phpslash-commit Mailing List for phpSlash (Page 47)

Brought to you by: joestewart, nhruby

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

Flat | Threaded

<< < 1 .. 45 46 47 48 49 .. 109 > >> (Page 47 of 109)

[Phpslash-commit] CVS: phpslash-dev/include/templates/en/default authorNew.tpl,1.2,1.3 blockEdit.tpl,1.1.1.1,1.2

From: Joe S. <joe...@us...> - 2003-05-15 21:19:33

Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/default
In directory sc8-pr-cvs1:/tmp/cvs-serv25115/phpslash-dev/include/templates/en/default

Modified Files:
	authorNew.tpl blockEdit.tpl 
Log Message:
tweaks of previous updates

Index: authorNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/default/authorNew.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** authorNew.tpl	21 Apr 2003 20:18:51 -0000	1.2
--- authorNew.tpl	15 May 2003 21:15:02 -0000	1.3
***************
*** 33,45 ****
    {OPTIONS}
    <TR>
-     <TD>
-       <INPUT TYPE=text name={OPTION_NAME} value="{OPTION_NAME_VAL}" size=20>
-     </TD>
-     <TD>
-       <INPUT TYPE=text name={OPTION_VALUE} value="{OPTION_VALUE_VAL}" size=20>
-     </TD>
-   </TR>
-   <!-- END each_option -->
-   <TR>
      <TD valign=top><B>Security</B><FONT COLOR=RED>*</FONT></TD>
      <TD valign=top>
--- 33,36 ----

Index: blockEdit.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/default/blockEdit.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** blockEdit.tpl	12 Mar 2003 16:12:53 -0000	1.1.1.1
--- blockEdit.tpl	15 May 2003 21:15:02 -0000	1.2
***************
*** 69,90 ****
      <TD> <b>Variable Value</b> </TD>
    </TR>
!   <!-- BEGIN each_default_option -->
!   <TR>
!     <TD>
!       <INPUT TYPE=hidden name={DOPTION_NAME} value="{DOPTION_NAME_VAL}"><B>{DOPTION_NAME_VAL}</B></TD>
!     <TD>
!       <INPUT TYPE=text name={DOPTION_VALUE} value="{DOPTION_VALUE_VAL}" size=20>    </TD>
!   </TR>
!   <!-- END each_default_option -->
!   <!-- BEGIN each_option -->
!   <TR>
!     <TD>
!       <INPUT TYPE=text name={OPTION_NAME} value="{OPTION_NAME_VAL}" size=20>
!     </TD>
!     <TD>
!       <INPUT TYPE=text name={OPTION_VALUE} value="{OPTION_VALUE_VAL}" size=20>
!     </TD>
!   </TR>
!   <!-- END each_option -->
    <TR>
      <TD>&nbsp;</TD>
--- 69,73 ----
      <TD> <b>Variable Value</b> </TD>
    </TR>
!   {OPTIONS}
    <TR>
      <TD>&nbsp;</TD>

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.16,1.17

From: Joe S. <joe...@us...> - 2003-05-15 21:19:32

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1:/tmp/cvs-serv25115/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
tweaks of previous updates

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CHANGES	15 May 2003 19:34:53 -0000	1.16
--- CHANGES	15 May 2003 21:15:02 -0000	1.17
***************
*** 13,17 ****
   9 - Removal of something (kill -9 :)
  
! 2003-April-28 2:30PM CDT Joe Stewart <joe...@us...>
  [W] - index.php - specify module page w/page GET variable.
        profile.php - use Author module index page.
--- 13,22 ----
   9 - Removal of something (kill -9 :)
  
! 2003-March 15 4:00PM CDT Joe Stewart <joe...@us...>
! [WT] - sectionAdmin.php - Don't attempt to display section being edited.
!        login.php - display page the same method as index page.
!        slash-all.sql - Administration block and Mailing list title.
! 
! 2003-March 15 2:30PM CDT Joe Stewart <joe...@us...>
  [W] - index.php - specify module page w/page GET variable.
        profile.php - use Author module index page.
***************
*** 19,23 ****
        submissionAdmin.php, topicAdmin.php - use module admin page.
  
! 2003-April-28 2:30PM CDT Joe Stewart <joe...@us...>
  [ET] - Large commit to test further use of page blocks and module sections.
         Significant number of blocks added require loading of slash-all.sql. 
--- 24,28 ----
        submissionAdmin.php, topicAdmin.php - use module admin page.
  
! 2003-March 15 2:30PM CDT Joe Stewart <joe...@us...>
  [ET] - Large commit to test further use of page blocks and module sections.
         Significant number of blocks added require loading of slash-all.sql.

[Phpslash-commit] CVS: phpslash-dev/public_html login.php,1.1.1.1,1.2

From: Joe S. <joe...@us...> - 2003-05-15 21:19:18

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv25115/phpslash-dev/public_html

Modified Files:
	login.php 
Log Message:
tweaks of previous updates

Index: login.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/login.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** login.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- login.php	15 May 2003 21:15:02 -0000	1.2
***************
*** 2,15 ****
  // $Id$
  
  // don't cache this page
  $cachetimeout=-1;
  
! 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
! 
! // page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
  
  if (isset($HTTP_POST_VARS['cancel'])) {
     $sess->delete();
--- 2,14 ----
  // $Id$
  
+ $HTTP_GET_VARS['section'] = 'User';
+ 
  // don't cache this page
  $cachetimeout=-1;
  
! 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 (isset($HTTP_POST_VARS['cancel'])) {
     $sess->delete();
***************
*** 50,129 ****
  }
  */
  $auth->login_if(!$perm->have_perm('user'));
  
  // Objects
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
  include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
  $block = pslNew("Block_i");
- // $db    = pslNew("slashDB");
  
  // Start of Page
- $ary = array();
- if(!empty($HTTP_GET_VARS)) {
-    $ary = clean($HTTP_GET_VARS);
- }
- 
- if ((empty($ary['section'])) AND (empty($ary['section_id']))){
-    $section = $_PSL['site_homesection'];
-    if(!$section) {
-       $section = "Home";
-    }
-    $ary['section'] = $section;
- } else {
-    $pagetitle .= $ary['section'];
- }
  
! // $ary['section'] = "Admin";  // Some may prefer these blocks.
! $ary['section'] = "User";
! $ary['section_id'] = "";
! 
! $breadcrumb = breadcrumb( $ary);
! 
! $_PSL['metatags']['object'] = $xsiteobject;
! 
! slashhead($pagetitle,$_PSL['metatags']);
! 
! // $allstories   = $story->getStories($ary);
! $allstories   = '';
! $leftblocks   = $block->getBlocks($ary, "left");
! $centerblocks = $block->getBlocks($ary, "center");
! $rightblocks  = $block->getBlocks($ary, "right");
! 
! // TODO: Please tell me what the below does :)
! 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",$_PSL['templatedir']);
! $template->debug = 0;
! $template->set_file(array(
!    'index'  => $tplfile //"index3col.tpl"
! ));
!  
! $template->set_var(array(
!    'ROOTDIR'      => $_PSL['rooturl'],
!    'IMAGEDIR'     => $_PSL['imageurl'],
!    'BREADCRUMB'   => $breadcrumb,
!    'STORY_COLUMN' => $allstories,
!    'LEFT_BLOCK_COLUMN'    => $leftblocks,
!    'CENTER_BLOCK_COLUMN'  => $centerblocks,
!    'RIGHT_BLOCK_COLUMN'   => $rightblocks
! ));
  
! $template->parse('OUT',"index");
! $template->p('OUT');
  
- slashfoot();
  page_close();
  ?>
--- 49,78 ----
  }
  */
+ 
  $auth->login_if(!$perm->have_perm('user'));
  
+ /*
+ if(!empty($HTTP_GET_VARS['login'])) {
+   $auth->login_if($HTTP_GET_VARS['login']);
+ }
+ */
+ $_PSL['metatags']['object'] = $xsiteobject;
+ 
  // Objects
  
+ // $ary['section'] = 'User';
+ // $ary['page'] = 'index';
+ 
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
  include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
  $block = pslNew("Block_i");
  
  // Start of Page
  
