[Phpslash-commit] CVS: phpslash-ft/class slashTemplate.class,NONE,1.1 Author.class,1.34,1.35 Block_admin.class,1.5,1.6 Block_i.class,1.23,1.24 Block_render_cal.class,1.12,1.13 Block_render_comments.class,1.6,1.7 Block_render_login.class,1.6,1.7 Block_render_query.class,1.11,1.12 Block_render_quote.class,1.7,1.8 Block_render_rss.class,1.12,1.13 Block_render_section.class,1.13,1.14 Block_render_skin.class,1.9,1.10 Block_render_submission.class,1.6,1.7 Block_render_topic.class,1.13,1.14 Comment.class,1.39,1.40 Glossary.class,1.10,1.11 Group.class,1.4,1.5 Infolog.class,1.7,1.8 MailingList.class,1.13,1.14 NavBar.class,1.16,1.17 Poll.class,1.24,1.25 Section.class,1.12,1.13 Story.class,1.47,1.48 Story_admin.class,1.9,1.10 Submission.class,1.14,1.15 Topic.class,1.14,1.15 TopicBar.class,1.4,1.5 Variable.class,1.6,1.7 functions.inc,1.118,1.119 slashAuth.class,1.9,1.10 slashAuthCR.class,1.34,1.35 tz.class,1.2,1.3 tz_posix.class,1.3,1.4

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

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

Modified Files:
	Author.class Block_admin.class Block_i.class 
	Block_render_cal.class Block_render_comments.class 
	Block_render_login.class Block_render_query.class 
	Block_render_quote.class Block_render_rss.class 
	Block_render_section.class Block_render_skin.class 
	Block_render_submission.class Block_render_topic.class 
	Comment.class Glossary.class Group.class Infolog.class 
	MailingList.class NavBar.class Poll.class Section.class 
	Story.class Story_admin.class Submission.class Topic.class 
	TopicBar.class Variable.class functions.inc slashAuth.class 
	slashAuthCR.class tz.class tz_posix.class 
Added Files:
	slashTemplate.class 
Log Message:
slashTemplate allows parent skin sets

--- NEW FILE: slashTemplate.class ---
<?php
/**
  * slashTemplate.class -> Primary methods for providing Templates 
  * @version $Id: slashTemplate.class,v 1.1 2002/12/20 22:17:30 joestewart Exp $ 
  *
  * Provides Session functions of PHPSlash 
  *
  * Extends the phplib Template class.
  *
  */

class slashTemplate extends Template {

   /**
	 * @var psl configuration variables
	 */
   var $psl;

   
   /**
   * The slashTemplate Constructor
   *
   * sets up the local version of the global _PSL array.
   *
   * @access public
   * @param string root
   * @param string unknowns
   */
   function slashTemplate($root = ".", $unknowns = "remove") {
      global $_PSL;
      
      $this->psl = &$_PSL;

      if ($this->debug & 4) {
         echo "<p><b>Template:</b> root = $root, unknowns = $unknowns</p>\n";
      }
      // $this->set_root($root);
      $this->set_unknowns($unknowns);

   }


   /**
   * set_root is unused in this class.
   *
   **/
   function set_root($root="") {
   
   }

