phpslash-commit Mailing List for phpSlash (Page 72)
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
phpslash-commit — A list for automatically mailed SCM Commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(59) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(52) |
Feb
(77) |
Mar
(118) |
Apr
(76) |
May
(106) |
Jun
(145) |
Jul
(9) |
Aug
(15) |
Sep
(78) |
Oct
(83) |
Nov
(105) |
Dec
(51) |
| 2003 |
Jan
(105) |
Feb
(100) |
Mar
(111) |
Apr
(149) |
May
(95) |
Jun
(56) |
Jul
(8) |
Aug
(2) |
Sep
|
Oct
(22) |
Nov
(117) |
Dec
(6) |
| 2004 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
(25) |
May
|
Jun
(11) |
Jul
(26) |
Aug
(85) |
Sep
(119) |
Oct
(312) |
Nov
(271) |
Dec
(5) |
| 2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
(12) |
May
(7) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joe S. <joe...@us...> - 2002-11-14 22:17:24
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv6063/phpslash-ft Modified Files: CHANGES Log Message: correct old navbar Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.605 retrieving revision 1.606 diff -C2 -d -r1.605 -r1.606 *** CHANGES 14 Nov 2002 18:56:41 -0000 1.605 --- CHANGES 14 Nov 2002 22:17:20 -0000 1.606 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-November-14 13:00PM CST Joe Stewart <joe...@us...> + [B] - config-dist.php3, config.php3 - correct old navbar. + 2002-November-14 12:00PM CST Joe Stewart <joe...@us...> [B] - comment.php3 - reply to another comment bug. |
|
From: Joe S. <joe...@us...> - 2002-11-14 18:56:46
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv5188/phpslash-ft/public_html
Modified Files:
comment.php3
Log Message:
reply to another comment bug
Index: comment.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/comment.php3,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** comment.php3 11 Nov 2002 21:22:58 -0000 1.20
--- comment.php3 14 Nov 2002 18:56:42 -0000 1.21
***************
*** 40,46 ****
case "preview":
! // when you are previewing a comment before submitting
! $ary[replying_to] = $cmt->formatComment($ary);
$content .= $cmt->getForm($ary);
break;
--- 40,46 ----
case "preview":
! // when you are previewing a comment before submitting
! $ary[replying_to] = $cmt->formatComment($ary);
$content .= $cmt->getForm($ary);
break;
***************
*** 58,70 ****
$id = $cmt->update($ary);
if ($id) {
! $content .= getMessage($cmt->getMessage());
$comment_ary = $cmt->getCommentArray($id);
$content .= $cmt->formatComment($comment_ary);
! // send email for new submission.
if ($_PSL[commentnotify]) {
! $mail_ary['tpl'] = "emailNotifyComment";
$mail_ary['vars'] = $ary;
! $success = emailNotify($mail_ary);
! }
} else {
$content .= getError($cmt->getMessage());
--- 58,70 ----
$id = $cmt->update($ary);
if ($id) {
! $content .= getMessage($cmt->getMessage());
$comment_ary = $cmt->getCommentArray($id);
$content .= $cmt->formatComment($comment_ary);
! // send email for new submission.
if ($_PSL[commentnotify]) {
! $mail_ary['tpl'] = "emailNotifyComment";
$mail_ary['vars'] = $ary;
! $success = emailNotify($mail_ary);
! }
} else {
$content .= getError($cmt->getMessage());
***************
*** 94,98 ****
$auth->login_if(true);
}
! if ($ary[parent_id] != 0) {
$parent_ary = $cmt->getCommentArray($ary[parent_id]);
$ary['replying_to'] = $cmt->formatComment($parent_ary);
--- 94,98 ----
$auth->login_if(true);
}
! if ($ary[parent_id] != 0) {
$parent_ary = $cmt->getCommentArray($ary[parent_id]);
$ary['replying_to'] = $cmt->formatComment($parent_ary);
***************
*** 111,129 ****
$ary['action_url'] = $_PSL['phpself'];
! $ary['siteowner'] = $_PSL['site_owner'];
// session variables
if(isset($name)) {
$ary['name'] = $name;
! }
! if(isset($email)) {
$ary['email'] = $email;
! }
if(isset($url)) {
$ary['url'] = $url;
! }
$content .= $cmt->getForm($ary);
! break;
case "view":
--- 111,132 ----
$ary['action_url'] = $_PSL['phpself'];
! $ary['siteowner'] = $_PSL['site_owner'];
// session variables
if(isset($name)) {
$ary['name'] = $name;
! }
! if(isset($email)) {
$ary['email'] = $email;
! }
if(isset($url)) {
$ary['url'] = $url;
! }
+ // either start a new object or getForm not reuse template vars.
+ $cmt = new Comment($ary);
+
$content .= $cmt->getForm($ary);
! break;
case "view":
|
|
From: Joe S. <joe...@us...> - 2002-11-14 18:56:45
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv5188/phpslash-ft Modified Files: CHANGES Log Message: reply to another comment bug Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.604 retrieving revision 1.605 diff -C2 -d -r1.604 -r1.605 *** CHANGES 14 Nov 2002 17:19:20 -0000 1.604 --- CHANGES 14 Nov 2002 18:56:41 -0000 1.605 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-November-14 12:00PM CST Joe Stewart <joe...@us...> + [B] - comment.php3 - reply to another comment bug. + 2002-November-14 11:00AM CST Joe Stewart <joe...@us...> [B] - groupAdmin.php3 - clean still breaks sometimes ( multidimensional arrays?) |
|
From: Joe S. <joe...@us...> - 2002-11-14 17:19:23
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv22408/phpslash-ft Modified Files: CHANGES Log Message: clean broke saveGroup Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.603 retrieving revision 1.604 diff -C2 -d -r1.603 -r1.604 *** CHANGES 13 Nov 2002 21:23:25 -0000 1.603 --- CHANGES 14 Nov 2002 17:19:20 -0000 1.604 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-November-14 11:00AM CST Joe Stewart <joe...@us...> + [B] - groupAdmin.php3 - clean still breaks sometimes ( multidimensional arrays?) + 2002-November-13 3:00PM CST Joe Stewart <joe...@us...> [W] - Poll.class - check for Comment module. |
|
From: Joe S. <joe...@us...> - 2002-11-14 17:19:23
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv22408/phpslash-ft/public_html/admin
Modified Files:
groupAdmin.php3
Log Message:
clean broke saveGroup
Index: groupAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/groupAdmin.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** groupAdmin.php3 11 Nov 2002 22:22:39 -0000 1.5
--- groupAdmin.php3 14 Nov 2002 17:19:20 -0000 1.6
***************
*** 67,71 ****
break;
case "submit":
! $success = $group->saveGroup(clean($HTTP_POST_VARS));
if($success) {
$content .= getMessage( pslgetText($group->getMessage()));
--- 67,71 ----
break;
case "submit":
! $success = $group->saveGroup($HTTP_POST_VARS);
if($success) {
$content .= getMessage( pslgetText($group->getMessage()));
|
|
From: Joe S. <joe...@us...> - 2002-11-13 21:23:28
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv15580/phpslash-ft/class
Modified Files:
Poll.class
Log Message:
check for Comment module
Index: Poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Poll.class 22 Oct 2002 16:36:47 -0000 1.20
--- Poll.class 13 Nov 2002 21:23:25 -0000 1.21
***************
*** 392,399 ****
return false;
}
!
! $cmt = new Comment;
! $del = $cmt->delete('0',$question_id);
!
$this->message = "Poll "$question_text" was <em>deleted</em><br>\n";
return true;
--- 392,399 ----
return false;
}
! if ($this->psl['module']['Comment']) {
! $cmt = new Comment;
! $del = $cmt->delete('0',$question_id);
! }
$this->message = "Poll "$question_text" was <em>deleted</em><br>\n";
return true;
***************
*** 646,653 ****
function resultPage ($ary) {
- $cmt = new Comment($ary);
$ary['story_id'] = $ary['question_id'];
$ary['parent_id'] = 0;
!
# print "$results\n";
# print "Comments<BR><BR>$comments<BR><BR>\n";
--- 646,660 ----
function resultPage ($ary) {
$ary['story_id'] = $ary['question_id'];
$ary['parent_id'] = 0;
!
! if ($this->psl['module']['Comment']) {
! $cmt = new Comment($ary);
! $comments = $cmt->getAllComments($ary);
! } else {
! $comments = '';
! }
!
!
# print "$results\n";
# print "Comments<BR><BR>$comments<BR><BR>\n";
***************
*** 656,660 ****
'QUESTION_ID' => $ary['question_id'],
'RESULT' => $this->getResults($ary['question_id']),
! 'COMMENT' => $cmt->getAllComments($ary)
));
--- 663,667 ----
'QUESTION_ID' => $ary['question_id'],
'RESULT' => $this->getResults($ary['question_id']),
! 'COMMENT' => $comments
));
|
|
From: Joe S. <joe...@us...> - 2002-11-13 21:23:27
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv15580/phpslash-ft Modified Files: CHANGES Log Message: check for Comment module Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.602 retrieving revision 1.603 diff -C2 -d -r1.602 -r1.603 *** CHANGES 13 Nov 2002 20:20:27 -0000 1.602 --- CHANGES 13 Nov 2002 21:23:25 -0000 1.603 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-November-13 3:00PM CST Joe Stewart <joe...@us...> + [W] - Poll.class - check for Comment module. + 2002-November-13 2:00PM CST Joe Stewart <joe...@us...> [WD] - Block_render_comments.class, phpslash.sgml - filter by section_id and |
|
From: Joe S. <joe...@us...> - 2002-11-13 20:22:04
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv6642/phpslash-ft/class Modified Files: Block_render_comments.class Log Message: filter comment block by section_id Index: Block_render_comments.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_comments.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Block_render_comments.class 13 Nov 2002 20:20:27 -0000 1.2 --- Block_render_comments.class 13 Nov 2002 20:22:01 -0000 1.3 *************** *** 2,5 **** --- 2,6 ---- /* Block_render_comments.class -> Methods for phpslash comment blocks */ + /* $Id$ */ /** |
|
From: Joe S. <joe...@us...> - 2002-11-13 20:20:33
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv5592/phpslash-ft/class
Modified Files:
Block_render_comments.class
Log Message:
filter comment block by section_id
Index: Block_render_comments.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_comments.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Block_render_comments.class 12 Nov 2002 20:48:35 -0000 1.1
--- Block_render_comments.class 13 Nov 2002 20:20:27 -0000 1.2
***************
*** 2,6 ****
/* Block_render_comments.class -> Methods for phpslash comment blocks */
- /* $Id$ */
/**
--- 2,5 ----
***************
*** 12,15 ****
--- 11,15 ----
*
* tpl = template filename [commentblock] (no path or extension)
+ * section_id = section id [] show only the comments in this section
* section = section name [] show only the comments in this section
* number = number [10] show this number of comments
***************
*** 63,68 ****
}
! if(!empty($GLOBALS['QUERY_STRING'])) {
! $QUERY_STRING = $GLOBALS['QUERY_STRING'] . $this->psl['amp'];
} else {
$QUERY_STRING = '';
--- 63,70 ----
}
! if(isset($section_id)) {
! $QUERY_STRING = "section_id=". $section_id . $this->psl['amp'];
! } elseif (isset($section)) {
! $QUERY_STRING = "section=". $section . $this->psl['amp'];
} else {
$QUERY_STRING = '';
***************
*** 87,99 ****
}
! if(empty($section)) {
! $query = "SELECT comment_id,
! comment_text,
! name,
! story_id
! FROM psl_comment
! ORDER BY date DESC
LIMIT $number";
! } else {
$query = "SELECT psl_comment.comment_id,
psl_comment.comment_text,
--- 89,106 ----
}
! if (isset($section_id)){
! $query = "SELECT psl_comment.comment_id,
! psl_comment.comment_text,
! psl_comment.name,
! psl_comment.story_id
! FROM psl_comment,
! psl_section,
! psl_section_lut
! WHERE psl_section.section_id = '$section_id'
! AND psl_section_lut.section_id = psl_section.section_id
! AND psl_comment.story_id = psl_section_lut.story_id
! ORDER BY date DESC
LIMIT $number";
! } elseif (isset($section)){
$query = "SELECT psl_comment.comment_id,
psl_comment.comment_text,
***************
*** 107,110 ****
--- 114,125 ----
AND psl_comment.story_id = psl_section_lut.story_id
ORDER BY date DESC
+ LIMIT $number";
+ } else {
+ $query = "SELECT comment_id,
+ comment_text,
+ name,
+ story_id
+ FROM psl_comment
+ ORDER BY date DESC
LIMIT $number";
}
|
|
From: Joe S. <joe...@us...> - 2002-11-13 20:20:32
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory usw-pr-cvs1:/tmp/cvs-serv5592/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
filter comment block by section_id
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** phpslash.sgml 12 Nov 2002 20:48:35 -0000 1.56
--- phpslash.sgml 13 Nov 2002 20:20:27 -0000 1.57
***************
*** 1052,1055 ****
--- 1052,1064 ----
the title to be "My Site: %%" It will show up on the main page as
"My Site: February 23".
+ <tag/Comments:/ Creates a block containing links to recent comments.
+ These are valid source url options:
+ <itemize>
+ <item> section_id = show only the comments in this section
+ <item> section = show only the comments in this section
+ <item> number = [10] show this number of comments
+ <item> length = [30] cut off the text after this number of characters
+ <item> tpl = [commentblock] alternate template ( no .tpl).
+ </itemize>
<tag/HTML/ Just put some HTML in the "DATA" field and that's pretty
much it.
***************
*** 1112,1116 ****
<item> type - "submission"
<item> expire length - "0"
! <item> section - "Admin"
<item> Data - empty
<item> order number - "70"
--- 1121,1125 ----
<item> type - "submission"
<item> expire length - "0"
! <item> section - "User"
<item> Data - empty
<item> order number - "70"
|
|
From: Joe S. <joe...@us...> - 2002-11-13 20:20:32
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv5592/phpslash-ft Modified Files: CHANGES Log Message: filter comment block by section_id Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.601 retrieving revision 1.602 diff -C2 -d -r1.601 -r1.602 *** CHANGES 13 Nov 2002 19:56:18 -0000 1.601 --- CHANGES 13 Nov 2002 20:20:27 -0000 1.602 *************** *** 14,17 **** --- 14,21 ---- 2002-November-13 2:00PM CST Joe Stewart <joe...@us...> + [WD] - Block_render_comments.class, phpslash.sgml - filter by section_id and + add comment block to documentation. + + 2002-November-13 2:00PM CST Joe Stewart <joe...@us...> [B] - login.php3 - typo. |
|
From: Joe S. <joe...@us...> - 2002-11-13 19:56:21
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv21565a/phpslash-ft/public_html
Modified Files:
login.php3
Log Message:
login.php3 - typo
Index: login.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** login.php3 11 Nov 2002 21:22:58 -0000 1.27
--- login.php3 13 Nov 2002 19:56:19 -0000 1.28
***************
*** 18,22 ****
if(isset($HTTP_COOKIE_VARS['user_info'])) {
$user_info = unserialize(base64_decode($HTTP_COOKIE_VARS['user_info']));
! if(!array_key_exists($user_info, 'preferences')) {
setcookie( 'user_info', '', time()-31536000, $_PSL['rooturl'], "", "");
$sess->delete();
--- 18,22 ----
if(isset($HTTP_COOKIE_VARS['user_info'])) {
$user_info = unserialize(base64_decode($HTTP_COOKIE_VARS['user_info']));
! if(!array_key_exists('preferences',$user_info)) {
setcookie( 'user_info', '', time()-31536000, $_PSL['rooturl'], "", "");
$sess->delete();
|
|
From: Joe S. <joe...@us...> - 2002-11-13 19:56:21
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv21565a/phpslash-ft Modified Files: CHANGES Log Message: login.php3 - typo Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.600 retrieving revision 1.601 diff -C2 -d -r1.600 -r1.601 *** CHANGES 13 Nov 2002 17:08:06 -0000 1.600 --- CHANGES 13 Nov 2002 19:56:18 -0000 1.601 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-November-13 2:00PM CST Joe Stewart <joe...@us...> + [B] - login.php3 - typo. + 2002-November-13 11:00AM CST Joe Stewart <joe...@us...> [W] - slash-all.sql - added submsission block to default install. |
|
From: Joe S. <joe...@us...> - 2002-11-13 17:08:11
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.7
In directory usw-pr-cvs1:/tmp/cvs-serv29505/phpslash-ft/tables/0.7
Modified Files:
slash-all.sql
Log Message:
submission block in default install
Index: slash-all.sql
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.7/slash-all.sql,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** slash-all.sql 11 Nov 2002 15:35:40 -0000 1.18
--- slash-all.sql 13 Nov 2002 17:08:08 -0000 1.19
***************
*** 132,136 ****
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_variable_seq', '63');
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_section_seq', '9');
! INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_block_seq', '149');
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_author_seq', '20');
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_infolog', '88');
--- 132,136 ----
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_variable_seq', '63');
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_section_seq', '9');
! INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_block_seq', '150');
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_author_seq', '20');
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_infolog', '88');
***************
*** 138,142 ****
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_glossary_seq', '1');
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_blocktype_seq ', '14');
! INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_section_block_lut_seq', '280');
INSERT INTO db_sequence VALUES ('psl_permission_seq',81);
INSERT INTO db_sequence VALUES ('psl_group_seq',27);
--- 138,142 ----
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_glossary_seq', '1');
INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_blocktype_seq ', '14');
! INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_section_block_lut_seq', '322');
INSERT INTO db_sequence VALUES ('psl_permission_seq',81);
INSERT INTO db_sequence VALUES ('psl_group_seq',27);
***************
*** 384,389 ****
', 'a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}', '30');
# INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '147', '10', 'Skins', '14400', '20011002152749', '', '', '', 'a:3:{s:6:"column";s:4:"left";s:5:"perms";s:4:"user";s:0:"";s:0:"";}', '50');
! INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '148', '1', 'Administration', '0', '20020628131644', '', '', '<BR><BR>A bunch of cool things like latest site activity and stats should go here. <BR> But until they do, just pick something from the NavBar and go about your duties...<BR><BR>', 'a:3:{s:6:\"column\";s:6:\"center\";s:5:\"perms\";s:4:\"user\";s:0:\"\";s:0:\"\";}', '90');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '149', '12', 'Tasks', '0', '20020628131658', '', 'menu_ary=menuadmin&tpl=navbarBlockh', '', 'a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:4:\"100%\";s:5:\"perms\";s:4:\"user\";s:8:\"box_type\";s:6:\"framed\";}', '95');
# --------------------------------------------------------
#
--- 384,391 ----
', 'a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}', '30');
# INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '147', '10', 'Skins', '14400', '20011002152749', '', '', '', 'a:3:{s:6:"column";s:4:"left";s:5:"perms";s:4:"user";s:0:"";s:0:"";}', '50');
! INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '148', '1', 'Administration', '0', '20020628131644', '', '', '<BR><BR>A bunch of cool things like latest site activity and stats should go here. <BR> But until they do, just pick something from the NavBar and go about your duties...<BR><BR>', 'a:3:{s:6:\"column\";s:6:\"center\";s:5:\"perms\";s:4:\"user\";s:0:\"\";s:0:\"\";}', '70');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '149', '12', 'Tasks', '0', '20020628131658', '', 'menu_ary=menuadmin&tpl=navbarBlockh', '', 'a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:4:\"100%\";s:5:\"perms\";s:4:\"user\";s:8:\"box_type\";s:6:\"framed\";}', '95');
+ INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '150', '13', 'Submission Queue', '0', '20020628131658', '', '', '', 'a:3:{s:6:\"column\";s:6:\"center\";s:5:\"perms\";s:10:\"submission\";s:0:\"\";s:0:\"\";}' , '80');
+
# --------------------------------------------------------
#
***************
*** 1010,1013 ****
--- 1012,1016 ----
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES( '320', '149', '8');
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES( '319', '149', '9');
+ INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES( '321', '150', '8');
|
|
From: Joe S. <joe...@us...> - 2002-11-13 17:08:11
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv29505/phpslash-ft Modified Files: CHANGES Log Message: submission block in default install Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.599 retrieving revision 1.600 diff -C2 -d -r1.599 -r1.600 *** CHANGES 12 Nov 2002 20:48:34 -0000 1.599 --- CHANGES 13 Nov 2002 17:08:06 -0000 1.600 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-November-13 11:00AM CST Joe Stewart <joe...@us...> + [W] - slash-all.sql - added submsission block to default install. + 2002-November-12 2:00PM CST Joe Stewart <joe...@us...> [FT] - Block_render_comment.class, commentblock.tpl, commentDisplay.tpl, |
|
From: Joe S. <joe...@us...> - 2002-11-12 20:48:38
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv1039/phpslash-ft/public_html/templates/en/default
Modified Files:
commentDisplay.tpl
Added Files:
commentblock.tpl
Log Message:
comment blocks
--- NEW FILE: commentblock.tpl ---
<!-- BEGIN commentblock.tpl -->
<!-- BEGIN each_comment -->
<li />[{NAME}] <a href="{ROOT_URL}/article.php3?{QUERYSTRING}story_id={STORY_ID}#{COMMENT_ID}">{COMMENT}</a><br />
<!-- END each_comment -->
<!-- END commentblock.tpl -->
Index: commentDisplay.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/commentDisplay.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** commentDisplay.tpl 3 Aug 2001 00:05:30 -0000 1.4
--- commentDisplay.tpl 12 Nov 2002 20:48:36 -0000 1.5
***************
*** 1,3 ****
--- 1,4 ----
<!-- BEGIN commentDisplay.tpl -->
+ <a name="{COMMENT_ID}" />
<div align=left>
|
|
From: Joe S. <joe...@us...> - 2002-11-12 20:48:38
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv1039/phpslash-ft/public_html/templates/en/basic
Modified Files:
commentDisplay.tpl
Added Files:
commentblock.tpl
Log Message:
comment blocks
--- NEW FILE: commentblock.tpl ---
<!-- BEGIN commentblock.tpl -->
<!-- BEGIN each_comment -->
<li />[{NAME}] <a href="{ROOT_URL}/article.php3?{QUERYSTRING}story_id={STORY_ID}#{COMMENT_ID}">{COMMENT}</a><br />
<!-- END each_comment -->
<!-- END commentblock.tpl -->
Index: commentDisplay.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/commentDisplay.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** commentDisplay.tpl 9 Apr 2002 16:57:06 -0000 1.2
--- commentDisplay.tpl 12 Nov 2002 20:48:35 -0000 1.3
***************
*** 1,3 ****
--- 1,4 ----
<!-- START commentDisplay.tpl -->
+ <a name="{COMMENT_ID}" />
<div id="commentDisplay">
<div id="commentHeader">
|
|
From: Joe S. <joe...@us...> - 2002-11-12 20:48:38
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory usw-pr-cvs1:/tmp/cvs-serv1039/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
comment blocks
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** phpslash.sgml 28 Oct 2002 16:13:53 -0000 1.55
--- phpslash.sgml 12 Nov 2002 20:48:35 -0000 1.56
***************
*** 776,779 ****
--- 776,781 ----
blockList.tpl
breadcrumb.tpl
+ commentblock.tpl
+ commentDisplay.tpl
commentSubmitForm.tpl
emailNotifyComment.tpl
***************
*** 1446,1450 ****
breadcrumb.tpl - display current section and topic
calendar.tpl - calendar block
! comment.tpl - all comments and the mode change form
commentDisplay.tpl - individual comment format
commentFlat.tpl - flat view
--- 1448,1453 ----
breadcrumb.tpl - display current section and topic
calendar.tpl - calendar block
! comment.tpl - all comments and the mode change form
! commentblock.tpl - format of comment block contents
commentDisplay.tpl - individual comment format
commentFlat.tpl - flat view
|
|
From: Joe S. <joe...@us...> - 2002-11-12 20:48:38
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv1039/phpslash-ft/class
Added Files:
Block_render_comments.class
Log Message:
comment blocks
--- NEW FILE: Block_render_comments.class ---
<?php
/* Block_render_comments.class -> Methods for phpslash comment blocks */
/* $Id: Block_render_comments.class,v 1.1 2002/11/12 20:48:35 joestewart Exp $ */
/**
* pass the query in the "Source Url" form field in the format of:
*
* option1=setting1&option2=setting2
*
* Available query options:
*
* tpl = template filename [commentblock] (no path or extension)
* section = section name [] show only the comments in this section
* number = number [10] show this number of comments
* length = number of chars [30] cut off the text after a number of characters
**/
class Block_render_comments extends Block_render_i {
var $DEFAULT_NUMBER;
var $DEFAULT_LENGTH;
/* constructor */
function Block_render_comments() {
$this->Block_render_i();
$this->type = "comments"; /* set the 'type' */
$this->description = "This shows recent comments";
$this->DEFAULT_NUMBER = 10;
$this->DEFAULT_LENGTH = 30;
}
function parse($block_info) {
$this->output = $this->comments($block_info);
return 1;
}
function comments($block_info) {
$db = new slashDB;
$default_tpl = "commentblock.tpl";
//this pulls apart the source_url variable into actual php variables
parse_str($block_info["source_url"]);
if ($this->psl['skin']) {
$skin = $this->psl['skin'];
} else {
$skin = $this->psl['defaultskin'];
$this->psl['templatedir]'] .= $skin;
}
// remove "skin" from templatedir
$templatedir = substr( $this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") );
if(empty($tpl)) {
$tpl = $default_tpl;
} elseif (file_exists($templatedir . "/" . basename($tpl) . ".tpl")) {
$tpl = basename($tpl) . ".tpl";
} else {
debug ("Block_render_skin:Template file doesn't exist, using default instead", $tpl);
$tpl = $default_tpl;
}
if(!empty($GLOBALS['QUERY_STRING'])) {
$QUERY_STRING = $GLOBALS['QUERY_STRING'] . $this->psl['amp'];
} else {
$QUERY_STRING = '';
}
$template = new Template($templatedir . "/" . $skin);
$template->debug = 0;
$template->set_file(array(
'block' => $tpl
));
$template->set_block ("block", "each_comment", "comment_block");
$template->set_var(array(
'QUERYSTRING' => $QUERY_STRING,
'ROOT_URL' => $this->psl['rooturl']
));
if(empty($number)) {
$number = $this->DEFAULT_NUMBER;
}
if(empty($length)) {
$length = $this->DEFAULT_LENGTH;
}
if(empty($section)) {
$query = "SELECT comment_id,
comment_text,
name,
story_id
FROM psl_comment
ORDER BY date DESC
LIMIT $number";
} else {
$query = "SELECT psl_comment.comment_id,
psl_comment.comment_text,
psl_comment.name,
psl_comment.story_id
FROM psl_comment,
psl_section,
psl_section_lut
WHERE psl_section.section_name = '$section'
AND psl_section_lut.section_id = psl_section.section_id
AND psl_comment.story_id = psl_section_lut.story_id
ORDER BY date DESC
LIMIT $number";
}
$db->query($query);
while($db->next_record()) {
$template->set_var(array(
'COMMENT' => substr(strip_tags($db->f("comment_text")),0,$length)."...",
'COMMENT_ID' => $db->f("comment_id"),
'STORY_ID' => $db->f("story_id"),
'NAME' => $db->f("name")
));
$template->parse("comment_block","each_comment",true);
}
unset($db);
return $template->parse('OUT', "block");
}
}
?>
|
|
From: Joe S. <joe...@us...> - 2002-11-12 20:48:38
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv1039/phpslash-ft Modified Files: CHANGES Log Message: comment blocks Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.598 retrieving revision 1.599 diff -C2 -d -r1.598 -r1.599 *** CHANGES 12 Nov 2002 17:08:15 -0000 1.598 --- CHANGES 12 Nov 2002 20:48:34 -0000 1.599 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-November-12 2:00PM CST Joe Stewart <joe...@us...> + [FT] - Block_render_comment.class, commentblock.tpl, commentDisplay.tpl, + phpslash.sgml - Comment Block submitted by Seth Hall. + 2002-November-12 11:00AM CST Joe Stewart <joe...@us...> [WT] - functions.inc, authorNew.tpl - editing other authors shouldn't save a |
|
From: Joe S. <joe...@us...> - 2002-11-12 17:08:20
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv21239/phpslash-ft/public_html/templates/en/basic
Modified Files:
authorNew.tpl
Log Message:
user preference tweaks
Index: authorNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/authorNew.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** authorNew.tpl 11 Nov 2002 15:35:39 -0000 1.8
--- authorNew.tpl 12 Nov 2002 17:08:16 -0000 1.9
***************
*** 85,92 ****
</tr>
<tr>
- <td class="descr"><input type=checkbox name=loggedoutprefs></td>
- <td>Use these settings when logged out as well.</td>
- </tr>
- <tr>
<td colspan="2">
<hr>
--- 85,88 ----
|
|
From: Joe S. <joe...@us...> - 2002-11-12 17:08:20
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv21239/phpslash-ft/public_html/templates/en/default
Modified Files:
authorNew.tpl
Log Message:
user preference tweaks
Index: authorNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/authorNew.tpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** authorNew.tpl 11 Nov 2002 15:35:40 -0000 1.13
--- authorNew.tpl 12 Nov 2002 17:08:16 -0000 1.14
***************
*** 89,96 ****
</TD>
</TR>
- <TR>
- <TD><INPUT type=checkbox name=loggedoutprefs></TD>
- <TD>Use these settings when logged out as well.</TD>
- </TR>
</TABLE>
<INPUT type="hidden" name="author_id" value="{AUTHOR_ID}">
--- 89,92 ----
|
|
From: Joe S. <joe...@us...> - 2002-11-12 17:08:19
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv21239/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
user preference tweaks
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** functions.inc 28 Oct 2002 21:41:14 -0000 1.112
--- functions.inc 12 Nov 2002 17:08:16 -0000 1.113
***************
*** 1433,1436 ****
--- 1433,1440 ----
$optioncnt = 0;
+ if(count($options_ary) == 0) {
+ $options_ary = '';
+ }
+
if(!empty($_PSL[$default_options])) {
$optioncnt = count($_PSL[$default_options]);
***************
*** 1475,1481 ****
for ($i =1; $i <= count($options_ary); $i++) {
$current=each($options_ary);
! debug("current", $current);
! if ($current) {
$tpl_object->set_var(array(
'OPTION_NAME' => "optionname[]",
--- 1479,1485 ----
for ($i =1; $i <= count($options_ary); $i++) {
$current=each($options_ary);
! // debug("current", $current);
! if ($current) {
$tpl_object->set_var(array(
'OPTION_NAME' => "optionname[]",
***************
*** 1485,1489 ****
));
}
! $tpl_object->parse("options", "each_option", true);
}
if( (count($options_ary) - $optioncnt) >= 0) {
--- 1489,1493 ----
));
}
! $tpl_object->parse("options", "each_option", true);
}
if( (count($options_ary) - $optioncnt) >= 0) {
|
|
From: Joe S. <joe...@us...> - 2002-11-12 17:08:19
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv21239/phpslash-ft Modified Files: CHANGES Log Message: user preference tweaks Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.597 retrieving revision 1.598 diff -C2 -d -r1.597 -r1.598 *** CHANGES 11 Nov 2002 22:22:35 -0000 1.597 --- CHANGES 12 Nov 2002 17:08:15 -0000 1.598 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-November-12 11:00AM CST Joe Stewart <joe...@us...> + [WT] - functions.inc, authorNew.tpl - editing other authors shouldn't save a + cookie. displayOptions catches empty option arrays. + 2002-November-11 4:00PM CST Joe Stewart <joe...@us...> [W] - authorAdmin.php3, blockAdmin.php3, commentAdmin.php3, glossaryAdmin.php3, |
|
From: Joe S. <joe...@us...> - 2002-11-11 22:42:22
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv27184/phpslash-ft/public_html
Modified Files:
submission.php3
Log Message:
translate page titles
Index: submission.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/submission.php3,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** submission.php3 11 Nov 2002 21:22:58 -0000 1.13
--- submission.php3 11 Nov 2002 22:42:19 -0000 1.14
***************
*** 1,4 ****
<?php
! // $id: submission.php3,v 1.0 2000/04/25 12:08:03 ajay Exp $
require("config.php3");
--- 1,4 ----
<?php
! // $Id$
require("config.php3");
|
2 messages has been excluded from this view by a project administrator.
