[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

[Joe S. <joe...@us...>]

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