! $content = $block->getBlocks($ary, "page");
  
! echo $content;
  
  page_close();
  ?>

[Phpslash-commit] CVS: phpslash-dev/tables/0.7 slash-all.sql,1.4,1.5

From: Joe S. <joe...@us...> - 2003-05-15 21:19:07

Update of /cvsroot/phpslash/phpslash-dev/tables/0.7
In directory sc8-pr-cvs1:/tmp/cvs-serv25115/phpslash-dev/tables/0.7

Modified Files:
	slash-all.sql 
Log Message:
tweaks of previous updates

Index: slash-all.sql
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.7/slash-all.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** slash-all.sql	15 May 2003 18:19:56 -0000	1.4
--- slash-all.sql	15 May 2003 21:15:03 -0000	1.5
***************
*** 212,216 ****
  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,1053009560);
  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',0,'','','','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',0,'','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 (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (150,15,'Page - public - header',0,'','','','a:3:{s:6:\"column\";s:3:\"top\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";}',95,NULL);
--- 212,216 ----
  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,1053009560);
  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',0,'','','<p>A bunch of cool things like latest site activity and stats should go here.  </p>\n <p>But until they do, just pick something from the NavBar and go about your duties...</p>\n','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',0,'','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 (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (150,15,'Page - public - header',0,'','','','a:3:{s:6:\"column\";s:3:\"top\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";}',95,NULL);
***************
*** 230,234 ****
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (160,18,'Module - Glossary',0,'','','','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";s:6:\"module\";s:8:\"Glossary\";}',90,NULL);
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (161,18,'Module - About page',0,'','','','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";s:6:\"module\";s:5:\"About\";}',90,NULL);
! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (162,18,'Module - Mailinglist',0,'','','','a:3:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:11:\"MailingList\";}',90,NULL);
  
  --
--- 230,234 ----
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (160,18,'Module - Glossary',0,'','','','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";s:6:\"module\";s:8:\"Glossary\";}',90,NULL);
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (161,18,'Module - About page',0,'','','','a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";s:6:\"module\";s:5:\"About\";}',90,NULL);
! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (162,18,'Mailinglist',0,'','','','a:3:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:0:\"\";s:6:\"module\";s:11:\"MailingList\";}',90,NULL);
  
  --

[Phpslash-commit] CVS: phpslash-dev ChangeLog,1.1,1.2

From: Joe S. <joe...@us...> - 2003-05-15 19:36:12

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1:/tmp/cvs-serv27267/phpslash-dev

Modified Files:
	ChangeLog 
Log Message:
update to use module pages

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChangeLog	15 May 2003 18:33:16 -0000	1.1
--- ChangeLog	15 May 2003 19:36:08 -0000	1.2
***************
*** 1,2 ****
--- 1,17 ----
+ 2003-05-15 14:34  joestewart
+ 
+ 	* CHANGES, public_html/index.php, public_html/profile.php,
+ 	public_html/admin/authorAdmin.php,
+ 	public_html/admin/blockAdmin.php,
+ 	public_html/admin/glossaryAdmin.php,
+ 	public_html/admin/pollAdmin.php,
+ 	public_html/admin/sectionAdmin.php,
+ 	public_html/admin/submissionAdmin.php,
+ 	public_html/admin/topicAdmin.php: update to use module pages
+ 
+ 2003-05-15 13:33  joestewart
+ 
+ 	* ChangeLog: module sections
+ 
  2003-05-15 13:19  joestewart

[Phpslash-commit] CVS: phpslash-dev/public_html/admin authorAdmin.php,1.1.1.1,1.2 blockAdmin.php,1.2,1.3 glossaryAdmin.php,1.1.1.1,1.2 pollAdmin.php,1.1.1.1,1.2 sectionAdmin.php,1.1.1.1,1.2 submissionAdmin.php,1.1.1.1,1.2 topicAdmin.php,1.1.1.1,1.2

From: Joe S. <joe...@us...> - 2003-05-15 19:34:57

Update of /cvsroot/phpslash/phpslash-dev/public_html/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv26212/phpslash-dev/public_html/admin

Modified Files:
	authorAdmin.php blockAdmin.php glossaryAdmin.php pollAdmin.php 
	sectionAdmin.php submissionAdmin.php topicAdmin.php 
Log Message:
update to use module pages

Index: authorAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/authorAdmin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** authorAdmin.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- authorAdmin.php	15 May 2003 19:34:54 -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('Author') .' '. pslgetText('Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Author') .' '. pslgetText('Administration Page'); // This Defines The META Tag Object Type
  
  if(!empty($HTTP_GET_VARS['login'])) {
***************
*** 11,21 ****
  }
  
  // Objects
  
! $_PSL['module']['module.current'] = $_PSL['module']['Author'];
  
! // 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'] = 'Author';
  
! $ary['section'] = 'Admin';
! $ary['page'] = 'admin';
  
  // setup the block module   
***************
*** 24,80 ****
  $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";
!    } 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();
  ?>

Index: blockAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/blockAdmin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** blockAdmin.php	15 May 2003 18:19:56 -0000	1.2
--- blockAdmin.php	15 May 2003 19:34:54 -0000	1.3
***************
*** 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('Block') .' '. pslgetText('Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Block') .' '. pslgetText('Administration Page'); // This Defines The META Tag Object Type
  
  if(!empty($HTTP_GET_VARS['login'])) {
***************
*** 11,21 ****
  }
  
  // Objects
  
! $_PSL['module']['module.current'] = $_PSL['module']['Block'];
  
! // 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'] = 'Block';
  
! $ary['section'] = 'Admin';
! $ary['page'] = 'admin';
  
  // setup the block module   
***************
*** 24,81 ****
  $block = pslNew("Block_i");
  
- 
- $ary['section'] = "Admin";
- // $ary['section_id'] = "9";
  // Start of Page
  
! $_PSL['metatags']['object'] = $xsiteobject;
! 
! // $allstories   = $story->getStories($ary);
! $topblocks    = $block->getBlocks($ary, "top");
! $leftblocks   = $block->getBlocks($ary, "left");
! $centerblocks = $block->getBlocks($ary, "center");
! $rightblocks  = $block->getBlocks($ary, "right");
! $bottomblocks = $block->getBlocks($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';
! }
! 
! $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,
!    'TOP'          => $topblocks,
!    'LEFT_BLOCK_COLUMN'    => $leftblocks,
!    'CENTER_BLOCK_COLUMN'  => $centerblocks,
!    'RIGHT_BLOCK_COLUMN'   => $rightblocks,
!    'BOTTOM'               => $bottomblocks
! ));
  
! $template->parse('OUT','index');
! $template->p('OUT');
  
  page_close();
--- 25,33 ----
  $block = pslNew("Block_i");
  
  // Start of Page
  
! $content = $block->getBlocks($ary, "page");
  
! echo $content;
  
  page_close();

Index: glossaryAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/glossaryAdmin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glossaryAdmin.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- glossaryAdmin.php	15 May 2003 19:34:54 -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('Glossary') .' '. pslgetText('Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Glossary') .' '. pslgetText('Administration 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   
! include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/admin.php");
! $allstories = $content;
  
  // setup the block module   
--- 11,22 ----
  }
  
+ $_PSL['metatags']['object'] = $xsiteobject;
+ 
  // Objects
  
! $ary['module'] = 'Glossary';
  
! $ary['section'] = 'Admin';
! $ary['page'] = 'admin';
  
  // setup the block module   
***************
*** 24,80 ****
  $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";
!    } 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();
  ?>

Index: pollAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/pollAdmin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pollAdmin.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- pollAdmin.php	15 May 2003 19:34:54 -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('Poll') .' '. pslgetText('Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Poll') .' '. pslgetText('Administration Page'); // This Defines The META Tag Object Type
  
  if(!empty($HTTP_GET_VARS['login'])) {
***************
*** 11,21 ****
  }
  
  // Objects
  
! $_PSL['module']['module.current'] = $_PSL['module']['Poll'];
  
! // 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'] = 'Poll';
  
! $ary['section'] = 'Admin';
! $ary['page'] = 'admin';
  
  // setup the block module   
