phpslash-commit Mailing List for phpSlash (Page 67)
Brought to you by:
joestewart,
nhruby
This list is closed, nobody may subscribe to it.
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...> - 2003-01-09 01:02:18
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic In directory sc8-pr-cvs1:/tmp/cvs-serv25874/phpslash-ft/public_html/templates/en/basic Modified Files: articleEmailForm.tpl articleEmailSent.tpl backendHTML.tpl fancybox.tpl navbarBlockh.tpl titlebar.tpl Added Files: article-wml.tpl framedbox.tpl Log Message: basiccurves skin --- NEW FILE: article-wml.tpl --- <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml"> <wml> <card title="{SITENAME} {PAGETITLE} : {TITLE}"> <p> <b>{TITLE}</b><br/> {INTRO_TEXT} {BODY_TEXT}</p> </card> </wml> --- NEW FILE: framedbox.tpl --- <!-- START FRAMEDBOX.TPL: {TITLE} --> <IMG SRC="{IMAGEDIR}/layout/blank.gif" HEIGHT="1" WIDTH="1" ALT=""> <table border="1" width="{WIDTH}" cellspacing="0" cellpadding="0" bordercolor="#3F4469" bordercolordark="#3F4469" bordercolorlight="#3F4469"> <tr> <td width="100%"> <table border="0" width="100%"> <tr> <td width="100%" align="left" valign="top"> <!-- START FANCYBOX TEMPLATE CONTENTS --><font face="arial,helvetica" size="2"> {CONTENTS} </font> <!-- END FANCYBOX TEMPLATE CONTENTS --> </td> </tr> </table> </td> </tr> </table> <img src ="{IMAGEDIR}/layout/blank.gif" width ="150" height = "15"><br> <!-- END FRAMEDBOX.TPL --> Index: articleEmailForm.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/articleEmailForm.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** articleEmailForm.tpl 9 Apr 2002 16:57:06 -0000 1.2 --- articleEmailForm.tpl 9 Jan 2003 01:02:15 -0000 1.3 *************** *** 9,13 **** <tr> <td class="titleBar"> - <img src="{IMAGEDIR}/layout/slc.gif" width="13" height="16" align="top" alt="" /> Email this Story to a Friend </td> --- 9,12 ---- Index: articleEmailSent.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/articleEmailSent.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** articleEmailSent.tpl 9 Apr 2002 16:57:06 -0000 1.2 --- articleEmailSent.tpl 9 Jan 2003 01:02:15 -0000 1.3 *************** *** 9,13 **** <tr> <td class="titleBar"> - <img src="{IMAGEDIR}/layout/slc.gif" width="13" height="16" align="top" alt="" /> Email this Story to a Friend </td> --- 9,12 ---- *************** *** 42,44 **** </div> <!-- id="articleEmailSent" --> ! <!-- End articleEmailSent.tpl --> \ No newline at end of file --- 41,43 ---- </div> <!-- id="articleEmailSent" --> ! <!-- End articleEmailSent.tpl --> Index: backendHTML.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/backendHTML.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** backendHTML.tpl 9 Apr 2002 16:53:34 -0000 1.1 --- backendHTML.tpl 9 Jan 2003 01:02:15 -0000 1.2 *************** *** 7,11 **** <tr bgcolor="#3F4469" align="LEFT"> <td valign=top> ! <img src="{IMAGEDIR}/layout/slc.gif" width=13 height=16 align=top alt=""><a href="{ROOTDIR}" target="{TARGET}"><font size="4" color="white" face="arial,helvetica"><b>{SITE_NAME}</b></font></a></td> </tr> <tr> --- 7,11 ---- <tr bgcolor="#3F4469" align="LEFT"> <td valign=top> ! <a href="{ROOTDIR}" target="{TARGET}"><font size="4" color="white" face="arial,helvetica"><b>{SITE_NAME}</b></font></a></td> </tr> <tr> Index: fancybox.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/fancybox.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fancybox.tpl 9 Apr 2002 16:57:06 -0000 1.2 --- fancybox.tpl 9 Jan 2003 01:02:15 -0000 1.3 *************** *** 2,6 **** <div id="fancyBox"> <div id="fancyBoxHeader"> - <img src="{IMAGEDIR}/layout/slc.gif" width="13" height="16" alt="" /> {LINK_OPEN}{TITLE}{LINK_CLOSE} </div> --- 2,5 ---- Index: navbarBlockh.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/navbarBlockh.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** navbarBlockh.tpl 30 Jun 2002 14:16:01 -0000 1.1 --- navbarBlockh.tpl 9 Jan 2003 01:02:15 -0000 1.2 *************** *** 1,5 **** ! <!-- START: navbarBlock.tpl --> <!-- BEGIN each_destination --> <a href="{LINK_NAVBAR}"><b>{LINK_NAVBAR_TEXT}</b></a> <!-- END each_destination --> ! <!-- END: navbarBlock.tpl --> --- 1,5 ---- ! <!-- START: navbarBlockh.tpl --> <!-- BEGIN each_destination --> <a href="{LINK_NAVBAR}"><b>{LINK_NAVBAR_TEXT}</b></a> <!-- END each_destination --> ! <!-- END: navbarBlockh.tpl --> Index: titlebar.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/titlebar.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** titlebar.tpl 9 Apr 2002 16:57:06 -0000 1.2 --- titlebar.tpl 9 Jan 2003 01:02:15 -0000 1.3 *************** *** 3,7 **** <tr> <td> - <img src="{IMAGEDIR}/layout/slc.gif" width="13" height="16" alt="" /> <span class="titleBarTitle">{TITLE}</span> </td> --- 3,6 ---- |
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basiccurves In directory sc8-pr-cvs1:/tmp/cvs-serv25874/phpslash-ft/public_html/templates/en/basiccurves Added Files: articleEmailForm.tpl articleEmailSent.tpl backendHTML.tpl fancybox.tpl skin.ini slashHead.tpl titlebar.tpl Log Message: basiccurves skin --- NEW FILE: articleEmailForm.tpl --- <!-- START articleEmailForm.tpl --> <div id="articleEmailForm"> <table cellpadding="0" cellspacing="0" border="0" width="100%"> <tr> <td> <img src="{IMAGEDIR}/layout/blank.gif" height="1" width="1" alt="" /> </td> </tr> <tr> <td class="titleBar"> <img src="{IMAGEDIR}/layout/slc.gif" width="13" height="16" align="top" alt="" /> Email this Story to a Friend </td> </tr> </table> <form action="{ACTION_URL}" method="post"> <input type="hidden" name="story_id" value="{STORY_ID}" /> <table width="100%" cellspacing="0" cellpadding="0"> <tr> <td class="descr">Your Name:</td> <td><input type="text" name="mailFromName" size="40" value="{MAILFROMNAME}" /></td> </tr> <tr> <td class="descr">Your Email Address:</td> <td><input type="text" name="mailFromAddress" size="40" value="{MAILFROMADDRESS}" /></td> </tr> <tr> <td class="descr">To Name:</td> <td><input type="text" name="mailToName" size="40" value="{MAILTONAME}" /></td> </tr> <tr> <td class="descr">To Address:</td> <td><input type="text" name="mailToAddress" size="40" value="{MAILTOADDRESS}" /></td> </tr> <tr> <td class="descr">Message To Send:</td> <td><textarea name="mailString" wrap="physical" cols="40" rows="10">{MAILSTRING}</textarea></td> <tr> <td class="descr"> </td> <td><input type="submit" value="Send Now!" /></td> </tr> </table> </form> <hr /> </div> <!-- id="articleEmailForm" --> <!-- END articleEmailForm.tpl --> --- NEW FILE: articleEmailSent.tpl --- <!-- start articleEmailSent.tpl --> <div id="articleEmailSent"> <table cellpadding="0" cellspacing="0" border="0" width="100%"> <tr> <td> <img src="{IMAGEDIR}/layout/blank.gif" height="1" width="1" alt="" /> </td> </tr> <tr> <td class="titleBar"> <img src="{IMAGEDIR}/layout/slc.gif" width="13" height="16" align="top" alt="" /> Email this Story to a Friend </td> </tr> </table> <table width="100%" cellspacing="0" cellpadding="0"> <tr> <td colspan="2" class="headline">Your Email Story was Sent!</td> </tr> <tr> <td class="descr">Your Name:</td> <td>{MAILFROMNAME}</td> </tr> <tr> <td class="descr">Your Email Address:</td> <td>{MAILFROMADDRESS}</td> </tr> <tr> <td class="descr">To Name:</td> <td>{MAILTONAME}</td> </tr> <tr> <td class="descr">To Address:</td> <td>{MAILTOADDRESS}</td> </tr> <tr> <td class="descr">Message Sent:</td> <td>{MAILSTRING}</td> </tr> </table> </div> <!-- id="articleEmailSent" --> <!-- End articleEmailSent.tpl --> --- NEW FILE: backendHTML.tpl --- <table cellpadding="0" cellspacing="0" border="0" width="100%" > <tr> <td> <IMG SRC="{IMAGEDIR}/layout/blank.gif" HEIGHT="1" WIDTH="1" ALT=""> </td> </tr> <tr bgcolor="#3F4469" align="LEFT"> <td valign=top> <img src="{IMAGEDIR}/layout/slc.gif" width=13 height=16 align=top alt=""><a href="{ROOTDIR}" target="{TARGET}"><font size="4" color="white" face="arial,helvetica"><b>{SITE_NAME}</b></font></a></td> </tr> <tr> <td> <ul> <!-- BEGIN each_story --> <li><a href="{ROOTDIR}/article.php3?story_id={STORY_ID}" target="{TARGET}">{TITLE}</a><br>{INTRO_TEXT} <!-- END each_story --> </ul> </td> </tr> </table> --- NEW FILE: fancybox.tpl --- <!-- START fancybox.tpl: {TITLE} --> <div id="fancyBox"> <div id="fancyBoxHeader"> <img src="{IMAGEDIR}/layout/slc.gif" width="13" height="16" alt="" /> {LINK_OPEN}{TITLE}{LINK_CLOSE} </div> <!-- START fancyBox template content --> {CONTENTS} <!-- END fancyBox template content --> </div> <!-- id="fancyBox" --> <!-- END fancybox.tpl --> --- NEW FILE: skin.ini --- ;; Name of parent skin ;; $Id: skin.ini,v 1.1 2003/01/09 01:02:15 joestewart Exp $ skin.parent = "basic" --- NEW FILE: slashHead.tpl --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <!-- START slashHead.tpl --> <html> <head> <title>{SITE_NAME} - {SECTION} {SITETITLE}</title> <!-- 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.. --> <meta name="object" content="{XSITEOBJECT}" /> <!-- 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.php3" /> <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/basic.css" /> </head> <body> <a name="top"></a> <div id="header"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <!-- START: Title and Search --> <tr> <td><a href="{ROOTDIR}"><img src="{IMAGEDIR}/new-logo.gif" border="0" alt="" /></a></td> <td width="50%" align="center"> <form method="get" action="{SEARCH_ACTION_URL}"> <input type="text" name=query value="" size="15" /> <input type="submit" value="Search" /> <input type="hidden" name="topic_id" value="" /> <input type="hidden" name="section_id" value="" /> <input type="hidden" name="author_id" value="" /> </form> </td> </tr> </table> <!-- END: Title and Search --> {TOPICBAR} {NAVBAR} </div> <!-- id="header" --> <!-- END slashHead.tpl --> --- NEW FILE: titlebar.tpl --- <!-- START titlebar.tpl --> <table class="titleBar" cellpadding="0" cellspacing="0" border="0" width="{WIDTH}"> <tr> <td> <img src="{IMAGEDIR}/layout/slc.gif" width="13" height="16" alt="" /> <span class="titleBarTitle">{TITLE}</span> </td> </tr> </table> <!-- END titlebar.tpl --> |
From: Joe S. <joe...@us...> - 2003-01-09 00:47:51
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basiccurves In directory sc8-pr-cvs1:/tmp/cvs-serv22011/basiccurves Log Message: Directory /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basiccurves added to the repository |
From: Joe S. <joe...@us...> - 2003-01-08 20:29:08
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv3308/phpslash-ft Modified Files: CHANGES Log Message: upgrade script Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.641 retrieving revision 1.642 diff -C2 -d -r1.641 -r1.642 *** CHANGES 8 Jan 2003 17:00:38 -0000 1.641 --- CHANGES 8 Jan 2003 20:29:02 -0000 1.642 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-January-08 2:30PM CST Joe Stewart <joe...@us...> + [W] - db_xfer.php3.disabled - a working upgrade script. No known bugs but + beware. Assumes a correctly installed config.php3. + 2003-January-08 10:30AM CST Joe Stewart <joe...@us...> [W] - cronmail.php3 - Lars Kvanum provided some more fixes. |
From: Joe S. <joe...@us...> - 2003-01-08 20:29:08
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv3308/phpslash-ft/public_html Modified Files: db_xfer.php3.disabled Log Message: upgrade script Index: db_xfer.php3.disabled =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/db_xfer.php3.disabled,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** db_xfer.php3.disabled 27 Nov 2000 07:15:39 -0000 1.17 --- db_xfer.php3.disabled 8 Jan 2003 20:29:04 -0000 1.18 *************** *** 3,109 **** /* ! * Script to migrate a PHPSlash database from v 0.5x to 0.6. * See function usage() for help. * * NOTES/TO-DOs: - * - I am not sure if the DB schema at this time has all IDs - * defined as sequences. Without that, we cannot use - * PHPLIB's $db->nextid() to get a new id when migrating; - * thus the IDs here are pretty much hacked together for now. [...1112 lines suppressed...] *** 802,809 **** if ( count($do_this) > 0 ) { ! echo "<a href=\"$PHP_SELF\"> Back to Migration Options </a><br>"; } ! echo "</tr></td></table></div>\n"; ! echo "</body></html>"; ?> --- 337,346 ---- if ( count($do_this) > 0 ) { ! $content .= "<a href=\"$PHP_SELF\"> Back to Migration Options </a><br>"; } ! echo $content; ! ! slashfoot(); ! ?> |
From: Joe S. <joe...@us...> - 2003-01-08 17:00:54
|
Update of /cvsroot/phpslash/phpslash-ft/contrib In directory sc8-pr-cvs1:/tmp/cvs-serv7820/phpslash-ft/contrib Modified Files: cronmail.php3 Log Message: Lars Kvanum provided fixes to cronmail.php3 Index: cronmail.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/contrib/cronmail.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** cronmail.php3 21 Nov 2002 18:59:07 -0000 1.8 --- cronmail.php3 8 Jan 2003 17:00:45 -0000 1.9 *************** *** 138,142 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 138,142 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 148,152 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 148,152 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 158,162 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 158,162 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 168,172 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 168,172 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 179,183 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 179,183 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 189,193 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 189,193 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 199,203 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 199,203 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 209,213 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 209,213 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 219,223 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 219,223 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 229,233 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 229,233 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 239,243 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 239,243 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 249,253 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 249,253 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 259,263 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 259,263 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 269,273 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 269,273 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 405,413 **** $eyear = date("Y"); $begdate = date("Y-m-d H:i:s", mktime(0,0,0,$bmonth,$bday,$byear)); ! $enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday + 1,$eyear)); // this should get the stories using the class // but, for the moment 2002-06-12 luis mondesi: $sql="SELECT story_id, title, dept, ". ! " date_available as timestamp, ". " intro_text FROM psl_story ". " WHERE time >= '$begdate' AND time <= '$enddate' ORDER BY time DESC"; --- 405,413 ---- $eyear = date("Y"); $begdate = date("Y-m-d H:i:s", mktime(0,0,0,$bmonth,$bday,$byear)); ! $enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday,$eyear)); // this should get the stories using the class // but, for the moment 2002-06-12 luis mondesi: $sql="SELECT story_id, title, dept, ". ! " UNIX_TIMESTAMP(time) as pretty_time, ". " intro_text FROM psl_story ". " WHERE time >= '$begdate' AND time <= '$enddate' ORDER BY time DESC"; *************** *** 421,425 **** GLOBAL $siteurl; $headline = "\n" . pslgetText("Story") . ": ".format_mail($slash_q->Record["title"],500,true) . "\n"; ! $headline .= " " . pslgetText("Written") . ": " . psl_dateTimeLong($slash_q->Record["timestamp"]) . "\n"; $headline .= " " . pslgetText("Intro") . ": " . format_mail($slash_q->Record["intro_text"],500,true) . ".\n"; $headline .= " ".$siteurl."/article.php3?story_id=" . $slash_q->Record["story_id"]."\n"; --- 421,425 ---- GLOBAL $siteurl; $headline = "\n" . pslgetText("Story") . ": ".format_mail($slash_q->Record["title"],500,true) . "\n"; ! $headline .= " " . pslgetText("Written") . ": " . psl_dateTimeLong($slash_q->Record["pretty_time"]) . "\n"; $headline .= " " . pslgetText("Intro") . ": " . format_mail($slash_q->Record["intro_text"],500,true) . ".\n"; $headline .= " ".$siteurl."/article.php3?story_id=" . $slash_q->Record["story_id"]."\n"; *************** *** 447,451 **** $enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday + 1,$eyear)); $sql=" SELECT story_id, title, dept, ". ! " date_available, ". " intro_text FROM psl_story ". " WHERE time >= '$begdate' AND time <= '$enddate' ORDER BY time DESC"; --- 447,451 ---- $enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday + 1,$eyear)); $sql=" SELECT story_id, title, dept, ". ! " date_format(time, \"%W %M %d %h %i %p\") as pretty_time, ". " intro_text FROM psl_story ". " WHERE time >= '$begdate' AND time <= '$enddate' ORDER BY time DESC"; *************** *** 457,462 **** $headline = "<B>".format_mail($slash_q->Record["title"],500,true) . "</B><BR>\n"; $headline .= " From the: \"" . $slash_q->Record["dept"] . "\" dept.<BR>\n"; ! $headline .= " Posted on: \"" ! . psl_dateTimeLong($slash_q->Record["date_available"]) . "<BR>\n"; $headline .= " Story: " . format_mail(chopit($slash_q->Record["intro_text"]),500,true) . ".</I><BR>\n"; $headline .= "<A HREF=\"".$siteurl."/article.php3?story_id=" . $slash_q->Record["story_id"] . "\">Full Story</A>\n"; --- 457,461 ---- $headline = "<B>".format_mail($slash_q->Record["title"],500,true) . "</B><BR>\n"; $headline .= " From the: \"" . $slash_q->Record["dept"] . "\" dept.<BR>\n"; ! $headline .= " Posted on: \"" . $slash_q->Record["pretty_time"] . "<BR>\n"; $headline .= " Story: " . format_mail(chopit($slash_q->Record["intro_text"]),500,true) . ".</I><BR>\n"; $headline .= "<A HREF=\"".$siteurl."/article.php3?story_id=" . $slash_q->Record["story_id"] . "\">Full Story</A>\n"; |
From: Joe S. <joe...@us...> - 2003-01-08 17:00:53
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv7820/phpslash-ft Modified Files: CHANGES Log Message: Lars Kvanum provided fixes to cronmail.php3 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.640 retrieving revision 1.641 diff -C2 -d -r1.640 -r1.641 *** CHANGES 8 Jan 2003 16:42:37 -0000 1.640 --- CHANGES 8 Jan 2003 17:00:38 -0000 1.641 *************** *** 14,17 **** --- 14,20 ---- 2003-January-08 10:30AM CST Joe Stewart <joe...@us...> + [W] - cronmail.php3 - Lars Kvanum provided some more fixes. + + 2003-January-08 10:30AM CST Joe Stewart <joe...@us...> [FT] - article.php3, backend.php3, article-xhtmlb.tpl, backendWml.tpl, backendXHTMLb.tpl, phpslash.sgml - Many thanks to Jonar Eikeland for |
From: Joe S. <joe...@us...> - 2003-01-08 16:46:25
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory sc8-pr-cvs1:/tmp/cvs-serv1507/phpslash-ft/public_html/templates/en/default Modified Files: backendWml.tpl Added Files: article-xhtmlb.tpl backendXHTMLb.tpl Log Message: Jonar Eikeland supplied xhtmlb and wml output --- NEW FILE: article-xhtmlb.tpl --- <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>{SITE_NAME} {PAGETITLE} : {TITLE}</title> <link type="text/css" rel="stylesheet" href="{ROOTDIR}/styles/xhtmlb.css"/> </head> <body> <p class="headline">{TITLE}</p> <p>{INTRO_TEXT}</p> <p>{BODY_TEXT}</p> <p>Delivered by <a href="{ROOTDIR}">{SITENAME}</a></p> </body> </html> --- NEW FILE: backendXHTMLb.tpl --- <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>{SITE_NAME}</title> <link type="text/css" rel="stylesheet" href="{ROOTDIR}/styles/xhtmlb.css"/> </head> <body> <!-- BEGIN each_story --> <p><a href="{ROOTDIR}/article.php3?story_id={STORY_ID}&submit=xhtmlb">{TITLE}</a><br/> {INTRO_TEXT}</p> <!-- END each_story --> <p class="menu">Show [ <a title="full description" href="{ROOTDIR}/backend.php3?view=xhtmlb">Intro</a> | <a title="no description" href="{ROOTDIR}/backend.php3?view=xhtmlb&d=0">No Intro</a> ]</p> <p>News collected from {SITE_NAME}</p> </body> </html> Index: backendWml.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/backendWml.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** backendWml.tpl 14 Sep 2002 16:12:17 -0000 1.3 --- backendWml.tpl 8 Jan 2003 16:46:22 -0000 1.4 *************** *** 1,11 **** ! <?xml version="1.0" encoding="UTF-8" ?> ! <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml"> ! <wml> ! <card id="nifcard" title="{SITE_NAME}"> ! <!-- BEGIN each_story --> ! <p><u>{TITLE}</u> <i>{INTRO_TEXT}</i></p> ! <!-- END each_story --> ! <p align="right">Powered by {SITE_NAME}</p> ! </card> ! </wml> ! --- 1,12 ---- ! <?xml version="1.0" encoding="iso-8859-1"?> ! <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml"> ! <wml> ! <card id="nifcard" title="{SITE_NAME}"> ! <!-- BEGIN each_story --> ! <p><u><a href="{ROOTDIR}/article.php3?story_id={STORY_ID}&submit=wml">{TITLE}</a></u><br/> {INTRO_TEXT}</p> ! <!-- END each_story --> ! <p align="center">Show [ <a title="full description" href="{ROOTDIR}/backend.php3?view=wml">Intro</a> | <a title="no description" href="{ROOTDIR}/backend.php3?view=wml&d=0">No Intro</a> ]</p> ! <p align="right">News collected from {SITE_NAME}</p> ! </card> ! </wml> ! |
From: Joe S. <joe...@us...> - 2003-01-08 16:46:24
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic In directory sc8-pr-cvs1:/tmp/cvs-serv1507/phpslash-ft/public_html/templates/en/basic Modified Files: backendWml.tpl Added Files: article-xhtmlb.tpl backendXHTMLb.tpl Log Message: Jonar Eikeland supplied xhtmlb and wml output --- NEW FILE: article-xhtmlb.tpl --- <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>{SITE_NAME} {PAGETITLE} : {TITLE}</title> <link type="text/css" rel="stylesheet" href="{ROOTDIR}/styles/xhtmlb.css"/> </head> <body> <p class="headline">{TITLE}</p> <p>{INTRO_TEXT}</p> <p>{BODY_TEXT}</p> <p>Delivered by <a href="{ROOTDIR}">{SITENAME}</a></p> </body> </html> --- NEW FILE: backendXHTMLb.tpl --- <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>{SITE_NAME}</title> <link type="text/css" rel="stylesheet" href="{ROOTDIR}/styles/xhtmlb.css"/> </head> <body> <!-- BEGIN each_story --> <p><a href="{ROOTDIR}/article.php3?story_id={STORY_ID}&submit=xhtmlb">{TITLE}</a><br/> {INTRO_TEXT}</p> <!-- END each_story --> <p class="menu">Show [ <a title="full description" href="{ROOTDIR}/backend.php3?view=xhtmlb">Intro</a> | <a title="no description" href="{ROOTDIR}/backend.php3?view=xhtmlb&d=0">No Intro</a> ]</p> <p>News collected from {SITE_NAME}</p> </body> </html> Index: backendWml.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/backendWml.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** backendWml.tpl 14 Sep 2002 16:12:17 -0000 1.3 --- backendWml.tpl 8 Jan 2003 16:46:20 -0000 1.4 *************** *** 1,11 **** ! <?xml version="1.0" encoding="UTF-8" ?> ! <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml"> ! <wml> ! <card id="nifcard" title="{SITE_NAME}"> ! <!-- BEGIN each_story --> ! <p><u>{TITLE}</u> <i>{INTRO_TEXT}</i></p> ! <!-- END each_story --> ! <p align="right">Powered by {SITE_NAME}</p> ! </card> ! </wml> ! --- 1,12 ---- ! <?xml version="1.0" encoding="iso-8859-1"?> ! <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml"> ! <wml> ! <card id="nifcard" title="{SITE_NAME}"> ! <!-- BEGIN each_story --> ! <p><u><a href="{ROOTDIR}/article.php3?story_id={STORY_ID}&submit=wml">{TITLE}</a></u><br/> {INTRO_TEXT}</p> ! <!-- END each_story --> ! <p align="center">Show [ <a title="full description" href="{ROOTDIR}/backend.php3?view=wml">Intro</a> | <a title="no description" href="{ROOTDIR}/backend.php3?view=wml&d=0">No Intro</a> ]</p> ! <p align="right">News collected from {SITE_NAME}</p> ! </card> ! </wml> ! |
From: Joe S. <joe...@us...> - 2003-01-08 16:46:03
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html In directory sc8-pr-cvs1:/tmp/cvs-serv1344/phpslash-ft/doc/html Modified Files: phpslash.sgml Log Message: Jonar Eikeland supplied xhtmlb and wml output Index: phpslash.sgml =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** phpslash.sgml 8 Jan 2003 16:42:42 -0000 1.59 --- phpslash.sgml 8 Jan 2003 16:45:58 -0000 1.60 *************** *** 1434,1437 **** --- 1434,1438 ---- about.tpl - About page article-pf.tpl - printer friendly article page + article-xhtmlb.tpl - xhtml basic article view article.tpl - deprecated articleEmailForm.tpl - email article to a friend form |
From: Joe S. <joe...@us...> - 2003-01-08 16:43:19
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html In directory sc8-pr-cvs1:/tmp/cvs-serv32589/phpslash-ft/doc/html Modified Files: phpslash.sgml Log Message: Jonar Eikeland supplied xhtmlb and wml output Index: phpslash.sgml =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** phpslash.sgml 21 Nov 2002 18:21:06 -0000 1.58 --- phpslash.sgml 8 Jan 2003 16:42:42 -0000 1.59 *************** *** 773,776 **** --- 773,777 ---- backendAV.tpl backendWml.tpl + backendXHTMLb.tpl blockEdit.tpl blockList.tpl *************** *** 1451,1455 **** backendRSS92.tpl - RSS 0.92 backendTxt.tpl - text ! backendWml.tpl - WAP Wireless Markup Language [untested] blockEdit.tpl - manage blocks in blockAdmin blockList.tpl - list blocks in blockAdmin --- 1452,1457 ---- backendRSS92.tpl - RSS 0.92 backendTxt.tpl - text ! backendWml.tpl - WAP Wireless Markup Language ! backendXHTMLb.tpl - XHTML-Basic for mobile phones, PDAs, pagers, and settop boxes. blockEdit.tpl - manage blocks in blockAdmin blockList.tpl - list blocks in blockAdmin |
From: Joe S. <joe...@us...> - 2003-01-08 16:43:15
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv32589/phpslash-ft Modified Files: CHANGES Log Message: Jonar Eikeland supplied xhtmlb and wml output Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.639 retrieving revision 1.640 diff -C2 -d -r1.639 -r1.640 *** CHANGES 7 Jan 2003 19:31:12 -0000 1.639 --- CHANGES 8 Jan 2003 16:42:37 -0000 1.640 *************** *** 13,16 **** --- 13,24 ---- 9 - Removal of something (kill -9 :) + 2003-January-08 10:30AM CST Joe Stewart <joe...@us...> + [FT] - article.php3, backend.php3, article-xhtmlb.tpl, backendWml.tpl, + backendXHTMLb.tpl, phpslash.sgml - Many thanks to Jonar Eikeland for + submitting a refinement to the WAP output as well as adding XHTML Basic + support. From the w3c.org site: "It is designed for Web clients that + do not support the full set of XHTML features; for example, Web clients + such as mobile phones, PDAs, pagers, and settop boxes." + 2003-January-07 1:30PM CST Joe Stewart <joe...@us...> [W] - slashTemplate.class, functions.inc, NavBar.class - cleanup of template |
From: Joe S. <joe...@us...> - 2003-01-08 16:42:54
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv32589/phpslash-ft/public_html Modified Files: article.php3 backend.php3 Log Message: Jonar Eikeland supplied xhtmlb and wml output Index: article.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** article.php3 20 Dec 2002 22:17:30 -0000 1.73 --- article.php3 8 Jan 2003 16:42:44 -0000 1.74 *************** *** 38,42 **** $t->set_var(array( 'STORY_URL' => $_PSL['rooturl']."/article.php3?story_id=".$story_id, ! 'SITENAME' => $_PSL['site_name'], 'PAGETITLE' => $pagetitle, 'TITLE' => $ttitle, --- 38,42 ---- $t->set_var(array( 'STORY_URL' => $_PSL['rooturl']."/article.php3?story_id=".$story_id, ! 'SITENAME' => $_PSL['site_name'], 'PAGETITLE' => $pagetitle, 'TITLE' => $ttitle, *************** *** 48,51 **** --- 48,91 ---- 'BODY_TEXT' => $story->story_ary["body_text"], 'XSITEOBJECT' => $xsiteobject + )); + $t->parse('PAGE', 'article'); + $t->p('PAGE'); + break; + + case "wml": + header("Content-type: text/vnd.wap.wml"); + $t->set_file(article, "article-wml.tpl"); + $t->set_var(array( + 'STORY_URL' => $_PSL['rooturl']."/article.php3?story_id=".$story_id, + 'SITENAME' => $_PSL['site_name'], + 'PAGETITLE' => $pagetitle, + 'TITLE' => $ttitle, + 'NAME' => $story->story_ary["name"], + 'REALNAME' => $story->story_ary["realname"], + 'DATEF' => $story->story_ary["datef"], + 'DEPT' => $story->story_ary["dept"], + 'INTRO_TEXT' => $str = ereg_replace("<([^>]+)>", "", $story->story_ary["intro_text"]), + 'BODY_TEXT' => $str = ereg_replace("<([^>]+)>", "", $story->story_ary["body_text"]), + 'XSITEOBJECT' => $xsiteobject + )); + $t->parse('PAGE', 'article'); + $t->p('PAGE'); + break; + + case "xhtmlb": + header("Content-type: text/html"); + $t->set_file(article, "article-xhtmlb.tpl"); + $t->set_var(array( + 'STORY_URL' => $_PSL['rooturl']."/article.php3?story_id=".$story_id, + 'SITENAME' => $_PSL['site_name'], + 'PAGETITLE' => $pagetitle, + 'TITLE' => $ttitle, + 'NAME' => $story->story_ary["name"], + 'REALNAME' => $story->story_ary["realname"], + 'DATEF' => $story->story_ary["datef"], + 'DEPT' => $story->story_ary["dept"], + 'INTRO_TEXT' => $str = ereg_replace("<([^>]+)>", "", $story->story_ary["intro_text"]), + 'BODY_TEXT' => $str = ereg_replace("<([^>]+)>", "", $story->story_ary["body_text"]), + 'XSITEOBJECT' => $xsiteobject )); $t->parse('PAGE', 'article'); Index: backend.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/backend.php3,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** backend.php3 20 Dec 2002 22:17:31 -0000 1.35 --- backend.php3 8 Jan 2003 16:42:48 -0000 1.36 *************** *** 24,41 **** rss92 - RSS 0.92 [rss1] - RSS 1.0 - default ! html - fancybox ! txt - simple text output of title and intro ! block - text delimited by %% ! js - javascript ! jsdata - javascript array ! mozilla - for adding to Netscape 6 My Sidebar ! opml - OPML (http://radio.userland.com) ! wml - WML - for WAP phones * d = description - this is the intro text. // TODO: nh asks: Do we really need this? [d] - include description - default ! [s] - site name ! [l] - site name plus description ! [0] - empty description Some of the template views and options are based on those contained in HPE --- 24,42 ---- rss92 - RSS 0.92 [rss1] - RSS 1.0 - default ! html - fancybox ! txt - simple text output of title and intro ! block - text delimited by %% ! js - javascript ! jsdata - javascript array ! mozilla - for adding to Netscape 6 My Sidebar ! opml - OPML (http://radio.userland.com) ! wml - WML - for WAP phones ! xhtmlb - XHTML Basic * d = description - this is the intro text. // TODO: nh asks: Do we really need this? [d] - include description - default ! [s] - site name ! [l] - site name plus description ! [0] - empty description Some of the template views and options are based on those contained in HPE *************** *** 107,110 **** --- 108,115 ---- header("Content-type: text/vnd.wap.wml"); break; + case 'xhtmlb': + $viewtpl = 'backendXHTMLb.tpl'; + header("Content-type: text/html"); + break; case 'rss': case 'rss1': |
From: Joe S. <joe...@us...> - 2003-01-07 19:31:16
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv29798/phpslash-ft/class Modified Files: slashTemplate.class functions.inc NavBar.class Log Message: template set_file tweaks Index: slashTemplate.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/slashTemplate.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** slashTemplate.class 20 Dec 2002 22:17:30 -0000 1.1 --- slashTemplate.class 7 Jan 2003 19:31:13 -0000 1.2 *************** *** 70,84 **** $filepath = $templatedir ."/". $skin_cfg['skin.parent'] ."/". $filename; if(!file_exists($filepath)) { ! $this->halt("set_file1: set_file: For varname $varname filename $filepath is invalid."); } } else { ! $this->halt("set_file2: set_file: For varname $varname filename $filepath is invalid."); } } ! Template::set_file($varname, $filepath); ! } else { reset($varname); ! while(list($v, $f) = each($varname)) { --- 70,88 ---- $filepath = $templatedir ."/". $skin_cfg['skin.parent'] ."/". $filename; if(!file_exists($filepath)) { ! $this->message = "set_file: set_file: For varname $varname filename $filepath is invalid."; ! // $this->halt($this->message); ! return false; } } else { ! $this->message = "set_file: set_file: For varname $varname filename $filepath is invalid."; ! // $this->halt($this->message); ! return false; } } ! return Template::set_file($varname, $filepath); ! } else { reset($varname); ! while(list($v, $f) = each($varname)) { *************** *** 94,108 **** $varname_ary[$v] = $filepath; if(!is_file($filepath)) { ! $this->halt("set_file: set_file: For varname $v filename $filepath is invalid."); } } else { ! $this->halt("set_file: set_file: For varname $varname filename $filepath is invalid."); } } } ! Template::set_file($varname_ary, $filename); } ! } ! } ?> --- 98,120 ---- $varname_ary[$v] = $filepath; if(!is_file($filepath)) { ! $this->message = "set_file: set_file: For varname $v filename $filepath is invalid."; ! $this->halt($this->message); } } else { ! $this->message = "set_file: set_file: For varname $varname filename $filepath is invalid."; ! $this->halt($this->message); } } } ! return Template::set_file($varname_ary, $filename); } ! ! // no matches return false. ! return false; ! ! } // end of function set_root ! ! } // end of slashTemplate class ! ?> Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** functions.inc 20 Dec 2002 22:32:25 -0000 1.120 --- functions.inc 7 Jan 2003 19:31:13 -0000 1.121 *************** *** 196,214 **** /* Templates */ ! $templ = pslNew("slashTemplate",$_PSL['templatedir']); $templ->debug = 0; ! if ( ($box_type != "") AND ( file_exists($_PSL['templatedir'] . "/" . basename($box_type) . "box.tpl")) ) { ! $template = basename($box_type) . "box.tpl"; ! } ! ! $templ->set_file(array( ! 'fancybox' => $template ! )); ! ! $templ->set_var(array( ! 'IMAGEDIR' => $_PSL['imageurl'] ! )); ! if (!$contents) { return; --- 196,212 ---- /* Templates */ ! $templ = pslNew("slashTemplate"); $templ->debug = 0; ! if( $box_type == "") { ! $templ->set_file( 'fancybox', $template); ! } elseif ( $templ->set_file('fancybox' , basename($box_type) ."box.tpl" ) ! ) ! { ! } else { ! $templ->set_file( 'fancybox', $template); ! } ! ! // If the contents are empty don't generate an empty box if (!$contents) { return; *************** *** 222,231 **** } else { $templ->set_var(array( ! 'LINK_OPEN' => "<A HREF=\"$link\">", ! 'LINK_CLOSE' => "</A>" )); } $templ->set_var(array( 'SKIN' => $_PSL['skin'], 'WIDTH' => $width, --- 220,230 ---- } else { $templ->set_var(array( ! 'LINK_OPEN' => "<a href=\"$link\">", ! 'LINK_CLOSE' => "</a>" )); } $templ->set_var(array( + 'IMAGEDIR' => $_PSL['imageurl'], 'SKIN' => $_PSL['skin'], 'WIDTH' => $width, *************** *** 239,244 **** } // debug("templ_var", $templ->varvals); ! $templ->parse('FANCYBOX', "fancybox" ); ! return $templ->get('FANCYBOX'); } --- 238,244 ---- } // debug("templ_var", $templ->varvals); ! // $templ->parse('FANCYBOX', "fancybox" ); ! // return $templ->get('FANCYBOX'); ! return $templ->parse('FANCYBOX', "fancybox" ); } Index: NavBar.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/NavBar.class,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** NavBar.class 20 Dec 2002 22:17:29 -0000 1.17 --- NavBar.class 7 Jan 2003 19:31:13 -0000 1.18 *************** *** 60,84 **** global $auth, $perm; ! $default_template = "navbar"; if( $menu_ary == "") { $menu_ary = $this->psl['menuitem']; } - - if( empty($tpl) ) { - $template = $default_template; - } elseif ( file_exists($this->psl['templatedir'] . "/" . basename($tpl) . ".tpl") ) { - $tpl_file = basename($tpl) . ".tpl"; - $this->templ->set_file(array( - "template" => "$tpl_file" - )); - $template = "template"; - } else { - debug ( "NavBar.class::getNavBar:Template file doesn't exist, - using default instead", $tpl); - $template = $default_template; - } ! $this->templ->set_block( $template, "each_destination", "block" ); $this->templ->set_var( array( 'LINK_NAVBAR' => "", 'LINK_NAVBAR_TEXT' => "") ); --- 60,77 ---- global $auth, $perm; ! $default_template = "navbar.tpl"; if( $menu_ary == "") { $menu_ary = $this->psl['menuitem']; } ! if( $tpl == "") { ! $this->templ->set_file( 'template', $default_template); ! } elseif ( $this->templ->set_file('template' , basename($tpl) . ".tpl" )) { ! } else { ! $this->templ->set_file( 'template', $default_template); ! } ! ! $this->templ->set_block( 'template', "each_destination", "block" ); $this->templ->set_var( array( 'LINK_NAVBAR' => "", 'LINK_NAVBAR_TEXT' => "") ); *************** *** 110,114 **** } ! $this->templ->parse( "OUT", $template ); return $this->templ->get( "OUT" ); } --- 103,107 ---- } ! $this->templ->parse( "OUT", 'template' ); return $this->templ->get( "OUT" ); } |
From: Joe S. <joe...@us...> - 2003-01-07 19:31:16
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv29798/phpslash-ft Modified Files: CHANGES Log Message: template set_file tweaks Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.638 retrieving revision 1.639 diff -C2 -d -r1.638 -r1.639 *** CHANGES 20 Dec 2002 22:19:16 -0000 1.638 --- CHANGES 7 Jan 2003 19:31:12 -0000 1.639 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-January-07 1:30PM CST Joe Stewart <joe...@us...> + [W] - slashTemplate.class, functions.inc, NavBar.class - cleanup of template + set_file. Check for alternate template in getFancyBox and getNavBar. + 2002-December-20 3:00PM CST Joe Stewart <joe...@us...> [F] - new slashTemplate.class - skins now only need to contain the changed |
From: Joe S. <joe...@us...> - 2002-12-20 22:32:30
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv30922/phpslash-ft/public_html Modified Files: config-dist.php3 Log Message: slashTemplate allows parent skin sets Index: config-dist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** config-dist.php3 16 Dec 2002 22:49:52 -0000 1.22 --- config-dist.php3 20 Dec 2002 22:32:27 -0000 1.23 *************** *** 205,208 **** --- 205,210 ---- addClassRequirement("slashPerm","perm"); addClassRequirement("slashPerm",$_PSL['classdir'] . "/slashPerm.class"); + addClassRequirement("slashTemplate","template"); + addClassRequirement("slashTemplate",$_PSL['classdir'] . "/slashTemplate.class"); addClassRequirement("author",$_PSL['classdir'] . "/Author.class"); addLibraryRequirement("phpslash",$_PSL['classdir'] . "/functions.inc"); |
From: Joe S. <joe...@us...> - 2002-12-20 22:32:30
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv30922/phpslash-ft/class Modified Files: functions.inc Log Message: slashTemplate allows parent skin sets Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** functions.inc 20 Dec 2002 22:17:30 -0000 1.119 --- functions.inc 20 Dec 2002 22:32:25 -0000 1.120 *************** *** 26,30 **** /* Templates */ ! $templ = pslNew('Template',$_PSL['templatedir']); if ( ($tpl != "") AND ( file_exists($_PSL['templatedir'] . "/" . basename($tpl) . ".tpl")) ) { $template = basename($tpl) . ".tpl"; --- 26,30 ---- /* Templates */ ! $templ = pslNew('slashTemplate',$_PSL['templatedir']); if ( ($tpl != "") AND ( file_exists($_PSL['templatedir'] . "/" . basename($tpl) . ".tpl")) ) { $template = basename($tpl) . ".tpl"; |
From: Joe S. <joe...@us...> - 2002-12-20 22:19:19
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv26477/phpslash-ft Modified Files: CHANGES Log Message: slashTemplate allows parent skin sets Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.637 retrieving revision 1.638 diff -C2 -d -r1.637 -r1.638 *** CHANGES 20 Dec 2002 16:29:58 -0000 1.637 --- CHANGES 20 Dec 2002 22:19:16 -0000 1.638 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-December-20 3:00PM CST Joe Stewart <joe...@us...> + [F] - new slashTemplate.class - skins now only need to contain the changed + templates from a parent skin. All calls to the Template class changed + to slashTemplate. + 2002-December-20 9:00AM CST Joe Stewart <joe...@us...> [F] - Comment.class, comment.php3, commentDisplay.tpl - Seth Hall's comment |
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv25814/phpslash-ft/class Modified Files: Author.class Block_admin.class Block_i.class Block_render_cal.class Block_render_comments.class Block_render_login.class Block_render_query.class Block_render_quote.class Block_render_rss.class Block_render_section.class Block_render_skin.class Block_render_submission.class Block_render_topic.class Comment.class Glossary.class Group.class Infolog.class MailingList.class NavBar.class Poll.class Section.class Story.class Story_admin.class Submission.class Topic.class TopicBar.class Variable.class functions.inc slashAuth.class slashAuthCR.class tz.class tz_posix.class Added Files: slashTemplate.class Log Message: slashTemplate allows parent skin sets --- NEW FILE: slashTemplate.class --- <?php /** * slashTemplate.class -> Primary methods for providing Templates * @version $Id: slashTemplate.class,v 1.1 2002/12/20 22:17:30 joestewart Exp $ * * Provides Session functions of PHPSlash * * Extends the phplib Template class. * */ class slashTemplate extends Template { /** * @var psl configuration variables */ var $psl; /** * The slashTemplate Constructor * * sets up the local version of the global _PSL array. * * @access public * @param string root * @param string unknowns */ function slashTemplate($root = ".", $unknowns = "remove") { global $_PSL; $this->psl = &$_PSL; if ($this->debug & 4) { echo "<p><b>Template:</b> root = $root, unknowns = $unknowns</p>\n"; } // $this->set_root($root); $this->set_unknowns($unknowns); } /** * set_root is unused in this class. * **/ function set_root($root="") { } /** * set_file now needs to prepend the correct path to the filename * before passing off to the parent set_file. * * if the given filename is not found in the current skin directory * a search is made for it in the skin.parent specified in an optional * skin.ini file. * * @access public * @param string varname * @param string filename **/ function set_file($varname, $filename = "") { if (!is_array($varname)) { $filepath = $this->psl['templatedir'] ."/". $filename; if(!file_exists($filepath)) { if(file_exists($this->psl['templatedir'] ."/skin.ini")) { $skin_cfg = parse_ini_file($this->psl['templatedir'] ."/". "skin.ini"); $templatedir = substr($this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") ); $filepath = $templatedir ."/". $skin_cfg['skin.parent'] ."/". $filename; if(!file_exists($filepath)) { $this->halt("set_file1: set_file: For varname $varname filename $filepath is invalid."); } } else { $this->halt("set_file2: set_file: For varname $varname filename $filepath is invalid."); } } Template::set_file($varname, $filepath); } else { reset($varname); while(list($v, $f) = each($varname)) { $filepath = $this->psl['templatedir'] ."/". $f; if( file_exists($filepath)) { $varname_ary[$v] = $filepath; } else { if(file_exists($this->psl['templatedir'] ."/skin.ini")) { $skin_cfg = parse_ini_file($this->psl['templatedir'] ."/". "skin.ini"); $templatedir = substr($this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") ); $filepath = $templatedir ."/". $skin_cfg['skin.parent'] ."/". $f; $varname_ary[$v] = $filepath; if(!is_file($filepath)) { $this->halt("set_file: set_file: For varname $v filename $filepath is invalid."); } } else { $this->halt("set_file: set_file: For varname $varname filename $filepath is invalid."); } } } Template::set_file($varname_ary, $filename); } } } ?> Index: Author.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Author.class 11 Dec 2002 19:39:52 -0000 1.34 --- Author.class 20 Dec 2002 22:17:28 -0000 1.35 *************** *** 41,45 **** /* Templates */ ! $this->author_templ = pslNew("Template",$this->psl['templatedir'], "remove"); $this->author_templ->debug = 0; $this->author_templ->set_file(array( --- 41,45 ---- /* Templates */ ! $this->author_templ = pslNew("slashTemplate",$this->psl['templatedir'], "remove"); $this->author_templ->debug = 0; $this->author_templ->set_file(array( Index: Block_admin.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_admin.class,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Block_admin.class 11 Dec 2002 19:39:53 -0000 1.5 --- Block_admin.class 20 Dec 2002 22:17:29 -0000 1.6 *************** *** 42,46 **** /* Start Template Object */ ! $this->templ = pslNew("Template",$this->psl['templatedir'], "remove"); $this->templ->debug = 0; --- 42,46 ---- /* Start Template Object */ ! $this->templ = pslNew("slashTemplate",$this->psl['templatedir'], "remove"); $this->templ->debug = 0; *************** *** 270,274 **** function listBlockTypes($option="", $name="") { ! $this->templ = pslNew("Template",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file(array( --- 270,274 ---- function listBlockTypes($option="", $name="") { ! $this->templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file(array( Index: Block_i.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_i.class,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Block_i.class 11 Dec 2002 19:39:53 -0000 1.23 --- Block_i.class 20 Dec 2002 22:17:29 -0000 1.24 *************** *** 43,47 **** /* Start Template Object */ ! $this->templ = pslNew("Template",$this->psl['templatedir']); $this->templ->debug = 0; --- 43,47 ---- /* Start Template Object */ ! $this->templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->templ->debug = 0; Index: Block_render_cal.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_cal.class,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Block_render_cal.class 11 Dec 2002 19:39:53 -0000 1.12 --- Block_render_cal.class 20 Dec 2002 22:17:29 -0000 1.13 *************** *** 18,22 **** // TODO: Make this class use $_PSL ! $templ = pslNew("Template",$this->psl['templatedir']); $templ->set_file(array( 'calendar' => 'calendar.tpl' --- 18,22 ---- // TODO: Make this class use $_PSL ! $templ = pslNew("slashTemplate",$this->psl['templatedir']); $templ->set_file(array( 'calendar' => 'calendar.tpl' Index: Block_render_comments.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_comments.class,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Block_render_comments.class 11 Dec 2002 19:39:53 -0000 1.6 --- Block_render_comments.class 20 Dec 2002 22:17:29 -0000 1.7 *************** *** 72,76 **** } ! $template = pslNew("Template",$templatedir . "/" . $skin); $template->debug = 0; $template->set_file(array( --- 72,76 ---- } ! $template = pslNew("slashTemplate",$templatedir . "/" . $skin); $template->debug = 0; $template->set_file(array( Index: Block_render_login.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_login.class,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Block_render_login.class 11 Dec 2002 19:39:54 -0000 1.6 --- Block_render_login.class 20 Dec 2002 22:17:29 -0000 1.7 *************** *** 54,58 **** } ! $template = pslNew("Template",$this->psl['templatedir']); $template->debug = 0; $template->set_file(array( --- 54,58 ---- } ! $template = pslNew("slashTemplate",$this->psl['templatedir']); $template->debug = 0; $template->set_file(array( Index: Block_render_query.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_query.class,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Block_render_query.class 11 Dec 2002 19:39:54 -0000 1.11 --- Block_render_query.class 20 Dec 2002 22:17:29 -0000 1.12 *************** *** 65,69 **** } ! $template = pslNew("Template",$this->psl['templatedir']); $template->debug = 0; $template->set_file(array( --- 65,69 ---- } ! $template = pslNew("slashTemplate",$this->psl['templatedir']); $template->debug = 0; $template->set_file(array( Index: Block_render_quote.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_quote.class,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Block_render_quote.class 11 Dec 2002 19:39:54 -0000 1.7 --- Block_render_quote.class 20 Dec 2002 22:17:29 -0000 1.8 *************** *** 42,46 **** } ! $template = pslNew("Template",$this->psl['templatedir']); $template->debug = 0; $template->set_file(array( --- 42,46 ---- } ! $template = pslNew("slashTemplate",$this->psl['templatedir']); $template->debug = 0; $template->set_file(array( Index: Block_render_rss.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_rss.class,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Block_render_rss.class 11 Dec 2002 19:39:54 -0000 1.12 --- Block_render_rss.class 20 Dec 2002 22:17:29 -0000 1.13 *************** *** 364,368 **** // debug("rss::parse::items", $this->rdf->items); ! $template = pslNew("Template",$this->psl["templatedir"]); $template->set_file ("block", $tpl); --- 364,368 ---- // debug("rss::parse::items", $this->rdf->items); ! $template = pslNew("slashTemplate",$this->psl["templatedir"]); $template->set_file ("block", $tpl); Index: Block_render_section.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_section.class,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Block_render_section.class 11 Dec 2002 19:39:54 -0000 1.13 --- Block_render_section.class 20 Dec 2002 22:17:29 -0000 1.14 *************** *** 85,89 **** } ! $template = pslNew("Template",$this->psl['templatedir']); $template->debug = 0; $template->set_file(array( --- 85,89 ---- } ! $template = pslNew("slashTemplate",$this->psl['templatedir']); $template->debug = 0; $template->set_file(array( Index: Block_render_skin.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_skin.class,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Block_render_skin.class 11 Dec 2002 19:39:54 -0000 1.9 --- Block_render_skin.class 20 Dec 2002 22:17:29 -0000 1.10 *************** *** 69,73 **** } ! $template = pslNew("Template",$templatedir . "/" . $skin); $template->debug = 0; $template->set_file(array( --- 69,73 ---- } ! $template = pslNew("slashTemplate",$templatedir . "/" . $skin); $template->debug = 0; $template->set_file(array( Index: Block_render_submission.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_submission.class,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Block_render_submission.class 11 Dec 2002 19:39:54 -0000 1.6 --- Block_render_submission.class 20 Dec 2002 22:17:29 -0000 1.7 *************** *** 34,38 **** // Templates ! $this->templ = pslNew("Template",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file ( array( --- 34,38 ---- // Templates ! $this->templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file ( array( Index: Block_render_topic.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_topic.class,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Block_render_topic.class 11 Dec 2002 19:39:54 -0000 1.13 --- Block_render_topic.class 20 Dec 2002 22:17:29 -0000 1.14 *************** *** 58,62 **** } ! $template = pslNew("Template",$this->psl['templatedir']); $template->debug = 0; $template->set_file(array( --- 58,62 ---- } ! $template = pslNew("slashTemplate",$this->psl['templatedir']); $template->debug = 0; $template->set_file(array( Index: Comment.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Comment.class 20 Dec 2002 16:29:58 -0000 1.39 --- Comment.class 20 Dec 2002 22:17:29 -0000 1.40 *************** *** 56,60 **** /* Templates */ ! $this->ctempl = pslNew("Template",$this->psl['templatedir'], 'remove'); $this->ctempl->debug = 0; $this->ctempl->set_file(array( --- 56,60 ---- /* Templates */ ! $this->ctempl = pslNew("slashTemplate",$this->psl['templatedir'], 'remove'); $this->ctempl->debug = 0; $this->ctempl->set_file(array( *************** *** 396,400 **** $all_comments = ''; ! $templ = pslNew("Template",$this->psl['templatedir'], 'remove'); $templ->debug = 0; $templ->set_file(array( --- 396,400 ---- $all_comments = ''; ! $templ = pslNew("slashTemplate",$this->psl['templatedir'], 'remove'); $templ->debug = 0; $templ->set_file(array( *************** *** 438,442 **** $all_comments = ''; ! $templ = pslNew("Template",$this->psl['templatedir'], remove); $templ->debug = 0; $templ->set_file(array( --- 438,442 ---- $all_comments = ''; ! $templ = pslNew("slashTemplate",$this->psl['templatedir'], remove); $templ->debug = 0; $templ->set_file(array( *************** *** 482,486 **** $all_comments = ''; ! $templ = pslNew("Template",$this->psl['templatedir'], remove); $templ->debug = 0; $templ->set_file(array( --- 482,486 ---- $all_comments = ''; ! $templ = pslNew("slashTemplate",$this->psl['templatedir'], remove); $templ->debug = 0; $templ->set_file(array( Index: Glossary.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Glossary.class,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Glossary.class 11 Dec 2002 19:39:54 -0000 1.10 --- Glossary.class 20 Dec 2002 22:17:29 -0000 1.11 *************** *** 25,29 **** /* Templates */ ! $this->templ = pslNew("Template",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file(array( --- 25,29 ---- /* Templates */ ! $this->templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file(array( Index: Group.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Group.class,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Group.class 11 Dec 2002 19:39:54 -0000 1.4 --- Group.class 20 Dec 2002 22:17:29 -0000 1.5 *************** *** 34,38 **** /* Templates */ ! $this->group_templ = pslNew("Template",$this->psl['templatedir']); $this->group_templ->debug = 0; $this->group_templ->set_file(array( --- 34,38 ---- /* Templates */ ! $this->group_templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->group_templ->debug = 0; $this->group_templ->set_file(array( *************** *** 40,44 **** 'newgroup' => "groupNew.tpl" )); ! $this->permission_templ = pslNew("Template",$this->psl['templatedir']); $this->permission_templ->debug = 0; $this->permission_templ->set_file(array( --- 40,44 ---- 'newgroup' => "groupNew.tpl" )); ! $this->permission_templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->permission_templ->debug = 0; $this->permission_templ->set_file(array( Index: Infolog.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Infolog.class,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Infolog.class 11 Dec 2002 19:39:54 -0000 1.7 --- Infolog.class 20 Dec 2002 22:17:29 -0000 1.8 *************** *** 26,30 **** /* Templates */ ! $this->templ = pslNew("Template",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file(array( --- 26,30 ---- /* Templates */ ! $this->templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file(array( Index: MailingList.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/MailingList.class,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MailingList.class 11 Dec 2002 19:39:54 -0000 1.13 --- MailingList.class 20 Dec 2002 22:17:29 -0000 1.14 *************** *** 25,29 **** /* Templates */ ! $this->templ = pslNew("Template",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file(array( --- 25,29 ---- /* Templates */ ! $this->templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file(array( Index: NavBar.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/NavBar.class,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** NavBar.class 11 Dec 2002 19:39:54 -0000 1.16 --- NavBar.class 20 Dec 2002 22:17:29 -0000 1.17 *************** *** 27,31 **** /* Templates */ ! $this->templ = pslNew("Template",$this->psl['templatedir'], "remove"); $this->templ->debug = false; $this->templ->halt_on_error = "report"; --- 27,31 ---- /* Templates */ ! $this->templ = pslNew("slashTemplate",$this->psl['templatedir'], "remove"); $this->templ->debug = false; $this->templ->halt_on_error = "report"; Index: Poll.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Poll.class 11 Dec 2002 19:39:54 -0000 1.24 --- Poll.class 20 Dec 2002 22:17:29 -0000 1.25 *************** *** 35,39 **** * Templates */ ! $this->templ = pslNew("Template",$_PSL['templatedir']); $this->templ->debug = 0; $this->templ->set_file(array( --- 35,39 ---- * Templates */ ! $this->templ = pslNew("slashTemplate",$_PSL['templatedir']); $this->templ->debug = 0; $this->templ->set_file(array( Index: Section.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Section.class,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Section.class 11 Dec 2002 19:39:55 -0000 1.12 --- Section.class 20 Dec 2002 22:17:29 -0000 1.13 *************** *** 24,28 **** /* Templates */ ! $this->sec_templ = pslNew("Template",$this->psl['templatedir']); $this->sec_templ->debug = 0; $this->sec_templ->set_file(array( --- 24,28 ---- /* Templates */ ! $this->sec_templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->sec_templ->debug = 0; $this->sec_templ->set_file(array( Index: Story.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Story.class 11 Dec 2002 19:39:55 -0000 1.47 --- Story.class 20 Dec 2002 22:17:29 -0000 1.48 *************** *** 57,61 **** ); ! $this->template = pslNew("Template",$this->psl['templatedir'], "remove"); $this->template->debug = 0; $this->template->set_file($template_ary); --- 57,61 ---- ); ! $this->template = pslNew("slashTemplate",$this->psl['templatedir'], "remove"); $this->template->debug = 0; $this->template->set_file($template_ary); Index: Story_admin.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_admin.class,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Story_admin.class 11 Dec 2002 19:39:55 -0000 1.9 --- Story_admin.class 20 Dec 2002 22:17:30 -0000 1.10 *************** *** 58,62 **** ); ! $this->template = pslNew("Template",$this->psl['templatedir'], "remove"); $this->template->debug = 0; $this->template->set_file($template_ary); --- 58,62 ---- ); ! $this->template = pslNew("slashTemplate",$this->psl['templatedir'], "remove"); $this->template->debug = 0; $this->template->set_file($template_ary); Index: Submission.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Submission.class,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Submission.class 11 Dec 2002 19:39:55 -0000 1.14 --- Submission.class 20 Dec 2002 22:17:30 -0000 1.15 *************** *** 14,18 **** /* Templates */ ! $this->templ = pslNew("Template",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file ( array( --- 14,18 ---- /* Templates */ ! $this->templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->templ->debug = 0; $this->templ->set_file ( array( Index: Topic.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Topic.class,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Topic.class 11 Dec 2002 19:39:55 -0000 1.14 --- Topic.class 20 Dec 2002 22:17:30 -0000 1.15 *************** *** 34,38 **** /* Templates */ ! $this->topic_templ = pslNew("Template",$this->psl['templatedir']); $this->topic_templ->debug = 0; $this->topic_templ->set_file(array( --- 34,38 ---- /* Templates */ ! $this->topic_templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->topic_templ->debug = 0; $this->topic_templ->set_file(array( *************** *** 345,349 **** function displayTopics($option="") { ! $this->topic_templ = pslNew("Template",$this->psl[templatedir]); $this->topic_templ->debug = 0; $this->topic_templ->set_file(array( --- 345,349 ---- function displayTopics($option="") { ! $this->topic_templ = pslNew("slashTemplate",$this->psl[templatedir]); $this->topic_templ->debug = 0; $this->topic_templ->set_file(array( Index: TopicBar.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/TopicBar.class,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TopicBar.class 11 Dec 2002 19:39:55 -0000 1.4 --- TopicBar.class 20 Dec 2002 22:17:30 -0000 1.5 *************** *** 19,23 **** /* Templates */ ! $this->templ = pslNew("Template",$this->psl['templatedir'], "remove"); $this->templ->debug = 0; $this->templ->halt_on_error = "report"; --- 19,23 ---- /* Templates */ ! $this->templ = pslNew("slashTemplate",$this->psl['templatedir'], "remove"); $this->templ->debug = 0; $this->templ->halt_on_error = "report"; Index: Variable.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Variable.class,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Variable.class 11 Dec 2002 19:39:55 -0000 1.6 --- Variable.class 20 Dec 2002 22:17:30 -0000 1.7 *************** *** 29,33 **** /* Templates */ ! $this->variable_templ = pslNew("Template",$this->psl['templatedir']); $this->variable_templ->debug = 0; $this->variable_templ->set_file(array( --- 29,33 ---- /* Templates */ ! $this->variable_templ = pslNew("slashTemplate",$this->psl['templatedir']); $this->variable_templ->debug = 0; $this->variable_templ->set_file(array( Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** functions.inc 11 Dec 2002 23:03:15 -0000 1.118 --- functions.inc 20 Dec 2002 22:17:30 -0000 1.119 *************** *** 160,164 **** /* Templates */ ! $stempl = pslNew("Template",$_PSL['templatedir']); $stempl->debug = 0; --- 160,164 ---- /* Templates */ ! $stempl = pslNew("slashTemplate",$_PSL['templatedir']); $stempl->debug = 0; *************** *** 196,200 **** /* Templates */ ! $templ = pslNew("Template",$_PSL['templatedir']); $templ->debug = 0; --- 196,200 ---- /* Templates */ ! $templ = pslNew("slashTemplate",$_PSL['templatedir']); $templ->debug = 0; *************** *** 529,533 **** } ! $templ = pslNew("Template",$_PSL['templatedir']); $templ->debug = 0; --- 529,533 ---- } ! $templ = pslNew("slashTemplate",$_PSL['templatedir']); $templ->debug = 0; *************** *** 647,651 **** ! $templ = pslNew("Template",$_PSL['templatedir']); $templ->debug = 0; --- 647,651 ---- ! $templ = pslNew("slashTemplate",$_PSL['templatedir']); $templ->debug = 0; *************** *** 797,801 **** $topic_link = ""; ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 797,801 ---- $topic_link = ""; ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( *************** *** 1457,1461 **** } ! $template = pslNew("Template",$_PSL['templatedir'], "remove");; $template->set_file("emailnotify",$tpl); --- 1457,1461 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir'], "remove");; $template->set_file("emailnotify",$tpl); Index: slashAuth.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuth.class,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** slashAuth.class 11 Dec 2002 19:39:56 -0000 1.9 --- slashAuth.class 20 Dec 2002 22:17:30 -0000 1.10 *************** *** 37,41 **** global $_PSL; ! $templ = pslNew("Template",$_PSL['templatedir']); $templ->set_file(array( 'form' => "loginform.tpl" --- 37,41 ---- global $_PSL; ! $templ = pslNew("slashTemplate",$_PSL['templatedir']); $templ->set_file(array( 'form' => "loginform.tpl" Index: slashAuthCR.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** slashAuthCR.class 11 Dec 2002 19:39:56 -0000 1.34 --- slashAuthCR.class 20 Dec 2002 22:17:30 -0000 1.35 *************** *** 99,103 **** } ! $templ = pslNew("Template",$_PSL['templatedir']); $templ->set_file(array( 'form' => "loginformCR.tpl" --- 99,103 ---- } ! $templ = pslNew("slashTemplate",$_PSL['templatedir']); $templ->set_file(array( 'form' => "loginformCR.tpl" *************** *** 360,364 **** global $sess; ! $templ = pslNew("Template",$this->psl['templatedir']); $templ->set_file(array( form => "registerform.tpl" --- 360,364 ---- global $sess; ! $templ = pslNew("slashTemplate",$this->psl['templatedir']); $templ->set_file(array( form => "registerform.tpl" Index: tz.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/tz.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tz.class 11 Dec 2002 19:39:56 -0000 1.2 --- tz.class 20 Dec 2002 22:17:30 -0000 1.3 *************** *** 224,228 **** function get_select_form($action_url='',$method='GET') { $action_url || $action_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']; ! $tpl = pslNew("Template",$this->templatedir); // $tpl->debug=true; $tpl->set_file('form','tz_form_native.tpl'); --- 224,228 ---- function get_select_form($action_url='',$method='GET') { $action_url || $action_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']; ! $tpl = pslNew("slashTemplate",$this->templatedir); // $tpl->debug=true; $tpl->set_file('form','tz_form_native.tpl'); *************** *** 341,345 **** function get_confirm_form($ary,$accept_url="",$reject_url='') { $reject_url || $reject_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']; ! $tpl = pslNew("Template",$this->templatedir); $tpl->set_file('form','tz_form_confirm.tpl'); $tpl->set_file('current_time','tz_show.tpl'); --- 341,345 ---- function get_confirm_form($ary,$accept_url="",$reject_url='') { $reject_url || $reject_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']; ! $tpl = pslNew("slashTemplate",$this->templatedir); $tpl->set_file('form','tz_form_confirm.tpl'); $tpl->set_file('current_time','tz_show.tpl'); Index: tz_posix.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/tz_posix.class,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tz_posix.class 11 Dec 2002 19:39:56 -0000 1.3 --- tz_posix.class 20 Dec 2002 22:17:30 -0000 1.4 *************** *** 298,302 **** */ function get_select_form($action_url='',$method='GET') { ! $tpl = pslNew("Template",$this->templatedir); $action_url || $action_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']; --- 298,302 ---- */ function get_select_form($action_url='',$method='GET') { ! $tpl = pslNew("slashTemplate",$this->templatedir); $action_url || $action_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']; |
From: Joe S. <joe...@us...> - 2002-12-20 22:17:35
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin In directory sc8-pr-cvs1:/tmp/cvs-serv25814/phpslash-ft/public_html/admin Modified Files: authorAdmin.php3 blockAdmin.php3 commentAdmin.php3 glossaryAdmin.php3 groupAdmin.php3 infologAdmin.php3 mailinglistAdmin.php3 pollAdmin.php3 sectionAdmin.php3 storyAdmin.php3 submissionAdmin.php3 topicAdmin.php3 variableAdmin.php3 Log Message: slashTemplate allows parent skin sets Index: authorAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/authorAdmin.php3,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** authorAdmin.php3 11 Dec 2002 19:41:37 -0000 1.13 --- authorAdmin.php3 20 Dec 2002 22:17:32 -0000 1.14 *************** *** 123,127 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 123,127 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: blockAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/blockAdmin.php3,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** blockAdmin.php3 11 Dec 2002 19:41:37 -0000 1.13 --- blockAdmin.php3 20 Dec 2002 22:17:32 -0000 1.14 *************** *** 128,132 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 128,132 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: commentAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/commentAdmin.php3,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** commentAdmin.php3 11 Dec 2002 19:41:38 -0000 1.15 --- commentAdmin.php3 20 Dec 2002 22:17:32 -0000 1.16 *************** *** 183,187 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 183,187 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: glossaryAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/glossaryAdmin.php3,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** glossaryAdmin.php3 11 Dec 2002 19:41:38 -0000 1.6 --- glossaryAdmin.php3 20 Dec 2002 22:17:32 -0000 1.7 *************** *** 120,124 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 120,124 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: groupAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/groupAdmin.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** groupAdmin.php3 11 Dec 2002 19:41:38 -0000 1.8 --- groupAdmin.php3 20 Dec 2002 22:17:32 -0000 1.9 *************** *** 204,208 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 204,208 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: infologAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/infologAdmin.php3,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** infologAdmin.php3 11 Dec 2002 19:41:38 -0000 1.9 --- infologAdmin.php3 20 Dec 2002 22:17:32 -0000 1.10 *************** *** 85,89 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 85,89 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: mailinglistAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/mailinglistAdmin.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mailinglistAdmin.php3 11 Dec 2002 19:41:38 -0000 1.8 --- mailinglistAdmin.php3 20 Dec 2002 22:17:32 -0000 1.9 *************** *** 110,114 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 110,114 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: pollAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/pollAdmin.php3,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** pollAdmin.php3 11 Dec 2002 19:41:38 -0000 1.14 --- pollAdmin.php3 20 Dec 2002 22:17:32 -0000 1.15 *************** *** 118,122 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 118,122 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: sectionAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/sectionAdmin.php3,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** sectionAdmin.php3 11 Dec 2002 19:41:38 -0000 1.9 --- sectionAdmin.php3 20 Dec 2002 22:17:32 -0000 1.10 *************** *** 113,117 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 113,117 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: storyAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/storyAdmin.php3,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** storyAdmin.php3 11 Dec 2002 19:41:38 -0000 1.18 --- storyAdmin.php3 20 Dec 2002 22:17:32 -0000 1.19 *************** *** 142,146 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 142,146 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: submissionAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/submissionAdmin.php3,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** submissionAdmin.php3 11 Dec 2002 19:41:39 -0000 1.11 --- submissionAdmin.php3 20 Dec 2002 22:17:32 -0000 1.12 *************** *** 165,169 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 165,169 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: topicAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/topicAdmin.php3,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** topicAdmin.php3 11 Dec 2002 19:41:39 -0000 1.7 --- topicAdmin.php3 20 Dec 2002 22:17:32 -0000 1.8 *************** *** 124,128 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 124,128 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: variableAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/variableAdmin.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** variableAdmin.php3 11 Dec 2002 19:41:39 -0000 1.8 --- variableAdmin.php3 20 Dec 2002 22:17:32 -0000 1.9 *************** *** 123,127 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 123,127 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( |
From: Joe S. <joe...@us...> - 2002-12-20 22:17:35
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv25814/phpslash-ft/public_html Modified Files: about.php3 article.php3 backend.php3 comment.php3 config.php3 errordocument.php3 glossary.php3 index.php3 login.php3 mailinglist.php3 poll.php3 profile.php3 search.php3 submission.php3 Log Message: slashTemplate allows parent skin sets Index: about.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/about.php3,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** about.php3 11 Dec 2002 21:25:54 -0000 1.20 --- about.php3 20 Dec 2002 22:17:30 -0000 1.21 *************** *** 21,25 **** slashhead($pagetitle,$_PSL['metatags']); ! $about_templ = pslNew("Template",$_PSL['templatedir']); $about_templ->set_file(array( 'main' => "about.tpl" --- 21,25 ---- slashhead($pagetitle,$_PSL['metatags']); ! $about_templ = pslNew("slashTemplate",$_PSL['templatedir']); $about_templ->set_file(array( 'main' => "about.tpl" *************** *** 47,51 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 47,51 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: article.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** article.php3 11 Dec 2002 21:25:54 -0000 1.72 --- article.php3 20 Dec 2002 22:17:30 -0000 1.73 *************** *** 24,28 **** $story_html = $story->getStory($story_id, "full", $ary); ! $t = pslNew("Template",$_PSL['templatedir'], "remove"); if ($story_html) { --- 24,28 ---- $story_html = $story->getStory($story_id, "full", $ary); ! $t = pslNew("slashTemplate",$_PSL['templatedir'], "remove"); if ($story_html) { Index: backend.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/backend.php3,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** backend.php3 11 Dec 2002 21:25:54 -0000 1.34 --- backend.php3 20 Dec 2002 22:17:31 -0000 1.35 *************** *** 125,129 **** // Create the template object, and set some options for silent running ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_unknowns('remove'); --- 125,129 ---- // Create the template object, and set some options for silent running ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_unknowns('remove'); Index: comment.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/comment.php3,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** comment.php3 20 Dec 2002 16:29:58 -0000 1.26 --- comment.php3 20 Dec 2002 22:17:31 -0000 1.27 *************** *** 190,194 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 190,194 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: config.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v retrieving revision 1.173 retrieving revision 1.174 diff -C2 -d -r1.173 -r1.174 *** config.php3 16 Dec 2002 22:49:51 -0000 1.173 --- config.php3 20 Dec 2002 22:17:31 -0000 1.174 *************** *** 189,192 **** --- 189,194 ---- addClassRequirement("slashPerm","perm"); addClassRequirement("slashPerm",$_PSL['classdir'] . "/slashPerm.class"); + addClassRequirement("slashTemplate","template"); + addClassRequirement("slashTemplate",$_PSL['classdir'] . "/slashTemplate.class"); addClassRequirement("author",$_PSL['classdir'] . "/Author.class"); addLibraryRequirement("phpslash",$_PSL['classdir'] . "/functions.inc"); Index: errordocument.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/errordocument.php3,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** errordocument.php3 11 Dec 2002 21:25:54 -0000 1.5 --- errordocument.php3 20 Dec 2002 22:17:31 -0000 1.6 *************** *** 43,47 **** // logwrite("404", "File Not Found " . $REDIRECT_URL); ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 43,47 ---- // logwrite("404", "File Not Found " . $REDIRECT_URL); ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( *************** *** 76,80 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 76,80 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: glossary.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/glossary.php3,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** glossary.php3 11 Dec 2002 21:25:54 -0000 1.17 --- glossary.php3 20 Dec 2002 22:17:31 -0000 1.18 *************** *** 70,74 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 70,74 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: index.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/index.php3,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** index.php3 16 Dec 2002 22:28:17 -0000 1.64 --- index.php3 20 Dec 2002 22:17:31 -0000 1.65 *************** *** 47,51 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 47,51 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: login.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** login.php3 11 Dec 2002 21:25:54 -0000 1.33 --- login.php3 20 Dec 2002 22:17:31 -0000 1.34 *************** *** 96,100 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 96,100 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: mailinglist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/mailinglist.php3,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mailinglist.php3 11 Dec 2002 21:25:54 -0000 1.11 --- mailinglist.php3 20 Dec 2002 22:17:31 -0000 1.12 *************** *** 85,89 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 85,89 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: poll.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/poll.php3,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** poll.php3 19 Dec 2002 16:19:19 -0000 1.21 --- poll.php3 20 Dec 2002 22:17:31 -0000 1.22 *************** *** 125,129 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 125,129 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: profile.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/profile.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** profile.php3 11 Dec 2002 21:25:54 -0000 1.8 --- profile.php3 20 Dec 2002 22:17:32 -0000 1.9 *************** *** 118,122 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 118,122 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: search.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/search.php3,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** search.php3 11 Dec 2002 21:25:54 -0000 1.53 --- search.php3 20 Dec 2002 22:17:32 -0000 1.54 *************** *** 168,174 **** /* Templates */ ! $templ = pslNew(Template ,$_PSL[templatedir]); $templ->debug = false; ! $templ->set_file (searchpage, "searchPage.tpl"); titlebar("100%",sprintf(pslgetText("Searching %s"),htmlentities($query))); --- 168,174 ---- /* Templates */ ! $templ = pslNew("slashTemplate" ,$_PSL[templatedir]); $templ->debug = false; ! $templ->set_file ("searchpage", "searchPage.tpl"); titlebar("100%",sprintf(pslgetText("Searching %s"),htmlentities($query))); *************** *** 477,481 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 477,481 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( Index: submission.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/submission.php3,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** submission.php3 11 Dec 2002 21:25:54 -0000 1.16 --- submission.php3 20 Dec 2002 22:17:32 -0000 1.17 *************** *** 111,115 **** } ! $template = pslNew("Template",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( --- 111,115 ---- } ! $template = pslNew("slashTemplate",$_PSL['templatedir']); $template->debug = 0; $template->set_file(array( |
From: Joe S. <joe...@us...> - 2002-12-20 16:30:02
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.7 In directory sc8-pr-cvs1:/tmp/cvs-serv3895/phpslash-ft/tables/0.7 Modified Files: 65_to_7.sql slash-all.sql Log Message: display partial IP of comment author Index: 65_to_7.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.7/65_to_7.sql,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** 65_to_7.sql 22 Nov 2002 17:42:55 -0000 1.12 --- 65_to_7.sql 20 Dec 2002 16:29:59 -0000 1.13 *************** *** 5,12 **** ALTER TABLE psl_story ADD order_no int(10) unsigned NOT NULL default '0'; ! INSERT INTO db_sequence VALUES ('psl_permission_seq',81); INSERT INTO db_sequence VALUES ('psl_group_seq',27); INSERT INTO db_sequence VALUES ('psl_group_section_lut_seq',66); ! INSERT INTO db_sequence VALUES ('psl_group_permission_lut_seq',109); INSERT INTO db_sequence VALUES ('psl_group_group_lut_seq',64); INSERT INTO db_sequence VALUES ('psl_author_group_lut_seq',26); --- 5,12 ---- ALTER TABLE psl_story ADD order_no int(10) unsigned NOT NULL default '0'; ! INSERT INTO db_sequence VALUES ('psl_permission_seq',82); INSERT INTO db_sequence VALUES ('psl_group_seq',27); INSERT INTO db_sequence VALUES ('psl_group_section_lut_seq',66); ! INSERT INTO db_sequence VALUES ('psl_group_permission_lut_seq',111); INSERT INTO db_sequence VALUES ('psl_group_group_lut_seq',64); INSERT INTO db_sequence VALUES ('psl_author_group_lut_seq',26); *************** *** 217,221 **** INSERT INTO psl_group_permission_lut VALUES (107,23,76); INSERT INTO psl_group_permission_lut VALUES (108,23,80); ! # # Table structure for table 'psl_group_section_lut' --- 217,222 ---- INSERT INTO psl_group_permission_lut VALUES (107,23,76); INSERT INTO psl_group_permission_lut VALUES (108,23,80); ! INSERT INTO psl_group_permission_lut VALUES (110,20,81); ! INSERT INTO psl_group_permission_lut VALUES (111,8,82); # # Table structure for table 'psl_group_section_lut' *************** *** 363,366 **** --- 364,368 ---- INSERT INTO psl_permission VALUES (81,'commentChangeName','can Change comment na me and url'); + INSERT INTO psl_permission VALUES( '82', 'commentViewIP', 'Can view full IP/Host of person posting a comment'); # These are the alterations to the database wherein dates are kept as Index: slash-all.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.7/slash-all.sql,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** slash-all.sql 19 Dec 2002 16:12:16 -0000 1.22 --- slash-all.sql 20 Dec 2002 16:29:59 -0000 1.23 *************** *** 121,128 **** INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_blocktype_seq',14); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_section_block_lut_seq',280); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_permission_seq',81); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_seq',27); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_section_lut_seq',66); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_permission_lut_seq',110); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_group_lut_seq',64); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_author_group_lut_seq',27); --- 121,128 ---- INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_blocktype_seq',14); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_section_block_lut_seq',280); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_permission_seq',82); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_seq',27); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_section_lut_seq',66); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_permission_lut_seq',111); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_group_lut_seq',64); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_author_group_lut_seq',27); *************** *** 498,501 **** --- 498,504 ---- INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (107,23,76); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (108,23,80); + INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES( '110', '20', '81'); + INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES( '111', '8', '82'); + # -------------------------------------------------------- *************** *** 702,705 **** --- 705,710 ---- INSERT INTO psl_permission (permission_id, permission_name, permission_description) VALUES (80,'storylistothers','story list contains other author's stories'); INSERT INTO psl_permission (permission_id, permission_name, permission_description) VALUES (81,'commentChangeName','can Change comment na\nme and url'); + INSERT INTO psl_permission VALUES( '82', 'commentViewIP', 'Can view full IP/Host of person posting a comment'); + # -------------------------------------------------------- |
From: Joe S. <joe...@us...> - 2002-12-20 16:30:02
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic In directory sc8-pr-cvs1:/tmp/cvs-serv3895/phpslash-ft/public_html/templates/en/basic Modified Files: commentDisplay.tpl Log Message: display partial IP of comment author Index: commentDisplay.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/commentDisplay.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** commentDisplay.tpl 12 Nov 2002 20:48:35 -0000 1.3 --- commentDisplay.tpl 20 Dec 2002 16:29:59 -0000 1.4 *************** *** 3,7 **** <div id="commentDisplay"> <div id="commentHeader"> ! <span class="commentSubject">{SUBJECT}</span> <span class="commentID">[{COMMENT_ID}]</span><br /> <span class="commentAuthor">by {NAME} {EMAIL_LINK_ON}{EMAIL}{EMAIL_LINK_OFF} on {TIME}</span> </div> <!-- id="commentHeader" --> --- 3,7 ---- <div id="commentDisplay"> <div id="commentHeader"> ! <span class="commentSubject">{SUBJECT}</span> <span class="commentID">[{COMMENT_ID}] (IP: {IP})</span><br /> <span class="commentAuthor">by {NAME} {EMAIL_LINK_ON}{EMAIL}{EMAIL_LINK_OFF} on {TIME}</span> </div> <!-- id="commentHeader" --> |
From: Joe S. <joe...@us...> - 2002-12-20 16:30:02
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory sc8-pr-cvs1:/tmp/cvs-serv3895/phpslash-ft/public_html/templates/en/default Modified Files: commentDisplay.tpl Log Message: display partial IP of comment author Index: commentDisplay.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/commentDisplay.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** commentDisplay.tpl 12 Nov 2002 20:48:36 -0000 1.5 --- commentDisplay.tpl 20 Dec 2002 16:29:59 -0000 1.6 *************** *** 10,14 **** <td bgcolor="#3F4469"> <font color="#FFFFFF"> ! <b>{SUBJECT} <FONT SIZE=SMALL>[{COMMENT_ID}]</FONT></b><br> by {NAME} {EMAIL_LINK_ON}<FONT COLOR="#FFFFFF">{EMAIL}</FONT>{EMAIL_LINK_OFF} on {TIME}<br> </font> --- 10,14 ---- <td bgcolor="#3F4469"> <font color="#FFFFFF"> ! <b>{SUBJECT} <FONT SIZE=SMALL>[{COMMENT_ID}]</FONT></b> (IP: {IP})<br> by {NAME} {EMAIL_LINK_ON}<FONT COLOR="#FFFFFF">{EMAIL}</FONT>{EMAIL_LINK_OFF} on {TIME}<br> </font> |
From: Joe S. <joe...@us...> - 2002-12-20 16:30:02
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv3895/phpslash-ft/class Modified Files: Comment.class Log Message: display partial IP of comment author Index: Comment.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Comment.class 11 Dec 2002 19:39:54 -0000 1.38 --- Comment.class 20 Dec 2002 16:29:58 -0000 1.39 *************** *** 271,274 **** --- 271,284 ---- } + $ip_ary = explode(".", $ary['ip']); + if( !$this->perm->have_perm("commentAdmin") ) { + if( is_numeric($ip_ary[sizeof($ip_ary)-1]) ) { + $ip_ary[sizeof($ip_ary)-1] = "--"; + } else { + $ip_ary[0] = "--"; + } + } + $ary['ip'] = implode(".", $ip_ary); + $this->ctempl->set_var(array( 'COMMENT_ID' => $ary['comment_id'], *************** *** 282,285 **** --- 292,296 ---- 'MODE' => $this->mode, 'ORDER' => $this->order, + 'IP' => $ary['ip'], 'TIME' => psl_dateTimeLong($ary['date_created']) )); *************** *** 319,323 **** <input type=submit name=action value=\"".pslgetText("Bulk Delete")."\"> <input type=submit name=action value=\"".pslgetText("Show Pending")."\"> ! <input type=hidden name=story_id value=".$cmtary['story_id']."></form>"; } else { $admin = ""; --- 330,334 ---- <input type=submit name=action value=\"".pslgetText("Bulk Delete")."\"> <input type=submit name=action value=\"".pslgetText("Show Pending")."\"> ! <input type=hidden name=story_id value=".$cmtary['story_id'].">"; } else { $admin = ""; *************** *** 675,678 **** --- 686,690 ---- $fdate = date("Y-m-d H:i:s",time()); $timestamp = time(); + $ip = gethostbyaddr($ary['ip']); $q = "INSERT INTO psl_comment (comment_id, *************** *** 693,697 **** '$ary[name]', '$ary[email]', ! '$ary[ip]', '$ary[subject]', '$ary[comment_text]')"; --- 705,709 ---- '$ary[name]', '$ary[email]', ! '$ip', '$ary[subject]', '$ary[comment_text]')"; |