   /**
   * set_file now needs to prepend the correct path to the filename
   * before passing off to the parent set_file.
   *
   * if the given filename is not found in the current skin directory
   * a search is made for it in the skin.parent specified in an optional
   * skin.ini file.
   *
   * @access public
   * @param string varname
   * @param string filename
   **/
   function set_file($varname, $filename = "") {
      if (!is_array($varname)) {
         $filepath = $this->psl['templatedir'] ."/". $filename;
         if(!file_exists($filepath)) {
            if(file_exists($this->psl['templatedir'] ."/skin.ini")) {
               $skin_cfg = parse_ini_file($this->psl['templatedir'] ."/". "skin.ini");
               $templatedir = substr($this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") );
               $filepath = $templatedir ."/". $skin_cfg['skin.parent'] ."/". $filename;
               if(!file_exists($filepath)) {
                  $this->halt("set_file1: set_file: For varname $varname filename $filepath is invalid.");
               }
            } else {
               $this->halt("set_file2: set_file: For varname $varname filename $filepath is invalid.");
            }
         }
         Template::set_file($varname, $filepath);
         
      } else {
         reset($varname);
         
         while(list($v, $f) = each($varname)) {

            $filepath = $this->psl['templatedir'] ."/". $f;
            if( file_exists($filepath)) {
               $varname_ary[$v] = $filepath;

            } else {
               if(file_exists($this->psl['templatedir'] ."/skin.ini")) {
                  $skin_cfg = parse_ini_file($this->psl['templatedir'] ."/". "skin.ini");
                  $templatedir = substr($this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") );
                  $filepath = $templatedir ."/". $skin_cfg['skin.parent'] ."/". $f;
                  $varname_ary[$v] = $filepath;
                  if(!is_file($filepath)) {
                     $this->halt("set_file: set_file: For varname $v filename $filepath is invalid.");
                  }
               } else {
                  $this->halt("set_file: set_file: For varname $varname filename $filepath is invalid.");
               }
            }
         }
         Template::set_file($varname_ary, $filename);
      }
   }
}

?>

Index: Author.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Author.class	11 Dec 2002 19:39:52 -0000	1.34
--- Author.class	20 Dec 2002 22:17:28 -0000	1.35
***************
*** 41,45 ****
  
       /* Templates */
!      $this->author_templ = pslNew("Template",$this->psl['templatedir'], "remove");
       $this->author_templ->debug = 0;
       $this->author_templ->set_file(array(
--- 41,45 ----
  
       /* Templates */
!      $this->author_templ = pslNew("slashTemplate",$this->psl['templatedir'], "remove");
       $this->author_templ->debug = 0;
       $this->author_templ->set_file(array(

Index: Block_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_admin.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Block_admin.class	11 Dec 2002 19:39:53 -0000	1.5
--- Block_admin.class	20 Dec 2002 22:17:29 -0000	1.6
***************
*** 42,46 ****
  
        /* Start Template Object */
!       $this->templ = pslNew("Template",$this->psl['templatedir'], "remove");
        $this->templ->debug = 0;
  
--- 42,46 ----
  
        /* Start Template Object */
!       $this->templ = pslNew("slashTemplate",$this->psl['templatedir'], "remove");
        $this->templ->debug = 0;
  
***************
*** 270,274 ****
     function listBlockTypes($option="", $name="") {
  
!       $this->templ = pslNew("Template",$this->psl['templatedir']);
        $this->templ->debug = 0;
        $this->templ->set_file(array(
--- 270,274 ----
     function listBlockTypes($option="", $name="") {
  
!       $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
        $this->templ->debug = 0;
        $this->templ->set_file(array(

Index: Block_i.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_i.class,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Block_i.class	11 Dec 2002 19:39:53 -0000	1.23
--- Block_i.class	20 Dec 2002 22:17:29 -0000	1.24
***************
*** 43,47 ****
  
        /* Start Template Object */
!       $this->templ = pslNew("Template",$this->psl['templatedir']);
        $this->templ->debug = 0;
  
--- 43,47 ----
  
        /* Start Template Object */
!       $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
        $this->templ->debug = 0;
  

Index: Block_render_cal.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_cal.class,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Block_render_cal.class	11 Dec 2002 19:39:53 -0000	1.12
--- Block_render_cal.class	20 Dec 2002 22:17:29 -0000	1.13
***************
*** 18,22 ****
        // TODO: Make this class use $_PSL
  
!       $templ = pslNew("Template",$this->psl['templatedir']);
        $templ->set_file(array(
           'calendar' => 'calendar.tpl'
--- 18,22 ----
        // TODO: Make this class use $_PSL
  
!       $templ = pslNew("slashTemplate",$this->psl['templatedir']);
        $templ->set_file(array(
           'calendar' => 'calendar.tpl'

Index: Block_render_comments.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_comments.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Block_render_comments.class	11 Dec 2002 19:39:53 -0000	1.6
--- Block_render_comments.class	20 Dec 2002 22:17:29 -0000	1.7
***************
*** 72,76 ****
        }
  
!       $template = pslNew("Template",$templatedir . "/" . $skin);
        $template->debug = 0;
        $template->set_file(array(
--- 72,76 ----
        }
  
!       $template = pslNew("slashTemplate",$templatedir . "/" . $skin);
        $template->debug = 0;
        $template->set_file(array(

Index: Block_render_login.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_login.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Block_render_login.class	11 Dec 2002 19:39:54 -0000	1.6
--- Block_render_login.class	20 Dec 2002 22:17:29 -0000	1.7
***************
*** 54,58 ****
        }
      
!       $template = pslNew("Template",$this->psl['templatedir']);
        $template->debug = 0;
        $template->set_file(array(
--- 54,58 ----
        }
      
!       $template = pslNew("slashTemplate",$this->psl['templatedir']);
        $template->debug = 0;
        $template->set_file(array(

Index: Block_render_query.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_query.class,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Block_render_query.class	11 Dec 2002 19:39:54 -0000	1.11
--- Block_render_query.class	20 Dec 2002 22:17:29 -0000	1.12
***************
*** 65,69 ****
        }
      
!       $template = pslNew("Template",$this->psl['templatedir']);
        $template->debug = 0;
        $template->set_file(array(
--- 65,69 ----
        }
      
!       $template = pslNew("slashTemplate",$this->psl['templatedir']);
        $template->debug = 0;
        $template->set_file(array(

Index: Block_render_quote.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_quote.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Block_render_quote.class	11 Dec 2002 19:39:54 -0000	1.7
--- Block_render_quote.class	20 Dec 2002 22:17:29 -0000	1.8
***************
*** 42,46 ****
        } 
     
!       $template = pslNew("Template",$this->psl['templatedir']);
        $template->debug = 0;
        $template->set_file(array(
--- 42,46 ----
        } 
     
!       $template = pslNew("slashTemplate",$this->psl['templatedir']);
        $template->debug = 0;
        $template->set_file(array(

Index: Block_render_rss.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_rss.class,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Block_render_rss.class	11 Dec 2002 19:39:54 -0000	1.12
--- Block_render_rss.class	20 Dec 2002 22:17:29 -0000	1.13
***************
*** 364,368 ****
           // debug("rss::parse::items",  $this->rdf->items);
  
!          $template = pslNew("Template",$this->psl["templatedir"]);
           $template->set_file  ("block", $tpl);
  
--- 364,368 ----
           // debug("rss::parse::items",  $this->rdf->items);
  
!          $template = pslNew("slashTemplate",$this->psl["templatedir"]);
           $template->set_file  ("block", $tpl);
  

Index: Block_render_section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_section.class,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Block_render_section.class	11 Dec 2002 19:39:54 -0000	1.13
--- Block_render_section.class	20 Dec 2002 22:17:29 -0000	1.14
***************
*** 85,89 ****
        }
      
!       $template = pslNew("Template",$this->psl['templatedir']);
        $template->debug = 0;
        $template->set_file(array(
--- 85,89 ----
        }
      
!       $template = pslNew("slashTemplate",$this->psl['templatedir']);
        $template->debug = 0;
        $template->set_file(array(

Index: Block_render_skin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_skin.class,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Block_render_skin.class	11 Dec 2002 19:39:54 -0000	1.9
--- Block_render_skin.class	20 Dec 2002 22:17:29 -0000	1.10
***************
*** 69,73 ****
        }
        
!       $template = pslNew("Template",$templatedir . "/" . $skin);
        $template->debug = 0;
        $template->set_file(array(
--- 69,73 ----
        }
        
!       $template = pslNew("slashTemplate",$templatedir . "/" . $skin);
        $template->debug = 0;
        $template->set_file(array(

Index: Block_render_submission.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_submission.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Block_render_submission.class	11 Dec 2002 19:39:54 -0000	1.6
--- Block_render_submission.class	20 Dec 2002 22:17:29 -0000	1.7
***************
*** 34,38 ****
  
        // Templates
!       $this->templ = pslNew("Template",$this->psl['templatedir']);
        $this->templ->debug = 0;
        $this->templ->set_file ( array(
--- 34,38 ----
  
        // Templates
!       $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
        $this->templ->debug = 0;
        $this->templ->set_file ( array(

Index: Block_render_topic.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_topic.class,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Block_render_topic.class	11 Dec 2002 19:39:54 -0000	1.13
--- Block_render_topic.class	20 Dec 2002 22:17:29 -0000	1.14
***************
*** 58,62 ****
        } 
  
!       $template = pslNew("Template",$this->psl['templatedir']);
        $template->debug = 0;
        $template->set_file(array(
--- 58,62 ----
        } 
  
!       $template = pslNew("slashTemplate",$this->psl['templatedir']);
        $template->debug = 0;
        $template->set_file(array(

Index: Comment.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Comment.class	20 Dec 2002 16:29:58 -0000	1.39
--- Comment.class	20 Dec 2002 22:17:29 -0000	1.40
***************
*** 56,60 ****
  
        /* Templates */
!       $this->ctempl = pslNew("Template",$this->psl['templatedir'], 'remove');
        $this->ctempl->debug = 0;
        $this->ctempl->set_file(array(
--- 56,60 ----
  
        /* Templates */
!       $this->ctempl = pslNew("slashTemplate",$this->psl['templatedir'], 'remove');
        $this->ctempl->debug = 0;
        $this->ctempl->set_file(array(
***************
*** 396,400 ****
        $all_comments = '';
     
!       $templ = pslNew("Template",$this->psl['templatedir'], 'remove');
        $templ->debug = 0;
        $templ->set_file(array(
--- 396,400 ----
        $all_comments = '';
     
!       $templ = pslNew("slashTemplate",$this->psl['templatedir'], 'remove');
        $templ->debug = 0;
        $templ->set_file(array(
***************
*** 438,442 ****
        $all_comments = '';
  
!       $templ = pslNew("Template",$this->psl['templatedir'], remove);
        $templ->debug = 0;
        $templ->set_file(array(
--- 438,442 ----
        $all_comments = '';
  
!       $templ = pslNew("slashTemplate",$this->psl['templatedir'], remove);
        $templ->debug = 0;
        $templ->set_file(array(
***************
*** 482,486 ****
        $all_comments = '';
  
!       $templ = pslNew("Template",$this->psl['templatedir'], remove);
        $templ->debug = 0;
        $templ->set_file(array(
--- 482,486 ----
        $all_comments = '';
  
!       $templ = pslNew("slashTemplate",$this->psl['templatedir'], remove);
        $templ->debug = 0;
        $templ->set_file(array(

Index: Glossary.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Glossary.class,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Glossary.class	11 Dec 2002 19:39:54 -0000	1.10
--- Glossary.class	20 Dec 2002 22:17:29 -0000	1.11
***************
*** 25,29 ****
  
       /* Templates */
!      $this->templ = pslNew("Template",$this->psl['templatedir']);
       $this->templ->debug = 0;
       $this->templ->set_file(array(
--- 25,29 ----
  
       /* Templates */
!      $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
       $this->templ->debug = 0;
       $this->templ->set_file(array(

Index: Group.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Group.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Group.class	11 Dec 2002 19:39:54 -0000	1.4
--- Group.class	20 Dec 2002 22:17:29 -0000	1.5
***************
*** 34,38 ****
  
        /* Templates */
!       $this->group_templ = pslNew("Template",$this->psl['templatedir']);
        $this->group_templ->debug = 0;
        $this->group_templ->set_file(array(
--- 34,38 ----
  
        /* Templates */
!       $this->group_templ = pslNew("slashTemplate",$this->psl['templatedir']);
        $this->group_templ->debug = 0;
        $this->group_templ->set_file(array(
***************
*** 40,44 ****
           'newgroup'   => "groupNew.tpl"
        ));
!       $this->permission_templ = pslNew("Template",$this->psl['templatedir']);
        $this->permission_templ->debug = 0;
        $this->permission_templ->set_file(array(
--- 40,44 ----
           'newgroup'   => "groupNew.tpl"
        ));
!       $this->permission_templ = pslNew("slashTemplate",$this->psl['templatedir']);
        $this->permission_templ->debug = 0;
        $this->permission_templ->set_file(array(

Index: Infolog.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Infolog.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Infolog.class	11 Dec 2002 19:39:54 -0000	1.7
--- Infolog.class	20 Dec 2002 22:17:29 -0000	1.8
***************
*** 26,30 ****
  
       /* Templates */
!      $this->templ = pslNew("Template",$this->psl['templatedir']);
       $this->templ->debug = 0;
       $this->templ->set_file(array(
--- 26,30 ----
  
       /* Templates */
!      $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
       $this->templ->debug = 0;
       $this->templ->set_file(array(

Index: MailingList.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/MailingList.class,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MailingList.class	11 Dec 2002 19:39:54 -0000	1.13
--- MailingList.class	20 Dec 2002 22:17:29 -0000	1.14
***************
*** 25,29 ****
  
       /* Templates */
!      $this->templ = pslNew("Template",$this->psl['templatedir']);
       $this->templ->debug = 0;
       $this->templ->set_file(array(
--- 25,29 ----
  
       /* Templates */
!      $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
       $this->templ->debug = 0;
       $this->templ->set_file(array(

Index: NavBar.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/NavBar.class,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** NavBar.class	11 Dec 2002 19:39:54 -0000	1.16
--- NavBar.class	20 Dec 2002 22:17:29 -0000	1.17
***************
*** 27,31 ****
        
        /* Templates */
!       $this->templ = pslNew("Template",$this->psl['templatedir'], "remove");
        $this->templ->debug = false;
        $this->templ->halt_on_error = "report";
--- 27,31 ----
        
        /* Templates */
!       $this->templ = pslNew("slashTemplate",$this->psl['templatedir'], "remove");
        $this->templ->debug = false;
        $this->templ->halt_on_error = "report";

Index: Poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Poll.class	11 Dec 2002 19:39:54 -0000	1.24
--- Poll.class	20 Dec 2002 22:17:29 -0000	1.25
***************
*** 35,39 ****
         * Templates
         */
!       $this->templ = pslNew("Template",$_PSL['templatedir']);
        $this->templ->debug = 0;
        $this->templ->set_file(array(
--- 35,39 ----
         * Templates
         */
!       $this->templ = pslNew("slashTemplate",$_PSL['templatedir']);
        $this->templ->debug = 0;
        $this->templ->set_file(array(

Index: Section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Section.class,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Section.class	11 Dec 2002 19:39:55 -0000	1.12
--- Section.class	20 Dec 2002 22:17:29 -0000	1.13
***************
*** 24,28 ****
  
       /* Templates */
!      $this->sec_templ = pslNew("Template",$this->psl['templatedir']);
       $this->sec_templ->debug = 0;
       $this->sec_templ->set_file(array(
--- 24,28 ----
  
       /* Templates */
!      $this->sec_templ = pslNew("slashTemplate",$this->psl['templatedir']);
       $this->sec_templ->debug = 0;
       $this->sec_templ->set_file(array(

Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** Story.class	11 Dec 2002 19:39:55 -0000	1.47
--- Story.class	20 Dec 2002 22:17:29 -0000	1.48
***************
*** 57,61 ****
        );
  
!       $this->template = pslNew("Template",$this->psl['templatedir'], "remove");
        $this->template->debug = 0;
        $this->template->set_file($template_ary);
--- 57,61 ----
        );
  
!       $this->template = pslNew("slashTemplate",$this->psl['templatedir'], "remove");
        $this->template->debug = 0;
        $this->template->set_file($template_ary);

Index: Story_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_admin.class,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Story_admin.class	11 Dec 2002 19:39:55 -0000	1.9
--- Story_admin.class	20 Dec 2002 22:17:30 -0000	1.10
***************
*** 58,62 ****
        );
  
!       $this->template = pslNew("Template",$this->psl['templatedir'], "remove");
        $this->template->debug = 0;
        $this->template->set_file($template_ary);
--- 58,62 ----
        );
  
!       $this->template = pslNew("slashTemplate",$this->psl['templatedir'], "remove");
        $this->template->debug = 0;
        $this->template->set_file($template_ary);

Index: Submission.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Submission.class,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Submission.class	11 Dec 2002 19:39:55 -0000	1.14
--- Submission.class	20 Dec 2002 22:17:30 -0000	1.15
***************
*** 14,18 ****
  
       /* Templates */
!      $this->templ = pslNew("Template",$this->psl['templatedir']);
       $this->templ->debug = 0;
       $this->templ->set_file ( array(
--- 14,18 ----
  
       /* Templates */
!      $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
       $this->templ->debug = 0;
       $this->templ->set_file ( array(

Index: Topic.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Topic.class,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Topic.class	11 Dec 2002 19:39:55 -0000	1.14
--- Topic.class	20 Dec 2002 22:17:30 -0000	1.15
***************
*** 34,38 ****
  
        /* Templates */
!       $this->topic_templ = pslNew("Template",$this->psl['templatedir']);
        $this->topic_templ->debug = 0;
        $this->topic_templ->set_file(array(
--- 34,38 ----
  
        /* Templates */
!       $this->topic_templ = pslNew("slashTemplate",$this->psl['templatedir']);
        $this->topic_templ->debug = 0;
        $this->topic_templ->set_file(array(
***************
*** 345,349 ****
     function displayTopics($option="") {
  
!       $this->topic_templ = pslNew("Template",$this->psl[templatedir]);
        $this->topic_templ->debug = 0;
        $this->topic_templ->set_file(array(
--- 345,349 ----
     function displayTopics($option="") {
  
!       $this->topic_templ = pslNew("slashTemplate",$this->psl[templatedir]);
        $this->topic_templ->debug = 0;
        $this->topic_templ->set_file(array(

Index: TopicBar.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/TopicBar.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TopicBar.class	11 Dec 2002 19:39:55 -0000	1.4
--- TopicBar.class	20 Dec 2002 22:17:30 -0000	1.5
***************
*** 19,23 ****
  
        /* Templates */
!       $this->templ = pslNew("Template",$this->psl['templatedir'], "remove");
        $this->templ->debug = 0;
        $this->templ->halt_on_error = "report";
--- 19,23 ----
  
        /* Templates */
!       $this->templ = pslNew("slashTemplate",$this->psl['templatedir'], "remove");
        $this->templ->debug = 0;
        $this->templ->halt_on_error = "report";

Index: Variable.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Variable.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Variable.class	11 Dec 2002 19:39:55 -0000	1.6
--- Variable.class	20 Dec 2002 22:17:30 -0000	1.7
***************
*** 29,33 ****
  
       /* Templates */
!      $this->variable_templ = pslNew("Template",$this->psl['templatedir']);
       $this->variable_templ->debug = 0;
       $this->variable_templ->set_file(array(
--- 29,33 ----
  
       /* Templates */
!      $this->variable_templ = pslNew("slashTemplate",$this->psl['templatedir']);
       $this->variable_templ->debug = 0;
       $this->variable_templ->set_file(array(

Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** functions.inc	11 Dec 2002 23:03:15 -0000	1.118
--- functions.inc	20 Dec 2002 22:17:30 -0000	1.119
***************
*** 160,164 ****
     /* Templates */
  
!    $stempl = pslNew("Template",$_PSL['templatedir']);
     $stempl->debug = 0;
  
--- 160,164 ----
     /* Templates */
  
!    $stempl = pslNew("slashTemplate",$_PSL['templatedir']);
     $stempl->debug = 0;
  
***************
*** 196,200 ****
  
     /* Templates */
!    $templ = pslNew("Template",$_PSL['templatedir']);
     $templ->debug = 0;
  
--- 196,200 ----
  
     /* Templates */
!    $templ = pslNew("slashTemplate",$_PSL['templatedir']);
     $templ->debug = 0;
  
***************
*** 529,533 ****
     }
     
!    $templ = pslNew("Template",$_PSL['templatedir']);
     $templ->debug = 0;
  
--- 529,533 ----
     }
     
!    $templ = pslNew("slashTemplate",$_PSL['templatedir']);
     $templ->debug = 0;
  
***************
*** 647,651 ****
  
     
!    $templ = pslNew("Template",$_PSL['templatedir']);
     $templ->debug = 0;
  
--- 647,651 ----
  
     
!    $templ = pslNew("slashTemplate",$_PSL['templatedir']);
     $templ->debug = 0;
  
***************
*** 797,801 ****
        $topic_link = "";
  
!       $template = pslNew("Template",$_PSL['templatedir']);
        $template->debug = 0;
        $template->set_file(array(
--- 797,801 ----
        $topic_link = "";
  
!       $template = pslNew("slashTemplate",$_PSL['templatedir']);
        $template->debug = 0;
        $template->set_file(array(
***************
*** 1457,1461 ****
     }
  
!    $template = pslNew("Template",$_PSL['templatedir'], "remove");;      
     $template->set_file("emailnotify",$tpl);
  
--- 1457,1461 ----
     }
  
!    $template = pslNew("slashTemplate",$_PSL['templatedir'], "remove");;      
     $template->set_file("emailnotify",$tpl);
  

Index: slashAuth.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuth.class,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** slashAuth.class	11 Dec 2002 19:39:56 -0000	1.9
--- slashAuth.class	20 Dec 2002 22:17:30 -0000	1.10
***************
*** 37,41 ****
        global $_PSL;
  
!       $templ = pslNew("Template",$_PSL['templatedir']);
        $templ->set_file(array(
           'form' => "loginform.tpl"
--- 37,41 ----
        global $_PSL;
  
!       $templ = pslNew("slashTemplate",$_PSL['templatedir']);
        $templ->set_file(array(
           'form' => "loginform.tpl"

Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** slashAuthCR.class	11 Dec 2002 19:39:56 -0000	1.34
--- slashAuthCR.class	20 Dec 2002 22:17:30 -0000	1.35
***************
*** 99,103 ****
        } 
  
!       $templ = pslNew("Template",$_PSL['templatedir']);
        $templ->set_file(array(
           'form' => "loginformCR.tpl"
--- 99,103 ----
        } 
  
!       $templ = pslNew("slashTemplate",$_PSL['templatedir']);
        $templ->set_file(array(
           'form' => "loginformCR.tpl"
***************
*** 360,364 ****
        global $sess;
  
!       $templ = pslNew("Template",$this->psl['templatedir']);
        $templ->set_file(array(
           form => "registerform.tpl"
--- 360,364 ----
        global $sess;
  
!       $templ = pslNew("slashTemplate",$this->psl['templatedir']);
        $templ->set_file(array(
           form => "registerform.tpl"

Index: tz.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/tz.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tz.class	11 Dec 2002 19:39:56 -0000	1.2
--- tz.class	20 Dec 2002 22:17:30 -0000	1.3
***************
*** 224,228 ****
  	function get_select_form($action_url='',$method='GET') {
  		$action_url || $action_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'];
! 		$tpl = pslNew("Template",$this->templatedir);
  		// $tpl->debug=true;
  		$tpl->set_file('form','tz_form_native.tpl');
--- 224,228 ----
  	function get_select_form($action_url='',$method='GET') {
  		$action_url || $action_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'];
! 		$tpl = pslNew("slashTemplate",$this->templatedir);
  		// $tpl->debug=true;
  		$tpl->set_file('form','tz_form_native.tpl');
***************
*** 341,345 ****
  	function get_confirm_form($ary,$accept_url="",$reject_url='') {
  		$reject_url || $reject_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'];
! 		$tpl = pslNew("Template",$this->templatedir);
  		$tpl->set_file('form','tz_form_confirm.tpl');
  		$tpl->set_file('current_time','tz_show.tpl');
--- 341,345 ----
  	function get_confirm_form($ary,$accept_url="",$reject_url='') {
  		$reject_url || $reject_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'];
! 		$tpl = pslNew("slashTemplate",$this->templatedir);
  		$tpl->set_file('form','tz_form_confirm.tpl');
  		$tpl->set_file('current_time','tz_show.tpl');

Index: tz_posix.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/tz_posix.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tz_posix.class	11 Dec 2002 19:39:56 -0000	1.3
--- tz_posix.class	20 Dec 2002 22:17:30 -0000	1.4
***************
*** 298,302 ****
  	 */
  	function get_select_form($action_url='',$method='GET') {
! 		$tpl = pslNew("Template",$this->templatedir);
  		$action_url || $action_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'];
  
--- 298,302 ----
  	 */
  	function get_select_form($action_url='',$method='GET') {
! 		$tpl = pslNew("slashTemplate",$this->templatedir);
  		$action_url || $action_url = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'];