***************
*** 24,79 ****
  $block = pslNew("Block_i");
  
- 
- $ary['section'] = "Admin";
  // 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",$_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();
  ?>

Index: sectionAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/sectionAdmin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sectionAdmin.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- sectionAdmin.php	15 May 2003 19:34:54 -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('Section') .' '. pslgetText('Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Section') .' '. pslgetText('Administration Page'); // This Defines The META Tag Object Type
  
  if(!empty($HTTP_GET_VARS['login'])) {
***************
*** 11,21 ****
  }
  
  // Objects
  
! $_PSL['module']['module.current'] = $_PSL['module']['Section'];
  
! // 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'] = 'Section';
  
! $ary['section'] = 'Admin';
! $ary['page'] = 'admin';
  
  // setup the block module   
***************
*** 24,80 ****
  $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";
!    } 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();
  ?>

Index: submissionAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/submissionAdmin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** submissionAdmin.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- submissionAdmin.php	15 May 2003 19:34:54 -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('Submission') .' '. pslgetText('Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Submission') .' '. pslgetText('Administration Page'); // This Defines The META Tag Object Type
  
  if(!empty($HTTP_GET_VARS['login'])) {
***************
*** 11,21 ****
  }
  
  // Objects
  
! $_PSL['module']['module.current'] = $_PSL['module']['Submission'];
  
! // 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'] = 'Submission';
  
! $ary['section'] = 'Admin';
! $ary['page'] = 'admin';
  
  // setup the block module   
***************
*** 24,80 ****
  $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";
!    } 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();
  ?>

Index: topicAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/topicAdmin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** topicAdmin.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- topicAdmin.php	15 May 2003 19:34:54 -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('Topic') .' '. pslgetText('Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Topic') .' '. pslgetText('Administration Page'); // This Defines The META Tag Object Type
  
  if(!empty($HTTP_GET_VARS['login'])) {
***************
*** 11,21 ****
  }
  
  // Objects
  
! $_PSL['module']['module.current'] = $_PSL['module']['Topic'];
  
! // 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'] = 'Topic';
  
! $ary['section'] = 'Admin';
! $ary['page'] = 'admin';
  
  // setup the block module   
***************
*** 24,79 ****
  $block = pslNew("Block_i");
  
- 
- $ary['section'] = "Admin";
  // 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",$_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();
  ?>

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.15,1.16

From: Joe S. <joe...@us...> - 2003-05-15 19:34:56

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1:/tmp/cvs-serv26212/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
update to use module pages

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CHANGES	15 May 2003 18:19:53 -0000	1.15
--- CHANGES	15 May 2003 19:34:53 -0000	1.16
***************
*** 14,17 ****
--- 14,23 ----
  
  2003-April-28 2:30PM CDT Joe Stewart <joe...@us...>
+ [W] - index.php - specify module page w/page GET variable.
+       profile.php - use Author module index page.
+       authorAdmin.php, glossaryAdmin.php, sectionAdmin.php, 
+       submissionAdmin.php, topicAdmin.php - use module admin page.
+ 
+ 2003-April-28 2:30PM CDT Joe Stewart <joe...@us...>
  [ET] - Large commit to test further use of page blocks and module sections.
         Significant number of blocks added require loading of slash-all.sql.

[Phpslash-commit] CVS: phpslash-dev/public_html index.php,1.3,1.4 profile.php,1.1.1.1,1.2

From: Joe S. <joe...@us...> - 2003-05-15 19:34:56

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv26212/phpslash-dev/public_html

Modified Files:
	index.php profile.php 
Log Message:
update to use module pages

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.php	15 May 2003 18:19:55 -0000	1.3
--- index.php	15 May 2003 19:34:53 -0000	1.4
***************
*** 17,24 ****
  // Is the page specified? - if not use module index.php
  $modulefilename =  'index.php';
  if(array_key_exists('page', $ary)) {
     $modulefilename =  basename($ary['page']) .".php";
  }
! 
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
--- 17,25 ----
  // Is the page specified? - if not use module index.php
  $modulefilename =  'index.php';
+ /*
  if(array_key_exists('page', $ary)) {
     $modulefilename =  basename($ary['page']) .".php";
  }
! */
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];

Index: profile.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/profile.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** profile.php	12 Mar 2003 16:12:56 -0000	1.1.1.1
--- profile.php	15 May 2003 19:34:53 -0000	1.2
***************
*** 4,9 ****
  require('config.php');
  
! $pagetitle   = pslgetText('Profile');       // The name to be displayed in the header
! $xsiteobject = pslgetText('Profile Page');  // This Defines The META Tag Object Type
  
  if(!empty($HTTP_GET_VARS['login'])) {
--- 4,9 ----
  require('config.php');
  
! $pagetitle   = pslgetText('User Profile') .' '. pslgetText('Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Profile') .' '. pslgetText('Administration Page'); // This Defines The META Tag Object Type
  
  if(!empty($HTTP_GET_VARS['login'])) {
***************
*** 11,20 ****
  }
  
  // Objects
  
! $_PSL['module']['module.current'] = $_PSL['module']['Author'];
  
! // get content from the module   
! $allstories = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
  
  // setup the block module   
--- 11,22 ----
  }
  
+ $_PSL['metatags']['object'] = $xsiteobject;
+ 
  // Objects
  
! $ary['module'] = 'Author';
  
! $ary['section'] = 'User';
! $ary['page'] = 'index';
  
  // setup the block module   
***************
*** 25,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();
  ?>
--- 27,34 ----
  // Start of Page
  
+ $content = $block->getBlocks($ary, "page");
  
! echo $content;
  
  page_close();
  ?>

[Phpslash-commit] CVS: phpslash-dev/include/class functions.inc,1.3,1.4 lib.resources.php,1.1.1.1,1.2 slashAuthCR.class,1.3,1.4 tz.class,1.1.1.1,1.2

From: Joe S. <joe...@us...> - 2003-05-15 18:55:23

Update of /cvsroot/phpslash/phpslash-dev/include/class
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/class

Modified Files:
	functions.inc lib.resources.php slashAuthCR.class tz.class 
Log Message:
module sections

Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/class/functions.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** functions.inc	23 Apr 2003 15:40:15 -0000	1.3
--- functions.inc	15 May 2003 18:19:53 -0000	1.4
***************
*** 568,571 ****
--- 568,576 ----
     }
  
+    // Are there extra tags/variables to pass to template?
+    if(!is_array($extra_ary) && array_key_exists('extra_ary',$_PSL)) {
+       $extra_ary = $_PSL['extra_ary'];
+    }
+ 
     // parse extra array into template variable placeholder and value
     if( is_array($extra_ary)) {
***************
*** 585,590 ****
        'SITETITLE'         => $title,
        'SEARCH_ACTION_URL' => $action_url,
!       'NAVBAR'            => $navbarcontent,   // Could be empty if NavBar is not required
!       'TOPICBAR'          => $topicbarcontent, // Could be empty if TopicBar is not required
        'SKIN'              => $_PSL['skin']
     ));
--- 590,595 ----
        'SITETITLE'         => $title,
        'SEARCH_ACTION_URL' => $action_url,
!       // 'NAVBAR'            => $navbarcontent,   // Could be empty if NavBar is not required
!       // 'TOPICBAR'          => $topicbarcontent, // Could be empty if TopicBar is not required
        'SKIN'              => $_PSL['skin']
     ));
***************
*** 832,836 ****
        }
     
