phpslash-commit Mailing List for phpSlash (Page 91)
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
phpslash-commit — A list for automatically mailed SCM Commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(59) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(52) |
Feb
(77) |
Mar
(118) |
Apr
(76) |
May
(106) |
Jun
(145) |
Jul
(9) |
Aug
(15) |
Sep
(78) |
Oct
(83) |
Nov
(105) |
Dec
(51) |
| 2003 |
Jan
(105) |
Feb
(100) |
Mar
(111) |
Apr
(149) |
May
(95) |
Jun
(56) |
Jul
(8) |
Aug
(2) |
Sep
|
Oct
(22) |
Nov
(117) |
Dec
(6) |
| 2004 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
(25) |
May
|
Jun
(11) |
Jul
(26) |
Aug
(85) |
Sep
(119) |
Oct
(312) |
Nov
(271) |
Dec
(5) |
| 2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
(12) |
May
(7) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joe S. <joe...@us...> - 2002-05-13 18:43:26
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv14865/phpslash-ft/class
Modified Files:
Comment.class
Log Message:
bugfix [ 554671 ] Problem with Re:'s
Index: Comment.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Comment.class 28 Apr 2002 02:08:26 -0000 1.25
--- Comment.class 13 May 2002 18:43:23 -0000 1.26
***************
*** 114,118 ****
date_format(date,\"%W, %M %d \@%h:%i%p\") AS time
FROM psl_comment
! WHERE story_id = '$ary[story_id]'";
if ($this->order == "DESC") {
$query .= " ORDER BY date DESC";
--- 114,121 ----
date_format(date,\"%W, %M %d \@%h:%i%p\") AS time
FROM psl_comment
! WHERE story_id = '$ary[story_id]' ";
! if( $ary['comment_id']) {
! $query .= "AND comment_id >= '$ary[comment_id]' ";
! }
if ($this->order == "DESC") {
$query .= " ORDER BY date DESC";
***************
*** 552,556 ****
if ($ary['subject'] == "") {
$ary['subject'] = pslgetText("No Subject Given");
! } else {
$ary['subject'] = pslgetText("Re: ") . $ary[subject];
}
--- 555,559 ----
if ($ary['subject'] == "") {
$ary['subject'] = pslgetText("No Subject Given");
! } elseif( !preg_match("/Re\:/i",$ary['subject'])) {
$ary['subject'] = pslgetText("Re: ") . $ary[subject];
}
|
|
From: Joe S. <joe...@us...> - 2002-05-13 18:43:26
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv14865/phpslash-ft/public_html
Modified Files:
comment.php3
Log Message:
bugfix [ 554671 ] Problem with Re:'s
Index: comment.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/comment.php3,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** comment.php3 6 Mar 2002 04:29:54 -0000 1.11
--- comment.php3 13 May 2002 18:43:23 -0000 1.12
***************
*** 90,93 ****
--- 90,95 ----
if ($parent_ary[subject] == "") {
$ary[subject] = pslgetText("No Subject Given");
+ } elseif( preg_match ("/Re\:/i",$parent_ary['subject'])) {
+ $ary[subject] = $parent_ary[subject];
} else {
$ary[subject] = pslgetText("Re: ") . $parent_ary[subject];
***************
*** 133,137 ****
echo "<BR>Click <A HREF=\"" . $return_link . "\">here</A> to go back<BR>\n";
if ($parent_id) {
! echo "<A HREF=\"" . $_PSL[rooturl] . "/comment.php3?submit=show&comment_id=$parent_id\">View Parent Comment</A>\n";
}
--- 135,139 ----
echo "<BR>Click <A HREF=\"" . $return_link . "\">here</A> to go back<BR>\n";
if ($parent_id) {
! echo "<A HREF=\"" . $_PSL[rooturl] . "/comment.php3?submit=show&story_id=$story_id&comment_id=$parent_id&mode=flat\">View Parent Comment</A>\n";
}
|
|
From: Joe S. <joe...@us...> - 2002-05-13 18:43:26
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv14865/phpslash-ft
Modified Files:
CHANGES
Log Message:
bugfix [ 554671 ] Problem with Re:'s
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.475
retrieving revision 1.476
diff -C2 -d -r1.475 -r1.476
*** CHANGES 10 May 2002 20:57:02 -0000 1.475
--- CHANGES 13 May 2002 18:43:23 -0000 1.476
***************
*** 13,18 ****
9 - Removal of something (kill -9 :)
2002-May-10 3:45PM CDT Joe Stewart <joe...@us...>
! [B] - article.php3 - type of CENTER_BLOCK_COLUMN, closing bug
[ 554668 ] Typo in article.php3.
--- 13,23 ----
9 - Removal of something (kill -9 :)
+ 2002-May-13 1:30PM CDT Joe Stewart <joe...@us...>
+ [B] - comment.php3, Comment.class - "Re:" is not longer appended to a comment
+ subject if it's already there. Also the "View Parent Comment" link
+ displays correctly. Closes bug [ 554671 ] Problem with "Re:"'s.
+
2002-May-10 3:45PM CDT Joe Stewart <joe...@us...>
! [B] - article.php3 - typo of CENTER_BLOCK_COLUMN, closing bug
[ 554668 ] Typo in article.php3.
|
|
From: Joe S. <joe...@us...> - 2002-05-10 20:57:06
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv17063/phpslash-ft/public_html
Modified Files:
article.php3
Log Message:
[ 554668 ] Typo in article.php3
Index: article.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** article.php3 17 Apr 2002 15:37:42 -0000 1.63
--- article.php3 10 May 2002 20:57:03 -0000 1.64
***************
*** 157,161 ****
'STORY_COLUMN' => $emailform."\n".$story_html."\n".$comments,
'LEFT_BLOCK_COLUMN' => $leftblocks,
! 'CENTER__TOP_BLOCK_COLUMN' => $centertopblocks,
'RIGHT_BLOCK_COLUMN' => $rightblocks,
// 'HEADER' => $header,
--- 157,161 ----
'STORY_COLUMN' => $emailform."\n".$story_html."\n".$comments,
'LEFT_BLOCK_COLUMN' => $leftblocks,
! 'CENTER_TOP_BLOCK_COLUMN' => $centertopblocks,
'RIGHT_BLOCK_COLUMN' => $rightblocks,
// 'HEADER' => $header,
|
|
From: Joe S. <joe...@us...> - 2002-05-10 20:57:05
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv17063/phpslash-ft Modified Files: CHANGES Log Message: [ 554668 ] Typo in article.php3 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.474 retrieving revision 1.475 diff -C2 -d -r1.474 -r1.475 *** CHANGES 5 May 2002 17:23:51 -0000 1.474 --- CHANGES 10 May 2002 20:57:02 -0000 1.475 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-May-10 3:45PM CDT Joe Stewart <joe...@us...> + [B] - article.php3 - type of CENTER_BLOCK_COLUMN, closing bug + [ 554668 ] Typo in article.php3. + 2002-May-05 3:45PM EDT Joe Stewart <joe...@us...> [W] - index.php3 -> made index use single quotes and made slightly more |
|
From: nathan h. <nh...@us...> - 2002-05-05 17:23:54
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv30250 Modified Files: CHANGES Log Message: slight change to index for sligle quotes Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.473 retrieving revision 1.474 diff -C2 -d -r1.473 -r1.474 *** CHANGES 29 Apr 2002 20:52:49 -0000 1.473 --- CHANGES 5 May 2002 17:23:51 -0000 1.474 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-May-05 3:45PM EDT Joe Stewart <joe...@us...> + [W] - index.php3 -> made index use single quotes and made slightly more + readble + 2002-Apr-29 3:45PM CDT Joe Stewart <joe...@us...> [B] - functions.inc - setSkinTpl wasn't setting the default if the cookie |
|
From: nathan h. <nh...@us...> - 2002-05-05 17:23:54
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv30250/public_html
Modified Files:
index.php3
Log Message:
slight change to index for sligle quotes
Index: index.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/index.php3,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** index.php3 25 Mar 2002 16:45:52 -0000 1.56
--- index.php3 5 May 2002 17:23:51 -0000 1.57
***************
*** 1,10 ****
<?php
// $Id$
! $pagetitle = "Home"; // The name to be displayed in the header
! $xsiteobject = "Home Page"; // This Defines The META Tag Object Type
! require("config.php3");
! page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
if(!empty($HTTP_GET_VARS['login'])) {
--- 1,12 ----
<?php
// $Id$
! $pagetitle = 'Home'; // The name to be displayed in the header
! $xsiteobject = 'Home Page'; // This Defines The META Tag Object Type
! require('config.php3');
! page_open(array('sess' => 'slashSess',
! 'auth' => 'slashAuth',
! 'perm' => 'slashPerm'));
if(!empty($HTTP_GET_VARS['login'])) {
***************
*** 35,39 ****
! $breadcrumb = breadcrumb( $ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 37,41 ----
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
***************
*** 41,47 ****
slashhead($pagetitle,$_PSL['metatags']);
! $allstories = $story->getStories($ary);
! $leftblocks = $block->getBlocks($ary, "left");
! $centerblocks = $block->getBlocks($ary, "center");
$rightblocks = $block->getBlocks($ary, "right");
--- 43,49 ----
slashhead($pagetitle,$_PSL['metatags']);
! $allstories = $story->getStories($ary);
! $leftblocks = $block->getBlocks($ary, "left");
! $centerblocks = $block->getBlocks($ary, "center");
$rightblocks = $block->getBlocks($ary, "right");
***************
*** 52,63 ****
// default to 2 column for transparent upgrade
$rightblocks = $block->getBlocks($ary);
! $tplfile = "index2colright.tpl";
} else {
! $tplfile = "index2colright.tpl";
}
} elseif (empty($rightblocks)) {
! $tplfile = "index2colleft.tpl";
} else {
! $tplfile = "index3col.tpl";
}
--- 54,65 ----
// default to 2 column for transparent upgrade
$rightblocks = $block->getBlocks($ary);
! $tplfile = 'index2colright.tpl';
} else {
! $tplfile = 'index2colright.tpl';
}
} elseif (empty($rightblocks)) {
! $tplfile = 'index2colleft.tpl';
} else {
! $tplfile = 'index3col.tpl';
}
***************
*** 70,74 ****
// TODO register_globals?
if( !empty($QUERY_STRING)) {
! $QUERY_STRING = "?".$QUERY_STRING;
}
--- 72,76 ----
// TODO register_globals?
if( !empty($QUERY_STRING)) {
! $QUERY_STRING = '?'.$QUERY_STRING;
}
***************
*** 84,88 ****
));
! $template->parse('OUT',"index");
$template->p('OUT');
--- 86,90 ----
));
! $template->parse('OUT','index');
$template->p('OUT');
|
|
From: Joe S. <joe...@us...> - 2002-04-29 20:52:53
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv1262/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
set default skin if cookie skin not found
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** functions.inc 27 Apr 2002 20:31:10 -0000 1.100
--- functions.inc 29 Apr 2002 20:52:49 -0000 1.101
***************
*** 1016,1019 ****
--- 1016,1023 ----
if(@is_dir($templatedir . "/" . $HTTP_COOKIE_VARS['skin'])) {
$new_skin=$HTTP_COOKIE_VARS['skin'];
+ } else {
+ // dir not found, delete this cookie and set to default
+ setcookie("skin","", "", "/", ereg_replace("www.", "", "$SERVER_NAME"));
+ $new_skin = $_PSL['defaultskin'];
}
} else {
|
|
From: Joe S. <joe...@us...> - 2002-04-29 20:52:53
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv1262/phpslash-ft Modified Files: CHANGES Log Message: set default skin if cookie skin not found Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.472 retrieving revision 1.473 diff -C2 -d -r1.472 -r1.473 *** CHANGES 29 Apr 2002 16:17:18 -0000 1.472 --- CHANGES 29 Apr 2002 20:52:49 -0000 1.473 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-29 3:45PM CDT Joe Stewart <joe...@us...> + [B] - functions.inc - setSkinTpl wasn't setting the default if the cookie + skin is not found. + 2002-Apr-29 11:00AM CDT Joe Stewart <joe...@us...> [BT] - basic/pollDisplay.tpl - voting still requires get variables. |
|
From: Joe S. <joe...@us...> - 2002-04-29 16:17:23
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv32456/phpslash-ft/public_html/templates/en/basic
Modified Files:
pollDisplay.tpl
Log Message:
post -> get in basic/pollDisplay.tpl
Index: pollDisplay.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/pollDisplay.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pollDisplay.tpl 28 Apr 2002 01:55:08 -0000 1.3
--- pollDisplay.tpl 29 Apr 2002 16:17:19 -0000 1.4
***************
*** 2,6 ****
<div id="pollDisplay">
<p class="question">{QUESTION}</p>
! <form action="{ACTION_URL}" method="post">
<input type="hidden" name="question_id" value="{QUESTION_ID}" />
<input type="hidden" name="submit" value="vote" />
--- 2,6 ----
<div id="pollDisplay">
<p class="question">{QUESTION}</p>
! <form action="{ACTION_URL}" method="get">
<input type="hidden" name="question_id" value="{QUESTION_ID}" />
<input type="hidden" name="submit" value="vote" />
|
|
From: Joe S. <joe...@us...> - 2002-04-29 16:17:23
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv32456/phpslash-ft Modified Files: CHANGES Log Message: post -> get in basic/pollDisplay.tpl Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.471 retrieving revision 1.472 diff -C2 -d -r1.471 -r1.472 *** CHANGES 28 Apr 2002 02:08:26 -0000 1.471 --- CHANGES 29 Apr 2002 16:17:18 -0000 1.472 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-29 11:00AM CDT Joe Stewart <joe...@us...> + [BT] - basic/pollDisplay.tpl - voting still requires get variables. + 2002-Apr-27 9:54PM EDT nathan hruby <na...@ds...> [B] - Poll.class - works now, single quoted something that shouldn't have been :) |
|
From: nathan h. <nh...@us...> - 2002-04-28 22:13:58
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html In directory usw-pr-cvs1:/tmp/cvs-serv4816/doc/html Modified Files: phpslash.sgml Log Message: Doc update for register_globals and a futz with config. Will fiox config before release Index: phpslash.sgml =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** phpslash.sgml 20 Mar 2002 22:17:56 -0000 1.22 --- phpslash.sgml 27 Apr 2002 20:49:35 -0000 1.23 *************** *** 438,441 **** --- 438,449 ---- list (currently at SourceForge). + <sect1> phpSlash and the register_globals setting + <p> + phpSlash currently does not work with the register_globals setting turned + Off. Yes we are aware of the problems this causes. yes we are aware that + php4.2.0 defaults to turning off register_gloabals. This will be + addressed in the next release (M7) with an all new user input and config + parsing system. + <sect1> A few notes on the installation of phplib <p> |
|
From: nathan h. <nh...@us...> - 2002-04-28 21:28:12
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv20437/class
Modified Files:
Block_render_cal.class
Log Message:
make cal go to rooturl instead of PHP_SELF
Index: Block_render_cal.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_cal.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Block_render_cal.class 5 Mar 2002 16:50:57 -0000 1.5
--- Block_render_cal.class 27 Apr 2002 21:58:17 -0000 1.6
***************
*** 14,19 ****
global $_PSL;
! $this->type = "cal"; /* set the 'type' */
! $this->output = ""; /* clear the output */
$this->psl = $_PSL;
}
--- 14,19 ----
global $_PSL;
! $this->type = 'cal'; /* set the 'type' */
! $this->output = ''; /* clear the output */
$this->psl = $_PSL;
}
***************
*** 29,33 ****
$templ = new Template($this->psl['templatedir']);
$templ->set_file(array(
! 'calendar' => "calendar.tpl"
));
$templ->debug=0;
--- 29,33 ----
$templ = new Template($this->psl['templatedir']);
$templ->set_file(array(
! 'calendar' => 'calendar.tpl'
));
$templ->debug=0;
***************
*** 92,96 ****
}
$templ->set_var(array(
! 'URL' => "$PHP_SELF?date=$url_date" . $url_day,
'LINKED_DATA' => "$daycounter"
));
--- 92,101 ----
}
$templ->set_var(array(
! //'URL' => "$PHP_SELF?date=$url_date" . $url_day,
! // assuming we want rooturl instead, as the only page
! // that can deal with this is index and if you put a cal on
! // the Home section then everything that looks at a page
! // will end up having bum links
! 'URL' => $this->psl['rooturl'] . "?date=$url_date" . $url_day,
'LINKED_DATA' => "$daycounter"
));
|
|
From: nathan h. <nh...@us...> - 2002-04-28 21:27:33
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv20437 Modified Files: CHANGES Log Message: make cal go to rooturl instead of PHP_SELF Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.466 retrieving revision 1.467 diff -C2 -d -r1.466 -r1.467 *** CHANGES 27 Apr 2002 21:50:12 -0000 1.466 --- CHANGES 27 Apr 2002 21:58:16 -0000 1.467 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-27 5:48PM EDT nathan hruby <na...@ds...> + [B] - class/Bloack_render_cal - make all links the cal display + go to the index page instead of $PHP_SELF + 2002-Apr-27 5:38PM EDT nathan hruby <na...@ds...> [B] - class/Poll.class -> Fix doing a ROOTDIR => ROOTURL in teplate defs. |
|
From: nathan h. <nh...@us...> - 2002-04-28 21:25:59
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory usw-pr-cvs1:/tmp/cvs-serv21882/public_html/templates/en/default Modified Files: footer.tpl slashFoot.tpl Log Message: Update copyright dates Index: footer.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/footer.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** footer.tpl 17 Apr 2000 03:52:53 -0000 1.4 --- footer.tpl 27 Apr 2002 22:02:50 -0000 1.5 *************** *** 6,10 **** <CENTER> <FONT FACE="arial,helvetica" SIZE="0"> ! <P>Copyright © 1999 and Licenced Under GPL. </FONT> </CENTER> --- 6,10 ---- <CENTER> <FONT FACE="arial,helvetica" SIZE="0"> ! <P>Copyright © 1998 - 2002 and Licenced Under GPL. </FONT> </CENTER> Index: slashFoot.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/slashFoot.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** slashFoot.tpl 3 Dec 2000 16:52:51 -0000 1.6 --- slashFoot.tpl 27 Apr 2002 22:02:50 -0000 1.7 *************** *** 12,16 **** <FONT size=1 color="white" face="arial,helvetica"> This site is powered by <a href="http://www.phpslash.org/">phpslash</a> - ! Copyright ©2000 and Licensed under the <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> - No warranty is, has, or will be given in any way whatsoever to anyone. --- 12,16 ---- <FONT size=1 color="white" face="arial,helvetica"> This site is powered by <a href="http://www.phpslash.org/">phpslash</a> - ! Copyright © 1998 - 2002 and Licensed under the <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> - No warranty is, has, or will be given in any way whatsoever to anyone. |
|
From: nathan h. <nh...@us...> - 2002-04-28 21:25:58
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv21882 Modified Files: CHANGES Log Message: Update copyright dates Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.467 retrieving revision 1.468 diff -C2 -d -r1.467 -r1.468 *** CHANGES 27 Apr 2002 21:58:16 -0000 1.467 --- CHANGES 27 Apr 2002 22:02:48 -0000 1.468 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-27 5:52PM EDT nathan hruby <na...@ds...> + [BT] - *foot*.tpl - Update copyright to reflect the fact it's + not 1999 or 2000 and that this has been a consecutive + work since 1998 as per the FSF's Copyright reccomendation + 2002-Apr-27 5:48PM EDT nathan hruby <na...@ds...> [B] - class/Bloack_render_cal - make all links the cal display |
|
From: nathan h. <nh...@us...> - 2002-04-28 21:13:07
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv630/public_html
Modified Files:
poll.php3
Log Message:
Poll Cleanups
Index: poll.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/poll.php3,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** poll.php3 6 Mar 2002 04:29:54 -0000 1.11
--- poll.php3 28 Apr 2002 01:55:08 -0000 1.12
***************
*** 71,74 ****
--- 71,75 ----
$poll->resultPage($cmtary);
} else {
+ // Umm min isn't defined anywhere for a default
$poll->listPolls ($ary['min']);
}
|
|
From: nathan h. <nh...@us...> - 2002-04-28 21:12:19
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv4816/public_html
Modified Files:
config.php3
Log Message:
Doc update for register_globals and a futz with config. Will fiox config before release
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** config.php3 27 Apr 2002 20:31:10 -0000 1.134
--- config.php3 27 Apr 2002 20:49:35 -0000 1.135
***************
*** 19,23 ****
/**** START DEBUGING - Comment or delete this for production! ****/
//ini_set('error_reporting', 'E_ALL');
! //ini_set('error_reporting', 'E_ALL~E_NOTICE');
/**** END DEBUGING ****/
--- 19,23 ----
/**** START DEBUGING - Comment or delete this for production! ****/
//ini_set('error_reporting', 'E_ALL');
! ini_set('error_reporting', 'E_ALL~E_NOTICE');
/**** END DEBUGING ****/
***************
*** 57,61 ****
// $rooturl -> The base URL for the phpslash site
! $_PSL['rooturl'] = 'http://dingo/devel/phpslash-ft/public_html';
// $adminurl -> The base URL for the admin pages
--- 57,61 ----
// $rooturl -> The base URL for the phpslash site
! $_PSL['rooturl'] = 'http://fatboy/ft/';
// $adminurl -> The base URL for the admin pages
|
|
From: nathan h. <nh...@us...> - 2002-04-28 21:10:07
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv29002/class
Modified Files:
Block_render_quote.class
Log Message:
fix errors in quote class
Index: Block_render_quote.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_quote.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Block_render_quote.class 5 Mar 2002 16:50:57 -0000 1.4
--- Block_render_quote.class 28 Apr 2002 01:32:39 -0000 1.5
***************
*** 2,6 ****
/* Block_render_quote.class -> Random quote generator */
! /* Id:$ */
class Block_render_quote {
--- 2,6 ----
/* Block_render_quote.class -> Random quote generator */
! /* $Id$ */
class Block_render_quote {
***************
*** 12,22 ****
/* constructor */
function Block_render_quote() {
-
global $_PSL;
! $this->type = "quote"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! $this->psl = $_PSL;
!
}
--- 12,20 ----
/* constructor */
function Block_render_quote() {
global $_PSL;
! $this->type = 'quote'; // set the 'type'
! $this->output = ''; // clear the output
! $this->psl = $_PSL;
}
***************
*** 26,59 ****
}
! function parse( $block_info) {
!
! $this->output = $this->query( $block_info);
! return 1;
}
! function query( $block_info) {
! $default_tpl = "quoteblock.tpl";
! $options = $block_info["source_url"];
!
! parse_str( $options, $ary);
! # parse_str( $options);
! $ary[tpl] = ""; // disable template option
! if( empty($ary[tpl]) ) {
$tpl = $default_tpl;
! } elseif ( file_exists($this->['templatedir'] . "/" . basename($ary['tpl']) . ".tpl") ) {
! # should be secure as path directives are discarded and extension added
! $tpl = basename($ary['tpl']) . ".tpl";
} else {
! debug ( "Block_render_quote:Template file doesn't exist, using default instead", $tpl);
$tpl = $default_tpl;
! }
!
! $template = new Template($this->[templatedir]);
$template->debug = 0;
$template->set_file(array(
! block => "$tpl"
));
--- 24,58 ----
}
! function parse($block_info) {
! $this->output = $this->query($block_info);
! return TRUE;
}
! function query($block_info) {
! // nh - This should be an object property in a skel class...
! $default_tpl = 'quoteblock.tpl';
! $options = $block_info['source_url'];
! parse_str($options, $ary);
! # parse_str($options);
!
! $ary['tpl'] = ''; // disable template option
!
! if (empty($ary['tpl'])) {
$tpl = $default_tpl;
! } elseif (file_exists($this->psl['templatedir'] . '/' . basename($ary['tpl']) . '.tpl')) {
! // should be secure as path directives are discarded and extension added
! $tpl = basename($ary['tpl']) . '.tpl';
} else {
! debug('Block_render_quote::Template file does not exist, using default instead', $tpl);
$tpl = $default_tpl;
! }
!
! $template = new Template($this->psl['templatedir']);
$template->debug = 0;
$template->set_file(array(
! 'block' => $tpl
));
***************
*** 75,84 ****
$template->set_var(array(
! 'QUOTE' => $db->f("quote"),
! 'AUTHOR' => $db->f("author")
));
unset($db);
! return $template->parse('OUT',"block");
}
--- 74,83 ----
$template->set_var(array(
! 'QUOTE' => $db->f('quote'),
! 'AUTHOR' => $db->f('author')
));
unset($db);
! return $template->parse('OUT','block');
}
|
|
From: nathan h. <nh...@us...> - 2002-04-28 20:47:27
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv21882/public_html/templates/en/basic
Modified Files:
footer.tpl slashFoot.tpl
Log Message:
Update copyright dates
Index: footer.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/footer.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** footer.tpl 9 Apr 2002 16:53:34 -0000 1.1
--- footer.tpl 27 Apr 2002 22:02:50 -0000 1.2
***************
*** 6,10 ****
<CENTER>
<FONT FACE="arial,helvetica" SIZE="0">
! <P>Copyright © 1999 and Licenced Under GPL.
</FONT>
</CENTER>
--- 6,10 ----
<CENTER>
<FONT FACE="arial,helvetica" SIZE="0">
! <P>Copyright © 1998 - 2002 and Licenced Under GPL.
</FONT>
</CENTER>
Index: slashFoot.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/slashFoot.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slashFoot.tpl 9 Apr 2002 16:57:06 -0000 1.2
--- slashFoot.tpl 27 Apr 2002 22:02:50 -0000 1.3
***************
*** 1,14 ****
! <!-- START slashfoot.tpl -->
! <div id="footer">
! {NAVBAR}
! <!-- insert the small logo here -->
! <p class="copyright">This site is powered by <a href="http://www.phpslash.org/">phpslash</a> -
! Copyright © 2000 and licensed under the
! <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> -
! No warranty is, has, or will be given in any way whatsoever to anyone.</p>
! <p><a href="#top">Go 2 Top</a></p>
! </div> <!-- id="footer" -->
! </body>
! </html>
!
! <!-- END slashFoot.tpl -->
--- 1,14 ----
! <!-- START slashfoot.tpl -->
! <div id="footer">
! {NAVBAR}
! <!-- insert the small logo here -->
! <p class="copyright">This site is powered by <a href="http://www.phpslash.org/">phpslash</a> -
! Copyright © 1998 - 2002 and licensed under the
! <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> -
! No warranty is, has, or will be given in any way whatsoever to anyone.</p>
! <p><a href="#top">Go 2 Top</a></p>
! </div> <!-- id="footer" -->
! </body>
! </html>
!
! <!-- END slashFoot.tpl -->
|
|
From: nathan h. <nh...@us...> - 2002-04-28 20:10:22
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv18441 Modified Files: CHANGES Log Message: Fix link bug Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.465 retrieving revision 1.466 diff -C2 -d -r1.465 -r1.466 *** CHANGES 27 Apr 2002 21:07:49 -0000 1.465 --- CHANGES 27 Apr 2002 21:50:12 -0000 1.466 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-27 5:38PM EDT nathan hruby <na...@ds...> + [B] - class/Poll.class -> Fix doing a ROOTDIR => ROOTURL in teplate defs. + This mad ethe Post a Comment about this poll error404 as the link + was a dud + 2002-Apr-27 4:57PM EDT nathan hruby <na...@ds...> [B] - mailinglistAdmin.php3 wasn't outputing the message correctly and it |
|
From: nathan h. <nh...@us...> - 2002-04-28 20:10:22
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv9026 Modified Files: CHANGES Log Message: fix no output in mailinglist admin Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.464 retrieving revision 1.465 diff -C2 -d -r1.464 -r1.465 *** CHANGES 27 Apr 2002 20:49:35 -0000 1.464 --- CHANGES 27 Apr 2002 21:07:49 -0000 1.465 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Apr-27 4:57PM EDT nathan hruby <na...@ds...> + [B] - mailinglistAdmin.php3 wasn't outputing the message correctly and it + looked like it does when it hadn't + 2002-Apr-27 4:45PM EDT nathan hruby <na...@ds...> [W] - Added info about register_globals setting in the docs. |
|
From: nathan h. <nh...@us...> - 2002-04-28 20:09:43
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv630/public_html/templates/en/basic
Modified Files:
pollDisplay.tpl pollList.tpl pollMoreLink.tpl
Log Message:
Poll Cleanups
Index: pollDisplay.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/pollDisplay.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pollDisplay.tpl 9 Apr 2002 16:57:06 -0000 1.2
--- pollDisplay.tpl 28 Apr 2002 01:55:08 -0000 1.3
***************
*** 1,17 ****
! <!-- START: pollDisplay.tpl -->
! <div id="pollDisplay">
! <p class="question">{QUESTION}</p>
! <form action="{ACTION_URL}" method="post">
! <input type="hidden" name="question_id" value="{QUESTION_ID}" />
! <input type="hidden" name="submit" value="vote" />
! <!-- BEGIN each_choice -->
! <input type="radio" name="answer_id" value="{ANSWER_ID}">{ANSWER}<br />
! <!-- END each_choice -->
! <input type="submit" value="Vote">
! </form>
! [ <a href="{ROOTDIR}/poll.php3?submit=viewresults&question_id={QUESTION_ID}">Results</a>
! | <a href="{ROOTDIR}/poll.php3">Polls</a> ]
! <br />
! Comments: <span class="commentCount">{COMMENT_COUNT}</span> | Votes: <span class="voteCount">{VOTE_COUNT}</span>
! </div> <!-- id="pollDisplay" -->
! <!-- END: pollDisplay.tpl -->
--- 1,17 ----
! <!-- START: pollDisplay.tpl -->
! <div id="pollDisplay">
! <p class="question">{QUESTION}</p>
! <form action="{ACTION_URL}" method="post">
! <input type="hidden" name="question_id" value="{QUESTION_ID}" />
! <input type="hidden" name="submit" value="vote" />
! <!-- BEGIN each_choice -->
! <input type="radio" name="answer_id" value="{ANSWER_ID}">{ANSWER}<br />
! <!-- END each_choice -->
! <input type="submit" value="Vote">
! </form>
! [ <a href="{ROOTURL}/poll.php3?submit=viewresults&question_id={QUESTION_ID}">Results</a>
! | <a href="{ROOTURL}/poll.php3">Polls</a> ]
! <br />
! Comments: <span class="commentCount">{COMMENT_COUNT}</span> | Votes: <span class="voteCount">{VOTE_COUNT}</span>
! </div> <!-- id="pollDisplay" -->
! <!-- END: pollDisplay.tpl -->
Index: pollList.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/pollList.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pollList.tpl 9 Apr 2002 16:57:06 -0000 1.2
--- pollList.tpl 28 Apr 2002 01:55:08 -0000 1.3
***************
*** 1,28 ****
! <!-- Start pollList.tpl -->
! <div id="pollList">
! <!-- BEGIN newpollbutton -->
! <form action="{ADMIN_URL}" method="post">
! <input type="submit" name="submit" value="new" />
! </form>
! <!-- END newpollbutton -->
! <ul>
! <!-- BEGIN row -->
! <li>
! <a href="{ROOTDIR}/poll.php3?submit=viewbooth&question_id={QUESTION_ID}">{QUESTION}</a> {POLLDATE}
! <!-- BEGIN admin -->
! <span class="pollAdminLinks">
! (
! <a href="{ADMIN_URL}?submit=edit&question_id={QUESTION_ID}">Edit</a> |
! <a href="{ADMIN_URL}?submit=delete&question_id={QUESTION_ID}">Delete</a> |
! <a href="{ADMIN_URL}?submit=makecurrent&question_id={QUESTION_ID}">Make Current</a>
! )
! </span>
! <!-- END admin -->
! </li>
! <!-- END row -->
! </ul>
! <!-- BEGIN morelink -->
! <span class="more"><a href="{ROOTDIR}/poll.php3?min={ID}">More Polls</a></span>
! <!-- END morelink -->
! </div> <!-- id="pollList" -->
! <!-- End pollList.tpl -->
--- 1,28 ----
! <!-- Start pollList.tpl -->
! <div id="pollList">
! <!-- BEGIN newpollbutton -->
! <form action="{ADMIN_URL}" method="post">
! <input type="submit" name="submit" value="new" />
! </form>
! <!-- END newpollbutton -->
! <ul>
! <!-- BEGIN row -->
! <li>
! <a href="{ROOTURL}/poll.php3?submit=viewbooth&question_id={QUESTION_ID}">{QUESTION}</a> {POLLDATE}
! <!-- BEGIN admin -->
! <span class="pollAdminLinks">
! (
! <a href="{ADMIN_URL}?submit=edit&question_id={QUESTION_ID}">Edit</a> |
! <a href="{ADMIN_URL}?submit=delete&question_id={QUESTION_ID}">Delete</a> |
! <a href="{ADMIN_URL}?submit=makecurrent&question_id={QUESTION_ID}">Make Current</a>
! )
! </span>
! <!-- END admin -->
! </li>
! <!-- END row -->
! </ul>
! <!-- BEGIN morelink -->
! <span class="more"><a href="{ROOTURL}/poll.php3?min={ID}">More Polls</a></span>
! <!-- END morelink -->
! </div> <!-- id="pollList" -->
! <!-- End pollList.tpl -->
Index: pollMoreLink.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/pollMoreLink.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pollMoreLink.tpl 9 Apr 2002 16:57:06 -0000 1.2
--- pollMoreLink.tpl 28 Apr 2002 01:55:08 -0000 1.3
***************
*** 1,2 ****
! <p>
! <font size=4><b><a href="{ROOTDIR}/poll.php3?min={ID}">More Polls</a></b></font>
--- 1,2 ----
! <p>
! <font size=4><b><a href="{ROOTURL}/poll.php3?min={ID}">More Polls</a></b></font>
|
|
From: nathan h. <nh...@us...> - 2002-04-28 20:09:41
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv630/public_html/templates/en/default
Modified Files:
pollList.tpl pollMoreLink.tpl
Log Message:
Poll Cleanups
Index: pollList.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/pollList.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pollList.tpl 8 Jun 2001 21:30:00 -0000 1.4
--- pollList.tpl 28 Apr 2002 01:55:08 -0000 1.5
***************
*** 10,14 ****
<!-- BEGIN row -->
<li>
! <a href="{ROOTDIR}/poll.php3?submit=viewbooth&question_id={QUESTION_ID}">{QUESTION}</a> {POLLDATE}
<!-- BEGIN admin -->
(<A href="{ADMIN_URL}?submit=edit&question_id={QUESTION_ID}">Edit</A> ||
--- 10,14 ----
<!-- BEGIN row -->
<li>
! <a href="{ROOTURL}/poll.php3?submit=viewbooth&question_id={QUESTION_ID}">{QUESTION}</a> {POLLDATE}
<!-- BEGIN admin -->
(<A href="{ADMIN_URL}?submit=edit&question_id={QUESTION_ID}">Edit</A> ||
***************
*** 21,25 ****
<p>
<!-- BEGIN morelink -->
! <font size=4><b><a href="{ROOTDIR}/poll.php3?min={ID}">More Polls</a></b></font>
<!-- END morelink -->
--- 21,25 ----
<p>
<!-- BEGIN morelink -->
! <font size=4><b><a href="{ROOTURL}/poll.php3?min={ID}">More Polls</a></b></font>
<!-- END morelink -->
Index: pollMoreLink.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/pollMoreLink.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pollMoreLink.tpl 17 May 2001 06:48:49 -0000 1.2
--- pollMoreLink.tpl 28 Apr 2002 01:55:08 -0000 1.3
***************
*** 1,2 ****
<p>
! <font size=4><b><a href="{ROOTDIR}/poll.php3?min={ID}">More Polls</a></b></font>
--- 1,2 ----
<p>
! <font size=4><b><a href="{ROOTURL}/poll.php3?min={ID}">More Polls</a></b></font>
|
|
From: nathan h. <nh...@us...> - 2002-04-28 19:45:33
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv1144/class
Modified Files:
Block_render_query.class Block_render_section.class
Block_render_topic.class Story_base.class functions.inc
Log Message:
Fixing unqouted strings
Index: Block_render_query.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_query.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Block_render_query.class 5 Mar 2002 16:48:28 -0000 1.6
--- Block_render_query.class 27 Apr 2002 20:31:10 -0000 1.7
***************
*** 34,39 ****
global $_PSL;
! $this->type = "query"; /* set the 'type' */
! $this->output = ""; /* clear the output */
$this->psl = $_PSL;
--- 34,39 ----
global $_PSL;
! $this->type = 'query'; /* set the 'type' */
! $this->output = ''; /* clear the output */
$this->psl = $_PSL;
***************
*** 58,70 ****
$site_homesection = $this->psl['site_homesection'];
! $default_tpl = "queryblock.tpl";
! $options_ary = split( "&",$block_info["source_url"] );
for( $i=0 ; $i < count($options_ary) ; $i++) {
! $arg_ary = split( "=", $options_ary[$i]);
$ary[$arg_ary[0]] = urldecode($arg_ary[1]);
}
! $ary[tpl] = ""; // disable template option
if( empty($ary['tpl']) ) {
$tpl = $default_tpl;
--- 58,70 ----
$site_homesection = $this->psl['site_homesection'];
! $default_tpl = 'queryblock.tpl';
! $options_ary = split( '&',$block_info['source_url'] );
for( $i=0 ; $i < count($options_ary) ; $i++) {
! $arg_ary = split( '=', $options_ary[$i]);
$ary[$arg_ary[0]] = urldecode($arg_ary[1]);
}
! $ary['tpl'] = ''; // disable template option
if( empty($ary['tpl']) ) {
$tpl = $default_tpl;
***************
*** 77,86 ****
}
! $template = new Template($this->psl["templatedir"]);
$template->debug = 0;
$template->set_file(array(
! block => "$tpl"
));
! $template->set_block ("block", "each_query", "query_block");
$stories_ary = $stories->extractStories( $ary);
--- 77,86 ----
}
! $template = new Template($this->psl['templatedir']);
$template->debug = 0;
$template->set_file(array(
! 'block' => $tpl
));
! $template->set_block ('block', 'each_query', 'query_block');
$stories_ary = $stories->extractStories( $ary);
***************
*** 89,106 ****
for ($i = 0 ; $i < count($stories_ary) ; $i++) {
! $story_id = $stories_ary[$i][story_id];
! if ($ary['section_id'] != "") {
! $story_id .= $amp . "section_id=" . $ary['section_id'];
} elseif ( ($ary['section'] != "") AND ( $ary['section'] != $site_homesection)) {
$section = new Section;
$section_name = $section->getId($ary['section']);
! $story_id .= $amp . "section=" . $section_name;
}
! if ($topic_id != "") {
! $story_id .= $amp . "topic_id=" . $ary['topic_id'];
! } elseif ($ary['topic'] != "") {
$topic = new Topic;
$topic_name = $topic->getId($ary['topic']);
! $story_id .= $amp . "topic=" . $topic_name;
}
--- 89,106 ----
for ($i = 0 ; $i < count($stories_ary) ; $i++) {
! $story_id = $stories_ary[$i]['story_id'];
! if ($ary['section_id'] != '') {
! $story_id .= $amp . 'section_id=' . $ary['section_id'];
} elseif ( ($ary['section'] != "") AND ( $ary['section'] != $site_homesection)) {
$section = new Section;
$section_name = $section->getId($ary['section']);
! $story_id .= $amp . 'section=' . $section_name;
}
! if ($topic_id != '') {
! $story_id .= $amp . 'topic_id=' . $ary['topic_id'];
! } elseif ($ary['topic'] != '') {
$topic = new Topic;
$topic_name = $topic->getId($ary['topic']);
! $story_id .= $amp . 'topic=' . $topic_name;
}
***************
*** 123,127 ****
));
! $template->parse ("query_block", "each_query", true);
}
--- 123,127 ----
));
! $template->parse ('query_block', 'each_query', true);
}
***************
*** 133,137 ****
));
unset($stories);
! return $template->parse('OUT',"block");
}
--- 133,137 ----
));
unset($stories);
! return $template->parse('OUT','block');
}
Index: Block_render_section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_section.class,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Block_render_section.class 5 Mar 2002 16:50:57 -0000 1.8
--- Block_render_section.class 27 Apr 2002 20:31:10 -0000 1.9
***************
*** 73,77 ****
$template->debug = 0;
$template->set_file(array(
! block => "$tpl"
));
$template->set_block ("block", "each_section", "section_block");
--- 73,77 ----
$template->debug = 0;
$template->set_file(array(
! 'block' => "$tpl"
));
$template->set_block ("block", "each_section", "section_block");
Index: Block_render_topic.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_topic.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Block_render_topic.class 5 Mar 2002 16:50:57 -0000 1.7
--- Block_render_topic.class 27 Apr 2002 20:31:10 -0000 1.8
***************
*** 69,91 ****
}
! $template = new Template($this->psl[templatedir]);
$template->debug = 0;
$template->set_file(array(
! block => $tpl
));
! $template->set_block ("block", "each_topic", "topic_block");
$template->set_var (array (
! 'TOPIC_ID' => "",
! 'TOPCIC_NAME' => ""
));
! $q = "SELECT DISTINCT psl_topic.topic_id,
psl_topic.topic_name
! FROM psl_topic ";
/* "all" will list those topics without stories also */
if ( $mode != "all") {
/* "section" will show how only topics in this section that have stories */
! if ( $section_id != "") {
$q .= ",psl_topic_lut,
psl_section_lut,
--- 69,91 ----
}
! $template = new Template($this->psl['templatedir']);
$template->debug = 0;
$template->set_file(array(
! 'block' => $tpl
));
! $template->set_block ('block', 'each_topic', 'topic_block');
$template->set_var (array (
! 'TOPIC_ID' => '',
! 'TOPCIC_NAME' => ''
));
! $q = 'SELECT DISTINCT psl_topic.topic_id,
psl_topic.topic_name
! FROM psl_topic ';
/* "all" will list those topics without stories also */
if ( $mode != "all") {
/* "section" will show how only topics in this section that have stories */
! if ( $section_id != '') {
$q .= ",psl_topic_lut,
psl_section_lut,
***************
*** 144,148 ****
));
! $output = $template->parse('OUT',"block");
unset($db);
return $output;
--- 144,148 ----
));
! $output = $template->parse('OUT','block');
unset($db);
return $output;
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Story_base.class 22 Apr 2002 14:56:09 -0000 1.11
--- Story_base.class 27 Apr 2002 20:31:10 -0000 1.12
***************
*** 34,37 ****
--- 34,39 ----
function Story_base () {
$this->db = new slashDB;
+ // NH: Umm.. do we mean the global $auth and $perm varables here?
+ // If so pass them by reference from $GLOBALS
$this->auth = $auth;
$this->perm = $perm;
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** functions.inc 10 Apr 2002 03:03:42 -0000 1.99
--- functions.inc 27 Apr 2002 20:31:10 -0000 1.100
***************
*** 841,845 ****
if( $pslstrings[$string]) {
$string = htmlentities($pslstrings[$string]);
! } elseif (($_PSL[debug]) AND ($pslstrings)) {
$string = message( $string, "messageStrike");
}
--- 841,845 ----
if( $pslstrings[$string]) {
$string = htmlentities($pslstrings[$string]);
! } elseif (($_PSL['debug']) AND ($pslstrings)) {
$string = message( $string, "messageStrike");
}
|
2 messages has been excluded from this view by a project administrator.
