phpslash-commit Mailing List for phpSlash (Page 93)
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-04-16 15:16:30
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv27082/phpslash-ft/public_html/admin
Modified Files:
pollAdmin.php3
Log Message:
bugfix - [ 544698 ] pollAdmin permissions
Index: pollAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/pollAdmin.php3,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pollAdmin.php3 12 Mar 2002 19:00:23 -0000 1.7
--- pollAdmin.php3 16 Apr 2002 15:16:27 -0000 1.8
***************
*** 13,16 ****
--- 13,18 ----
*****************************/
+ $auth->login_if(!$perm->have_perm('poll'));
+
/* DEBUG STUFF */
debug("HTTP_POST_VARS" , $HTTP_POST_VARS);
***************
*** 56,62 ****
} else { // no permissions!
! $auth->auth['error'] = pslgetText("Sorry. You do not have the necessary privilege to view this page.");
! Header("Location: " . $_PSL['rooturl' ."/login.php3"]);
! exit;
}
--- 58,63 ----
} else { // no permissions!
! titlebar("100%","Error! Invalid Privileges");
! echo "Sorry. You do not have the necessary privilege to view this page.";
}
|
|
From: Joe S. <joe...@us...> - 2002-04-15 17:32:00
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.65 In directory usw-pr-cvs1:/tmp/cvs-serv4030/phpslash-ft/tables/0.65 Modified Files: slash-all.sql 6_to_65.sql Log Message: new perm storyeditor Index: slash-all.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.65/slash-all.sql,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** slash-all.sql 13 Mar 2002 16:37:56 -0000 1.14 --- slash-all.sql 15 Apr 2002 15:47:42 -0000 1.15 *************** *** 164,168 **** # ! INSERT INTO psl_author (author_id, author_name, author_realname, url, email, quote, password, seclev, perms) VALUES ( '1', 'god', '', 'http://www.god.com', 'go...@he...', 'God doesn't need a 'quote'!', MD5('god:password'), '1000000', 'root,nobody,user,topic,comment,story,section,submission,block,poll,author,variable,glossary,mailinglist,logging'); # -------------------------------------------------------- --- 164,168 ---- # ! INSERT INTO psl_author (author_id, author_name, author_realname, url, email, quote, password, seclev, perms) VALUES ( '1', 'god', '', 'http://www.god.com', 'go...@he...', 'God doesn't need a 'quote'!', MD5('god:password'), '1000000', 'root,nobody,user,topic,comment,story,storyeditor,section,submission,block,poll,author,variable,glossary,mailinglist,logging'); # -------------------------------------------------------- Index: 6_to_65.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.65/6_to_65.sql,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** 6_to_65.sql 1 Feb 2002 21:39:02 -0000 1.7 --- 6_to_65.sql 15 Apr 2002 15:47:43 -0000 1.8 *************** *** 11,15 **** update psl_author set perms='nobody,user,topic,story,section,submission,block,poll,author,variable,glossary,mailinglist,logging,comment' where seclev > '9999' and seclev < '1000000'; ! update psl_author set perms='root,nobody,user,topic,story,section,submission,block,poll,author,variable,glossary,mailinglist,logging,comment' where seclev > '999999'; UPDATE psl_author SET password = MD5(CONCAT(author_name,":",password)); --- 11,15 ---- update psl_author set perms='nobody,user,topic,story,section,submission,block,poll,author,variable,glossary,mailinglist,logging,comment' where seclev > '9999' and seclev < '1000000'; ! update psl_author set perms='root,nobody,user,topic,story,storyeditor,section,submission,block,poll,author,variable,glossary,mailinglist,logging,comment' where seclev > '999999'; UPDATE psl_author SET password = MD5(CONCAT(author_name,":",password)); |
|
From: Joe S. <joe...@us...> - 2002-04-15 17:31:58
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv7780/phpslash-ft/class
Modified Files:
Story_base.class
Log Message:
new perm storyeditor
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Story_base.class 15 Apr 2002 13:13:08 -0000 1.9
--- Story_base.class 15 Apr 2002 15:59:05 -0000 1.10
***************
*** 421,425 ****
// Normal users can't edit another user's stories
! if((!$this->perm->have_perm('story,root')) AND
( $ary['author_id'] != $this->auth->auth['uid'])) {
$this->message = pslgetText("Sorry. You do not have the necessary privilege to view this page.");
--- 421,425 ----
// Normal users can't edit another user's stories
! if((!$this->perm->have_perm('story,storyeditor')) AND
( $ary['author_id'] != $this->auth->auth['uid'])) {
$this->message = pslgetText("Sorry. You do not have the necessary privilege to view this page.");
|
|
From: Joe S. <joe...@us...> - 2002-04-15 17:31:43
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv24707/phpslash-ft
Modified Files:
CHANGES
Log Message:
SKIN variable in slashHead
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.454
retrieving revision 1.455
diff -C2 -d -r1.454 -r1.455
*** CHANGES 15 Apr 2002 13:13:08 -0000 1.454
--- CHANGES 15 Apr 2002 14:50:21 -0000 1.455
***************
*** 13,19 ****
--- 13,24 ----
9 - Removal of something (kill -9 :)
+ 2002-Apr-15 9:30AM CDT Joe Stewart <joe...@us...>
+ [T] - default/storyNew.tpl - typo.
+ [T] - basic/slashHead.tpl - use SKIN variable for .css file location.
+
2002-Apr-15 8:00AM CDT Joe Stewart <joe...@us...>
[F] - Story.class, Story_base.class - Implemented drop-down date input per
Ajay's request that it be included in 0.65.
+ [T] - default/storyNew.tpl, basic/storyNew.tpl - drop-down dates.
2002-Apr-13 11:30AM CDT Joe Stewart <joe...@us...>
|
|
From: Joe S. <joe...@us...> - 2002-04-15 17:31:39
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv24707/phpslash-ft/public_html/templates/en/default
Modified Files:
storyNew.tpl
Log Message:
SKIN variable in slashHead
Index: storyNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/storyNew.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** storyNew.tpl 15 Apr 2002 13:13:08 -0000 1.12
--- storyNew.tpl 15 Apr 2002 14:50:22 -0000 1.13
***************
*** 34,38 ****
</TR>
! <TR>
<TD valign="top">Author</TD>
<TD valign="top">
--- 34,38 ----
</TR>
! <TR>
<TD valign="top">Author</TD>
<TD valign="top">
***************
*** 86,89 ****
--- 86,90 ----
<!-- END datetimeset_row -->
</TD>
+ </TR>
</TABLE>
</TD>
|
|
From: Joe S. <joe...@us...> - 2002-04-15 17:08:25
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv24707/phpslash-ft/public_html/templates/en/basic
Modified Files:
slashHead.tpl
Log Message:
SKIN variable in slashHead
Index: slashHead.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/slashHead.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** slashHead.tpl 9 Apr 2002 17:08:05 -0000 1.3
--- slashHead.tpl 15 Apr 2002 14:50:22 -0000 1.4
***************
*** 15,19 ****
<!-- END each_metatag -->
! <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/basic.css" />
</head>
--- 15,19 ----
<!-- END each_metatag -->
! <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" />
</head>
|
|
From: Joe S. <joe...@us...> - 2002-04-15 17:08:14
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv4030/phpslash-ft/class
Modified Files:
Story.class
Log Message:
new perm storyeditor
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Story.class 15 Apr 2002 13:13:08 -0000 1.32
--- Story.class 15 Apr 2002 15:47:37 -0000 1.33
***************
*** 562,566 ****
$user_id = $story_ary['user_id'];
! if((!$this->perm->have_perm('story,root')) AND
( $user_id != $this->auth->auth['uid'])) {
return false;
--- 562,566 ----
$user_id = $story_ary['user_id'];
! if((!$this->perm->have_perm('story,storyeditor')) AND
( $user_id != $this->auth->auth['uid'])) {
return false;
***************
*** 849,854 ****
$user_id = $this->auth->auth[uid];
! // if you're not root, then you can only view your own stories.
! if (!$this->perm->have_perm("story,root")) {
$q .= "AND '$user_id' = story.user_id
AND '$user_id' = author.author_id ";
--- 849,854 ----
$user_id = $this->auth->auth[uid];
! // if you're not a storyeditor, then you can only view your own stories.
! if (!$this->perm->have_perm("story,storyeditor")) {
$q .= "AND '$user_id' = story.user_id
AND '$user_id' = author.author_id ";
***************
*** 1060,1064 ****
));
// $this->template->set_block("newstory","datetime_row","datetime_rows");
! if (!$this->perm->have_perm("story,root")) {
$this->template->set_var(array(
'TYPE' => "hidden",
--- 1060,1064 ----
));
// $this->template->set_block("newstory","datetime_row","datetime_rows");
! if (!$this->perm->have_perm("story,storyeditor")) {
$this->template->set_var(array(
'TYPE' => "hidden",
***************
*** 1217,1227 ****
// Normal users can't edit another user's stories
! if((!$this->perm->have_perm('story,root')) AND
( $user_id != $this->auth->auth['uid'])) {
return false;
}
! /* if god-level, enable setting of date, otherwise display date */
! if (!$this->perm->have_perm("story,root")) {
$this->template->set_var(array(
'TYPE' => "hidden",
--- 1217,1227 ----
// Normal users can't edit another user's stories
! if((!$this->perm->have_perm('story,storyeditor')) AND
( $user_id != $this->auth->auth['uid'])) {
return false;
}
! /* if storyeditor, enable setting of date, otherwise display date */
! if (!$this->perm->have_perm("story,storyeditor")) {
$this->template->set_var(array(
'TYPE' => "hidden",
***************
*** 1368,1374 ****
}
! $god_edit = true; //god can create as anyone or change story author
!
! if (!$this->perm->have_perm("story,root")) {
$this->template->set_var(array(
'AUTHOR_ID' => $this->auth->auth['uid'],
--- 1368,1372 ----
}
! if (!$this->perm->have_perm("story,storyeditor")) {
$this->template->set_var(array(
'AUTHOR_ID' => $this->auth->auth['uid'],
***************
*** 1384,1390 ****
author_name
FROM psl_author ";
- if( $god_edit == false) {
- $q .= " WHERE author_id = '$user_id' ";
- }
$q .= " ORDER BY author_name ";
--- 1382,1385 ----
|
|
From: Joe S. <joe...@us...> - 2002-04-15 17:08:14
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv4030/phpslash-ft Modified Files: CHANGES Log Message: new perm storyeditor Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.455 retrieving revision 1.456 diff -C2 -d -r1.455 -r1.456 *** CHANGES 15 Apr 2002 14:50:21 -0000 1.455 --- CHANGES 15 Apr 2002 15:47:33 -0000 1.456 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-15 10:30AM CDT Joe Stewart <joe...@us...> + [W] - Story.class, Story_base.class, config.php3, slash-all.sql, + and 6_to_65.sql - changed required permissions for some story actions + to a new permission level "storyeditor". + 2002-Apr-15 9:30AM CDT Joe Stewart <joe...@us...> [T] - default/storyNew.tpl - typo. |
|
From: Joe S. <joe...@us...> - 2002-04-15 17:08:14
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv4030/phpslash-ft/public_html
Modified Files:
config.php3
Log Message:
new perm storyeditor
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** config.php3 19 Mar 2002 16:25:17 -0000 1.132
--- config.php3 15 Apr 2002 15:47:40 -0000 1.133
***************
*** 383,386 ****
--- 383,387 ----
"topic" => 64,
"story" => 256,
+ "storyeditor" => 512,
"comment" => 1024,
"section" => 16384,
|
|
From: Joe S. <joe...@us...> - 2002-04-15 13:13:12
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv25599/phpslash-ft/class
Modified Files:
Story.class Story_base.class
Log Message:
drop-down dates for stories
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Story.class 20 Mar 2002 22:16:42 -0000 1.31
--- Story.class 15 Apr 2002 13:13:08 -0000 1.32
***************
*** 1029,1032 ****
--- 1029,1041 ----
$this->template->set_var('EXTTRANS_CHKBOX',"");
+ $this->template->set_block("newstory","datetime_row","datetime_rows");
+ $this->template->set_block("newstory","year_row","year_rows");
+ $this->template->set_block("newstory","month_row","month_rows");
+ $this->template->set_block("newstory","day_row","day_rows");
+ $this->template->set_block("newstory","hour_row","hour_rows");
+ $this->template->set_block("newstory","minute_row","minute_rows");
+ $this->template->set_block("newstory","second_row","second_rows");
+ $this->template->set_block("newstory","datetimeset_row","datetimeset_rows");
+
if ($data_source == "array") { /* this is what happens during a preview */
***************
*** 1050,1068 ****
'AUTHOR_NAME' => $author_name
));
!
if (!$this->perm->have_perm("story,root")) {
$this->template->set_var(array(
'TYPE' => "hidden",
'TIME_VALUE' => $ary['time']
! ));
} else {
! $this->template->set_var(array(
! 'TYPE' => "text",
! 'TIME_VALUE' => ""
! ));
! }
! if ($ary['content'] == "plain") {
$this->template->set_var('PLAIN_CHKBOX',"CHECKED");
$this->template->set_var('HTML_CHKBOX',"");
--- 1059,1151 ----
'AUTHOR_NAME' => $author_name
));
! // $this->template->set_block("newstory","datetime_row","datetime_rows");
if (!$this->perm->have_perm("story,root")) {
$this->template->set_var(array(
'TYPE' => "hidden",
'TIME_VALUE' => $ary['time']
! ));
! $this->template->parse("datetime_rows","datetime_row",true);
} else {
! $datetime = split( ' ', $ary['time']);
! $story_date = split( '-', $datetime[0]);
! $story_time = split( ':', $datetime[1]);
+ // setup year select box
+ for( $i=1998; $i<2009; $i++) {
+ $this->template->set_var(array(
+ 'SELECTED' => '',
+ 'STORYYEAR' => $i
+ ));
+ if( $i == $story_date[0]) {
+ $this->template->set_var('SELECTED', "selected=\"selected\"");
+ }
+ $this->template->parse("year_rows","year_row",true);
+ }
+ // setup month select box
+ for( $i=1; $i<=12; $i++) {
+ $this->template->set_var(array(
+ 'SELECTED' => '',
+ 'STORYMONTH' => sprintf( "%02d", $i)
+ ));
+ if( $i == $story_date[1]) {
+ $this->template->set_var('SELECTED', "selected=\"selected\"");
+ }
+ $this->template->parse("month_rows","month_row",true);
+ }
! // setup day select box
! for( $i=1; $i<=31; $i++) {
! $this->template->set_var(array(
! 'SELECTED' => '',
! 'STORYDAY' => sprintf( "%02d", $i)
! ));
! if( $i == $story_date[2]) {
! $this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("day_rows","day_row",true);
! }
!
! // setup hour select box
! for( $i=1; $i<=24; $i++) {
! $this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYHOUR' => $i
! ));
! if( $i == $story_time[0]) {
! $this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("hour_rows","hour_row",true);
! }
!
! // setup minute select box
! for( $i=1; $i<=60; $i++) {
! $this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYMINUTE' => sprintf( "%02d", $i)
! ));
! if( $i == $story_time[1]) {
! $this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("minute_rows","minute_row",true);
! }
!
! // setup seconds select box
! for( $i=1; $i<=60; $i++) {
! $this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYSECOND' => sprintf( "%02d", $i)
! ));
! if( $i == $story_time[2]) {
! $this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("second_rows","second_row",true);
! }
! $this->template->parse("datetimeset_rows","datetimeset_row",true);
! }
!
! if ($ary['content'] == "plain") {
$this->template->set_var('PLAIN_CHKBOX',"CHECKED");
$this->template->set_var('HTML_CHKBOX',"");
***************
*** 1144,1153 ****
'TYPE' => "hidden",
'TIME_VALUE' => $this->db->Record['time']
! ));
} else {
! $this->template->set_var(array(
! 'TYPE' => "text",
! 'TIME_VALUE' => ""
! ));
}
--- 1227,1315 ----
'TYPE' => "hidden",
'TIME_VALUE' => $this->db->Record['time']
! ));
! $this->template->parse("datetime_rows","datetime_row",true);
} else {
! $datetime = split( ' ', $this->db->Record['time']);
! $story_date = split( '-', $datetime[0]);
! $story_time = split( ':', $datetime[1]);
!
! // setup year select box
! for( $i=1998; $i<2009; $i++) {
! $this->template->set_var(array(
! 'SELECTED' => '',
! 'STORYYEAR' => $i
! ));
!
! if( $i == $story_date[0]) {
! $this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("year_rows","year_row",true);
! }
!
! // setup month select box
! for( $i=1; $i<=12; $i++) {
! $this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYMONTH' => sprintf( "%02d", $i)
! ));
! if( $i == $story_date[1]) {
! $this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("month_rows","month_row",true);
! }
!
! // setup day select box
! for( $i=1; $i<=31; $i++) {
! $this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYDAY' => sprintf( "%02d", $i)
! ));
! if( $i == $story_date[2]) {
! $this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("day_rows","day_row",true);
! }
!
! // setup hour select box
! for( $i=1; $i<=24; $i++) {
! $this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYHOUR' => $i
! ));
! if( $i == $story_time[0]) {
! $this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("hour_rows","hour_row",true);
! }
!
! // setup minute select box
! for( $i=1; $i<=60; $i++) {
! $this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYMINUTE' => sprintf( "%02d", $i)
! ));
! if( $i == $story_time[1]) {
! $this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("minute_rows","minute_row",true);
! }
!
! // setup seconds select box
! for( $i=1; $i<=60; $i++) {
! $this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYSECOND' => sprintf( "%02d", $i)
! ));
! if( $i == $story_time[2]) {
! $this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("second_rows","second_row",true);
! }
! $this->template->parse("datetimeset_rows","datetimeset_row",true);
}
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Story_base.class 10 Apr 2002 03:37:36 -0000 1.8
--- Story_base.class 15 Apr 2002 13:13:08 -0000 1.9
***************
*** 461,465 ****
if ($ary['time'] == "") {
! $ary['time'] = date("Y-m-d H:i:s");
}
--- 461,469 ----
if ($ary['time'] == "") {
! if( $ary['story_date'] ) {
! $ary['time'] = implode( '-', $ary['story_date']) ." ". implode( ':',$ary['story_time']);
! } else {
! $ary['time'] = date("Y-m-d H:i:s");
! }
}
|
|
From: Joe S. <joe...@us...> - 2002-04-15 13:13:12
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv25599/phpslash-ft Modified Files: CHANGES Log Message: drop-down dates for stories Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.453 retrieving revision 1.454 diff -C2 -d -r1.453 -r1.454 *** CHANGES 13 Apr 2002 16:35:21 -0000 1.453 --- CHANGES 15 Apr 2002 13:13:08 -0000 1.454 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-15 8:00AM CDT Joe Stewart <joe...@us...> + [F] - Story.class, Story_base.class - Implemented drop-down date input per + Ajay's request that it be included in 0.65. + 2002-Apr-13 11:30AM CDT Joe Stewart <joe...@us...> [B] - Author.class - missed author_name in saveAuthor. |
|
From: Joe S. <joe...@us...> - 2002-04-15 13:13:11
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv25599/phpslash-ft/public_html/templates/en/default
Modified Files:
storyNew.tpl
Log Message:
drop-down dates for stories
Index: storyNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/storyNew.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** storyNew.tpl 2 Feb 2002 15:26:02 -0000 1.11
--- storyNew.tpl 15 Apr 2002 13:13:08 -0000 1.12
***************
*** 35,40 ****
<TR>
! <TD>Author</TD>
! <TD>
<select name=author_id>
<!-- BEGIN author_row -->
--- 35,40 ----
<TR>
! <TD valign="top">Author</TD>
! <TD valign="top">
<select name=author_id>
<!-- BEGIN author_row -->
***************
*** 43,51 ****
</select>
</TD>
! <TD>Time</TD>
<TD>
! <INPUT type={TYPE} name=time value="{TIME}" size=20>{TIME_VALUE}</TD>
</TD>
- </TR>
</TABLE>
</TD>
--- 43,89 ----
</select>
</TD>
! <TD>Date</TD>
<TD>
! <!-- BEGIN datetime_row -->
! <INPUT type=hidden name=datetime value="{TIME}" size=20>{TIME_VALUE}
! <!-- END datetime_row -->
! <!-- BEGIN datetimeset_row -->
! <select name=story_date[]>
! <!-- BEGIN year_row -->
! <option {SELECTED} value="{STORYYEAR}">{STORYYEAR}</option>
! <!-- END year_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN month_row -->
! <option {SELECTED}>{STORYMONTH}</option>
! <!-- END month_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN day_row -->
! <option {SELECTED}>{STORYDAY}</option>
! <!-- END day_row -->
! </select>
! Time
! <select name=story_time[]>
! <!-- BEGIN hour_row -->
! <option {SELECTED}>{STORYHOUR}</option>
! <!-- END hour_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN minute_row -->
! <option {SELECTED}>{STORYMINUTE}</option>
! <!-- END minute_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN second_row -->
! <option {SELECTED}>{STORYSECOND}</option>
! <!-- END second_row -->
! </select>
! <!-- END datetimeset_row -->
</TD>
</TABLE>
</TD>
|
|
From: Joe S. <joe...@us...> - 2002-04-15 13:13:11
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv25599/phpslash-ft/public_html/templates/en/basic
Modified Files:
storyNew.tpl
Log Message:
drop-down dates for stories
Index: storyNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/storyNew.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** storyNew.tpl 9 Apr 2002 16:57:06 -0000 1.2
--- storyNew.tpl 15 Apr 2002 13:13:08 -0000 1.3
***************
*** 45,49 ****
<td class="descr">Time</td>
<td>
! <input type="text" name="time" value="{TIME}" size="20" />{TIME_VALUE}</TD>
</td>
</tr>
--- 45,88 ----
<td class="descr">Time</td>
<td>
! <!-- BEGIN datetime_row -->
! <INPUT type=hidden name=datetime value="{TIME}" size=20>{TIME_VALUE}
! <!-- END datetime_row -->
! <!-- BEGIN datetimeset_row -->
! <select name=story_date[]>
! <!-- BEGIN year_row -->
! <option {SELECTED} value="{STORYYEAR}">{STORYYEAR}</option>
! <!-- END year_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN month_row -->
! <option {SELECTED}>{STORYMONTH}</option>
! <!-- END month_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN day_row -->
! <option {SELECTED}>{STORYDAY}</option>
! <!-- END day_row -->
! </select>
! Time
! <select name=story_time[]>
! <!-- BEGIN hour_row -->
! <option {SELECTED}>{STORYHOUR}</option>
! <!-- END hour_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN minute_row -->
! <option {SELECTED}>{STORYMINUTE}</option>
! <!-- END minute_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN second_row -->
! <option {SELECTED}>{STORYSECOND}</option>
! <!-- END second_row -->
! </select>
! <!-- END datetimeset_row -->
</td>
</tr>
|
|
From: Joe S. <joe...@us...> - 2002-04-13 16:35:24
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv5467/phpslash-ft Modified Files: CHANGES Log Message: missed author_name in saveAuthor Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.452 retrieving revision 1.453 diff -C2 -d -r1.452 -r1.453 *** CHANGES 12 Apr 2002 15:44:21 -0000 1.452 --- CHANGES 13 Apr 2002 16:35:21 -0000 1.453 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-13 11:30AM CDT Joe Stewart <joe...@us...> + [B] - Author.class - missed author_name in saveAuthor. + 2002-Apr-12 10:30AM CDT Joe Stewart <joe...@us...> [B] - slashAuthCR.class, NavBar.class - login doesn't redirect on success |
|
From: Joe S. <joe...@us...> - 2002-04-13 16:35:24
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv5467/phpslash-ft/class
Modified Files:
Author.class
Log Message:
missed author_name in saveAuthor
Index: Author.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Author.class 11 Apr 2002 21:05:06 -0000 1.17
--- Author.class 13 Apr 2002 16:35:21 -0000 1.18
***************
*** 128,132 ****
/* if a record exists, then we update, else we insert a new author! */
! $this->db->query("SELECT author_id
FROM psl_author
WHERE author_id = '".$ary['author_id']."'");
--- 128,132 ----
/* if a record exists, then we update, else we insert a new author! */
! $this->db->query("SELECT author_id, author_name
FROM psl_author
WHERE author_id = '".$ary['author_id']."'");
|
|
From: Joe S. <joe...@us...> - 2002-04-12 16:08:11
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv25527/phpslash-ft/class
Modified Files:
NavBar.class slashAuthCR.class
Log Message:
login tweak
Index: NavBar.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/NavBar.class,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NavBar.class 6 Feb 2002 18:47:43 -0000 1.9
--- NavBar.class 12 Apr 2002 15:44:21 -0000 1.10
***************
*** 88,92 ****
$this->parse("Logout " . $auth->auth["uname"], "".$this->psl['rooturl']."/login.php3?logout=yes");
} else {
! $this->parse("Login", "".$this->psl['rooturl']."/index.php3?login=yes");
}
}
--- 88,92 ----
$this->parse("Logout " . $auth->auth["uname"], "".$this->psl['rooturl']."/login.php3?logout=yes");
} else {
! $this->parse("Login", "".$this->psl['rooturl']."/login.php3?login=yes");
}
}
Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** slashAuthCR.class 7 Mar 2002 21:45:36 -0000 1.6
--- slashAuthCR.class 12 Apr 2002 15:44:21 -0000 1.7
***************
*** 34,39 ****
$templ->set_var( array(
! 'ACTION_URL' => $_PSL['rooturl'] . "/login.php3",
! 'PHP_SELF' => $_PSL['phpself'],
'ROOTURL' => $_PSL['rooturl'],
'CHALLENGE' => $challenge
--- 34,40 ----
$templ->set_var( array(
! // 'ACTION_URL' => $_PSL['rooturl'] . "/login.php3",
! 'ACTION_URL' => $_PSL['phpself'],
! 'PHP_SELF' => $_PSL['phpself'],
'ROOTURL' => $_PSL['rooturl'],
'CHALLENGE' => $challenge
|
|
From: Joe S. <joe...@us...> - 2002-04-12 16:08:11
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv25527/phpslash-ft Modified Files: CHANGES Log Message: login tweak Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.451 retrieving revision 1.452 diff -C2 -d -r1.451 -r1.452 *** CHANGES 11 Apr 2002 21:05:05 -0000 1.451 --- CHANGES 12 Apr 2002 15:44:21 -0000 1.452 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-12 10:30AM CDT Joe Stewart <joe...@us...> + [B] - slashAuthCR.class, NavBar.class - login doesn't redirect on success + anymore. + 2002-Apr-11 4:00PM CDT Joe Stewart <joe...@us...> [B] - Author.class, authorAdmin.php3 - if username is changed, the password |
|
From: Joe S. <joe...@us...> - 2002-04-11 21:05:18
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv17227/phpslash-ft Modified Files: CHANGES Log Message: saveAuthor check Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.450 retrieving revision 1.451 diff -C2 -d -r1.450 -r1.451 *** CHANGES 10 Apr 2002 03:37:36 -0000 1.450 --- CHANGES 11 Apr 2002 21:05:05 -0000 1.451 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-11 4:00PM CDT Joe Stewart <joe...@us...> + [B] - Author.class, authorAdmin.php3 - if username is changed, the password + needs to be confirmed. Better error message reporting. + [T] - default/authorList.tpl - alternating bars. + 2002-Apr-09 10:30PM CDT Joe Stewart <joe...@us...> [B] - Story_base.class - extractStories recognizes author_id. |
|
From: Joe S. <joe...@us...> - 2002-04-11 21:05:14
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv17227/phpslash-ft/public_html/admin
Modified Files:
authorAdmin.php3
Log Message:
saveAuthor check
Index: authorAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/authorAdmin.php3,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** authorAdmin.php3 1 Feb 2002 04:23:52 -0000 1.4
--- authorAdmin.php3 11 Apr 2002 21:05:06 -0000 1.5
***************
*** 13,16 ****
--- 13,18 ----
*****************************/
+ $auth->login_if(!$perm->have_perm('author'));
+
slashhead($pagetitle,$xsiteobject);
***************
*** 35,39 ****
case "delete":
! $author->deleteAuthor($id, $auth->auth["uid"]);
$author->newAuthor();
$author->listAuthor();
--- 37,46 ----
case "delete":
! $success = $author->deleteAuthor($id, $auth->auth["uid"]);
! if($success) {
! echo message( pslgetText($author->message));
! } else {
! error( pslgetText($author->message));
! }
$author->newAuthor();
$author->listAuthor();
***************
*** 45,49 ****
case "update":
case "new":
! $author->saveAuthor($HTTP_POST_VARS);
default:
$author->newAuthor();
--- 52,61 ----
case "update":
case "new":
! $success = $author->saveAuthor($HTTP_POST_VARS);
! if(isset($success)) {
! echo message( pslgetText($author->message));
! } else {
! error( pslgetText($author->message));
! }
default:
$author->newAuthor();
|
|
From: Joe S. <joe...@us...> - 2002-04-11 21:05:13
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv17227/phpslash-ft/class
Modified Files:
Author.class
Log Message:
saveAuthor check
Index: Author.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Author.class 3 Feb 2002 02:49:39 -0000 1.16
--- Author.class 11 Apr 2002 21:05:06 -0000 1.17
***************
*** 63,66 ****
--- 63,67 ----
$this->author_templ->set_block("listauthor","row","rows");
+ $this->author_templ->set_block("listauthor","row2","rows2");
$count = 0;
***************
*** 82,87 ****
'AMP' => $this->psl['amp']
));
! $this->author_templ->parse("rows","row",true);
! $count++;
};
$this->author_templ->parse('OUT',array("listauthor"));
--- 83,92 ----
'AMP' => $this->psl['amp']
));
! if ($count%2 == 0) {
! $this->author_templ->parse("rows","row","true");
! } else {
! $this->author_templ->parse("rows","row2","true");
! }
! $count++;
};
$this->author_templ->parse('OUT',array("listauthor"));
***************
*** 130,133 ****
--- 135,145 ----
if ($this->db->next_record()) {
if ($ary['password'] == "") {
+
+ // if username changes password value in db has to change also
+ if ($ary[author_name] != $this->db->Record['author_name']) {
+ $this->message = "When changing the username, the password field must also be completed.";
+ return $false;
+ }
+
$q = "UPDATE psl_author
SET author_name = '$ary[author_name]',
***************
*** 149,152 ****
--- 161,167 ----
WHERE author_id = '$ary[author_id]'";
}
+
+ $this->message = "Author Updated";
+
} else {
***************
*** 177,180 ****
--- 192,197 ----
'$ary[seclev]',
'$joined_perms')";
+
+ $this->message = "Author Created";
}
***************
*** 183,187 ****
--- 200,266 ----
return true;
}
+
+ /**
+ * saveProfile - save the perm limited author info to the DB for
+ * users to modify their own info.
+ *
+ * Saves the author in the $ary array to the DB
+ * Obligatory fields: author_name, some others
+ * Optional fields: author_id
+ *
+ * Returns true if sucessful (author updated), false on error
+ * Used only by logged in users.
+ *
+ * @param array $ary
+ *
+ * @access public
+ */
+ function saveProfile($ary) {
+
+ if ($ary['author_name'] == "") {
+ error("There is no author_name in Author.class::saveAuthor");
+ return false;
+ }
+ /* addslashes for the (') AND str_replace for the (") */
+
+ $ary["quote"] = clean($ary["quote"]);
+ $ary['author_name'] = clean($ary["author_name"]);
+ // $ary['author_name'] = clean($ary["author_name"]);
+ $ary['author_realname'] = clean($ary["author_realname"]);
+
+ $this->db->query("SELECT author_id
+ FROM psl_author
+ WHERE author_id = '".$ary['author_id']."'");
+
+ if ($this->db->next_record()) {
+ if ($ary['password'] == "") {
+ $q = "UPDATE psl_author
+ SET author_name = '$ary[author_name]',
+ author_realname = '$ary[author_realname]',
+ url = '$ary[url]',
+ email = '$ary[email]',
+ quote = '$ary[quote]'
+ WHERE author_id = '$ary[author_id]'";
+ } else {
+ $q = "UPDATE psl_author
+ SET author_name = '$ary[author_name]',
+ author_realname = '$ary[author_realname]',
+ url = '$ary[url]',
+ email = '$ary[email]',
+ quote = '$ary[quote]',
+ password = MD5('$ary[author_name]:$ary[password]')
+ WHERE author_id = '$ary[author_id]'";
+ }
+ }
+
+ # echo "<BR><PRE><B>QUERY: $q</B></PRE><BR>\n";
+ $this->db->query($q);
+
+ $this->message = "Profile Updated";
+ return true;
+ }
+
+
/**
* deleteAuthor - deletes the author info to the DB
***************
*** 200,204 ****
if ($author_id_to_delete == $author_id) {
! echo "<BR><BR>You can't delete yourself! Create another user, log in as he/she and then delete this account.<BR><BR>";
return false;
};
--- 279,283 ----
if ($author_id_to_delete == $author_id) {
! $this->message = "You can't delete yourself! Create another user, log in as he/she and then delete this account.";
return false;
};
***************
*** 233,236 ****
--- 312,316 ----
$this->db->query($q);
if ($this->db->affected_rows() > 0) {
+ $this->message = "Author deleted";
return true;
} else {
***************
*** 289,293 ****
* @access public
*/
! function editAuthor($id) {
titlebar("100%","Update Author ($id)");
--- 369,388 ----
* @access public
*/
! function editAuthor($id, $tpl='') {
!
! $default_tpl = "newauthor";
!
! if( empty($tpl) ) {
! $template = $default_tpl;
! } elseif ( file_exists($this->psl['templatedir'] . "/" . basename($tpl) . ".tpl") ) {
! $tpl_file = basename($tpl) . ".tpl";
! $this->author_templ->set_file(array(
! "template" => "$tpl_file"
! ));
! $template = "template";
! } else {
! debug ( "Story.class::getStory:Template file doesn't exist, using default instead", $tpl);
! $template = $default_tpl;
! }
titlebar("100%","Update Author ($id)");
***************
*** 332,336 ****
};
! $this->author_templ->parse('OUT',array("newauthor"));
$this->author_templ->p('OUT');
--- 427,431 ----
};
! $this->author_templ->parse('OUT',$template);
$this->author_templ->p('OUT');
|
|
From: Joe S. <joe...@us...> - 2002-04-11 21:05:13
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv17227/phpslash-ft/public_html/templates/en/default
Modified Files:
authorList.tpl
Log Message:
saveAuthor check
Index: authorList.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/authorList.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** authorList.tpl 11 Sep 2001 16:38:20 -0000 1.6
--- authorList.tpl 11 Apr 2002 21:05:06 -0000 1.7
***************
*** 24,27 ****
--- 24,40 ----
</TR>
<!-- END row -->
+ <!-- BEGIN row2 -->
+
+ <TR bgcolor="#eeeeee">
+ <TD WIDTH=30> </TD>
+ <TD><a href="{ACTION_URL}?submit=edit{AMP}id={AUTHOR_ID}">{NAME}</a></TD>
+ <TD><a href="{ACTION_URL}?submit=edit{AMP}id={AUTHOR_ID}">{REALNAME}</a></TD>
+ <TD>{URL}</TD>
+ <TD>{EMAIL}</TD>
+ <TD>{QUOTE}</TD>
+ <TD><a href="{ACTION_URL}?submit=edit{AMP}id={AUTHOR_ID}">Modify</a>
+ || <a href="{ACTION_URL}?submit=delete{AMP}id={AUTHOR_ID}">Delete</a></TD>
+ </TR>
+ <!-- END row2 -->
</TABLE>
|
|
From: Joe S. <joe...@us...> - 2002-04-10 03:37:39
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv9694/phpslash-ft Modified Files: CHANGES Log Message: extractStories tweak Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.449 retrieving revision 1.450 diff -C2 -d -r1.449 -r1.450 *** CHANGES 10 Apr 2002 03:03:42 -0000 1.449 --- CHANGES 10 Apr 2002 03:37:36 -0000 1.450 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-09 10:30PM CDT Joe Stewart <joe...@us...> + [B] - Story_base.class - extractStories recognizes author_id. + 2002-Apr-09 10:00PM CDT Joe Stewart <joe...@us...> [B] - functions.inc, Comment.class - Changed the name of the function censor |
|
From: Joe S. <joe...@us...> - 2002-04-10 03:37:39
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv9694/phpslash-ft/class
Modified Files:
Story_base.class
Log Message:
extractStories tweak
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Story_base.class 15 Mar 2002 19:16:28 -0000 1.7
--- Story_base.class 10 Apr 2002 03:37:36 -0000 1.8
***************
*** 238,241 ****
--- 238,247 ----
$q .= "AND psl_author.author_name = '$argv_ary[author]' ";
break;
+
+ case "author_id":
+ if( $argv_ary["author"] == "" ) {
+ $q .= " AND psl_author.author_id = '$argv_ary[author_id]' ";
+ }
+ break;
case "date":
|
|
From: Joe S. <joe...@us...> - 2002-04-10 03:03:45
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv2985/phpslash-ft Modified Files: CHANGES Log Message: censor -> psl_censor Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.448 retrieving revision 1.449 diff -C2 -d -r1.448 -r1.449 *** CHANGES 9 Apr 2002 17:08:05 -0000 1.448 --- CHANGES 10 Apr 2002 03:03:42 -0000 1.449 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-09 10:00PM CDT Joe Stewart <joe...@us...> + [B] - functions.inc, Comment.class - Changed the name of the function censor + to psl_censor. + 2002-Apr-09 12:00PM CDT Joe Stewart <joe...@us...> [T] - basic/slashHead.inc - prepended rootdir to css filepath. |
|
From: Joe S. <joe...@us...> - 2002-04-10 03:03:45
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv2985/phpslash-ft/class
Modified Files:
functions.inc Comment.class
Log Message:
censor -> psl_censor
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** functions.inc 13 Mar 2002 22:11:03 -0000 1.98
--- functions.inc 10 Apr 2002 03:03:42 -0000 1.99
***************
*** 742,746 ****
/**
! * function censor - returns a "censored" string
*
* The string is matched against an array of words not accepted.
--- 742,746 ----
/**
! * function psl_censor - returns a "censored" string
*
* The string is matched against an array of words not accepted.
***************
*** 771,775 ****
*/
! function censor( $string, $replacement="", $censorfile="") {
global $_PSL;
--- 771,775 ----
*/
! function psl_censor( $string, $replacement="", $censorfile="") {
global $_PSL;
Index: Comment.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Comment.class 3 Feb 2002 02:49:39 -0000 1.23
--- Comment.class 10 Apr 2002 03:03:43 -0000 1.24
***************
*** 581,588 ****
if ( $this->psl["censorfile"]) {
! $ary['name'] = censor($ary['name']);
! $ary['email'] = censor($ary['email']);
! $ary['subject'] = censor($ary['subject']);
! $ary['comment_text'] = censor($ary['comment_text']);
}
return $ary;
--- 581,588 ----
if ( $this->psl["censorfile"]) {
! $ary['name'] = psl_censor($ary['name']);
! $ary['email'] = psl_censor($ary['email']);
! $ary['subject'] = psl_censor($ary['subject']);
! $ary['comment_text'] = psl_censor($ary['comment_text']);
}
return $ary;
|
2 messages has been excluded from this view by a project administrator.