!       if ($ary['topic_id'] != "") {
  
           $template->set_var(array(
--- 837,841 ----
        }
     
!       if (!empty($ary['topic_id'])) {
  
           $template->set_var(array(

Index: lib.resources.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/class/lib.resources.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** lib.resources.php	12 Mar 2003 16:12:50 -0000	1.1.1.1
--- lib.resources.php	15 May 2003 18:19:53 -0000	1.2
***************
*** 161,165 ****
     $urnPieces = parse_urn($repUrn);
     // debug("$fn:pieces",$urnPieces);
!    if ('class' == $urnPieces['NID']) {
        $answer = $urnPieces['NSS'];
     }
--- 161,165 ----
     $urnPieces = parse_urn($repUrn);
     // debug("$fn:pieces",$urnPieces);
!    if (!empty($urnPieces['NID']) && 'class' == $urnPieces['NID']) {
        $answer = $urnPieces['NSS'];
     }
***************
*** 460,464 ****
     $fc = "$fn(\"$urn\",\"$key\")";
     // debug($fc,"begin");
!    $answer = $GLOBALS['_PSL']['resources'][$urn][$key];
     // debug("$fc:answer",$answer);
     return $answer;
--- 460,467 ----
     $fc = "$fn(\"$urn\",\"$key\")";
     // debug($fc,"begin");
!    $answer = '';
!    if( !empty($GLOBALS['_PSL']['resources'][$urn][$key])) {
!       $answer = $GLOBALS['_PSL']['resources'][$urn][$key];
!    }
     // debug("$fc:answer",$answer);
     return $answer;
***************
*** 498,500 ****
  }
  
! ?>
\ No newline at end of file
--- 501,503 ----
  }
  
! ?>

Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/class/slashAuthCR.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4

Index: tz.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/class/tz.class,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** tz.class	12 Mar 2003 16:12:50 -0000	1.1.1.1
--- tz.class	15 May 2003 18:19:53 -0000	1.2
***************
*** 48,52 ****
  	 */
  	var $show_format; 
! 	
  	/**
  	 * constructor
--- 48,62 ----
  	 */
  	var $show_format; 
! 
!    /**
! 	 * @var string file path to zone.tab file
! 	 */
!    var $zone_file;
! 
!    /**
! 	 * @var string file path to iso3166.tab file
! 	 */
!    var $country_file;
!    
  	/**
  	 * constructor

[Phpslash-commit] CVS: phpslash-dev/include/modules/block/blocktypes Block_render_poll.class,1.1.1.1,1.2 Block_render_query.class,1.1.1.1,1.2 Block_render_rss.class,1.1.1.1,1.2

From: Joe S. <joe...@us...> - 2003-05-15 18:44:53

Update of /cvsroot/phpslash/phpslash-dev/include/modules/block/blocktypes
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/modules/block/blocktypes

Modified Files:
	Block_render_poll.class Block_render_query.class 
	Block_render_rss.class 
Log Message:
module sections

Index: Block_render_poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/blocktypes/Block_render_poll.class,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Block_render_poll.class	12 Mar 2003 16:12:55 -0000	1.1.1.1
--- Block_render_poll.class	15 May 2003 18:19:54 -0000	1.2
***************
*** 19,25 ****
    function parse($block_info) {
    
!     global $_PSL;
  
      AddClassRequirement("poll",$_PSL['moduledir'] . "/poll/Poll.class");
    
      $this->poll = pslNew("Poll");
--- 19,27 ----
    function parse($block_info) {
    
!     global $_PSL, $ary;
  
      AddClassRequirement("poll",$_PSL['moduledir'] . "/poll/Poll.class");
+   
+     $ary['module'] = "Poll";
    
      $this->poll = pslNew("Poll");

Index: Block_render_query.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/blocktypes/Block_render_query.class,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Block_render_query.class	12 Mar 2003 16:12:55 -0000	1.1.1.1
--- Block_render_query.class	15 May 2003 18:19:54 -0000	1.2
***************
*** 78,81 ****
--- 78,83 ----
                 }
              } elseif ( (!empty($ary['section'])) AND ( $ary['section'] != $site_homesection))  {
+           AddClassRequirement("section",$this->psl['moduledir']  ."/section/Section.class");
+ 
  	       $section = pslNew("Section");
  	       $section_name = $section->getId($ary['section']);
***************
*** 85,88 ****
--- 87,91 ----
                 $story_id .= $amp . 'topic_id=' . $ary['topic_id'];
              } elseif (!empty($ary['topic'])) {
+           AddClassRequirement("topic",$this->psl['moduledir']  ."/topic/Topic.class");
  	       $topic = pslNew("Topic");
  	       $topic_name = $topic->getId($ary['topic']);

Index: Block_render_rss.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/blocktypes/Block_render_rss.class,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Block_render_rss.class	12 Mar 2003 16:12:55 -0000	1.1.1.1
--- Block_render_rss.class	15 May 2003 18:19:54 -0000	1.2
***************
*** 1,550 ****
! <?php
! /* Block_render_rss.class -> Methods for parsing RSS 0.91 data */
! /* $Id$ */
! 
!  /*
!  * BLOCK OPTIONS USED
!  * target = [_blank],_self etc
!  * max_items = 10
!  * tpl    = alternate template ( no .tpl extension) [rssblock]
!  * title  = none - dont display title or image, even if they are available
[...1088 lines suppressed...]
! 	 }
!          return false;
!       }
! 
!    }
! 
!    /**
!    * Returns block title (for use with dynamic blcok titles)
!    *
!    * This wont work until object values are saved between the two stages of rendering a block.
!    * - it currently returns an empty string
!    *
!    * @return htmlstring
!    */
!    function getTitle() {
!       // debug("rss::parse::getTitle", $this->title);
!       return $this->title;
!    }
! }
! ?>

[Phpslash-commit] CVS: phpslash-dev/include/modules/mailinglist admin.php,1.3,1.4 index.php,1.2,1.3

From: Joe S. <joe...@us...> - 2003-05-15 18:44:44

Update of /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/modules/mailinglist

Modified Files:
	admin.php index.php 
Log Message:
module sections

Index: admin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist/admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** admin.php	21 Apr 2003 15:00:17 -0000	1.3
--- admin.php	15 May 2003 18:19:54 -0000	1.4
***************
*** 7,10 ****
--- 7,14 ----
  $ary = $GLOBALS['ary'];
  
+ global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $auth, $perm;
+ 
+ $ary = $GLOBALS['ary'];
+ 
  AddClassRequirement("mailinglist",$_PSL['moduledir'] . "/mailinglist/MailingList.class");
  

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	17 Apr 2003 23:31:00 -0000	1.2
--- index.php	15 May 2003 18:19:54 -0000	1.3
***************
*** 7,10 ****
--- 7,14 ----
  $ary = $GLOBALS['ary'];
  
+ global $_PSL, $HTTP_POST_VARS;
+ 
+ $ary = $GLOBALS['ary'];
+ 
  AddClassRequirement("mailinglist",$_PSL['moduledir'] . "/mailinglist/MailingList.class");

[Phpslash-commit] CVS: phpslash-dev/include/modules/poll index.php,1.2,1.3

From: Joe S. <joe...@us...> - 2003-05-15 18:44:44

Update of /cvsroot/phpslash/phpslash-dev/include/modules/poll
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/modules/poll

Modified Files:
	index.php 
Log Message:
module sections

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/poll/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	17 Apr 2003 23:31:00 -0000	1.2
--- index.php	15 May 2003 18:19:54 -0000	1.3
***************
*** 7,10 ****
--- 7,14 ----
  $ary = $GLOBALS['ary'];
  
+ global $_PSL, $HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_SERVER_VARS;
+ 
+ $ary = $GLOBALS['ary'];
+ 
  AddClassRequirement("poll",$_PSL['moduledir'] . "/poll/Poll.class");

[Phpslash-commit] CVS: phpslash-dev/include/modules/section Section.class,1.1.1.1,1.2 admin.php,1.1.1.1,1.2

From: Joe S. <joe...@us...> - 2003-05-15 18:44:35

Update of /cvsroot/phpslash/phpslash-dev/include/modules/section
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/modules/section

Modified Files:
	Section.class admin.php 
Log Message:
module sections

Index: Section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/section/Section.class,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Section.class	12 Mar 2003 16:12:56 -0000	1.1.1.1
--- Section.class	15 May 2003 18:19:54 -0000	1.2
***************
*** 20,28 ****
  
       $this->db = pslNew("slashDB");
!      $this->psl = $_PSL;
       $this->message = '';
  
       /* Templates */
!      $this->sec_templ = pslNew("slashTemplate",$this->psl['templatedir']);
       $this->sec_templ->debug = 0;
       $this->sec_templ->set_file(array(
--- 20,28 ----
  
       $this->db = pslNew("slashDB");
!      $this->psl = &$_PSL;
       $this->message = '';
  
       /* Templates */
!      $this->sec_templ = pslNew("slashTemplate");
       $this->sec_templ->debug = 0;
       $this->sec_templ->set_file(array(
***************
*** 207,211 ****
           $q = "DELETE FROM psl_section where section_id = '$section_id'";
           $this->db->query($q);
! 	 $this->message .= pslgetText(sprintf("Section %s(%s) deleted", $section_name, $section_id));
           return true;
        }
--- 207,211 ----
           $q = "DELETE FROM psl_section where section_id = '$section_id'";
           $this->db->query($q);
! 	      $this->message .= pslgetText(sprintf("Section %s(%s) deleted", $section_name, $section_id));
           return true;
        }
***************
*** 225,229 ****
  
           $this->sec_templ->set_var(array(
! 	    'TITLEBAR'     => getTitlebar("100%","New Section"),
              'ACTION_URL'   => $this->psl['phpself'],
              'SECTION_NAME' => "",
--- 225,229 ----
  
           $this->sec_templ->set_var(array(
! 	         'TITLEBAR'     => getTitlebar("100%","New Section"),
              'ACTION_URL'   => $this->psl['phpself'],
              'SECTION_NAME' => "",
***************
*** 231,241 ****
           ));
  
! 	 $this->sec_templ = displayoptions('section', $this->sec_templ, "newsection", '');
  	 
        } else {
  	 
! 	 $q = "SELECT * 
                   FROM psl_section 
! 	        WHERE section_id = '$ary[section_id]'";
           $this->db->query($q);
           $this->db->next_record();
--- 231,242 ----
           ));
  
! 	      $options = displayOptions('section', $this->sec_templ, "newsection", '');
  	 
+     
        } else {
  	 
! 	      $q = "SELECT * 
                   FROM psl_section 
! 	             WHERE section_id = '$ary[section_id]'";
           $this->db->query($q);
           $this->db->next_record();
***************
*** 243,248 ****
           $this->sec_templ->set_block("newsection","each_option", "options");
  	 
! 	 $this->sec_templ->set_var(array(
! 	    'TITLEBAR'     => getTitlebar("100%","Edit Section"),
              'SECTION_ID'   => $this->db->Record['section_id'],
              'SECTION_NAME' => $this->db->Record['section_name'],
--- 244,249 ----
           $this->sec_templ->set_block("newsection","each_option", "options");
  	 
! 	      $this->sec_templ->set_var(array(
! 	         'TITLEBAR'     => getTitlebar("100%","Edit Section"),
              'SECTION_ID'   => $this->db->Record['section_id'],
              'SECTION_NAME' => $this->db->Record['section_name'],
***************
*** 250,260 ****
           ));
           
! 	 // options
! 	 $temparray = unserialize($this->db->Record['section_options']);
           if (is_array($temparray)) {
              reset($temparray);
           }
  
! 	 $this->sec_templ = displayoptions('section', $this->sec_templ, "newsection", $temparray);
        }
  
--- 251,262 ----
           ));
           
! 	      // options
! 	      $temparray = unserialize($this->db->Record['section_options']);
           if (is_array($temparray)) {
              reset($temparray);
           }
  
! 	      $options = displayOptions('section', $this->sec_templ, "newsection", $temparray);
!          $this->sec_templ->set_var('OPTIONS', $options);
        }
  

Index: admin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/section/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:56 -0000	1.1.1.1
--- admin.php	15 May 2003 18:19:54 -0000	1.2
***************
*** 2,6 ****
  // $Id$
  
! AddClassRequirement("section",$_PSL['moduledir']  ."/". $_PSL['module']['module.current'] ."/Section.class");
  
  # header title
--- 2,10 ----
  // $Id$
  
! global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $auth, $perm;
! 
! $ary = $GLOBALS['ary'];
! 
! AddClassRequirement("section",$_PSL['moduledir']  ."/section/Section.class");
  
  # header title
***************
*** 49,64 ****
           if ($perm->have_perm("sectionEdit")) {
              $ary["section_id"] = $section_id;
! 	 }
! 	 break;
        case "update":
           if ($perm->have_perm("sectionSave")) {
!             $success = $section->saveSection(clean($HTTP_POST_VARS,true));
! 	    debug("message", $section->getMessage());
! 	    if($success) {
                 $content .= getMessage($section->getMessage());
! 	    } else {
                 $content .= getError($section->getMessage());
! 	    }
! 	 }
           break;
        default:
--- 53,68 ----
           if ($perm->have_perm("sectionEdit")) {
              $ary["section_id"] = $section_id;
! 	      }
! 	      break;
        case "update":
           if ($perm->have_perm("sectionSave")) {
!             $success = $section->saveSection($HTTP_POST_VARS);
! 	         debug("message", $section->getMessage());
! 	         if($success) {
                 $content .= getMessage($section->getMessage());
! 	         } else {
                 $content .= getError($section->getMessage());
! 	         }
! 	      }
           break;
        default:

[Phpslash-commit] CVS: phpslash-dev/include/modules/story Story.class,1.3,1.4 admin.php,1.1.1.1,1.2 index.php,1.2,1.3

From: Joe S. <joe...@us...> - 2003-05-15 18:44:34

Update of /cvsroot/phpslash/phpslash-dev/include/modules/story
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/modules/story

Modified Files:
	Story.class admin.php index.php 
Log Message:
module sections

Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/Story.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Story.class	28 Apr 2003 15:26:53 -0000	1.3
--- Story.class	15 May 2003 18:19:54 -0000	1.4
***************
*** 302,306 ****
        }
        
!       $name_mod = implode('', $argv_ary);
        $story_name = basename($this->psl['languagefile']) . $this->psl['skin'] ."story" . $name_mod;
        $cache_ary[$story_name]['expire'] = $cache_ary['story']['expire'];
--- 302,310 ----
        }
        
