[Phpslash-commit] CVS: phpslash-ft/class Block_i.class,1.25,1.26 Block_admin.class,1.7,1.8

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

Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv32511/phpslash-ft/class

Modified Files:
	Block_i.class Block_admin.class 
Log Message:
Block_i, Block_admin constructor cleanup

Index: Block_i.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_i.class,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Block_i.class	22 Jan 2003 17:28:42 -0000	1.25
--- Block_i.class	12 Feb 2003 16:44:09 -0000	1.26
***************
*** 33,40 ****
  
        /* Here starts Block_i specfic construction */
-       global $_PSL;
-       
-       $this->psl = $_PSL;
-       
        $this->argv_ary = "";
  
--- 33,36 ----
***************
*** 45,55 ****
        $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
        $this->templ->debug = 0;
- 
-       /* Setup the files array */
-       $this->templ->set_file(array(
-          'listblock'  => "blockList.tpl",
-          'newblock'   => "blockEdit.tpl",
-          'editblock'  => "blockEdit.tpl"
-       ));
  
        /* Setup the template vars. We need these in all our templates */
--- 41,44 ----

Index: Block_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_admin.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Block_admin.class	22 Jan 2003 17:28:42 -0000	1.7
--- Block_admin.class	12 Feb 2003 16:44:09 -0000	1.8
***************
*** 14,20 ****
  */
  class Block_admin extends Block_i {
!    /* Declare properties for class Block_admin */
!    var $psl, $templ, $debug, $argv_ary;
! 
     /* 
     * class Block also defines the following properties:
--- 14,21 ----
  */
  class Block_admin extends Block_i {
!    /* class Block_i also defines the following properties 
!    *  psl, $templ, $debug, $argv_ary
!    */
!    
     /* 
     * class Block also defines the following properties:
***************
*** 29,47 ****
        /* Constructor: Create sub-objects here, etc... */
      
!       $this->Block(); /* Calls the contructor for the parent class */
! 
!       /* Here starts Block_i specfic construction */
!       global $_PSL;
!       
!       $this->psl = $_PSL;
!       
!       $this->argv_ary = "";
  
        /* Do we debug? [Boolean] */
!       $this->debug = 1;
! 
!       /* Start Template Object */
!       $this->templ = pslNew("slashTemplate",$this->psl['templatedir'], "remove");
!       $this->templ->debug = 0;
  
        /* Setup the files array */
--- 30,37 ----
        /* Constructor: Create sub-objects here, etc... */
      
!       $this->Block_i(); /* Calls the contructor for the parent class */
  
        /* Do we debug? [Boolean] */
!       // $this->debug = 1;
  
        /* Setup the files array */
***************
*** 52,60 ****
        ));
  
-       /* Setup the template vars. We need these in all our templates */
-       $this->templ->set_var( array( 
-          'ROOTDIR'   => $this->psl['rooturl'],
-          'IMAGEDIR'  => $this->psl['imageurl']
-       ));
     }    
     
--- 42,45 ----
***************
*** 270,275 ****
     function listBlockTypes($option="", $name="") {
  
-       $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
-       $this->templ->debug = 0;
        $this->templ->set_file(array(
           'listblocktypes'   => "blocktypeList.tpl"
--- 255,258 ----
***************
*** 311,315 ****
  	         }
  	      }
!          $this->templ->set_block("listblocktypes","addrow","rows");
           while( list($key, $val) = each($avail_ary) ) {
  	    
--- 294,298 ----
  	         }
  	      }
!          $this->templ->set_block("listblocktypes","addrow","addrows");
           while( list($key, $val) = each($avail_ary) ) {
  	    
***************
*** 318,322 ****
  	            'ADDURL'  => $this->psl[phpself] ."?option=add". $this->psl[amp] ."name=". $key
  	         ));
!             $this->templ->parse("rows","addrow",true);
  	 
           }
--- 301,305 ----
  	            'ADDURL'  => $this->psl[phpself] ."?option=add". $this->psl[amp] ."name=". $key
  	         ));
!             $this->templ->parse("addrows","addrow",true);
  	 
           }