phpslash-commit Mailing List for phpSlash (Page 26)
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...> - 2004-10-01 18:07:32
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30676/phpslash-dev Modified Files: CHANGES Log Message: changed url skin change from url to not set cookie unless cookie argument also set. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** CHANGES 29 Sep 2004 14:21:49 -0000 1.107 --- CHANGES 1 Oct 2004 18:07:21 -0000 1.108 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2004-October 1 Joe Stewart <joe...@us... + [W] - config-dist.php - changed skin change from url to not set + cookie unless cookie argument also set. + 2004-September 25 Joe Stewart <joe...@us... [B] - Story_base.class - php5 compatibility. test for string |
|
From: Joe S. <joe...@us...> - 2004-09-29 18:25:42
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28576/phpslash-dev/include/templates/en/default Modified Files: emailNotifyComment.tpl emailNotifySubmission.tpl Log Message: replace any .php3 extensions Index: emailNotifyComment.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/default/emailNotifyComment.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** emailNotifyComment.tpl 28 Apr 2003 15:26:56 -0000 1.2 --- emailNotifyComment.tpl 29 Sep 2004 18:25:33 -0000 1.3 *************** *** 15,19 **** Notice: A new comment has been submitted to {SITE_NAME}. ! <{ROOTURL}/article.php3?story_id={STORY_ID}#{COMMENT_ID}>. +=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+ --- 15,19 ---- Notice: A new comment has been submitted to {SITE_NAME}. ! <{ROOTURL}/article.php?story_id={STORY_ID}#{COMMENT_ID}>. +=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+ Index: emailNotifySubmission.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/default/emailNotifySubmission.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** emailNotifySubmission.tpl 28 Apr 2003 15:26:57 -0000 1.2 --- emailNotifySubmission.tpl 29 Sep 2004 18:25:33 -0000 1.3 *************** *** 16,20 **** You now need to login and check the Submissions. ! <{ROOTURL}>/admin/submissionAdmin.php3> +=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+ --- 16,20 ---- You now need to login and check the Submissions. ! <{ROOTURL}>/admin/submissionAdmin.php> +=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+ |
|
From: Joe S. <joe...@us...> - 2004-09-29 18:24:00
|
Update of /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28171/phpslash-skins/include/templates/en/ShankZen Modified Files: comment.tpl commentDisplay.tpl commentIndex.tpl pollDisplay.tpl pollResultPage.tpl slashHead-htmlarea3.tpl slashHead.tpl story.tpl Log Message: replace any .php3 extensions Index: comment.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/comment.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** comment.tpl 8 Apr 2003 21:12:31 -0000 1.1 --- comment.tpl 29 Sep 2004 18:23:51 -0000 1.2 *************** *** 1,5 **** <!-- START comment.tpl --> <div class="psl-block"> ! <form method="get" action="comment.php3"> Comment Style: <select name="mode" class="psl-text"> --- 1,5 ---- <!-- START comment.tpl --> <div class="psl-block"> ! <form method="get" action="comment.php"> Comment Style: <select name="mode" class="psl-text"> Index: commentDisplay.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/commentDisplay.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** commentDisplay.tpl 8 Apr 2003 21:12:32 -0000 1.1 --- commentDisplay.tpl 29 Sep 2004 18:23:51 -0000 1.2 *************** *** 16,26 **** <input type="checkbox" name="bulkdel_ary[]" value="{COMMENT_ID}" />Mark for Bulk Delete | ! <a href="{ROOTY}/comment.php3?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ! | <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=delete">Delete</a> ! | <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=edit">Edit</a> ! | <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=markpend">Mark Pending</a> ]<br /> ! [ <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=unmarkpend">Unmark Pending</a> ! | <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentupone">Reparent Up One Level</a> ! | <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentuptop">Reparent Up To Top</a> ] </div> --- 16,26 ---- <input type="checkbox" name="bulkdel_ary[]" value="{COMMENT_ID}" />Mark for Bulk Delete | ! <a href="{ROOTY}/comment.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=delete">Delete</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=edit">Edit</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=markpend">Mark Pending</a> ]<br /> ! [ <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=unmarkpend">Unmark Pending</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentupone">Reparent Up One Level</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentuptop">Reparent Up To Top</a> ] </div> *************** *** 29,33 **** <!-- BEGIN regular_perm --> <div> ! [ <a href="{ROOTY}/comment.php3?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ] </div> <!-- END regular_perm --> --- 29,33 ---- <!-- BEGIN regular_perm --> <div> ! [ <a href="{ROOTY}/comment.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ] </div> <!-- END regular_perm --> Index: commentIndex.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/commentIndex.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** commentIndex.tpl 8 Apr 2003 21:12:32 -0000 1.1 --- commentIndex.tpl 29 Sep 2004 18:23:51 -0000 1.2 *************** *** 1,5 **** <!-- start commentIndex.tpl --> <span class="psl-commentSubject"> ! <a href="{ROOTDIR}/comment.php3?submit=view&mode={MODE}&order={ORDER}&story_id={STORY_ID}&parent_id={PARENT_ID}">{SUBJECT}</a></span> <span class="psl-commentID">[{COMMENT_ID}]</span> <span class="psl-commentAuthor">by {NAME} on {TIME}</span> --- 1,5 ---- <!-- start commentIndex.tpl --> <span class="psl-commentSubject"> ! <a href="{ROOTDIR}/comment.php?submit=view&mode={MODE}&order={ORDER}&story_id={STORY_ID}&parent_id={PARENT_ID}">{SUBJECT}</a></span> <span class="psl-commentID">[{COMMENT_ID}]</span> <span class="psl-commentAuthor">by {NAME} on {TIME}</span> Index: pollDisplay.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/pollDisplay.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pollDisplay.tpl 8 Apr 2003 21:12:32 -0000 1.1 --- pollDisplay.tpl 29 Sep 2004 18:23:51 -0000 1.2 *************** *** 9,14 **** <input type="submit" value="Vote" class="psl-button"> </form> ! [ <a href="{ROOTURL}/poll.php3?submit=viewresults&question_id={QUESTION_ID}">Results</a> ! | <a href="{ROOTURL}/poll.php3">Polls</a> ] [ Comments: <span class="psl-commentCount">{COMMENT_COUNT}</span> | Votes: <span class="psl-voteCount">{VOTE_COUNT} </span>] <!-- END: pollDisplay.tpl --> --- 9,14 ---- <input type="submit" value="Vote" class="psl-button"> </form> ! [ <a href="{ROOTURL}/poll.php?submit=viewresults&question_id={QUESTION_ID}">Results</a> ! | <a href="{ROOTURL}/poll.php">Polls</a> ] [ Comments: <span class="psl-commentCount">{COMMENT_COUNT}</span> | Votes: <span class="psl-voteCount">{VOTE_COUNT} </span>] <!-- END: pollDisplay.tpl --> Index: pollResultPage.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/pollResultPage.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pollResultPage.tpl 8 Apr 2003 21:12:33 -0000 1.1 --- pollResultPage.tpl 29 Sep 2004 18:23:51 -0000 1.2 *************** *** 4,8 **** {RESULT} ! <p>[ <a href="{ROOTURL}/comment.php3?submit=post&story_id={QUESTION_ID}&parent_id=0">Post a Comment About this Poll</b></a> ]</p> {COMMENT} --- 4,8 ---- {RESULT} ! <p>[ <a href="{ROOTURL}/comment.php?submit=post&story_id={QUESTION_ID}&parent_id=0">Post a Comment About this Poll</b></a> ]</p> {COMMENT} Index: slashHead-htmlarea3.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/slashHead-htmlarea3.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** slashHead-htmlarea3.tpl 8 Sep 2004 20:09:06 -0000 1.7 --- slashHead-htmlarea3.tpl 29 Sep 2004 18:23:51 -0000 1.8 *************** *** 14,18 **** <meta name="{METANAME}" content="{METADESCRIPTION}" /> <!-- END each_metatag --> ! <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php3" /> <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" /> <!-- <style type="text/css" media="screen">@import "{ROOTDIR}/styles/{SKIN}_ext.css";</style> --> --- 14,18 ---- <meta name="{METANAME}" content="{METADESCRIPTION}" /> <!-- END each_metatag --> ! <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php" /> <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" /> <!-- <style type="text/css" media="screen">@import "{ROOTDIR}/styles/{SKIN}_ext.css";</style> --> Index: slashHead.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/slashHead.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** slashHead.tpl 2 Sep 2004 17:32:14 -0000 1.2 --- slashHead.tpl 29 Sep 2004 18:23:51 -0000 1.3 *************** *** 14,18 **** <meta name="{METANAME}" content="{METADESCRIPTION}" /> <!-- END each_metatag --> ! <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php3" /> <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" /> <style type="text/css" media="screen">@import "{ROOTDIR}/styles/{SKIN}_ext.css";</style> --- 14,18 ---- <meta name="{METANAME}" content="{METADESCRIPTION}" /> <!-- END each_metatag --> ! <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php" /> <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" /> <style type="text/css" media="screen">@import "{ROOTDIR}/styles/{SKIN}_ext.css";</style> Index: story.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/story.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** story.tpl 2 Sep 2004 17:32:14 -0000 1.3 --- story.tpl 29 Sep 2004 18:23:51 -0000 1.4 *************** *** 1,4 **** <!-- START story.tpl --> ! <div class="psl-block"> <!-- added so that display by article.php3 has outline --> {TITLEBAR} <span class="psl-additional"> --- 1,4 ---- <!-- START story.tpl --> ! <div class="psl-block"> <!-- added so that display by article.php has outline --> {TITLEBAR} <span class="psl-additional"> *************** *** 10,14 **** <!-- END alsotext --> <!-- BEGIN row --> ! <a href="{ROOTDIR}/search.php3?topic_id={LIST_TOPIC_ID}">{LIST_TOPIC_NAME}</a><br /> <!-- END row --> </span> <!-- id="storyAdditional" --> --- 10,14 ---- <!-- END alsotext --> <!-- BEGIN row --> ! <a href="{ROOTDIR}/search.php?topic_id={LIST_TOPIC_ID}">{LIST_TOPIC_NAME}</a><br /> <!-- END row --> </span> <!-- id="storyAdditional" --> |
|
From: Joe S. <joe...@us...> - 2004-09-29 18:23:59
|
Update of /cvsroot/phpslash/phpslash-skins/include/templates/en/PostNuke In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28171/phpslash-skins/include/templates/en/PostNuke Modified Files: comment.tpl commentDisplay.tpl storyIndex.tpl Log Message: replace any .php3 extensions Index: comment.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/PostNuke/comment.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** comment.tpl 3 Apr 2003 21:53:17 -0000 1.1 --- comment.tpl 29 Sep 2004 18:23:51 -0000 1.2 *************** *** 7,11 **** <tr> <td bgcolor="#F6F7EB" align="center" width="100%"> ! <form method="get" action="comment.php3"> Comment Style: <select name="mode"> --- 7,11 ---- <tr> <td bgcolor="#F6F7EB" align="center" width="100%"> ! <form method="get" action="comment.php"> Comment Style: <select name="mode"> Index: commentDisplay.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/PostNuke/commentDisplay.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** commentDisplay.tpl 3 Apr 2003 21:53:17 -0000 1.1 --- commentDisplay.tpl 29 Sep 2004 18:23:51 -0000 1.2 *************** *** 25,46 **** <input type="checkbox" name="bulkdel_ary[]" value="{COMMENT_ID}">Mark for Bulk Delete | ! <a href="{ROOTY}/comment.php3?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ! | <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=delete">Delete</a> ! | <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=edit">Edit</a> ! | <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=markpend">Mark Pending</a> ]<br /> ! [ <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=unmarkpend">Unmark Pending</a> ! | <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentupone">Reparent Up One Level</a> ! | <a href="{ADMINURL}/commentAdmin.php3?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentuptop">Reparent Up To Top</a> ] <!-- END admin_perm --> <!-- BEGIN regular_perm --> ! [ <a href="{ROOTY}/comment.php3?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ] <!-- END regular_perm --> </td> --- 25,46 ---- <input type="checkbox" name="bulkdel_ary[]" value="{COMMENT_ID}">Mark for Bulk Delete | ! <a href="{ROOTY}/comment.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=delete">Delete</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=edit">Edit</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=markpend">Mark Pending</a> ]<br /> ! [ <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=unmarkpend">Unmark Pending</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentupone">Reparent Up One Level</a> ! | <a href="{ADMINURL}/commentAdmin.php?story_id={STORY_ID}&comment_id={COMMENT_ID}&parent_id={PARENT_ID}&action=reparentuptop">Reparent Up To Top</a> ] <!-- END admin_perm --> <!-- BEGIN regular_perm --> ! [ <a href="{ROOTY}/comment.php?submit=post&story_id={STORY_ID}&parent_id={COMMENT_ID}">Reply</a> ] <!-- END regular_perm --> </td> Index: storyIndex.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/PostNuke/storyIndex.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** storyIndex.tpl 3 Apr 2003 21:53:17 -0000 1.1 --- storyIndex.tpl 29 Sep 2004 18:23:51 -0000 1.2 *************** *** 2,7 **** <!-- BEGIN each_story --> {THESTORY} ! <a href="{ROOTDIR}/article.php3?story_id={STORY_ID}">{MORE}</a> ! [<a href="{ROOTDIR}/article.php3?story_id={STORY_ID}">{COMMENT}]</a> <!-- END each_story --> <!-- end storyIndex.tpl --> --- 2,7 ---- <!-- BEGIN each_story --> {THESTORY} ! <a href="{ROOTDIR}/article.php?story_id={STORY_ID}">{MORE}</a> ! [<a href="{ROOTDIR}/article.php?story_id={STORY_ID}">{COMMENT}]</a> <!-- END each_story --> <!-- end storyIndex.tpl --> |
|
From: Joe S. <joe...@us...> - 2004-09-29 18:22:44
|
Update of /cvsroot/phpslash/phpslash-skins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27973/phpslash-skins Modified Files: CHANGES Log Message: replace any .php3 extensions Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/CHANGES,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** CHANGES 21 Sep 2004 11:28:13 -0000 1.15 --- CHANGES 29 Sep 2004 18:22:34 -0000 1.16 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2004-September 29 Joe Stewart <joe...@us...> + [B] - ShankZend and PostNuke - removed any .php3 extensions. + 2004-September 21 Joe Stewart <joe...@us...> [F] - Added embedded ShankZend skin - no html or body tags. |
|
From: Joe S. <joe...@us...> - 2004-09-29 14:22:23
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/story In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10858/phpslash-dev/include/modules/story Modified Files: Story_base.class Log Message: php5 compatibility - check for string index for array Index: Story_base.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/Story_base.class,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Story_base.class 7 Jul 2004 18:24:36 -0000 1.10 --- Story_base.class 29 Sep 2004 14:21:49 -0000 1.11 *************** *** 367,371 **** while (($this->db->next_record()) AND ( $i <= $argv_ary['max'] ) ) { ! if ( $stories_ary[$i-1]['story_id'] == $this->db->Record["story_id"]) { /* multiple topics - stuff topic arrays */ --- 367,371 ---- while (($this->db->next_record()) AND ( $i <= $argv_ary['max'] ) ) { ! if ( is_array($stories_ary[$i-1]) && ($stories_ary[$i-1]['story_id'] == $this->db->Record["story_id"])) { /* multiple topics - stuff topic arrays */ |
|
From: Joe S. <joe...@us...> - 2004-09-29 14:22:23
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10858/phpslash-dev Modified Files: CHANGES Log Message: php5 compatibility - check for string index for array Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** CHANGES 24 Sep 2004 20:15:27 -0000 1.106 --- CHANGES 29 Sep 2004 14:21:49 -0000 1.107 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2004-September 25 Joe Stewart <joe...@us... + [B] - Story_base.class - php5 compatibility. test for string + index for array. + 2004-September 24 Joe Stewart <joe...@us... [F] - Author.class - new method - get_group_users. Gets lists of users belonging |
|
From: Joe S. <joe...@us...> - 2004-09-24 20:15:36
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/author In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22592/phpslash-dev/include/modules/author Modified Files: Author.class Log Message: Author.class - new method - get_group_users Index: Author.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/author/Author.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Author.class 21 Apr 2003 19:28:47 -0000 1.2 --- Author.class 24 Sep 2004 20:15:27 -0000 1.3 *************** *** 1081,1085 **** } } ! } /* end of Author.class */ ?> --- 1081,1101 ---- } } ! ! function get_group_users($group) { ! $q = "SELECT psl_author.author_name ! FROM psl_group, psl_author_group_lut, psl_author ! WHERE psl_group.group_id = psl_author_group_lut.group_id ! AND psl_author_group_lut.author_id = psl_author.author_id ! AND psl_group.group_name = '$group'"; ! debug("q", $q); ! $this->db->query($q); ! ! $i = 0; ! if ($this->db->next_record()) { ! return $this->db->Record; ! } ! return false; ! } ! } /* end of Author.class */ ?> |
|
From: Joe S. <joe...@us...> - 2004-09-24 20:15:36
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22592/phpslash-dev Modified Files: CHANGES Log Message: Author.class - new method - get_group_users Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** CHANGES 22 Sep 2004 21:01:30 -0000 1.105 --- CHANGES 24 Sep 2004 20:15:27 -0000 1.106 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2004-September 24 Joe Stewart <joe...@us... + [F] - Author.class - new method - get_group_users. Gets lists of users belonging + to a group. + 2004-September 22 Joe Stewart <joe...@us... [F] - slashAuthEGW.class - eGroupware authentication |
|
From: Joe S. <joe...@us...> - 2004-09-22 21:05:05
|
Update of /cvsroot/phpslash/phpslash-skins/include/templates/en/embedded In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3507/phpslash-skins/include/templates/en/embedded Modified Files: slashHead-htmlarea3.tpl Log Message: add eGroupware authentication Index: slashHead-htmlarea3.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/embedded/slashHead-htmlarea3.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** slashHead-htmlarea3.tpl 21 Sep 2004 11:28:14 -0000 1.1 --- slashHead-htmlarea3.tpl 22 Sep 2004 21:04:56 -0000 1.2 *************** *** 219,222 **** --- 219,223 ---- </script> + <body onLoad="PSL_chooseEditor()"> <!-- END HTMLAREA3 Javascript --> |
|
From: Joe S. <joe...@us...> - 2004-09-22 21:01:41
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/auth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2479/phpslash-dev/include/modules/auth Modified Files: slashAuth.class Log Message: add eGroupware authentication Index: slashAuth.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/auth/slashAuth.class,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** slashAuth.class 21 Sep 2004 11:14:05 -0000 1.3 --- slashAuth.class 22 Sep 2004 21:01:31 -0000 1.4 *************** *** 343,350 **** // username not found - return failure ! if ($user_info == false) { return false; } ! // username found $uid = $user_info["author_id"]; --- 343,351 ---- // username not found - return failure ! /* if ($user_info == false) { return false; } ! */ ! if ($user_info) { // username found $uid = $user_info["author_id"]; *************** *** 353,357 **** $this->auth["dname"] = $user_info["author_realname"]; $this->auth["url"] = $user_info["url"]; ! // auth type specific validation // psl built in Challenge Response --- 354,358 ---- $this->auth["dname"] = $user_info["author_realname"]; $this->auth["url"] = $user_info["url"]; ! } // auth type specific validation // psl built in Challenge Response |
|
From: Joe S. <joe...@us...> - 2004-09-22 21:01:41
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2479/phpslash-dev Modified Files: CHANGES Log Message: add eGroupware authentication Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** CHANGES 21 Sep 2004 11:18:35 -0000 1.104 --- CHANGES 22 Sep 2004 21:01:30 -0000 1.105 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2004-September 22 Joe Stewart <joe...@us... + [F] - slashAuthEGW.class - eGroupware authentication + 2004-September 21 Joe Stewart <joe...@us... [F] - slashAuth.class - allow auto registration from external authentication. |
|
From: Joe S. <joe...@us...> - 2004-09-22 21:01:41
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2479/phpslash-dev/include/modules/auth/authtypes Added Files: slashAuthEGW.class Log Message: add eGroupware authentication --- NEW FILE: slashAuthEGW.class --- <?php /* $Id: slashAuthEGW.class,v 1.1 2004/09/22 21:01:31 joestewart Exp $ * * eGroupware authentication */ class slashAuth extends slashAuth_base { // eGw authentication function psl_validate($username, $passwd, $response='', $user_info='') { $is_user = false; if ($this->egw_authenticate($username, $passwd)) { if($user_info) { // user exists in psl already return true; } elseif ($this->psl['auth.autoadd']) { // if config allows for us to add external users $is_user = $this->psl_add_egwuser($username); } } return $is_user; } function egw_authenticate($username, $passwd) { $passwd_type = 'text'; if($GLOBALS['phpgw']->auth->authenticate($username, $passwd, $passwd_type)) { return true; } return false; } // automatically login psl if logged into eGw function auth_preauth() { $uid = false; if(is_array($GLOBALS['phpgw_info']['user'])) { $username = $GLOBALS['phpgw_info']['user']['account_lid']; $user_info = $this->get_psluser_info($username); if ($user_info == false) { // egw user not a psl user yet if($this->psl['auth.autoadd']) { // but we can add them $is_user = $this->psl_add_egwuser($username); if($is_user) { $user_info = $this->get_psluser_info($username); } } } if ($user_info) { // preauth successful // debug("preauth", "successful"); $this->auth["uname"] = $user_info["uname"]; $this->auth["dname"] = $user_info["dname"]; $this->auth["url"] = $user_info["url"]; // $this->auth["uid"] = $user_info["uid"]; $uid = $user_info["author_id"]; $this->auth["perm"] = $this->get_userperms($uid); } // expire cache for this session if(function_exists('jpcache_gc')) { jpcache_gc('string', "-slashSess-" . $sess->id, "100"); } // success is signalled by returning the user's id. return $uid; } else if ($this->nobody) { // not logged into eGw // if public access allowed apply the data for user named 'nobody' $arg_ary['author_name'] = 'nobody'; $author_ary = $this->load_user_info($arg_ary); $this->auth['preferences'] = ''; // get rid of session variables and use the db author record. $this->clear_session_vars(); // expire cache for this session if(function_exists('jpcache_gc')) { jpcache_gc('string', "-slashSess-" . $sess->id, "100"); } // return the id for user 'nobody' return $author_ary['author_id']; } else { // preauth failed // debug("preauth", "failed"); return false; } } function psl_add_egwuser($username) { $ary['author_name'] = $username; if($GLOBALS['phpgw_info']['user']['account_lid'] == $username) { $ary['author_realname'] = $GLOBALS['phpgw_info']['user']['fullname']; $ary['email'] = $GLOBALS['phpgw_info']['user']['email']; } $perm_ary['nobody'] = 20; $perm_ary['user'] = 21; $perm_ary['bloggers'] = 28; if (isset($GLOBALS['phpgw_info']['user']['apps']['admin']) && is_array($GLOBALS['phpgw_info']['user']['apps']['admin'])) { $perm_ary['root'] = 24; } $ary["permission"] = $perm_ary; if($is_user = $this->psl_register_authed($ary)) { return $is_user; } return false; } } ?> |
|
From: Joe S. <joe...@us...> - 2004-09-21 11:28:24
|
Update of /cvsroot/phpslash/phpslash-skins/include/templates/en/embedded In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31709/phpslash-skins/include/templates/en/embedded Added Files: skin.ini slashFoot.tpl slashHead-htmlarea3.tpl slashHead.tpl Log Message: Added embedded ShankZend skin - no html or body tags. --- NEW FILE: skin.ini --- ;; Name of parent skin ;; $Id: skin.ini,v 1.1 2004/09/21 11:28:14 joestewart Exp $ skin.parent = "ShankZen" --- NEW FILE: slashFoot.tpl --- <!-- START slashfoot.tpl --> <table id="footer" border=0 width=80%> <tr><td> {NAVBAR} <p class="psl-copyright">This site is powered by <a href="http://www.php-slash.org/">phpslash</a> - Copyright © 1998 - 2003 and licensed under the <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> - No warranty is, has, or will be given in any way whatsoever to anyone.</p> <p style="text-align:right"><a href="#top">Go 2 Top</a></p> </td></tr> </table> <!-- end: footer --> <!-- END slashFoot.tpl --> --- NEW FILE: slashHead-htmlarea3.tpl --- <!-- START slashHead.tpl --> <!-- theme design: Peter Cruickshank < in...@cu... > --> <!-- Enter Your Desired META Tags Below Here --> <!-- This Meta Tag is Defined In Each Page By Setting The Variable $xsiteobject = "HomePage"; to the page type HomePage, Glossary, Info, etc.. --> <!-- Enter Your META Tags Above Here --> <!-- BEGIN each_metatag --> <meta name="{METANAME}" content="{METADESCRIPTION}" /> <!-- END each_metatag --> <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php" /> <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/ShankZen.css" /> <!-- <style type="text/css" media="screen">@import "{ROOTDIR}/styles/ShankZen_ext.css";</style> --> <!-- BEGIN HTMLAREA3 Javascript --> <script type="text/javascript"> // the _editor_url is REQUIRED! don't forget to set it. _editor_url="{ROOTDIR}/scripts/htmlarea3/"; // implicit language will be "en", but let's set it for brevity _editor_lang = "en"; </script> <script type="text/javascript" src="{ROOTDIR}/scripts/htmlarea3/htmlarea.js"></script> <!-- load the plugins --> <script type="text/javascript"> // WARNING: using this interface to load plugin // will _NOT_ work if plugins do not have the language // loaded by HTMLArea. // In other words, this function generates SCRIPT tags // that load the plugin and the language file, based on the // global variable HTMLArea.I18N.lang (defined in the lang file, // in our case "lang/en.js" loaded above). // If this lang file is not found the plugin will fail to // load correctly and nothing will work. HTMLArea.loadPlugin("TableOperations"); // HTMLArea.loadPlugin("SpellChecker"); // HTMLArea.loadPlugin("FullPage"); // HTMLArea.loadPlugin("CSS"); HTMLArea.loadPlugin("ContextMenu"); // HTMLArea.loadPlugin("HtmlTidy"); // HTMLArea.loadPlugin("ListType"); HTMLArea.loadPlugin("ImageManager"); </script> <script type="text/javascript"> // this function will get called at body.onload function initEditor() { // cache these values as we need to pass it for both editors var css_plugin_args = { combos : [ { label: "Syntax", // menu text // CSS class options: { "None" : "", "Code" : "code", "String" : "string", "Comment" : "comment", "Variable name" : "variable-name", "Type" : "type", "Reference" : "reference", "Preprocessor" : "preprocessor", "Keyword" : "keyword", "Function name" : "function-name", "Html tag" : "html-tag", "Html italic" : "html-helper-italic", "Warning" : "warning", "Html bold" : "html-helper-bold" }, context: "pre" }, { label: "Info", options: { "None" : "", "Quote" : "quote", "Highlight" : "highlight", "Deprecated" : "deprecated" } } ] }; //--------------------------------------------------------------------- // GENERAL PATTERN // // 1. Instantitate an editor object. // 2. Register plugins (note, it's required to have them loaded). // 3. Configure any other items in editor.config. // 4. generate() the editor // // The above are steps that you use to create one editor. Nothing new // so far. In order to create more than one editor, you just have to // repeat those steps for each of one. Of course, you can register any // plugins you want (no need to register the same plugins for all // editors, and to demonstrate that we'll skip the TableOperations // plugin for the second editor). Just be careful to pass different // ID-s in the constructor (you don't want to _even try_ to create more // editors for the same TEXTAREA element ;-)). // // So much for the noise, see the action below. //--------------------------------------------------------------------- //--------------------------------------------------------------------- // CREATE FIRST EDITOR // var editor1 = new HTMLArea("intro_text"); // plugins must be registered _per editor_. Therefore, we register // plugins for the first editor here, and we will also do this for the // second editor. editor1.registerPlugin(TableOperations); // editor1.registerPlugin(SpellChecker); // editor1.registerPlugin(CSS, css_plugin_args); // editor1.registerPlugin(HtmlTidy); // editor1.registerPlugin(ListType); editor1.registerPlugin(ContextMenu); editor1.registerPlugin(ImageManager); // custom config must be done per editor. Here we're importing the // stylesheet used by the CSS plugin. // editor1.config.pageStyle = "@import url(custom.css);"; // generate first editor editor1.config.hideSomeButtons(" fontname fontsize formatblock "); editor1.generate(); //--------------------------------------------------------------------- //--------------------------------------------------------------------- // CREATE SECOND EDITOR // var editor2 = new HTMLArea("body_text"); // we are using the same plugins editor2.registerPlugin(TableOperations); // editor2.registerPlugin(SpellChecker); // editor2.registerPlugin(CSS, css_plugin_args); // editor2.registerPlugin(HtmlTidy); // editor2.registerPlugin(ListType); editor2.registerPlugin(ContextMenu); editor2.registerPlugin(ImageManager); // import the CSS plugin styles // editor2.config.pageStyle = "@import url(custom.css);"; // generate the second editor // IMPORTANT: if we don't give it a timeout, the first editor will // not function in Mozilla. Soon I'll think about starting to // implement some kind of event that will fire when the editor // finished creating, then we'll be able to chain the generate() // calls in an elegant way. But right now there's no other solution // than the following. setTimeout(function() { editor2.config.hideSomeButtons(" fontname fontsize formatblock "); editor2.generate(); }, 500); //--------------------------------------------------------------------- }; function insertHTML() { var html = prompt("Enter some HTML code here"); if (html) { editor.insertHTML(html); } } function highlight() { editor.surroundHTML('<span style="background-color: yellow">', '</span>'); } </script> <script type="text/javascript"> function PSL_chooseEditor(onLoad) { // if IE 5.5 or W3C/Moz 1.3+ - Can't combine the two due to problems with reload() & IE // if((document.all && document.designMode) || (document.designMode)) { // IE 5.5 - Eliminating reload() because it pulled down new form data if(document.all && document.designMode) { // HTML or htmlArea if (document.editNew.content_type[0].checked) { // HTMLArea.replace('en'); // HTMLArea.replaceAll(); initEditor(); } else { // how to remove in IE? } // W3C/Moz 1.3+ - reload() without adjusting form data } else if(document.designMode) { // HTML or htmlArea if (document.editNew.content_type[0].checked) { // HTMLArea.replace('en'); // HTMLArea.replaceAll(); initEditor(); } else { if(onLoad == 1) { onLoad = 2; window.location.reload(); } } } } </script> <!-- END HTMLAREA3 Javascript --> <a name="top"> </a> <table id="header" width=80%> <tr><td> <div style="vertical-align:bottom"> <div class="psl-logo"> <a href="{ROOTDIR}"><img src="{IMAGEDIR}/topics/topicphpslash.gif" alt="{SITE_NAME}" border="0" width="100" height="40"/></a> </div> <div class="psl-title"> {SITETITLE} </div> </div> <!-- Search box <div class="psl-search"> <form method="get" action="{SEARCH_ACTION_URL}"> <input type="text" name="query" value="" size="15" class="psl-text" /> <input type="submit" value="Search" class="psl-button" /> <input type="hidden" name="topic_id" value="" /> <input type="hidden" name="section_id" value="" /> <input type="hidden" name="author_id" value="" /> </form> </div> end: search --> <!-- TOPICBAR --> </td></tr> <tr><td> {NAVBAR} </td></tr> </table> <!-- end: header --> <!-- END slashHead.tpl --> --- NEW FILE: slashHead.tpl --- <!-- START slashHead.tpl --> <!-- theme design: Peter Cruickshank < in...@cu... > --> <!-- Enter Your Desired META Tags Below Here --> <!-- This Meta Tag is Defined In Each Page By Setting The Variable $xsiteobject = "HomePage"; to the page type HomePage, Glossary, Info, etc.. --> <!-- BEGIN each_metatag --> <meta name="{METANAME}" content="{METADESCRIPTION}" /> <!-- END each_metatag --> <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php" /> <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/ShankZen.css" /> <style type="text/css" media="screen">@import "{ROOTDIR}/styles/ShankZen_ext.css";</style> <a name="top"> </a> <table id="header" width=80%> <tr><td> <div style="vertical-align:bottom"> <div class="psl-logo"> <a href="{ROOTDIR}"><img src="{IMAGEDIR}/topics/topicphpslash.gif" alt="{SITE_NAME}" border="0" width="100" height="40"/></a> </div> <div class="psl-title"> {SITETITLE} </div> </div> <!-- Search box <div class="psl-search"> <form method="get" action="{SEARCH_ACTION_URL}"> <input type="text" name="query" value="" size="15" class="psl-text" /> <input type="submit" value="Search" class="psl-button" /> <input type="hidden" name="topic_id" value="" /> <input type="hidden" name="section_id" value="" /> <input type="hidden" name="author_id" value="" /> </form> </div> end: search --> <!-- TOPICBAR --> </td></tr> <tr><td> {NAVBAR} </td></tr> </table> <!-- end: header --> <!-- END slashHead.tpl --> |
|
From: Joe S. <joe...@us...> - 2004-09-21 11:28:24
|
Update of /cvsroot/phpslash/phpslash-skins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31709/phpslash-skins Modified Files: CHANGES Log Message: Added embedded ShankZend skin - no html or body tags. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-skins/CHANGES,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CHANGES 1 Sep 2004 19:16:59 -0000 1.14 --- CHANGES 21 Sep 2004 11:28:13 -0000 1.15 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2004-September 21 Joe Stewart <joe...@us...> + [F] - Added embedded ShankZend skin - no html or body tags. + 2004-September 1 Joe Stewart <joe...@us...> [T] - Changed all phpslash.org to php-slash.org. |
|
From: Joe S. <joe...@us...> - 2004-09-21 11:25:38
|
Update of /cvsroot/phpslash/phpslash-skins/include/templates/en/embedded In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31134/embedded Log Message: Directory /cvsroot/phpslash/phpslash-skins/include/templates/en/embedded added to the repository |
|
From: Joe S. <joe...@us...> - 2004-09-21 11:18:44
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29910/phpslash-dev Modified Files: CHANGES Log Message: allow auto registration from external authentication Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** CHANGES 20 Sep 2004 16:16:35 -0000 1.103 --- CHANGES 21 Sep 2004 11:18:35 -0000 1.104 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2004-September 21 Joe Stewart <joe...@us... + [F] - slashAuth.class - allow auto registration from external authentication. + slashAuthSkel.class - Skeleton auth class. + slashAuthPAM.class, SlashAuthHTTP.class - untested auth methods. + 2004-September 20 Joe Stewart <joe...@us... [EF] - jpcache/types/memcache.php - Adding memcache storage method |
|
From: Joe S. <joe...@us...> - 2004-09-21 11:18:27
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29828/phpslash-dev/include/modules/auth/authtypes Added Files: slashAuthPAM.class slashAuthHTTP.class Log Message: add untested PAM and HTTP auth classes --- NEW FILE: slashAuthPAM.class --- <?php /* $Id: slashAuthPAM.class,v 1.1 2004/09/21 11:18:17 joestewart Exp $ * * pam_auth module - http://www.math.ohio-state.edu/~ccunning/pam_auth/ */ class slashAuth extends slashAuth_base { // pam authentication function psl_validate($username, $password, $response='', $user_info='') { if (pam_auth($username, $passwd, &$this->message)) { if($user_info) { // user exists in psl already return true; } elseif ($this->psl['auth.autoadd']) { // if config allows for us to add external users $ary['author_name'] = $username; if($user_info = this->psl_register_authed($ary)) { return $user_info; } } } return false; } } ?> --- NEW FILE: slashAuthHTTP.class --- <?php /* $Id: slashAuthHTTP.class,v 1.1 2004/09/21 11:18:17 joestewart Exp $ * * Authentication somewhat based on HTTP auth in phpgroupware * Copyright (C) 2000, 2001 Dan Kuykendall * */ class slashAuth extends slashAuth_base { // http authentication function psl_validate($username='', $password='', $response='', $user_info='') { if (isset($_SERVER['PHP_AUTH_USER'])) { return true; } else { return false; } } // override the preauth to check PHP_AUTH_USER function psl_preauth($username, $password, $user_info) { return $this->psl_validate(); } } ?> |
|
From: Joe S. <joe...@us...> - 2004-09-21 11:17:09
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/auth/authtypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29559/phpslash-dev/include/modules/auth/authtypes Added Files: slashAuthSkel.class Log Message: add Skeleton auth class --- NEW FILE: slashAuthSkel.class --- <?php /* $Id: slashAuthSkel.class,v 1.1 2004/09/21 11:16:59 joestewart Exp $ * * Skeleton example for providing external authentication to phpSlash */ /* class slashAuth extends slashAuth_base { // This validation method is required. // returns true if user is validated // false otherwise // The parent class loginform uses attempts to use Challenge-Response and the // password argument will typically be blank // function psl_validate($username='', $password='', $response='', $user_info='') { if (external_validation($username, $password)) { return true; } else { return false; } } // The example methods below all exist in the parent class and are optional // except if required for bridging authorization to the external method. // override the preauth to check if already externally authorized // upon initial entry to psl. function psl_preauth($username, $password, $user_info) { return false; } // Display the login form function auth_loginform() { } // Useful methods in the parent class: // psl_register_authed($ary) - Pass user info in the argument array to // add an authenticated user that does not exist in the psl database. // Can be added in psl_validate above to sync the user databases upon // success. // set_preauth_cookie($user_info) - use a different method to set data that // is to be checked in psl_preauth(). // get_psluser_info($username) - returns an array containing any information // in the database corresponding to the username argument. } */ ?> |
|
From: Joe S. <joe...@us...> - 2004-09-21 11:14:14
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/auth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28895/phpslash-dev/include/modules/auth Modified Files: slashAuth.class Log Message: allow auto registration from external authentication Index: slashAuth.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/auth/slashAuth.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** slashAuth.class 16 Sep 2004 21:05:07 -0000 1.2 --- slashAuth.class 21 Sep 2004 11:14:05 -0000 1.3 *************** *** 787,792 **** } ! // method to be overridden in child class ! // used by authtypes/slashAuthCR.class and authtypes/slashAuth.class function psl_validate($username, $password, $response, $user_info) { global $challenge; --- 787,821 ---- } ! /** ! * psl_register_authed - register in psl an externally authenticated user. ! * ! * @return void ! */ ! function psl_register_authed($ary) { ! ! // add new user ! $author = pslNew("Author"); ! if(empty($ary["password"])) { ! $ary["password"] = md5(uniqid($this->magic)); ! } ! if(empty($ary["permission"])) { ! $perm_ary['nobody'] = 20; ! $perm_ary['user'] = 21; ! $ary["permission"] = $perm_ary; ! } ! ! // use Author.class saveAuthor for account creation ! if ($author->saveAuthor($ary)) { ! // successful account creation ! return $ary; ! } else { ! // account creation failed ! $this->auth["error"] = pslgetText("User Registration failed"); ! return false; ! } ! ! } ! ! // dummy method to be overridden in child class function psl_validate($username, $password, $response, $user_info) { global $challenge; |
|
From: Joe S. <joe...@us...> - 2004-09-20 16:16:49
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5578/phpslash-dev Modified Files: CHANGES Log Message: Adding memcache support to jpcache Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** CHANGES 18 Sep 2004 14:40:03 -0000 1.102 --- CHANGES 20 Sep 2004 16:16:35 -0000 1.103 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2004-September 20 Joe Stewart <joe...@us... + [EF] - jpcache/types/memcache.php - Adding memcache storage method + to jpcache. No garbage collection or deletion available yet. + 2004-September 18 Joe Stewart <joe...@us... [F] - Admin module - added blocks from Back-End for file perm |
|
From: Joe S. <joe...@us...> - 2004-09-20 16:16:49
|
Update of /cvsroot/phpslash/phpslash-dev/include/class/jpcache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5578/phpslash-dev/include/class/jpcache Modified Files: jpcache-config.php Log Message: Adding memcache support to jpcache Index: jpcache-config.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/class/jpcache/jpcache-config.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jpcache-config.php 20 Nov 2003 21:14:59 -0000 1.2 --- jpcache-config.php 20 Sep 2004 16:16:37 -0000 1.3 *************** *** 21,24 **** --- 21,25 ---- //$JPCACHE_TYPE = "mysql"; //$JPCACHE_TYPE = "dbm"; + $JPCACHE_TYPE = "memcache"; //$JPCACHE_TYPE = "phplib"; *************** *** 65,67 **** --- 66,74 ---- // collection is executed. Please check // first if this works on your mySQL! + + /** + * Memcache based caching settings + */ + $JPCACHE_MEMCACHE_HOST = "localhost"; // Memcache Server + $JPCACHE_MEMCACHE_PORT = "11211"; // Port ?> |
|
From: Joe S. <joe...@us...> - 2004-09-20 16:16:49
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5578/phpslash-dev/public_html Modified Files: config-dist.php Log Message: Adding memcache support to jpcache Index: config-dist.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** config-dist.php 15 Sep 2004 23:18:39 -0000 1.24 --- config-dist.php 20 Sep 2004 16:16:37 -0000 1.25 *************** *** 361,364 **** --- 361,371 ---- // collection is executed. Please check // first if this works on your mySQL! + + /** + * Memcache based caching settings + */ + $JPCACHE_MEMCACHE_HOST = "localhost"; // Memcache Server + $JPCACHE_MEMCACHE_PORT = "11211"; // Port + $JPCACHE_VERSION = "2.0.0rc1"; // Standard jpcache functions |
|
From: Joe S. <joe...@us...> - 2004-09-20 16:16:47
|
Update of /cvsroot/phpslash/phpslash-dev/include/class/jpcache/type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5578/phpslash-dev/include/class/jpcache/type Added Files: memcache.php Log Message: Adding memcache support to jpcache --- NEW FILE: memcache.php --- <?php /* $Id: memcache.php,v 1.1 2004/09/20 16:16:37 joestewart Exp $ */ // Add variables you use to jpcache-config.php // // Storage type using Memcache // // memcached is available at http://www.danga.com/memcached/ // requires the memcache pecl module: http://pecl.php.net/package/memcache // function jpcache_memcache_connect() { if(array_key_exists("memcache_object", $GLOBALS)) { $connected = true; } else { $connected = false; } if(!$connected) { $GLOBALS['memcache_object'] = memcache_connect($GLOBALS['JPCACHE_MEMCACHE_HOST'], $GLOBALS['JPCACHE_MEMCACHE_PORT']); } return $GLOBALS['memcache_object']; } /* jpcache_restore() * * Will (try to) restore the cachedata. */ function jpcache_restore() { // Construct key name $keyname = $GLOBALS["JPCACHE_FILEPREFIX"].$GLOBALS["jpcache_key"]; // read memcache $cachedata=jpcache_memcache_read($keyname); if (is_array($cachedata)) { // Only read cache of my version if ($cachedata["jpcache_version"] == $GLOBALS["JPCACHE_VERSION"]) { if (($cachedata["jpcache_expire"] == "0") || ($cachedata["jpcache_expire"] >= time())) { //Restore data $GLOBALS["jpcachedata_gzdata"] = $cachedata["jpcachedata_gzdata"]; $GLOBALS["jpcachedata_datasize"] = $cachedata["jpcachedata_datasize"]; $GLOBALS["jpcachedata_datacrc"] = $cachedata["jpcachedata_datacrc"]; return TRUE; } else { jpcache_debug("Data in cache $keyname has expired"); } } else { // Invalid version of cache- jpcache_debug("Invalid version of cache- $keyname"); } } else { // Invalid cache- jpcache_debug("Invalid content of cache- $keyname"); } return FALSE; } /* jpcache_write() * * Will (try to) write out the cachedata to memcache */ function jpcache_write($gzdata, $datasize, $datacrc) { // Construct keyname $keyname = $GLOBALS["JPCACHE_FILEPREFIX"].$GLOBALS["jpcache_key"]; // Create and fill cachedata-array $cachedata = array(); $cachedata["jpcache_version"] = $GLOBALS["JPCACHE_VERSION"]; $cachedata["jpcache_expire"] = ($GLOBALS["JPCACHE_TIME"] > 0) ? time() + $GLOBALS["JPCACHE_TIME"] : 0; $cachedata["jpcachedata_gzdata"] = $gzdata; $cachedata["jpcachedata_datasize"] = $datasize; $cachedata["jpcachedata_datacrc"] = $datacrc; // And write the data if (jpcache_memcache_write($keyname, $cachedata)) { jpcache_debug("Successfully wrote cache $keyname"); } else { jpcache_debug("Unable to write cache $keyname"); } } /* jpcache_do_gc() * * Performs the actual garbagecollection * * TODO: implement garbage collection */ function jpcache_do_gc($method='cachetimeout', $argv='') { switch($method) { case 'regex': break; case 'string': break; case 'cachetimeout': default: break; // end default case } } /* jpcache_do_start() * * Additional code that is executed before real jpcache-code kicks in */ function jpcache_do_start() { // Connect to memcache daemon jpcache_memcache_connect(); } /* jpcache_do_end() * * Additional code that is executed after caching has been performed, * but just before output is returned. No new output can be added! */ function jpcache_do_end() { // Add additional code you might require } /* This internal function reads in the cache- */ function jpcache_memcache_read($keyname) { return $GLOBALS['memcache_object']->get($keyname); } /* This internal function writes the cache */ function jpcache_memcache_write($keyname, $data) { return $GLOBALS['memcache_object']->set($keyname, $data); } // Make sure no additional lines/characters are after the closing-tag! ?> |
|
From: Joe S. <joe...@us...> - 2004-09-18 15:46:57
|
Update of /cvsroot/phpslash/phpslash-dev/tables/0.8 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17714/phpslash-dev/tables/0.8 Modified Files: slash-all.sql Log Message: Added Admin Blocks From Back-End Index: slash-all.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.8/slash-all.sql,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** slash-all.sql 17 Sep 2004 15:17:47 -0000 1.9 --- slash-all.sql 18 Sep 2004 15:46:48 -0000 1.10 *************** *** 122,126 **** INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_variable_seq',63); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_section_seq',16); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_block_seq',171); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_author_seq',20); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_infolog',170); --- 122,126 ---- INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_variable_seq',63); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_section_seq',16); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_block_seq',174); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_author_seq',20); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_infolog',170); *************** *** 128,132 **** INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_glossary_seq',1); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_blocktype_seq',20); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_section_block_lut_seq',440); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_permission_seq',82); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_seq',28); --- 128,132 ---- INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_glossary_seq',1); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_blocktype_seq',20); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_section_block_lut_seq',443); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_permission_seq',82); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_seq',28); *************** *** 212,216 **** INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (144,6,'Most Popular Stories',3600,'','order=hits','','a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}',60,1053009560); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (145,6,'Older Stories',3600,'','start=5&max=5','','a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}',30,990019227); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (148,1,'Administration',0,'','','<p>A bunch of cool things like latest site activity and stats should go here. </p>\n <p>But until they do, just pick something from the NavBar and go about your duties...</p>\n','a:3:{s:6:\"column\";s:6:\"center\";s:5:\"perms\";s:4:\"user\";s:0:\"\";s:0:\"\";}',90,1025284604); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (149,12,'Tasks',0,'','menu_ary=menuadmin&tpl=navbarBlockh','','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:4:\"100%\";s:5:\"perms\";s:4:\"user\";s:8:\"box_type\";s:6:\"framed\";}',95,1025284618); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (150,15,'Page - public - header',0,'','','','a:3:{s:6:\"column\";s:3:\"top\";s:5:\"width\";s:4:\"100%\";s:8:\"box_type\";s:11:\"contentonly\";}',95,NULL); --- 212,216 ---- INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (144,6,'Most Popular Stories',3600,'','order=hits','','a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}',60,1053009560); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (145,6,'Older Stories',3600,'','start=5&max=5','','a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}',30,990019227); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (148,18,'Administration',0,'','','<p>A bunch of cool things like latest site activity and stats should go here. </p>\r\n <p>But until they do, just pick something from the NavBar and go about your duties...</p>\r\n','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:5:\"perms\";s:4:\"user\";s:6:\"module\";s:5:\"Admin\";}',92,NULL); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (149,12,'Tasks',0,'','menu_ary=menuadmin&tpl=navbarBlockh','','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:4:\"100%\";s:5:\"perms\";s:4:\"user\";s:8:\"box_type\";s:6:\"framed\";}',95,1025284618); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (150,15,'Page - public - header',0,'','','','a:3:{s:6:\"column\";s:3:\"top\";s:5:\"width\";s:4:\"100%\";s:8:\"box_type\";s:11:\"contentonly\";}',95,NULL); *************** *** 233,236 **** --- 233,240 ---- INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (170,18,'Module - Comment',0,'','','','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";s:6:\"module\";s:7:\"Comment\";}',80,NULL); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (171,18,'Related Links',0,'','','','a:4:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Story\";s:4:\"page\";s:12:\"relatedlinks\";}',92,NULL); + INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (172,18,'Config Files Security',0,'','','','a:5:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Admin\";s:4:\"page\";s:11:\"configperms\";s:8:\"box_type\";s:4:\"open\";}',90,NULL); + INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (173,18,'Clear Cache',0,'','','','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Admin\";s:4:\"page\";s:10:\"clearcache\";}',80,NULL); + INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (174,18,'System Details',0,'','','','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:5:\"Admin\";s:4:\"page\";s:13:\"systemdetails\";}',70,NULL); + -- -- Table structure for table 'psl_block_type' *************** *** 982,985 **** --- 986,992 ---- INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (439,171,7); INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (440,155,8); + INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (441,172,8); + INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (442,173,8); + INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (443,174,8); -- |
2 messages has been excluded from this view by a project administrator.