!       $name_mod = '';
!       if(is_array( $argv_ary)) {
!          $name_mod = implode('', $argv_ary);
!       }
!       
        $story_name = basename($this->psl['languagefile']) . $this->psl['skin'] ."story" . $name_mod;
        $cache_ary[$story_name]['expire'] = $cache_ary['story']['expire'];

Index: admin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/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	15 May 2003 18:19:54 -0000	1.2
***************
*** 3,6 ****
--- 3,10 ----
  /* $Id$ */
  
+ global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $auth, $perm;
+ 
+ $ary = $GLOBALS['ary'];
+ 
  AddClassRequirement("story_base",$_PSL['moduledir'] . "/story/Story_base.class");
  AddClassRequirement("story","story_base");

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	17 Apr 2003 23:31:01 -0000	1.2
--- index.php	15 May 2003 18:19:54 -0000	1.3
***************
*** 6,9 ****
--- 6,13 ----
  $ary = $GLOBALS['ary'];
  
+ global $_PSL;
+ 
+ $ary = $GLOBALS['ary'];
+ 
  AddClassRequirement("story_base",$_PSL['moduledir'] . "/story/Story_base.class");
  AddClassRequirement("story","story_base");

[Phpslash-commit] CVS: phpslash-dev/include/modules/submission index.php,1.2,1.3

From: Joe S. <joe...@us...> - 2003-05-15 18:44:34

Update of /cvsroot/phpslash/phpslash-dev/include/modules/submission
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/modules/submission

Modified Files:
	index.php 
Log Message:
module sections

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/submission/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	17 Apr 2003 23:31:01 -0000	1.2
--- index.php	15 May 2003 18:19:54 -0000	1.3
***************
*** 4,7 ****
--- 4,9 ----
  global $_PSL, $HTTP_POST_VARS, $ary;
  
+ global $_PSL, $HTTP_POST_VARS, $ary;
+ 
  AddClassRequirement("submission",$_PSL['moduledir'] . "/submission/Submission.class");

[Phpslash-commit] CVS: phpslash-dev ChangeLog,NONE,1.1

From: Joe S. <joe...@us...> - 2003-05-15 18:33:19

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1:/tmp/cvs-serv20734/phpslash-dev

Added Files:
	ChangeLog 
Log Message:
module sections

