phpslash-commit Mailing List for phpSlash (Page 51)
Brought to you by:
joestewart,
nhruby
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...> - 2003-04-21 16:59:41
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/block In directory sc8-pr-cvs1:/tmp/cvs-serv10715/phpslash-dev/include/modules/block Modified Files: Block.class Log Message: new block option - cache_disabled. Index: Block.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/Block.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Block.class 18 Apr 2003 14:26:43 -0000 1.2 --- Block.class 21 Apr 2003 16:59:36 -0000 1.3 *************** *** 456,463 **** $this->parsedData = $this->parser->getFinal(); // only write to the db if the data is changed ! if($this->block_info["cache_data"] != $this->parsedData) { ! // debug($this->block_info["title"], "updated"); ! $this->block_info["cache_data"] = $this->parsedData; ! $this->storeParsed(); } return true; --- 456,466 ---- $this->parsedData = $this->parser->getFinal(); // only write to the db if the data is changed ! if($this->block_info["cache_data"] != $this->parsedData) { ! // debug($this->block_info["title"], "updated"); ! $this->block_info["cache_data"] = $this->parsedData; ! // Don't commit to db if cache_off block option is used. ! if(empty($this->block_info["block_options"]["cache_disabled"])) { ! $this->storeParsed(); ! } } return true; |
From: Joe S. <joe...@us...> - 2003-04-21 16:41:29
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/block/blocktypes In directory sc8-pr-cvs1:/tmp/cvs-serv22273/phpslash-dev/include/modules/block/blocktypes Modified Files: Block_render_page.class Log Message: finish the template output and mailinglist/admin.php - Bring in HTTP_GET_VARS from globals Index: Block_render_page.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/blocktypes/Block_render_page.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Block_render_page.class 17 Apr 2003 23:33:47 -0000 1.1 --- Block_render_page.class 21 Apr 2003 16:41:23 -0000 1.2 *************** *** 101,105 **** )); ! $this->output = $template->parse('OUT','index'); return true; --- 101,105 ---- )); ! $this->output = $template->finish($template->parse('OUT','index')); return true; |
From: Joe S. <joe...@us...> - 2003-04-21 15:24:32
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1:/tmp/cvs-serv11885/phpslash-dev Modified Files: CHANGES Log Message: Mailinglist.class - sync with -ft cvs. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CHANGES 21 Apr 2003 15:00:16 -0000 1.6 --- CHANGES 21 Apr 2003 15:24:26 -0000 1.7 *************** *** 14,17 **** --- 14,20 ---- 2003-April-21 10:00AM CST Joe Stewart <joe...@us...> + [B] - Mailinglist.class - sync with -ft cvs. + + 2003-April-21 10:00AM CST Joe Stewart <joe...@us...> [B] - Block_render_page.class - "finish" the template output. mailinglist/admin.php - Bring in HTTP_GET_VARS from globals. |
From: Joe S. <joe...@us...> - 2003-04-21 15:24:10
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist In directory sc8-pr-cvs1:/tmp/cvs-serv11538/phpslash-dev/include/modules/mailinglist Modified Files: MailingList.class Log Message: Mailinglist.class - sync with -ft cvs. Index: MailingList.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist/MailingList.class,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** MailingList.class 12 Mar 2003 16:12:54 -0000 1.1.1.1 --- MailingList.class 21 Apr 2003 15:24:05 -0000 1.2 *************** *** 305,309 **** function build_body($ary, $offset) { //BEGIN FUNCTION ! if ($date_override) { $ary['bday'] = date("d"); $ary['bday'] = $bday - $offset; --- 305,309 ---- function build_body($ary, $offset) { //BEGIN FUNCTION ! if ($ary['dateoverride']) { $ary['bday'] = date("d"); $ary['bday'] = $bday - $offset; *************** *** 342,345 **** --- 342,346 ---- $this->templ->set_block("messagebodymail", "row", "rows"); + $success = false; while($this->db->next_record()) { *************** *** 354,360 **** )); $this->templ->parse("rows","row",true); } //End While next_record ! ! return $this->templ->parse('OUT',array("messagebodymail")); // return $this->templ->get('OUT'); } //END FUNCTION --- 355,365 ---- )); $this->templ->parse("rows","row",true); + $success = true; } //End While next_record ! if ($success == true) { ! return $this->templ->parse('OUT',array("messagebodymail")); ! } else { ! return false; ! } // return $this->templ->get('OUT'); } //END FUNCTION *************** *** 419,423 **** } ! $this->messge .= "To: $email <$name>"; if ( ($dayback != $tmpDay) && ( !($ary['override']) ) ) { --- 424,428 ---- } ! $this->message .= "To: $email <$name>"; if ( ($dayback != $tmpDay) && ( !($ary['override']) ) ) { *************** *** 447,452 **** $this->templ->parse('OUT',array("messagemail")); $final_body = $this->templ->get('OUT'); ! ! if ( mail($email, $mail_subject, $final_body, "From: ".$ary['sender']) ) { $this->message .= pslgetText("Mail Sent Successfully!")."<br>\n"; } else { --- 452,459 ---- $this->templ->parse('OUT',array("messagemail")); $final_body = $this->templ->get('OUT'); ! ! if(empty($ary['body']) && empty($extra_message)){ ! $this->message .= pslgetText("Nothing to send"); ! } elseif ( mail($email, $mail_subject, $final_body, "From: ".$ary['sender']) ) { $this->message .= pslgetText("Mail Sent Successfully!")."<br>\n"; } else { |
From: Joe S. <joe...@us...> - 2003-04-21 15:02:31
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1:/tmp/cvs-serv21991/phpslash-dev Modified Files: CHANGES Log Message: finish the template output and mailinglist/admin.php - Bring in HTTP_GET_VARS from globals Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CHANGES 18 Apr 2003 14:26:42 -0000 1.5 --- CHANGES 21 Apr 2003 15:00:16 -0000 1.6 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-April-21 10:00AM CST Joe Stewart <joe...@us...> + [B] - Block_render_page.class - "finish" the template output. + mailinglist/admin.php - Bring in HTTP_GET_VARS from globals. 2003-April-18 9:00AM CST Joe Stewart <joe...@us...> |
From: Joe S. <joe...@us...> - 2003-04-21 15:02:30
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist In directory sc8-pr-cvs1:/tmp/cvs-serv21991/phpslash-dev/include/modules/mailinglist Modified Files: admin.php Log Message: finish the template output and mailinglist/admin.php - Bring in HTTP_GET_VARS from globals Index: admin.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist/admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin.php 18 Apr 2003 16:45:17 -0000 1.2 --- admin.php 21 Apr 2003 15:00:17 -0000 1.3 *************** *** 3,7 **** /* $Id$ */ ! global $_PSL, $HTTP_POST_VARS, $auth, $perm; $ary = $GLOBALS['ary']; --- 3,7 ---- /* $Id$ */ ! global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $auth, $perm; $ary = $GLOBALS['ary']; |
From: Joe S. <joe...@us...> - 2003-04-18 16:46:05
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv11542/phpslash-dev/public_html Modified Files: config-dist.php Log Message: doParse only calls storeParsed if the block data changed. Index: config-dist.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config-dist.php 12 Mar 2003 16:12:57 -0000 1.1.1.1 --- config-dist.php 18 Apr 2003 16:46:00 -0000 1.2 *************** *** 588,592 **** **/ AddClassRequirement("comment",$_PSL['classdir'] . "/Comment.class"); ! AddClassRequirement("group",$_PSL['classdir'] . "/Group.class"); AddClassRequirement("infolog",$_PSL['classdir'] . "/Infolog.class"); // AddClassRequirement("navbar",$_PSL['classdir'] . "/NavBar.class"); --- 588,592 ---- **/ AddClassRequirement("comment",$_PSL['classdir'] . "/Comment.class"); ! // AddClassRequirement("group",$_PSL['classdir'] . "/Group.class"); AddClassRequirement("infolog",$_PSL['classdir'] . "/Infolog.class"); // AddClassRequirement("navbar",$_PSL['classdir'] . "/NavBar.class"); |
From: Joe S. <joe...@us...> - 2003-04-18 16:45:21
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist In directory sc8-pr-cvs1:/tmp/cvs-serv11170/phpslash-dev/include/modules/mailinglist Modified Files: admin.php Log Message: doParse only calls storeParsed if the block data changed. Index: admin.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist/admin.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** admin.php 12 Mar 2003 16:12:54 -0000 1.1.1.1 --- admin.php 18 Apr 2003 16:45:17 -0000 1.2 *************** *** 3,6 **** --- 3,10 ---- /* $Id$ */ + global $_PSL, $HTTP_POST_VARS, $auth, $perm; + + $ary = $GLOBALS['ary']; + AddClassRequirement("mailinglist",$_PSL['moduledir'] . "/mailinglist/MailingList.class"); |
From: Joe S. <joe...@us...> - 2003-04-18 16:42:31
|
Update of /cvsroot/phpslash/phpslash-dev/tables/0.7 In directory sc8-pr-cvs1:/tmp/cvs-serv9907/phpslash-dev/tables/0.7 Modified Files: slash-all.sql Log Message: doParse only calls storeParsed if the block data changed. Index: slash-all.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.7/slash-all.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** slash-all.sql 17 Apr 2003 23:31:00 -0000 1.2 --- slash-all.sql 18 Apr 2003 16:42:27 -0000 1.3 *************** *** 209,215 **** INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (148,1,'Administration','','','','<BR><BR>A bunch of cool things like latest site activity and stats should go here. <BR> But until they do, just pick something from the NavBar and go about your duties...<BR><BR>','a:3:{s:6:"column";s:6:"center";s:5:"perms";s:4:"user";s:0:"";s:0:"";}',90,1025284604); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (149,12,'Tasks','','','menu_ary=menuadmin&tpl=navbarBlockh','','a:4:{s:6:"column";s:6:"center";s:5:"width";s:4:"100%";s:5:"perms";s:4:"user";s:8:"box_type";s:6:"framed";}',95,1025284618); ! INSERT INTO psl_block VALUES (150,15,'Page - public - header',0,'','','','a:2:{s:6:\"column\";s:3:\"top\";s:8:\"box_type\";s:11:\"contentonly\";}',90,1050617309); ! INSERT INTO psl_block VALUES (151,16,'Page - public - footer',0,'','','','a:2:{s:6:\"column\";s:6:\"bottom\";s:8:\"box_type\";s:11:\"contentonly\";}',5,1050617309); ! INSERT INTO psl_block VALUES (152,17,'Page - public - topicbar',0,'','','','a:2:{s:6:\"column\";s:3:\"top\";s:8:\"box_type\";s:11:\"contentonly\";}',80,1050617308); INSERT INTO psl_block VALUES (153,12,'Page - public - nav - top',0,'','tpl=navbar','','a:2:{s:6:\"column\";s:3:\"top\";s:8:\"box_type\";s:11:\"contentonly\";}',70,1050617309); INSERT INTO psl_block VALUES (154,12,'Page - public - nav - foot',0,'','tpl=navbarFooter','','a:2:{s:6:\"column\";s:6:\"bottom\";s:8:\"box_type\";s:11:\"contentonly\";}',10,1050617309); --- 209,215 ---- INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (148,1,'Administration','','','','<BR><BR>A bunch of cool things like latest site activity and stats should go here. <BR> But until they do, just pick something from the NavBar and go about your duties...<BR><BR>','a:3:{s:6:"column";s:6:"center";s:5:"perms";s:4:"user";s:0:"";s:0:"";}',90,1025284604); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (149,12,'Tasks','','','menu_ary=menuadmin&tpl=navbarBlockh','','a:4:{s:6:"column";s:6:"center";s:5:"width";s:4:"100%";s:5:"perms";s:4:"user";s:8:"box_type";s:6:"framed";}',95,1025284618); ! INSERT INTO psl_block VALUES (150,15,'Page - public - header',86400,'','','','a:2:{s:6:\"column\";s:3:\"top\";s:8:\"box_type\";s:11:\"contentonly\";}',90,990019227); ! INSERT INTO psl_block VALUES (151,16,'Page - public - footer',86400,'','','','a:2:{s:6:\"column\";s:6:\"bottom\";s:8:\"box_type\";s:11:\"contentonly\";}',5,990019227); ! INSERT INTO psl_block VALUES (152,17,'Page - public - topicbar',1200,'','','','a:2:{s:6:\"column\";s:3:\"top\";s:8:\"box_type\";s:11:\"contentonly\";}',80,1050617308); INSERT INTO psl_block VALUES (153,12,'Page - public - nav - top',0,'','tpl=navbar','','a:2:{s:6:\"column\";s:3:\"top\";s:8:\"box_type\";s:11:\"contentonly\";}',70,1050617309); INSERT INTO psl_block VALUES (154,12,'Page - public - nav - foot',0,'','tpl=navbarFooter','','a:2:{s:6:\"column\";s:6:\"bottom\";s:8:\"box_type\";s:11:\"contentonly\";}',10,1050617309); |
From: Joe S. <joe...@us...> - 2003-04-18 14:35:45
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv11540/phpslash-ft/class Modified Files: Block.class Log Message: doParse only calls storeParsed if the block data changed. Index: Block.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Block.class 9 Apr 2003 19:18:36 -0000 1.29 --- Block.class 18 Apr 2003 14:35:41 -0000 1.30 *************** *** 520,525 **** $this->parser->parse($this->block_info); $this->parsedData = $this->parser->getFinal(); ! $this->block_info["cache_data"] = $this->parsedData; ! $this->storeParsed(); return true; } else { --- 520,528 ---- $this->parser->parse($this->block_info); $this->parsedData = $this->parser->getFinal(); ! // only write to the db if the data is changed ! if($this->block_info["cache_data"] != $this->parsedData) { ! $this->block_info["cache_data"] = $this->parsedData; ! $this->storeParsed(); ! } return true; } else { |
From: Joe S. <joe...@us...> - 2003-04-18 14:35:45
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv11540/phpslash-ft Modified Files: CHANGES Log Message: doParse only calls storeParsed if the block data changed. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.757 retrieving revision 1.758 diff -C2 -d -r1.757 -r1.758 *** CHANGES 17 Apr 2003 23:57:27 -0000 1.757 --- CHANGES 18 Apr 2003 14:35:40 -0000 1.758 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-April-18 9:00AM CST Joe Stewart <joe...@us...> + [B] - Block.class - doParse only calls storeParsed if the block data changed. + functions.inc, slash-all.sql - tweaks for new block types. + 2003-April 17 6:30PM CDT Joe Stewart <joe...@us...> [B] - functions.inc - displayOptions tweak. |
From: Joe S. <joe...@us...> - 2003-04-18 14:26:47
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/block In directory sc8-pr-cvs1:/tmp/cvs-serv7708/phpslash-dev/include/modules/block Modified Files: Block.class Log Message: doParse only calls storeParsed if the block data changed. Index: Block.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/Block.class,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Block.class 12 Mar 2003 16:12:55 -0000 1.1.1.1 --- Block.class 18 Apr 2003 14:26:43 -0000 1.2 *************** *** 455,460 **** $this->parser->parse($this->block_info); $this->parsedData = $this->parser->getFinal(); ! $this->block_info["cache_data"] = $this->parsedData; ! $this->storeParsed(); return true; } else { --- 455,464 ---- $this->parser->parse($this->block_info); $this->parsedData = $this->parser->getFinal(); ! // only write to the db if the data is changed ! if($this->block_info["cache_data"] != $this->parsedData) { ! // debug($this->block_info["title"], "updated"); ! $this->block_info["cache_data"] = $this->parsedData; ! $this->storeParsed(); ! } return true; } else { |
From: Joe S. <joe...@us...> - 2003-04-18 14:26:46
|
Update of /cvsroot/phpslash/phpslash-dev/include/class In directory sc8-pr-cvs1:/tmp/cvs-serv7708/phpslash-dev/include/class Modified Files: functions.inc Log Message: doParse only calls storeParsed if the block data changed. Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/class/functions.inc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** functions.inc 12 Mar 2003 16:12:50 -0000 1.1.1.1 --- functions.inc 18 Apr 2003 14:26:42 -0000 1.2 *************** *** 558,562 **** $action_url = $_PSL['rooturl'] . "/search.php"; ! if ($_PSL['module']['TopicBar']) { $topicbar = pslNew("TopicBar"); --- 558,562 ---- $action_url = $_PSL['rooturl'] . "/search.php"; ! /* if ($_PSL['module']['TopicBar']) { $topicbar = pslNew("TopicBar"); *************** *** 565,569 **** $topicbarcontent = ""; } ! if ($_PSL['module']['NavBar']) { $navbar = pslNew("NavBar"); --- 565,570 ---- $topicbarcontent = ""; } ! */ ! /* if ($_PSL['module']['NavBar']) { $navbar = pslNew("NavBar"); *************** *** 572,576 **** $navbarcontent = ""; } ! if( !empty($GLOBALS['QUERY_STRING'])) { $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING']; --- 573,577 ---- $navbarcontent = ""; } ! */ if( !empty($GLOBALS['QUERY_STRING'])) { $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING']; *************** *** 624,628 **** global $_PSL; ! if ($_PSL['module']['NavBar']) { $navbar = pslNew("NavBar"); --- 625,629 ---- global $_PSL; ! /* if ($_PSL['module']['NavBar']) { $navbar = pslNew("NavBar"); *************** *** 631,635 **** $navbarcontent = ""; } ! /* Templates */ $default_template = "slashFoot.tpl"; --- 632,636 ---- $navbarcontent = ""; } ! */ /* Templates */ $default_template = "slashFoot.tpl"; *************** *** 649,653 **** 'SKIN' => $_PSL['skin'], 'BASEURL' => $_PSL['rooturl'], ! 'NAVBAR' => $navbarcontent )); --- 650,654 ---- 'SKIN' => $_PSL['skin'], 'BASEURL' => $_PSL['rooturl'], ! // 'NAVBAR' => $navbarcontent )); |
From: Joe S. <joe...@us...> - 2003-04-18 14:26:46
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1:/tmp/cvs-serv7708/phpslash-dev Modified Files: CHANGES Log Message: doParse only calls storeParsed if the block data changed. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CHANGES 17 Apr 2003 23:30:59 -0000 1.4 --- CHANGES 18 Apr 2003 14:26:42 -0000 1.5 *************** *** 14,17 **** --- 14,21 ---- + 2003-April-18 9:00AM CST Joe Stewart <joe...@us...> + [B] - Block.class - doParse only calls storeParsed if the block data changed. + functions.inc, slash-all.sql - tweaks for new block types. + 2003-April-17 6:00PM CST Joe Stewart <joe...@us...> [ET] - Initial testing of new block types and page display. New block |
From: Joe S. <joe...@us...> - 2003-04-17 23:57:30
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv25772/phpslash-ft Modified Files: CHANGES Log Message: displayOptions tweak. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.756 retrieving revision 1.757 diff -C2 -d -r1.756 -r1.757 *** CHANGES 16 Apr 2003 16:35:46 -0000 1.756 --- CHANGES 17 Apr 2003 23:57:27 -0000 1.757 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-April 17 6:30PM CDT Joe Stewart <joe...@us...> + [B] - functions.inc - displayOptions tweak. + 2003-April 14 3:30PM CDT Joe Stewart <joe...@us...> [B] - Added ROOTURL, IMAGEURL and SKIN placeholders to topicBar.tpl. |
From: Joe S. <joe...@us...> - 2003-04-17 23:56:44
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv25495/phpslash-ft/class Modified Files: functions.inc Log Message: displayOptions tweak. Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** functions.inc 14 Apr 2003 18:07:15 -0000 1.143 --- functions.inc 17 Apr 2003 23:56:40 -0000 1.144 *************** *** 1657,1690 **** // debug("dvalue", $dvalue); $tpl_object->set_var(array( ! 'DOPTION_NAME' => "optionname[]", ! 'DOPTION_NAME_VAL' => $dname, ! 'DOPTION_DESCRIPTION' => pslgetText($ddescription) )); ! // option choices ! if(is_array($dchoices)) { ! // choices available ! reset($dchoices); ! foreach($dchoices as $key => $value) { ! $tpl_object->set_var(array( ! 'DOPTION_VALUE' => "optionval[]", ! 'DOPTION_VALUE_VAL' => $key, ! 'DOPTION_VALUE_LABEL' => $value ! )); ! // selected or not ! if($dvalue == $key ) { ! $tpl_object->parse("dchoices", "each_default_selected", true); ! } else { ! $tpl_object->parse("dchoices", "each_default_notselected", true); ! } ! $tpl_object->parse("dchoices", "each_default_choice", true); ! } ! } else { ! // no choices $tpl_object->set_var(array( 'DOPTION_VALUE' => "optionval[]", ! 'DOPTION_VALUE_VAL' => $dvalue )); } if(is_array($options_ary) && array_key_exists($dname, $options_ary)) { // option processed - remove it from queue. --- 1657,1705 ---- // debug("dvalue", $dvalue); $tpl_object->set_var(array( ! 'DOPTION_NAME' => "optionname[]", ! 'DOPTION_NAME_VAL' => $dname, ! 'DOPTION_DESCRIPTION' => pslgetText($ddescription) )); ! // option choices ! if(is_array($dchoices)) { ! // choices available ! reset($dchoices); ! ! // show current option value as selected/checked ! $tpl_object->set_var(array( ! 'DOPTION_VALUE' => "optionval[]", ! 'DOPTION_VALUE_VAL' => $dvalue, ! 'DOPTION_VALUE_LABEL' => $dvalue ! )); ! ! // If the current option value is one of the choices, show that label ! if(array_key_exists($dvalue,$dchoices)) { ! $tpl_object->set_var('DOPTION_VALUE_LABEL', $dchoices[$dvalue]); ! } ! $tpl_object->parse("dchoices", "each_default_selected", true); ! ! // display the choices ! foreach($dchoices as $key => $value) { $tpl_object->set_var(array( 'DOPTION_VALUE' => "optionval[]", ! 'DOPTION_VALUE_VAL' => $key, ! 'DOPTION_VALUE_LABEL' => $value )); + // selected or not + if($dvalue == $key ) { + // $tpl_object->parse("dchoices", "each_default_selected", true); + } else { + $tpl_object->parse("dchoices", "each_default_notselected", true); + } + $tpl_object->parse("dchoices", "each_default_choice", true); } + } else { + // no choices + $tpl_object->set_var(array( + 'DOPTION_VALUE' => "optionval[]", + 'DOPTION_VALUE_VAL' => $dvalue + )); + } if(is_array($options_ary) && array_key_exists($dname, $options_ary)) { // option processed - remove it from queue. *************** *** 1697,1702 **** $tpl_object->set_var(array( 'selected' => '', ! 'notselected' => '', ! 'dchoices' => '' )); } --- 1712,1717 ---- $tpl_object->set_var(array( 'selected' => '', ! 'notselected' => '', ! 'dchoices' => '' )); } *************** *** 1716,1720 **** // debug("current", $current); ! if ($current) { $tpl_object->set_var(array( 'OPTION_NAME' => "optionname[]", --- 1731,1735 ---- // debug("current", $current); ! if ($current) { $tpl_object->set_var(array( 'OPTION_NAME' => "optionname[]", |
From: Joe S. <joe...@us...> - 2003-04-17 23:37:14
|
Update of /cvsroot/phpslash/phpslash-dev/public_html/admin In directory sc8-pr-cvs1:/tmp/cvs-serv18274/phpslash-dev/public_html/admin Modified Files: mailinglistAdmin.php Log Message: Initial testing of new block types and page display. Index: mailinglistAdmin.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/mailinglistAdmin.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** mailinglistAdmin.php 12 Mar 2003 16:12:57 -0000 1.1.1.1 --- mailinglistAdmin.php 17 Apr 2003 23:37:11 -0000 1.2 *************** *** 4,9 **** require('config.php'); ! $pagetitle = pslgetText('Administration'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Administration Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { --- 4,9 ---- require('config.php'); ! $pagetitle = pslgetText('Mailinglist Administration'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Mailinglist Administration Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { *************** *** 11,21 **** } // Objects ! $_PSL['module']['module.current'] = $_PSL['module']['MailingList']; ! // get content from the module ! include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/admin.php"); ! $allstories = $content; // setup the block module --- 11,22 ---- } + $_PSL['metatags']['object'] = $xsiteobject; + // Objects ! $ary['module'] = 'MailingList'; ! $ary['section'] = 'Admin'; ! $ary['page'] = 'admin'; // setup the block module *************** *** 24,83 **** $block = pslNew("Block_i"); - - $ary['section'] = "Admin"; // Start of Page ! $_PSL['metatags']['object'] = $xsiteobject; ! ! slashhead($pagetitle,$_PSL['metatags']); ! ! // $allstories = $story->getStories($ary); ! $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 = pslNew("slashTemplate",$_PSL['templatedir']); ! $template->debug = 0; ! $template->set_file(array( ! 'index' => $tplfile //"index3col.tpl" ! )); ! ! if( !empty($GLOBALS['QUERY_STRING'])) { ! $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING']; ! } else { ! $QUERY_STRING = ''; ! } ! ! $template->set_var(array( ! 'QUERYSTRING' => $QUERY_STRING, ! '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(); ?> --- 25,34 ---- $block = pslNew("Block_i"); // Start of Page ! $content = $block->getBlocks($ary, "page"); ! echo $content; page_close(); ?> |
Update of /cvsroot/phpslash/phpslash-dev/include/modules/block/blocktypes In directory sc8-pr-cvs1:/tmp/cvs-serv17018/phpslash-dev/include/modules/block/blocktypes Added Files: Block_render_footer.class Block_render_header.class Block_render_module.class Block_render_page.class Block_render_topicbar.class Log Message: Initial testing of new block types and page display. --- NEW FILE: Block_render_footer.class --- <?php /* Block_render_footer.class -> Methods for phpslash specfic blocks */ /* $Id: Block_render_footer.class,v 1.1 2003/04/17 23:33:47 joestewart Exp $ */ class Block_render_footer extends Block_render_i { /* constructor */ function Block_render_footer() { $this->Block_render_i(); $this->type = "footer"; /* set the 'type' */ $this->description = "A block that displays the parsed contents of slashFoot.tpl"; } function parse($block_info) { $tpl = ''; if (is_array($block_info['block_options'])) { if(array_key_exists('tpl', $block_info['block_options'])) { $tpl = $block_info['block_options']['tpl']; } } $this->output = getFooter($tpl); return true; } } ?> --- NEW FILE: Block_render_header.class --- <?php /* Block_render_header.class -> Methods for phpslash specfic blocks */ /* $Id: Block_render_header.class,v 1.1 2003/04/17 23:33:47 joestewart Exp $ */ class Block_render_header extends Block_render_i { /* constructor */ function Block_render_header() { $this->Block_render_i(); $this->type = "header"; /* set the 'type' */ $this->description = "A block that displays the parsed contents of slashHead.tpl"; } function parse($block_info) { $this->output = getHeader($GLOBALS['pagetitle'],$this->psl['metatags']); return true; } } ?> --- NEW FILE: Block_render_module.class --- <?php /* Block_render_module.class -> Methods for phpslash specfic blocks */ /* $Id: Block_render_module.class,v 1.1 2003/04/17 23:33:47 joestewart Exp $ */ class Block_render_module extends Block_render_i { /* constructor */ function Block_render_module() { $this->Block_render_i(); $this->type = "module"; /* set the 'type' */ $this->description = "A block that displays module output"; } function parse($block_info) { // set defaults // set default module $module = $this->psl['module']['module.default']; // set default filename $modulefilename = "index"; // are there block options? if (is_array($block_info['block_options'])) { if(array_key_exists('module', $block_info['block_options'])) { // the module is set in the block admin $module = $block_info['block_options']['module']; } elseif(array_key_exists('module', $GLOBALS['ary'])) { // the module is set by the calling script $module = $GLOBALS['ary']['module']; } if(array_key_exists('page', $block_info['block_options'])) { // the filename is set in the block admin $modulefilename = basename($block_info['block_options']['page']); } elseif(array_key_exists('page', $GLOBALS['ary'])) { // the filename is set by the calling script $modulefilename = basename($GLOBALS['ary']['page']); } } // assemble the module directory path $moduledir = $this->psl['moduledir'] ."/". $this->psl['module'][$module]; // assemble the full file path $modulefilepath = $moduledir ."/". $modulefilename .".php"; // get the data from the module $this->output = include($modulefilepath); return true; } } ?> --- NEW FILE: Block_render_page.class --- <?php /* Block_render_page.class -> Methods for phpslash specfic blocks */ /* $Id: Block_render_page.class,v 1.1 2003/04/17 23:33:47 joestewart Exp $ */ class Block_render_page extends Block_render_i { /* constructor */ function Block_render_page() { $this->Block_render_i(); $this->type = "page"; /* set the 'type' */ $this->description = "A block that displays page output"; } function parse($block_info) { global $ary; // set defaults // $ary['section_id'] = 3; // set default filename $pagefilename = "index"; // are there block options? if (is_array($block_info['block_options'])) { /* if(array_key_exists('tpl', $block_info['block_options'])) { // the filename is set in the block admin $pagefilename = basename($block_info['block_options']['page']); } */ if(array_key_exists('page', $block_info['block_options'])) { // the filename is set in the block admin $pagefilename = basename($block_info['block_options']['page']); } elseif(array_key_exists('page', $GLOBALS['ary'])) { // the filename is set by the calling script $pagefilename = basename($GLOBALS['ary']['page']); } } if(is_object($GLOBALS['block'])) { // already have a block object $block = $GLOBALS['block']; } else { // no block object - create one $this->psl['module']['module.current'] = $this->psl['module']['Block']; include($this->psl['moduledir'] ."/". $this->psl['module']['module.current'] ."/". $pagefilename .".php"); $block = pslNew("Block_i"); } $topblocks = $block->getBlocks($ary, "top"); $leftblocks = $block->getBlocks($ary, "left"); $centerblocks = $block->getBlocks($ary, "center"); $rightblocks = $block->getBlocks($ary, "right"); $bottomblocks = $block->getBlocks($GLOBALS['ary'], "bottom"); if (empty($leftblocks)) { if (empty($rightblocks)) { // $centerblocks = $block->getBlocks($ary); $tplfile = "index1col.tpl"; } else { $tplfile = 'index2colright.tpl'; } } elseif (empty($rightblocks)) { $tplfile = 'index2colleft.tpl'; } else { $tplfile = 'index3col.tpl'; } if(is_object($GLOBALS['template'])) { $template = $GLOBALS['template']; } else { $template = pslNew("slashTemplate"); } $template->debug = 0; $template->set_file(array( 'index' => $tplfile //"index3col.tpl" )); if( !empty($_SERVER['QUERY_STRING'])) { $QUERY_STRING = '?'.$_SERVER['QUERY_STRING']; } else { $QUERY_STRING = ''; } $template->set_var(array( 'SKIN' => $this->psl['skin'], 'QUERYSTRING' => $QUERY_STRING, 'ROOTDIR' => $this->psl['rooturl'], 'IMAGEDIR' => $this->psl['imageurl'], 'BREADCRUMB' => $breadcrumb, 'STORY_COLUMN' => $allstories, 'TOP' => $topblocks, 'LEFT_BLOCK_COLUMN' => $leftblocks, 'CENTER_BLOCK_COLUMN' => $centerblocks, 'RIGHT_BLOCK_COLUMN' => $rightblocks, 'BOTTOM' => $bottomblocks )); $this->output = $template->parse('OUT','index'); return true; } } ?> --- NEW FILE: Block_render_topicbar.class --- <?php /* Block_render_topicbar.class -> Methods for phpslash specfic blocks */ /* $Id: Block_render_topicbar.class,v 1.1 2003/04/17 23:33:47 joestewart Exp $ */ class Block_render_topicbar extends Block_render_i { /* constructor */ function Block_render_topicbar() { $this->Block_render_i(); $this->type = "topicbar"; /* set the 'type' */ $this->description = "A block that displays a Topic Bar"; } function parse($block_info) { $topicbar = pslNew("TopicBar"); $this->output = $topicbar->getTopicBar(); return true; } } ?> |
From: Joe S. <joe...@us...> - 2003-04-17 23:33:51
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic In directory sc8-pr-cvs1:/tmp/cvs-serv17018/phpslash-dev/include/templates/en/basic Added Files: contentonlybox.tpl Log Message: Initial testing of new block types and page display. --- NEW FILE: contentonlybox.tpl --- {CONTENTS} |
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv15895/phpslash-dev/public_html Modified Files: about.php glossary.php index.php mailinglist.php poll.php search.php submission.php Log Message: Initial testing of new block types and page display. Index: about.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/about.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** about.php 12 Mar 2003 16:12:57 -0000 1.1.1.1 --- about.php 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 4,9 **** require('config.php'); ! $pagetitle = pslgetText('About'); // The name to be displayed in the header ! $xsiteobject = pslgetText('About Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { --- 4,9 ---- require('config.php'); ! $pagetitle = pslgetText('About'); // The name to be displayed in the header ! $xsiteobject = pslgetText('About Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { *************** *** 11,23 **** } ! // Objects ! $_PSL['module']['module.current'] = $_PSL['module']['About']; ! // get content from the module ! include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php"); ! // $allstories = getFancyBox("100%", "About phpSlash", $content, '', ''); ! $allstories = $content; // setup the block module $_PSL['module']['module.current'] = $_PSL['module']['Block']; --- 11,21 ---- } ! $_PSL['metatags']['object'] = $xsiteobject; ! // Objects ! $ary['module'] = 'About'; + // $_PSL['module']['module.current'] = $_PSL['module']['About']; // setup the block module $_PSL['module']['module.current'] = $_PSL['module']['Block']; *************** *** 27,84 **** // Start of Page ! $breadcrumb = breadcrumb($ary); ! ! $_PSL['metatags']['object'] = $xsiteobject; ! ! slashhead($pagetitle,$_PSL['metatags']); ! ! // $allstories = $story->getStories($ary); ! $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 = pslNew("slashTemplate",$_PSL['templatedir']); ! $template->debug = 0; ! $template->set_file(array( ! 'index' => $tplfile //"index3col.tpl" ! )); ! ! if( !empty($GLOBALS['QUERY_STRING'])) { ! $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING']; ! } else { ! $QUERY_STRING = ''; ! } ! ! $template->set_var(array( ! 'QUERYSTRING' => $QUERY_STRING, ! '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(); ?> --- 25,32 ---- // Start of Page ! $content = $block->getBlocks($ary, "page"); ! echo $content; page_close(); ?> Index: glossary.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/glossary.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** glossary.php 12 Mar 2003 16:12:57 -0000 1.1.1.1 --- glossary.php 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 4,9 **** require('config.php'); ! $pagetitle = pslgetText('Glossary'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Glossary Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { --- 4,9 ---- require('config.php'); ! $pagetitle = pslgetText('Glossary'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Glossary Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { *************** *** 11,21 **** } ! // Objects ! $_PSL['module']['module.current'] = $_PSL['module']['Glossary']; ! // get content from the module ! $allstories = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php"); ! // $allstories = $content; // setup the block module --- 11,19 ---- } ! $_PSL['metatags']['object'] = $xsiteobject; ! // Objects ! $ary['module'] = 'Glossary'; // setup the block module *************** *** 26,83 **** // Start of Page ! $breadcrumb = breadcrumb($ary); ! ! $_PSL['metatags']['object'] = $xsiteobject; ! ! slashhead($pagetitle,$_PSL['metatags']); ! ! // $allstories = $story->getStories($ary); ! $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 = pslNew("slashTemplate",$_PSL['templatedir']); ! $template->debug = 0; ! $template->set_file(array( ! 'index' => $tplfile //"index3col.tpl" ! )); ! ! if( !empty($GLOBALS['QUERY_STRING'])) { ! $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING']; ! } else { ! $QUERY_STRING = ''; ! } ! ! $template->set_var(array( ! 'QUERYSTRING' => $QUERY_STRING, ! '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(); ?> --- 24,31 ---- // Start of Page ! $content = $block->getBlocks($ary, "page"); ! echo $content; page_close(); ?> Index: index.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 12 Mar 2003 16:12:57 -0000 1.1.1.1 --- index.php 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 11,14 **** --- 11,16 ---- } + $_PSL['metatags']['object'] = $xsiteobject; + // Objects *************** *** 20,32 **** } - // no match, just use default - if(empty($_PSL['module']['module.current'])) { - $_PSL['module']['module.current'] = $_PSL['module'][$_PSL['module']['module.default']]; - } - - // get content from the module - $allstories = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php"); - // $allstories = $content; - // setup the block module $_PSL['module']['module.current'] = $_PSL['module']['Block']; --- 22,25 ---- *************** *** 36,88 **** // Start of Page ! $_PSL['metatags']['object'] = $xsiteobject; ! ! slashhead($pagetitle,$_PSL['metatags']); ! ! $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"; ! } else { ! $tplfile = 'index2colright.tpl'; ! } ! } elseif (empty($rightblocks)) { ! $tplfile = 'index2colleft.tpl'; ! } else { ! $tplfile = 'index3col.tpl'; ! } ! ! $template = pslNew("slashTemplate"); ! $template->debug = 0; ! $template->set_file(array( ! 'index' => $tplfile //"index3col.tpl" ! )); ! ! if( !empty($_SERVER['QUERY_STRING'])) { ! $QUERY_STRING = '?'.$_SERVER['QUERY_STRING']; ! } else { ! $QUERY_STRING = ''; ! } ! ! $template->set_var(array( ! 'SKIN' => $_PSL['skin'], ! 'QUERYSTRING' => $QUERY_STRING, ! '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(); ?> --- 29,36 ---- // Start of Page ! $content = $block->getBlocks($ary, "page"); ! echo $content; page_close(); ?> Index: mailinglist.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/mailinglist.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** mailinglist.php 12 Mar 2003 16:12:57 -0000 1.1.1.1 --- mailinglist.php 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 4,9 **** require('config.php'); ! $pagetitle = pslgetText('Mailinglist'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Mailinglist Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { --- 4,9 ---- require('config.php'); ! $pagetitle = pslgetText('Mailinglist'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Mailinglist Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { *************** *** 11,20 **** } ! // Objects ! $_PSL['module']['module.current'] = $_PSL['module']['MailingList']; ! // get content from the module ! $allstories = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php"); // setup the block module --- 11,19 ---- } ! $_PSL['metatags']['object'] = $xsiteobject; ! // Objects ! $ary['module'] = 'MailingList'; // setup the block module *************** *** 25,82 **** // Start of Page ! $breadcrumb = breadcrumb($ary); ! ! $_PSL['metatags']['object'] = $xsiteobject; ! ! slashhead($pagetitle,$_PSL['metatags']); ! ! // $allstories = $story->getStories($ary); ! $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 = pslNew("slashTemplate",$_PSL['templatedir']); ! $template->debug = 0; ! $template->set_file(array( ! 'index' => $tplfile //"index3col.tpl" ! )); ! ! if( !empty($GLOBALS['QUERY_STRING'])) { ! $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING']; ! } else { ! $QUERY_STRING = ''; ! } ! ! $template->set_var(array( ! 'QUERYSTRING' => $QUERY_STRING, ! '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(); ?> --- 24,31 ---- // Start of Page ! $content = $block->getBlocks($ary, "page"); ! echo $content; page_close(); ?> Index: poll.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/poll.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** poll.php 12 Mar 2003 16:12:57 -0000 1.1.1.1 --- poll.php 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 4,9 **** require('config.php'); ! $pagetitle = pslgetText('Poll'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Poll Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { --- 4,9 ---- require('config.php'); ! $pagetitle = pslgetText('Poll'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Poll Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { *************** *** 11,20 **** } ! // Objects ! $_PSL['module']['module.current'] = $_PSL['module']['Poll']; ! // get content from the module ! $allstories = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php"); // setup the block module --- 11,19 ---- } ! $_PSL['metatags']['object'] = $xsiteobject; ! // Objects ! $ary['module'] = 'Poll'; // setup the block module *************** *** 25,82 **** // Start of Page ! $breadcrumb = breadcrumb($ary); ! ! $_PSL['metatags']['object'] = $xsiteobject; ! ! slashhead($pagetitle,$_PSL['metatags']); ! ! // $allstories = $story->getStories($ary); ! $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 = pslNew("slashTemplate",$_PSL['templatedir']); ! $template->debug = 0; ! $template->set_file(array( ! 'index' => $tplfile //"index3col.tpl" ! )); ! ! if( !empty($GLOBALS['QUERY_STRING'])) { ! $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING']; ! } else { ! $QUERY_STRING = ''; ! } ! ! $template->set_var(array( ! 'QUERYSTRING' => $QUERY_STRING, ! '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(); ?> --- 24,31 ---- // Start of Page ! $content = $block->getBlocks($ary, "page"); ! echo $content; page_close(); ?> Index: search.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/search.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** search.php 12 Mar 2003 16:12:57 -0000 1.1.1.1 --- search.php 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 4,9 **** require('config.php'); ! $pagetitle = pslgetText('Search'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Search Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { --- 4,9 ---- require('config.php'); ! $pagetitle = pslgetText('Search'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Search Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { *************** *** 11,20 **** } ! // Objects ! $_PSL['module']['module.current'] = $_PSL['module']['Search']; ! // get content from the module ! $allstories = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php"); // setup the block module --- 11,19 ---- } ! $_PSL['metatags']['object'] = $xsiteobject; ! // Objects ! $ary['module'] = 'Search'; // setup the block module *************** *** 25,82 **** // Start of Page ! $breadcrumb = breadcrumb($ary); ! ! $_PSL['metatags']['object'] = $xsiteobject; ! ! slashhead($pagetitle,$_PSL['metatags']); ! ! // $allstories = $story->getStories($ary); ! $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 = pslNew("slashTemplate",$_PSL['templatedir']); ! $template->debug = 0; ! $template->set_file(array( ! 'index' => $tplfile //"index3col.tpl" ! )); ! ! if( !empty($GLOBALS['QUERY_STRING'])) { ! $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING']; ! } else { ! $QUERY_STRING = ''; ! } ! ! $template->set_var(array( ! 'QUERYSTRING' => $QUERY_STRING, ! '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(); ?> --- 24,31 ---- // Start of Page ! $content = $block->getBlocks($ary, "page"); ! echo $content; page_close(); ?> Index: submission.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/public_html/submission.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** submission.php 12 Mar 2003 16:12:57 -0000 1.1.1.1 --- submission.php 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 4,9 **** require('config.php'); ! $pagetitle = pslgetText('Submission'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Submission Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { --- 4,9 ---- require('config.php'); ! $pagetitle = pslgetText('Submission'); // The name to be displayed in the header ! $xsiteobject = pslgetText('Submission Page'); // This Defines The META Tag Object Type if(!empty($HTTP_GET_VARS['login'])) { *************** *** 11,20 **** } ! // Objects ! $_PSL['module']['module.current'] = $_PSL['module']['Submission']; ! // get content from the module ! $allstories = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php"); // setup the block module --- 11,19 ---- } ! $_PSL['metatags']['object'] = $xsiteobject; ! // Objects ! $ary['module'] = 'Submission'; // setup the block module *************** *** 25,82 **** // Start of Page ! $breadcrumb = breadcrumb($ary); ! ! $_PSL['metatags']['object'] = $xsiteobject; ! ! slashhead($pagetitle,$_PSL['metatags']); ! ! // $allstories = $story->getStories($ary); ! $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 = pslNew("slashTemplate",$_PSL['templatedir']); ! $template->debug = 0; ! $template->set_file(array( ! 'index' => $tplfile //"index3col.tpl" ! )); ! ! if( !empty($GLOBALS['QUERY_STRING'])) { ! $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING']; ! } else { ! $QUERY_STRING = ''; ! } ! ! $template->set_var(array( ! 'QUERYSTRING' => $QUERY_STRING, ! '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(); ?> --- 24,31 ---- // Start of Page ! $content = $block->getBlocks($ary, "page"); ! echo $content; page_close(); ?> |
From: Joe S. <joe...@us...> - 2003-04-17 23:31:05
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic In directory sc8-pr-cvs1:/tmp/cvs-serv15895/phpslash-dev/include/templates/en/basic Modified Files: index1col.tpl index2colleft.tpl index2colright.tpl index3col.tpl Log Message: Initial testing of new block types and page display. Index: index1col.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/index1col.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index1col.tpl 12 Mar 2003 16:12:52 -0000 1.1.1.1 --- index1col.tpl 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 1,3 **** --- 1,5 ---- <!-- start index1col.tpl --> + {TOP} + {BREADCRUMB} *************** *** 13,17 **** </tr> </table> ! <!-- end index1col.tpl --> --- 15,19 ---- </tr> </table> ! {BOTTOM} <!-- end index1col.tpl --> Index: index2colleft.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/index2colleft.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index2colleft.tpl 12 Mar 2003 16:12:52 -0000 1.1.1.1 --- index2colleft.tpl 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 1,3 **** --- 1,4 ---- <!-- start index2colleft.tpl --> + {TOP} {BREADCRUMB} *************** *** 20,22 **** --- 21,24 ---- </tr> </table> + {BOTTOM} <!-- end index2colleft.tpl --> Index: index2colright.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/index2colright.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index2colright.tpl 12 Mar 2003 16:12:52 -0000 1.1.1.1 --- index2colright.tpl 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 1,3 **** --- 1,5 ---- <!-- start index2colright.tpl --> + {TOP} + {BREADCRUMB} *************** *** 21,23 **** --- 23,26 ---- </tr> </table> + {BOTTOM} <!-- end index2colright.tpl --> Index: index3col.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/index3col.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index3col.tpl 12 Mar 2003 16:12:52 -0000 1.1.1.1 --- index3col.tpl 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 1,3 **** --- 1,5 ---- <!-- start index3col.tpl --> + {TOP} + {BREADCRUMB} <table width="100%" cellpadding="0" cellspacing="0" border="0"> *************** *** 27,30 **** --- 29,33 ---- </tr> </table> + {BOTTOM} <!-- end index3col.tpl --> |
From: Joe S. <joe...@us...> - 2003-04-17 23:31:05
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/submission In directory sc8-pr-cvs1:/tmp/cvs-serv15895/phpslash-dev/include/modules/submission Modified Files: index.php Log Message: Initial testing of new block types and page display. Index: index.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/submission/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 12 Mar 2003 16:12:55 -0000 1.1.1.1 --- index.php 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 2,5 **** --- 2,7 ---- // $Id$ + global $_PSL, $HTTP_POST_VARS, $ary; + AddClassRequirement("submission",$_PSL['moduledir'] . "/submission/Submission.class"); |
From: Joe S. <joe...@us...> - 2003-04-17 23:31:05
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/story In directory sc8-pr-cvs1:/tmp/cvs-serv15895/phpslash-dev/include/modules/story Modified Files: index.php Log Message: Initial testing of new block types and page display. Index: index.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 12 Mar 2003 16:12:54 -0000 1.1.1.1 --- index.php 17 Apr 2003 23:31:01 -0000 1.2 *************** *** 2,5 **** --- 2,9 ---- // $Id$ + global $_PSL; + + $ary = $GLOBALS['ary']; + AddClassRequirement("story_base",$_PSL['moduledir'] . "/story/Story_base.class"); AddClassRequirement("story","story_base"); |
From: Joe S. <joe...@us...> - 2003-04-17 23:31:04
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/poll In directory sc8-pr-cvs1:/tmp/cvs-serv15895/phpslash-dev/include/modules/poll Modified Files: index.php Log Message: Initial testing of new block types and page display. Index: index.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/poll/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 12 Mar 2003 16:12:53 -0000 1.1.1.1 --- index.php 17 Apr 2003 23:31:00 -0000 1.2 *************** *** 3,6 **** --- 3,10 ---- /* $Id$ */ + global $_PSL; + + $ary = $GLOBALS['ary']; + AddClassRequirement("poll",$_PSL['moduledir'] . "/poll/Poll.class"); *************** *** 58,62 **** /* we register the "return link" in case they post a comment */ $return_link = $HTTP_SERVER_VARS["REQUEST_URI"]; ! $sess->register("return_link"); $content .= $poll->resultPage($cmtary); --- 62,66 ---- /* we register the "return link" in case they post a comment */ $return_link = $HTTP_SERVER_VARS["REQUEST_URI"]; ! // $sess->register("return_link"); $content .= $poll->resultPage($cmtary); |
From: Joe S. <joe...@us...> - 2003-04-17 23:31:04
|
Update of /cvsroot/phpslash/phpslash-dev/tables/0.7 In directory sc8-pr-cvs1:/tmp/cvs-serv15895/phpslash-dev/tables/0.7 Modified Files: slash-all.sql Log Message: Initial testing of new block types and page display. Index: slash-all.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.7/slash-all.sql,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** slash-all.sql 12 Mar 2003 16:12:59 -0000 1.1.1.1 --- slash-all.sql 17 Apr 2003 23:31:00 -0000 1.2 *************** *** 114,124 **** INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_variable_seq',63); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_section_seq',9); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_block_seq',149); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_author_seq',20); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_infolog',88); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_mailinglist_seq',2); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_glossary_seq',1); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_blocktype_seq',14); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_section_block_lut_seq',280); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_permission_seq',82); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_seq',27); --- 114,124 ---- INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_variable_seq',63); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_section_seq',9); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_block_seq',158); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_author_seq',20); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_infolog',88); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_mailinglist_seq',2); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_glossary_seq',1); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_blocktype_seq',19); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_section_block_lut_seq',341); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_permission_seq',82); INSERT INTO db_sequence (seq_name, nextid) VALUES ('psl_group_seq',27); *************** *** 199,212 **** INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (131,5,'PHPSlash Poll',1200,'','','<!-- START: pollDisplay.tpl -->\n <form action="/pollAdmin.php">\n <input type=hidden name=question_id value="">\n <FONT SIZE=-1 face="arial,helvetica">\n <b></b><BR>\n \n <input type=submit value=Vote> \n [ <a href="">Results</a> \n | <a href="/pollAdmin.php">Polls</a> ]\n <br>Comments: <b></b> | Votes: <b></b>\n </FONT>\n </form>\n<!-- END: pollDisplay.tpl -->\n','a:2:{s:5:"width";s:3:"160";s:6:"column";s:5:"right";}','',990021726); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (139,7,'Sections',3600,'','','<!-- sectionsblock.tpl begin-->\n <ul>\n \n <li><a href="http://localhost/authperm//index.php">Home</a><br>\n </ul> \n<!-- sectionsblock.tpl end-->\n\n','a:2:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";}',99,990019226); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (130,4,'%%',3600,'','','<table cellpadding=2 border=0 BGCOLOR=#000066>\n<tr BGCOLOR=#FFFFFF>\n <th><FONT FACE=arial,helvetica COLOR=#000000>S</FONT></th>\n <th><FONT FACE=arial,helvetica COLOR=#000000>M</FONT></th>\n <th><FONT FACE=arial,helvetica COLOR=#000000>T</FONT></th>\n <th><FONT FACE=arial,helvetica COLOR=#000000>W</FONT></th>\n <th><FONT FACE=arial,helvetica COLOR=#000000>T</FONT></th>\n <th><FONT FACE=arial,helvetica COLOR=#000000>F</FONT></th>\n <th><FONT FACE=arial,helvetica COLOR=#000000>S</FONT></th>\n</tr>\n\n\n<tr ALIGN=CENTER BGCOLOR=#FFFFFF>\n\n <!-- customize this td block for regular cells -->\n\n \n <td><FONT FACE=arial,helvetica COLOR="#000000"> </FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000"> </FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">1</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">2</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">3</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">4</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">5</FONT></td>\n\n <!-- customize this td block for linked cells -->\n\n \n\n</tr>\n<tr ALIGN=CENTER BGCOLOR=#FFFFFF>\n\n <!-- customize this td block for regular cells -->\n\n \n <td><FONT FACE=arial,helvetica COLOR="#000000">6</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">7</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">8</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">9</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">10</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">11</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">12</FONT></td>\n\n <!-- customize this td block for linked cells -->\n\n \n\n</tr>\n<tr ALIGN=CENTER BGCOLOR=#FFFFFF>\n\n <!-- customize this td block for regular cells -->\n\n \n <td><FONT FACE=arial,helvetica COLOR="#000000">13</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">14</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">15</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">16</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">17</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">18</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">19</FONT></td>\n\n <!-- customize this td block for linked cells -->\n\n \n\n</tr>\n<tr ALIGN=CENTER BGCOLOR=#FFFFFF>\n\n <!-- customize this td block for regular cells -->\n\n \n <td><FONT FACE=arial,helvetica COLOR="#000000">20</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">21</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">22</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">23</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">24</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">25</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">26</FONT></td>\n\n <!-- customize this td block for linked cells -->\n\n \n\n</tr>\n<tr ALIGN=CENTER BGCOLOR=#FFFFFF>\n\n <!-- customize this td block for regular cells -->\n\n \n <td><FONT FACE=arial,helvetica COLOR="#000000">27</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">28</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">29</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">30</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000">31</FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000"> </FONT></td>\n <td><FONT FACE=arial,helvetica COLOR="#000000"> </FONT></td>\n\n <!-- customize this td block for linked cells -->\n\n \n\n</tr>\n\n</table>\n','a:2:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";}',89,990019226); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (140,8,'Interview Topics',3600,'','section=interviews','<!-- topicsblock.tpl begin-->\n <ul> \n \n <li><a href="http://localhost/phpslash-ft/public_html/index.php?topic=Apple§ion=interviews">Apple</a><br>\n \n </ul>\n<!-- topicsblock.tpl end-->\n\n','a:3:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";s:0:"";s:0:"";}',90,975030554); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (141,8,'Feature Topics',3600,'','section=features','<!-- topicsblock.tpl begin-->\n <ul> \n \n <li><a href="http://localhost/phpslash-ft/public_html/index.php?topic=American%26nbsp%3BOnline§ion=features">American Online</a><br>\n \n <li><a href="http://localhost/phpslash-ft/public_html/index.php?topic=Amiga§ion=features">Amiga</a><br>\n \n <li><a href="http://localhost/phpslash-ft/public_html/index.php?topic=FreeBSD§ion=features">FreeBSD</a><br>\n \n </ul>\n<!-- topicsblock.tpl end-->\n\n','a:3:{s:5:"width";s:3:"160";s:6:"column";s:5:"right";s:0:"";s:0:"";}',90,975030541); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (142,8,'Topics',3600,'','section=Home','<!-- topicsblock.tpl begin-->\n <ul> \n \n <li><a href="http://localhost/authperm//index.php?topic=PHPSlash">PHPSlash</a><br>\n </ul>\n<!-- topicsblock.tpl end-->\n\n','a:2:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";}',90,990019226); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (143,6,'Got Foo?',3600,'','query=foo','<!-- queryblock.tpl begin-->\n {query_block}\n<!-- queryblock.tpl end-->\n\n','a:3:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";s:0:"";s:0:"";}',50,990019226); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (144,6,'Most Popular Stories',3600,'','order=hits','<!-- queryblock.tpl begin-->\n \n <li><a href="http://localhost/authperm//article.php?story_id=19">Congratulations! It Works!</a><br>\n<!-- queryblock.tpl end-->\n\n','a:2:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";}',60,990019226); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (145,6,'Older Stories',3600,'','start=5&max=5','<!-- queryblock.tpl begin-->\n {query_block}\n<!-- queryblock.tpl end-->\n\n','a:2:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";}',30,990019227); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (148,1,'Administration','','','','<BR><BR>A bunch of cool things like latest site activity and stats should go here. <BR> But until they do, just pick something from the NavBar and go about your duties...<BR><BR>','a:3:{s:6:"column";s:6:"center";s:5:"perms";s:4:"user";s:0:"";s:0:"";}',90,1025284604); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (149,12,'Tasks','','','menu_ary=menuadmin&tpl=navbarBlockh','','a:4:{s:6:"column";s:6:"center";s:5:"width";s:4:"100%";s:5:"perms";s:4:"user";s:8:"box_type";s:6:"framed";}',95,1025284618); # -------------------------------------------------------- --- 199,221 ---- INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (131,5,'PHPSlash Poll',1200,'','','<!-- START: pollDisplay.tpl -->\n <form action="/pollAdmin.php">\n <input type=hidden name=question_id value="">\n <FONT SIZE=-1 face="arial,helvetica">\n <b></b><BR>\n \n <input type=submit value=Vote> \n [ <a href="">Results</a> \n | <a href="/pollAdmin.php">Polls</a> ]\n <br>Comments: <b></b> | Votes: <b></b>\n </FONT>\n </form>\n<!-- END: pollDisplay.tpl -->\n','a:2:{s:5:"width";s:3:"160";s:6:"column";s:5:"right";}','',990021726); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (139,7,'Sections',3600,'','','','a:2:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";}',99,990019226); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (130,4,'%%',3600,'','','','a:2:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";}',89,990019226); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (140,8,'Interview Topics',3600,'','section=interviews','','a:3:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";s:0:"";s:0:"";}',90,975030554); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (141,8,'Feature Topics',3600,'','section=features','','a:3:{s:5:"width";s:3:"160";s:6:"column";s:5:"right";s:0:"";s:0:"";}',90,975030541); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (142,8,'Topics',3600,'','section=Home','','a:2:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";}',90,990019226); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (143,6,'Got Foo?',3600,'','query=foo','','a:3:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";s:0:"";s:0:"";}',50,990019226); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (144,6,'Most Popular Stories',3600,'','order=hits','','a:2:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";}',60,990019226); ! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (145,6,'Older Stories',3600,'','start=5&max=5','','a:2:{s:6:"column";s:5:"right";s:5:"width";s:3:"160";}',30,990019227); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (148,1,'Administration','','','','<BR><BR>A bunch of cool things like latest site activity and stats should go here. <BR> But until they do, just pick something from the NavBar and go about your duties...<BR><BR>','a:3:{s:6:"column";s:6:"center";s:5:"perms";s:4:"user";s:0:"";s:0:"";}',90,1025284604); INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (149,12,'Tasks','','','menu_ary=menuadmin&tpl=navbarBlockh','','a:4:{s:6:"column";s:6:"center";s:5:"width";s:4:"100%";s:5:"perms";s:4:"user";s:8:"box_type";s:6:"framed";}',95,1025284618); + INSERT INTO psl_block VALUES (150,15,'Page - public - header',0,'','','','a:2:{s:6:\"column\";s:3:\"top\";s:8:\"box_type\";s:11:\"contentonly\";}',90,1050617309); + INSERT INTO psl_block VALUES (151,16,'Page - public - footer',0,'','','','a:2:{s:6:\"column\";s:6:\"bottom\";s:8:\"box_type\";s:11:\"contentonly\";}',5,1050617309); + INSERT INTO psl_block VALUES (152,17,'Page - public - topicbar',0,'','','','a:2:{s:6:\"column\";s:3:\"top\";s:8:\"box_type\";s:11:\"contentonly\";}',80,1050617308); + INSERT INTO psl_block VALUES (153,12,'Page - public - nav - top',0,'','tpl=navbar','','a:2:{s:6:\"column\";s:3:\"top\";s:8:\"box_type\";s:11:\"contentonly\";}',70,1050617309); + INSERT INTO psl_block VALUES (154,12,'Page - public - nav - foot',0,'','tpl=navbarFooter','','a:2:{s:6:\"column\";s:6:\"bottom\";s:8:\"box_type\";s:11:\"contentonly\";}',10,1050617309); + INSERT INTO psl_block VALUES (155,18,'Page - public - module',0,'','','','a:2:{s:6:\"column\";s:6:\"center\";s:8:\"box_type\";s:11:\"contentonly\";}',90,1050617306); + INSERT INTO psl_block VALUES (156,19,'Page - public',0,'','','','a:2:{s:6:\"column\";s:4:\"page\";s:8:\"box_type\";s:11:\"contentonly\";}',0,1050617309); + INSERT INTO psl_block VALUES (157,18,'Page - admin - module',0,'','','','a:2:{s:6:\"column\";s:6:\"center\";s:8:\"box_type\";s:11:\"contentonly\";}',90,1050617309); + INSERT INTO psl_block VALUES (158,19,'Page - admin',0,'','','','a:2:{s:6:\"column\";s:4:\"page\";s:8:\"box_type\";s:11:\"contentonly\";}',0,1050617309); # -------------------------------------------------------- *************** *** 240,243 **** --- 249,257 ---- INSERT INTO psl_block_type (id, name) VALUES (12,'navbar'); INSERT INTO psl_block_type (id, name) VALUES (13,'submission'); + INSERT INTO psl_block_type VALUES (15,'header'); + INSERT INTO psl_block_type VALUES (16,'footer'); + INSERT INTO psl_block_type VALUES (17,'topicbar'); + INSERT INTO psl_block_type VALUES (18,'module'); + INSERT INTO psl_block_type VALUES (19,'page'); # -------------------------------------------------------- *************** *** 813,832 **** # ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (108,'',3); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (242,131,3); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (234,130,3); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (263,141,5); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (278,139,4); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (277,139,3); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (276,139,5); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (261,140,4); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (268,142,3); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (279,139,7); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (239,144,4); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (238,144,3); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (244,147,8); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (1,148,8); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (320,149,8); ! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES (319,149,9); # -------------------------------------------------------- --- 827,882 ---- # ! INSERT INTO psl_section_block_lut VALUES (242,131,3); ! INSERT INTO psl_section_block_lut VALUES (234,130,3); ! INSERT INTO psl_section_block_lut VALUES (263,141,5); ! INSERT INTO psl_section_block_lut VALUES (278,139,4); ! INSERT INTO psl_section_block_lut VALUES (277,139,3); ! INSERT INTO psl_section_block_lut VALUES (276,139,5); ! INSERT INTO psl_section_block_lut VALUES (261,140,4); ! INSERT INTO psl_section_block_lut VALUES (268,142,3); ! INSERT INTO psl_section_block_lut VALUES (279,139,7); ! INSERT INTO psl_section_block_lut VALUES (239,144,4); ! INSERT INTO psl_section_block_lut VALUES (238,144,3); ! INSERT INTO psl_section_block_lut VALUES (244,147,8); ! INSERT INTO psl_section_block_lut VALUES (1,148,8); ! INSERT INTO psl_section_block_lut VALUES (320,149,8); ! INSERT INTO psl_section_block_lut VALUES (319,149,9); ! INSERT INTO psl_section_block_lut VALUES (281,150,9); ! INSERT INTO psl_section_block_lut VALUES (282,150,5); ! INSERT INTO psl_section_block_lut VALUES (283,150,3); ! INSERT INTO psl_section_block_lut VALUES (284,150,4); ! INSERT INTO psl_section_block_lut VALUES (285,150,7); ! INSERT INTO psl_section_block_lut VALUES (286,150,8); ! INSERT INTO psl_section_block_lut VALUES (287,151,9); ! INSERT INTO psl_section_block_lut VALUES (288,151,5); ! INSERT INTO psl_section_block_lut VALUES (289,151,3); ! INSERT INTO psl_section_block_lut VALUES (290,151,4); ! INSERT INTO psl_section_block_lut VALUES (291,151,7); ! INSERT INTO psl_section_block_lut VALUES (292,151,8); ! INSERT INTO psl_section_block_lut VALUES (333,152,8); ! INSERT INTO psl_section_block_lut VALUES (332,152,7); ! INSERT INTO psl_section_block_lut VALUES (331,152,4); ! INSERT INTO psl_section_block_lut VALUES (330,152,3); ! INSERT INTO psl_section_block_lut VALUES (329,152,5); ! INSERT INTO psl_section_block_lut VALUES (339,153,8); ! INSERT INTO psl_section_block_lut VALUES (338,153,7); ! INSERT INTO psl_section_block_lut VALUES (337,153,4); ! INSERT INTO psl_section_block_lut VALUES (336,153,3); ! INSERT INTO psl_section_block_lut VALUES (335,153,5); ! INSERT INTO psl_section_block_lut VALUES (334,153,9); ! INSERT INTO psl_section_block_lut VALUES (316,154,9); ! INSERT INTO psl_section_block_lut VALUES (317,154,5); ! INSERT INTO psl_section_block_lut VALUES (318,154,3); ! INSERT INTO psl_section_block_lut VALUES (321,156,5); ! INSERT INTO psl_section_block_lut VALUES (322,156,3); ! INSERT INTO psl_section_block_lut VALUES (323,156,4); ! INSERT INTO psl_section_block_lut VALUES (324,156,7); ! INSERT INTO psl_section_block_lut VALUES (325,155,5); ! INSERT INTO psl_section_block_lut VALUES (326,155,3); ! INSERT INTO psl_section_block_lut VALUES (327,155,4); ! INSERT INTO psl_section_block_lut VALUES (328,155,7); ! INSERT INTO psl_section_block_lut VALUES (340,157,9); ! INSERT INTO psl_section_block_lut VALUES (341,158,9); ! # -------------------------------------------------------- |