phpslash-commit Mailing List for phpSlash (Page 75)
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-10-25 05:14:22
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv23775/phpslash-ft Modified Files: CHANGES Log Message: reduce the number of Undefined index warnings Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.580 retrieving revision 1.581 diff -C2 -d -r1.580 -r1.581 *** CHANGES 23 Oct 2002 20:47:48 -0000 1.580 --- CHANGES 24 Oct 2002 18:13:32 -0000 1.581 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-October-24 12:00PM CDT Joe Stewart <joe...@us...> + [W] - effort to reduce the number of "Undefined index" warnings. Most + script and class files affected. + 2002-October-23 3:30PM CDT Joe Stewart <joe...@us...> [W] - Block_render_login.class, slashAuthCR.class - login block tweaks |
|
From: Joe S. <joe...@us...> - 2002-10-25 05:14:14
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv22718/class
Modified Files:
Block.class Block_admin.class Block_i.class
Block_render_login.class Block_render_section.class
Block_render_skin.class Block_render_topic.class Comment.class
Glossary.class Story.class Story_base.class functions.inc
slashAuthCR.class slashPerm.class
Log Message:
reduce the number of Undefined index warnings
Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Block.class 21 Oct 2002 20:42:27 -0000 1.16
--- Block.class 24 Oct 2002 18:12:10 -0000 1.17
***************
*** 425,429 ****
static $parser_arr;
! if( !$parser_arr[$mytype]) {
if( @file_exists($this->psl['classdir'] .'/'. $parserFile)) {
--- 425,429 ----
static $parser_arr;
! if( empty($parser_arr[$mytype])) {
if( @file_exists($this->psl['classdir'] .'/'. $parserFile)) {
***************
*** 555,559 ****
AND psl_block_type.id = psl_block.type
AND psl_section.section_id = lut.section_id ";
! if ( $ary['section_id'] != "") {
$q .= "AND lut.section_id = '$ary[section_id]' ";
} else {
--- 555,559 ----
AND psl_block_type.id = psl_block.type
AND psl_section.section_id = lut.section_id ";
! if ( !empty($ary['section_id'])) {
$q .= "AND lut.section_id = '$ary[section_id]' ";
} else {
Index: Block_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_admin.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Block_admin.class 7 Jun 2002 16:24:04 -0000 1.2
--- Block_admin.class 24 Oct 2002 18:12:10 -0000 1.3
***************
*** 87,93 ****
while ($this->db->next_record()) {
$this->templ->set_var(array(
! 'SECTION_ID' => $this->db->Record[section_id],
'SELECTED' => "",
! 'SECTION_NAME' => $this->db->Record[section_name]
));
$this->templ->parse("section_rows","section_row",true);
--- 87,93 ----
while ($this->db->next_record()) {
$this->templ->set_var(array(
! 'SECTION_ID' => $this->db->Record['section_id'],
'SELECTED' => "",
! 'SECTION_NAME' => $this->db->Record['section_name']
));
$this->templ->parse("section_rows","section_row",true);
***************
*** 104,108 ****
'CACHE_DATA' => "",
'BLOCK_ID' => "",
! 'ORDERNUM' => ""
));
--- 104,108 ----
'CACHE_DATA' => "",
'BLOCK_ID' => "",
! 'ORDERNUM' => ""
));
***************
*** 136,140 ****
while ($this->db->next_record()) {
! $section_ary[$i] = $this->db->Record[section_id];
$i++;
}
--- 136,140 ----
while ($this->db->next_record()) {
! $section_ary[$i] = $this->db->Record['section_id'];
$i++;
}
***************
*** 169,176 ****
));
! $this->templ->set_var(SELECTED,"");
for ($i = 0 ; $i < count($section_ary) ; $i++) {
! if ($section_ary[$i] == $this->db->Record[section_id]) {
! $this->templ->set_var(SELECTED,"SELECTED");
}
}
--- 169,176 ----
));
! $this->templ->set_var('SELECTED',"");
for ($i = 0 ; $i < count($section_ary) ; $i++) {
! if ($section_ary[$i] == $this->db->Record['section_id']) {
! $this->templ->set_var('SELECTED',"SELECTED");
}
}
***************
*** 213,216 ****
--- 213,218 ----
function listBlock() {
+ $i = 0;
+
$query = "SELECT block.id,
title,
***************
*** 270,274 ****
$this->templ->debug = 0;
$this->templ->set_file(array(
! listblocktypes => "blocktypeList.tpl"
));
--- 272,276 ----
$this->templ->debug = 0;
$this->templ->set_file(array(
! 'listblocktypes' => "blocktypeList.tpl"
));
Index: Block_i.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_i.class,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Block_i.class 7 Jun 2002 16:24:04 -0000 1.19
--- Block_i.class 24 Oct 2002 18:12:10 -0000 1.20
***************
*** 130,133 ****
--- 130,134 ----
$width = "100%";
+ $box_type = '';
if ( ($ary['block_options']['column'] == $column) OR
***************
*** 179,183 ****
default:
// pluggable user defined function
! if ($this->psl['block_options_udf'] != '') {
$ary = $this->psl['block_options_udf']($key, $value, $ary);
}
--- 180,184 ----
default:
// pluggable user defined function
! if (!empty($this->psl['block_options_udf'])) {
$ary = $this->psl['block_options_udf']($key, $value, $ary);
}
Index: Block_render_login.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_login.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Block_render_login.class 23 Oct 2002 20:47:50 -0000 1.4
--- Block_render_login.class 24 Oct 2002 18:12:10 -0000 1.5
***************
*** 57,61 ****
$template->debug = 0;
$template->set_file(array(
! block => "$tpl"
));
--- 57,61 ----
$template->debug = 0;
$template->set_file(array(
! 'block' => "$tpl"
));
Index: Block_render_section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_section.class,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Block_render_section.class 3 Sep 2002 19:54:40 -0000 1.11
--- Block_render_section.class 24 Oct 2002 18:12:10 -0000 1.12
***************
*** 60,67 ****
$db = new slashDB;
!
$default_tpl = "sectionsblock.tpl";
! if( $this->psl['site_homesection'] == false) {
! $site_homesection = 'Home';
}
--- 60,69 ----
$db = new slashDB;
! $mode = '';
!
$default_tpl = "sectionsblock.tpl";
! $site_homesection = 'Home';
! if( !empty($this->psl['site_homesection'])) {
! $site_homesection = $this->psl['site_homesection'];
}
***************
*** 103,109 ****
$q .= ", psl_section_lut
WHERE psl_section.section_id = psl_section_lut.section_id ";
! if ( $section_id) {
$q .= " AND psl_section.section_id = '$section_id' ";
! } elseif( $section) {
$q .= " AND psl_section.section_name = '$section' ";
}
--- 105,111 ----
$q .= ", psl_section_lut
WHERE psl_section.section_id = psl_section_lut.section_id ";
! if ( isset($section_id)) {
$q .= " AND psl_section.section_id = '$section_id' ";
! } elseif( isset($section)) {
$q .= " AND psl_section.section_name = '$section' ";
}
Index: Block_render_skin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_skin.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Block_render_skin.class 3 Sep 2002 19:54:40 -0000 1.7
--- Block_render_skin.class 24 Oct 2002 18:12:10 -0000 1.8
***************
*** 91,95 ****
$template->set_var(array(
! SKIN => $eachfile
));
--- 91,95 ----
$template->set_var(array(
! 'SKIN' => $eachfile
));
Index: Block_render_topic.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_topic.class,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Block_render_topic.class 3 Sep 2002 20:01:03 -0000 1.10
--- Block_render_topic.class 24 Oct 2002 18:12:10 -0000 1.11
***************
*** 35,38 ****
--- 35,39 ----
$db = new slashDB;
+ $mode = '';
$default_tpl = "topicsblock.tpl";
***************
*** 75,79 ****
/* "section" will show how only topics in this section that have stories */
! if ( $section_id != '') {
$q .= ",psl_topic_lut,
psl_section_lut,
--- 76,80 ----
/* "section" will show how only topics in this section that have stories */
! if ( isset($section_id)) {
$q .= ",psl_topic_lut,
psl_section_lut,
***************
*** 82,86 ****
AND psl_topic_lut.story_id = psl_section_lut.story_id
AND psl_section_lut.section_id = '$section_id' ";
! } elseif ( $section != "") {
$q = "SELECT DISTINCT psl_topic.topic_id,
psl_topic.topic_name,
--- 83,87 ----
AND psl_topic_lut.story_id = psl_section_lut.story_id
AND psl_section_lut.section_id = '$section_id' ";
! } elseif ( isset($section)) {
$q = "SELECT DISTINCT psl_topic.topic_id,
psl_topic.topic_name,
***************
*** 113,117 ****
'TOPIC_NAME' => $db->Record['topic_name']
));
! if ( ($section_id != "") AND ( $section != $site_homesection)) {
$template->set_var (array (
--- 114,118 ----
'TOPIC_NAME' => $db->Record['topic_name']
));
! if ( (!empty($section_id)) AND ( $section != $site_homesection)) {
$template->set_var (array (
Index: Comment.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Comment.class 24 Sep 2002 16:23:39 -0000 1.34
--- Comment.class 24 Oct 2002 18:12:10 -0000 1.35
***************
*** 44,47 ****
--- 44,49 ----
$this->auth = $auth;
+ $tags = '';
+
if ($ary['mode'] == "") {
$this->mode = $this->psl['comment_defaultmode'];
***************
*** 122,126 ****
ON psl_comment.user_id = psl_author.author_id
WHERE story_id = '$ary[story_id]' ";
! if( $ary['comment_id']) {
$query .= "AND comment_id >= '$ary[comment_id]' ";
}
--- 124,128 ----
ON psl_comment.user_id = psl_author.author_id
WHERE story_id = '$ary[story_id]' ";
! if( !empty($ary['comment_id'])) {
$query .= "AND comment_id >= '$ary[comment_id]' ";
}
***************
*** 384,387 ****
--- 386,391 ----
function nested($parent_id, $lvl) {
+ $all_comments = '';
+
$templ = new Template($this->psl['templatedir'], 'remove');
$templ->debug = 0;
***************
*** 424,427 ****
--- 428,433 ----
function thread($parent_id, $lvl) {
+ $all_comments = '';
+
$templ = new Template($this->psl['templatedir'], remove);
$templ->debug = 0;
***************
*** 465,468 ****
--- 471,476 ----
*/
function index($parent_id, $lvl) {
+
+ $all_comments = '';
$templ = new Template($this->psl['templatedir'], remove);
Index: Glossary.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Glossary.class,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Glossary.class 18 Jun 2002 16:35:07 -0000 1.8
--- Glossary.class 24 Oct 2002 18:12:10 -0000 1.9
***************
*** 162,166 ****
$this->templ->set_var(array(
'TITLEBAR' => getTitlebar("100%",pslgetText("Glossary")),
! 'ACTION_URL' => $this->psl[phpself]
));
--- 162,166 ----
$this->templ->set_var(array(
'TITLEBAR' => getTitlebar("100%",pslgetText("Glossary")),
! 'ACTION_URL' => $this->psl['phpself']
));
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Story.class 11 Oct 2002 19:31:24 -0000 1.41
--- Story.class 24 Oct 2002 18:12:10 -0000 1.42
***************
*** 435,439 ****
$default_tpl = "indexstory";
!
$site_homesection = $this->psl['site_homesection'];
if( !$site_homesection) {
--- 435,440 ----
$default_tpl = "indexstory";
! $topic_id_ary = '';
!
$site_homesection = $this->psl['site_homesection'];
if( !$site_homesection) {
***************
*** 488,494 ****
}
! if ($mode != "full") {
$body_text = "";
! }
$this->template->set_var(array(
'rows' => "",
--- 489,495 ----
}
! // if ($mode != "full") {
$body_text = "";
! // }
$this->template->set_var(array(
'rows' => "",
***************
*** 499,503 ****
$this->template->set_var(array(
! 'SKIN' => $this->psl['skin'],
'TITLEBAR' => $titlebar,
'TITLE' => $stories_ary[$i]['title'],
--- 500,504 ----
$this->template->set_var(array(
! 'SKIN' => $this->psl['skin'],
'TITLEBAR' => $titlebar,
'TITLE' => $stories_ary[$i]['title'],
***************
*** 520,524 ****
));
! $topic_id_ary = $stories_ary[$i]['topic_id_ary'];
$topic_name_ary = $stories_ary[$i]['topic_name_ary'];
--- 521,527 ----
));
! if(!empty($stories_ary[$i]['topic_id_ary'])) {
! $topic_id_ary = $stories_ary[$i]['topic_id_ary'];
! }
$topic_name_ary = $stories_ary[$i]['topic_name_ary'];
***************
*** 545,564 ****
$link_argv = $stories_ary[$i]['story_id'];
! if ( $ary['mode'] != "") {
$link_argv .= "&mode=" . $ary['mode'];
}
! if ( $ary['section_id'] != "") {
$link_argv .= "&section_id=" . $ary['section_id'];
} elseif ( $ary['section'] != $site_homesection) {
$link_argv .= "&section=" . $ary['section'];
}
! if ( $ary['topic_id'] != "") {
$link_argv .= "&topic_id=" . urlencode($ary['topic_id']);
! } elseif ( $ary['topic'] != "") {
$link_argv .= "&topic=" . urlencode($ary['topic']);
}
! if ( $ary['author_id'] != "") {
$link_argv .= "&author_id=" . $ary['author_id'];
! } elseif ( $ary['author'] != "") {
$link_argv .= "&author=" . $ary['author'];
}
--- 548,567 ----
$link_argv = $stories_ary[$i]['story_id'];
! if ( !empty($ary['mode'])) {
$link_argv .= "&mode=" . $ary['mode'];
}
! if ( !empty($ary['section_id'])) {
$link_argv .= "&section_id=" . $ary['section_id'];
} elseif ( $ary['section'] != $site_homesection) {
$link_argv .= "&section=" . $ary['section'];
}
! if ( !empty($ary['topic_id'])) {
$link_argv .= "&topic_id=" . urlencode($ary['topic_id']);
! } elseif ( !empty($ary['topic'])) {
$link_argv .= "&topic=" . urlencode($ary['topic']);
}
! if ( !empty($ary['author_id'])) {
$link_argv .= "&author_id=" . $ary['author_id'];
! } elseif ( !empty($ary['author'])) {
$link_argv .= "&author=" . $ary['author'];
}
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Story_base.class 11 Oct 2002 19:31:24 -0000 1.16
--- Story_base.class 24 Oct 2002 18:12:10 -0000 1.17
***************
*** 171,174 ****
--- 171,177 ----
// debug("Story::extractStories.argv_ary", $argv_ary);
+
+ $stories_ary = '';
+
if(!is_array($argv_ary)) {
$argv_ary = array();
***************
*** 177,181 ****
$q = "SELECT ";
! if( $argv_ary["fields"] != "") {
$q .= $argv_ary["fields"];
} else {
--- 180,184 ----
$q = "SELECT ";
! if( !empty($argv_ary["fields"])) {
$q .= $argv_ary["fields"];
} else {
***************
*** 207,211 ****
psl_commentcount ";
! if ($argv_ary['section_id'] != "") {
$q .= " ,psl_section_lut ";
} elseif ($argv_ary['section'] != "") {
--- 210,214 ----
psl_commentcount ";
! if (!empty($argv_ary['section_id'])) {
$q .= " ,psl_section_lut ";
} elseif ($argv_ary['section'] != "") {
***************
*** 219,223 ****
// if no date specified, display from now back(no future articles)
! if( $argv_ary['date'] == "") {
$argv_ary['date'] = date("Y-m-d H:i:s");
} else {
--- 222,226 ----
// if no date specified, display from now back(no future articles)
! if( empty($argv_ary['date'])) {
$argv_ary['date'] = date("Y-m-d H:i:s");
} else {
***************
*** 231,235 ****
case "section":
! if ( $argv_ary['section_id'] == "") {
$q .= "AND psl_story.story_id = psl_section_lut.story_id
AND psl_section_lut.section_id = psl_section.section_id
--- 234,238 ----
case "section":
! if ( empty($argv_ary['section_id'])) {
$q .= "AND psl_story.story_id = psl_section_lut.story_id
AND psl_section_lut.section_id = psl_section.section_id
***************
*** 250,254 ****
case "topic_id":
! if( $argv_ary["topic"] == "" ) {
$q .= "AND psl_story.story_id = psl_topic_lut.story_id
AND psl_topic_lut.topic_id = '$argv_ary[topic_id]' ";
--- 253,257 ----
case "topic_id":
! if( empty($argv_ary["topic"])) {
$q .= "AND psl_story.story_id = psl_topic_lut.story_id
AND psl_topic_lut.topic_id = '$argv_ary[topic_id]' ";
***************
*** 292,296 ****
$start = 0;
$start_set = FALSE;
! if ($argv_ary['start'] == "") {
$start_set = TRUE;
$argv_ary['start'] = 0;
--- 295,299 ----
$start = 0;
$start_set = FALSE;
! if (empty($argv_ary['start'])) {
$start_set = TRUE;
$argv_ary['start'] = 0;
***************
*** 313,331 ****
*
*/
! if ($argv_ary['chunkincr'] == "") {
$argv_ary['chunkincr'] = 2;
}
! if ($argv_ary['max'] == "") {
$argv_ary['max'] = 10;
}
! if ($argv_ary['chunk'] == "") {
$argv_ary['chunk'] = $argv_ary['chunkincr'] * $argv_ary['max'];
}
! if ($argv_ary['order'] == "" ) {
$argv_ary['order'] = "time";
}
! if ($argv_ary['asc'] == "" ) {
$argv_ary['asc'] = "DESC";
}
--- 316,334 ----
*
*/
! if (empty($argv_ary['chunkincr'])) {
$argv_ary['chunkincr'] = 2;
}
! if (empty($argv_ary['max'])) {
$argv_ary['max'] = 10;
}
! if (empty($argv_ary['chunk'])) {
$argv_ary['chunk'] = $argv_ary['chunkincr'] * $argv_ary['max'];
}
! if (empty($argv_ary['order']) ) {
$argv_ary['order'] = "time";
}
! if (empty($argv_ary['asc']) ) {
$argv_ary['asc'] = "DESC";
}
***************
*** 411,415 ****
}
}
! if ($argv_ary['debug'] == "on") {
debug("Story::extractStories.queries", $queries);
debug("Story::extractStories.returned", $returned);
--- 414,418 ----
}
}
! if (!empty($argv_ary['debug'])) {
debug("Story::extractStories.queries", $queries);
debug("Story::extractStories.returned", $returned);
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** functions.inc 3 Sep 2002 15:06:07 -0000 1.109
--- functions.inc 24 Oct 2002 18:12:11 -0000 1.110
***************
*** 193,196 ****
--- 193,197 ----
$template = "fancybox.tpl";
+ $align = '';
/* Templates */
***************
*** 392,395 ****
--- 393,399 ----
$default_template = "slashHead.tpl";
+ $navbar_ary = array();
+ $navbar_ary['tpl'] = '';
+ $navbar_ary['menu_ary'] = '';
if (!$title) {
***************
*** 397,401 ****
};
! if ($section != '') {
$block = new Block_i;
// should be passing array now days
--- 401,405 ----
};
! if (!isset($section)) {
$block = new Block_i;
// should be passing array now days
***************
*** 433,438 ****
$templ->set_var('XSITEOBJECT', $metaobject['object']);
unset($metaobject['object']);
!
! $navbar_ary = $metaobject['navbar_ary'];
unset($metaobject['navbar_ary']);
--- 437,444 ----
$templ->set_var('XSITEOBJECT', $metaobject['object']);
unset($metaobject['object']);
!
! if(!empty($metaobject['navbar_ary'])) {
! $navbar_ary = $metaobject['navbar_ary'];
! }
unset($metaobject['navbar_ary']);
***************
*** 476,480 ****
'SITE_SLOGAN' => $_PSL['site_slogan'],
'SITE_TITLE' => $_PSL['site_title'],
! 'SECTION' => $_PSL['section'],
'ROOTDIR' => $_PSL['rooturl'],
'IMAGEDIR' => $_PSL['imageurl'],
--- 482,486 ----
'SITE_SLOGAN' => $_PSL['site_slogan'],
'SITE_TITLE' => $_PSL['site_title'],
! 'SECTION' => $section,
'ROOTDIR' => $_PSL['rooturl'],
'IMAGEDIR' => $_PSL['imageurl'],
***************
*** 658,662 ****
$as = $_PSL['amp'];
! if ($ary['section_id']) {
$sec = new Section;
$ary['section'] = $sec->getName($ary['section_id']);
--- 664,668 ----
$as = $_PSL['amp'];
! if (!empty($ary['section_id'])) {
$sec = new Section;
$ary['section'] = $sec->getName($ary['section_id']);
***************
*** 666,675 ****
}
! if ($ary['topic_id']) {
$top = new Topic;
$ary['topic'] = $top->getName($ary['topic_id']);
$_PSL['topic'] = $ary['topic'];
}
! if ($ary['author_id']) {
$author = new Author;
$ary['author'] = $author->getName($ary['author_id']);
--- 672,681 ----
}
! if (!empty($ary['topic_id'])) {
$top = new Topic;
$ary['topic'] = $top->getName($ary['topic_id']);
$_PSL['topic'] = $ary['topic'];
}
! if (!empty($ary['author_id'])) {
$author = new Author;
$ary['author'] = $author->getName($ary['author_id']);
***************
*** 678,683 ****
if( ($ary['section_id'] != $_PSL['home_section_id']) OR
! ($ary['topic_id'] != "") OR
! ($ary['author_id'] != "") ) {
$delimeter = "->";
--- 684,689 ----
if( ($ary['section_id'] != $_PSL['home_section_id']) OR
! (!empty($ary['topic_id'])) OR
! (!empty($ary['author_id'])) ) {
$delimeter = "->";
***************
*** 698,705 ****
/* setup the first link to the homepage */
$template->set_var(array(
! PHP_SELF => $_PSL['phpself'],
! DELIMETER => "",
! LINK => "",
! NAME => pslgetText("Home")
));
--- 704,711 ----
/* setup the first link to the homepage */
$template->set_var(array(
! 'PHP_SELF' => $_PSL['phpself'],
! 'DELIMETER' => "",
! 'LINK' => "",
! 'NAME' => pslgetText("Home")
));
***************
*** 730,734 ****
}
! if ($ary['author_id'] != "") {
$template->set_var(array(
--- 736,740 ----
}
! if (!empty($ary['author_id'])) {
$template->set_var(array(
***************
*** 868,872 ****
}
}
! if( $pslstrings[$string]) {
$string = htmlentities($pslstrings[$string]);
} elseif (($_PSL['debug']) AND ($pslstrings)) {
--- 874,878 ----
}
}
! if( !empty($pslstrings[$string])) {
$string = htmlentities($pslstrings[$string]);
} elseif (($_PSL['debug']) AND ($pslstrings)) {
***************
*** 888,891 ****
--- 894,899 ----
static $localinfo;
static $catcodes;
+
+ $ans = '';
if (!$catcodes) {
***************
*** 912,916 ****
}
}
! $ans = $localinfo[$locale][$category][$keyword];
if (!isset($ans)) {
/* Hm. it's not in the localinfo array. We'll try first looking
--- 920,926 ----
}
}
! if(!empty($localinfo[$locale][$category][$keyword])) {
! $ans = $localinfo[$locale][$category][$keyword];
! }
if (!isset($ans)) {
/* Hm. it's not in the localinfo array. We'll try first looking
***************
*** 1180,1189 ****
global $_PSL, $HTTP_GET_VARS, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS;
$fn = "set_TZ";
// debug("$fn: start",$new_tzname);
// default: value in _PSL array.
! $default_TZ = $_PSL['timezone']['name'];
! if (!$default_TZ && $_PSL['timezone']['native'])
$default_TZ = $_PSL['timezone']['default'];
// start with cookie value if it's set
$cookie_TZ = $HTTP_COOKIE_VARS['TZ'];
--- 1190,1205 ----
global $_PSL, $HTTP_GET_VARS, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS;
$fn = "set_TZ";
+ $default_TZ = '';
+ $host = '';
+
// debug("$fn: start",$new_tzname);
// default: value in _PSL array.
! if (!empty($_PSL['timezone']['name'])) {
! $default_TZ = $_PSL['timezone']['name'];
! }
! if (!$default_TZ && !empty($_PSL['timezone']['native']) && !empty($_PSL['timezone']['default'])) {
$default_TZ = $_PSL['timezone']['default'];
+ }
// start with cookie value if it's set
$cookie_TZ = $HTTP_COOKIE_VARS['TZ'];
Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** slashAuthCR.class 23 Oct 2002 20:47:50 -0000 1.25
--- slashAuthCR.class 24 Oct 2002 18:12:11 -0000 1.26
***************
*** 38,42 ****
$this->psl = $_PSL;
! if ($HTTP_GET_VARS['mode']=='reg') {
if( !empty($_PSL['authmode'])) {
$this->mode = $_PSL['authmode'];
--- 38,42 ----
$this->psl = $_PSL;
! if (!empty($HTTP_GET_VARS['mode']) && $HTTP_GET_VARS['mode']=='reg') {
if( !empty($_PSL['authmode'])) {
$this->mode = $_PSL['authmode'];
***************
*** 65,69 ****
}
! $templ = new Template($_PSL[templatedir]);
$templ->set_file(array(
'form' => "loginformCR.tpl"
--- 65,69 ----
}
! $templ = new Template($_PSL['templatedir']);
$templ->set_file(array(
'form' => "loginformCR.tpl"
***************
*** 158,162 ****
global $HTTP_POST_VARS, $HTTP_GET_VARS, $saved_get, $saved_post, $challenge;
! if(sizeof($HTTP_POST_VARS) == 0) {
if($this->auth['uid'] == 'nobody'){
$uid = $this->auth["uid"] = "nobody";
--- 158,162 ----
global $HTTP_POST_VARS, $HTTP_GET_VARS, $saved_get, $saved_post, $challenge;
! if(empty($HTTP_POST_VARS)) {
if($this->auth['uid'] == 'nobody'){
$uid = $this->auth["uid"] = "nobody";
***************
*** 446,451 ****
while ($this->db->next_record()) {
! $group_id = $this->db->Record[group_id];
! $this->auth["perm"][$this->db->Record['group_name']][$this->db->Record['permission_name']] = true;
$q = "SELECT section_id
FROM psl_group_section_lut
--- 446,451 ----
while ($this->db->next_record()) {
! $group_id = $this->db->Record['group_id'];
! $this->auth['perm'][$this->db->Record['group_name']][$this->db->Record['permission_name']] = true;
$q = "SELECT section_id
FROM psl_group_section_lut
***************
*** 491,495 ****
$childgroup_name = $groups_ary[$childgroup_id];
! if( is_array($this->auth['perm'][$childgroup_name])) {
$this->auth['perm'][$group_name][$childgroup_name] = $this->auth['perm'][$childgroup_name];
} else {
--- 491,496 ----
$childgroup_name = $groups_ary[$childgroup_id];
! if( !empty($this->auth['perm'][$childgroup_name]) &&
! is_array($this->auth['perm'][$childgroup_name])) {
$this->auth['perm'][$group_name][$childgroup_name] = $this->auth['perm'][$childgroup_name];
} else {
Index: slashPerm.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashPerm.class,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** slashPerm.class 10 Oct 2002 16:40:25 -0000 1.8
--- slashPerm.class 24 Oct 2002 18:12:11 -0000 1.9
***************
*** 24,28 ****
global $_PSL, $auth;
!
$this->permissions = $_PSL['perm_array'];
$this->auth = $auth;
--- 24,31 ----
global $_PSL, $auth;
!
! if(empty($_PSL['perm_array'])) {
! $_PSL['perm_array'] = '';
! }
$this->permissions = $_PSL['perm_array'];
$this->auth = $auth;
***************
*** 103,107 ****
}
$k = trim($p_ary[$i]);
! if( !$ary[$k]) {
$i = $max;
}
--- 106,110 ----
}
$k = trim($p_ary[$i]);
! if( empty($ary[$k])) {
$i = $max;
}
|
|
From: Joe S. <joe...@us...> - 2002-10-25 05:14:10
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv22718/public_html/admin
Modified Files:
blockAdmin.php3
Log Message:
reduce the number of Undefined index warnings
Index: blockAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/blockAdmin.php3,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** blockAdmin.php3 11 Sep 2002 17:14:23 -0000 1.8
--- blockAdmin.php3 24 Oct 2002 18:12:11 -0000 1.9
***************
*** 129,133 ****
'ROOTDIR' => $_PSL['rooturl'],
'IMAGEDIR' => $_PSL['imageurl'],
! 'BREADCRUMB' => $breadcrumb,
'STORY_COLUMN' => $content,
'LEFT_BLOCK_COLUMN' => $leftblocks,
--- 129,133 ----
'ROOTDIR' => $_PSL['rooturl'],
'IMAGEDIR' => $_PSL['imageurl'],
! // 'BREADCRUMB' => $breadcrumb,
'STORY_COLUMN' => $content,
'LEFT_BLOCK_COLUMN' => $leftblocks,
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv13587/phpslash-ft/class
Modified Files:
Block.class Block_render_cal.class Block_render_poll.class
Block_render_query.class Group.class Story_base.class
Log Message:
removed more Undefinded index warnings
Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Block.class 24 Oct 2002 18:12:10 -0000 1.17
--- Block.class 24 Oct 2002 19:36:03 -0000 1.18
***************
*** 210,217 ****
if(is_array($block_array)) {
! $optionname_ary = $block_array[optionname];
! $optionval_ary = $block_array[optionval];
! for( $i=0 ; $i < count($block_array[optionname]) ; $i++) {
if( $optionname_ary[$i] != "") {
$optname = $optionname_ary[$i];
--- 210,217 ----
if(is_array($block_array)) {
! $optionname_ary = $block_array['optionname'];
! $optionval_ary = $block_array['optionval'];
! for( $i=0 ; $i < count($block_array['optionname']) ; $i++) {
if( $optionname_ary[$i] != "") {
$optname = $optionname_ary[$i];
***************
*** 221,225 ****
}
! $section_id_ary = $block_array[section_id_ary];
$serial_opts=addslashes(serialize($block_options_ary));
--- 221,225 ----
}
! $section_id_ary = $block_array['section_id_ary'];
$serial_opts=addslashes(serialize($block_options_ary));
Index: Block_render_cal.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_cal.class,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Block_render_cal.class 3 Sep 2002 19:52:57 -0000 1.8
--- Block_render_cal.class 24 Oct 2002 19:36:03 -0000 1.9
***************
*** 25,28 ****
--- 25,29 ----
$daycounter = 1;
+ $linkon = 0;
$current_date=getdate();
Index: Block_render_poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_poll.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Block_render_poll.class 3 Sep 2002 19:52:57 -0000 1.4
--- Block_render_poll.class 24 Oct 2002 19:36:03 -0000 1.5
***************
*** 23,27 ****
$question_id = "";
if (is_array($block_info["block_options"])) {
! if (is_string($block_info["block_options"]["question_id"])) {
$question_id = $block_info["block_options"]["question_id"];
}
--- 23,27 ----
$question_id = "";
if (is_array($block_info["block_options"])) {
! if (!empty($block_info["block_options"]["question_id"])) {
$question_id = $block_info["block_options"]["question_id"];
}
Index: Block_render_query.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_query.class,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Block_render_query.class 3 Sep 2002 19:52:57 -0000 1.8
--- Block_render_query.class 24 Oct 2002 19:36:03 -0000 1.9
***************
*** 78,91 ****
$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']);
--- 78,91 ----
$story_id = $stories_ary[$i]['story_id'];
! if (!empty($ary['section_id'])) {
$story_id .= $amp . 'section_id=' . $ary['section_id'];
! } elseif ( (!empty($ary['section'])) AND ( $ary['section'] != $site_homesection)) {
$section = new Section;
$section_name = $section->getId($ary['section']);
$story_id .= $amp . 'section=' . $section_name;
}
! if (isset($topic_id)) {
$story_id .= $amp . 'topic_id=' . $ary['topic_id'];
! } elseif (!empty($ary['topic'])) {
$topic = new Topic;
$topic_name = $topic->getId($ary['topic']);
***************
*** 97,101 ****
'TITLE' => $stories_ary[$i]['title'],
'INTRO_TEXT' => $stories_ary[$i]['intro_text'],
! 'BODY_TEXT' => $body_text,
'DEPT' => $stories_ary[$i]['dept'],
'URL' => $stories_ary[$i]['url'],
--- 97,101 ----
'TITLE' => $stories_ary[$i]['title'],
'INTRO_TEXT' => $stories_ary[$i]['intro_text'],
! // 'BODY_TEXT' => $body_text,
'DEPT' => $stories_ary[$i]['dept'],
'URL' => $stories_ary[$i]['url'],
Index: Group.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Group.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Group.class 17 Jun 2002 20:30:39 -0000 1.2
--- Group.class 24 Oct 2002 19:36:04 -0000 1.3
***************
*** 74,78 ****
while ($this->db->next_record()) {
! $group_id = $this->db->Record[group_id];
if ($this->perm->have_perm("groupAdmin")) {
$admin = "<A HREF=\"" . $this->psl['phpself'] . "?submit=edit" . $this->psl['amp'] . "group_id=$group_id\">[Edit]</A>";
--- 74,78 ----
while ($this->db->next_record()) {
! $group_id = $this->db->Record['group_id'];
if ($this->perm->have_perm("groupAdmin")) {
$admin = "<A HREF=\"" . $this->psl['phpself'] . "?submit=edit" . $this->psl['amp'] . "group_id=$group_id\">[Edit]</A>";
***************
*** 319,322 ****
--- 319,324 ----
*/
function newGroup($ary="") {
+
+ $size = 0;
$this->group_templ->set_var(array(
***************
*** 393,397 ****
'PERMISSION_ID' => $val['id'],
'SELECTED' => "",
! 'PERMISSION_NAME' => $val[name]
));
$this->group_templ->parse("permission_rows","permission_row",true);
--- 395,399 ----
'PERMISSION_ID' => $val['id'],
'SELECTED' => "",
! 'PERMISSION_NAME' => $val['name']
));
$this->group_templ->parse("permission_rows","permission_row",true);
***************
*** 690,694 ****
while ($this->db->next_record()) {
! $permission_id = $this->db->Record[permission_id];
if ($this->perm->have_perm("permissionAdmin")) {
$admin = "<A HREF=\"" . $this->psl['phpself'] . "?submit=editperm" . $this->psl['amp'] . "permission_id=$permission_id\">[Edit]</A>";
--- 692,696 ----
while ($this->db->next_record()) {
! $permission_id = $this->db->Record['permission_id'];
if ($this->perm->have_perm("permissionAdmin")) {
$admin = "<A HREF=\"" . $this->psl['phpself'] . "?submit=editperm" . $this->psl['amp'] . "permission_id=$permission_id\">[Edit]</A>";
***************
*** 836,842 ****
* @access public
*/
! function editPermission($ary="") {
! if($ary["permission_id"] == "") {
$this->permission_templ->set_var(array(
'TITLEBAR' => getTitlebar("100%","Add a new Permission"),
--- 838,844 ----
* @access public
*/
! function editPermission($ary=array()) {
! if(empty($ary['permission_id'])) {
$this->permission_templ->set_var(array(
'TITLEBAR' => getTitlebar("100%","Add a new Permission"),
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Story_base.class 24 Oct 2002 18:12:10 -0000 1.17
--- Story_base.class 24 Oct 2002 19:36:04 -0000 1.18
***************
*** 212,216 ****
if (!empty($argv_ary['section_id'])) {
$q .= " ,psl_section_lut ";
! } elseif ($argv_ary['section'] != "") {
$q .= " ,psl_section_lut, psl_section ";
}
--- 212,216 ----
if (!empty($argv_ary['section_id'])) {
$q .= " ,psl_section_lut ";
! } elseif (!empty($argv_ary['section'])) {
$q .= " ,psl_section_lut, psl_section ";
}
|
|
From: Joe S. <joe...@us...> - 2002-10-25 01:06:35
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv13587/phpslash-ft/public_html
Modified Files:
config-dist.php3
Log Message:
removed more Undefinded index warnings
Index: config-dist.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config-dist.php3 23 Oct 2002 17:42:19 -0000 1.6
--- config-dist.php3 24 Oct 2002 19:36:04 -0000 1.7
***************
*** 139,143 ****
*/
// to enable setting of time zone in URL
! set_TZ($HTTP_GET_VARS['TZ'],'cookie');
// to disable setting in URL and to set $_PSL['timezone']['name'] as the time zone
// set_TZ();
--- 139,147 ----
*/
// to enable setting of time zone in URL
! if(!empty($HTTP_GET_VARS['TZ'])) {
! set_TZ($HTTP_GET_VARS['TZ'],'cookie');
! } else {
! set_TZ('','cookie');
! }
// to disable setting in URL and to set $_PSL['timezone']['name'] as the time zone
// set_TZ();
|
|
From: Joe S. <joe...@us...> - 2002-10-25 01:06:32
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv13587/phpslash-ft/public_html/admin
Modified Files:
blockAdmin.php3 pollAdmin.php3
Log Message:
removed more Undefinded index warnings
Index: blockAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/blockAdmin.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** blockAdmin.php3 24 Oct 2002 18:12:11 -0000 1.9
--- blockAdmin.php3 24 Oct 2002 19:36:04 -0000 1.10
***************
*** 78,82 ****
if ($perm->have_perm("blockList")) {
$content .= $block->listBlock(); /* prints a list of current blocks */
! $content .= $block->listBlockTypes($HTTP_GET_VARS['option'], $HTTP_GET_VARS['name']); /* optional block type management */
}
}
--- 78,88 ----
if ($perm->have_perm("blockList")) {
$content .= $block->listBlock(); /* prints a list of current blocks */
! if(empty($HTTP_GET_VARS['option'])) {
! $HTTP_GET_VARS['option'] = '';
! }
! if(empty($HTTP_GET_VARS['name'])) {
! $HTTP_GET_VARS['name'] = '';
! }
! $content .= $block->listBlockTypes($HTTP_GET_VARS['option'], $HTTP_GET_VARS['name']); /* optional block type management */
}
}
Index: pollAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/pollAdmin.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pollAdmin.php3 10 Sep 2002 21:09:50 -0000 1.10
--- pollAdmin.php3 24 Oct 2002 19:36:04 -0000 1.11
***************
*** 24,27 ****
--- 24,29 ----
$content = '';
+ $min = '';
+
if(!empty($HTTP_POST_VARS['submit'])) {
$submit = $HTTP_POST_VARS['submit'];
***************
*** 121,125 ****
'ROOTDIR' => $_PSL['rooturl'],
'IMAGEDIR' => $_PSL['imageurl'],
! 'BREADCRUMB' => $breadcrumb,
'STORY_COLUMN' => $content,
'LEFT_BLOCK_COLUMN' => $leftblocks,
--- 123,127 ----
'ROOTDIR' => $_PSL['rooturl'],
'IMAGEDIR' => $_PSL['imageurl'],
! // 'BREADCRUMB' => $breadcrumb,
'STORY_COLUMN' => $content,
'LEFT_BLOCK_COLUMN' => $leftblocks,
|
|
From: Joe S. <joe...@us...> - 2002-10-25 01:05:00
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv22388/phpslash-ft/public_html
Modified Files:
login.php3
Log Message:
removed more Undefinded index warnings
Index: login.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** login.php3 24 Oct 2002 18:14:58 -0000 1.23
--- login.php3 24 Oct 2002 19:41:35 -0000 1.24
***************
*** 14,18 ****
if (isset($HTTP_GET_VARS['logout'])) {
if(isset($HTTP_COOKIE_VARS['user_info'])) {
! setcookie( 'user_info', '', time()-31536000, $this->psl['rooturl'], "", "");
$sess->delete();
$HTTP_COOKIE_VARS['user_info'] = '';
--- 14,18 ----
if (isset($HTTP_GET_VARS['logout'])) {
if(isset($HTTP_COOKIE_VARS['user_info'])) {
! setcookie( 'user_info', '', time()-31536000, $_PSL['rooturl'], "", "");
$sess->delete();
$HTTP_COOKIE_VARS['user_info'] = '';
|
|
From: Joe S. <joe...@us...> - 2002-10-25 01:01:18
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv8972/phpslash-ft/public_html
Modified Files:
config-dist.php3
Log Message:
removed more Undefinded index warnings
Index: config-dist.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** config-dist.php3 24 Oct 2002 19:36:04 -0000 1.7
--- config-dist.php3 24 Oct 2002 20:56:48 -0000 1.8
***************
*** 421,424 ****
--- 421,425 ----
//////////////////////////////////////////////////////////////////////////
+ define("ALLSECTIONS", "section_id0");
/* ============= Things to deprecate ============= */
|
|
From: Joe S. <joe...@us...> - 2002-10-25 01:01:18
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv8972/phpslash-ft/class
Modified Files:
functions.inc slashAuthCR.class
Log Message:
removed more Undefinded index warnings
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** functions.inc 24 Oct 2002 18:12:11 -0000 1.110
--- functions.inc 24 Oct 2002 20:56:47 -0000 1.111
***************
*** 278,282 ****
global $_PSL;
! if ($_PSL[use_infolog]) {
// Init vars (we don't like warnings :)
$fdate = date("Y-m-d H:i:s",time());
--- 278,282 ----
global $_PSL;
! if (!empty($_PSL['use_infolog'])) {
// Init vars (we don't like warnings :)
$fdate = date("Y-m-d H:i:s",time());
***************
*** 570,573 ****
--- 570,575 ----
function clean ($dirty,$allow_html=false) {
+ $clean = '';
+
if (is_array($dirty)) {
while( list( $key, $val) = @each( $dirty )) {
***************
*** 1427,1432 ****
$default_options = "default_".$module."_options";
$optioncount = $module."_optioncount";
!
! $optioncnt = count($_PSL[$default_options]);
$tpl_object->set_block($template,"each_default_option", "doptions");
for ($i =0; $i < $optioncnt; $i++) {
--- 1429,1437 ----
$default_options = "default_".$module."_options";
$optioncount = $module."_optioncount";
! $optioncnt = 0;
!
! if(!empty($_PSL[$default_options])) {
! $optioncnt = count($_PSL[$default_options]);
! }
$tpl_object->set_block($template,"each_default_option", "doptions");
for ($i =0; $i < $optioncnt; $i++) {
Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** slashAuthCR.class 24 Oct 2002 18:12:11 -0000 1.26
--- slashAuthCR.class 24 Oct 2002 20:56:47 -0000 1.27
***************
*** 28,32 ****
global $_PSL;
! if($_PSL['magic']) {
$this->magic = $_PSL['magic'];
}
--- 28,32 ----
global $_PSL;
! if(!empty($_PSL['magic'])) {
$this->magic = $_PSL['magic'];
}
***************
*** 159,163 ****
if(empty($HTTP_POST_VARS)) {
! if($this->auth['uid'] == 'nobody'){
$uid = $this->auth["uid"] = "nobody";
$aid = Author::getId($uid);
--- 159,164 ----
if(empty($HTTP_POST_VARS)) {
! if(!empty($this->auth['uid']) &&
! $this->auth['uid'] == 'nobody'){
$uid = $this->auth["uid"] = "nobody";
$aid = Author::getId($uid);
***************
*** 168,171 ****
--- 169,175 ----
}
+ $setcookie = '';
+ $lostpw = '';
+
// TODO: Change there so they aren't undefined indexes :)
$username = $HTTP_POST_VARS['username'];
***************
*** 173,178 ****
// $challenge = $HTTP_POST_VARS['challenge']; // use session variable
$response = $HTTP_POST_VARS['response'];
! $setcookie = $HTTP_POST_VARS['setcookie'];
! $lostpw = $HTTP_POST_VARS['lostpw'];
if($challenge != $HTTP_POST_VARS['challenge']) {
--- 177,186 ----
// $challenge = $HTTP_POST_VARS['challenge']; // use session variable
$response = $HTTP_POST_VARS['response'];
! if(!empty($HTTP_POST_VARS['setcookie'])) {
! $setcookie = $HTTP_POST_VARS['setcookie'];
! }
! if(!empty($HTTP_POST_VARS['lostpw'])) {
! $lostpw = $HTTP_POST_VARS['lostpw'];
! }
if($challenge != $HTTP_POST_VARS['challenge']) {
***************
*** 329,332 ****
--- 337,345 ----
global $HTTP_POST_VARS;
+ if(empty($HTTP_POST_VARS)) {
+ return false;
+ }
+
+
# the login form will save the username
$this->auth["uname"] = $username = $HTTP_POST_VARS['username'];
***************
*** 490,496 ****
$group_name = $groups_ary[$group_id];
$childgroup_name = $groups_ary[$childgroup_id];
!
! if( !empty($this->auth['perm'][$childgroup_name]) &&
! is_array($this->auth['perm'][$childgroup_name])) {
$this->auth['perm'][$group_name][$childgroup_name] = $this->auth['perm'][$childgroup_name];
} else {
--- 503,508 ----
$group_name = $groups_ary[$group_id];
$childgroup_name = $groups_ary[$childgroup_id];
!
! if( !empty($this->auth['perm'][$childgroup_name])) {
$this->auth['perm'][$group_name][$childgroup_name] = $this->auth['perm'][$childgroup_name];
} else {
|
|
From: Joe S. <joe...@us...> - 2002-10-23 20:47:53
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv22971/phpslash-ft Modified Files: CHANGES Log Message: login block challenge auth tweaks Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.579 retrieving revision 1.580 diff -C2 -d -r1.579 -r1.580 *** CHANGES 23 Oct 2002 17:42:15 -0000 1.579 --- CHANGES 23 Oct 2002 20:47:48 -0000 1.580 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-October-23 3:30PM CDT Joe Stewart <joe...@us...> + [W] - Block_render_login.class, slashAuthCR.class - login block tweaks + to work with challenge auth correctly. + 2002-October-23 12:00PM CDT Joe Stewart <joe...@us...> [W] - NavBar.class, config-dist.php3, config-dist.ini.php3, config.php3 - |
|
From: Joe S. <joe...@us...> - 2002-10-23 20:47:53
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv22971/phpslash-ft/class
Modified Files:
slashAuthCR.class Block_render_login.class
Log Message:
login block challenge auth tweaks
Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** slashAuthCR.class 21 Oct 2002 20:42:27 -0000 1.24
--- slashAuthCR.class 23 Oct 2002 20:47:50 -0000 1.25
***************
*** 60,65 ****
$sess->register("saved_get");
! $challenge = md5(uniqid($this->magic));
! $sess->register("challenge");
$templ = new Template($_PSL[templatedir]);
--- 60,67 ----
$sess->register("saved_get");
! if(!isset($challenge)) {
! $challenge = md5(uniqid($this->magic));
! $sess->register("challenge");
! }
$templ = new Template($_PSL[templatedir]);
***************
*** 146,150 ****
$this->auth["dname"] = Author::getRealName($aid);
$this->auth["email"] = '';
! return $uid;
}
--- 148,152 ----
$this->auth["dname"] = Author::getRealName($aid);
$this->auth["email"] = '';
! return $aid;
}
***************
*** 155,158 ****
--- 157,171 ----
global $HTTP_POST_VARS, $HTTP_GET_VARS, $saved_get, $saved_post, $challenge;
+
+ if(sizeof($HTTP_POST_VARS) == 0) {
+ if($this->auth['uid'] == 'nobody'){
+ $uid = $this->auth["uid"] = "nobody";
+ $aid = Author::getId($uid);
+ $this->auth["perm"] = $this->get_userperms($aid);
+ return $aid;
+ }
+ return false;
+ }
+
// TODO: Change there so they aren't undefined indexes :)
$username = $HTTP_POST_VARS['username'];
***************
*** 174,178 ****
$aid = Author::getId($uid);
$this->auth["perm"] = $this->get_userperms($aid);
! return $uid;
}
--- 187,191 ----
$aid = Author::getId($uid);
$this->auth["perm"] = $this->get_userperms($aid);
! return $aid;
}
***************
*** 393,403 ****
if ($author->saveAuthor($ary)) {
// $password = $pass1;
! $HTTP_POST_VARS['username'] = $username;
! $HTTP_POST_VARS['password'] = $pass1;
! $HTTP_POST_VARS['challenge'] = md5(uniqid($this->magic));
! $HTTP_POST_VARS['response'] = '';
! // debug("username", $username);
! // debug("pass1", $pass1);
! $uid = $this->auth_validatelogin();
if( $uid == false) {
$this->auth["error"] = "Account created, but validation failed";
--- 406,416 ----
if ($author->saveAuthor($ary)) {
// $password = $pass1;
! $HTTP_POST_VARS['username'] = $username;
! $HTTP_POST_VARS['password'] = $pass1;
! $HTTP_POST_VARS['challenge'] = md5(uniqid($this->magic));
! $HTTP_POST_VARS['response'] = '';
! // debug("username", $username);
! // debug("pass1", $pass1);
! $uid = $this->auth_validatelogin();
if( $uid == false) {
$this->auth["error"] = "Account created, but validation failed";
Index: Block_render_login.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_login.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Block_render_login.class 3 Sep 2002 19:52:57 -0000 1.3
--- Block_render_login.class 23 Oct 2002 20:47:50 -0000 1.4
***************
*** 31,34 ****
--- 31,40 ----
function login($block_info) {
+ global $sess, $auth, $challenge;
+
+ if(!isset($challenge)) {
+ $challenge = md5(uniqid($auth->magic));
+ $sess->register("challenge");
+ }
$default_tpl = "loginblock.tpl";
***************
*** 57,61 ****
'ROOTDIR' => $this->psl['rooturl'],
'IMAGEDIR' => $this->psl['imageurl'],
! 'ACTION_URL' => $this->psl['rooturl']."/login.php3"
));
--- 63,68 ----
'ROOTDIR' => $this->psl['rooturl'],
'IMAGEDIR' => $this->psl['imageurl'],
! 'ACTION_URL' => $this->psl['rooturl']."/login.php3",
! 'CHALLENGE' => $challenge
));
|
|
From: Joe S. <joe...@us...> - 2002-10-23 19:13:38
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv21934/phpslash-ft/class
Modified Files:
NavBar.class
Log Message:
moved login/logout menu items to config(again)
Index: NavBar.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/NavBar.class,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** NavBar.class 23 Oct 2002 17:42:18 -0000 1.14
--- NavBar.class 23 Oct 2002 19:00:36 -0000 1.15
***************
*** 101,104 ****
--- 101,106 ----
$this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] );
}
+ } elseif ($menu_ary[$i]['perm'] == "") {
+ $this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] );
}
} elseif ($menu_ary[$i]['perm'] == "") {
|
|
From: Joe S. <joe...@us...> - 2002-10-23 17:42:52
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv25033/phpslash-ft Modified Files: CHANGES Log Message: moved login/logout menu items to config(again) Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.578 retrieving revision 1.579 diff -C2 -d -r1.578 -r1.579 *** CHANGES 22 Oct 2002 16:36:24 -0000 1.578 --- CHANGES 23 Oct 2002 17:42:15 -0000 1.579 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-October-23 12:00PM CDT Joe Stewart <joe...@us...> + [W] - NavBar.class, config-dist.php3, config-dist.ini.php3, config.php3 - + Moved Login/Logout from NavBar class to menu array in config. (again) + 2002-October-21 11:30AM CDT Joe Stewart <joe...@us...> [B] - Poll.class - Mike Giffords patch to allow initial poll creation. |
|
From: Joe S. <joe...@us...> - 2002-10-23 17:42:52
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv25033/phpslash-ft/class
Modified Files:
NavBar.class
Log Message:
moved login/logout menu items to config(again)
Index: NavBar.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/NavBar.class,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NavBar.class 4 Oct 2002 21:27:05 -0000 1.13
--- NavBar.class 23 Oct 2002 17:42:18 -0000 1.14
***************
*** 96,106 ****
if($menu_ary[$i]['perm'] == "nobody") {
$this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] );
! } elseif ($auth->is_authenticated() and is_object($perm) ) {
! if ($perm->have_perm($menu_ary[$i]['perm'])) {
! $this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] );
! }
! }
! }
}
$this->templ->parse( "OUT", $template );
return $this->templ->get( "OUT" );
--- 96,111 ----
if($menu_ary[$i]['perm'] == "nobody") {
$this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] );
! } elseif ($auth->is_authenticated() and is_object($perm) ) {
! if($perm->have_perm('user') ) {
! if ($perm->have_perm($menu_ary[$i]['perm'])) {
! $this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] );
! }
! }
! } elseif ($menu_ary[$i]['perm'] == "") {
! $this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] );
! }
! }
}
+
$this->templ->parse( "OUT", $template );
return $this->templ->get( "OUT" );
|
|
From: Joe S. <joe...@us...> - 2002-10-23 17:42:25
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv25033/phpslash-ft/public_html
Modified Files:
config-dist.ini.php3 config-dist.php3 config.php3
Log Message:
moved login/logout menu items to config(again)
Index: config-dist.ini.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.ini.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config-dist.ini.php3 21 Oct 2002 20:42:27 -0000 1.6
--- config-dist.ini.php3 23 Oct 2002 17:42:19 -0000 1.7
***************
*** 66,70 ****
;; turns the Admin link on in the navbar
! show_admin_on_navbar = true
;;;
--- 66,70 ----
;; turns the Admin link on in the navbar
! show_admin_on_navbar = false
;;;
Index: config-dist.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config-dist.php3 11 Oct 2002 15:48:40 -0000 1.5
--- config-dist.php3 23 Oct 2002 17:42:19 -0000 1.6
***************
*** 160,164 ****
* attempted automatically.
*/
!
$menuitem[] = array(
'name' => "Home",
--- 160,177 ----
* attempted automatically.
*/
! $menuitem[] = array(
! 'name' => "Login",
! 'link' => $_PSL['rooturl'] . "/login.php3",
! 'perm' => "",
! 'module' => ""
!
! );
! $menuitem[] = array(
! 'name' => "Logout",
! 'link' => $_PSL['rooturl'] . "/login.php3?logout=yes",
! 'perm' => "user",
! 'module' => ""
!
! );
$menuitem[] = array(
'name' => "Home",
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -d -r1.154 -r1.155
*** config.php3 10 Oct 2002 16:10:48 -0000 1.154
--- config.php3 23 Oct 2002 17:42:20 -0000 1.155
***************
*** 101,105 ****
$_PSL['module']['Group'] = true;
! $_PSL['show_admin_on_navbar'] = true; // turns the Admin link on in the navbar
$_PSL['default_pending'] = false; // decides if new comments are marked pending
--- 101,105 ----
$_PSL['module']['Group'] = true;
! $_PSL['show_admin_on_navbar'] = false; // turns the Admin link on in the navbar
$_PSL['default_pending'] = false; // decides if new comments are marked pending
***************
*** 320,324 ****
* attempted automatically.
*/
!
$menuitem[] = array(
'name' => "Home",
--- 320,337 ----
* attempted automatically.
*/
! $menuitem[] = array(
! 'name' => "Login",
! 'link' => $_PSL['rooturl'] . "/login.php3",
! 'perm' => "",
! 'module' => ""
!
! );
! $menuitem[] = array(
! 'name' => "Logout",
! 'link' => $_PSL['rooturl'] . "/login.php3?logout=yes",
! 'perm' => "user",
! 'module' => ""
!
! );
$menuitem[] = array(
'name' => "Home",
|
|
From: Joe S. <joe...@us...> - 2002-10-22 16:36:52
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv7477/phpslash-ft/class
Modified Files:
Poll.class
Log Message:
[ 626707 ] New Poll (when polls are blank)
Index: Poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Poll.class 3 Sep 2002 15:15:09 -0000 1.19
--- Poll.class 22 Oct 2002 16:36:47 -0000 1.20
***************
*** 565,572 ****
$this->db->next_record();
}
while ($this->db->next_record() && ($min + 20) > $thisid++) {
$action = $this->templ->get('ACTION_URL');
$this->templ->set_var(array(
- 'ADMIN_URL' => $this->psl['adminurl'] . '/pollAdmin.php3',
'QUESTION_ID' => $this->db->f('question_id'),
'QUESTION' => $this->db->f('question_text'),
--- 565,573 ----
$this->db->next_record();
}
+
+ $this->templ->set_var( 'ADMIN_URL',$this->psl['adminurl'] . '/pollAdmin.php3');
while ($this->db->next_record() && ($min + 20) > $thisid++) {
$action = $this->templ->get('ACTION_URL');
$this->templ->set_var(array(
'QUESTION_ID' => $this->db->f('question_id'),
'QUESTION' => $this->db->f('question_text'),
|
|
From: Joe S. <joe...@us...> - 2002-10-22 16:36:29
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv7035/phpslash-ft Modified Files: CHANGES Log Message: [ 626707 ] New Poll (when polls are blank) Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.577 retrieving revision 1.578 diff -C2 -d -r1.577 -r1.578 *** CHANGES 21 Oct 2002 20:42:27 -0000 1.577 --- CHANGES 22 Oct 2002 16:36:24 -0000 1.578 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-October-21 11:30AM CDT Joe Stewart <joe...@us...> + [B] - Poll.class - Mike Giffords patch to allow initial poll creation. + This closes bug [ 626707 ] New Poll (when polls are blank). + 2002-October-21 3:00PM CDT Joe Stewart <joe...@us...> [W] - Block.class - attempt to translate block titles. |
|
From: Joe S. <joe...@us...> - 2002-10-21 20:42:30
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv6660/phpslash-ft/public_html Modified Files: config-dist.ini.php3 Log Message: translate block titles and config magic word Index: config-dist.ini.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.ini.php3,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config-dist.ini.php3 4 Oct 2002 21:27:04 -0000 1.5 --- config-dist.ini.php3 21 Oct 2002 20:42:27 -0000 1.6 *************** *** 48,51 **** --- 48,54 ---- mailinglist_subject = "PHPSlash Times" + ;; A secret string used when generating site unique variables + magic = "ChangeThisToSomethingUnique" + ;; End of Site determinant variables ;;;;; |
|
From: Joe S. <joe...@us...> - 2002-10-21 20:42:30
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv6660/phpslash-ft/class
Modified Files:
slashAuthCR.class Block.class
Log Message:
translate block titles and config magic word
Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** slashAuthCR.class 11 Oct 2002 21:25:42 -0000 1.23
--- slashAuthCR.class 21 Oct 2002 20:42:27 -0000 1.24
***************
*** 24,27 ****
--- 24,36 ----
var $psl;
+ function slashAuth() {
+
+ global $_PSL;
+
+ if($_PSL['magic']) {
+ $this->magic = $_PSL['magic'];
+ }
+ }
+
function start() {
Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Block.class 9 Jul 2002 20:48:10 -0000 1.15
--- Block.class 21 Oct 2002 20:42:27 -0000 1.16
***************
*** 402,408 ****
}
if( !is_string($this->block_info['block_options']['perms'])) {
! return getFancyBox($width, $temptitle, $this->block_info["cache_data"],$link, $box_type);
} elseif ($this->perm->have_perm($this->block_info['block_options']['perms'])) {
! return getFancyBox($width, $temptitle, $this->block_info["cache_data"],$link, $box_type);
}
}
--- 402,408 ----
}
if( !is_string($this->block_info['block_options']['perms'])) {
! return getFancyBox($width, pslgetText($temptitle), $this->block_info["cache_data"],$link, $box_type);
} elseif ($this->perm->have_perm($this->block_info['block_options']['perms'])) {
! return getFancyBox($width, pslgetText($temptitle), $this->block_info["cache_data"],$link, $box_type);
}
}
|
|
From: Joe S. <joe...@us...> - 2002-10-21 20:42:30
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv6660/phpslash-ft Modified Files: CHANGES Log Message: translate block titles and config magic word Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.576 retrieving revision 1.577 diff -C2 -d -r1.576 -r1.577 *** CHANGES 11 Oct 2002 21:25:42 -0000 1.576 --- CHANGES 21 Oct 2002 20:42:27 -0000 1.577 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-October-21 3:00PM CDT Joe Stewart <joe...@us...> + [W] - Block.class - attempt to translate block titles. + slashAuthCR.class, config-dist.ini.php3 - use a configuration variable + for the magic word if available. + 2002-October-11 2:00PM CDT Joe Stewart <joe...@us...> [W] - slashAuthCR.class - re-enable identifying anon user. |
|
From: Matthew L. <sym...@us...> - 2002-10-21 18:53:39
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv5958 Modified Files: tz_posix.class Log Message: Copied a javadoc @link tag from the class header to the constructor header in the hopes that phpdoc will recognize it. Index: tz_posix.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/tz_posix.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tz_posix.class 3 Sep 2002 15:07:36 -0000 1.1 --- tz_posix.class 21 Oct 2002 18:53:35 -0000 1.2 *************** *** 36,40 **** --- 36,43 ---- * constructor * + * $name should be in POSIX format, e.g. "GMT+0BST,M4.1.0/1,M10.5.0/2" + * * @param string time zone string + * @link http://www.gnu.org/manual/glibc-2.2.3/html_node/libc_431.html */ function tz_posix($name='') { |
|
From: Joe S. <joe...@us...> - 2002-10-11 21:25:45
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv26092/phpslash-ft
Modified Files:
CHANGES
Log Message:
re-enable nobody authentication
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.575
retrieving revision 1.576
diff -C2 -d -r1.575 -r1.576
*** CHANGES 11 Oct 2002 19:31:24 -0000 1.575
--- CHANGES 11 Oct 2002 21:25:42 -0000 1.576
***************
*** 14,17 ****
--- 14,20 ----
2002-October-11 2:00PM CDT Joe Stewart <joe...@us...>
+ [W] - slashAuthCR.class - re-enable identifying anon user.
+
+ 2002-October-11 2:00PM CDT Joe Stewart <joe...@us...>
[F] - Sam Wiliams patch to order stories in addition to date. Affected files -
Story_base.class, Story.class, Story_admin.class, storyList.tpl,
|
|
From: Joe S. <joe...@us...> - 2002-10-11 21:25:45
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv26092/phpslash-ft/class
Modified Files:
slashAuthCR.class
Log Message:
re-enable nobody authentication
Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** slashAuthCR.class 10 Oct 2002 16:10:46 -0000 1.22
--- slashAuthCR.class 11 Oct 2002 21:25:42 -0000 1.23
***************
*** 131,135 ****
}
}
! /* } else if ($this->nobody) {
$uid = $this->auth["uid"] = "nobody";
$aid = Author::getId($uid);
--- 131,135 ----
}
}
! } else if ($this->nobody) {
$uid = $this->auth["uid"] = "nobody";
$aid = Author::getId($uid);
***************
*** 138,142 ****
$this->auth["email"] = '';
return $uid;
! */ }
}
--- 138,142 ----
$this->auth["email"] = '';
return $uid;
! }
}
***************
*** 163,169 ****
} else if ($this->nobody) { ## provides for "default login cancel"
$uid = $this->auth["uid"] = "nobody";
! /* $aid = Author::getId($uid);
$this->auth["perm"] = $this->get_userperms($aid);
! */ return $uid;
}
--- 163,169 ----
} else if ($this->nobody) { ## provides for "default login cancel"
$uid = $this->auth["uid"] = "nobody";
! $aid = Author::getId($uid);
$this->auth["perm"] = $this->get_userperms($aid);
! return $uid;
}
|
|
From: Joe S. <joe...@us...> - 2002-10-11 19:36:31
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv19883/phpslash-ft/class
Modified Files:
Story_admin.class
Log Message:
story order
Index: Story_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_admin.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Story_admin.class 11 Oct 2002 19:31:24 -0000 1.4
--- Story_admin.class 11 Oct 2002 19:36:28 -0000 1.5
***************
*** 303,307 ****
$q .= "AND '$section_id' = psl_section_lut.section_id ";
}
! $q .= "ORDER BY order_no DESC, time DESC";
$this->db->query($q);
--- 303,307 ----
$q .= "AND '$section_id' = psl_section_lut.section_id ";
}
! $q .= "ORDER BY order_no DESC, timestamp DESC";
$this->db->query($q);
|
|
From: Joe S. <joe...@us...> - 2002-10-11 19:32:06
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv18283/default
Modified Files:
storyList.tpl storyNew.tpl
Log Message:
story order
Index: storyList.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/storyList.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** storyList.tpl 20 Mar 2002 22:16:42 -0000 1.6
--- storyList.tpl 11 Oct 2002 19:32:02 -0000 1.7
***************
*** 29,32 ****
--- 29,33 ----
<TR>
<TH>CNT</TH>
+ <TH>Order</TH>
<TH>Title</TH>
<TH>Author</TH>
***************
*** 41,44 ****
--- 42,48 ----
<FONT SIZE=2><B>{COUNT}</B></FONT>
</TD>
+ <TD>
+ {ORDER_NO}
+ </TD>
<TD>
{TITLE}
***************
*** 63,66 ****
--- 67,73 ----
<FONT SIZE=2><B>{COUNT}</B></FONT>
</TD>
+ <TD>
+ {ORDER_NO}
+ </TD>
<TD>
{TITLE}
Index: storyNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/storyNew.tpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** storyNew.tpl 13 Jun 2002 20:07:27 -0000 1.15
--- storyNew.tpl 11 Oct 2002 19:32:02 -0000 1.16
***************
*** 92,95 ****
--- 92,101 ----
</TR>
<TR>
+ <TD align="top">Order</TD>
+ <TD colspan=3>
+ <INPUT type=text name=order_no value="{ORDER_NO}" size=4>
+ </TD>
+ </TR>
+ <TR>
<TD align="top">Intro Text</TD>
<TD colspan=3>
|
2 messages has been excluded from this view by a project administrator.