--- NEW FILE: ChangeLog ---
2003-05-15 13:19  joestewart

	* CHANGES, include/class/functions.inc,
	include/class/lib.resources.php, include/class/slashAuthCR.class,
	include/class/tz.class, include/modules/about/index.php,
	include/modules/author/admin.php, include/modules/author/index.php,
	include/modules/block/Block_i.class,
	include/modules/block/index.php,
	include/modules/block/blocktypes/Block_render_poll.class,
	include/modules/block/blocktypes/Block_render_query.class,
	include/modules/block/blocktypes/Block_render_rss.class,
	include/modules/group/admin.php,
	include/modules/mailinglist/admin.php,
	include/modules/mailinglist/index.php,
	include/modules/poll/index.php,
	include/modules/section/Section.class,
	include/modules/section/admin.php,
	include/modules/story/Story.class, include/modules/story/admin.php,
	include/modules/story/index.php,
[...1024 lines suppressed...]
	public_html/images/topics/topicquickies.gif,
	public_html/images/topics/topicredhat.gif,
	public_html/images/topics/topicscience.gif,
	public_html/images/topics/topicsgi.gif,
	public_html/images/topics/topicslashdot.gif,
	public_html/images/topics/topicspam.jpg,
	public_html/images/topics/topicstarwars.gif,
	public_html/images/topics/topicsun.gif,
	public_html/images/topics/topicsuse.gif,
	public_html/images/topics/topictech2.jpg,
	public_html/images/topics/topictv.jpg,
	public_html/images/topics/topicunix.jpg,
	public_html/images/topics/topicus.gif,
	public_html/images/topics/topicwine.gif,
	public_html/images/topics/topicx.jpg,
	public_html/images/topics/topicxmas.jpg,
	public_html/styles/basic.css, public_html/styles/xhtmlb.css,
	scripts/db_xfer.php3.disabled, scripts/url_test.php,
	tables/0.7/65_to_7.sql, tables/0.7/slash-all.sql: Initial revision

[Phpslash-commit] CVS: phpslash-dev/include/modules/about index.php,1.1.1.1,1.2

From: Joe S. <joe...@us...> - 2003-05-15 18:23:34

Update of /cvsroot/phpslash/phpslash-dev/include/modules/about
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/modules/about

Modified Files:
	index.php 
Log Message:
module sections

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/about/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	15 May 2003 18:19:53 -0000	1.2
***************
*** 6,12 ****
  
  $about_templ = pslNew("slashTemplate");
! $about_templ->set_file(array(
!   'main' => "about.tpl"
! ));
  
  $content = $about_templ->parse('OUT',"main");
--- 6,10 ----
  
  $about_templ = pslNew("slashTemplate");
! $about_templ->set_file( 'main' , "about.tpl");
  
  $content = $about_templ->parse('OUT',"main");

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.14,1.15

From: Joe S. <joe...@us...> - 2003-05-15 18:20:28

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
module sections

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CHANGES	28 Apr 2003 19:30:18 -0000	1.14
--- CHANGES	15 May 2003 18:19:53 -0000	1.15
***************
*** 14,17 ****
--- 14,21 ----
  
  2003-April-28 2:30PM CDT Joe Stewart <joe...@us...>
+ [ET] - Large commit to test further use of page blocks and module sections.
+        Significant number of blocks added require loading of slash-all.sql. 
+ 
+ 2003-April-28 2:30PM CDT Joe Stewart <joe...@us...>
  [E] - slashTemplate.class - experimental support for module templates to 
        be contained in a "templates" subdirectory.

[Phpslash-commit] CVS: phpslash-dev/include/modules/block Block_i.class,1.1.1.1,1.2 index.php,1.2,1.3

From: Joe S. <joe...@us...> - 2003-05-15 18:20:28

Update of /cvsroot/phpslash/phpslash-dev/include/modules/block
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/modules/block

Modified Files:
	Block_i.class index.php 
Log Message:
module sections

Index: Block_i.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/Block_i.class,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Block_i.class	12 Mar 2003 16:12:55 -0000	1.1.1.1
--- Block_i.class	15 May 2003 18:19:53 -0000	1.2
***************
*** 90,94 ****
           
        $output = "";
