phpslash-commit Mailing List for phpSlash (Page 99)
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: nathan h. <nh...@us...> - 2002-03-03 16:07:57
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv20873/class
Modified Files:
functions.inc
Log Message:
opefully fix Luis' bug
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** functions.inc 25 Feb 2002 23:58:22 -0000 1.92
--- functions.inc 3 Mar 2002 16:07:53 -0000 1.93
***************
*** 231,235 ****
--- 231,238 ----
$sl_q = new slashDB;
return $sl_q->nextid($sequence);
+ // Destroy the object, the gc should free resources
+ unset($sl_q);
} else {
+ // TODO: Shouldn't be an echo
echo "<BR><BR><B><FONT COLOR=RED SIZE=+2>You need to pass in the sequence to generateID!!!</FONT></B><BR><BR>\n";
exit;
|
|
From: Joe S. <joe...@us...> - 2002-02-25 23:58:25
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv27798/phpslash-ft/public_html/templates/en/default
Modified Files:
story.tpl
Log Message:
extra quote in story.tpl
Index: story.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/story.tpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** story.tpl 7 Dec 2001 18:40:27 -0000 1.14
--- story.tpl 25 Feb 2002 23:58:22 -0000 1.15
***************
*** 24,28 ****
<!-- END alsotext -->
<!-- BEGIN row -->
! <a href="{ROOTDIR}/search.php3?topic_id={LIST_TOPIC_ID}"">{LIST_TOPIC_NAME}</a><br>
<!-- END row -->
</FONT>
--- 24,28 ----
<!-- END alsotext -->
<!-- BEGIN row -->
! <a href="{ROOTDIR}/search.php3?topic_id={LIST_TOPIC_ID}">{LIST_TOPIC_NAME}</a><br>
<!-- END row -->
</FONT>
|
|
From: Joe S. <joe...@us...> - 2002-02-25 23:58:25
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv27798/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
extra quote in story.tpl
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** functions.inc 8 Feb 2002 18:54:04 -0000 1.91
--- functions.inc 25 Feb 2002 23:58:22 -0000 1.92
***************
*** 623,626 ****
--- 623,627 ----
global $_PSL;
+ $as = arg_separator("1");
if ($ary['section_id']) {
$sec = new Section;
|
|
From: Joe S. <joe...@us...> - 2002-02-25 23:58:25
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv27798/phpslash-ft Modified Files: CHANGES Log Message: extra quote in story.tpl Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.403 retrieving revision 1.404 diff -C2 -d -r1.403 -r1.404 *** CHANGES 21 Feb 2002 18:08:36 -0000 1.403 --- CHANGES 25 Feb 2002 23:58:22 -0000 1.404 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-25 6:00PM CST Joe Stewart <jo...@be...> + [B] - functions.inc - breadcrumb needed to call the + arg_separator function. + [T] - story.tpl - Luis reported an extra quote. + 2002-Feb-21 12:00PM CST Joe Stewart <jo...@be...> [B] - [ #520556 ] Manage Block Types includes phpslash. |
|
From: Joe S. <joe...@us...> - 2002-02-21 18:08:44
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv18290/phpslash-ft/class
Modified Files:
Block_i.class
Log Message:
[ #520556 ] better filemask for block_types
Index: Block_i.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_i.class,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Block_i.class 3 Feb 2002 02:49:39 -0000 1.14
--- Block_i.class 21 Feb 2002 18:08:36 -0000 1.15
***************
*** 416,422 ****
$each = $this->psl['classdir'] . "/" . $eachfile;
if( (is_file($each)) AND
- ( $each != ".") AND
- ( $each != "..") AND
- ( $each != "CVS") AND
( preg_match('/Block_render_/i', $each)) ) {
--- 416,419 ----
|
|
From: Joe S. <joe...@us...> - 2002-02-21 18:08:44
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv18290/phpslash-ft
Modified Files:
CHANGES
Log Message:
[ #520556 ] better filemask for block_types
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.402
retrieving revision 1.403
diff -C2 -d -r1.402 -r1.403
*** CHANGES 21 Feb 2002 00:12:25 -0000 1.402
--- CHANGES 21 Feb 2002 18:08:36 -0000 1.403
***************
*** 13,21 ****
9 - Removal of something (kill -9 :)
! 2002-Feb-18 6:00PM CST Joe Stewart <jo...@be...>
[T] - about.tpl, about.php3 - about now conforms to using slashhead and
displays blocks.
! 2002-Feb-18 5:00PM CST Joe Stewart <jo...@be...>
[T] - notfound.tpl, errordocument.php3. Merged Peter's index page
scheme into Russel's errordocument from stable.
--- 13,27 ----
9 - Removal of something (kill -9 :)
! 2002-Feb-21 12:00PM CST Joe Stewart <jo...@be...>
! [B] - [ #520556 ] Manage Block Types includes phpslash.
! Block_i.class - removed unneeded conditionals from
! file mask for block_types. Thanks to Peter for
! pointing this out.
!
! 2002-Feb-20 6:00PM CST Joe Stewart <jo...@be...>
[T] - about.tpl, about.php3 - about now conforms to using slashhead and
displays blocks.
! 2002-Feb-20 5:00PM CST Joe Stewart <jo...@be...>
[T] - notfound.tpl, errordocument.php3. Merged Peter's index page
scheme into Russel's errordocument from stable.
|
|
From: Joe S. <joe...@us...> - 2002-02-21 00:13:08
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv29211/phpslash-ft/public_html/templates/en/default
Modified Files:
about.tpl
Log Message:
about page displays blocks
Index: about.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/about.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** about.tpl 27 Jun 2001 20:33:26 -0000 1.9
--- about.tpl 21 Feb 2002 00:13:04 -0000 1.10
***************
*** 1,4 ****
<!-- Start of ABOUT.TPL -->
- {HEADER}
<TABLE WIDTH=100%>
<TR>
--- 1,3 ----
***************
*** 108,112 ****
</TR>
</TABLE>
- {FOOTER}
<!-- End of ABOUT.TPL -->
-
--- 107,109 ----
|
|
From: Joe S. <joe...@us...> - 2002-02-21 00:13:08
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv29211/phpslash-ft/public_html
Modified Files:
about.php3
Log Message:
about page displays blocks
Index: about.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/about.php3,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** about.php3 3 Feb 2002 22:09:12 -0000 1.14
--- about.php3 21 Feb 2002 00:13:04 -0000 1.15
***************
*** 1,16 ****
<?php
-
/* $Id$ */
- $pagetitle="About";
require("config.php3");
page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
! $xsiteobject = "About Page"; #Defines The META TAG Page Type
! // TODO: nh asks: Shouldn't this be slashhead() and slashfoot()?
! $header = getHeader($pagetitle,$xsiteobject);
! $footer = getFooter();
$about_templ = new Template($_PSL['templatedir']);
--- 1,39 ----
<?php
/* $Id$ */
+ $pagetitle = "About"; // The name to be displayed in the header
+ $xsiteobject = "About 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'])) {
! $auth->login_if($HTTP_GET_VARS['login']);
! }
! // Objects
! $block = new Block_i;
!
! // Start of Page
!
! /* parse cmd line variables into array */
! while ( list($key, $val) = each($HTTP_GET_VARS )) {
! $ary[$key] = $val;
! }
! /* defaults for main "index" page */
! if ((!$section) AND (!$section_id)){
! $section = $_PSL['site_homesection'];
! if(!$section) {
! $section = "Home";
! }
! $ary['section'] = $section;
! } else {
! $pagetitle .= " - $section";
! }
!
! $_PSL['metatags']['object'] = $xsiteobject;
!
! slashhead($pagetitle,$_PSL['metatags']);
$about_templ = new Template($_PSL['templatedir']);
***************
*** 18,29 ****
'main' => "about.tpl"
));
! $about_templ->set_var(array(
! 'HEADER' => $header,
! 'FOOTER' => $footer
));
! $about_templ->parse(OUT,"main");
! $about_templ->p(OUT);
page_close();
?>
--- 41,86 ----
'main' => "about.tpl"
));
!
! $allstories = $about_templ->parse(OUT,"main");
! $leftblocks = $block->getBlocks($ary, "left");
! $centerblocks = $block->getBlocks($ary, "center");
! $rightblocks = $block->getBlocks($ary, "right");
!
! if (empty($leftblocks)) {
! if (empty($rightblocks)) {
! // $centerblocks = $block->getBlocks($ary);
! // $tplfile = "index1col.tpl";
! // 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";
! }
!
! $template = new Template($_PSL['templatedir']);
! $template->debug = 0;
! $template->set_file(array(
! 'index' => $tplfile //"index3col.tpl"
! ));
!
! $template->set_var(array(
! 'ROOTDIR' => $_PSL['rooturl'],
! 'IMAGEDIR' => $_PSL['imageurl'],
! 'BREADCRUMB' => '',
! 'STORY_COLUMN' => $allstories,
! 'LEFT_BLOCK_COLUMN' => $leftblocks,
! 'CENTER_BLOCK_COLUMN' => $centerblocks,
! 'RIGHT_BLOCK_COLUMN' => $rightblocks
));
! $template->parse('OUT',"index");
! $template->p('OUT');
+ slashfoot();
page_close();
?>
|
|
From: Joe S. <joe...@us...> - 2002-02-21 00:12:29
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv29051/phpslash-ft Modified Files: CHANGES Log Message: about page displays blocks Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.401 retrieving revision 1.402 diff -C2 -d -r1.401 -r1.402 *** CHANGES 20 Feb 2002 23:15:59 -0000 1.401 --- CHANGES 21 Feb 2002 00:12:25 -0000 1.402 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-18 6:00PM CST Joe Stewart <jo...@be...> + [T] - about.tpl, about.php3 - about now conforms to using slashhead and + displays blocks. + 2002-Feb-18 5:00PM CST Joe Stewart <jo...@be...> [T] - notfound.tpl, errordocument.php3. Merged Peter's index page |
|
From: Joe S. <joe...@us...> - 2002-02-20 23:16:03
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory usw-pr-cvs1:/tmp/cvs-serv8920/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
adding errordocument.php3
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** phpslash.sgml 11 Feb 2002 18:50:30 -0000 1.16
--- phpslash.sgml 20 Feb 2002 23:15:59 -0000 1.17
***************
*** 645,648 ****
--- 645,649 ----
mailinglistMessageForm.tpl
messageStrike.tpl
+ notfound.tpl
pollDisplay.tpl
pollEdit.tpl
***************
*** 1176,1179 ****
--- 1177,1181 ----
navbar.tpl - top Navigation bar (Home, About, etc.)
navbarFooter.tpli - bottom Navigation bar (Home, About, etc.)
+ notfound.tpl - errordocument content
pollAdminLink.tpl - links to administer polls
pollDisplay.tpl - voting form and comment display
|
|
From: Joe S. <joe...@us...> - 2002-02-20 23:16:03
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv8920/phpslash-ft/public_html/templates/en/default
Added Files:
notfound.tpl
Log Message:
adding errordocument.php3
--- NEW FILE: notfound.tpl ---
<!-- notfound.tpl -->
<P>
<TABLE width="100%" cellpadding=0 cellspacing=0 border="0">
<TR>
<TD valign=top WIDTH="100%">
<FONT color="#000000" size="+3" ALIGN="CENTER">
Page not found:
{ERRORURL}
</FONT>
</TD>
</TR>
</TABLE>
<!-- end notfound.tpl -->
|
|
From: Joe S. <joe...@us...> - 2002-02-20 23:16:03
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv8920/phpslash-ft/public_html
Added Files:
errordocument.php3
Log Message:
adding errordocument.php3
--- NEW FILE: errordocument.php3 ---
<?php
// $Id: errordocument.php3,v 1.1 2002/02/20 23:15:59 joestewart Exp $
$pagetitle = "Page not found"; // The name to be displayed in the header
$xsiteobject = "Error Document"; // 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'])) {
$auth->login_if($HTTP_GET_VARS['login']);
}
// Objects
$block = new Block_i;
$db = new slashDB;
// Start of Page
/* parse cmd line variables into array */
while ( list($key, $val) = each($HTTP_GET_VARS )) {
$ary[$key] = $val;
}
/* defaults for main "index" page */
if ((!$section) AND (!$section_id)){
$section = $_PSL['site_homesection'];
if(!$section) {
$section = "Home";
}
$ary['section'] = $section;
} else {
$pagetitle .= " - $section";
}
$breadcrumb = breadcrumb( $ary);
$_PSL['metatags']['object'] = $xsiteobject;
slashhead($pagetitle,$_PSL['metatags']);
$template = new Template($_PSL['templatedir']);
$template->debug = 0;
$template->set_file(array(
index => "notfound.tpl"
));
$template->set_var(array(
ROOTDIR => $_PSL['rooturl'],
IMAGEDIR => $_PSL['imagedir'],
ERRORURL => $REDIRECT_URL
));
$allstories = $template->parse(OUT,"index");
$leftblocks = $block->getBlocks($ary, "left");
$centerblocks = $block->getBlocks($ary, "center");
$rightblocks = $block->getBlocks($ary, "right");
if (empty($leftblocks)) {
if (empty($rightblocks)) {
// $centerblocks = $block->getBlocks($ary);
// $tplfile = "index1col.tpl";
// 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";
}
$template = new Template($_PSL['templatedir']);
$template->debug = 0;
$template->set_file(array(
'index' => $tplfile //"index3col.tpl"
));
$template->set_var(array(
'ROOTDIR' => $_PSL['rooturl'],
'IMAGEDIR' => $_PSL['imageurl'],
'BREADCRUMB' => $breadcrumb,
'STORY_COLUMN' => $allstories,
'LEFT_BLOCK_COLUMN' => $leftblocks,
'CENTER_BLOCK_COLUMN' => $centerblocks,
'RIGHT_BLOCK_COLUMN' => $rightblocks
));
$template->parse('OUT',"index");
$template->p('OUT');
slashfoot();
page_close();
?>
|
|
From: Joe S. <joe...@us...> - 2002-02-20 23:16:02
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv8920/phpslash-ft Modified Files: CHANGES Log Message: adding errordocument.php3 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.400 retrieving revision 1.401 diff -C2 -d -r1.400 -r1.401 *** CHANGES 18 Feb 2002 21:03:19 -0000 1.400 --- CHANGES 20 Feb 2002 23:15:59 -0000 1.401 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-18 5:00PM CST Joe Stewart <jo...@be...> + [T] - notfound.tpl, errordocument.php3. Merged Peter's index page + scheme into Russel's errordocument from stable. + [D] - phpslash.sgml updated for notfound.tpl. + 2002-Feb-18 3:00PM CST Joe Stewart <jo...@be...> [B] - [ #515209 ] pollAdmin.php3 - Luis' changes and string cleanup. |
|
From: Joe S. <joe...@us...> - 2002-02-18 21:09:44
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv19343/phpslash-ft/public_html/admin
Modified Files:
pollAdmin.php3
Log Message:
[ #515209 ] pollAdmin.php3 broken
Index: pollAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/pollAdmin.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pollAdmin.php3 18 Feb 2002 21:04:25 -0000 1.5
--- pollAdmin.php3 18 Feb 2002 21:09:40 -0000 1.6
***************
*** 51,55 ****
} else { // no permissions!
$auth->auth['error'] = pslgetText("Sorry. You do not have the necessary privilege to view this page.");
! Header("Location: " . $_PSL['rooturl' ."/login.php3"]); //
exit;
}
--- 51,55 ----
} else { // no permissions!
$auth->auth['error'] = pslgetText("Sorry. You do not have the necessary privilege to view this page.");
! Header("Location: " . $_PSL['rooturl' ."/login.php3"]);
exit;
}
|
|
From: Joe S. <joe...@us...> - 2002-02-18 21:04:28
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv17600/phpslash-ft/public_html
Modified Files:
login.php3
Log Message:
[ #515209 ] pollAdmin.php3 broken
Index: login.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** login.php3 3 Feb 2002 22:09:12 -0000 1.14
--- login.php3 18 Feb 2002 21:04:25 -0000 1.15
***************
*** 7,11 ****
if (isset($HTTP_POST_VARS['cancel'])) {
! Header("Location: " . $_PSL['rooturl']); // go home
die("\n"); // Kill script if not dead already, possible memory leak
}
--- 7,11 ----
if (isset($HTTP_POST_VARS['cancel'])) {
! Header("Location: " . $_PSL['rooturl' ."/"]); // go home
die("\n"); // Kill script if not dead already, possible memory leak
}
|
|
From: Joe S. <joe...@us...> - 2002-02-18 21:04:28
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv17600/phpslash-ft/public_html/admin
Modified Files:
pollAdmin.php3
Log Message:
[ #515209 ] pollAdmin.php3 broken
Index: pollAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/pollAdmin.php3,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pollAdmin.php3 6 Feb 2002 19:55:46 -0000 1.4
--- pollAdmin.php3 18 Feb 2002 21:04:25 -0000 1.5
***************
*** 13,20 ****
*****************************/
- slashhead($pagetitle,$xsiteobject);
-
- $debug = true;
-
/* DEBUG STUFF */
debug("HTTP_POST_VARS" , $HTTP_POST_VARS);
--- 13,16 ----
***************
*** 24,31 ****
$poll = new Poll;
- /* this is all really unsecure code. TODO, secure it! */
-
if ($perm->have_perm("poll")) {
switch ($submit) {
case "edit":
--- 20,27 ----
$poll = new Poll;
if ($perm->have_perm("poll")) {
+ slashhead($pagetitle,$xsiteobject);
+
switch ($submit) {
case "edit":
***************
*** 38,46 ****
if ($poll->savePoll($HTTP_POST_VARS)) {
echo "<center>";
! fancybox(210, "$_PSL['site_name'] Poll", $poll->getPollBooth("$HTTP_POST_VARS[question_id]"), "r");
echo "</center>";
} else {
echo "ERROR: $poll->message<BR>\n";
! };
break;
case "delete":
--- 34,42 ----
if ($poll->savePoll($HTTP_POST_VARS)) {
echo "<center>";
! fancybox(210, $_PSL['site_name'] ."Poll", $poll->getPollBooth($HTTP_POST_VARS['question_id']), "r");
echo "</center>";
} else {
echo "ERROR: $poll->message<BR>\n";
! }
break;
case "delete":
***************
*** 53,58 ****
}
! } else { /* no permissions! */
! echo "Ooops! You're not supposed to see this!<br>";
}
--- 49,56 ----
}
! } else { // no permissions!
! $auth->auth['error'] = pslgetText("Sorry. You do not have the necessary privilege to view this page.");
! Header("Location: " . $_PSL['rooturl' ."/login.php3"]); //
! exit;
}
|
|
From: Joe S. <joe...@us...> - 2002-02-18 21:03:21
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv17287/phpslash-ft Modified Files: CHANGES Log Message: [ #515209 ] pollAdmin.php3 broken Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.399 retrieving revision 1.400 diff -C2 -d -r1.399 -r1.400 *** CHANGES 11 Feb 2002 20:20:18 -0000 1.399 --- CHANGES 18 Feb 2002 21:03:19 -0000 1.400 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-18 3:00PM CST Joe Stewart <jo...@be...> + [B] - [ #515209 ] pollAdmin.php3 - Luis' changes and string cleanup. + login.php3 - tweak for cancel redirect using Mozilla. + 2002-Feb-11 2:00PM CST Joe Stewart <jo...@be...> [B] - fixed missing site_name, slogan, etc. - Should work with |
|
From: Joe S. <joe...@us...> - 2002-02-11 20:20:23
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv16629/phpslash-ft Modified Files: CHANGES Log Message: fixed missing sitename in backend Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.398 retrieving revision 1.399 diff -C2 -d -r1.398 -r1.399 *** CHANGES 11 Feb 2002 18:24:56 -0000 1.398 --- CHANGES 11 Feb 2002 20:20:18 -0000 1.399 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-11 2:00PM CST Joe Stewart <jo...@be...> + [B] - fixed missing site_name, slogan, etc. - Should work with + register_globals off OK. + 2002-Feb-11 12:00PM CST Joe Stewart <jo...@be...> [T] - breadcrumb.tpl - hardcoded link to index page. |
|
From: Joe S. <joe...@us...> - 2002-02-11 20:20:23
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv16629/phpslash-ft/public_html
Modified Files:
backend.php3
Log Message:
fixed missing sitename in backend
Index: backend.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/backend.php3,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** backend.php3 6 Feb 2002 20:46:52 -0000 1.20
--- backend.php3 11 Feb 2002 20:20:18 -0000 1.21
***************
*** 65,88 ****
}
! if(!$max) {
! $max= 15;
! $ary['max'] = 15;
! }
!
! $site_homesection = $_PSL['site_homesection'];
! if ($section == "") {
! $section = $site_homesection;
! if(!$section) {
! $section = "Home";
! }
}
$stories = $story->extractStories($ary);
! $site_name = $_PSL['site_name'];
! $site_title = $_PSL['site_title'];
!
!
! switch( $view) {
case "js":
$viewtpl = "backendJS.tpl";
--- 65,75 ----
}
! if(empty($ary['max'])) {
! $ary['max']= 15;
}
$stories = $story->extractStories($ary);
! switch( $ary['view']) {
case "js":
$viewtpl = "backendJS.tpl";
***************
*** 124,129 ****
}
! if( !$target) {
! $target = "_self";
}
$date = date("H:i m:d:y T");
--- 111,116 ----
}
! if( empty($ary['target'])) {
! $ary['target'] = "_self";
}
$date = date("H:i m:d:y T");
***************
*** 141,149 ****
$template->set_var(array(
! 'SITE_NAME' => $site_name,
! 'SITE_TITLE' => $site_title,
! 'SITE_SLOGAN' => $site_slogan,
'SITE_HOST' => $HTTP_HOST, // TODO: nh asks: Will this be around with register_globals=Off?
! 'PHP_SELF' => $PHP_SELF, // TODO: Make this use $_PSL['phpself']
'ROOTDIR' => $_PSL['rooturl'],
'DATE' => $date,
--- 128,136 ----
$template->set_var(array(
! 'SITE_NAME' => $_PSL['site_name'],
! 'SITE_TITLE' => $_PSL['site_title'],
! 'SITE_SLOGAN' => $_PSL['site_slogan'],
'SITE_HOST' => $HTTP_HOST, // TODO: nh asks: Will this be around with register_globals=Off?
! 'PHP_SELF' => $_PSL['phpself'],
'ROOTDIR' => $_PSL['rooturl'],
'DATE' => $date,
***************
*** 151,160 ****
));
! if( count($stories) < $max) {
! $max = count($stories);
}
$template->set_block("storiesbackend", "each_story", "stories");
! for ($i = 0 ; $i < $max ; $i++) {
! switch( $d) {
case "0":
--- 138,147 ----
));
! if( count($stories) < $ary['max']) {
! $ary['max'] = count($stories);
}
$template->set_block("storiesbackend", "each_story", "stories");
! for ($i = 0 ; $i < $ary['max']; $i++) {
! switch( $ary['d']) {
case "0":
***************
*** 162,169 ****
break;
case "s":
! $description = $site_name;
break;
case "l":
! $description = $site_name . " - ";
$description .= htmlspecialchars(strip_tags($stories[$i]["intro_text"]));
// $description .= format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
--- 149,156 ----
break;
case "s":
! $description = $_PSL['site_name'] ;
break;
case "l":
! $description = $_PSL['site_name'] . " - ";
$description .= htmlspecialchars(strip_tags($stories[$i]["intro_text"]));
// $description .= format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
***************
*** 181,186 ****
'TITLE' => htmlspecialchars($stories[$i]["title"]),
'INTRO_TEXT' => $description,
! 'TARGET' => $target,
! 'COUNT' => $max,
'IDX' => $i,
'DATEF' => $stories[$i]["datef"]
--- 168,173 ----
'TITLE' => htmlspecialchars($stories[$i]["title"]),
'INTRO_TEXT' => $description,
! 'TARGET' => $ary['target'],
! 'COUNT' => $ary['max'],
'IDX' => $i,
'DATEF' => $stories[$i]["datef"]
|
|
From: Joe S. <joe...@us...> - 2002-02-11 18:50:32
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html In directory usw-pr-cvs1:/tmp/cvs-serv21007/phpslash-ft/doc/html Modified Files: phpslash.sgml Log Message: breadcrumb in article page Index: phpslash.sgml =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** phpslash.sgml 11 Feb 2002 18:25:22 -0000 1.15 --- phpslash.sgml 11 Feb 2002 18:50:30 -0000 1.16 *************** *** 368,374 **** $_PSL[topicimagedir] = $_PSL[basedir] . "/images" . "/topics"; ! $Host - the hostname of the MySQL server ! $Database - the name of the database ! $User - the username used to connect to the database $Password - the password needed to connect to the database --- 368,377 ---- $_PSL[topicimagedir] = $_PSL[basedir] . "/images" . "/topics"; ! $Host - the hostname of the MySQL server ! ! $Database - the name of the database ! ! $User - the username used to connect to the database ! $Password - the password needed to connect to the database |
|
From: Joe S. <joe...@us...> - 2002-02-11 18:26:01
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv14287/phpslash-ft/public_html
Modified Files:
poll.php3
Log Message:
register_globals off
Index: poll.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/poll.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** poll.php3 6 Feb 2002 19:55:46 -0000 1.9
--- poll.php3 11 Feb 2002 18:25:58 -0000 1.10
***************
*** 9,12 ****
--- 9,17 ----
page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
+ /* parse cmd line variables into array */
+ while ( list($key, $val) = each($HTTP_GET_VARS )) {
+ $ary[$key] = $val;
+ }
+
slashhead($pagetitle,$xsiteobject);
***************
*** 14,20 ****
/* the comment stuff is using "story_id" so we have to funky
fix it here. */
! if (!$question_id && $story_id) {
! $question_id = $story_id;
! };
$as = arg_separator("1"); # Default: = &
--- 19,27 ----
/* the comment stuff is using "story_id" so we have to funky
fix it here. */
! if (!$ary['question_id'] && $ary['story_id']) {
! $question_id = $ary['story_id'];
! } else {
! $question_id = $ary['question_id'];
! }
$as = arg_separator("1"); # Default: = &
***************
*** 26,34 ****
/* setting up the possible comment variables... */
! $cmtary['mode'] = $mode;
! $cmtary['order'] = $order;
$cmtary['question_id'] = $question_id;
! switch ($submit) {
case "vote":
$poll->vote($question_id, $answer_id, $REMOTE_ADDR);
--- 33,41 ----
/* setting up the possible comment variables... */
! $cmtary['mode'] = $ary['mode'];
! $cmtary['order'] = $ary['order'];
$cmtary['question_id'] = $question_id;
! switch ($ary['submit']) {
case "vote":
$poll->vote($question_id, $answer_id, $REMOTE_ADDR);
***************
*** 55,59 ****
case "list":
! $poll->listPolls ($min);
break;
--- 62,66 ----
case "list":
! $poll->listPolls ($ary['min']);
break;
***************
*** 62,66 ****
$poll->resultPage($cmtary);
} else {
! $poll->listPolls ($min);
}
}
--- 69,73 ----
$poll->resultPage($cmtary);
} else {
! $poll->listPolls ($ary['min']);
}
}
|
|
From: Joe S. <joe...@us...> - 2002-02-11 18:25:25
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory usw-pr-cvs1:/tmp/cvs-serv14151/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
breadcrumb in article page
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** phpslash.sgml 4 Feb 2002 14:37:39 -0000 1.14
--- phpslash.sgml 11 Feb 2002 18:25:22 -0000 1.15
***************
*** 205,214 ****
<item><url url="http://www.mysql.com" name="MySQL Database">
<itemize>
! <item>Suggested version 3.23 and higher.
</itemize>
<item><url url="http://phplib.netuse.de/" name="PHPLIB">
<itemize>
! <item>Suggested version 7.2c and higher.
<item>If you have PHP4, you *must* run at least 7.2c because of a bug in the template library.
</itemize>
--- 205,214 ----
<item><url url="http://www.mysql.com" name="MySQL Database">
<itemize>
! <item>Suggested version 3.23.2 and higher.
</itemize>
<item><url url="http://phplib.netuse.de/" name="PHPLIB">
<itemize>
! <item>Suggested version 7.2d and higher.
<item>If you have PHP4, you *must* run at least 7.2c because of a bug in the template library.
</itemize>
***************
*** 337,349 ****
<tag/Section 1.11/
! Here are some directory and URL paths that are needed by phpslash., Shown below is a brief explination
! along with an example fo what the linw will look like in the config file.You'll need to edit these in order for phpslash to work.
NOTE: There are no trailing slashes at the end.
! NOTE: The format change from prevous versions of phpSlash.
! A reference to the local running php script. We use this a lot, so it makes sense to make a
! copy in our own array and use that instead of doing a global $PHP_SELF; on every function
! and object.
! $_PSL[phpself] = $PHP_SELF;
Complete filesystem path to the pages
--- 337,346 ----
<tag/Section 1.11/
! Here are some directory and URL paths that are needed by phpslash., Shown below is a brief explanation along with an example of what the line will look like in the config file. You'll need to edit these in order for phpslash to work.
NOTE: There are no trailing slashes at the end.
! NOTE: The format changed from previous versions of phpSlash.
! A reference to the local running php script. We use this a lot, so it makes sense to make a copy in our own array and use that instead of doing a global $PHP_SELF; on every function
! and object. $_PSL[phpself] = $HTTP_SERVER_VARS['PHP_SELF'];
Complete filesystem path to the pages
***************
*** 371,374 ****
--- 368,376 ----
$_PSL[topicimagedir] = $_PSL[basedir] . "/images" . "/topics";
+ $Host - the hostname of the MySQL server
+ $Database - the name of the database
+ $User - the username used to connect to the database
+ $Password - the password needed to connect to the database
+
<tag/Section 1.2/
***************
*** 400,412 ****
<tag/Section 2.0: PHPLIB configuration/
! You only need to change a few things in Section 2.1. Everything else
! should remain the same.
!
! In the slashDB configuration, change the following variables:
!
! $Host - the hostname of the MySQL server
! $Database - the name of the database
! $User - the username used to connect to the database
! $Password - the password needed to connect to the database
</descrip>
--- 402,406 ----
<tag/Section 2.0: PHPLIB configuration/
! You shouldn't need to make any changes in this section.
</descrip>
***************
*** 414,418 ****
Save and exit your editor.
! Now open up the site in a webrowser. <bf>Correct any errors, this is
where you'll probably get most of the problems with PHPSlash not finding
certain things like templates or images, etc...</bf> Just make sure your
--- 408,412 ----
Save and exit your editor.
! Now open up the site in a web browser. <bf>Correct any errors, this is
where you'll probably get most of the problems with PHPSlash not finding
certain things like templates or images, etc...</bf> Just make sure your
***************
*** 632,635 ****
--- 626,630 ----
blockEdit.tpl
blocktypeList.tpl
+ breadcrumb.tpl
comment.tpl
commentDisplay.tpl
***************
*** 705,713 ****
<sect1> Sections, topics, blocks and pages: Explained
<sect2>Pages
! <p> A page in phpslash is really nothing special.. it simply set up the
environment and calls the required classes to pull information. Each page
has calls to pull out certain topics or sections, but they can be changed
(for the most part) on the fly by the user (article.php3 is a special
! case, but we'll put that aside for the moment...). Let's forget out page
for a moment and just assume it will call anything and everything we want,
when we tell it (the index.php3 page pretty much behaves this way..).
--- 700,708 ----
<sect1> Sections, topics, blocks and pages: Explained
<sect2>Pages
! <p> A page in phpslash is really nothing special.. it simply sets up the
environment and calls the required classes to pull information. Each page
has calls to pull out certain topics or sections, but they can be changed
(for the most part) on the fly by the user (article.php3 is a special
! case, but we'll put that aside for the moment...). Let's forget about page
for a moment and just assume it will call anything and everything we want,
when we tell it (the index.php3 page pretty much behaves this way..).
***************
*** 775,780 ****
<p>
The administrative pages for phpslash are protected by a username/password
! system. Each site admin gets a username, password and a security
! level (which is assigned by another admin). When you first hit an admin
page you will told "You have no authority. Login to gain it." and
presented with the standard username and password entry fields. Simply
--- 770,775 ----
<p>
The administrative pages for phpslash are protected by a username/password
! system. Each site admin gets a username, password and security
! permissions (which are assigned by another admin). When you first hit an admin
page you will told "You have no authority. Login to gain it." and
presented with the standard username and password entry fields. Simply
|
|
From: Joe S. <joe...@us...> - 2002-02-11 18:24:59
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv13956/phpslash-ft/public_html/templates/en/default
Modified Files:
breadcrumb.tpl
Log Message:
breadcrumb in article page
Index: breadcrumb.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/breadcrumb.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** breadcrumb.tpl 15 Nov 2000 16:17:20 -0000 1.1
--- breadcrumb.tpl 11 Feb 2002 18:24:56 -0000 1.2
***************
*** 2,6 ****
<font size=1 face="arial, helvetica">
<!-- BEGIN each_crumb -->
! {DELIMETER}<a href="{PHP_SELF}{LINK}">{NAME}</a>
<!-- END each_crumb -->
</font>
--- 2,6 ----
<font size=1 face="arial, helvetica">
<!-- BEGIN each_crumb -->
! {DELIMETER}<a href="{ROOTURL}/index.php3{LINK}">{NAME}</a>
<!-- END each_crumb -->
</font>
|
|
From: Joe S. <joe...@us...> - 2002-02-11 18:24:59
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv13956/phpslash-ft/public_html
Modified Files:
article.php3
Log Message:
breadcrumb in article page
Index: article.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** article.php3 3 Feb 2002 22:09:12 -0000 1.58
--- article.php3 11 Feb 2002 18:24:56 -0000 1.59
***************
*** 24,27 ****
--- 24,32 ----
}
+ // correction for register_globals OFF
+ $story_id = $ary['story_id'];
+ $submit = $ary['submit'];
+
+
if ((!$section) AND (!$section)) {
$section = $_PSL[site_homesection];
***************
*** 79,95 ****
default:
! if (!isset($parent_id)) {
! $parent_id = 0;
}
$t->set_file(article, "article.tpl");
!
$_PSL['metatags']['object'] = $xsiteobject;
// override description metatag to include first 150 chars of article
$_PSL['metatags']['description'] = substr(strip_tags($story->story_ary["intro_text"]), 0, 150);
- // $header = getHeader($ttitle,$_PSL['metatags']);
- // $footer = getFooter();
-
// $titlebar = getTitlebar("100%", $title); // here if you need it.
--- 84,99 ----
default:
! if (!isset($ary['parent_id'])) {
! $ary['parent_id'] = 0;
}
$t->set_file(article, "article.tpl");
!
! $breadcrumb = breadcrumb($ary);
!
$_PSL['metatags']['object'] = $xsiteobject;
// override description metatag to include first 150 chars of article
$_PSL['metatags']['description'] = substr(strip_tags($story->story_ary["intro_text"]), 0, 150);
// $titlebar = getTitlebar("100%", $title); // here if you need it.
***************
*** 128,135 ****
/* Now the comments */
! $cmtary['mode'] = $mode;
! $cmtary['order'] = $order;
! $cmtary['story_id'] = $story_id;
! $cmtary['parent_id'] = $parent_id;
$cmt = new Comment($cmtary);
$comments = $cmt->getAllComments($cmtary);
--- 132,139 ----
/* Now the comments */
! $cmtary['mode'] = $ary['mode'];
! $cmtary['order'] = $ary['order'];
! $cmtary['story_id'] = $ary['story_id'];
! $cmtary['parent_id'] = $ary['parent_id'];
$cmt = new Comment($cmtary);
$comments = $cmt->getAllComments($cmtary);
|
|
From: Joe S. <joe...@us...> - 2002-02-11 18:24:59
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv13956/phpslash-ft Modified Files: CHANGES Log Message: breadcrumb in article page Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.397 retrieving revision 1.398 diff -C2 -d -r1.397 -r1.398 *** CHANGES 8 Feb 2002 22:17:27 -0000 1.397 --- CHANGES 11 Feb 2002 18:24:56 -0000 1.398 *************** *** 13,16 **** --- 13,22 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-11 12:00PM CST Joe Stewart <jo...@be...> + [T] - breadcrumb.tpl - hardcoded link to index page. + [W] - article.php3 - now supports breadcrumb. + [W] - article.php3, poll.php3 - work towards register_globals OFF. + [D] - phpslash.sgml - typos and other small tweaks. + 2002-Feb-08 5:07PM EST nathan hruby <na...@ds...> [B] - Wrapped $login in index |
2 messages has been excluded from this view by a project administrator.
