updated readme with information on a series of bugs I know exist

[scuttle] / services / templateservice.php

diff --git a/services/templateservice.php b/services/templateservice.php
index 191ab8df67a0592204ad77dad903392c0d7966ff..6675462ba93bd09afc7ad9b8c1b435903449972c 100644 (file)
--- a/services/templateservice.php
+++ b/services/templateservice.php
@@ -1,46 +1,48 @@
 <?php
 class TemplateService {
 <?php
 class TemplateService {

-    var $basedir;
-  
-    function &getInstance() {
-        static $instance;
-        if (!isset($instance))
-            $instance =& new TemplateService();
-        return $instance;
-    }
-  
-    function TemplateService() {
-        $this->basedir = $GLOBALS['TEMPLATES_DIR'];    
+  var $basedir;
+
+  function &getInstance() {
+    static $instance;
+    if (!isset($instance)) {
+      $instance = new TemplateService();

     }
     }

-  
-    function loadTemplate($template, $vars = NULL) {
-        if (substr($template, -4) != '.php')
-            $template .= '.php';
-        $tpl =& new Template($this->basedir .'/'. $template, $vars, $this);
-        $tpl->parse();
-        return $tpl;
+    return $instance;
+  }
+
+  function __construct() {
+    $this->basedir = $GLOBALS['TEMPLATES_DIR'];    
+  }
+
+  function loadTemplate($template, $vars = NULL) {
+    if (substr($template, -4) != '.php') {
+      $template .= '.php';

     }
     }

+    $tpl = new Template($this->basedir .'/'. $template, $vars, $this);
+    $tpl->parse();
+    return $tpl;
+  }

 }
 
 class Template {
 }
 
 class Template {

-    var $vars = array();
-    var $file = '';
-    var $templateservice;
-  
-    function Template($file, $vars = NULL, &$templateservice) {
-        $this->vars = $vars;
-        $this->file = $file;
-        $this->templateservice = $templateservice; 
-    }
-  
-    function parse() {
-        if (isset($this->vars))
-            extract($this->vars);
-        include($this->file);
-    }
-  
-    function includeTemplate($name) {
-        return $this->templateservice->loadTemplate($name, $this->vars);
+  var $vars = array();
+  var $file = '';
+  var $templateservice;
+
+  function __construct($file, $vars = NULL, &$templateservice) {
+    $this->vars = $vars;
+    $this->file = $file;
+    $this->templateservice = $templateservice; 
+  }
+
+  function parse() {
+    if (isset($this->vars)) {
+      extract($this->vars);

     }
     }

+    include $this->file;
+  }
+
+  function includeTemplate($name) {
+    return $this->templateservice->loadTemplate($name, $this->vars);
+  }

 }
 }

-?>
\ No newline at end of file