!       for ($i=0; $i < count($this->block_ary); $i++) {
              
  	      if( empty($this->block_ary[$i]['block_options']['perms'])) {
--- 90,95 ----
           
        $output = "";
!       $count = count($this->block_ary);
!       for ($i=0; $i < $count; $i++) {
              
  	      if( empty($this->block_ary[$i]['block_options']['perms'])) {
***************
*** 144,148 ****
  	         // remove column from array
  	         unset($ary["block_options"]["column"]);
! 	         while( list( $key, $val) = @each( $ary["block_options"] )) {
             
                 switch($key) {
--- 145,150 ----
  	         // remove column from array
  	         unset($ary["block_options"]["column"]);
!             foreach( $ary["block_options"] as $key => $val) {
! 	         // while( list( $key, $val) = @each( $ary["block_options"] )) {
             
                 switch($key) {

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	17 Apr 2003 23:31:00 -0000	1.2
--- index.php	15 May 2003 18:19:53 -0000	1.3
***************
*** 1,6 ****
  <?php
  
! global $_PSL;
  
  AddClassRequirement("block",$_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/Block.class");
  AddClassRequirement("block_i","block");
--- 1,8 ----
  <?php
+ // $Id$
  
! global $_PSL, $ary;
  
+ // specify classes to load
  AddClassRequirement("block",$_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/Block.class");
  AddClassRequirement("block_i","block");
***************
*** 8,11 ****
--- 10,21 ----
  AddClassRequirement("block_render_i",$_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/Block_render_i.class");
  AddClassRequirement("block_admin","block_i");
+ 
+ // instantiate block object
+ $block = pslNew("Block_i");
+ 
+ // get page content
+ $content = $block->getBlocks($ary, "page");
+ 
+ return $content;
  
  ?>

[Phpslash-commit] CVS: phpslash-dev/include/modules/author admin.php,1.1.1.1,1.2 index.php,1.2,1.3

From: Joe S. <joe...@us...> - 2003-05-15 18:20:28

Update of /cvsroot/phpslash/phpslash-dev/include/modules/author
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/modules/author

Modified Files:
	admin.php index.php 
Log Message:
module sections

Index: admin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/author/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:56 -0000	1.1.1.1
--- admin.php	15 May 2003 18:19:53 -0000	1.2
***************
*** 3,6 ****
--- 3,8 ----
  /* $Id$ */
  
+ global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $auth, $perm;
+ 
  AddClassRequirement("author",$_PSL['moduledir']  ."/". $_PSL['module']['module.current'] ."/Author.class");
  
***************
*** 62,67 ****
  	    }
  	 }
!          if ($perm->have_perm("authorNew")) {
!             $content .= $author->newAuthor();
  	 }
  	 if ($perm->have_perm("authorList")) {
--- 64,69 ----
  	    }
  	 }
!     if ($perm->have_perm("authorNew")) {
!        $content .= $author->newAuthor();
  	 }
  	 if ($perm->have_perm("authorList")) {

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/author/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	25 Apr 2003 20:00:21 -0000	1.2
--- index.php	15 May 2003 18:19:53 -0000	1.3
***************
*** 5,8 ****
--- 5,10 ----
  global $_PSL, $auth, $perm, $HTTP_GET_VARS, $HTTP_POST_VARS;
  
+ global $_PSL, $auth, $perm, $HTTP_GET_VARS, $HTTP_POST_VARS;
+ 
  AddClassRequirement("author",$_PSL['moduledir']  ."/". $_PSL['module']['module.current'] ."/Author.class");

[Phpslash-commit] CVS: phpslash-dev/include/modules/group admin.php,1.1.1.1,1.2

From: Joe S. <joe...@us...> - 2003-05-15 18:20:27

Update of /cvsroot/phpslash/phpslash-dev/include/modules/group
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/modules/group

Modified Files:
	admin.php 
Log Message:
module sections

Index: admin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/group/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:56 -0000	1.1.1.1
--- admin.php	15 May 2003 18:19:54 -0000	1.2
***************
*** 3,7 ****
  /* $Id$ */
  
! AddClassRequirement("group",$_PSL['moduledir']  ."/". $_PSL['module']['module.current'] ."/Group.class");
  
  AddClassRequirement("section",$_PSL['moduledir']  ."/section/Section.class");
--- 3,9 ----
  /* $Id$ */
  
! global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $auth, $perm;
! 
! AddClassRequirement("group",$_PSL['moduledir']  ."/group/Group.class");
  
  AddClassRequirement("section",$_PSL['moduledir']  ."/section/Section.class");

[Phpslash-commit] CVS: phpslash-dev/tables/0.7 slash-all.sql,1.3,1.4

From: Joe S. <joe...@us...> - 2003-05-15 18:20:00

Update of /cvsroot/phpslash/phpslash-dev/tables/0.7
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/tables/0.7

Modified Files:
	slash-all.sql 
Log Message:
module sections

Index: slash-all.sql
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.7/slash-all.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** slash-all.sql	18 Apr 2003 16:42:27 -0000	1.3
--- slash-all.sql	15 May 2003 18:19:56 -0000	1.4
***************
*** 1,17 ****
! # phpMyAdmin MySQL-Dump
! # version 2.2.0
! # http://phpwizard.net/phpMyAdmin/
! # http://phpmyadmin.sourceforge.net/ (download page)
! #
! # Host: localhost
! # Generation Time: November 18, 2002, 5:48 pm
! # Server version: 3.23.42
! # PHP Version: 4.2.2
! # Database : `phpslash2`
[...1455 lines suppressed...]
  INSERT INTO psl_variable (variable_id, variable_name, value, description, variable_group) VALUES (3,'poll_currentquestionid','18','The Current Question on the homepage pollbooth','');
***************
*** 1072,1087 ****
  INSERT INTO psl_variable (variable_id, variable_name, value, description, variable_group) VALUES (63,'mailinglist_subject','Slash list','The Subject for the mailing list newsletters','');
  
- 
- # --------------------------------------------------------
- #
- # Table structure for table 'CACHEDATA'
- #
- 
- CREATE TABLE CACHEDATA (
-    CACHEKEY varchar(255) NOT NULL,
-    CACHEEXPIRATION int(11) NOT NULL,
-    GZDATA blob,
-    DATASIZE int(11),
-    DATACRC int(11),
-    PRIMARY KEY (CACHEKEY)
-  ) TYPE=MyISAM; 
--- 1151,1152 ----

[Phpslash-commit] CVS: phpslash-dev/public_html about.php,1.2,1.3 glossary.php,1.2,1.3 index.php,1.2,1.3 mailinglist.php,1.2,1.3 poll.php,1.2,1.3 search.php,1.2,1.3 submission.php,1.2,1.3

From: Joe S. <joe...@us...> - 2003-05-15 18:19:59

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/public_html

Modified Files:
	about.php glossary.php index.php mailinglist.php poll.php 
	search.php submission.php 
Log Message:
module sections

Index: about.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/about.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** about.php	17 Apr 2003 23:31:01 -0000	1.2
--- about.php	15 May 2003 18:19:55 -0000	1.3
***************
*** 2,5 ****
--- 2,8 ----
  // $Id$
  
+ 
+ $HTTP_GET_VARS['section'] = 'About';
+ 
  require('config.php');
  
***************
*** 7,10 ****
--- 10,14 ----
  $xsiteobject = pslgetText('About Page'); // This Defines The META Tag Object Type
  
+ // Show login form if requested
  if(!empty($HTTP_GET_VARS['login'])) {
    $auth->login_if($HTTP_GET_VARS['login']);
***************
*** 13,30 ****
  $_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'];
! include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
! $block = pslNew("Block_i");
! 
! // Start of Page
! 
! $content = $block->getBlocks($ary, "page");
  
  echo $content;
  
--- 17,32 ----
  $_PSL['metatags']['object'] = $xsiteobject;
  
  
! // Is the page specified? - if not use module index.php
! $modulefilename =  'index.php';
! if(array_key_exists('page', $ary)) {
!    $modulefilename =  basename($ary['page']) .".php";
! }
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! $content = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/". $modulefilename);
  
+ // show page
  echo $content;
  

Index: glossary.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/glossary.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** glossary.php	17 Apr 2003 23:31:01 -0000	1.2
--- glossary.php	15 May 2003 18:19:55 -0000	1.3
***************
*** 2,5 ****
--- 2,8 ----
  // $Id$
  
+ 
+ $HTTP_GET_VARS['section'] = 'Glossary';
+ 
  require('config.php');
  
***************
*** 13,28 ****
  $_PSL['metatags']['object'] = $xsiteobject;
  
- // Objects
- 
- $ary['module'] = 'Glossary';
- 
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
  include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
- $block = pslNew("Block_i");
- 
- // Start of Page
- 
- $content = $block->getBlocks($ary, "page");
  
  echo $content;
--- 16,22 ----

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	17 Apr 2003 23:31:01 -0000	1.2
--- index.php	15 May 2003 18:19:55 -0000	1.3
***************
*** 7,10 ****
--- 7,11 ----
  $xsiteobject = pslgetText('Home Page'); // This Defines The META Tag Object Type
  
+ // Show login form if requested
  if(!empty($HTTP_GET_VARS['login'])) {
    $auth->login_if($HTTP_GET_VARS['login']);
***************
*** 13,34 ****
  $_PSL['metatags']['object'] = $xsiteobject;
  
- // Objects
  
! // does the module get variable match a module definition?
! if(!empty($HTTP_GET_VARS['module'])) {
!    if(!empty($_PSL['module'][$HTTP_GET_VARS['module']])) {
!       $_PSL['module']['module.current'] = $_PSL['module'][$HTTP_GET_VARS['module']];
!    }
  }
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
! $block = pslNew("Block_i");
! 
! // Start of Page
  
- $content = $block->getBlocks($ary, "page");
  
  echo $content;
  
--- 14,30 ----
  $_PSL['metatags']['object'] = $xsiteobject;
  
  
! // Is the page specified? - if not use module index.php
! $modulefilename =  'index.php';
! if(array_key_exists('page', $ary)) {
!    $modulefilename =  basename($ary['page']) .".php";
  }
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! $content = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/". $modulefilename);
  
  
+ // show page
  echo $content;
  

Index: mailinglist.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/mailinglist.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mailinglist.php	17 Apr 2003 23:31:01 -0000	1.2
--- mailinglist.php	15 May 2003 18:19:55 -0000	1.3
***************
*** 2,5 ****
--- 2,7 ----
  // $Id$
  
+ $HTTP_GET_VARS['section'] = 'MailingList';
+ 
  require('config.php');
  
***************
*** 7,10 ****
--- 9,13 ----
  $xsiteobject = pslgetText('Mailinglist Page'); // This Defines The META Tag Object Type
  
+ // Show login form if requested
  if(!empty($HTTP_GET_VARS['login'])) {
    $auth->login_if($HTTP_GET_VARS['login']);
***************
*** 13,29 ****
  $_PSL['metatags']['object'] = $xsiteobject;
  
- // Objects
  
! $ary['module'] = 'MailingList';
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
! $block = pslNew("Block_i");
! 
! // Start of Page
! 
! $content = $block->getBlocks($ary, "page");
  
  echo $content;
  
--- 16,31 ----
  $_PSL['metatags']['object'] = $xsiteobject;
  
  
! // Is the page specified? - if not use module index.php
! $modulefilename =  'index.php';
! if(array_key_exists('page', $ary)) {
!    $modulefilename =  basename($ary['page']) .".php";
! }
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! $content = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/". $modulefilename);
  
+ // show page
  echo $content;
  

Index: poll.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/poll.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** poll.php	17 Apr 2003 23:31:01 -0000	1.2
--- poll.php	15 May 2003 18:19:55 -0000	1.3
***************
*** 2,5 ****
--- 2,8 ----
  // $Id$
  
+ 
+ $HTTP_GET_VARS['section'] = 'Poll';
+ 
  require('config.php');
  
***************
*** 7,10 ****
--- 10,14 ----
  $xsiteobject = pslgetText('Poll Page'); // This Defines The META Tag Object Type
  
+ // Show login form if requested
  if(!empty($HTTP_GET_VARS['login'])) {
    $auth->login_if($HTTP_GET_VARS['login']);
***************
*** 13,29 ****
  $_PSL['metatags']['object'] = $xsiteobject;
  
- // Objects
  
! $ary['module'] = 'Poll';
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
! $block = pslNew("Block_i");
! 
! // Start of Page
! 
! $content = $block->getBlocks($ary, "page");
  
  echo $content;
  
--- 17,32 ----
  $_PSL['metatags']['object'] = $xsiteobject;
  
  
! // Is the page specified? - if not use module index.php
! $modulefilename =  'index.php';
! if(array_key_exists('page', $ary)) {
!    $modulefilename =  basename($ary['page']) .".php";
! }
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! $content = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/". $modulefilename);
  
+ // show page
  echo $content;
  

Index: search.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/search.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** search.php	17 Apr 2003 23:31:01 -0000	1.2
--- search.php	15 May 2003 18:19:55 -0000	1.3
***************
*** 2,5 ****
--- 2,8 ----
  // $Id$
  
+ 
+ $HTTP_GET_VARS['section'] = 'Search';
+ 
  require('config.php');
  
***************
*** 7,10 ****
--- 10,14 ----
  $xsiteobject = pslgetText('Search Page'); // This Defines The META Tag Object Type
  
+ // Show login form if requested
  if(!empty($HTTP_GET_VARS['login'])) {
    $auth->login_if($HTTP_GET_VARS['login']);
***************
*** 13,29 ****
  $_PSL['metatags']['object'] = $xsiteobject;
  
- // Objects
  
! $ary['module'] = 'Search';
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
! $block = pslNew("Block_i");
! 
! // Start of Page
! 
! $content = $block->getBlocks($ary, "page");
  
  echo $content;
  
--- 17,32 ----
  $_PSL['metatags']['object'] = $xsiteobject;
  
  
! // Is the page specified? - if not use module index.php
! $modulefilename =  'index.php';
! if(array_key_exists('page', $ary)) {
!    $modulefilename =  basename($ary['page']) .".php";
! }
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! $content = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/". $modulefilename);
  
+ // show page
  echo $content;
  

Index: submission.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/submission.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** submission.php	17 Apr 2003 23:31:01 -0000	1.2
--- submission.php	15 May 2003 18:19:55 -0000	1.3
***************
*** 2,5 ****
--- 2,8 ----
  // $Id$
  
+ 
+ $HTTP_GET_VARS['section'] = 'Submission';
+ 
  require('config.php');
  
***************
*** 7,10 ****
--- 10,14 ----
  $xsiteobject = pslgetText('Submission Page'); // This Defines The META Tag Object Type
  
+ // Show login form if requested
  if(!empty($HTTP_GET_VARS['login'])) {
    $auth->login_if($HTTP_GET_VARS['login']);
***************
*** 13,29 ****
  $_PSL['metatags']['object'] = $xsiteobject;
  
- // Objects
  
! $ary['module'] = 'Submission';
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
! $block = pslNew("Block_i");
! 
! // Start of Page
! 
! $content = $block->getBlocks($ary, "page");
  
  echo $content;
  
--- 17,32 ----
  $_PSL['metatags']['object'] = $xsiteobject;
  
  
! // Is the page specified? - if not use module index.php
! $modulefilename =  'index.php';
! if(array_key_exists('page', $ary)) {
!    $modulefilename =  basename($ary['page']) .".php";
! }
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! $content = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/". $modulefilename);
  
+ // show page
  echo $content;

[Phpslash-commit] CVS: phpslash-dev/public_html/admin blockAdmin.php,1.1.1.1,1.2 groupAdmin.php,1.1.1.1,1.2 storyAdmin.php,1.1.1.1,1.2

From: Joe S. <joe...@us...> - 2003-05-15 18:19:59

Update of /cvsroot/phpslash/phpslash-dev/public_html/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/public_html/admin

Modified Files:
	blockAdmin.php groupAdmin.php storyAdmin.php 
Log Message:
module sections

Index: blockAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/blockAdmin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** blockAdmin.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- blockAdmin.php	15 May 2003 18:19:56 -0000	1.2
***************
*** 26,39 ****
  
  $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)) {
--- 26,40 ----
  
  $ary['section'] = "Admin";
+ // $ary['section_id'] = "9";
  // Start of Page
  
  $_PSL['metatags']['object'] = $xsiteobject;
  
  // $allstories   = $story->getStories($ary);
+ $topblocks    = $block->getBlocks($ary, "top");
  $leftblocks   = $block->getBlocks($ary, "left");
  $centerblocks = $block->getBlocks($ary, "center");
  $rightblocks  = $block->getBlocks($ary, "right");
+ $bottomblocks = $block->getBlocks($ary, "bottom");
  
  if (empty($leftblocks)) {
***************
*** 68,74 ****
     'BREADCRUMB'   => $breadcrumb,
     'STORY_COLUMN' => $allstories,
     'LEFT_BLOCK_COLUMN'    => $leftblocks,
     'CENTER_BLOCK_COLUMN'  => $centerblocks,
!    'RIGHT_BLOCK_COLUMN'   => $rightblocks
  ));
  
--- 69,77 ----
     'BREADCRUMB'   => $breadcrumb,
     'STORY_COLUMN' => $allstories,
+    'TOP'          => $topblocks,
     'LEFT_BLOCK_COLUMN'    => $leftblocks,
     'CENTER_BLOCK_COLUMN'  => $centerblocks,
!    'RIGHT_BLOCK_COLUMN'   => $rightblocks,
!    'BOTTOM'               => $bottomblocks
  ));
  
***************
*** 76,80 ****
  $template->p('OUT');
  
- slashfoot();
  page_close();
  ?>
--- 79,82 ----

Index: groupAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/groupAdmin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** groupAdmin.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- groupAdmin.php	15 May 2003 18:19:56 -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('Group') .' '. pslgetText('Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Group') .' '. pslgetText('Administration Page'); // This Defines The META Tag Object Type
  
  if(!empty($HTTP_GET_VARS['login'])) {
***************
*** 11,21 ****
  }
  
  // Objects
  
! $_PSL['module']['module.current'] = $_PSL['module']['Group'];
  
! // 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'] = 'Group';
  
! $ary['section'] = 'Admin';
! $ary['page'] = 'admin';
  
  // setup the block module   
***************
*** 24,79 ****
  $block = pslNew("Block_i");
  
- 
- $ary['section'] = "Admin";
  // 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",$_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();
  ?>

Index: storyAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/storyAdmin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** storyAdmin.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- storyAdmin.php	15 May 2003 18:19:56 -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('Story Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Story Administration Page'); // This Defines The META Tag Object Type
  
  if(!empty($HTTP_GET_VARS['login'])) {
***************
*** 11,21 ****
  }
  
  // Objects
  
! $_PSL['module']['module.current'] = $_PSL['module']['Story'];
  
! // 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'] = 'Story';
  
! $ary['section'] = 'Admin';
! $ary['page'] = 'admin';
  
  // setup the block module   
***************
*** 24,80 ****
  $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";
!    } 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();
  ?>

[Phpslash-commit] CVS: phpslash-dev/include/templates/en/basic index3col.tpl,1.2,1.3

From: Joe S. <joe...@us...> - 2003-05-15 18:19:58

Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/templates/en/basic

Modified Files:
	index3col.tpl 
Log Message:
module sections

Index: index3col.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/index3col.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index3col.tpl	17 Apr 2003 23:31:01 -0000	1.2
--- index3col.tpl	15 May 2003 18:19:55 -0000	1.3
***************
*** 1,5 ****
  <!-- start index3col.tpl -->
  {TOP}
! 
  {BREADCRUMB}
  <table width="100%" cellpadding="0" cellspacing="0" border="0">
--- 1,5 ----
  <!-- start index3col.tpl -->
  {TOP}
! <br />
  {BREADCRUMB}
  <table width="100%" cellpadding="0" cellspacing="0" border="0">

2 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 45 46 47 48 49 .. 109 > >> (Page 47 of 109)

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