- reactivated PHP resource for simple PHP templates. Must set allow_php_templates = true to enable

- {PHP} tag can be enabled by allow_php_tag = true

change_log.txt

@@ -1,4 +1,6 @@
-
+10/01/2009
+- reactivated PHP resource for simple PHP templates. Must set allow_php_templates = true to enable
+- {PHP} tag can be enabled by allow_php_tag = true
 
 09/30/2009
 - fixed handling template_exits methode for all resource types

demo/index.php

@@ -6,13 +6,11 @@ $smarty = new Smarty;
 
 
 //$smarty->force_compile = true;
-//$smarty->debugging = true;
+$smarty->debugging = true;
 $smarty->caching = true;
-$smarty->caching_lifetime = 120;
+$smarty->cache_lifetime = 120;
 
-
+$smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill",true);
-
-$smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill");
 $smarty->assign("FirstName",array("John","Mary","James","Henry"));
 $smarty->assign("LastName",array("Doe","Smith","Johnson","Case"));
 $smarty->assign("Class",array(array("A","B","C","D"), array("E", "F", "G", "H"),

demo/index_php_template.php

@@ -5,7 +5,6 @@
 * @package SmartyTestScripts
 */
 require('../libs/Smarty.class.php');
-ini_set('short_open_tag','1');
 
  class Person
 {
@@ -31,11 +30,13 @@ ini_set('short_open_tag','1');
 }  
 
 $smarty = new Smarty();
+$smarty->allow_php_templates= true;
 $smarty->force_compile = false;
-$smarty->caching = false;
+$smarty->caching = true;
-$smarty->cache_lifetime = 10;
+$smarty->cache_lifetime = 100;
+//$smarty->debugging = true;
 
-$smarty->assign('foo','<bar>');
+$smarty->assign('foo',"'bar'");
 
 $person = new Person;
 

demo/templates/index_view.php

@@ -1,11 +1,13 @@
 PHP file test
 $foo is <?=$foo?>
-<br> Test modifier chaining
+<br> Test functions
-<?=$foo->trim()->escape('html')?>
+<? echo trim($foo,"'");?>
 <br>Test objects
-<?=$person->setName('Paul')->setAge(39)->introduce()->trim()->truncate(10)?>
+<?=$person->setName('Paul')->setAge(39)->introduce()?>
 <br>Test Arrays
-<?=$array['a']['aa']->truncate(5)?><?=$array['b']?>
+<?=$array['a']['aa']?> <?=$array['b']?>
-<br>Function
+<br>function time 
-<?=$_f->trim($array['a']['aa'])->truncate(10)?>
+<? echo time();?>
-DONE
+<br>nocache function time 
+<? echo '<? echo time();?>';?>
+<br>DONE

libs/Smarty.class.php

@@ -135,6 +135,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
     public $right_delimiter = "}"; 
     // security
     public $php_handling = SMARTY_PHP_PASSTHRU;
+    public $allow_php_tag = false;
+    public $allow_php_templates = false;
     public $security = false;
     public $security_policy = null;
     public $security_handler = null;

libs/plugins/block.php.php

@@ -25,9 +25,9 @@ function smarty_block_php($params, $content, $smarty, &$repeat, $template)
         $sec_obj = $smarty;
     } 
     if (is_null($content)) {
-    if ($sec_obj->php_handling != SMARTY_PHP_ALLOW) {
+        if (!$smarty->allow_php_tag) {
-        trigger_error("{php} is deprecated, set php_handling = SMARTY_PHP_ALLOW to enable",E_USER_WARNING);
+            trigger_error("{php} is deprecated, set allow_php_tag = true to enable", E_USER_WARNING);
-    } 
+        } 
         return;
     } 
 

libs/sysplugins/internal.resource_stream.php

@@ -30,7 +30,7 @@ class Smarty_Internal_Resource_Stream {
     */
     public function isExisting($template)
     {
-        if ($template->getTemplateSource() === false) {
+        if ($template->getTemplateSource() == '') {
             return false;
         } else {
             return true;

libs/sysplugins/internal.template.php

@@ -461,10 +461,16 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
                 } 
             } 
         } else {
-            throw new Exception("Resource '$this->resource_type' must use compiler");
+            if (is_callable(array($this->resource_objects[$this->resource_type], 'renderUncompiled'))) {
+                $_start_time = $this->_get_time();
+                ob_start();
+                $this->resource_objects[$this->resource_type]->renderUncompiled($this);
+            } else {
+                throw new Exception("Resource '$this->resource_type' must have 'renderUncompiled' methode");
+            } 
         } 
-        $this->render_time += $this->_get_time() - $_start_time;
         $this->rendered_content = ob_get_clean();
+        $this->render_time += $this->_get_time() - $_start_time;
         if (!$this->isEvaluated) {
             $this->properties['file_dependency']['F' . abs(crc32($this->getTemplateFilepath()))] = array($this->getTemplateFilepath(), $this->getTemplateTimestamp());
         } 
@@ -476,10 +482,8 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
         if (!$this->isEvaluated() && $this->caching) {
             // write rendered template
             $this->writeCachedContent($this);
-            if ($this->usesCompiler()) {
                 // cache file may contain nocache code. read it back for processing
                 $this->rendered_content = $this->smarty->cache_resource_objects[$this->caching_type]->getCachedContents($this);
-            } 
         } 
     }