phpslash-commit Mailing List for phpSlash (Page 74)
Brought to you by:
joestewart,
nhruby
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-10-29 17:14:02
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv6303/phpslash-ft Modified Files: CHANGES Log Message: more user option tweaks Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.589 retrieving revision 1.590 diff -C2 -d -r1.589 -r1.590 *** CHANGES 29 Oct 2002 15:49:33 -0000 1.589 --- CHANGES 29 Oct 2002 17:13:58 -0000 1.590 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-October-29 10:00AM CST Joe Stewart <joe...@us...> + [W] - Author.class, slashAuthCR.lcass, login.php3 - more tweaks to user options. + 2002-October-29 9:00AM CST Joe Stewart <joe...@us...> [B] - login.php3 - missed small change to logout. |
From: Joe S. <joe...@us...> - 2002-10-29 15:49:36
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv27461/phpslash-ft/public_html Modified Files: login.php3 Log Message: remember user options when logging out Index: login.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** login.php3 24 Oct 2002 19:41:35 -0000 1.24 --- login.php3 29 Oct 2002 15:49:33 -0000 1.25 *************** *** 14,20 **** if (isset($HTTP_GET_VARS['logout'])) { if(isset($HTTP_COOKIE_VARS['user_info'])) { ! setcookie( 'user_info', '', time()-31536000, $_PSL['rooturl'], "", ""); ! $sess->delete(); ! $HTTP_COOKIE_VARS['user_info'] = ''; } $username = $auth->auth['uname']; --- 14,23 ---- if (isset($HTTP_GET_VARS['logout'])) { if(isset($HTTP_COOKIE_VARS['user_info'])) { ! $user_info = $HTTP_COOKIE_VARS['user_info']; ! if(empty($user_info['preferences'])) { ! setcookie( 'user_info', '', time()-31536000, $_PSL['rooturl'], "", ""); ! $sess->delete(); ! $HTTP_COOKIE_VARS['user_info'] = ''; ! } } $username = $auth->auth['uname']; |
From: Joe S. <joe...@us...> - 2002-10-29 15:49:36
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv27461/phpslash-ft Modified Files: CHANGES Log Message: remember user options when logging out Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.588 retrieving revision 1.589 diff -C2 -d -r1.588 -r1.589 *** CHANGES 29 Oct 2002 11:21:36 -0000 1.588 --- CHANGES 29 Oct 2002 15:49:33 -0000 1.589 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-October-29 9:00AM CST Joe Stewart <joe...@us...> + [B] - login.php3 - missed small change to logout. + 2002-October-29 3:20PM PST Ajay Sharma <aja...@us...> [B] - There's a bogus topic called "what's new" and it points to xxx.gif |
From: Ajay S. <aja...@us...> - 2002-10-29 11:21:41
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv9015/phpslash-ft Modified Files: CHANGES Log Message: removed a bogus topic Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.587 retrieving revision 1.588 diff -C2 -d -r1.587 -r1.588 *** CHANGES 29 Oct 2002 11:12:03 -0000 1.587 --- CHANGES 29 Oct 2002 11:21:36 -0000 1.588 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-October-29 3:20PM PST Ajay Sharma <aja...@us...> + [B] - There's a bogus topic called "what's new" and it points to xxx.gif + which doesn't exist, so I removed it from slash-all.sql + 2002-October-29 3:02PM PST Ajay Sharma <aja...@us...> [B] - Fixed the Story_admin.class so that it doesn't try to delete comments |
From: Ajay S. <aja...@us...> - 2002-10-29 11:21:41
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.7 In directory usw-pr-cvs1:/tmp/cvs-serv9015/phpslash-ft/tables/0.7 Modified Files: slash-all.sql Log Message: removed a bogus topic Index: slash-all.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.7/slash-all.sql,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** slash-all.sql 11 Oct 2002 19:31:25 -0000 1.16 --- slash-all.sql 29 Oct 2002 11:21:37 -0000 1.17 *************** *** 1138,1142 **** INSERT INTO psl_topic (topic_id, topic_name, image, alt_text, width, height, onlinkbar) VALUES ( '18', 'PHPSlash', 'topicphpslash.gif', 'The wonderful PHPSlash', '100', '40', '0'); INSERT INTO psl_topic (topic_id, topic_name, image, alt_text, width, height, onlinkbar) VALUES ( '9', 'Amiga', 'topicamiga.gif', 'Amiga', '64', '64', '5'); - INSERT INTO psl_topic (topic_id, topic_name, image, alt_text, width, height, onlinkbar) VALUES ( '34', 'what\'s new', 'xxx.gif', 'what\'s goin\' on', '23', '23', '0'); # -------------------------------------------------------- --- 1138,1141 ---- |
From: Ajay S. <aja...@us...> - 2002-10-29 11:12:06
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv5829/phpslash-ft Modified Files: CHANGES Log Message: Fixed Story_admin so that it checks the Comment Module before deleting Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.586 retrieving revision 1.587 diff -C2 -d -r1.586 -r1.587 *** CHANGES 29 Oct 2002 11:07:16 -0000 1.586 --- CHANGES 29 Oct 2002 11:12:03 -0000 1.587 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-October-29 3:02PM PST Ajay Sharma <aja...@us...> + [B] - Fixed the Story_admin.class so that it doesn't try to delete comments + if the comment module isn't loaded + 2002-October-29 3:00PM PST Ajay Sharma <aja...@us...> [B] - When the Comment module is false, it shouldn't be queried/parsed in |
From: Ajay S. <aja...@us...> - 2002-10-29 11:12:06
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv5829/phpslash-ft/class Modified Files: Story_admin.class Log Message: Fixed Story_admin so that it checks the Comment Module before deleting Index: Story_admin.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_admin.class,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Story_admin.class 11 Oct 2002 19:36:28 -0000 1.5 --- Story_admin.class 29 Oct 2002 11:12:03 -0000 1.6 *************** *** 85,91 **** echo "The storyid is: $story_id<BR>\n"; ! $comment = new Comment; ! $deleted_comments = $comment->delete("0",$story_id); ! echo "You deleted $deleted_comments comments<BR>\n"; $section_del = "DELETE --- 85,93 ---- echo "The storyid is: $story_id<BR>\n"; ! if ($_PSL['module']['Comment']) { ! $comment = new Comment; ! $deleted_comments = $comment->delete("0",$story_id); ! echo "You deleted $deleted_comments comments<BR>\n"; ! } $section_del = "DELETE |
From: Ajay S. <aja...@us...> - 2002-10-29 11:07:20
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv4666/phpslash-ft/public_html Modified Files: article.php3 Log Message: article.php3 checks to see if the Comment module is loaded before quering/parsing the comments Index: article.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** article.php3 20 Sep 2002 16:23:46 -0000 1.68 --- article.php3 29 Oct 2002 11:07:17 -0000 1.69 *************** *** 159,169 **** /* Now the comments */ ! ! $cmtary['mode'] = $ary['mode']; ! $cmtary['order'] = $ary['order']; ! $cmtary['story_id'] = $ary['story_id']; ! $cmtary['parent_id'] = $ary['parent_id']; ! $cmt = new Comment($cmtary); ! $comments = $cmt->getAllComments($cmtary); $t->set_var('COMMENTS', $comments); --- 159,173 ---- /* Now the comments */ ! ! if ($_PSL['module']['Comment']) { ! $cmtary['mode'] = $ary['mode']; ! $cmtary['order'] = $ary['order']; ! $cmtary['story_id'] = $ary['story_id']; ! $cmtary['parent_id'] = $ary['parent_id']; ! $cmt = new Comment($cmtary); ! $comments = $cmt->getAllComments($cmtary); ! } else { ! $comments = ''; ! } $t->set_var('COMMENTS', $comments); |
From: Ajay S. <aja...@us...> - 2002-10-29 11:07:20
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv4666/phpslash-ft Modified Files: CHANGES Log Message: article.php3 checks to see if the Comment module is loaded before quering/parsing the comments Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.585 retrieving revision 1.586 diff -C2 -d -r1.585 -r1.586 *** CHANGES 28 Oct 2002 22:30:19 -0000 1.585 --- CHANGES 29 Oct 2002 11:07:16 -0000 1.586 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-October-29 3:00PM PST Ajay Sharma <aja...@us...> + [B] - When the Comment module is false, it shouldn't be queried/parsed in + article.php3 + 2002-October-28 4:00PM CST Joe Stewart <joe...@us...> [F] - Author.class, slashAuthCR.lcass, login.php3 - ability to remember |
From: Joe S. <joe...@us...> - 2002-10-28 22:30:22
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv13467/phpslash-ft/class Modified Files: Author.class slashAuthCR.class Log Message: remember user options Index: Author.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Author.class 28 Oct 2002 21:41:14 -0000 1.30 --- Author.class 28 Oct 2002 22:30:19 -0000 1.31 *************** *** 285,289 **** function saveProfile($ary) { ! global $auth; if ($ary['author_name'] == "") { --- 285,289 ---- function saveProfile($ary) { ! global $auth, $HTTP_COOKIE_VARS; if ($ary['author_name'] == "") { *************** *** 317,321 **** } ! $serial_opts=addslashes(serialize($author_options_ary)); --- 317,332 ---- } ! if(!empty($ary['loggedoutprefs'])) { ! debug("yes", $ary['loggedoutprefs']); ! $preferences['skin'] = $ary['skin']; ! $cookie_ary['preferences'] = $preferences; ! setcookie( 'user_info', base64_encode(serialize($cookie_ary)), time()+31536000,$this->psl['rooturl'] , "" , ""); ! ! } elseif(!empty($HTTP_COOKIE_VARS['user_info']['preferences'])) { ! setcookie( 'user_info', '', time()-31536000, $this->psl['rooturl'], "", ""); ! $HTTP_COOKIE_VARS['user_info'] = ''; ! ! } ! $serial_opts=addslashes(serialize($author_options_ary)); Index: slashAuthCR.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** slashAuthCR.class 28 Oct 2002 21:41:14 -0000 1.28 --- slashAuthCR.class 28 Oct 2002 22:30:19 -0000 1.29 *************** *** 124,127 **** --- 124,130 ---- if ($this->db->num_rows() == 0) { + if(!empty($cookie_ary['preferences'])) { + $this->auth['preferences'] = $cookie_ary['preferences']; + } return false; } *************** *** 140,144 **** $this->auth["perm"] = $this->get_userperms($uid); return $uid; ! } else { // preauth failed // debug("preauth", "failed"); --- 143,147 ---- $this->auth["perm"] = $this->get_userperms($uid); return $uid; ! } else { // preauth failed // debug("preauth", "failed"); |
From: Joe S. <joe...@us...> - 2002-10-28 22:30:22
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv13467/phpslash-ft Modified Files: CHANGES Log Message: remember user options Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.584 retrieving revision 1.585 diff -C2 -d -r1.584 -r1.585 *** CHANGES 28 Oct 2002 21:41:14 -0000 1.584 --- CHANGES 28 Oct 2002 22:30:19 -0000 1.585 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-October-28 4:00PM CST Joe Stewart <joe...@us...> + [F] - Author.class, slashAuthCR.lcass, login.php3 - ability to remember + user options if logged out also. + 2002-October-28 3:00PM CST Joe Stewart <joe...@us...> [FT] - Author.class, slashAuthCR.class, functions.inc, authorProfile.tpl, |
From: Joe S. <joe...@us...> - 2002-10-28 21:41:18
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic In directory usw-pr-cvs1:/tmp/cvs-serv22931/phpslash-ft/public_html/templates/en/basic Modified Files: authorProfile.tpl authorNew.tpl Log Message: user option - skin setting Index: authorProfile.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/authorProfile.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** authorProfile.tpl 24 Jun 2002 19:58:50 -0000 1.4 --- authorProfile.tpl 28 Oct 2002 21:41:14 -0000 1.5 *************** *** 1,37 **** ! <!-- start authorProfile.tpl --> {TITLEBAR} ! <div id="authorProfile"> ! <form action="{ACTION_URL}" method="post"> ! <table border="0"> ! <tr> ! <td> </td> ! <td> </td> ! </tr> ! <tr> ! <td class="descr">Name <span class="must">*</span></td> ! <td><input type="text" name="author_name" value="{NAME}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">Real Name</td> ! <td><input type="text" name="author_realname" value="{REALNAME}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">URL</td> ! <td><input type="text" name="url" value="{URL}" size="15" /></td> ! </tr> ! <tr> ! <td class="descr">Email</td> ! <td><input type="text" name="email" value="{EMAIL}" size="15" /></td> ! </tr> ! <tr> ! <td class="descr">Quote</td> ! <td><input type="text" name="quote" value="{QUOTE}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">Password <span class="must">*</span></td> ! <td><input type="password" name="password" value="{PASSWORD}" size="10" /></td> ! </tr> <!-- BEGIN each_default_option --> ! <tr> <td class="descr"><input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" size="15" />{DOPTION_NAME_VAL}</td> <td class="descr"><input type="text" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" size="20" /></td> --- 1,37 ---- ! <!-- start authorProfile.tpl --> {TITLEBAR} ! <div id="authorProfile"> ! <form action="{ACTION_URL}" method="post"> ! <table border="0"> ! <tr> ! <td> </td> ! <td> </td> ! </tr> ! <tr> ! <td class="descr">Name <span class="must">*</span></td> ! <td><input type="text" name="author_name" value="{NAME}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">Real Name</td> ! <td><input type="text" name="author_realname" value="{REALNAME}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">URL</td> ! <td><input type="text" name="url" value="{URL}" size="15" /></td> ! </tr> ! <tr> ! <td class="descr">Email</td> ! <td><input type="text" name="email" value="{EMAIL}" size="15" /></td> ! </tr> ! <tr> ! <td class="descr">Quote</td> ! <td><input type="text" name="quote" value="{QUOTE}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">Password <span class="must">*</span></td> ! <td><input type="password" name="password" value="{PASSWORD}" size="10" /></td> ! </tr> <!-- BEGIN each_default_option --> ! <tr> <td class="descr"><input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" size="15" />{DOPTION_NAME_VAL}</td> <td class="descr"><input type="text" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" size="20" /></td> *************** *** 39,48 **** <!-- BEGIN each_option --> <!-- END each_option --> ! <tr> ! </table> ! <input type="hidden" name="author_id" value="{AUTHOR_ID}" /> ! <input type="submit" name="submit" value="update" /> ! </form> ! <hr /> ! </div> <!-- id="authorProfile" --> ! <!-- end authorProfile.tpl --> --- 39,76 ---- <!-- BEGIN each_option --> <!-- END each_option --> ! </tr> ! <tr> ! <td colspan="2"> ! <hr> ! </td> ! </tr> ! <tr> ! <td></td> ! <td class="descr">- Preferences -</td> ! </tr> ! <tr> ! <td class="descr">Skin</td> ! <td> ! <select name="skin"> ! <!-- BEGIN each_skin --> ! <option value="{SKIN}" {SKIN_SELECTED}>{SKIN}</option> ! <!-- END each_skin --> ! </select> ! </td> ! </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> ! </td> ! </tr> ! </table> ! <input type="hidden" name="author_id" value="{AUTHOR_ID}" /> ! <input type="submit" name="submit" value="update" /> ! </form> ! <hr /> ! </div> <!-- id="authorProfile" --> ! <!-- end authorProfile.tpl --> Index: authorNew.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/authorNew.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** authorNew.tpl 13 Jun 2002 20:07:27 -0000 1.6 --- authorNew.tpl 28 Oct 2002 21:41:14 -0000 1.7 *************** *** 1,37 **** ! <!-- start authorNew.tpl --> ! <div id="authorNew"> {TITLEBAR} ! <form action="{ACTION_URL}" method="post"> ! <table border="0"> ! <tr> ! <td> </td> ! <td> </td> ! </tr> ! <tr> ! <td class="descr">Name <span class="must">*</span></td> ! <td><input type="text" name="author_name" value="{NAME}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">Real Name</td> ! <td><input type="text" name="author_realname" value="{REALNAME}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">URL</td> ! <td><input type="text" name="url" value="{URL}" size="15" /></td> ! </tr> ! <tr> ! <td class="descr">Email</td> ! <td><input type="text" name="email" value="{EMAIL}" size="15" /></td> ! </tr> ! <tr> ! <td class="descr">Quote</td> ! <td><input type="text" name="quote" value="{QUOTE}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">Password <span class="must">*</span></td> ! <td><input type="password" name="password" value="{PASSWORD}" size="10" /></td> ! </tr> <!-- BEGIN each_default_option --> ! <tr> <td class="descr"><input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" size="15" />{DOPTION_NAME_VAL}</td> <td class="text"><input type="text" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" size="20" /></td> --- 1,37 ---- ! <!-- start authorNew.tpl --> ! <div id="authorNew"> {TITLEBAR} ! <form action="{ACTION_URL}" method="post"> ! <table border="0"> ! <tr> ! <td> </td> ! <td> </td> ! </tr> ! <tr> ! <td class="descr">Name <span class="must">*</span></td> ! <td><input type="text" name="author_name" value="{NAME}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">Real Name</td> ! <td><input type="text" name="author_realname" value="{REALNAME}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">URL</td> ! <td><input type="text" name="url" value="{URL}" size="15" /></td> ! </tr> ! <tr> ! <td class="descr">Email</td> ! <td><input type="text" name="email" value="{EMAIL}" size="15" /></td> ! </tr> ! <tr> ! <td class="descr">Quote</td> ! <td><input type="text" name="quote" value="{QUOTE}" size="20" /></td> ! </tr> ! <tr> ! <td class="descr">Password <span class="must">*</span></td> ! <td><input type="password" name="password" value="{PASSWORD}" size="10" /></td> ! </tr> <!-- BEGIN each_default_option --> ! <tr> <td class="descr"><input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" size="15" />{DOPTION_NAME_VAL}</td> <td class="text"><input type="text" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" size="20" /></td> *************** *** 39,62 **** <!-- END each_default_option --> <!-- BEGIN each_option --> ! <tr> <td class="descr"><input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="15" /></td> <td class="descr"><input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" /></td> <!-- END each_option --> ! <tr> ! <td class="descr">Security <span class="must">*</span></td> ! <td> ! <!-- BEGIN perm_row --> ! <input name="permission[{PERM}]" value="{PERM_VALUE}" type="checkbox" />{PERM}{GROUP}<br /> ! <!-- END perm_row --> ! <!-- BEGIN permhave_row --> ! <input name="permission[{PERM}]" value="{PERM_VALUE}" type="checkbox" checked="checked" />{PERM}{GROUP}<br /> ! <!-- END permhave_row --> ! </td> ! </tr> ! </table> ! <input type="hidden" name="author_id" value="{AUTHOR_ID}" /> ! <input type="submit" name="submit" value="update" /> ! </form> ! <hr /> ! </div> <!-- id="authorNew" --> ! <!-- end authorNew.tpl --> --- 39,91 ---- <!-- END each_default_option --> <!-- BEGIN each_option --> ! <tr> <td class="descr"><input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="15" /></td> <td class="descr"><input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" /></td> + </tr> <!-- END each_option --> ! <tr> ! <td class="descr">Security <span class="must">*</span></td> ! <td> ! <!-- BEGIN perm_row --> ! <input name="permission[{PERM}]" value="{PERM_VALUE}" type="checkbox" />{PERM}{GROUP}<br /> ! <!-- END perm_row --> ! <!-- BEGIN permhave_row --> ! <input name="permission[{PERM}]" value="{PERM_VALUE}" type="checkbox" checked="checked" />{PERM}{GROUP}<br /> ! <!-- END permhave_row --> ! </td> ! </tr> ! <tr> ! <td colspan="2"> ! <hr> ! </td> ! </tr> ! <tr> ! <td></td> ! <td class="descr">- Preferences -</td> ! </tr> ! <tr> ! <td class="descr">Skin</td> ! <td> ! <select name="skin"> ! <!-- BEGIN each_skin --> ! <option value="{SKIN}" {SKIN_SELECTED}>{SKIN}</option> ! <!-- END each_skin --> ! </select> ! </td> ! </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> ! </td> ! </tr> ! </table> ! <input type="hidden" name="author_id" value="{AUTHOR_ID}" /> ! <input type="submit" name="submit" value="update" /> ! </form> ! <hr /> ! </div> <!-- id="authorNew" --> ! <!-- end authorNew.tpl --> |
From: Joe S. <joe...@us...> - 2002-10-28 21:41:17
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory usw-pr-cvs1:/tmp/cvs-serv22931/phpslash-ft/public_html/templates/en/default Modified Files: authorProfile.tpl authorNew.tpl Log Message: user option - skin setting Index: authorProfile.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/authorProfile.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** authorProfile.tpl 24 Jun 2002 19:58:50 -0000 1.4 --- authorProfile.tpl 28 Oct 2002 21:41:14 -0000 1.5 *************** *** 41,44 **** --- 41,68 ---- <!-- BEGIN each_option --> <!-- END each_option --> + </TR> + <TR> + <TD colspan="2"> + <hr> + </TD> + </TR> + <TR> + <TD></TD> + <TD><b>- Preferences -</b></TD> + </TR> + <TR> + <TD><b>Skin</br></TD> + <TD> + <SELECT name="skin"> + <!-- BEGIN each_skin --> + <OPTION value="{SKIN}" {SKIN_SELECTED}>{SKIN}</OPTION> + <!-- END each_skin --> + </SELECT> + </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}"> Index: authorNew.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/authorNew.tpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** authorNew.tpl 3 Jun 2002 18:04:55 -0000 1.11 --- authorNew.tpl 28 Oct 2002 21:41:14 -0000 1.12 *************** *** 58,62 **** <input name="permission[{PERM}]" value="{PERM_VALUE}" type=checkbox checked="checked">{PERM}{GROUP}<br /> <!-- END permhave_row --> ! </TD </TR> </TABLE> --- 58,85 ---- <input name="permission[{PERM}]" value="{PERM_VALUE}" type=checkbox checked="checked">{PERM}{GROUP}<br /> <!-- END permhave_row --> ! </TD> ! </TR> ! <TR> ! <TD colspan="2"> ! <hr> ! </TD> ! </TR> ! <TR> ! <TD></TD> ! <TD><b>- Preferences -</b></TD> ! </TR> ! <TR> ! <TD><b>Skin</br></TD> ! <TD> ! <SELECT name="skin"> ! <!-- BEGIN each_skin --> ! <OPTION value="{SKIN}" {SKIN_SELECTED}>{SKIN}</OPTION> ! <!-- END each_skin --> ! </SELECT> ! </TD> ! </TR> ! <TR> ! <TD><INPUT type=checkbox name=loggedoutprefs></TD> ! <TD>Use these settings when logged out as well.</TD> </TR> </TABLE> |
From: Joe S. <joe...@us...> - 2002-10-28 21:41:17
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv22931/phpslash-ft/class Modified Files: Author.class functions.inc slashAuthCR.class Log Message: user option - skin setting Index: Author.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Author.class 23 Sep 2002 21:31:36 -0000 1.29 --- Author.class 28 Oct 2002 21:41:14 -0000 1.30 *************** *** 49,53 **** $this->author_templ->set_var( array( ! 'ROOTDIR' => $this->psl['rootur'], 'IMAGEDIR' => $this->psl['imageurl'] )); --- 49,53 ---- $this->author_templ->set_var( array( ! 'ROOTDIR' => $this->psl['rooturl'], 'IMAGEDIR' => $this->psl['imageurl'] )); *************** *** 158,161 **** --- 158,166 ---- } + if(!empty($ary['skin'])) { + $author_options_ary['preferences']['skin'] = $ary['skin']; + $author_options_ary['_PSL']['skin'] = $ary['skin']; + } + $serial_opts=addslashes(serialize($author_options_ary)); *************** *** 280,283 **** --- 285,290 ---- function saveProfile($ary) { + global $auth; + if ($ary['author_name'] == "") { error("There is no author_name in Author.class::saveAuthor"); *************** *** 299,307 **** $optname = $optionname_ary[$i]; $optval = $optionval_ary[$i]; ! $section_options_ary[$optname] = $optval; } } ! $serial_opts=addslashes(serialize($section_options_ary)); $this->db->query("SELECT author_id --- 306,322 ---- $optname = $optionname_ary[$i]; $optval = $optionval_ary[$i]; ! $author_options_ary[$optname] = $optval; } } ! ! if(!empty($ary['skin'])) { ! $author_options_ary['preferences']['skin'] = $ary['skin']; ! $author_options_ary['_PSL']['skin'] = $ary['skin']; ! $auth->auth['preferences']['skin'] = $ary['skin']; ! } ! ! ! $serial_opts=addslashes(serialize($author_options_ary)); $this->db->query("SELECT author_id *************** *** 419,430 **** while(list($k, $v) = each($allperms_ary)) { if(is_array($v)) { ! $this->author_templ->set_var( PERM_VALUE, $v); ! $this->author_templ->set_var( GROUP, "*"); ! } else { ! $this->author_templ->set_var( PERM_VALUE, $v); ! $this->author_templ->set_var( GROUP, ""); } ! $this->author_templ->set_var( PERM, $k); ! $this->author_templ->parse("perm_rows","perm_row",true); } --- 434,445 ---- while(list($k, $v) = each($allperms_ary)) { if(is_array($v)) { ! $this->author_templ->set_var( 'PERM_VALUE', $v); ! $this->author_templ->set_var( 'GROUP', "*"); ! } else { ! $this->author_templ->set_var( 'PERM_VALUE', $v); ! $this->author_templ->set_var( 'GROUP', ""); } ! $this->author_templ->set_var( 'PERM', $k); ! $this->author_templ->parse("perm_rows","perm_row",true); } *************** *** 434,438 **** 'AUTHOR_ID' => "", 'NAME' => "", ! 'REALNAME' => $this->author_id, 'EMAIL' => "", 'URL' => "", --- 449,453 ---- 'AUTHOR_ID' => "", 'NAME' => "", ! 'REALNAME' => "", 'EMAIL' => "", 'URL' => "", *************** *** 441,444 **** --- 456,492 ---- 'SECLEV' => "" )); + + $currentskin = $this->psl['defaultskin']; + if (!empty($temparray['preferences'])) { + $preferences = $temparray['preferences']; + if(array_key_exists('skin', $preferences)) { + $currentskin = $preferences['skin']; + } + unset($temparray['preferences']); + } + + // remove "skin" from templatedir + $templatedir = substr( $this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") ); + + $this->author_templ->set_block ("newauthor", "each_skin", "skins"); + $fulldirlist = dir($templatedir . "/"); + while( $eachfile = $fulldirlist->read()) { + $this->author_templ->set_var('SKIN_SELECTED', ''); + + if( (@is_dir($templatedir . "/" . $eachfile)) AND + ( $eachfile != ".") AND + ( $eachfile != "..") AND + ( $eachfile != "CVS") ) { + + $this->author_templ->set_var(array( + 'SKIN' => $eachfile + )); + + if("$eachfile" == "$currentskin") { + $this->author_templ->set_var('SKIN_SELECTED', 'selected=SELECTED'); + } + $this->author_templ->parse("skins","each_skin", true); + } + } $this->author_templ = displayoptions('author', $this->author_templ, "newauthor", ''); *************** *** 462,465 **** --- 510,514 ---- $default_tpl = "newauthor"; + $count = ''; if( empty($tpl) ) { *************** *** 533,543 **** while(list($k, $v) = each($allperms_ary)) { if(is_array($v)) { ! $this->author_templ->set_var( PERM_VALUE, $v); ! $this->author_templ->set_var( GROUP, "*"); } else { ! $this->author_templ->set_var( PERM_VALUE, $v); ! $this->author_templ->set_var( GROUP, ""); } ! $this->author_templ->set_var( PERM, $k); if ($this->perm->perm_islisted($author_perms,$k)) { $this->author_templ->parse("perm_rows","permhave_row",true); --- 582,592 ---- while(list($k, $v) = each($allperms_ary)) { if(is_array($v)) { ! $this->author_templ->set_var( 'PERM_VALUE', $v); ! $this->author_templ->set_var( 'GROUP', "*"); } else { ! $this->author_templ->set_var( 'PERM_VALUE', $v); ! $this->author_templ->set_var( 'GROUP', ""); } ! $this->author_templ->set_var( 'PERM', $k); if ($this->perm->perm_islisted($author_perms,$k)) { $this->author_templ->parse("perm_rows","permhave_row",true); *************** *** 552,555 **** --- 601,637 ---- } + $currentskin = $this->psl['defaultskin']; + if (!empty($temparray['preferences'])) { + $preferences = $temparray['preferences']; + if(array_key_exists('skin', $preferences)) { + $currentskin = $preferences['skin']; + } + unset($temparray['preferences']); + unset($temparray['_PSL']); + } + + // remove "skin" from templatedir + $templatedir = substr( $this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") ); + + $this->author_templ->set_block ($template, "each_skin", "skins"); + $fulldirlist = dir($templatedir . "/"); + while( $eachfile = $fulldirlist->read()) { + $this->author_templ->set_var('SKIN_SELECTED', ''); + + if( (@is_dir($templatedir . "/" . $eachfile)) AND + ( $eachfile != ".") AND + ( $eachfile != "..") AND + ( $eachfile != "CVS") ) { + + $this->author_templ->set_var(array( + 'SKIN' => $eachfile + )); + + if("$eachfile" == "$currentskin") { + $this->author_templ->set_var('SKIN_SELECTED', 'selected=SELECTED'); + } + $this->author_templ->parse("skins","each_skin", true); + } + } $this->author_templ = displayoptions('author', $this->author_templ, $template, $temparray); Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** functions.inc 24 Oct 2002 20:56:47 -0000 1.111 --- functions.inc 28 Oct 2002 21:41:14 -0000 1.112 *************** *** 1135,1139 **** } if($new_skin) { ! // check if skin templatedir exists if(@is_dir($templatedir . "/" . basename($new_skin))) { --- 1135,1141 ---- } if($new_skin) { ! ! // remove skin name from templatedir path ! $templatedir = substr($templatedir, 0, strrpos($templatedir, "/") ); // check if skin templatedir exists if(@is_dir($templatedir . "/" . basename($new_skin))) { *************** *** 1449,1453 **** 'DOPTION_VALUE_VAL' => $dvalue )); ! unset($options_ary[$dname]); } else { $tpl_object->set_var(array( --- 1451,1455 ---- 'DOPTION_VALUE_VAL' => $dvalue )); ! unset($options_ary[$dname]); } else { $tpl_object->set_var(array( *************** *** 1465,1469 **** reset($options_ary); } ! $optioncnt = $_PSL[$optioncount]; $i = 1; --- 1467,1473 ---- reset($options_ary); } ! if(array_key_exists($optioncount, $_PSL)) { ! $optioncnt = $_PSL[$optioncount]; ! } $i = 1; Index: slashAuthCR.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** slashAuthCR.class 24 Oct 2002 20:56:47 -0000 1.27 --- slashAuthCR.class 28 Oct 2002 21:41:14 -0000 1.28 *************** *** 48,51 **** --- 48,55 ---- } + if(!empty($this->auth['preferences'])) { + $_PSL['templatedir'] = setSkinTpl($this->auth['preferences']['skin']); + } + Auth::start(); } *************** *** 170,174 **** $setcookie = ''; ! $lostpw = ''; // TODO: Change there so they aren't undefined indexes :) --- 174,178 ---- $setcookie = ''; ! $lostpw = ''; // TODO: Change there so they aren't undefined indexes :) *************** *** 261,264 **** --- 265,274 ---- setcookie( 'user_info', base64_encode(serialize($cookie_ary)), time()+31536000,$this->psl['rooturl'] , "" , ""); } + + $temparray=unserialize($this->db->Record['author_options']); + if(!empty($temparray['preferences'])){ + $this->auth['preferences'] = $temparray['preferences']; + } + // may also need to get legacy records $this->auth["perm"] = $this->get_userperms( $uid); *************** *** 468,472 **** while ($db2->next_record()) { $section_perm = "section_id". $db2->Record['section_id']; ! debug("section_perm", $section_perm); $this->auth["perm"][$this->db->Record['group_name']][$section_perm] = true; } --- 478,482 ---- while ($db2->next_record()) { $section_perm = "section_id". $db2->Record['section_id']; ! // debug("section_perm", $section_perm); $this->auth["perm"][$this->db->Record['group_name']][$section_perm] = true; } *************** *** 504,508 **** $childgroup_name = $groups_ary[$childgroup_id]; ! if( !empty($this->auth['perm'][$childgroup_name])) { $this->auth['perm'][$group_name][$childgroup_name] = $this->auth['perm'][$childgroup_name]; } else { --- 514,518 ---- $childgroup_name = $groups_ary[$childgroup_id]; ! if( isset($this->auth['perm'][$childgroup_name])) { $this->auth['perm'][$group_name][$childgroup_name] = $this->auth['perm'][$childgroup_name]; } else { |
From: Joe S. <joe...@us...> - 2002-10-28 21:41:17
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv22931/phpslash-ft Modified Files: CHANGES Log Message: user option - skin setting Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.583 retrieving revision 1.584 diff -C2 -d -r1.583 -r1.584 *** CHANGES 28 Oct 2002 16:13:52 -0000 1.583 --- CHANGES 28 Oct 2002 21:41:14 -0000 1.584 *************** *** 13,17 **** 9 - Removal of something (kill -9 :) ! 2002-October-28 100:00AM CST Joe Stewart <joe...@us...> [FT] - Peter C's [ 629466 ] Mainpage:Change PSL home from index.php3. config-dist.ini.php3, config-dist.php3, config.php3, breadcrumb.tpl, --- 13,21 ---- 9 - Removal of something (kill -9 :) ! 2002-October-28 3:00PM CST Joe Stewart <joe...@us...> ! [FT] - Author.class, slashAuthCR.class, functions.inc, authorProfile.tpl, ! authorNew.tpl - allow setting skin user option w/o another cookie. ! ! 2002-October-28 10:00AM CST Joe Stewart <joe...@us...> [FT] - Peter C's [ 629466 ] Mainpage:Change PSL home from index.php3. config-dist.ini.php3, config-dist.php3, config.php3, breadcrumb.tpl, |
From: Joe S. <joe...@us...> - 2002-10-28 16:14:49
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory usw-pr-cvs1:/tmp/cvs-serv8833/default Modified Files: breadcrumb.tpl sectionsblock.tpl topicsblock.tpl Log Message: Peter C - [ 629466 ] Mainpage:Change PSL home from index.php3 Index: breadcrumb.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/breadcrumb.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** breadcrumb.tpl 11 Feb 2002 18:24:56 -0000 1.2 --- breadcrumb.tpl 28 Oct 2002 16:14:45 -0000 1.3 *************** *** 1,7 **** ! <br> ! <font size=1 face="arial, helvetica"> ! <!-- BEGIN each_crumb --> ! {DELIMETER}<a href="{ROOTURL}/index.php3{LINK}">{NAME}</a> ! <!-- END each_crumb --> ! </font> ! --- 1,6 ---- ! <br> ! <font size=1 face="arial, helvetica"> ! <!-- BEGIN each_crumb --> ! {DELIMETER}<a href="{ROOTURL}/{MAINPAGE}{LINK}">{NAME}</a> ! <!-- END each_crumb --> ! </font> Index: sectionsblock.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/sectionsblock.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sectionsblock.tpl 20 Nov 2000 18:35:01 -0000 1.2 --- sectionsblock.tpl 28 Oct 2002 16:14:45 -0000 1.3 *************** *** 1,8 **** ! <!-- sectionsblock.tpl begin--> ! <ul> ! <!-- BEGIN each_section --> ! <li><a href="{ROOTDIR}/index.php3{SECTION_LINK}">{SECTION_NAME}</a><br> ! <!-- END each_section --> ! </ul> ! <!-- sectionsblock.tpl end--> ! --- 1,8 ---- ! <!-- sectionsblock.tpl begin--> ! <ul> ! <!-- BEGIN each_section --> ! <li><a href="{ROOTDIR}/{MAINPAGE}{SECTION_LINK}">{SECTION_NAME}</a><br> ! <!-- END each_section --> ! </ul> ! <!-- sectionsblock.tpl end--> ! Index: topicsblock.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/topicsblock.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** topicsblock.tpl 10 Jun 2001 15:09:38 -0000 1.2 --- topicsblock.tpl 28 Oct 2002 16:14:45 -0000 1.3 *************** *** 1,8 **** ! <!-- topicsblock.tpl begin--> ! <ul> ! <!-- BEGIN each_topic --> ! <li><a href="{ROOTDIR}/index.php3?topic_id={TOPIC_ID}">{TOPIC_NAME}</a><br> ! <!-- END each_topic --> ! </ul> ! <!-- topicsblock.tpl end--> ! --- 1,8 ---- ! <!-- topicsblock.tpl begin--> ! <ul> ! <!-- BEGIN each_topic --> ! <li><a href="{ROOTDIR}/{MAINPAGE}?topic_id={TOPIC_ID}">{TOPIC_NAME}</a><br> ! <!-- END each_topic --> ! </ul> ! <!-- topicsblock.tpl end--> ! |
From: Joe S. <joe...@us...> - 2002-10-28 16:14:48
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic In directory usw-pr-cvs1:/tmp/cvs-serv8833/basic Modified Files: breadcrumb.tpl sectionsblock.tpl topicsblock.tpl Log Message: Peter C - [ 629466 ] Mainpage:Change PSL home from index.php3 Index: breadcrumb.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/breadcrumb.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** breadcrumb.tpl 9 Apr 2002 16:57:06 -0000 1.2 --- breadcrumb.tpl 28 Oct 2002 16:14:45 -0000 1.3 *************** *** 1,8 **** ! <!-- START breadcrumb.tpl --> ! <p class="breadcrumb"> ! ! <!-- BEGIN each_crumb --> ! {DELIMETER}<a href="{ROOTURL}/index.php3{LINK}">{NAME}</a> ! <!-- END each_crumb --> ! </p> <!-- END breadcrumb.tpl --> --- 1,8 ---- ! <!-- START breadcrumb.tpl --> ! <p class="breadcrumb"> ! ! <!-- BEGIN each_crumb --> ! {DELIMETER}<a href="{ROOTURL}/{MAINPAGE}{LINK}">{NAME}</a> ! <!-- END each_crumb --> ! </p> <!-- END breadcrumb.tpl --> Index: sectionsblock.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/sectionsblock.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sectionsblock.tpl 9 Apr 2002 16:57:06 -0000 1.2 --- sectionsblock.tpl 28 Oct 2002 16:14:45 -0000 1.3 *************** *** 1,8 **** ! <!-- start sectionsblock.tpl --> ! <ul class="sectionsblock"> ! <!-- BEGIN each_section --> ! <li><a href="{ROOTDIR}/index.php3{SECTION_LINK}">{SECTION_NAME}</a></li> ! <!-- END each_section --> ! </ul> ! <!-- end sectionsblock.tpl --> ! --- 1,8 ---- ! <!-- start sectionsblock.tpl --> ! <ul class="sectionsblock"> ! <!-- BEGIN each_section --> ! <li><a href="{ROOTDIR}/{MAINPAGE}{SECTION_LINK}">{SECTION_NAME}</a></li> ! <!-- END each_section --> ! </ul> ! <!-- end sectionsblock.tpl --> ! Index: topicsblock.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/topicsblock.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** topicsblock.tpl 9 Apr 2002 16:57:06 -0000 1.2 --- topicsblock.tpl 28 Oct 2002 16:14:45 -0000 1.3 *************** *** 1,8 **** ! <!-- start topicsblock.tpl --> ! <ul class="topicsblock"> ! <!-- BEGIN each_topic --> ! <li><a href="{ROOTDIR}/index.php3?topic_id={TOPIC_ID}">{TOPIC_NAME}</a></li> ! <!-- END each_topic --> ! </ul> ! <!-- topicsblock.tpl end--> ! --- 1,8 ---- ! <!-- start topicsblock.tpl --> ! <ul class="topicsblock"> ! <!-- BEGIN each_topic --> ! <li><a href="{ROOTDIR}/{MAINPAGE}?topic_id={TOPIC_ID}">{TOPIC_NAME}</a></li> ! <!-- END each_topic --> ! </ul> ! <!-- topicsblock.tpl end--> ! |
From: Joe S. <joe...@us...> - 2002-10-28 16:13:58
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv8305/phpslash-ft/public_html Modified Files: config-dist.ini.php3 config-dist.php3 config.php3 Log Message: Peter C - [ 629466 ] Mainpage:Change PSL home from index.php3 Index: config-dist.ini.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.ini.php3,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config-dist.ini.php3 23 Oct 2002 17:42:19 -0000 1.7 --- config-dist.ini.php3 28 Oct 2002 16:13:54 -0000 1.8 *************** *** 147,150 **** --- 147,151 ---- home_section_id = 3 site_homesection = "Home" + mainpage = "index.php3" ; Seconds to cache the formatted output in a serialized variable Index: config-dist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** config-dist.php3 24 Oct 2002 20:56:48 -0000 1.8 --- config-dist.php3 28 Oct 2002 16:13:54 -0000 1.9 *************** *** 180,184 **** $menuitem[] = array( 'name' => "Home", ! 'link' => $_PSL['rooturl'] . "/", 'perm' => "nobody", 'module' => "" --- 180,184 ---- $menuitem[] = array( 'name' => "Home", ! 'link' => $_PSL['rooturl'] . "/" . $_PSL['mainpage'], 'perm' => "nobody", 'module' => "" Index: config.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v retrieving revision 1.155 retrieving revision 1.156 diff -C2 -d -r1.155 -r1.156 *** config.php3 23 Oct 2002 17:42:20 -0000 1.155 --- config.php3 28 Oct 2002 16:13:55 -0000 1.156 *************** *** 190,193 **** --- 190,196 ---- $_PSL['site_homesection'] = "Home"; + /* the name of the default (home) page when you pull up the site */ + $_PSL['mainpage'] = 'index.php3'; + /* when you turn these on you'll probably get a full table scan! */ $_PSL['article_nextprevlinks'] = true; *************** *** 336,340 **** $menuitem[] = array( 'name' => "Home", ! 'link' => $_PSL['rooturl'] . "/", 'perm' => "nobody", 'module' => "" --- 339,343 ---- $menuitem[] = array( 'name' => "Home", ! 'link' => $_PSL['rooturl'] . "/" . $_PSL['mainpage'], 'perm' => "nobody", 'module' => "" |
From: Joe S. <joe...@us...> - 2002-10-28 16:13:57
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html In directory usw-pr-cvs1:/tmp/cvs-serv8305/phpslash-ft/doc/html Modified Files: phpslash.sgml Log Message: Peter C - [ 629466 ] Mainpage:Change PSL home from index.php3 Index: phpslash.sgml =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** phpslash.sgml 24 Oct 2002 18:12:11 -0000 1.54 --- phpslash.sgml 28 Oct 2002 16:13:53 -0000 1.55 *************** *** 775,778 **** --- 775,779 ---- blockEdit.tpl blockList.tpl + breadcrumb.tpl commentSubmitForm.tpl emailNotifyComment.tpl *************** *** 797,800 **** --- 798,802 ---- permissionList.tpl permissionNew.tpl + sectionsblock.tpl sectionsList.tpl sectionsNew.tpl *************** *** 804,807 **** --- 806,810 ---- storyNew.tpl submissionForm.tpl + topicsblock.tpl topicList.tpl topicNew.tpl |
From: Joe S. <joe...@us...> - 2002-10-28 16:13:56
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv8305/phpslash-ft Modified Files: CHANGES Log Message: Peter C - [ 629466 ] Mainpage:Change PSL home from index.php3 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.582 retrieving revision 1.583 diff -C2 -d -r1.582 -r1.583 *** CHANGES 24 Oct 2002 19:36:03 -0000 1.582 --- CHANGES 28 Oct 2002 16:13:52 -0000 1.583 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-October-28 100:00AM CST Joe Stewart <joe...@us...> + [FT] - Peter C's [ 629466 ] Mainpage:Change PSL home from index.php3. + config-dist.ini.php3, config-dist.php3, config.php3, breadcrumb.tpl, + sectionsblock.tpl, topicsblock.tpl, phpslash.sgml. + 2002-October-24 2:00PM CDT Joe Stewart <joe...@us...> [W] - removed more "Undefined index" warnings. |
From: Joe S. <joe...@us...> - 2002-10-25 07:13:37
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv13587/phpslash-ft Modified Files: CHANGES Log Message: removed more Undefinded index warnings Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.581 retrieving revision 1.582 diff -C2 -d -r1.581 -r1.582 *** CHANGES 24 Oct 2002 18:13:32 -0000 1.581 --- CHANGES 24 Oct 2002 19:36:03 -0000 1.582 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-October-24 2:00PM CDT Joe Stewart <joe...@us...> + [W] - removed more "Undefined index" warnings. + 2002-October-24 12:00PM CDT Joe Stewart <joe...@us...> [W] - effort to reduce the number of "Undefined index" warnings. Most |
From: Joe S. <joe...@us...> - 2002-10-25 05:18:39
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv28783/phpslash-ft/class Modified Files: Submission.class Log Message: reduce the number of Undefined index warnings Index: Submission.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Submission.class,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Submission.class 17 Jun 2002 15:31:19 -0000 1.10 --- Submission.class 24 Oct 2002 18:20:24 -0000 1.11 *************** *** 161,177 **** $siteowner = $this->psl['site_owner']; ! $submission_id = $ary['submission_id']; ! ! if ($ary['name'] == "") { $ary['name'] = $submission_name; $ary['email'] = $submission_email; }; ! if ($ary['cookie'] == "yes") { ! $this->templ->set_var('CHECKED', "checked"); ! } else { ! $this->templ->set_var('CHECKED', ""); ! } --- 161,181 ---- $siteowner = $this->psl['site_owner']; + + $submission_id = ''; + if(!empty($ary['submission_id'])) { + $submission_id = $ary['submission_id']; + } ! if (empty($ary['name'])) { $ary['name'] = $submission_name; $ary['email'] = $submission_email; }; ! // should be out of date now. ! // if ($ary['cookie'] == "yes") { ! // $this->templ->set_var('CHECKED', "checked"); ! // } else { ! // $this->templ->set_var('CHECKED', ""); ! // } |
From: Joe S. <joe...@us...> - 2002-10-25 05:18:02
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv24921/phpslash-ft/public_html Modified Files: about.php3 glossary.php3 index.php3 login.php3 poll.php3 submission.php3 Log Message: reduce the number of Undefined index warnings Index: about.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/about.php3,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** about.php3 11 Sep 2002 17:14:23 -0000 1.16 --- about.php3 24 Oct 2002 18:14:58 -0000 1.17 *************** *** 18,27 **** // Start of Page ! /* parse cmd line variables into array */ ! while ( list($key, $val) = each($HTTP_GET_VARS )) { ! $ary[$key] = $val; } ! if ((!$ary['section']) AND (!$ary['section_id'])){ $section = $_PSL['site_homesection']; if(!$section) { --- 18,27 ---- // Start of Page ! $ary = array(); ! if(!empty($HTTP_GET_VARS)) { ! $ary = clean($HTTP_GET_VARS); } ! if ((empty($ary['section'])) AND (empty($ary['section_id']))){ $section = $_PSL['site_homesection']; if(!$section) { *************** *** 40,44 **** )); ! $allstories = $about_templ->parse(OUT,"main"); $leftblocks = $block->getBlocks($ary, "left"); $centerblocks = $block->getBlocks($ary, "center"); --- 40,44 ---- )); ! $allstories = $about_templ->parse('OUT',"main"); $leftblocks = $block->getBlocks($ary, "left"); $centerblocks = $block->getBlocks($ary, "center"); Index: glossary.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/glossary.php3,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** glossary.php3 11 Sep 2002 17:14:23 -0000 1.13 --- glossary.php3 24 Oct 2002 18:14:58 -0000 1.14 *************** *** 13,19 **** START OF PAGE *****************************/ ! $ary = $HTTP_GET_VARS; ! if ((!$ary['section']) AND (!$ary['section_id'])){ $section = $_PSL['site_homesection']; if(!$section) { --- 13,22 ---- START OF PAGE *****************************/ ! $ary = array(); ! if(!empty($HTTP_GET_VARS)) { ! $ary = clean($HTTP_GET_VARS); ! } ! if ((empty($ary['section'])) AND (empty($ary['section_id']))){ $section = $_PSL['site_homesection']; if(!$section) { *************** *** 37,40 **** --- 40,47 ---- $glossary = new Glossary; + + if(empty($ary['search'])) { + $ary['search'] = ''; + } $content = $glossary->searchGlossary($ary['search']); $block = new Block_i; Index: index.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/index.php3,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** index.php3 11 Sep 2002 17:14:23 -0000 1.59 --- index.php3 24 Oct 2002 18:14:58 -0000 1.60 *************** *** 22,29 **** // Start of Page ! $ary = $HTTP_GET_VARS; ! ! if ((!$ary['section']) AND (!$ary['section_id'])){ $section = $_PSL['site_homesection']; if(!$section) { --- 22,31 ---- // Start of Page + $ary = array(); + if(!empty($HTTP_GET_VARS)) { + $ary = clean($HTTP_GET_VARS); + } ! if ((empty($ary['section'])) AND (empty($ary['section_id']))){ $section = $_PSL['site_homesection']; if(!$section) { Index: login.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** login.php3 10 Oct 2002 16:12:23 -0000 1.22 --- login.php3 24 Oct 2002 18:14:58 -0000 1.23 *************** *** 39,47 **** // Start of Page ! /* parse cmd line variables into array */ ! $ary = $HTTP_GET_VARS; ! ! if ((!$ary['section']) AND (!$ary['section_id'])) { $section = $_PSL['site_homesection']; if(!$section) { --- 39,48 ---- // Start of Page + $ary = array(); + if(!empty($HTTP_GET_VARS)) { + $ary = clean($HTTP_GET_VARS); + } ! if ((empty($ary['section'])) AND (empty($ary['section_id']))){ $section = $_PSL['site_homesection']; if(!$section) { *************** *** 50,54 **** $ary['section'] = $section; } else { ! $pagetitle .= " - $section"; } --- 51,55 ---- $ary['section'] = $section; } else { ! $pagetitle .= $ary['section']; } *************** *** 75,86 **** } else { $tplfile = "index2colright.tpl"; - $rightblocks = $related . $rightblocks; } } elseif (empty($rightblocks)) { $tplfile = "index2colleft.tpl"; - $leftblocks .= $related; } else { $tplfile = "index3col.tpl"; - $rightblocks = $related . $rightblocks; } --- 76,84 ---- Index: poll.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/poll.php3,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** poll.php3 11 Sep 2002 20:21:52 -0000 1.16 --- poll.php3 24 Oct 2002 18:14:58 -0000 1.17 *************** *** 9,18 **** page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm")); ! /* parse cmd line variables into array */ ! while ( list($key, $val) = each($HTTP_GET_VARS )) { ! $ary[$key] = $val; } ! if ((!$ary['section']) AND (!$ary['section_id'])){ $section = $_PSL['site_homesection']; if(!$section) { --- 9,18 ---- page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm")); ! $ary = array(); ! if(!empty($HTTP_GET_VARS)) { ! $ary = clean($HTTP_GET_VARS); } ! if ((empty($ary['section'])) AND (empty($ary['section_id']))){ $section = $_PSL['site_homesection']; if(!$section) { *************** *** 20,33 **** } $ary['section'] = $section; - } else { - $pagetitle .= " - $section"; } /* the comment stuff is using "story_id" so we have to funky fix it here. */ ! if (!$ary['question_id'] && $ary['story_id']) { $question_id = $ary['story_id']; ! } else { $question_id = $ary['question_id']; } --- 20,33 ---- } $ary['section'] = $section; } /* the comment stuff is using "story_id" so we have to funky fix it here. */ ! if (empty($ary['question_id']) && !empty($ary['story_id'])) { $question_id = $ary['story_id']; ! } elseif(!empty($ary['question_id'])) { $question_id = $ary['question_id']; + } else { + $question_id = ''; } *************** *** 40,49 **** /* setting up the possible comment variables... */ ! $cmtary['mode'] = $ary['mode']; ! $cmtary['order'] = $ary['order']; $cmtary['question_id'] = $question_id; $content = ''; switch ($ary['submit']) { case "vote": --- 40,61 ---- /* setting up the possible comment variables... */ ! if(!empty($ary['mode'])) { ! $cmtary['mode'] = $ary['mode']; ! } else { ! $cmtary['mode'] = ''; ! } ! if(!empty($ary['order'])) { ! $cmtary['order'] = $ary['order']; ! } else { ! $cmtary['order'] = ''; ! } $cmtary['question_id'] = $question_id; $content = ''; + if(empty($ary['submit'])) { + $ary['submit'] = ''; + } + switch ($ary['submit']) { case "vote": *************** *** 80,84 **** $content .= $poll->resultPage($cmtary); } else { ! // Umm min isn't defined anywhere for a default $content .= $poll->listPolls ($ary['min']); } --- 92,98 ---- $content .= $poll->resultPage($cmtary); } else { ! if(empty($ary['min'])) { ! $ary['min'] = ''; ! } $content .= $poll->listPolls ($ary['min']); } *************** *** 126,130 **** 'ROOTDIR' => $_PSL['rooturl'], 'IMAGEDIR' => $_PSL['imageurl'], ! 'BREADCRUMB' => $breadcrumb, 'STORY_COLUMN' => $content, 'LEFT_BLOCK_COLUMN' => $leftblocks, --- 140,144 ---- 'ROOTDIR' => $_PSL['rooturl'], 'IMAGEDIR' => $_PSL['imageurl'], ! // 'BREADCRUMB' => $breadcrumb, 'STORY_COLUMN' => $content, 'LEFT_BLOCK_COLUMN' => $leftblocks, Index: submission.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/submission.php3,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** submission.php3 12 Sep 2002 15:13:08 -0000 1.11 --- submission.php3 24 Oct 2002 18:14:58 -0000 1.12 *************** *** 9,17 **** $auth->login_if(!$perm->have_perm('submissionNew')); ! $ary_post = $HTTP_POST_VARS; ! $ary = $HTTP_GET_VARS; ! ! if (isset($ary_post['cookie'])) { $submission_name = $ary_post['name']; $submission_email = $ary_post['email']; --- 9,22 ---- $auth->login_if(!$perm->have_perm('submissionNew')); + $ary = array(); + if(!empty($HTTP_GET_VARS)) { + $ary = clean($HTTP_GET_VARS); + } + $ary_post = array(); + if(!empty($HTTP_POST_VARS)) { + $ary_post = clean($HTTP_POST_VARS); + } ! if (!empty($ary_post['cookie'])) { $submission_name = $ary_post['name']; $submission_email = $ary_post['email']; *************** *** 35,38 **** --- 40,47 ---- $submission = new Submission; + if(empty($ary_post['submit'])) { + $ary_post['submit'] = ''; + } + switch ($ary_post['submit']) { *************** *** 67,71 **** $block = new Block_i; ! if ((!$ary['section']) AND (!$ary['section_id'])){ $section = $_PSL['site_homesection']; if(!$section) { --- 76,80 ---- $block = new Block_i; ! if ((empty($ary['section'])) AND (empty($ary['section_id']))){ $section = $_PSL['site_homesection']; if(!$section) { |
From: Joe S. <joe...@us...> - 2002-10-25 05:17:36
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html In directory usw-pr-cvs1:/tmp/cvs-serv22718/doc/html Modified Files: phpslash.sgml Log Message: reduce the number of Undefined index warnings Index: phpslash.sgml =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** phpslash.sgml 24 Sep 2002 16:23:39 -0000 1.53 --- phpslash.sgml 24 Oct 2002 18:12:11 -0000 1.54 *************** *** 801,804 **** --- 801,805 ---- skinsblock.tpl slashHead.tpl + storyList.tpl storyNew.tpl submissionForm.tpl |
From: Joe S. <joe...@us...> - 2002-10-25 05:15:51
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv26828/phpslash-ft/public_html Modified Files: mailinglist.php3 Log Message: reduce the number of Undefined index warnings Index: mailinglist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/mailinglist.php3,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mailinglist.php3 11 Sep 2002 17:14:24 -0000 1.7 --- mailinglist.php3 24 Oct 2002 18:17:28 -0000 1.8 *************** *** 13,20 **** START OF PAGE *****************************/ ! $ary = $HTTP_GET_VARS; ! ! if ((!$ary['section']) AND (!$ary['section_id'])){ $section = $_PSL['site_homesection']; if(!$section) { --- 13,22 ---- START OF PAGE *****************************/ + $ary = array(); + if(!empty($HTTP_GET_VARS)) { + $ary = clean($HTTP_GET_VARS); + } ! if ((empty($ary['section'])) AND (empty($ary['section_id']))){ $section = $_PSL['site_homesection']; if(!$section) { *************** *** 22,27 **** } $ary['section'] = $section; - } else { - $pagetitle .= " - $section"; } --- 24,27 ---- *************** *** 37,40 **** --- 37,44 ---- $content = ''; + if(empty($ary['action'])) { + $ary['action'] = ''; + } + switch ($ary['action']) { case "subscribe": *************** *** 97,101 **** 'ROOTDIR' => $_PSL['rooturl'], 'IMAGEDIR' => $_PSL['imageurl'], ! 'BREADCRUMB' => $breadcrumb, 'STORY_COLUMN' => $content, 'LEFT_BLOCK_COLUMN' => $leftblocks, --- 101,105 ---- 'ROOTDIR' => $_PSL['rooturl'], 'IMAGEDIR' => $_PSL['imageurl'], ! // 'BREADCRUMB' => $breadcrumb, 'STORY_COLUMN' => $content, 'LEFT_BLOCK_COLUMN' => $leftblocks, |