smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-06 03:14:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3.1.15'

Browse Source
This commit is contained in:
Uwe Tews
2014-10-31 01:59:07 +01:00
parent 5ea2a50161 953f6f5a14
commit 4281d16bd4
127 changed files with 7654 additions and 7081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
change_log.txt
View File

@@ -1,4 +1,69 @@
===== Smarty-3.1.14 =====
===== Smarty-3.1.14 =====
01.10.2013
- use current delimiters in compiler error messages (issue 157)
- improvement on performance when using error handler and multiple template folders (issue 152)
17.09.2013
- improvement added patch for additional SmartyCompilerException properties for better access to scource information (forum topic 24559)
16.09.2013
- bugfix recompiled templates did not show on first request with zend opcache cache (forum topic 24320)
13.09.2013
- bugfix html_select_time defaulting error for the Meridian dropdown (forum topic 24549)
09.09.2012
- bugfix incorrect compiled code with array(object,method) callback at registered Variable Filter (forum topic 24542)
27.08.2013
- bugfix delimiter followed by linebreak did not work as auto literal after update from 24.08.2013 (forum topic 24518)
24.08.2013
- bugfix and enhancement
Because several recent problems with template inheritance the {block} tag compiler has been rewriten
- Error messages shown now the correct child template file and line number
- The compiler could fail on some larger UTF-8 text block (forum topic 24455)
- The {strip} tag can now be placed outside {block} tags in child templates (forum topic 24289)
- change SmartyException::$escape is now false by default
- change PHP traceback has been remove for SmartyException and SmartyCompilerException
14.08.2013
- bugfix compiled filepath of config file did not observe different config_dir (forum topic 24493)
13.08.2013
- bugfix the internal resource cache did not observe config_dir changes (forum topic 24493)
12.08.2013
- bugfix internal $tmpx variables must be unique over all inheritance templates (Issue 149)
10.08.2013
- bugfix a newline was eaten when a <?xml ... ?> was passed by a Smarty variable and caching was enabled (forum topic 24482)
29.07.2013
- bugfix headers already send warning thrown when using 'SMARTY_DEBUG=on' from URL (Issue 148)
27.07.2013
- enhancement allow access to properties of registered opjects for Smarty2 BC (forum topic 24344)
26.07.2013
- bugfix template inheritance nesting problem (forum topic 24387)
15.7.2013
- update code generated by PSR-2 standards fixer which introduced PHP 5.4 incompatibilities of 14.7.2013
14.7.2013
- bugfix increase of internal maximum parser stacksize to allow more complex tag code {forum topic 24426}
- update for PHP 5.4 compatibility
- reformat source to PSR-2 standard
12.7.2013
- bugfix Do not remove '//' from file path at normalization (Issue 142)
2.7.2013
- bugfix trimwhitespace would replace captured items in wrong order (forum topic 24387)
===== Smarty-3.1.14 =====
27.06.2013 27.06.2013
- bugfix removed PHP 5.5 deprecated preg_replace /e option in modifier capitalize (forum topic 24389) - bugfix removed PHP 5.5 deprecated preg_replace /e option in modifier capitalize (forum topic 24389)

9
demo/index.php
View File

@@ -5,12 +5,10 @@
* @package Example-application * @package Example-application
*/ */
require('../libs/Smarty.class.php'); require '../libs/Smarty.class.php';
$smarty = new Smarty; $smarty = new Smarty;
//$smarty->force_compile = true; //$smarty->force_compile = true;
$smarty->debugging = true; $smarty->debugging = true;
$smarty->caching = true; $smarty->caching = true;
@@ -20,14 +18,13 @@ $smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill",true);
$smarty->assign("FirstName",array("John","Mary","James","Henry")); $smarty->assign("FirstName",array("John","Mary","James","Henry"));
$smarty->assign("LastName",array("Doe","Smith","Johnson","Case")); $smarty->assign("LastName",array("Doe","Smith","Johnson","Case"));
$smarty->assign("Class",array(array("A","B","C","D"), array("E", "F", "G", "H"), $smarty->assign("Class",array(array("A","B","C","D"), array("E", "F", "G", "H"),
array("I", "J", "K", "L"), array("M", "N", "O", "P"))); array("I", "J", "K", "L"), array("M", "N", "O", "P")));
$smarty->assign("contacts", array(array("phone" => "1", "fax" => "2", "cell" => "3"), $smarty->assign("contacts", array(array("phone" => "1", "fax" => "2", "cell" => "3"),
array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234"))); array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")));
$smarty->assign("option_values", array("NY","NE","KS","IA","OK","TX")); $smarty->assign("option_values", array("NY","NE","KS","IA","OK","TX"));
$smarty->assign("option_output", array("New York","Nebraska","Kansas","Iowa","Oklahoma","Texas")); $smarty->assign("option_output", array("New York","Nebraska","Kansas","Iowa","Oklahoma","Texas"));
$smarty->assign("option_selected", "NE"); $smarty->assign("option_selected", "NE");
$smarty->display('index.tpl'); $smarty->display('index.tpl');
?>

19
demo/plugins/cacheresource.apc.php
View File

@@ -9,12 +9,12 @@
* @package CacheResource-examples * @package CacheResource-examples
* @author Uwe Tews * @author Uwe Tews
*/ */
class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore { class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
{
public function __construct() public function __construct()
{ {
// test if APC is present // test if APC is present
if(!function_exists('apc_cache_info')) { if (!function_exists('apc_cache_info')) {
throw new Exception('APC Template Caching Error: APC is not installed'); throw new Exception('APC Template Caching Error: APC is not installed');
} }
} }
@@ -22,8 +22,8 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore {
/** /**
* Read values for a set of keys from cache * Read values for a set of keys from cache
* *
* @param array $keys list of keys to fetch * @param array $keys list of keys to fetch
* @return array list of values with the given keys used as indexes * @return array list of values with the given keys used as indexes
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
protected function read(array $keys) protected function read(array $keys)
@@ -33,14 +33,15 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore {
foreach ($res as $k => $v) { foreach ($res as $k => $v) {
$_res[$k] = $v; $_res[$k] = $v;
} }
return $_res; return $_res;
} }
/** /**
* Save values for a set of keys to cache * Save values for a set of keys to cache
* *
* @param array $keys list of values to save * @param array $keys list of values to save
* @param int $expire expiration time * @param int $expire expiration time
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
protected function write(array $keys, $expire=null) protected function write(array $keys, $expire=null)
@@ -48,13 +49,14 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore {
foreach ($keys as $k => $v) { foreach ($keys as $k => $v) {
apc_store($k, $v, $expire); apc_store($k, $v, $expire);
} }
return true; return true;
} }
/** /**
* Remove values from cache * Remove values from cache
* *
* @param array $keys list of keys to delete * @param array $keys list of keys to delete
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
protected function delete(array $keys) protected function delete(array $keys)
@@ -62,6 +64,7 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore {
foreach ($keys as $k) { foreach ($keys as $k) {
apc_delete($k); apc_delete($k);
} }
return true; return true;
} }

16
demo/plugins/cacheresource.memcache.php
View File

@@ -12,7 +12,8 @@
* @package CacheResource-examples * @package CacheResource-examples
* @author Rodney Rehm * @author Rodney Rehm
*/ */
class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore { class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
{
/** /**
* memcache instance * memcache instance
* @var Memcache * @var Memcache
@@ -28,8 +29,8 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore {
/** /**
* Read values for a set of keys from cache * Read values for a set of keys from cache
* *
* @param array $keys list of keys to fetch * @param array $keys list of keys to fetch
* @return array list of values with the given keys used as indexes * @return array list of values with the given keys used as indexes
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
protected function read(array $keys) protected function read(array $keys)
@@ -45,14 +46,15 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore {
foreach ($res as $k => $v) { foreach ($res as $k => $v) {
$_res[$lookup[$k]] = $v; $_res[$lookup[$k]] = $v;
} }
return $_res; return $_res;
} }
/** /**
* Save values for a set of keys to cache * Save values for a set of keys to cache
* *
* @param array $keys list of values to save * @param array $keys list of values to save
* @param int $expire expiration time * @param int $expire expiration time
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
protected function write(array $keys, $expire=null) protected function write(array $keys, $expire=null)
@@ -61,13 +63,14 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore {
$k = sha1($k); $k = sha1($k);
$this->memcache->set($k, $v, 0, $expire); $this->memcache->set($k, $v, 0, $expire);
} }
return true; return true;
} }
/** /**
* Remove values from cache * Remove values from cache
* *
* @param array $keys list of keys to delete * @param array $keys list of keys to delete
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
protected function delete(array $keys) protected function delete(array $keys)
@@ -76,6 +79,7 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore {
$k = sha1($k); $k = sha1($k);
$this->memcache->delete($k); $this->memcache->delete($k);
} }
return true; return true;
} }

56
demo/plugins/cacheresource.mysql.php
View File

@@ -24,16 +24,18 @@
* @package CacheResource-examples * @package CacheResource-examples
* @author Rodney Rehm * @author Rodney Rehm
*/ */
class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom { class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
{
// PDO instance // PDO instance
protected $db; protected $db;
protected $fetch; protected $fetch;
protected $fetchTimestamp; protected $fetchTimestamp;
protected $save; protected $save;
public function __construct() { public function __construct()
{
try { try {
$this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty"); $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
} catch (PDOException $e) { } catch (PDOException $e) {
throw new SmartyException('Mysql Resource failed: ' . $e->getMessage()); throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
} }
@@ -46,12 +48,12 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom {
/** /**
* fetch cached content and its modification time from data source * fetch cached content and its modification time from data source
* *
* @param string $id unique cache content identifier * @param string $id unique cache content identifier
* @param string $name template name * @param string $name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param string $content cached content * @param string $content cached content
* @param integer $mtime cache modification timestamp (epoch) * @param integer $mtime cache modification timestamp (epoch)
* @return void * @return void
*/ */
protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime) protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
@@ -72,10 +74,10 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom {
* Fetch cached content's modification timestamp from data source * Fetch cached content's modification timestamp from data source
* *
* @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the complete cached content. * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the complete cached content.
* @param string $id unique cache content identifier * @param string $id unique cache content identifier
* @param string $name template name * @param string $name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @return integer|boolean timestamp (epoch) the template was modified, or false if not found * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
*/ */
protected function fetchTimestamp($id, $name, $cache_id, $compile_id) protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
@@ -83,19 +85,20 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom {
$this->fetchTimestamp->execute(array('id' => $id)); $this->fetchTimestamp->execute(array('id' => $id));
$mtime = strtotime($this->fetchTimestamp->fetchColumn()); $mtime = strtotime($this->fetchTimestamp->fetchColumn());
$this->fetchTimestamp->closeCursor(); $this->fetchTimestamp->closeCursor();
return $mtime; return $mtime;
} }
/** /**
* Save content to cache * Save content to cache
* *
* @param string $id unique cache content identifier * @param string $id unique cache content identifier
* @param string $name template name * @param string $name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param integer|null $exp_time seconds till expiration time in seconds or null * @param integer|null $exp_time seconds till expiration time in seconds or null
* @param string $content content to cache * @param string $content content to cache
* @return boolean success * @return boolean success
*/ */
protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content) protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
{ {
@@ -106,17 +109,18 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom {
'compile_id' => $compile_id, 'compile_id' => $compile_id,
'content' => $content, 'content' => $content,
)); ));
return !!$this->save->rowCount(); return !!$this->save->rowCount();
} }
/** /**
* Delete content from cache * Delete content from cache
* *
* @param string $name template name * @param string $name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param integer|null $exp_time seconds till expiration or null * @param integer|null $exp_time seconds till expiration or null
* @return integer number of deleted caches * @return integer number of deleted caches
*/ */
protected function delete($name, $cache_id, $compile_id, $exp_time) protected function delete($name, $cache_id, $compile_id, $exp_time)
{ {
@@ -124,6 +128,7 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom {
if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) { if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
// returning the number of deleted caches would require a second query to count them // returning the number of deleted caches would require a second query to count them
$query = $this->db->query('TRUNCATE TABLE output_cache'); $query = $this->db->query('TRUNCATE TABLE output_cache');
return -1; return -1;
} }
// build the filter // build the filter
@@ -147,6 +152,7 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom {
} }
// run delete query // run delete query
$query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where)); $query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where));
return $query->rowCount(); return $query->rowCount();
} }
} }

14
demo/plugins/resource.extendsall.php
View File

@@ -9,13 +9,13 @@
* @package Resource-examples * @package Resource-examples
* @author Rodney Rehm * @author Rodney Rehm
*/ */
class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends { class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends
{
/** /**
* populate Source Object with meta data from Resource * populate Source Object with meta data from Resource
* *
* @param Smarty_Template_Source $source source object * @param Smarty_Template_Source $source source object
* @param Smarty_Internal_Template $_template template object * @param Smarty_Internal_Template $_template template object
* @return void * @return void
*/ */
public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
@@ -31,13 +31,13 @@ class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends {
} }
$sources[$s->uid] = $s; $sources[$s->uid] = $s;
$uid .= $s->filepath; $uid .= $s->filepath;
} } catch (SmartyException $e) {}
catch (SmartyException $e) {}
} }
if (!$sources) { if (!$sources) {
$source->exists = false; $source->exists = false;
$source->template = $_template; $source->template = $_template;
return; return;
} }
@@ -56,5 +56,3 @@ class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends {
$source->template = $_template; $source->template = $_template;
} }
} }
?>

20
demo/plugins/resource.mysql.php
View File

@@ -20,7 +20,8 @@
* @package Resource-examples * @package Resource-examples
* @author Rodney Rehm * @author Rodney Rehm
*/ */
class Smarty_Resource_Mysql extends Smarty_Resource_Custom { class Smarty_Resource_Mysql extends Smarty_Resource_Custom
{
// PDO instance // PDO instance
protected $db; protected $db;
// prepared fetch() statement // prepared fetch() statement
@@ -28,9 +29,10 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom {
// prepared fetchTimestamp() statement // prepared fetchTimestamp() statement
protected $mtime; protected $mtime;
public function __construct() { public function __construct()
{
try { try {
$this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty"); $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
} catch (PDOException $e) { } catch (PDOException $e) {
throw new SmartyException('Mysql Resource failed: ' . $e->getMessage()); throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
} }
@@ -41,9 +43,9 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom {
/** /**
* Fetch a template and its modification time from database * Fetch a template and its modification time from database
* *
* @param string $name template name * @param string $name template name
* @param string $source template source * @param string $source template source
* @param integer $mtime template modification timestamp (epoch) * @param integer $mtime template modification timestamp (epoch)
* @return void * @return void
*/ */
protected function fetch($name, &$source, &$mtime) protected function fetch($name, &$source, &$mtime)
@@ -64,13 +66,15 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom {
* Fetch a template's modification time from database * Fetch a template's modification time from database
* *
* @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source. * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source.
* @param string $name template name * @param string $name template name
* @return integer timestamp (epoch) the template was modified * @return integer timestamp (epoch) the template was modified
*/ */
protected function fetchTimestamp($name) { protected function fetchTimestamp($name)
{
$this->mtime->execute(array('name' => $name)); $this->mtime->execute(array('name' => $name));
$mtime = $this->mtime->fetchColumn(); $mtime = $this->mtime->fetchColumn();
$this->mtime->closeCursor(); $this->mtime->closeCursor();
return strtotime($mtime); return strtotime($mtime);
} }
} }

14
demo/plugins/resource.mysqls.php
View File

@@ -23,15 +23,17 @@
* @package Resource-examples * @package Resource-examples
* @author Rodney Rehm * @author Rodney Rehm
*/ */
class Smarty_Resource_Mysqls extends Smarty_Resource_Custom { class Smarty_Resource_Mysqls extends Smarty_Resource_Custom
{
// PDO instance // PDO instance
protected $db; protected $db;
// prepared fetch() statement // prepared fetch() statement
protected $fetch; protected $fetch;
public function __construct() { public function __construct()
{
try { try {
$this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty"); $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
} catch (PDOException $e) { } catch (PDOException $e) {
throw new SmartyException('Mysql Resource failed: ' . $e->getMessage()); throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
} }
@@ -41,9 +43,9 @@ class Smarty_Resource_Mysqls extends Smarty_Resource_Custom {
/** /**
* Fetch a template and its modification time from database * Fetch a template and its modification time from database
* *
* @param string $name template name * @param string $name template name
* @param string $source template source * @param string $source template source
* @param integer $mtime template modification timestamp (epoch) * @param integer $mtime template modification timestamp (epoch)
* @return void * @return void
*/ */
protected function fetch($name, &$source, &$mtime) protected function fetch($name, &$source, &$mtime)

200
libs/Smarty.class.php
View File

@@ -104,8 +104,8 @@ include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_cacheresource_file.php';
* This is the main Smarty class * This is the main Smarty class
* @package Smarty * @package Smarty
*/ */
class Smarty extends Smarty_Internal_TemplateBase { class Smarty extends Smarty_Internal_TemplateBase
{
/**#@+ /**#@+
* constant definitions * constant definitions
*/ */
@@ -633,7 +633,6 @@ class Smarty extends Smarty_Internal_TemplateBase {
} }
} }
/** /**
* Class destructor * Class destructor
*/ */
@@ -650,14 +649,13 @@ class Smarty extends Smarty_Internal_TemplateBase {
$this->smarty = $this; $this->smarty = $this;
} }
/** /**
* <<magic>> Generic getter. * <<magic>> Generic getter.
* *
* Calls the appropriate getter function. * Calls the appropriate getter function.
* Issues an E_USER_NOTICE if no valid getter is found. * Issues an E_USER_NOTICE if no valid getter is found.
* *
* @param string $name property name * @param string $name property name
* @return mixed * @return mixed
*/ */
public function __get($name) public function __get($name)
@@ -706,7 +704,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Check if a template resource exists * Check if a template resource exists
* *
* @param string $resource_name template name * @param string $resource_name template name
* @return boolean status * @return boolean status
*/ */
public function templateExists($resource_name) public function templateExists($resource_name)
@@ -717,14 +715,15 @@ class Smarty extends Smarty_Internal_TemplateBase {
// check if it does exists // check if it does exists
$result = $tpl->source->exists; $result = $tpl->source->exists;
$this->template_objects = $save; $this->template_objects = $save;
return $result; return $result;
} }
/** /**
* Returns a single or all global variables * Returns a single or all global variables
* *
* @param object $smarty * @param object $smarty
* @param string $varname variable name or null * @param string $varname variable name or null
* @return string variable value or or array of variables * @return string variable value or or array of variables
*/ */
public function getGlobal($varname = null) public function getGlobal($varname = null)
@@ -740,6 +739,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
foreach (self::$global_tpl_vars AS $key => $var) { foreach (self::$global_tpl_vars AS $key => $var) {
$_result[$key] = $var->value; $_result[$key] = $var->value;
} }
return $_result; return $_result;
} }
} }
@@ -747,26 +747,27 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Empty cache folder * Empty cache folder
* *
* @param integer $exp_time expiration time * @param integer $exp_time expiration time
* @param string $type resource type * @param string $type resource type
* @return integer number of cache files deleted * @return integer number of cache files deleted
*/ */
function clearAllCache($exp_time = null, $type = null) public function clearAllCache($exp_time = null, $type = null)
{ {
// load cache resource and call clearAll // load cache resource and call clearAll
$_cache_resource = Smarty_CacheResource::load($this, $type); $_cache_resource = Smarty_CacheResource::load($this, $type);
Smarty_CacheResource::invalidLoadedCache($this); Smarty_CacheResource::invalidLoadedCache($this);
return $_cache_resource->clearAll($this, $exp_time); return $_cache_resource->clearAll($this, $exp_time);
} }
/** /**
* Empty cache for a specific template * Empty cache for a specific template
* *
* @param string $template_name template name * @param string $template_name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param integer $exp_time expiration time * @param integer $exp_time expiration time
* @param string $type resource type * @param string $type resource type
* @return integer number of cache files deleted * @return integer number of cache files deleted
*/ */
public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null) public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
@@ -774,20 +775,22 @@ class Smarty extends Smarty_Internal_TemplateBase {
// load cache resource and call clear // load cache resource and call clear
$_cache_resource = Smarty_CacheResource::load($this, $type); $_cache_resource = Smarty_CacheResource::load($this, $type);
Smarty_CacheResource::invalidLoadedCache($this); Smarty_CacheResource::invalidLoadedCache($this);
return $_cache_resource->clear($this, $template_name, $cache_id, $compile_id, $exp_time); return $_cache_resource->clear($this, $template_name, $cache_id, $compile_id, $exp_time);
} }
/** /**
* Loads security class and enables security * Loads security class and enables security
* *
* @param string|Smarty_Security $security_class if a string is used, it must be class-name * @param string|Smarty_Security $security_class if a string is used, it must be class-name
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
* @throws SmartyException when an invalid class name is provided * @throws SmartyException when an invalid class name is provided
*/ */
public function enableSecurity($security_class = null) public function enableSecurity($security_class = null)
{ {
if ($security_class instanceof Smarty_Security) { if ($security_class instanceof Smarty_Security) {
$this->security_policy = $security_class; $this->security_policy = $security_class;
return $this; return $this;
} elseif (is_object($security_class)) { } elseif (is_object($security_class)) {
throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security."); throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
@@ -820,8 +823,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Set template directory * Set template directory
* *
* @param string|array $template_dir directory(s) of template sources * @param string|array $template_dir directory(s) of template sources
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
*/ */
public function setTemplateDir($template_dir) public function setTemplateDir($template_dir)
{ {
@@ -831,15 +834,16 @@ class Smarty extends Smarty_Internal_TemplateBase {
} }
$this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir); $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
return $this; return $this;
} }
/** /**
* Add template directory(s) * Add template directory(s)
* *
* @param string|array $template_dir directory(s) of template sources * @param string|array $template_dir directory(s) of template sources
* @param string $key of the array element to assign the template dir to * @param string $key of the array element to assign the template dir to
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
* @throws SmartyException when the given template directory is not valid * @throws SmartyException when the given template directory is not valid
*/ */
public function addTemplateDir($template_dir, $key=null) public function addTemplateDir($template_dir, $key=null)
@@ -865,6 +869,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
$this->template_dir[] = rtrim($template_dir, '/\\') . DS; $this->template_dir[] = rtrim($template_dir, '/\\') . DS;
} }
$this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir); $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
return $this; return $this;
} }
@@ -880,14 +885,14 @@ class Smarty extends Smarty_Internal_TemplateBase {
return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null; return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null;
} }
return (array)$this->template_dir; return (array) $this->template_dir;
} }
/** /**
* Set config directory * Set config directory
* *
* @param string|array $template_dir directory(s) of configuration sources * @param string|array $template_dir directory(s) of configuration sources
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
*/ */
public function setConfigDir($config_dir) public function setConfigDir($config_dir)
{ {
@@ -897,6 +902,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
} }
$this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir); $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
return $this; return $this;
} }
@@ -922,7 +928,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
$this->config_dir[$k] = rtrim($v, '/\\') . DS; $this->config_dir[$k] = rtrim($v, '/\\') . DS;
} }
} }
} elseif( $key !== null ) { } elseif ($key !== null) {
// override directory at specified index // override directory at specified index
$this->config_dir[$key] = rtrim($config_dir, '/\\') . DS; $this->config_dir[$key] = rtrim($config_dir, '/\\') . DS;
} else { } else {
@@ -931,6 +937,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
} }
$this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir); $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
return $this; return $this;
} }
@@ -946,19 +953,19 @@ class Smarty extends Smarty_Internal_TemplateBase {
return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null; return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null;
} }
return (array)$this->config_dir; return (array) $this->config_dir;
} }
/** /**
* Set plugins directory * Set plugins directory
* *
* @param string|array $plugins_dir directory(s) of plugins * @param string|array $plugins_dir directory(s) of plugins
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
*/ */
public function setPluginsDir($plugins_dir) public function setPluginsDir($plugins_dir)
{ {
$this->plugins_dir = array(); $this->plugins_dir = array();
foreach ((array)$plugins_dir as $k => $v) { foreach ((array) $plugins_dir as $k => $v) {
$this->plugins_dir[$k] = rtrim($v, '/\\') . DS; $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
} }
@@ -993,6 +1000,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
} }
$this->plugins_dir = array_unique($this->plugins_dir); $this->plugins_dir = array_unique($this->plugins_dir);
return $this; return $this;
} }
@@ -1003,13 +1011,13 @@ class Smarty extends Smarty_Internal_TemplateBase {
*/ */
public function getPluginsDir() public function getPluginsDir()
{ {
return (array)$this->plugins_dir; return (array) $this->plugins_dir;
} }
/** /**
* Set compile directory * Set compile directory
* *
* @param string $compile_dir directory to store compiled templates in * @param string $compile_dir directory to store compiled templates in
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
*/ */
public function setCompileDir($compile_dir) public function setCompileDir($compile_dir)
@@ -1018,6 +1026,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
if (!isset(Smarty::$_muted_directories[$this->compile_dir])) { if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
Smarty::$_muted_directories[$this->compile_dir] = null; Smarty::$_muted_directories[$this->compile_dir] = null;
} }
return $this; return $this;
} }
@@ -1034,7 +1043,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Set cache directory * Set cache directory
* *
* @param string $cache_dir directory to store cached templates in * @param string $cache_dir directory to store cached templates in
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
*/ */
public function setCacheDir($cache_dir) public function setCacheDir($cache_dir)
@@ -1043,6 +1052,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
if (!isset(Smarty::$_muted_directories[$this->cache_dir])) { if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
Smarty::$_muted_directories[$this->cache_dir] = null; Smarty::$_muted_directories[$this->cache_dir] = null;
} }
return $this; return $this;
} }
@@ -1059,20 +1069,21 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Set default modifiers * Set default modifiers
* *
* @param array|string $modifiers modifier or list of modifiers to set * @param array|string $modifiers modifier or list of modifiers to set
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
*/ */
public function setDefaultModifiers($modifiers) public function setDefaultModifiers($modifiers)
{ {
$this->default_modifiers = (array) $modifiers; $this->default_modifiers = (array) $modifiers;
return $this; return $this;
} }
/** /**
* Add default modifiers * Add default modifiers
* *
* @param array|string $modifiers modifier or list of modifiers to add * @param array|string $modifiers modifier or list of modifiers to add
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
*/ */
public function addDefaultModifiers($modifiers) public function addDefaultModifiers($modifiers)
{ {
@@ -1099,8 +1110,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Set autoload filters * Set autoload filters
* *
* @param array $filters filters to load automatically * @param array $filters filters to load automatically
* @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
*/ */
public function setAutoloadFilters($filters, $type=null) public function setAutoloadFilters($filters, $type=null)
@@ -1117,8 +1128,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Add autoload filters * Add autoload filters
* *
* @param array $filters filters to load automatically * @param array $filters filters to load automatically
* @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
*/ */
public function addAutoloadFilters($filters, $type=null) public function addAutoloadFilters($filters, $type=null)
@@ -1145,8 +1156,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Get autoload filters * Get autoload filters
* *
* @param string $type type of filter to get autoloads for. Defaults to all autoload filters * @param string $type type of filter to get autoloads for. Defaults to all autoload filters
* @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified
*/ */
public function getAutoloadFilters($type=null) public function getAutoloadFilters($type=null)
{ {
@@ -1170,8 +1181,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* set the debug template * set the debug template
* *
* @param string $tpl_name * @param string $tpl_name
* @return Smarty current Smarty instance for chaining * @return Smarty current Smarty instance for chaining
* @throws SmartyException if file is not readable * @throws SmartyException if file is not readable
*/ */
public function setDebugTemplate($tpl_name) public function setDebugTemplate($tpl_name)
@@ -1187,12 +1198,12 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* creates a template object * creates a template object
* *
* @param string $template the resource handle of the template file * @param string $template the resource handle of the template file
* @param mixed $cache_id cache id to be used with this template * @param mixed $cache_id cache id to be used with this template
* @param mixed $compile_id compile id to be used with this template * @param mixed $compile_id compile id to be used with this template
* @param object $parent next higher level of Smarty variables * @param object $parent next higher level of Smarty variables
* @param boolean $do_clone flag is Smarty object shall be cloned * @param boolean $do_clone flag is Smarty object shall be cloned
* @return object template object * @return object template object
*/ */
public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true) public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
{ {
@@ -1247,6 +1258,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
$tpl->tpl_vars[$_key] = new Smarty_variable($_val); $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
} }
} }
return $tpl; return $tpl;
} }
@@ -1256,8 +1268,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
* class name format: Smarty_PluginType_PluginName * class name format: Smarty_PluginType_PluginName
* plugin filename format: plugintype.pluginname.php * plugin filename format: plugintype.pluginname.php
* *
* @param string $plugin_name class plugin name to load * @param string $plugin_name class plugin name to load
* @param bool $check check if already loaded * @param bool $check check if already loaded
* @return string |boolean filepath of loaded file or false * @return string |boolean filepath of loaded file or false
*/ */
public function loadPlugin($plugin_name, $check = true) public function loadPlugin($plugin_name, $check = true)
@@ -1272,6 +1284,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
// count($_name_parts) < 3 === !isset($_name_parts[2]) // count($_name_parts) < 3 === !isset($_name_parts[2])
if (!isset($_name_parts[2]) || strtolower($_name_parts[0]) !== 'smarty') { if (!isset($_name_parts[2]) || strtolower($_name_parts[0]) !== 'smarty') {
throw new SmartyException("plugin {$plugin_name} is not a valid name format"); throw new SmartyException("plugin {$plugin_name} is not a valid name format");
return false; return false;
} }
// if type is "internal", get plugin from sysplugins // if type is "internal", get plugin from sysplugins
@@ -1279,6 +1292,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
$file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php'; $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
if (file_exists($file)) { if (file_exists($file)) {
require_once($file); require_once($file);
return $file; return $file;
} else { } else {
return false; return false;
@@ -1290,7 +1304,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
$_stream_resolve_include_path = function_exists('stream_resolve_include_path'); $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
// loop through plugin dirs and find the plugin // loop through plugin dirs and find the plugin
foreach($this->getPluginsDir() as $_plugin_dir) { foreach ($this->getPluginsDir() as $_plugin_dir) {
$names = array( $names = array(
$_plugin_dir . $_plugin_filename, $_plugin_dir . $_plugin_filename,
$_plugin_dir . strtolower($_plugin_filename), $_plugin_dir . strtolower($_plugin_filename),
@@ -1298,6 +1312,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
foreach ($names as $file) { foreach ($names as $file) {
if (file_exists($file)) { if (file_exists($file)) {
require_once($file); require_once($file);
return $file; return $file;
} }
if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) { if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
@@ -1310,6 +1325,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
if ($file !== false) { if ($file !== false) {
require_once($file); require_once($file);
return $file; return $file;
} }
} }
@@ -1322,10 +1338,10 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Compile all template files * Compile all template files
* *
* @param string $extension file extension * @param string $extension file extension
* @param bool $force_compile force all to recompile * @param bool $force_compile force all to recompile
* @param int $time_limit * @param int $time_limit
* @param int $max_errors * @param int $max_errors
* @return integer number of template files recompiled * @return integer number of template files recompiled
*/ */
public function compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null) public function compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
@@ -1336,10 +1352,10 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Compile all config files * Compile all config files
* *
* @param string $extension file extension * @param string $extension file extension
* @param bool $force_compile force all to recompile * @param bool $force_compile force all to recompile
* @param int $time_limit * @param int $time_limit
* @param int $max_errors * @param int $max_errors
* @return integer number of template files recompiled * @return integer number of template files recompiled
*/ */
public function compileAllConfig($extension = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null) public function compileAllConfig($extension = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
@@ -1350,9 +1366,9 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Delete compiled template file * Delete compiled template file
* *
* @param string $resource_name template name * @param string $resource_name template name
* @param string $compile_id compile id * @param string $compile_id compile id
* @param integer $exp_time expiration time * @param integer $exp_time expiration time
* @return integer number of template files deleted * @return integer number of template files deleted
*/ */
public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
@@ -1364,8 +1380,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Return array of tag/attributes of all tags used by an template * Return array of tag/attributes of all tags used by an template
* *
* @param object $templae template object * @param object $templae template object
* @return array of tag/attributes * @return array of tag/attributes
*/ */
public function getTags(Smarty_Internal_Template $template) public function getTags(Smarty_Internal_Template $template)
{ {
@@ -1375,7 +1391,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
/** /**
* Run installation test * Run installation test
* *
* @param array $errors Array to write errors into, rather than outputting them * @param array $errors Array to write errors into, rather than outputting them
* @return boolean true if setup is fine, false if something is wrong * @return boolean true if setup is fine, false if something is wrong
*/ */
public function testInstall(&$errors=null) public function testInstall(&$errors=null)
@@ -1387,7 +1403,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
* Error Handler to mute expected messages * Error Handler to mute expected messages
* *
* @link http://php.net/set_error_handler * @link http://php.net/set_error_handler
* @param integer $errno Error level * @param integer $errno Error level
* @return boolean * @return boolean
*/ */
public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext) public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
@@ -1492,10 +1508,13 @@ if (Smarty::$_CHARSET !== 'UTF-8') {
* Smarty exception class * Smarty exception class
* @package Smarty * @package Smarty
*/ */
class SmartyException extends Exception { class SmartyException extends Exception
public static $escape = true; {
public function __construct($message) { public static $escape = false;
$this->message = self::$escape ? htmlentities($message) : $message;
public function __toString()
{
return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';
} }
} }
@@ -1503,7 +1522,32 @@ class SmartyException extends Exception {
* Smarty compiler exception class * Smarty compiler exception class
* @package Smarty * @package Smarty
*/ */
class SmartyCompilerException extends SmartyException { class SmartyCompilerException extends SmartyException
{
public function __toString()
{
return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
}
/**
* The line number of the template error
* @type int|null
*/
public $line = null;
/**
* The template source snippet relating to the error
* @type string|null
*/
public $source = null;
/**
* The raw text of the error message
* @type string|null
*/
public $desc = null;
/**
* The resource identifier or template name
* @type string|null
*/
public $template = null;
} }
/** /**
@@ -1512,7 +1556,7 @@ class SmartyCompilerException extends SmartyException {
function smartyAutoload($class) function smartyAutoload($class)
{ {
$_class = strtolower($class); $_class = strtolower($class);
$_classes = array( static $_classes = array(
'smarty_config_source' => true, 'smarty_config_source' => true,
'smarty_config_compiled' => true, 'smarty_config_compiled' => true,
'smarty_security' => true, 'smarty_security' => true,
@@ -1529,5 +1573,3 @@ function smartyAutoload($class)
include SMARTY_SYSPLUGINS_DIR . $_class . '.php'; include SMARTY_SYSPLUGINS_DIR . $_class . '.php';
} }
} }
?>

53
libs/SmartyBC.class.php
View File

@@ -39,8 +39,8 @@ require(dirname(__FILE__) . '/Smarty.class.php');
* *
* @package Smarty * @package Smarty
*/ */
class SmartyBC extends Smarty { class SmartyBC extends Smarty
{
/** /**
* Smarty 2 BC * Smarty 2 BC
* @var string * @var string
@@ -118,10 +118,10 @@ class SmartyBC extends Smarty {
/** /**
* Registers object to be used in templates * Registers object to be used in templates
* *
* @param string $object name of template object * @param string $object name of template object
* @param object $object_impl the referenced PHP object to register * @param object $object_impl the referenced PHP object to register
* @param array $allowed list of allowed methods (empty = all) * @param array $allowed list of allowed methods (empty = all)
* @param boolean $smarty_args smarty argument format, else traditional * @param boolean $smarty_args smarty argument format, else traditional
* @param array $block_functs list of methods that are block format * @param array $block_functs list of methods that are block format
*/ */
public function register_object($object, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array()) public function register_object($object, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
@@ -144,8 +144,8 @@ class SmartyBC extends Smarty {
/** /**
* Registers block function to be used in templates * Registers block function to be used in templates
* *
* @param string $block name of template block * @param string $block name of template block
* @param string $block_impl PHP function to register * @param string $block_impl PHP function to register
* @param bool $cacheable * @param bool $cacheable
* @param mixed $cache_attrs * @param mixed $cache_attrs
*/ */
@@ -189,7 +189,7 @@ class SmartyBC extends Smarty {
/** /**
* Registers modifier to be used in templates * Registers modifier to be used in templates
* *
* @param string $modifier name of template modifier * @param string $modifier name of template modifier
* @param string $modifier_impl name of PHP function to register * @param string $modifier_impl name of PHP function to register
*/ */
public function register_modifier($modifier, $modifier_impl) public function register_modifier($modifier, $modifier_impl)
@@ -305,10 +305,10 @@ class SmartyBC extends Smarty {
/** /**
* clear cached content for the given template and cache id * clear cached content for the given template and cache id
* *
* @param string $tpl_file name of template file * @param string $tpl_file name of template file
* @param string $cache_id name of cache_id * @param string $cache_id name of cache_id
* @param string $compile_id name of compile_id * @param string $compile_id name of compile_id
* @param string $exp_time expiration time * @param string $exp_time expiration time
* @return boolean * @return boolean
*/ */
public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null) public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
@@ -319,7 +319,7 @@ class SmartyBC extends Smarty {
/** /**
* clear the entire contents of cache (all templates) * clear the entire contents of cache (all templates)
* *
* @param string $exp_time expire time * @param string $exp_time expire time
* @return boolean * @return boolean
*/ */
public function clear_all_cache($exp_time = null) public function clear_all_cache($exp_time = null)
@@ -330,9 +330,9 @@ class SmartyBC extends Smarty {
/** /**
* test to see if valid cache exists for this template * test to see if valid cache exists for this template
* *
* @param string $tpl_file name of template file * @param string $tpl_file name of template file
* @param string $cache_id * @param string $cache_id
* @param string $compile_id * @param string $compile_id
* @return boolean * @return boolean
*/ */
public function is_cached($tpl_file, $cache_id = null, $compile_id = null) public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
@@ -353,9 +353,9 @@ class SmartyBC extends Smarty {
* or all compiled template files if one is not specified. * or all compiled template files if one is not specified.
* This function is for advanced use only, not normally needed. * This function is for advanced use only, not normally needed.
* *
* @param string $tpl_file * @param string $tpl_file
* @param string $compile_id * @param string $compile_id
* @param string $exp_time * @param string $exp_time
* @return boolean results of {@link smarty_core_rm_auto()} * @return boolean results of {@link smarty_core_rm_auto()}
*/ */
public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null) public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
@@ -366,7 +366,7 @@ class SmartyBC extends Smarty {
/** /**
* Checks whether requested template exists. * Checks whether requested template exists.
* *
* @param string $tpl_file * @param string $tpl_file
* @return boolean * @return boolean
*/ */
public function template_exists($tpl_file) public function template_exists($tpl_file)
@@ -377,7 +377,7 @@ class SmartyBC extends Smarty {
/** /**
* Returns an array containing template variables * Returns an array containing template variables
* *
* @param string $name * @param string $name
* @return array * @return array
*/ */
public function get_template_vars($name=null) public function get_template_vars($name=null)
@@ -388,7 +388,7 @@ class SmartyBC extends Smarty {
/** /**
* Returns an array containing config variables * Returns an array containing config variables
* *
* @param string $name * @param string $name
* @return array * @return array
*/ */
public function get_config_vars($name=null) public function get_config_vars($name=null)
@@ -411,7 +411,7 @@ class SmartyBC extends Smarty {
/** /**
* return a reference to a registered object * return a reference to a registered object
* *
* @param string $name * @param string $name
* @return object * @return object
*/ */
public function get_registered_object($name) public function get_registered_object($name)
@@ -432,7 +432,7 @@ class SmartyBC extends Smarty {
/** /**
* trigger Smarty error * trigger Smarty error
* *
* @param string $error_msg * @param string $error_msg
* @param integer $error_type * @param integer $error_type
*/ */
public function trigger_error($error_msg, $error_type = E_USER_WARNING) public function trigger_error($error_msg, $error_type = E_USER_WARNING)
@@ -454,7 +454,6 @@ class SmartyBC extends Smarty {
function smarty_php_tag($params, $content, $template, &$repeat) function smarty_php_tag($params, $content, $template, &$repeat)
{ {
eval($content); eval($content);
return ''; return '';
} }
?>

9
libs/plugins/block.textformat.php
View File

@@ -53,17 +53,17 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
case 'indent_char': case 'indent_char':
case 'wrap_char': case 'wrap_char':
case 'assign': case 'assign':
$$_key = (string)$_val; $$_key = (string) $_val;
break; break;
case 'indent': case 'indent':
case 'indent_first': case 'indent_first':
case 'wrap': case 'wrap':
$$_key = (int)$_val; $$_key = (int) $_val;
break; break;
case 'wrap_cut': case 'wrap_cut':
$$_key = (bool)$_val; $$_key = (bool) $_val;
break; break;
default: default:
@@ -78,7 +78,6 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
$_paragraphs = preg_split('![\r\n]{2}!', $content); $_paragraphs = preg_split('![\r\n]{2}!', $content);
$_output = ''; $_output = '';
foreach ($_paragraphs as &$_paragraph) { foreach ($_paragraphs as &$_paragraph) {
if (!$_paragraph) { if (!$_paragraph) {
continue; continue;
@@ -109,5 +108,3 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
return $_output; return $_output;
} }
} }
?>

6
libs/plugins/function.counter.php
View File

@@ -35,7 +35,7 @@ function smarty_function_counter($params, $template)
$counter =& $counters[$name]; $counter =& $counters[$name];
if (isset($params['start'])) { if (isset($params['start'])) {
$counter['start'] = $counter['count'] = (int)$params['start']; $counter['start'] = $counter['count'] = (int) $params['start'];
} }
if (!empty($params['assign'])) { if (!empty($params['assign'])) {
@@ -47,7 +47,7 @@ function smarty_function_counter($params, $template)
} }
if (isset($params['print'])) { if (isset($params['print'])) {
$print = (bool)$params['print']; $print = (bool) $params['print'];
} else { } else {
$print = empty($counter['assign']); $print = empty($counter['assign']);
} }
@@ -74,5 +74,3 @@ function smarty_function_counter($params, $template)
return $retval; return $retval;
} }
?>

19
libs/plugins/function.cycle.php
View File

@@ -48,13 +48,14 @@ function smarty_function_cycle($params, $template)
static $cycle_vars; static $cycle_vars;
$name = (empty($params['name'])) ? 'default' : $params['name']; $name = (empty($params['name'])) ? 'default' : $params['name'];
$print = (isset($params['print'])) ? (bool)$params['print'] : true; $print = (isset($params['print'])) ? (bool) $params['print'] : true;
$advance = (isset($params['advance'])) ? (bool)$params['advance'] : true; $advance = (isset($params['advance'])) ? (bool) $params['advance'] : true;
$reset = (isset($params['reset'])) ? (bool)$params['reset'] : false; $reset = (isset($params['reset'])) ? (bool) $params['reset'] : false;
if (!isset($params['values'])) { if (!isset($params['values'])) {
if(!isset($cycle_vars[$name]['values'])) { if (!isset($cycle_vars[$name]['values'])) {
trigger_error("cycle: missing 'values' parameter"); trigger_error("cycle: missing 'values' parameter");
return; return;
} }
} else { } else {
@@ -71,13 +72,13 @@ function smarty_function_cycle($params, $template)
$cycle_vars[$name]['delimiter'] = ','; $cycle_vars[$name]['delimiter'] = ',';
} }
if(is_array($cycle_vars[$name]['values'])) { if (is_array($cycle_vars[$name]['values'])) {
$cycle_array = $cycle_vars[$name]['values']; $cycle_array = $cycle_vars[$name]['values'];
} else { } else {
$cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']); $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
} }
if(!isset($cycle_vars[$name]['index']) || $reset ) { if (!isset($cycle_vars[$name]['index']) || $reset ) {
$cycle_vars[$name]['index'] = 0; $cycle_vars[$name]['index'] = 0;
} }
@@ -86,13 +87,13 @@ function smarty_function_cycle($params, $template)
$template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]); $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
} }
if($print) { if ($print) {
$retval = $cycle_array[$cycle_vars[$name]['index']]; $retval = $cycle_array[$cycle_vars[$name]['index']];
} else { } else {
$retval = null; $retval = null;
} }
if($advance) { if ($advance) {
if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) { if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
$cycle_vars[$name]['index'] = 0; $cycle_vars[$name]['index'] = 0;
} else { } else {
@@ -102,5 +103,3 @@ function smarty_function_cycle($params, $template)
return $retval; return $retval;
} }
?>

69
libs/plugins/function.fetch.php
View File

@@ -24,6 +24,7 @@ function smarty_function_fetch($params, $template)
{ {
if (empty($params['file'])) { if (empty($params['file'])) {
trigger_error("[plugin] fetch parameter 'file' cannot be empty",E_USER_NOTICE); trigger_error("[plugin] fetch parameter 'file' cannot be empty",E_USER_NOTICE);
return; return;
} }
@@ -40,12 +41,12 @@ function smarty_function_fetch($params, $template)
if (isset($template->smarty->security_policy)) { if (isset($template->smarty->security_policy)) {
if ($protocol) { if ($protocol) {
// remote resource (or php stream, …) // remote resource (or php stream, …)
if(!$template->smarty->security_policy->isTrustedUri($params['file'])) { if (!$template->smarty->security_policy->isTrustedUri($params['file'])) {
return; return;
} }
} else { } else {
// local file // local file
if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) { if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
return; return;
} }
} }
@@ -54,7 +55,7 @@ function smarty_function_fetch($params, $template)
$content = ''; $content = '';
if ($protocol == 'http') { if ($protocol == 'http') {
// http fetch // http fetch
if($uri_parts = parse_url($params['file'])) { if ($uri_parts = parse_url($params['file'])) {
// set defaults // set defaults
$host = $server_name = $uri_parts['host']; $host = $server_name = $uri_parts['host'];
$timeout = 30; $timeout = 30;
@@ -64,43 +65,44 @@ function smarty_function_fetch($params, $template)
$uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/'; $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
$uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : ''; $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
$_is_proxy = false; $_is_proxy = false;
if(empty($uri_parts['port'])) { if (empty($uri_parts['port'])) {
$port = 80; $port = 80;
} else { } else {
$port = $uri_parts['port']; $port = $uri_parts['port'];
} }
if(!empty($uri_parts['user'])) { if (!empty($uri_parts['user'])) {
$user = $uri_parts['user']; $user = $uri_parts['user'];
} }
if(!empty($uri_parts['pass'])) { if (!empty($uri_parts['pass'])) {
$pass = $uri_parts['pass']; $pass = $uri_parts['pass'];
} }
// loop through parameters, setup headers // loop through parameters, setup headers
foreach($params as $param_key => $param_value) { foreach ($params as $param_key => $param_value) {
switch($param_key) { switch ($param_key) {
case "file": case "file":
case "assign": case "assign":
case "assign_headers": case "assign_headers":
break; break;
case "user": case "user":
if(!empty($param_value)) { if (!empty($param_value)) {
$user = $param_value; $user = $param_value;
} }
break; break;
case "pass": case "pass":
if(!empty($param_value)) { if (!empty($param_value)) {
$pass = $param_value; $pass = $param_value;
} }
break; break;
case "accept": case "accept":
if(!empty($param_value)) { if (!empty($param_value)) {
$accept = $param_value; $accept = $param_value;
} }
break; break;
case "header": case "header":
if(!empty($param_value)) { if (!empty($param_value)) {
if(!preg_match('![\w\d-]+: .+!',$param_value)) { if (!preg_match('![\w\d-]+: .+!',$param_value)) {
trigger_error("[plugin] invalid header format '".$param_value."'",E_USER_NOTICE); trigger_error("[plugin] invalid header format '".$param_value."'",E_USER_NOTICE);
return; return;
} else { } else {
$extra_headers[] = $param_value; $extra_headers[] = $param_value;
@@ -108,80 +110,84 @@ function smarty_function_fetch($params, $template)
} }
break; break;
case "proxy_host": case "proxy_host":
if(!empty($param_value)) { if (!empty($param_value)) {
$proxy_host = $param_value; $proxy_host = $param_value;
} }
break; break;
case "proxy_port": case "proxy_port":
if(!preg_match('!\D!', $param_value)) { if (!preg_match('!\D!', $param_value)) {
$proxy_port = (int) $param_value; $proxy_port = (int) $param_value;
} else { } else {
trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE); trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
return; return;
} }
break; break;
case "agent": case "agent":
if(!empty($param_value)) { if (!empty($param_value)) {
$agent = $param_value; $agent = $param_value;
} }
break; break;
case "referer": case "referer":
if(!empty($param_value)) { if (!empty($param_value)) {
$referer = $param_value; $referer = $param_value;
} }
break; break;
case "timeout": case "timeout":
if(!preg_match('!\D!', $param_value)) { if (!preg_match('!\D!', $param_value)) {
$timeout = (int) $param_value; $timeout = (int) $param_value;
} else { } else {
trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE); trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
return; return;
} }
break; break;
default: default:
trigger_error("[plugin] unrecognized attribute '".$param_key."'",E_USER_NOTICE); trigger_error("[plugin] unrecognized attribute '".$param_key."'",E_USER_NOTICE);
return; return;
} }
} }
if(!empty($proxy_host) && !empty($proxy_port)) { if (!empty($proxy_host) && !empty($proxy_port)) {
$_is_proxy = true; $_is_proxy = true;
$fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout); $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout);
} else { } else {
$fp = fsockopen($server_name,$port,$errno,$errstr,$timeout); $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
} }
if(!$fp) { if (!$fp) {
trigger_error("[plugin] unable to fetch: $errstr ($errno)",E_USER_NOTICE); trigger_error("[plugin] unable to fetch: $errstr ($errno)",E_USER_NOTICE);
return; return;
} else { } else {
if($_is_proxy) { if ($_is_proxy) {
fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n"); fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
} else { } else {
fputs($fp, "GET $uri HTTP/1.0\r\n"); fputs($fp, "GET $uri HTTP/1.0\r\n");
} }
if(!empty($host)) { if (!empty($host)) {
fputs($fp, "Host: $host\r\n"); fputs($fp, "Host: $host\r\n");
} }
if(!empty($accept)) { if (!empty($accept)) {
fputs($fp, "Accept: $accept\r\n"); fputs($fp, "Accept: $accept\r\n");
} }
if(!empty($agent)) { if (!empty($agent)) {
fputs($fp, "User-Agent: $agent\r\n"); fputs($fp, "User-Agent: $agent\r\n");
} }
if(!empty($referer)) { if (!empty($referer)) {
fputs($fp, "Referer: $referer\r\n"); fputs($fp, "Referer: $referer\r\n");
} }
if(isset($extra_headers) && is_array($extra_headers)) { if (isset($extra_headers) && is_array($extra_headers)) {
foreach($extra_headers as $curr_header) { foreach ($extra_headers as $curr_header) {
fputs($fp, $curr_header."\r\n"); fputs($fp, $curr_header."\r\n");
} }
} }
if(!empty($user) && !empty($pass)) { if (!empty($user) && !empty($pass)) {
fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n"); fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n");
} }
fputs($fp, "\r\n"); fputs($fp, "\r\n");
while(!feof($fp)) { while (!feof($fp)) {
$content .= fgets($fp,4096); $content .= fgets($fp,4096);
} }
fclose($fp); fclose($fp);
@@ -189,12 +195,13 @@ function smarty_function_fetch($params, $template)
$content = $csplit[1]; $content = $csplit[1];
if(!empty($params['assign_headers'])) { if (!empty($params['assign_headers'])) {
$template->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0])); $template->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0]));
} }
} }
} else { } else {
trigger_error("[plugin fetch] unable to parse URL, check syntax",E_USER_NOTICE); trigger_error("[plugin fetch] unable to parse URL, check syntax",E_USER_NOTICE);
return; return;
} }
} else { } else {
@@ -210,5 +217,3 @@ function smarty_function_fetch($params, $template)
return $content; return $content;
} }
} }
?>

16
libs/plugins/function.html_checkboxes.php
View File

@@ -58,8 +58,8 @@ function smarty_function_html_checkboxes($params, $template)
$extra = ''; $extra = '';
foreach($params as $_key => $_val) { foreach ($params as $_key => $_val) {
switch($_key) { switch ($_key) {
case 'name': case 'name':
case 'separator': case 'separator':
$$_key = (string) $_val; $$_key = (string) $_val;
@@ -134,7 +134,7 @@ function smarty_function_html_checkboxes($params, $template)
// omit break; to fall through! // omit break; to fall through!
default: default:
if(!is_array($_val)) { if (!is_array($_val)) {
$extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"'; $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
} else { } else {
trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE); trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
@@ -159,7 +159,7 @@ function smarty_function_html_checkboxes($params, $template)
} }
} }
if(!empty($params['assign'])) { if (!empty($params['assign'])) {
$template->assign($params['assign'], $_html_result); $template->assign($params['assign'], $_html_result);
} else { } else {
return implode("\n", $_html_result); return implode("\n", $_html_result);
@@ -167,7 +167,8 @@ function smarty_function_html_checkboxes($params, $template)
} }
function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape=true) { function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape=true)
{
$_output = ''; $_output = '';
if (is_object($value)) { if (is_object($value)) {
@@ -175,6 +176,7 @@ function smarty_function_html_checkboxes_output($name, $value, $output, $selecte
$value = (string) $value->__toString(); $value = (string) $value->__toString();
} else { } else {
trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE); trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
return ''; return '';
} }
} else { } else {
@@ -186,6 +188,7 @@ function smarty_function_html_checkboxes_output($name, $value, $output, $selecte
$output = (string) $output->__toString(); $output = (string) $output->__toString();
} else { } else {
trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE); trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE);
return ''; return '';
} }
} else { } else {
@@ -227,7 +230,6 @@ function smarty_function_html_checkboxes_output($name, $value, $output, $selecte
} }
$_output .= $separator; $_output .= $separator;
return $_output; return $_output;
} }
?>

14
libs/plugins/function.html_image.php
View File

@@ -47,7 +47,7 @@ function smarty_function_html_image($params, $template)
$suffix = ''; $suffix = '';
$path_prefix = ''; $path_prefix = '';
$basedir = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : ''; $basedir = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : '';
foreach($params as $_key => $_val) { foreach ($params as $_key => $_val) {
switch ($_key) { switch ($_key) {
case 'file': case 'file':
case 'height': case 'height':
@@ -84,6 +84,7 @@ function smarty_function_html_image($params, $template)
if (empty($file)) { if (empty($file)) {
trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE); trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
return; return;
} }
@@ -106,12 +107,12 @@ function smarty_function_html_image($params, $template)
if (isset($template->smarty->security_policy)) { if (isset($template->smarty->security_policy)) {
if ($protocol) { if ($protocol) {
// remote resource (or php stream, …) // remote resource (or php stream, …)
if(!$template->smarty->security_policy->isTrustedUri($params['file'])) { if (!$template->smarty->security_policy->isTrustedUri($params['file'])) {
return; return;
} }
} else { } else {
// local file // local file
if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) { if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
return; return;
} }
} }
@@ -122,12 +123,15 @@ function smarty_function_html_image($params, $template)
if (!$_image_data = @getimagesize($_image_path)) { if (!$_image_data = @getimagesize($_image_path)) {
if (!file_exists($_image_path)) { if (!file_exists($_image_path)) {
trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE); trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
return; return;
} else if (!is_readable($_image_path)) { } elseif (!is_readable($_image_path)) {
trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE); trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
return; return;
} else { } else {
trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE); trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
return; return;
} }
} }
@@ -155,5 +159,3 @@ function smarty_function_html_image($params, $template)
return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix; return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix;
} }
?>

6
libs/plugins/function.html_options.php
View File

@@ -120,6 +120,7 @@ function smarty_function_html_options($params, $template)
if (!isset($options) && !isset($values)) { if (!isset($options) && !isset($values)) {
/* raise error here? */ /* raise error here? */
return ''; return '';
} }
@@ -165,6 +166,7 @@ function smarty_function_html_options_optoutput($key, $value, $selected, $id, $c
$value = smarty_function_escape_special_chars((string) $value->__toString()); $value = smarty_function_escape_special_chars((string) $value->__toString());
} else { } else {
trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE); trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
return ''; return '';
} }
} else { } else {
@@ -177,6 +179,7 @@ function smarty_function_html_options_optoutput($key, $value, $selected, $id, $c
$_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id.'-'.$idx) : null, $class, $_idx); $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id.'-'.$idx) : null, $class, $_idx);
$idx++; $idx++;
} }
return $_html_result; return $_html_result;
} }
@@ -187,7 +190,6 @@ function smarty_function_html_options_optgroup($key, $values, $selected, $id, $c
$optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx); $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
} }
$optgroup_html .= "</optgroup>\n"; $optgroup_html .= "</optgroup>\n";
return $optgroup_html; return $optgroup_html;
} }
?>

8
libs/plugins/function.html_radios.php
View File

@@ -57,7 +57,7 @@ function smarty_function_html_radios($params, $template)
$output = null; $output = null;
$extra = ''; $extra = '';
foreach($params as $_key => $_val) { foreach ($params as $_key => $_val) {
switch ($_key) { switch ($_key) {
case 'name': case 'name':
case 'separator': case 'separator':
@@ -131,6 +131,7 @@ function smarty_function_html_radios($params, $template)
if (!isset($options) && !isset($values)) { if (!isset($options) && !isset($values)) {
/* raise error here? */ /* raise error here? */
return ''; return '';
} }
@@ -163,6 +164,7 @@ function smarty_function_html_radios_output($name, $value, $output, $selected, $
$value = (string) $value->__toString(); $value = (string) $value->__toString();
} else { } else {
trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE); trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
return ''; return '';
} }
} else { } else {
@@ -174,6 +176,7 @@ function smarty_function_html_radios_output($name, $value, $output, $selected, $
$output = (string) $output->__toString(); $output = (string) $output->__toString();
} else { } else {
trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE); trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE);
return ''; return '';
} }
} else { } else {
@@ -211,7 +214,6 @@ function smarty_function_html_radios_output($name, $value, $output, $selected, $
} }
$_output .= $separator; $_output .= $separator;
return $_output; return $_output;
} }
?>

19
libs/plugins/function.html_select_date.php
View File

@@ -155,7 +155,7 @@ function smarty_function_html_select_date($params, $template)
case 'month_id': case 'month_id':
case 'day_id': case 'day_id':
case 'year_id': case 'year_id':
$$_key = (string)$_value; $$_key = (string) $_value;
break; break;
case 'display_days': case 'display_days':
@@ -163,7 +163,7 @@ function smarty_function_html_select_date($params, $template)
case 'display_years': case 'display_years':
case 'year_as_text': case 'year_as_text':
case 'reverse_years': case 'reverse_years':
$$_key = (bool)$_value; $$_key = (bool) $_value;
break; break;
default: default:
@@ -217,13 +217,13 @@ function smarty_function_html_select_date($params, $template)
$key .= '_year'; $key .= '_year';
$t = $$key; $t = $$key;
if ($t === null) { if ($t === null) {
$$key = (int)$_current_year; $$key = (int) $_current_year;
} else if ($t[0] == '+') { } elseif ($t[0] == '+') {
$$key = (int)($_current_year + trim(substr($t, 1))); $$key = (int) ($_current_year + trim(substr($t, 1)));
} else if ($t[0] == '-') { } elseif ($t[0] == '-') {
$$key = (int)($_current_year - trim(substr($t, 1))); $$key = (int) ($_current_year - trim(substr($t, 1)));
} else { } else {
$$key = (int)$$key; $$key = (int) $$key;
} }
} }
@@ -388,7 +388,6 @@ function smarty_function_html_select_date($params, $template)
break; break;
} }
} }
return $_html; return $_html;
} }
?>

10
libs/plugins/function.html_select_time.php
View File

@@ -117,7 +117,7 @@ function smarty_function_html_select_time($params, $template)
case 'minute_value_format': case 'minute_value_format':
case 'second_format': case 'second_format':
case 'second_value_format': case 'second_value_format':
$$_key = (string)$_value; $$_key = (string) $_value;
break; break;
case 'display_hours': case 'display_hours':
@@ -125,7 +125,7 @@ function smarty_function_html_select_time($params, $template)
case 'display_seconds': case 'display_seconds':
case 'display_meridian': case 'display_meridian':
case 'use_24_hours': case 'use_24_hours':
$$_key = (bool)$_value; $$_key = (bool) $_value;
break; break;
case 'minute_interval': case 'minute_interval':
@@ -135,7 +135,7 @@ function smarty_function_html_select_time($params, $template)
case 'minute_size': case 'minute_size':
case 'second_size': case 'second_size':
case 'meridian_size': case 'meridian_size':
$$_key = (int)$_value; $$_key = (int) $_value;
break; break;
default: default:
@@ -345,7 +345,7 @@ function smarty_function_html_select_time($params, $template)
$_html_meridian .= '<option value="">' . ( isset($meridian_empty) ? $meridian_empty : $all_empty ) . '</option>' . $option_separator; $_html_meridian .= '<option value="">' . ( isset($meridian_empty) ? $meridian_empty : $all_empty ) . '</option>' . $option_separator;
} }
$_html_meridian .= '<option value="am"'. ($_hour < 12 ? ' selected="selected"' : '') .'>AM</option>' . $option_separator $_html_meridian .= '<option value="am"'. ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .'>AM</option>' . $option_separator
. '<option value="pm"'. ($_hour < 12 ? '' : ' selected="selected"') .'>PM</option>' . $option_separator . '<option value="pm"'. ($_hour < 12 ? '' : ' selected="selected"') .'>PM</option>' . $option_separator
. '</select>'; . '</select>';
} }
@@ -362,5 +362,3 @@ function smarty_function_html_select_time($params, $template)
return $_html; return $_html;
} }
?>

11
libs/plugins/function.html_table.php
View File

@@ -64,13 +64,14 @@ function smarty_function_html_table($params, $template)
if (!isset($params['loop'])) { if (!isset($params['loop'])) {
trigger_error("html_table: missing 'loop' parameter",E_USER_WARNING); trigger_error("html_table: missing 'loop' parameter",E_USER_WARNING);
return; return;
} }
foreach ($params as $_key => $_value) { foreach ($params as $_key => $_value) {
switch ($_key) { switch ($_key) {
case 'loop': case 'loop':
$$_key = (array)$_value; $$_key = (array) $_value;
break; break;
case 'cols': case 'cols':
@@ -81,14 +82,14 @@ function smarty_function_html_table($params, $template)
$cols = explode(',', $_value); $cols = explode(',', $_value);
$cols_count = count($cols); $cols_count = count($cols);
} elseif (!empty($_value)) { } elseif (!empty($_value)) {
$cols_count = (int)$_value; $cols_count = (int) $_value;
} else { } else {
$cols_count = $cols; $cols_count = $cols;
} }
break; break;
case 'rows': case 'rows':
$$_key = (int)$_value; $$_key = (int) $_value;
break; break;
case 'table_attr': case 'table_attr':
@@ -97,7 +98,7 @@ function smarty_function_html_table($params, $template)
case 'vdir': case 'vdir':
case 'inner': case 'inner':
case 'caption': case 'caption':
$$_key = (string)$_value; $$_key = (string) $_value;
break; break;
case 'tr_attr': case 'tr_attr':
@@ -173,5 +174,3 @@ function smarty_function_html_table_cycle($name, $var, $no)
return ($ret) ? ' ' . $ret : ''; return ($ret) ? ' ' . $ret : '';
} }
?>

8
libs/plugins/function.mailto.php
View File

@@ -55,6 +55,7 @@ function smarty_function_mailto($params, $template)
if (empty($params['address'])) { if (empty($params['address'])) {
trigger_error("mailto: missing 'address' parameter",E_USER_WARNING); trigger_error("mailto: missing 'address' parameter",E_USER_WARNING);
return; return;
} else { } else {
$address = $params['address']; $address = $params['address'];
@@ -95,6 +96,7 @@ function smarty_function_mailto($params, $template)
$encode = (empty($params['encode'])) ? 'none' : $params['encode']; $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
if (!isset($_allowed_encoding[$encode])) { if (!isset($_allowed_encoding[$encode])) {
trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex", E_USER_WARNING); trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex", E_USER_WARNING);
return; return;
} }
// FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed! // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
@@ -110,7 +112,7 @@ function smarty_function_mailto($params, $template)
} elseif ($encode == 'javascript_charcode') { } elseif ($encode == 'javascript_charcode') {
$string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>'; $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
for($x = 0, $y = strlen($string); $x < $y; $x++) { for ($x = 0, $y = strlen($string); $x < $y; $x++) {
$ord[] = ord($string[$x]); $ord[] = ord($string[$x]);
} }
@@ -126,6 +128,7 @@ function smarty_function_mailto($params, $template)
preg_match('!^(.*)(\?.*)$!', $address, $match); preg_match('!^(.*)(\?.*)$!', $address, $match);
if (!empty($match[2])) { if (!empty($match[2])) {
trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.",E_USER_WARNING); trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.",E_USER_WARNING);
return; return;
} }
$address_encode = ''; $address_encode = '';
@@ -142,11 +145,10 @@ function smarty_function_mailto($params, $template)
} }
$mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;"; $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>'; return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
} else { } else {
// no encoding // no encoding
return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>'; return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
} }
} }
?>

13
libs/plugins/function.math.php
View File

@@ -31,6 +31,7 @@ function smarty_function_math($params, $template)
// be sure equation parameter is present // be sure equation parameter is present
if (empty($params['equation'])) { if (empty($params['equation'])) {
trigger_error("math: missing equation parameter",E_USER_WARNING); trigger_error("math: missing equation parameter",E_USER_WARNING);
return; return;
} }
@@ -39,28 +40,32 @@ function smarty_function_math($params, $template)
// make sure parenthesis are balanced // make sure parenthesis are balanced
if (substr_count($equation,"(") != substr_count($equation,")")) { if (substr_count($equation,"(") != substr_count($equation,")")) {
trigger_error("math: unbalanced parenthesis",E_USER_WARNING); trigger_error("math: unbalanced parenthesis",E_USER_WARNING);
return; return;
} }
// match all vars in equation, make sure all are passed // match all vars in equation, make sure all are passed
preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match); preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
foreach($match[1] as $curr_var) { foreach ($match[1] as $curr_var) {
if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) { if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) {
trigger_error("math: function call $curr_var not allowed",E_USER_WARNING); trigger_error("math: function call $curr_var not allowed",E_USER_WARNING);
return; return;
} }
} }
foreach($params as $key => $val) { foreach ($params as $key => $val) {
if ($key != "equation" && $key != "format" && $key != "assign") { if ($key != "equation" && $key != "format" && $key != "assign") {
// make sure value is not empty // make sure value is not empty
if (strlen($val)==0) { if (strlen($val)==0) {
trigger_error("math: parameter $key is empty",E_USER_WARNING); trigger_error("math: parameter $key is empty",E_USER_WARNING);
return; return;
} }
if (!is_numeric($val)) { if (!is_numeric($val)) {
trigger_error("math: parameter $key: is not numeric",E_USER_WARNING); trigger_error("math: parameter $key: is not numeric",E_USER_WARNING);
return; return;
} }
$equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation); $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
@@ -76,12 +81,10 @@ function smarty_function_math($params, $template)
$template->assign($params['assign'],$smarty_math_result); $template->assign($params['assign'],$smarty_math_result);
} }
} else { } else {
if (empty($params['assign'])){ if (empty($params['assign'])) {
printf($params['format'],$smarty_math_result); printf($params['format'],$smarty_math_result);
} else { } else {
$template->assign($params['assign'],sprintf($params['format'],$smarty_math_result)); $template->assign($params['assign'],sprintf($params['format'],$smarty_math_result));
} }
} }
} }
?>

8
libs/plugins/modifier.capitalize.php
View File

@@ -35,12 +35,13 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
// check uc_digits case // check uc_digits case
if (!$uc_digits) { if (!$uc_digits) {
if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) { if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
foreach($matches[1] as $match) { foreach ($matches[1] as $match) {
$upper_string = substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1], strlen($match[0])); $upper_string = substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1], strlen($match[0]));
} }
} }
} }
$upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, create_function ('$matches', 'return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[3]),MB_CASE_UPPER, "' . addslashes(Smarty::$_CHARSET) . '");'), $upper_string); $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, create_function ('$matches', 'return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[3]),MB_CASE_UPPER, "' . addslashes(Smarty::$_CHARSET) . '");'), $upper_string);
return $upper_string; return $upper_string;
} }
@@ -53,13 +54,12 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
// check uc_digits case // check uc_digits case
if (!$uc_digits) { if (!$uc_digits) {
if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) { if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
foreach($matches[1] as $match) { foreach ($matches[1] as $match) {
$upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0])); $upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0]));
} }
} }
} }
$upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, create_function ('$matches', 'return stripslashes($matches[1]).ucfirst(stripslashes($matches[3]));'), $upper_string); $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, create_function ('$matches', 'return stripslashes($matches[1]).ucfirst(stripslashes($matches[3]));'), $upper_string);
return $upper_string; return $upper_string;
} }
?>

5
libs/plugins/modifier.date_format.php
View File

@@ -42,7 +42,7 @@ function smarty_modifier_date_format($string, $format=null, $default_date='', $f
} else { } else {
return; return;
} }
if($formatter=='strftime'||($formatter=='auto'&&strpos($format,'%')!==false)) { if ($formatter=='strftime'||($formatter=='auto'&&strpos($format,'%')!==false)) {
if (DS == '\\') { if (DS == '\\') {
$_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T'); $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
$_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S'); $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
@@ -56,10 +56,9 @@ function smarty_modifier_date_format($string, $format=null, $default_date='', $f
} }
$format = str_replace($_win_from, $_win_to, $format); $format = str_replace($_win_from, $_win_to, $format);
} }
return strftime($format, $timestamp); return strftime($format, $timestamp);
} else { } else {
return date($format, $timestamp); return date($format, $timestamp);
} }
} }
?>

2
libs/plugins/modifier.debug_print_var.php
View File

@@ -101,5 +101,3 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
return $results; return $results;
} }
?>

13
libs/plugins/modifier.escape.php
View File

@@ -46,6 +46,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
$string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
$string = htmlspecialchars($string, ENT_QUOTES, $char_set); $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
$string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
return $string; return $string;
} }
} }
@@ -65,6 +66,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
$string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
$string = htmlspecialchars($string, ENT_QUOTES, $char_set); $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
$string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
return $string; return $string;
} }
} }
@@ -83,6 +85,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
$string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
$string = htmlentities($string, ENT_QUOTES, $char_set); $string = htmlentities($string, ENT_QUOTES, $char_set);
$string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
return $string; return $string;
} }
} }
@@ -105,6 +108,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
for ($x = 0; $x < $_length; $x++) { for ($x = 0; $x < $_length; $x++) {
$return .= '%' . bin2hex($string[$x]); $return .= '%' . bin2hex($string[$x]);
} }
return $return; return $return;
case 'hexentity': case 'hexentity':
@@ -115,6 +119,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) { foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
$return .= '&#x' . strtoupper(dechex($unicode)) . ';'; $return .= '&#x' . strtoupper(dechex($unicode)) . ';';
} }
return $return; return $return;
} }
// no MBString fallback // no MBString fallback
@@ -122,6 +127,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
for ($x = 0; $x < $_length; $x++) { for ($x = 0; $x < $_length; $x++) {
$return .= '&#x' . bin2hex($string[$x]) . ';'; $return .= '&#x' . bin2hex($string[$x]) . ';';
} }
return $return; return $return;
case 'decentity': case 'decentity':
@@ -132,6 +138,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) { foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
$return .= '&#' . $unicode . ';'; $return .= '&#' . $unicode . ';';
} }
return $return; return $return;
} }
// no MBString fallback // no MBString fallback
@@ -139,6 +146,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
for ($x = 0; $x < $_length; $x++) { for ($x = 0; $x < $_length; $x++) {
$return .= '&#' . ord($string[$x]) . ';'; $return .= '&#' . ord($string[$x]) . ';';
} }
return $return; return $return;
case 'javascript': case 'javascript':
@@ -148,6 +156,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
case 'mail': case 'mail':
if (Smarty::$_MBSTRING) { if (Smarty::$_MBSTRING) {
require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php'); require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string); return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
} }
// no MBString fallback // no MBString fallback
@@ -165,6 +174,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
$return .= chr($unicode); $return .= chr($unicode);
} }
} }
return $return; return $return;
} }
@@ -178,11 +188,10 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
$return .= substr($string, $_i, 1); $return .= substr($string, $_i, 1);
} }
} }
return $return; return $return;
default: default:
return $string; return $string;
} }
} }
?>

8
libs/plugins/modifier.regex_replace.php
View File

@@ -23,13 +23,14 @@
*/ */
function smarty_modifier_regex_replace($string, $search, $replace) function smarty_modifier_regex_replace($string, $search, $replace)
{ {
if(is_array($search)) { if (is_array($search)) {
foreach($search as $idx => $s) { foreach ($search as $idx => $s) {
$search[$idx] = _smarty_regex_replace_check($s); $search[$idx] = _smarty_regex_replace_check($s);
} }
} else { } else {
$search = _smarty_regex_replace_check($search); $search = _smarty_regex_replace_check($search);
} }
return preg_replace($search, $replace, $string); return preg_replace($search, $replace, $string);
} }
@@ -49,7 +50,6 @@ function _smarty_regex_replace_check($search)
if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) { if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
$search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]); $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
} }
return $search; return $search;
} }
?>

3
libs/plugins/modifier.replace.php
View File

@@ -24,10 +24,9 @@ function smarty_modifier_replace($string, $search, $replace)
{ {
if (Smarty::$_MBSTRING) { if (Smarty::$_MBSTRING) {
require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php'); require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
return smarty_mb_str_replace($search, $replace, $string); return smarty_mb_str_replace($search, $replace, $string);
} }
return str_replace($search, $replace, $string); return str_replace($search, $replace, $string);
} }
?>

2
libs/plugins/modifier.spacify.php
View File

@@ -23,5 +23,3 @@ function smarty_modifier_spacify($string, $spacify_char = ' ')
// well… what about charsets besides latin and UTF-8? // well… what about charsets besides latin and UTF-8?
return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY)); return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
} }
?>

9
libs/plugins/modifier.truncate.php
View File

@@ -24,7 +24,8 @@
* @param boolean $middle truncate in the middle of text * @param boolean $middle truncate in the middle of text
* @return string truncated string * @return string truncated string
*/ */
function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false) { function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
{
if ($length == 0) if ($length == 0)
return ''; return '';
@@ -37,8 +38,10 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_wo
if (!$middle) { if (!$middle) {
return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc; return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
} }
return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc . mb_substr($string, - $length / 2, $length, Smarty::$_CHARSET); return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc . mb_substr($string, - $length / 2, $length, Smarty::$_CHARSET);
} }
return $string; return $string;
} }
@@ -51,9 +54,9 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_wo
if (!$middle) { if (!$middle) {
return substr($string, 0, $length) . $etc; return substr($string, 0, $length) . $etc;
} }
return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2); return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
} }
return $string; return $string;
} }
?>

2
libs/plugins/modifiercompiler.cat.php
View File

@@ -26,5 +26,3 @@ function smarty_modifiercompiler_cat($params, $compiler)
{ {
return '('.implode(').(', $params).')'; return '('.implode(').(', $params).')';
} }
?>

2
libs/plugins/modifiercompiler.count_characters.php
View File

@@ -29,5 +29,3 @@ function smarty_modifiercompiler_count_characters($params, $compiler)
// no MBString fallback // no MBString fallback
return 'strlen(' . $params[0] . ')'; return 'strlen(' . $params[0] . ')';
} }
?>

2
libs/plugins/modifiercompiler.count_paragraphs.php
View File

@@ -24,5 +24,3 @@ function smarty_modifiercompiler_count_paragraphs($params, $compiler)
// count \r or \n characters // count \r or \n characters
return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)'; return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)';
} }
?>

2
libs/plugins/modifiercompiler.count_sentences.php
View File

@@ -24,5 +24,3 @@ function smarty_modifiercompiler_count_sentences($params, $compiler)
// find periods, question marks, exclamation marks with a word before but not after. // find periods, question marks, exclamation marks with a word before but not after.
return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[0] . ', $tmp)'; return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[0] . ', $tmp)';
} }
?>

2
libs/plugins/modifiercompiler.count_words.php
View File

@@ -28,5 +28,3 @@ function smarty_modifiercompiler_count_words($params, $compiler)
// no MBString fallback // no MBString fallback
return 'str_word_count(' . $params[0] . ')'; return 'str_word_count(' . $params[0] . ')';
} }
?>

3
libs/plugins/modifiercompiler.default.php
View File

@@ -29,7 +29,6 @@ function smarty_modifiercompiler_default ($params, $compiler)
foreach ($params as $param) { foreach ($params as $param) {
$output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)'; $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
} }
return $output; return $output;
} }
?>

11
libs/plugins/modifiercompiler.escape.php
View File

@@ -46,7 +46,7 @@ function smarty_modifiercompiler_escape($params, $compiler)
. $params[0] .', ENT_QUOTES, ' . $params[0] .', ENT_QUOTES, '
. var_export($char_set, true) . ', ' . var_export($char_set, true) . ', '
. var_export($double_encode, true) . ')'; . var_export($double_encode, true) . ')';
} else if ($double_encode) { } elseif ($double_encode) {
return 'htmlspecialchars(' return 'htmlspecialchars('
. $params[0] .', ENT_QUOTES, ' . $params[0] .', ENT_QUOTES, '
. var_export($char_set, true) . ')'; . var_export($char_set, true) . ')';
@@ -64,7 +64,7 @@ function smarty_modifiercompiler_escape($params, $compiler)
. var_export($double_encode, true) . var_export($double_encode, true)
. '), "HTML-ENTITIES", ' . '), "HTML-ENTITIES", '
. var_export($char_set, true) . ')'; . var_export($char_set, true) . ')';
} else if ($double_encode) { } elseif ($double_encode) {
// php <5.2.3 - only handle double encoding // php <5.2.3 - only handle double encoding
return 'mb_convert_encoding(htmlspecialchars(' return 'mb_convert_encoding(htmlspecialchars('
. $params[0] .', ENT_QUOTES, ' . $params[0] .', ENT_QUOTES, '
@@ -83,7 +83,7 @@ function smarty_modifiercompiler_escape($params, $compiler)
. $params[0] .', ENT_QUOTES, ' . $params[0] .', ENT_QUOTES, '
. var_export($char_set, true) . ', ' . var_export($char_set, true) . ', '
. var_export($double_encode, true) . ')'; . var_export($double_encode, true) . ')';
} else if ($double_encode) { } elseif ($double_encode) {
// php <5.2.3 - only handle double encoding // php <5.2.3 - only handle double encoding
return 'htmlentities(' return 'htmlentities('
. $params[0] .', ENT_QUOTES, ' . $params[0] .', ENT_QUOTES, '
@@ -107,7 +107,7 @@ function smarty_modifiercompiler_escape($params, $compiler)
return 'strtr(' . $params[0] . ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))'; return 'strtr(' . $params[0] . ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
} }
} catch(SmartyException $e) { } catch (SmartyException $e) {
// pass through to regular plugin fallback // pass through to regular plugin fallback
} }
@@ -119,7 +119,6 @@ function smarty_modifiercompiler_escape($params, $compiler)
$compiler->template->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php'; $compiler->template->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php';
$compiler->template->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape'; $compiler->template->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
} }
return 'smarty_modifier_escape(' . join( ', ', $params ) . ')'; return 'smarty_modifier_escape(' . join( ', ', $params ) . ')';
} }
?>

2
libs/plugins/modifiercompiler.from_charset.php
View File

@@ -30,5 +30,3 @@ function smarty_modifiercompiler_from_charset($params, $compiler)
return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')'; return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')';
} }
?>

3
libs/plugins/modifiercompiler.indent.php
View File

@@ -26,7 +26,6 @@ function smarty_modifiercompiler_indent($params, $compiler)
if (!isset($params[2])) { if (!isset($params[2])) {
$params[2] = "' '"; $params[2] = "' '";
} }
return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')'; return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')';
} }
?>

2
libs/plugins/modifiercompiler.lower.php
View File

@@ -27,5 +27,3 @@ function smarty_modifiercompiler_lower($params, $compiler)
// no MBString fallback // no MBString fallback
return 'strtolower(' . $params[0] . ')'; return 'strtolower(' . $params[0] . ')';
} }
?>

2
libs/plugins/modifiercompiler.noprint.php
View File

@@ -21,5 +21,3 @@ function smarty_modifiercompiler_noprint($params, $compiler)
{ {
return "''"; return "''";
} }
?>

2
libs/plugins/modifiercompiler.string_format.php
View File

@@ -22,5 +22,3 @@ function smarty_modifiercompiler_string_format($params, $compiler)
{ {
return 'sprintf(' . $params[1] . ',' . $params[0] . ')'; return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
} }
?>

3
libs/plugins/modifiercompiler.strip.php
View File

@@ -27,7 +27,6 @@ function smarty_modifiercompiler_strip($params, $compiler)
if (!isset($params[1])) { if (!isset($params[1])) {
$params[1] = "' '"; $params[1] = "' '";
} }
return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})"; return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
} }
?>

2
libs/plugins/modifiercompiler.to_charset.php
View File

@@ -30,5 +30,3 @@ function smarty_modifiercompiler_to_charset($params, $compiler)
return 'mb_convert_encoding(' . $params[0] . ', ' . $params[1] . ', "' . addslashes(Smarty::$_CHARSET) . '")'; return 'mb_convert_encoding(' . $params[0] . ', ' . $params[1] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
} }
?>

2
libs/plugins/modifiercompiler.unescape.php
View File

@@ -47,5 +47,3 @@ function smarty_modifiercompiler_unescape($params, $compiler)
return $params[0]; return $params[0];
} }
} }
?>

2
libs/plugins/modifiercompiler.upper.php
View File

@@ -26,5 +26,3 @@ function smarty_modifiercompiler_upper($params, $compiler)
// no MBString fallback // no MBString fallback
return 'strtoupper(' . $params[0] . ')'; return 'strtoupper(' . $params[0] . ')';
} }
?>

3
libs/plugins/modifiercompiler.wordwrap.php
View File

@@ -40,7 +40,6 @@ function smarty_modifiercompiler_wordwrap($params, $compiler)
} }
$function = 'smarty_mb_wordwrap'; $function = 'smarty_mb_wordwrap';
} }
return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')'; return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
} }
?>

6
libs/plugins/outputfilter.trimwhitespace.php
View File

@@ -74,13 +74,11 @@ function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $s
// maybe a \0 byte or something is interfering? // maybe a \0 byte or something is interfering?
// $source = trim( $source ); // $source = trim( $source );
// capture html elements not to be messed with
$_offset = 0; $_offset = 0;
if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) { if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
foreach ($matches as $match) { foreach ($matches as $match) {
$store[] = $match[0][0];
$_length = strlen($match[0][0]); $_length = strlen($match[0][0]);
$replace = array_shift($store); $replace = $store[$match[1][0]];
$source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length); $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length);
$_offset += strlen($replace) - $_length; $_offset += strlen($replace) - $_length;
@@ -90,5 +88,3 @@ function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $s
return $source; return $source;
} }
?>

8
libs/plugins/shared.escape_special_chars.php
View File

@@ -15,7 +15,7 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
* special chars except for already escaped ones * special chars except for already escaped ones
* *
* @author Monte Ohrt <monte at ohrt dot com> * @author Monte Ohrt <monte at ohrt dot com>
* @param string $string text that should by escaped * @param string $string text that should by escaped
* @return string * @return string
*/ */
function smarty_function_escape_special_chars($string) function smarty_function_escape_special_chars($string)
@@ -23,6 +23,7 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
if (!is_array($string)) { if (!is_array($string)) {
$string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false); $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
} }
return $string; return $string;
} }
} else { } else {
@@ -34,7 +35,7 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
* special chars except for already escaped ones * special chars except for already escaped ones
* *
* @author Monte Ohrt <monte at ohrt dot com> * @author Monte Ohrt <monte at ohrt dot com>
* @param string $string text that should by escaped * @param string $string text that should by escaped
* @return string * @return string
*/ */
function smarty_function_escape_special_chars($string) function smarty_function_escape_special_chars($string)
@@ -44,8 +45,7 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
$string = htmlspecialchars($string); $string = htmlspecialchars($string);
$string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
} }
return $string; return $string;
} }
} }
?>

1
libs/plugins/shared.literal_compiler_param.php
View File

@@ -29,5 +29,6 @@ function smarty_literal_compiler_param($params, $index, $default=null)
$t = null; $t = null;
eval("\$t = " . $params[$index] . ";"); eval("\$t = " . $params[$index] . ";");
return $t; return $t;
} }

3
libs/plugins/shared.make_timestamp.php
View File

@@ -35,8 +35,7 @@ function smarty_make_timestamp($string)
// strtotime() was not able to parse $string, use "now": // strtotime() was not able to parse $string, use "now":
return time(); return time();
} }
return $time; return $time;
} }
} }
?>

10
libs/plugins/shared.mb_str_replace.php
View File

@@ -10,10 +10,10 @@ if (!function_exists('smarty_mb_str_replace')) {
/** /**
* Multibyte string replace * Multibyte string replace
* *
* @param string $search the string to be searched * @param string $search the string to be searched
* @param string $replace the replacement string * @param string $replace the replacement string
* @param string $subject the source string * @param string $subject the source string
* @param int &$count number of matches found * @param int &$count number of matches found
* @return string replaced string * @return string replaced string
* @author Rodney Rehm * @author Rodney Rehm
*/ */
@@ -48,8 +48,8 @@ if (!function_exists('smarty_mb_str_replace')) {
$count = count($parts) - 1; $count = count($parts) - 1;
$subject = implode($replace, $parts); $subject = implode($replace, $parts);
} }
return $subject; return $subject;
} }
} }
?>

12
libs/plugins/shared.mb_unicode.php
View File

@@ -15,12 +15,14 @@
* @return array sequence of unicodes * @return array sequence of unicodes
* @author Rodney Rehm * @author Rodney Rehm
*/ */
function smarty_mb_to_unicode($string, $encoding=null) { function smarty_mb_to_unicode($string, $encoding=null)
{
if ($encoding) { if ($encoding) {
$expanded = mb_convert_encoding($string, "UTF-32BE", $encoding); $expanded = mb_convert_encoding($string, "UTF-32BE", $encoding);
} else { } else {
$expanded = mb_convert_encoding($string, "UTF-32BE"); $expanded = mb_convert_encoding($string, "UTF-32BE");
} }
return unpack("N*", $expanded); return unpack("N*", $expanded);
} }
@@ -33,16 +35,16 @@ function smarty_mb_to_unicode($string, $encoding=null) {
* @return string unicode as character sequence in given $encoding * @return string unicode as character sequence in given $encoding
* @author Rodney Rehm * @author Rodney Rehm
*/ */
function smarty_mb_from_unicode($unicode, $encoding=null) { function smarty_mb_from_unicode($unicode, $encoding=null)
{
$t = ''; $t = '';
if (!$encoding) { if (!$encoding) {
$encoding = mb_internal_encoding(); $encoding = mb_internal_encoding();
} }
foreach((array) $unicode as $utf32be) { foreach ((array) $unicode as $utf32be) {
$character = pack("N*", $utf32be); $character = pack("N*", $utf32be);
$t .= mb_convert_encoding($character, $encoding, "UTF-32BE"); $t .= mb_convert_encoding($character, $encoding, "UTF-32BE");
} }
return $t; return $t;
} }
?>

15
libs/plugins/shared.mb_wordwrap.php
View File

@@ -6,17 +6,17 @@
* @subpackage PluginsShared * @subpackage PluginsShared
*/ */
if(!function_exists('smarty_mb_wordwrap')) { if (!function_exists('smarty_mb_wordwrap')) {
/** /**
* Wrap a string to a given number of characters * Wrap a string to a given number of characters
* *
* @link http://php.net/manual/en/function.wordwrap.php for similarity * @link http://php.net/manual/en/function.wordwrap.php for similarity
* @param string $str the string to wrap * @param string $str the string to wrap
* @param int $width the width of the output * @param int $width the width of the output
* @param string $break the character used to break the line * @param string $break the character used to break the line
* @param boolean $cut ignored parameter, just for the sake of * @param boolean $cut ignored parameter, just for the sake of
* @return string wrapped string * @return string wrapped string
* @author Rodney Rehm * @author Rodney Rehm
*/ */
function smarty_mb_wordwrap($str, $width=75, $break="\n", $cut=false) function smarty_mb_wordwrap($str, $width=75, $break="\n", $cut=false)
@@ -63,7 +63,7 @@ if(!function_exists('smarty_mb_wordwrap')) {
$length = 0; $length = 0;
continue; continue;
} }
} else if ($token == "\n") { } elseif ($token == "\n") {
// hard break must reset counters // hard break must reset counters
$_previous = 0; $_previous = 0;
$length = 0; $length = 0;
@@ -80,4 +80,3 @@ if(!function_exists('smarty_mb_wordwrap')) {
} }
} }
?>

2
libs/plugins/variablefilter.htmlspecialchars.php
View File

@@ -17,5 +17,3 @@ function smarty_variablefilter_htmlspecialchars($source, $smarty)
{ {
return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET); return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
} }
?>

32
libs/sysplugins/smarty_cacheresource.php
View File

@@ -13,7 +13,8 @@
* @subpackage Cacher * @subpackage Cacher
* @author Rodney Rehm * @author Rodney Rehm
*/ */
abstract class Smarty_CacheResource { abstract class Smarty_CacheResource
{
/** /**
* cache for Smarty_CacheResource instances * cache for Smarty_CacheResource instances
* @var array * @var array
@@ -35,7 +36,7 @@ abstract class Smarty_CacheResource {
* @param Smarty_Internal_Template $_template template object * @param Smarty_Internal_Template $_template template object
* @return void * @return void
*/ */
public abstract function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template); abstract public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
/** /**
* populate Cached Object with timestamp and exists from Resource * populate Cached Object with timestamp and exists from Resource
@@ -43,7 +44,7 @@ abstract class Smarty_CacheResource {
* @param Smarty_Template_Cached $source cached object * @param Smarty_Template_Cached $source cached object
* @return void * @return void
*/ */
public abstract function populateTimestamp(Smarty_Template_Cached $cached); abstract public function populateTimestamp(Smarty_Template_Cached $cached);
/** /**
* Read the cached template and process header * Read the cached template and process header
@@ -52,7 +53,7 @@ abstract class Smarty_CacheResource {
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
* @return booelan true or false if the cached content does not exist * @return booelan true or false if the cached content does not exist
*/ */
public abstract function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null); abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null);
/** /**
* Write the rendered template output to cache * Write the rendered template output to cache
@@ -61,7 +62,7 @@ abstract class Smarty_CacheResource {
* @param string $content content to cache * @param string $content content to cache
* @return boolean success * @return boolean success
*/ */
public abstract function writeCachedContent(Smarty_Internal_Template $_template, $content); abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content);
/** /**
* Return cached content * Return cached content
@@ -74,8 +75,10 @@ abstract class Smarty_CacheResource {
if ($_template->cached->handler->process($_template)) { if ($_template->cached->handler->process($_template)) {
ob_start(); ob_start();
$_template->properties['unifunc']($_template); $_template->properties['unifunc']($_template);
return ob_get_clean(); return ob_get_clean();
} }
return null; return null;
} }
@@ -86,7 +89,7 @@ abstract class Smarty_CacheResource {
* @param integer $exp_time expiration time (number of seconds, not timestamp) * @param integer $exp_time expiration time (number of seconds, not timestamp)
* @return integer number of cache files deleted * @return integer number of cache files deleted
*/ */
public abstract function clearAll(Smarty $smarty, $exp_time=null); abstract public function clearAll(Smarty $smarty, $exp_time=null);
/** /**
* Empty cache for a specific template * Empty cache for a specific template
@@ -98,8 +101,7 @@ abstract class Smarty_CacheResource {
* @param integer $exp_time expiration time (number of seconds, not timestamp) * @param integer $exp_time expiration time (number of seconds, not timestamp)
* @return integer number of cache files deleted * @return integer number of cache files deleted
*/ */
public abstract function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time); abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
public function locked(Smarty $smarty, Smarty_Template_Cached $cached) public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
{ {
@@ -114,6 +116,7 @@ abstract class Smarty_CacheResource {
} }
sleep(1); sleep(1);
} }
return $hadLock; return $hadLock;
} }
@@ -135,7 +138,6 @@ abstract class Smarty_CacheResource {
return true; return true;
} }
/** /**
* Load Cache Resource Handler * Load Cache Resource Handler
* *
@@ -165,6 +167,7 @@ abstract class Smarty_CacheResource {
$cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type); $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
self::$resources[$type] = new $cache_resource_class(); self::$resources[$type] = new $cache_resource_class();
} }
return $smarty->_cacheresource_handlers[$type] = self::$resources[$type]; return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
} }
// try plugins dir // try plugins dir
@@ -173,6 +176,7 @@ abstract class Smarty_CacheResource {
if (!isset(self::$resources[$type])) { if (!isset(self::$resources[$type])) {
self::$resources[$type] = new $cache_resource_class(); self::$resources[$type] = new $cache_resource_class();
} }
return $smarty->_cacheresource_handlers[$type] = self::$resources[$type]; return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
} }
// give up // give up
@@ -204,7 +208,8 @@ abstract class Smarty_CacheResource {
* @subpackage TemplateResources * @subpackage TemplateResources
* @author Rodney Rehm * @author Rodney Rehm
*/ */
class Smarty_Template_Cached { class Smarty_Template_Cached
{
/** /**
* Source Filepath * Source Filepath
* @var string * @var string
@@ -300,6 +305,7 @@ class Smarty_Template_Cached {
// //
if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) { if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) {
$handler->populate($this, $_template); $handler->populate($this, $_template);
return; return;
} }
while (true) { while (true) {
@@ -328,7 +334,7 @@ class Smarty_Template_Cached {
if ($smarty->debugging) { if ($smarty->debugging) {
Smarty_Internal_Debug::start_cache($_template); Smarty_Internal_Debug::start_cache($_template);
} }
if($handler->process($_template, $this) === false) { if ($handler->process($_template, $this) === false) {
$this->valid = false; $this->valid = false;
} else { } else {
$this->processed = true; $this->processed = true;
@@ -347,6 +353,7 @@ class Smarty_Template_Cached {
} }
if (!$this->valid && $_template->smarty->cache_locking) { if (!$this->valid && $_template->smarty->cache_locking) {
$this->handler->acquireLock($_template->smarty, $this); $this->handler->acquireLock($_template->smarty, $this);
return; return;
} else { } else {
return; return;
@@ -371,11 +378,12 @@ class Smarty_Template_Cached {
if ($_template->smarty->cache_locking) { if ($_template->smarty->cache_locking) {
$this->handler->releaseLock($_template->smarty, $this); $this->handler->releaseLock($_template->smarty, $this);
} }
return true; return true;
} }
} }
return false; return false;
} }
} }
?>

102
libs/sysplugins/smarty_cacheresource_custom.php
View File

@@ -13,20 +13,20 @@
* @subpackage Cacher * @subpackage Cacher
* @author Rodney Rehm * @author Rodney Rehm
*/ */
abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource { abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
{
/** /**
* fetch cached content and its modification time from data source * fetch cached content and its modification time from data source
* *
* @param string $id unique cache content identifier * @param string $id unique cache content identifier
* @param string $name template name * @param string $name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param string $content cached content * @param string $content cached content
* @param integer $mtime cache modification timestamp (epoch) * @param integer $mtime cache modification timestamp (epoch)
* @return void * @return void
*/ */
protected abstract function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime); abstract protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
/** /**
* Fetch cached content's modification timestamp from data source * Fetch cached content's modification timestamp from data source
@@ -34,10 +34,10 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
* {@internal implementing this method is optional. * {@internal implementing this method is optional.
* Only implement it if modification times can be accessed faster than loading the complete cached content.}} * Only implement it if modification times can be accessed faster than loading the complete cached content.}}
* *
* @param string $id unique cache content identifier * @param string $id unique cache content identifier
* @param string $name template name * @param string $name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @return integer|boolean timestamp (epoch) the template was modified, or false if not found * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
*/ */
protected function fetchTimestamp($id, $name, $cache_id, $compile_id) protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
@@ -48,32 +48,32 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
/** /**
* Save content to cache * Save content to cache
* *
* @param string $id unique cache content identifier * @param string $id unique cache content identifier
* @param string $name template name * @param string $name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param integer|null $exp_time seconds till expiration or null * @param integer|null $exp_time seconds till expiration or null
* @param string $content content to cache * @param string $content content to cache
* @return boolean success * @return boolean success
*/ */
protected abstract function save($id, $name, $cache_id, $compile_id, $exp_time, $content); abstract protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
/** /**
* Delete content from cache * Delete content from cache
* *
* @param string $name template name * @param string $name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param integer|null $exp_time seconds till expiration time in seconds or null * @param integer|null $exp_time seconds till expiration time in seconds or null
* @return integer number of deleted caches * @return integer number of deleted caches
*/ */
protected abstract function delete($name, $cache_id, $compile_id, $exp_time); abstract protected function delete($name, $cache_id, $compile_id, $exp_time);
/** /**
* populate Cached Object with meta data from Resource * populate Cached Object with meta data from Resource
* *
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
* @param Smarty_Internal_Template $_template template object * @param Smarty_Internal_Template $_template template object
* @return void * @return void
*/ */
public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template) public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
@@ -88,7 +88,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
/** /**
* populate Cached Object with timestamp and exists from Resource * populate Cached Object with timestamp and exists from Resource
* *
* @param Smarty_Template_Cached $source cached object * @param Smarty_Template_Cached $source cached object
* @return void * @return void
*/ */
public function populateTimestamp(Smarty_Template_Cached $cached) public function populateTimestamp(Smarty_Template_Cached $cached)
@@ -97,6 +97,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
if ($mtime !== null) { if ($mtime !== null) {
$cached->timestamp = $mtime; $cached->timestamp = $mtime;
$cached->exists = !!$cached->timestamp; $cached->exists = !!$cached->timestamp;
return; return;
} }
$timestamp = null; $timestamp = null;
@@ -108,9 +109,9 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
/** /**
* Read the cached template and process the header * Read the cached template and process the header
* *
* @param Smarty_Internal_Template $_template template object * @param Smarty_Internal_Template $_template template object
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
* @return booelan true or false if the cached content does not exist * @return booelan true or false if the cached content does not exist
*/ */
public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null) public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
{ {
@@ -132,17 +133,19 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
if (isset($content)) { if (isset($content)) {
$_smarty_tpl = $_template; $_smarty_tpl = $_template;
eval("?>" . $content); eval("?>" . $content);
return true; return true;
} }
return false; return false;
} }
/** /**
* Write the rendered template output to cache * Write the rendered template output to cache
* *
* @param Smarty_Internal_Template $_template template object * @param Smarty_Internal_Template $_template template object
* @param string $content content to cache * @param string $content content to cache
* @return boolean success * @return boolean success
*/ */
public function writeCachedContent(Smarty_Internal_Template $_template, $content) public function writeCachedContent(Smarty_Internal_Template $_template, $content)
{ {
@@ -159,38 +162,40 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
/** /**
* Empty cache * Empty cache
* *
* @param Smarty $smarty Smarty object * @param Smarty $smarty Smarty object
* @param integer $exp_time expiration time (number of seconds, not timestamp) * @param integer $exp_time expiration time (number of seconds, not timestamp)
* @return integer number of cache files deleted * @return integer number of cache files deleted
*/ */
public function clearAll(Smarty $smarty, $exp_time=null) public function clearAll(Smarty $smarty, $exp_time=null)
{ {
$this->cache = array(); $this->cache = array();
return $this->delete(null, null, null, $exp_time); return $this->delete(null, null, null, $exp_time);
} }
/** /**
* Empty cache for a specific template * Empty cache for a specific template
* *
* @param Smarty $smarty Smarty object * @param Smarty $smarty Smarty object
* @param string $resource_name template name * @param string $resource_name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param integer $exp_time expiration time (number of seconds, not timestamp) * @param integer $exp_time expiration time (number of seconds, not timestamp)
* @return integer number of cache files deleted * @return integer number of cache files deleted
*/ */
public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time) public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
{ {
$this->cache = array(); $this->cache = array();
return $this->delete($resource_name, $cache_id, $compile_id, $exp_time); return $this->delete($resource_name, $cache_id, $compile_id, $exp_time);
} }
/** /**
* Check is cache is locked for this template * Check is cache is locked for this template
* *
* @param Smarty $smarty Smarty object * @param Smarty $smarty Smarty object
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
* @return booelan true or false if cache is locked * @return booelan true or false if cache is locked
*/ */
public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached) public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
{ {
@@ -208,7 +213,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
/** /**
* Lock cache for this template * Lock cache for this template
* *
* @param Smarty $smarty Smarty object * @param Smarty $smarty Smarty object
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
*/ */
public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached) public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
@@ -223,7 +228,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
/** /**
* Unlock cache for this template * Unlock cache for this template
* *
* @param Smarty $smarty Smarty object * @param Smarty $smarty Smarty object
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
*/ */
public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached) public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
@@ -234,4 +239,3 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
$this->delete($name, null, null, null); $this->delete($name, null, null, null);
} }
} }
?>

135
libs/sysplugins/smarty_cacheresource_keyvaluestore.php
View File

@@ -31,8 +31,8 @@
* @subpackage Cacher * @subpackage Cacher
* @author Rodney Rehm * @author Rodney Rehm
*/ */
abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource { abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
{
/** /**
* cache for contents * cache for contents
* @var array * @var array
@@ -47,8 +47,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
/** /**
* populate Cached Object with meta data from Resource * populate Cached Object with meta data from Resource
* *
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
* @param Smarty_Internal_Template $_template template object * @param Smarty_Internal_Template $_template template object
* @return void * @return void
*/ */
public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template) public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
@@ -64,7 +64,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
/** /**
* populate Cached Object with timestamp and exists from Resource * populate Cached Object with timestamp and exists from Resource
* *
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
* @return void * @return void
*/ */
public function populateTimestamp(Smarty_Template_Cached $cached) public function populateTimestamp(Smarty_Template_Cached $cached)
@@ -80,9 +80,9 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
/** /**
* Read the cached template and process the header * Read the cached template and process the header
* *
* @param Smarty_Internal_Template $_template template object * @param Smarty_Internal_Template $_template template object
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
* @return booelan true or false if the cached content does not exist * @return booelan true or false if the cached content does not exist
*/ */
public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null) public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
{ {
@@ -99,21 +99,24 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
if (isset($content)) { if (isset($content)) {
$_smarty_tpl = $_template; $_smarty_tpl = $_template;
eval("?>" . $content); eval("?>" . $content);
return true; return true;
} }
return false; return false;
} }
/** /**
* Write the rendered template output to cache * Write the rendered template output to cache
* *
* @param Smarty_Internal_Template $_template template object * @param Smarty_Internal_Template $_template template object
* @param string $content content to cache * @param string $content content to cache
* @return boolean success * @return boolean success
*/ */
public function writeCachedContent(Smarty_Internal_Template $_template, $content) public function writeCachedContent(Smarty_Internal_Template $_template, $content)
{ {
$this->addMetaTimestamp($content); $this->addMetaTimestamp($content);
return $this->write(array($_template->cached->filepath => $content), $_template->properties['cache_lifetime']); return $this->write(array($_template->cached->filepath => $content), $_template->properties['cache_lifetime']);
} }
@@ -122,8 +125,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
* *
* {@internal the $exp_time argument is ignored altogether }} * {@internal the $exp_time argument is ignored altogether }}
* *
* @param Smarty $smarty Smarty object * @param Smarty $smarty Smarty object
* @param integer $exp_time expiration time [being ignored] * @param integer $exp_time expiration time [being ignored]
* @return integer number of cache files deleted [always -1] * @return integer number of cache files deleted [always -1]
* @uses purge() to clear the whole store * @uses purge() to clear the whole store
* @uses invalidate() to mark everything outdated if purge() is inapplicable * @uses invalidate() to mark everything outdated if purge() is inapplicable
@@ -133,6 +136,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
if (!$this->purge()) { if (!$this->purge()) {
$this->invalidate(null); $this->invalidate(null);
} }
return -1; return -1;
} }
@@ -141,11 +145,11 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
* *
* {@internal the $exp_time argument is ignored altogether}} * {@internal the $exp_time argument is ignored altogether}}
* *
* @param Smarty $smarty Smarty object * @param Smarty $smarty Smarty object
* @param string $resource_name template name * @param string $resource_name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param integer $exp_time expiration time [being ignored] * @param integer $exp_time expiration time [being ignored]
* @return integer number of cache files deleted [always -1] * @return integer number of cache files deleted [always -1]
* @uses buildCachedFilepath() to generate the CacheID * @uses buildCachedFilepath() to generate the CacheID
* @uses invalidate() to mark CacheIDs parent chain as outdated * @uses invalidate() to mark CacheIDs parent chain as outdated
@@ -157,15 +161,16 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
$cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' . $this->sanitize($compile_id); $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' . $this->sanitize($compile_id);
$this->delete(array($cid)); $this->delete(array($cid));
$this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid); $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
return -1; return -1;
} }
/** /**
* Get template's unique ID * Get template's unique ID
* *
* @param Smarty $smarty Smarty object * @param Smarty $smarty Smarty object
* @param string $resource_name template name * @param string $resource_name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @return string filepath of cache file * @return string filepath of cache file
*/ */
protected function getTemplateUid(Smarty $smarty, $resource_name, $cache_id, $compile_id) protected function getTemplateUid(Smarty $smarty, $resource_name, $cache_id, $compile_id)
@@ -188,13 +193,14 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
} }
unset($smarty->template_objects[$_templateId]); unset($smarty->template_objects[$_templateId]);
} }
return $uid; return $uid;
} }
/** /**
* Sanitize CacheID components * Sanitize CacheID components
* *
* @param string $string CacheID component to sanitize * @param string $string CacheID component to sanitize
* @return string sanitized CacheID component * @return string sanitized CacheID component
*/ */
protected function sanitize($string) protected function sanitize($string)
@@ -204,19 +210,20 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
if (!$string) { if (!$string) {
return null; return null;
} }
return preg_replace('#[^\w\|]+#S', '_', $string); return preg_replace('#[^\w\|]+#S', '_', $string);
} }
/** /**
* Fetch and prepare a cache object. * Fetch and prepare a cache object.
* *
* @param string $cid CacheID to fetch * @param string $cid CacheID to fetch
* @param string $resource_name template name * @param string $resource_name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param string $content cached content * @param string $content cached content
* @param integer &$timestamp cached timestamp (epoch) * @param integer &$timestamp cached timestamp (epoch)
* @param string $resource_uid resource's uid * @param string $resource_uid resource's uid
* @return boolean success * @return boolean success
*/ */
protected function fetch($cid, $resource_name = null, $cache_id = null, $compile_id = null, &$content = null, &$timestamp = null, $resource_uid = null) protected function fetch($cid, $resource_name = null, $cache_id = null, $compile_id = null, &$content = null, &$timestamp = null, $resource_uid = null)
@@ -253,25 +260,26 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
/** /**
* Extract the timestamp the $content was cached * Extract the timestamp the $content was cached
* *
* @param string &$content the cached content * @param string &$content the cached content
* @return float the microtime the content was cached * @return float the microtime the content was cached
*/ */
protected function getMetaTimestamp(&$content) protected function getMetaTimestamp(&$content)
{ {
$s = unpack("N", substr($content, 0, 4)); $s = unpack("N", substr($content, 0, 4));
$m = unpack("N", substr($content, 4, 4)); $m = unpack("N", substr($content, 4, 4));
$content = substr($content, 8); $content = substr($content, 8);
return $s[1] + ($m[1] / 100000000); return $s[1] + ($m[1] / 100000000);
} }
/** /**
* Invalidate CacheID * Invalidate CacheID
* *
* @param string $cid CacheID * @param string $cid CacheID
* @param string $resource_name template name * @param string $resource_name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param string $resource_uid source's uid * @param string $resource_uid source's uid
* @return void * @return void
*/ */
protected function invalidate($cid = null, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null) protected function invalidate($cid = null, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
@@ -304,12 +312,12 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
/** /**
* Determine the latest timestamp known to the invalidation chain * Determine the latest timestamp known to the invalidation chain
* *
* @param string $cid CacheID to determine latest invalidation timestamp of * @param string $cid CacheID to determine latest invalidation timestamp of
* @param string $resource_name template name * @param string $resource_name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param string $resource_uid source's filepath * @param string $resource_uid source's filepath
* @return float the microtime the CacheID was invalidated * @return float the microtime the CacheID was invalidated
*/ */
protected function getLatestInvalidationTimestamp($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null) protected function getLatestInvalidationTimestamp($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
{ {
@@ -328,6 +336,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
} }
// make sure we're dealing with floats // make sure we're dealing with floats
$values = array_map('floatval', $values); $values = array_map('floatval', $values);
return max($values); return max($values);
} }
@@ -336,12 +345,12 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
* *
* Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... ) * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
* *
* @param string $cid CacheID to translate * @param string $cid CacheID to translate
* @param string $resource_name template name * @param string $resource_name template name
* @param string $cache_id cache id * @param string $cache_id cache id
* @param string $compile_id compile id * @param string $compile_id compile id
* @param string $resource_uid source's filepath * @param string $resource_uid source's filepath
* @return array list of InvalidationKeys * @return array list of InvalidationKeys
* @uses $invalidationKeyPrefix to prepend to each InvalidationKey * @uses $invalidationKeyPrefix to prepend to each InvalidationKey
*/ */
protected function listInvalidationKeys($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null) protected function listInvalidationKeys($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
@@ -380,27 +389,29 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
// skip past delimiter position // skip past delimiter position
$i++; $i++;
} }
return $t; return $t;
} }
/** /**
* Check is cache is locked for this template * Check is cache is locked for this template
* *
* @param Smarty $smarty Smarty object * @param Smarty $smarty Smarty object
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
* @return booelan true or false if cache is locked * @return booelan true or false if cache is locked
*/ */
public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached) public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
{ {
$key = 'LOCK#' . $cached->filepath; $key = 'LOCK#' . $cached->filepath;
$data = $this->read(array($key)); $data = $this->read(array($key));
return $data && time() - $data[$key] < $smarty->locking_timeout; return $data && time() - $data[$key] < $smarty->locking_timeout;
} }
/** /**
* Lock cache for this template * Lock cache for this template
* *
* @param Smarty $smarty Smarty object * @param Smarty $smarty Smarty object
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
*/ */
public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached) public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
@@ -413,7 +424,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
/** /**
* Unlock cache for this template * Unlock cache for this template
* *
* @param Smarty $smarty Smarty object * @param Smarty $smarty Smarty object
* @param Smarty_Template_Cached $cached cached object * @param Smarty_Template_Cached $cached cached object
*/ */
public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached) public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
@@ -426,27 +437,27 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
/** /**
* Read values for a set of keys from cache * Read values for a set of keys from cache
* *
* @param array $keys list of keys to fetch * @param array $keys list of keys to fetch
* @return array list of values with the given keys used as indexes * @return array list of values with the given keys used as indexes
*/ */
protected abstract function read(array $keys); abstract protected function read(array $keys);
/** /**
* Save values for a set of keys to cache * Save values for a set of keys to cache
* *
* @param array $keys list of values to save * @param array $keys list of values to save
* @param int $expire expiration time * @param int $expire expiration time
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
protected abstract function write(array $keys, $expire=null); abstract protected function write(array $keys, $expire=null);
/** /**
* Remove values from cache * Remove values from cache
* *
* @param array $keys list of keys to delete * @param array $keys list of keys to delete
* @return boolean true on success, false on failure * @return boolean true on success, false on failure
*/ */
protected abstract function delete(array $keys); abstract protected function delete(array $keys);
/** /**
* Remove *all* values from cache * Remove *all* values from cache
@@ -459,5 +470,3 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
} }
} }
?>

25
libs/sysplugins/smarty_config_source.php
View File

@@ -19,17 +19,17 @@
* @property int $timestamp * @property int $timestamp
* @property bool $exists * @property bool $exists
*/ */
class Smarty_Config_Source extends Smarty_Template_Source { class Smarty_Config_Source extends Smarty_Template_Source
{
/** /**
* create Config Object container * create Config Object container
* *
* @param Smarty_Resource $handler Resource Handler this source object communicates with * @param Smarty_Resource $handler Resource Handler this source object communicates with
* @param Smarty $smarty Smarty instance this source object belongs to * @param Smarty $smarty Smarty instance this source object belongs to
* @param string $resource full config_resource * @param string $resource full config_resource
* @param string $type type of resource * @param string $type type of resource
* @param string $name resource name * @param string $name resource name
* @param string $unique_resource unqiue resource name * @param string $unique_resource unqiue resource name
*/ */
public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource) public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
{ {
@@ -50,8 +50,8 @@ class Smarty_Config_Source extends Smarty_Template_Source {
/** /**
* <<magic>> Generic setter. * <<magic>> Generic setter.
* *
* @param string $property_name valid: content, timestamp, exists * @param string $property_name valid: content, timestamp, exists
* @param mixed $value newly assigned value (not check for correct type) * @param mixed $value newly assigned value (not check for correct type)
* @throws SmartyException when the given property name is not valid * @throws SmartyException when the given property name is not valid
*/ */
public function __set($property_name, $value) public function __set($property_name, $value)
@@ -71,7 +71,7 @@ class Smarty_Config_Source extends Smarty_Template_Source {
/** /**
* <<magic>> Generic getter. * <<magic>> Generic getter.
* *
* @param string $property_name valid: content, timestamp, exists * @param string $property_name valid: content, timestamp, exists
* @throws SmartyException when the given property name is not valid * @throws SmartyException when the given property name is not valid
*/ */
public function __get($property_name) public function __get($property_name)
@@ -80,6 +80,7 @@ class Smarty_Config_Source extends Smarty_Template_Source {
case 'timestamp': case 'timestamp':
case 'exists': case 'exists':
$this->handler->populateTimestamp($this); $this->handler->populateTimestamp($this);
return $this->$property_name; return $this->$property_name;
case 'content': case 'content':
@@ -91,5 +92,3 @@ class Smarty_Config_Source extends Smarty_Template_Source {
} }
} }
?>

14
libs/sysplugins/smarty_internal_cacheresource_file.php
View File

@@ -16,8 +16,8 @@
* @package Smarty * @package Smarty
* @subpackage Cacher * @subpackage Cacher
*/ */
class Smarty_Internal_CacheResource_File extends Smarty_CacheResource { class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
{
/** /**
* populate Cached Object with meta data from Resource * populate Cached Object with meta data from Resource
* *
@@ -87,6 +87,7 @@
public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null) public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
{ {
$_smarty_tpl = $_template; $_smarty_tpl = $_template;
return @include $_template->cached->filepath; return @include $_template->cached->filepath;
} }
@@ -106,6 +107,7 @@
return true; return true;
} }
} }
return false; return false;
} }
@@ -186,7 +188,7 @@
@rmdir($_file->getPathname()); @rmdir($_file->getPathname());
} }
} else { } else {
$_parts = explode($_dir_sep, str_replace('\\', '/', substr((string)$_file, $_dir_length))); $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string) $_file, $_dir_length)));
$_parts_count = count($_parts); $_parts_count = count($_parts);
// check name // check name
if (isset($resource_name)) { if (isset($resource_name)) {
@@ -210,7 +212,7 @@
} }
} }
// expired ? // expired ?
if (isset($exp_time)) { if (isset($exp_time)) {
if ($exp_time < 0) { if ($exp_time < 0) {
preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match); preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match);
if ($_time < (@filemtime($_file) + $match[1])) { if ($_time < (@filemtime($_file) + $match[1])) {
@@ -226,6 +228,7 @@
} }
} }
} }
return $_count; return $_count;
} }
@@ -244,6 +247,7 @@
clearstatcache(); clearstatcache();
} }
$t = @filemtime($cached->lock_id); $t = @filemtime($cached->lock_id);
return $t && (time() - $t < $smarty->locking_timeout); return $t && (time() - $t < $smarty->locking_timeout);
} }
@@ -271,5 +275,3 @@
@unlink($cached->lock_id); @unlink($cached->lock_id);
} }
} }
?>

12
libs/sysplugins/smarty_internal_compile_append.php
View File

@@ -15,14 +15,14 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign { class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
{
/** /**
* Compiles code for the {append} tag * Compiles code for the {append} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -49,5 +49,3 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
} }
} }
?>

15
libs/sysplugins/smarty_internal_compile_assign.php
View File

@@ -15,14 +15,14 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {assign} tag * Compiles code for the {assign} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -76,13 +76,12 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
} elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) { } elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) {
$output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }"; $output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }";
} }
if ( $_scope == Smarty::SCOPE_GLOBAL) { if ($_scope == Smarty::SCOPE_GLOBAL) {
$output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];"; $output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
} }
$output .= '?>'; $output .= '?>';
return $output; return $output;
} }
} }
?>

413
libs/sysplugins/smarty_internal_compile_block.php
View File

@@ -16,8 +16,10 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase
{
const parent = '____SMARTY_BLOCK_PARENT____';
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -32,7 +34,7 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
* @var array * @var array
* @see Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase
*/ */
public $shorttag_order = array('name', 'hide'); public $shorttag_order = array('name');
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
@@ -40,167 +42,141 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
* @var array * @var array
* @see Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase
*/ */
public $optional_attributes = array('hide'); public $option_flags = array('hide', 'append', 'prepend', 'nocache');
/**
* Attribute definition: Overwrites base class.
*
* @var array
* @see Smarty_Internal_CompileBase
*/
public $optional_attributes = array('internal_file', 'internal_uid', 'internal_line');
/**
* nested child block names
*
* @var array
*/
public static $nested_block_names = array();
/**
* child block source buffer
*
* @var array
*/
public static $block_data = array();
/** /**
* Compiles code for the {block} tag * Compiles code for the {block} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return boolean true * @return boolean true
*/ */
public function compile($args, $compiler) { public function compile($args, $compiler)
{
// check and get attributes // check and get attributes
$_attr = $this->getAttributes($compiler, $args); $_attr = $this->getAttributes($compiler, $args);
$save = array($_attr, $compiler->parser->current_buffer, $compiler->nocache, $compiler->smarty->merge_compiled_includes, $compiler->merged_templates, $compiler->smarty->merged_templates_func, $compiler->template->properties, $compiler->template->has_nocache_code); $_name = trim($_attr['name'], "\"'");
$this->openTag($compiler, 'block', $save);
if ($_attr['nocache'] == true) { // check if we process an inheritance child template
$compiler->nocache = true; if ($compiler->inheritance_child) {
array_unshift(self::$nested_block_names, $_name);
$this->template->block_data[$_name]['source'] = '';
// build {block} for child block
self::$block_data[$_name]['source'] =
"{$compiler->smarty->left_delimiter}private_child_block name={$_attr['name']} file='{$compiler->template->source->filepath}'" .
" uid='{$compiler->template->source->uid}' line={$compiler->lex->line}";
if ($_attr['nocache']) {
self::$block_data[$_name]['source'] .= ' nocache';
}
self::$block_data[$_name]['source'] .= $compiler->smarty->right_delimiter;
$save = array($_attr, $compiler->inheritance);
$this->openTag($compiler, 'block', $save);
// set flag for {block} tag
$compiler->inheritance = true;
$compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
$compiler->has_code = false;
return;
} }
// set flag for {block} tag
$compiler->inheritance = true;
// must merge includes // must merge includes
$compiler->smarty->merge_compiled_includes = true; if ($_attr['nocache'] == true) {
$compiler->tag_nocache = true;
}
$save = array($_attr, $compiler->inheritance, $compiler->parser->current_buffer, $compiler->nocache);
$this->openTag($compiler, 'block', $save);
$compiler->inheritance = true;
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
$compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser); $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
$compiler->has_code = false; $compiler->has_code = false;
return true; return true;
} }
/**
* Save or replace child block source by block name during parsing
*
* @param string $block_content block source content
* @param string $block_tag opening block tag
* @param object $template template object
* @param string $filepath filepath of template source
*/
public static function saveBlockData($block_content, $block_tag, $template, $filepath) {
$_rdl = preg_quote($template->smarty->right_delimiter);
$_ldl = preg_quote($template->smarty->left_delimiter);
if (!$template->smarty->auto_literal) {
$al = '\s*';
} else {
$al = '';
}
if (0 == preg_match("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")(\s*?)?((append|prepend|nocache)?(\s*)?(hide)?)?(\s*{$_rdl})!", $block_tag, $_match)) {
$error_text = 'Syntax Error in template "' . $template->source->filepath . '" "' . $block_tag . '" illegal options';
throw new SmartyCompilerException($error_text);
} else {
$_name = trim($_match[3], '\'"');
if ($_match[8] != 'hide' || isset($template->block_data[$_name])) { // replace {$smarty.block.child}
// get nested block tags
if (0 != preg_match_all("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")([\s\S]*?)(hide)?(\s*{$_rdl})([\s\S]*?)(.*)?({$_ldl}{$al}/block\s*{$_rdl})!", $block_content, $_match2)) {
foreach ($_match2[3] as $key => $name) {
// get it's replacement
$_name2 = trim($name, '\'"');
if ($_match2[5][$key] != 'hide' || isset($template->block_data[$_name2])) {
if (isset($template->block_data[$_name2])) {
$replacement = $template->block_data[$_name2]['source'];
} else {
$replacement = '';
}
// replace {$smarty.block.child} tag
if (preg_match("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!",$_match2[7][$key])) {
$replacement = preg_replace("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $replacement, $_match2[7][$key]);
$block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl}[\s\S]*?{$_ldl}{$al}/block\s*{$_rdl}))!", $replacement, $block_content);
}
if (preg_match("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!",$_match2[8][$key])) {
$replacement = preg_replace("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!", $replacement, $_match2[8][$key]);
$block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl})(.*)?({$_ldl}{$al}/block\s*{$_rdl}))!", $replacement, $block_content);
}
} else {
// remove hidden blocks
$block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl}[\s\S]*?{$_ldl}{$al}/block\s*{$_rdl}))!", '', $block_content);
}
}
}
// do we have not nested {$smart.block.child}
if (0 != preg_match("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $block_content, $_match2)) {
// get child replacement for this block
if (isset($template->block_data[$_name])) {
$replacement = $template->block_data[$_name]['source'];
unset($template->block_data[$_name]);
} else {
$replacement = '';
}
$block_content = preg_replace("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $replacement, $block_content);
}
if (isset($template->block_data[$_name])) {
if (strpos($template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
$template->block_data[$_name]['source'] =
str_replace('%%%%SMARTY_PARENT%%%%', $block_content, $template->block_data[$_name]['source']);
} elseif ($template->block_data[$_name]['mode'] == 'prepend') {
$template->block_data[$_name]['source'] .= $block_content;
} elseif ($template->block_data[$_name]['mode'] == 'append') {
$template->block_data[$_name]['source'] = $block_content . $template->block_data[$_name]['source'];
}
} else {
$template->block_data[$_name]['source'] = $block_content;
$template->block_data[$_name]['file'] = $filepath;
}
if ($_match[6] == 'append') {
$template->block_data[$_name]['mode'] = 'append';
} elseif ($_match[6] == 'prepend') {
$template->block_data[$_name]['mode'] = 'prepend';
} else {
$template->block_data[$_name]['mode'] = 'replace';
}
}
}
}
/** /**
* Compile saved child block source * Compile saved child block source
* *
* @param object $compiler compiler object * @param object $compiler compiler object
* @param string $_name optional name of child block * @param string $_name optional name of child block
* @return string compiled code of schild block * @return string compiled code of child block
*/ */
public static function compileChildBlock($compiler, $_name = null) { static function compileChildBlock($compiler, $_name = null)
$_output = ''; {
if ($compiler->inheritance_child) {
$name1 = Smarty_Internal_Compile_Block::$nested_block_names[0];
if (isset($compiler->template->block_data[$name1])) {
// replace inner block name with generic
Smarty_Internal_Compile_Block::$block_data[$name1]['source'] .= $compiler->template->block_data[$name1]['source'];
Smarty_Internal_Compile_Block::$block_data[$name1]['child'] = true;
}
$compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
$compiler->has_code = false;
return;
}
// if called by {$smarty.block.child} we must search the name of enclosing {block} // if called by {$smarty.block.child} we must search the name of enclosing {block}
if ($_name == null) { if ($_name == null) {
$stack_count = count($compiler->_tag_stack); $stack_count = count($compiler->_tag_stack);
while (--$stack_count >= 0) { while (--$stack_count >= 0) {
if ($compiler->_tag_stack[$stack_count][0] == 'block') { if ($compiler->_tag_stack[$stack_count][0] == 'block') {
$_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "'\""); $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "\"'");
break; break;
} }
} }
// flag that child is already compile by {$smarty.block.child} inclusion
$compiler->template->block_data[$_name]['compiled'] = true;
} }
if ($_name == null) { if ($_name == null) {
$compiler->trigger_template_error('{$smarty.block.child} used out of context', $compiler->lex->taglineno); $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ', $compiler->lex->taglineno);
} }
// undefined child? // undefined child?
if (!isset($compiler->template->block_data[$_name]['source'])) { if (!isset($compiler->template->block_data[$_name]['source'])) {
$compiler->popTrace();
return ''; return '';
} }
// flag that child is already compile by {$smarty.block.child} inclusion
$compiler->template->block_data[$_name]['compiled'] = true;
$_tpl = new Smarty_Internal_template('string:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id, $_tpl = new Smarty_Internal_template('string:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id,
$compiler->template->compile_id, $compiler->template->caching, $compiler->template->cache_lifetime); $compiler->template->compile_id, $compiler->template->caching, $compiler->template->cache_lifetime);
if ($compiler->smarty->debugging) {
Smarty_Internal_Debug::ignore($_tpl);
}
$_tpl->variable_filters = $compiler->template->variable_filters; $_tpl->variable_filters = $compiler->template->variable_filters;
$_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash']; $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
$_tpl->source->filepath = $compiler->template->block_data[$_name]['file'];
$_tpl->allow_relative_path = true; $_tpl->allow_relative_path = true;
if ($compiler->nocache) { $_tpl->compiler->inheritance = true;
$_tpl->compiler->forceNocache = 2;
} else {
$_tpl->compiler->forceNocache = 1;
}
$_tpl->compiler->suppressHeader = true; $_tpl->compiler->suppressHeader = true;
$_tpl->compiler->suppressFilter = true; $_tpl->compiler->suppressFilter = true;
$_tpl->compiler->suppressTemplatePropertyHeader = true; $_tpl->compiler->suppressTemplatePropertyHeader = true;
$_tpl->compiler->suppressMergedTemplates = true; $_tpl->compiler->suppressMergedTemplates = true;
if (strpos($compiler->template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) { $nocache = $compiler->nocache || $compiler->tag_nocache;
$_output = str_replace('%%%%SMARTY_PARENT%%%%', $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl)); if (strpos($compiler->template->block_data[$_name]['source'], self::parent) !== false) {
$_output = str_replace(self::parent, $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl, $nocache));
} elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') { } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
$_output = $_tpl->compiler->compileTemplate($_tpl) . $compiler->parser->current_buffer->to_smarty_php(); $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache) . $compiler->parser->current_buffer->to_smarty_php();
} elseif ($compiler->template->block_data[$_name]['mode'] == 'append') { } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') {
$_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl); $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl, $nocache);
} elseif (!empty($compiler->template->block_data[$_name])) { } elseif (!empty($compiler->template->block_data[$_name])) {
$_output = $_tpl->compiler->compileTemplate($_tpl); $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache);
} }
$compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']); $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
$compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']); $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
@@ -222,45 +198,134 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
} }
} }
unset($_tpl); unset($_tpl);
$compiler->has_code = true;
return $_output; return $_output;
} }
/**
* Compile $smarty.block.parent
*
* @param object $compiler compiler object
* @param string $_name optional name of child block
* @return string compiled code of schild block
*/
static function compileParentBlock($compiler, $_name = null)
{
// if called by {$smarty.block.parent} we must search the name of enclosing {block}
if ($_name == null) {
$stack_count = count($compiler->_tag_stack);
while (--$stack_count >= 0) {
if ($compiler->_tag_stack[$stack_count][0] == 'block') {
$_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "\"'");
break;
}
}
}
if ($_name == null) {
$compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ', $compiler->lex->taglineno);
}
if (empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
$compiler->trigger_template_error(' illegal {$smarty.block.parent} in parent template ', $compiler->lex->taglineno);
}
Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= Smarty_Internal_Compile_Block::parent;
$compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
$compiler->has_code = false;
return;
}
/**
* Process block source
*
* @param string $source source text
* @return ''
*/
static function blockSource($compiler, $source)
{
Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= $source;
}
} }
/** /**
* Smarty Internal Plugin Compile BlockClose Class * Smarty Internal Plugin Compile BlockClose Class
* *
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {/block} tag * Compiles code for the {/block} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) { public function compile($args, $compiler)
{
$compiler->has_code = true; $compiler->has_code = true;
// check and get attributes // check and get attributes
$_attr = $this->getAttributes($compiler, $args); $_attr = $this->getAttributes($compiler, $args);
$saved_data = $this->closeTag($compiler, array('block')); $saved_data = $this->closeTag($compiler, array('block'));
$_name = trim($saved_data[0]['name'], "\"'"); $_name = trim($saved_data[0]['name'], "\"'");
// reset flag for {block} tag
$compiler->inheritance = $saved_data[1];
// check if we process an inheritance child template
if ($compiler->inheritance_child) {
$name1 = Smarty_Internal_Compile_Block::$nested_block_names[0];
Smarty_Internal_Compile_Block::$block_data[$name1]['source'] .= "{$compiler->smarty->left_delimiter}/private_child_block{$compiler->smarty->right_delimiter}";
$level = count(Smarty_Internal_Compile_Block::$nested_block_names);
array_shift(Smarty_Internal_Compile_Block::$nested_block_names);
if (!empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
$name2 = Smarty_Internal_Compile_Block::$nested_block_names[0];
if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
if (isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child']) || !isset($compiler->template->block_data[$name1])) {
Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
} else {
if ($compiler->template->block_data[$name1]['mode'] == 'append') {
Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
} elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'] . Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
} else {
Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'];
}
}
}
unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
$compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
} else {
if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
if (isset($compiler->template->block_data[$name1]) && !isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child'])) {
if (strpos($compiler->template->block_data[$name1]['source'], Smarty_Internal_Compile_Block::parent) !== false) {
$compiler->template->block_data[$name1]['source'] =
str_replace(Smarty_Internal_Compile_Block::parent, Smarty_Internal_Compile_Block::$block_data[$name1]['source'], $compiler->template->block_data[$name1]['source']);
} elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
$compiler->template->block_data[$name1]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
} elseif ($compiler->template->block_data[$name1]['mode'] == 'append') {
$compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
}
} else {
$compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
}
$compiler->template->block_data[$name1]['mode'] = 'replace';
if ($saved_data[0]['append']) {
$compiler->template->block_data[$name1]['mode'] = 'append';
}
if ($saved_data[0]['prepend']) {
$compiler->template->block_data[$name1]['mode'] = 'prepend';
}
}
unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
$compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
}
$compiler->has_code = false;
return;
}
if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) { if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
// restore to status before {block} tag as new subtemplate code of parent {block} is not needed
// TODO: Below code was disabled in 3.1.8 because of problems with {include} in nested {block} tags in child templates
// combined with append/prepend or $smarty.block.parent
// For later versions it should be checked under which conditions it could run for optimisation
//
//$compiler->merged_templates = $saved_data[4];
//$compiler->smarty->merged_templates_func = $saved_data[5];
//$compiler->template->properties = $saved_data[6];
//$compiler->template->has_nocache_code = $saved_data[7];
$_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name); $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
} else { } else {
if (isset($saved_data[0]['hide']) && !isset($compiler->template->block_data[$_name]['source'])) { if ($saved_data[0]['hide'] && !isset($compiler->template->block_data[$_name]['source'])) {
$_output = ''; $_output = '';
} else { } else {
$_output = $compiler->parser->current_buffer->to_smarty_php(); $_output = $compiler->parser->current_buffer->to_smarty_php();
@@ -268,16 +333,96 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase {
unset($compiler->template->block_data[$_name]['compiled']); unset($compiler->template->block_data[$_name]['compiled']);
} }
// reset flags // reset flags
$compiler->parser->current_buffer = $saved_data[1]; $compiler->parser->current_buffer = $saved_data[2];
$compiler->nocache = $saved_data[2]; if ($compiler->nocache) {
$compiler->smarty->merge_compiled_includes = $saved_data[3]; $compiler->tag_nocache = true;
// reset flag for {block} tag }
$compiler->inheritance = false; $compiler->nocache = $saved_data[3];
// $_output content has already nocache code processed // $_output content has already nocache code processed
$compiler->suppressNocacheProcessing = true; $compiler->suppressNocacheProcessing = true;
return $_output; return $_output;
} }
} }
?> /**
* Smarty Internal Plugin Compile Child Block Class
*
* @package Smarty
* @subpackage Compiler
*/
class Smarty_Internal_Compile_Private_Child_Block extends Smarty_Internal_CompileBase
{
/**
* Attribute definition: Overwrites base class.
*
* @var array
* @see Smarty_Internal_CompileBase
*/
public $required_attributes = array('name', 'file', 'uid', 'line');
/**
* Compiles code for the {private_child_block} tag
*
* @param array $args array with attributes from parser
* @param object $compiler compiler object
* @return boolean true
*/
public function compile($args, $compiler)
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
// must merge includes
if ($_attr['nocache'] == true) {
$compiler->tag_nocache = true;
}
$save = array($_attr, $compiler->nocache);
// set trace back to child block
$compiler->pushTrace(trim($_attr['file'], "\"'"), trim($_attr['uid'], "\"'"), $_attr['line'] - $compiler->lex->line);
$this->openTag($compiler, 'private_child_block', $save);
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
$compiler->has_code = false;
return true;
}
}
/**
* Smarty Internal Plugin Compile Child Block Close Class
*
* @package Smarty
* @subpackage Compiler
*/
class Smarty_Internal_Compile_Private_Child_Blockclose extends Smarty_Internal_CompileBase
{
/**
* Compiles code for the {/private_child_block} tag
*
* @param array $args array with attributes from parser
* @param object $compiler compiler object
* @return boolean true
*/
public function compile($args, $compiler)
{
// check and get attributes
$_attr = $this->getAttributes($compiler, $args);
$saved_data = $this->closeTag($compiler, array('private_child_block'));
// end of child block
$compiler->popTrace();
$compiler->nocache = $saved_data[1];
$compiler->has_code = false;
return true;
}
}

14
libs/sysplugins/smarty_internal_compile_break.php
View File

@@ -14,8 +14,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -34,9 +34,9 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
/** /**
* Compiles code for the {break} tag * Compiles code for the {break} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -68,10 +68,8 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
if ($level_count != 0) { if ($level_count != 0) {
$compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno); $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);
} }
$compiler->has_code = true;
return "<?php break {$_levels}?>"; return "<?php break {$_levels}?>";
} }
} }
?>

13
libs/sysplugins/smarty_internal_compile_call.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -42,9 +42,9 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
/** /**
* Compiles the calls of user defined tags defined by {function} * Compiles the calls of user defined tags defined by {function}
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -122,9 +122,8 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
$_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n"; $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n";
} }
} }
return $_output; return $_output;
} }
} }
?>

19
libs/sysplugins/smarty_internal_compile_capture.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -35,8 +35,8 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
/** /**
* Compiles code for the {capture} tag * Compiles code for the {capture} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -64,13 +64,13 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {/capture} tag * Compiles code for the {/capture} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -90,9 +90,8 @@ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase {
$_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n"; $_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n";
$_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n"; $_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n";
$_output .= "} else \$_smarty_tpl->capture_error();?>"; $_output .= "} else \$_smarty_tpl->capture_error();?>";
return $_output; return $_output;
} }
} }
?>

12
libs/sysplugins/smarty_internal_compile_config_load.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -42,8 +42,8 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
/** /**
* Compiles code for the {config_load} tag * Compiles code for the {config_load} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -56,7 +56,6 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
} }
// save posible attributes // save posible attributes
$conf_file = $_attr['file']; $conf_file = $_attr['file'];
if (isset($_attr['section'])) { if (isset($_attr['section'])) {
@@ -77,9 +76,8 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
// create config object // create config object
$_output = "<?php \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);"; $_output = "<?php \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);";
$_output .= "\$_config->loadConfigVars($section, '$scope'); ?>"; $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>";
return $_output; return $_output;
} }
} }
?>

14
libs/sysplugins/smarty_internal_compile_continue.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -35,9 +35,9 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
/** /**
* Compiles code for the {continue} tag * Compiles code for the {continue} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -69,10 +69,8 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
if ($level_count != 0) { if ($level_count != 0) {
$compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno); $compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno);
} }
$compiler->has_code = true;
return "<?php continue {$_levels}?>"; return "<?php continue {$_levels}?>";
} }
} }
?>

11
libs/sysplugins/smarty_internal_compile_debug.php
View File

@@ -16,13 +16,13 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {debug} tag * Compiles code for the {debug} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -35,9 +35,8 @@ class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase {
// display debug template // display debug template
$_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>"; $_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>";
return $_output; return $_output;
} }
} }
?>

11
libs/sysplugins/smarty_internal_compile_eval.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -42,8 +42,8 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
/** /**
* Compiles code for the {eval} tag * Compiles code for the {eval} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -65,9 +65,8 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
} else { } else {
$_output .= "echo \$_template->fetch();"; $_output .= "echo \$_template->fetch();";
} }
return "<?php $_output ?>"; return "<?php $_output ?>";
} }
} }
?>

162
libs/sysplugins/smarty_internal_compile_extends.php
View File

@@ -1,133 +1,87 @@
<?php <?php
/** /**
* Smarty Internal Plugin Compile extend * Smarty Internal Plugin Compile extend
* *
* Compiles the {extends} tag * Compiles the {extends} tag
* *
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
* @author Uwe Tews * @author Uwe Tews
*/ */
/** /**
* Smarty Internal Plugin Compile extend Class * Smarty Internal Plugin Compile extend Class
* *
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
* @var array * @var array
* @see Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase
*/ */
public $required_attributes = array('file'); public $required_attributes = array('file');
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
* @var array * @var array
* @see Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase
*/ */
public $shorttag_order = array('file'); public $shorttag_order = array('file');
/**
* mbstring.overload flag
*
* @var int
*/
public $mbstring_overload = 0;
/** /**
* Compiles code for the {extends} tag * Compiles code for the {extends} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
{ {
static $_is_stringy = array('string' => true, 'eval' => true);
$this->_rdl = preg_quote($compiler->smarty->right_delimiter);
$this->_ldl = preg_quote($compiler->smarty->left_delimiter);
if (!$compiler->smarty->auto_literal) {
$al = '\s*';
} else {
$al = '';
}
$filepath = $compiler->template->source->filepath;
$this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
// check and get attributes // check and get attributes
$_attr = $this->getAttributes($compiler, $args); $_attr = $this->getAttributes($compiler, $args);
if ($_attr['nocache'] === true) { if ($_attr['nocache'] === true) {
$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
} }
$_smarty_tpl = $compiler->template;
$include_file = null;
if (strpos($_attr['file'], '$_tmp') !== false) { if (strpos($_attr['file'], '$_tmp') !== false) {
$compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno); $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno);
} }
eval('$include_file = ' . $_attr['file'] . ';'); // add tag to call parent template at the end of source
if ($compiler->has_variable_string || !((substr_count($_attr['file'], '"') == 2 || substr_count($_attr['file'], "'") == 2))
|| substr_count($_attr['file'], '(') != 0 || substr_count($_attr['file'], '$_smarty_tpl->') != 0
) {
$compiler->trigger_template_error('variable template file name not allowed', $compiler->lex->taglineno);
}
$name = trim($_attr['file'],"\"'");
// create template object // create template object
$_template = new $compiler->smarty->template_class($include_file, $compiler->smarty, $compiler->template); $_template = new $compiler->smarty->template_class($name, $compiler->smarty, $compiler->template);
// save file dependency // check for recursion
if (isset($_is_stringy[$_template->source->type])) { $uid = $_template->source->uid;
$template_sha1 = sha1($include_file); if (isset($compiler->extends_uid[$uid])) {
$compiler->trigger_template_error("illegal recursive call of \"$include_file\"", $this->lex->line - 1);
}
$compiler->extends_uid[$uid] = true;
if (empty($_template->source->components)) {
array_unshift($compiler->sources, $_template->source);
} else { } else {
$template_sha1 = sha1($_template->source->filepath); foreach ($_template->source->components as $source) {
} array_unshift($compiler->sources, $source);
if (isset($compiler->template->properties['file_dependency'][$template_sha1])) { $uid = $source->uid;
$compiler->trigger_template_error("illegal recursive call of \"{$include_file}\"", $compiler->lex->line - 1); if (isset($compiler->extends_uid[$uid])) {
} $compiler->trigger_template_error("illegal recursive call of \"{$sorce->filepath}\"", $this->lex->line - 1);
$compiler->template->properties['file_dependency'][$template_sha1] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);
$_content = ($this->mbstring_overload ? mb_substr($compiler->lex->data, $compiler->lex->counter - 1, 20000000, 'latin1') : substr($compiler->lex->data, $compiler->lex->counter - 1));
if (preg_match_all("!({$this->_ldl}{$al}block\s(.+?)\s*{$this->_rdl})!", $_content, $s) !=
preg_match_all("!({$this->_ldl}{$al}/block\s*{$this->_rdl})!", $_content, $c)) {
$compiler->trigger_template_error('unmatched {block} {/block} pairs');
}
preg_match_all("!{$this->_ldl}{$al}block\s(.+?)\s*{$this->_rdl}|{$this->_ldl}{$al}/block\s*{$this->_rdl}|{$this->_ldl}\*([\S\s]*?)\*{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
$_result_count = count($_result[0]);
$_start = 0;
while ($_start+1 < $_result_count) {
$_end = 0;
$_level = 1;
if (($this->mbstring_overload ? mb_substr($_result[0][$_start][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') {
$_start++;
continue;
}
while ($_level != 0) {
$_end++;
if (($this->mbstring_overload ? mb_substr($_result[0][$_start + $_end][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start + $_end][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') {
continue;
} }
if (!strpos($_result[0][$_start + $_end][0], '/')) { $compiler->extends_uid[$uid] = true;
$_level++;
} else {
$_level--;
}
}
$_block_content = str_replace($compiler->smarty->left_delimiter . '$smarty.block.parent' . $compiler->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
($this->mbstring_overload ? mb_substr($_content, $_result[0][$_start][1] + mb_strlen($_result[0][$_start][0], 'latin1'), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + mb_strlen($_result[0][$_start][0], 'latin1'), 'latin1') : substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))));
Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath);
$_start = $_start + $_end + 1;
}
if ($_template->source->type == 'extends') {
$_template->block_data = $compiler->template->block_data;
}
$compiler->template->source->content = $_template->source->content;
if ($_template->source->type == 'extends') {
$compiler->template->block_data = $_template->block_data;
foreach ($_template->source->components as $key => $component) {
$compiler->template->properties['file_dependency'][$key] = array($component->filepath, $component->timestamp, $component->type);
} }
} }
$compiler->template->source->filepath = $_template->source->filepath; unset ($_template);
$compiler->abort_and_recompile = true; $compiler->inheritance_child = true;
$compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
return ''; return '';
} }
} }
?>

43
libs/sysplugins/smarty_internal_compile_for.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {for} tag * Compiles code for the {for} tag
* *
@@ -31,9 +31,9 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
* The parser is gereration different sets of attribute by which this compiler can * The parser is gereration different sets of attribute by which this compiler can
* determin which syntax is used. * determin which syntax is used.
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -54,7 +54,7 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
$output .= " \$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;"; $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
$output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n"; $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n";
} }
$output .= " if ($_attr[ifexp]){ for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]){\n"; $output .= " if ($_attr[ifexp]) { for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]) {\n";
} else { } else {
$_statement = $_attr['start']; $_statement = $_attr['start'];
$output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;"; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
@@ -64,12 +64,12 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
$output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;"; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;";
} }
if (isset($_attr['max'])) { if (isset($_attr['max'])) {
$output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n"; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n";
} else { } else {
$output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n"; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n";
} }
$output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0){\n"; $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0) {\n";
$output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++){\n"; $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++) {\n";
$output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;"; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;";
$output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;"; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;";
} }
@@ -90,14 +90,14 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {forelse} tag * Compiles code for the {forelse} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -107,6 +107,7 @@ class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase {
list($openTag, $nocache) = $this->closeTag($compiler, array('for')); list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
$this->openTag($compiler, 'forelse', array('forelse', $nocache)); $this->openTag($compiler, 'forelse', array('forelse', $nocache));
return "<?php }} else { ?>"; return "<?php }} else { ?>";
} }
@@ -118,14 +119,14 @@ class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {/for} tag * Compiles code for the {/for} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -147,5 +148,3 @@ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase {
} }
} }
?>

33
libs/sysplugins/smarty_internal_compile_foreach.php
View File

@@ -15,7 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -41,9 +42,9 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
/** /**
* Compiles code for the {foreach} tag * Compiles code for the {foreach} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -131,7 +132,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
$output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n"; $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
} }
} }
$output .= "foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value){\n\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n"; $output .= "foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value) {\n\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n";
if ($key != null) { if ($key != null) {
$output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n"; $output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n";
} }
@@ -173,14 +174,14 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {foreachelse} tag * Compiles code for the {foreachelse} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -202,14 +203,14 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {/foreach} tag * Compiles code for the {/foreach} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -227,5 +228,3 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase {
} }
} }
?>

31
libs/sysplugins/smarty_internal_compile_function.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -42,9 +42,9 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
/** /**
* Compiles code for the {function} tag * Compiles code for the {function} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return boolean true * @return boolean true
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -97,14 +97,14 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {/function} tag * Compiles code for the {/function} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return boolean true * @return boolean true
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -116,8 +116,8 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
$plugins_string = ''; $plugins_string = '';
if (!empty($compiler->template->required_plugins['compiled'])) { if (!empty($compiler->template->required_plugins['compiled'])) {
$plugins_string = '<?php '; $plugins_string = '<?php ';
foreach($compiler->template->required_plugins['compiled'] as $tmp) { foreach ($compiler->template->required_plugins['compiled'] as $tmp) {
foreach($tmp as $data) { foreach ($tmp as $data) {
$plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n"; $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
} }
} }
@@ -125,8 +125,8 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
} }
if (!empty($compiler->template->required_plugins['nocache'])) { if (!empty($compiler->template->required_plugins['nocache'])) {
$plugins_string .= "<?php echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php "; $plugins_string .= "<?php echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
foreach($compiler->template->required_plugins['nocache'] as $tmp) { foreach ($compiler->template->required_plugins['nocache'] as $tmp) {
foreach($tmp as $data) { foreach ($tmp as $data) {
$plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n"; $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
} }
} }
@@ -158,9 +158,8 @@ foreach (Smarty::\$global_tpl_vars as \$key => \$value) if(!isset(\$_smarty_tpl-
$compiler->parser->current_buffer = $saved_data[1]; $compiler->parser->current_buffer = $saved_data[1];
$compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2]; $compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2];
$compiler->template->required_plugins = $saved_data[3]; $compiler->template->required_plugins = $saved_data[3];
return $output; return $output;
} }
} }
?>

51
libs/sysplugins/smarty_internal_compile_if.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {if} tag * Compiles code for the {if} tag
* *
@@ -51,14 +51,15 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
} }
if (is_array($parameter['if condition']['var'])) { if (is_array($parameter['if condition']['var'])) {
$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n"; $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
$_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>"; $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value'].") {?>";
} else { } else {
$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."])) \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(null{$_nocache});"; $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."])) \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(null{$_nocache});";
$_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>"; $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value'].") {?>";
} }
return $_output; return $_output;
} else { } else {
return "<?php if ({$parameter['if condition']}){?>"; return "<?php if ({$parameter['if condition']}) {?>";
} }
} }
@@ -70,8 +71,8 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {else} tag * Compiles code for the {else} tag
* *
@@ -85,7 +86,7 @@ class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase {
list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif')); list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
$this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache)); $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
return "<?php }else{ ?>"; return "<?php } else { ?>";
} }
} }
@@ -96,8 +97,8 @@ class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {elseif} tag * Compiles code for the {elseif} tag
* *
@@ -138,16 +139,18 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
if ($condition_by_assign) { if ($condition_by_assign) {
$this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache)); $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
if (is_array($parameter['if condition']['var'])) { if (is_array($parameter['if condition']['var'])) {
$_output = "<?php }else{ if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; $_output = "<?php } else { if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
$_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>"; $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
} else { } else {
$_output = "<?php }else{ if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});"; $_output = "<?php } else { if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
$_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>"; $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
} }
return $_output; return $_output;
} else { } else {
$this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache)); $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
return "<?php }elseif({$parameter['if condition']}){?>";
return "<?php } elseif ({$parameter['if condition']}) {?>";
} }
} else { } else {
$tmp = ''; $tmp = '';
@@ -157,15 +160,16 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
$this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache)); $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
if ($condition_by_assign) { if ($condition_by_assign) {
if (is_array($parameter['if condition']['var'])) { if (is_array($parameter['if condition']['var'])) {
$_output = "<?php }else{?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; $_output = "<?php } else {?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
$_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>"; $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
} else { } else {
$_output = "<?php }else{?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});"; $_output = "<?php } else {?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
$_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>"; $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
} }
return $_output; return $_output;
} else { } else {
return "<?php }else{?>{$tmp}<?php if ({$parameter['if condition']}){?>"; return "<?php } else {?>{$tmp}<?php if ({$parameter['if condition']}) {?>";
} }
} }
} }
@@ -178,8 +182,8 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {/if} tag * Compiles code for the {/if} tag
* *
@@ -199,9 +203,8 @@ class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase {
for ($i = 0; $i < $nesting; $i++) { for ($i = 0; $i < $nesting; $i++) {
$tmp .= '}'; $tmp .= '}';
} }
return "<?php {$tmp}?>"; return "<?php {$tmp}?>";
} }
} }
?>

232
libs/sysplugins/smarty_internal_compile_include.php
View File

@@ -1,61 +1,61 @@
<?php <?php
/** /**
* Smarty Internal Plugin Compile Include * Smarty Internal Plugin Compile Include
* *
* Compiles the {include} tag * Compiles the {include} tag
* *
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
* @author Uwe Tews * @author Uwe Tews
*/ */
/** /**
* Smarty Internal Plugin Compile Include Class * Smarty Internal Plugin Compile Include Class
* *
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
{
/** /**
* caching mode to create nocache code but no cache file * caching mode to create nocache code but no cache file
*/ */
const CACHING_NOCACHE_CODE = 9999; const CACHING_NOCACHE_CODE = 9999;
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
* @var array * @var array
* @see Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase
*/ */
public $required_attributes = array('file'); public $required_attributes = array('file');
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
* @var array * @var array
* @see Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase
*/ */
public $shorttag_order = array('file'); public $shorttag_order = array('file');
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
* @var array * @var array
* @see Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase
*/ */
public $option_flags = array('nocache', 'inline', 'caching'); public $option_flags = array('nocache', 'inline', 'caching');
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
* @var array * @var array
* @see Smarty_Internal_CompileBase * @see Smarty_Internal_CompileBase
*/ */
public $optional_attributes = array('_any'); public $optional_attributes = array('_any');
/** /**
* Compiles code for the {include} tag * Compiles code for the {include} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -81,12 +81,15 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
$_parent_scope = Smarty::SCOPE_GLOBAL; $_parent_scope = Smarty::SCOPE_GLOBAL;
} }
} }
$_caching = 'null';
if ($compiler->nocache || $compiler->tag_nocache) { $_caching = Smarty::CACHING_OFF;
$_caching = Smarty::CACHING_OFF;
} // flag if included template code should be merged into caller
// default for included templates $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) && !$compiler->template->source->recompiled;
if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
// set default when in nocache mode
// if ($compiler->template->caching && ($compiler->nocache || $compiler->tag_nocache || $compiler->forceNocache == 2)) {
if ($compiler->template->caching && ((!$compiler->inheritance && !$compiler->nocache && !$compiler->tag_nocache) || ($compiler->inheritance && ($compiler->nocache ||$compiler->tag_nocache)))) {
$_caching = self::CACHING_NOCACHE_CODE; $_caching = self::CACHING_NOCACHE_CODE;
} }
/* /*
@@ -118,53 +121,89 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
} }
if ($_attr['nocache'] === true) { if ($_attr['nocache'] === true) {
$compiler->tag_nocache = true; $compiler->tag_nocache = true;
if ($merge_compiled_includes || $compiler->inheritance) {
$_caching = self::CACHING_NOCACHE_CODE;
} else {
$_caching = Smarty::CACHING_OFF; $_caching = Smarty::CACHING_OFF;
}
} }
$has_compiled_template = false; $has_compiled_template = false;
if (($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) && !$compiler->template->source->recompiled if ($merge_compiled_includes || $compiler->inheritance) {
&& !($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache)) && $_caching != Smarty::CACHING_LIFETIME_CURRENT) { // variable template name ?
// check if compiled code can be merged (contains no variable part) if ($compiler->has_variable_string || !((substr_count($include_file, '"') == 2 || substr_count($include_file, "'") == 2))
if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2) || substr_count($include_file, '(') != 0 || substr_count($include_file, '$_smarty_tpl->') != 0
and substr_count($include_file, '(') == 0 and substr_count($include_file, '$_smarty_tpl->') == 0) { ) {
$tpl_name = null; $merge_compiled_includes = false;
eval("\$tpl_name = $include_file;"); if ($compiler->inheritance) {
if (!isset($compiler->smarty->merged_templates_func[$tpl_name]) || $compiler->inheritance) { $compiler->trigger_template_error(' variable template file names not allow within {block} tags');
$tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
// save unique function name
$compiler->smarty->merged_templates_func[$tpl_name]['func'] = $tpl->properties['unifunc'] = 'content_'. str_replace('.', '_', uniqid('', true));
// use current nocache hash for inlined code
$compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
if ($compiler->template->caching) {
// needs code for cached page but no cache file
$tpl->caching = self::CACHING_NOCACHE_CODE;
}
// make sure whole chain gest compiled
$tpl->mustCompile = true;
if (!($tpl->source->uncompiled) && $tpl->source->exists) {
// get compiled code
$compiled_code = $tpl->compiler->compileTemplate($tpl);
// release compiler object to free memory
unset($tpl->compiler);
// merge compiled code for {function} tags
$compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']);
// merge filedependency
$tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp,$tpl->source->type);
$compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']);
// remove header code
$compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code);
if ($tpl->has_nocache_code) {
// replace nocache_hash
$compiled_code = str_replace("{$tpl->properties['nocache_hash']}", $compiler->template->properties['nocache_hash'], $compiled_code);
$compiler->template->has_nocache_code = true;
}
$compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
$has_compiled_template = true;
}
} else {
$has_compiled_template = true;
} }
} }
// variable compile_id?
if (isset($_attr['compile_id'])) {
if (!((substr_count($_attr['compile_id'], '"') == 2 || substr_count($_attr['compile_id'], "'") == 2))
|| substr_count($_attr['compile_id'], '(') != 0 || substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0
) {
$merge_compiled_includes = false;
if ($compiler->inheritance) {
$compiler->trigger_template_error(' variable compile_id not allow within {block} tags');
}
}
}
if ($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache) && $_caching != self::CACHING_NOCACHE_CODE) {
$merge_compiled_includes = false;
if ($compiler->inheritance) {
$compiler->trigger_template_error(' invalid caching mode of subtemplate within {block} tags');
}
}
}
if ($merge_compiled_includes || $compiler->inheritance) {
// we must observe different compile_id
$uid = sha1($_compile_id);
$tpl_name = null;
$nocache = false;
eval("\$tpl_name = $include_file;");
if (!isset($compiler->smarty->merged_templates_func[$tpl_name][$uid]) || $compiler->inheritance) {
$tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
// save unique function name
$compiler->smarty->merged_templates_func[$tpl_name][$uid]['func'] = $tpl->properties['unifunc'] = 'content_' . str_replace('.', '_', uniqid('', true));
// use current nocache hash for inlined code
$compiler->smarty->merged_templates_func[$tpl_name][$uid]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
if ($compiler->template->caching && $_caching == self::CACHING_NOCACHE_CODE) {
// all code must be nocache
$nocache = true;
}
if ($compiler->inheritance) {
$tpl->compiler->inheritance = true;
}
// make sure whole chain gets compiled
$tpl->mustCompile = true;
if (!($tpl->source->uncompiled) && $tpl->source->exists) {
// get compiled code
$compiled_code = $tpl->compiler->compileTemplate($tpl, $nocache);
// release compiler object to free memory
unset($tpl->compiler);
// merge compiled code for {function} tags
$compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']);
// merge filedependency
$tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp, $tpl->source->type);
$compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']);
// remove header code
$compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code);
if ($tpl->has_nocache_code) {
// replace nocache_hash
$compiled_code = str_replace("{$tpl->properties['nocache_hash']}", $compiler->template->properties['nocache_hash'], $compiled_code);
$compiler->template->has_nocache_code = true;
}
$compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
$has_compiled_template = true;
unset ($tpl);
}
} else {
$has_compiled_template = true;
}
} }
// delete {include} standard attributes // delete {include} standard attributes
unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']); unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
@@ -175,7 +214,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
foreach ($_attr as $key => $value) { foreach ($_attr as $key => $value) {
$_pairs[] = "'$key'=>$value"; $_pairs[] = "'$key'=>$value";
} }
$_vars = 'array('.join(',',$_pairs).')'; $_vars = 'array(' . join(',', $_pairs) . ')';
$_has_vars = true; $_has_vars = true;
} else { } else {
$compiler->trigger_template_error('variable passing not allowed in parent/global scope', $compiler->lex->taglineno); $compiler->trigger_template_error('variable passing not allowed in parent/global scope', $compiler->lex->taglineno);
@@ -185,19 +224,22 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
$_has_vars = false; $_has_vars = false;
} }
if ($has_compiled_template) { if ($has_compiled_template) {
$_hash = $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash']; // never call inline templates in nocache mode
$compiler->suppressNocacheProcessing = true;
$_hash = $compiler->smarty->merged_templates_func[$tpl_name][$uid]['nocache_hash'];
$_output = "<?php /* Call merged included template \"" . $tpl_name . "\" */\n"; $_output = "<?php /* Call merged included template \"" . $tpl_name . "\" */\n";
$_output .= "\$_tpl_stack[] = \$_smarty_tpl;\n"; $_output .= "\$_tpl_stack[] = \$_smarty_tpl;\n";
$_output .= " \$_smarty_tpl = \$_smarty_tpl->setupInlineSubTemplate($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope, '$_hash');\n"; $_output .= " \$_smarty_tpl = \$_smarty_tpl->setupInlineSubTemplate($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope, '$_hash');\n";
if (isset($_assign)) { if (isset($_assign)) {
$_output .= 'ob_start(); '; $_output .= 'ob_start(); ';
} }
$_output .= $compiler->smarty->merged_templates_func[$tpl_name]['func']. "(\$_smarty_tpl);\n"; $_output .= $compiler->smarty->merged_templates_func[$tpl_name][$uid]['func'] . "(\$_smarty_tpl);\n";
$_output .= "\$_smarty_tpl = array_pop(\$_tpl_stack); "; $_output .= "\$_smarty_tpl = array_pop(\$_tpl_stack); ";
if (isset($_assign)) { if (isset($_assign)) {
$_output .= " \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(ob_get_clean());"; $_output .= " \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(ob_get_clean());";
} }
$_output .= "/* End of included template \"" . $tpl_name . "\" */?>"; $_output .= "\n/* End of included template \"" . $tpl_name . "\" */?>";
return $_output; return $_output;
} }
@@ -207,9 +249,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
} else { } else {
$_output = "<?php echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n"; $_output = "<?php echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n";
} }
return $_output; return $_output;
} }
} }
?>

12
libs/sysplugins/smarty_internal_compile_include_php.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -42,8 +42,8 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
/** /**
* Compiles code for the {include_php} tag * Compiles code for the {include_php} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -68,7 +68,7 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
$_dir = $compiler->smarty->trusted_dir; $_dir = $compiler->smarty->trusted_dir;
} }
if (!empty($_dir)) { if (!empty($_dir)) {
foreach((array)$_dir as $_script_dir) { foreach ((array) $_dir as $_script_dir) {
$_script_dir = rtrim($_script_dir, '/\\') . DS; $_script_dir = rtrim($_script_dir, '/\\') . DS;
if (file_exists($_script_dir . $_file)) { if (file_exists($_script_dir . $_file)) {
$_filepath = $_script_dir . $_file; $_filepath = $_script_dir . $_file;
@@ -104,5 +104,3 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
} }
} }
?>

13
libs/sysplugins/smarty_internal_compile_insert.php
View File

@@ -16,8 +16,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -43,8 +43,8 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
/** /**
* Compiles code for the {insert} tag * Compiles code for the {insert} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -82,7 +82,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
$_dir = $compiler->smarty->trusted_dir; $_dir = $compiler->smarty->trusted_dir;
} }
if (!empty($_dir)) { if (!empty($_dir)) {
foreach((array)$_dir as $_script_dir) { foreach ((array) $_dir as $_script_dir) {
$_script_dir = rtrim($_script_dir, '/\\') . DS; $_script_dir = rtrim($_script_dir, '/\\') . DS;
if (file_exists($_script_dir . $_script)) { if (file_exists($_script_dir . $_script)) {
$_filepath = $_script_dir . $_script; $_filepath = $_script_dir . $_script;
@@ -134,9 +134,8 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
$_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>"; $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
} }
} }
return $_output; return $_output;
} }
} }
?>

11
libs/sysplugins/smarty_internal_compile_ldelim.php
View File

@@ -15,14 +15,14 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {ldelim} tag * Compiles code for the {ldelim} tag
* *
* This tag does output the left delimiter * This tag does output the left delimiter
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -33,9 +33,8 @@ class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase {
} }
// this tag does not return compiled code // this tag does not return compiled code
$compiler->has_code = true; $compiler->has_code = true;
return $compiler->smarty->left_delimiter; return $compiler->smarty->left_delimiter;
} }
} }
?>

29
libs/sysplugins/smarty_internal_compile_nocache.php
View File

@@ -15,15 +15,15 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {nocache} tag * Compiles code for the {nocache} tag
* *
* This tag does not generate compiled output. It only sets a compiler flag. * This tag does not generate compiled output. It only sets a compiler flag.
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return bool * @return bool
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -32,10 +32,14 @@ class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase {
if ($_attr['nocache'] === true) { if ($_attr['nocache'] === true) {
$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
} }
if ($compiler->template->caching) {
// enter nocache mode // enter nocache mode
$this->openTag($compiler, 'nocache', $compiler->nocache);
$compiler->nocache = true; $compiler->nocache = true;
}
// this tag does not return compiled code // this tag does not return compiled code
$compiler->has_code = false; $compiler->has_code = false;
return true; return true;
} }
@@ -47,27 +51,28 @@ class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {/nocache} tag * Compiles code for the {/nocache} tag
* *
* This tag does not generate compiled output. It only sets a compiler flag. * This tag does not generate compiled output. It only sets a compiler flag.
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return bool * @return bool
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
{ {
$_attr = $this->getAttributes($compiler, $args); $_attr = $this->getAttributes($compiler, $args);
// leave nocache mode if ($compiler->template->caching) {
$compiler->nocache = false; // restore old nocache mode
$compiler->nocache = $this->closeTag($compiler, 'nocache');
}
// this tag does not return compiled code // this tag does not return compiled code
$compiler->has_code = false; $compiler->has_code = false;
return true; return true;
} }
} }
?>

17
libs/sysplugins/smarty_internal_compile_private_block_plugin.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -28,11 +28,11 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
/** /**
* Compiles code for the execution of block plugin * Compiles code for the execution of block plugin
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @param string $tag name of block plugin * @param string $tag name of block plugin
* @param string $function PHP function name * @param string $function PHP function name
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter, $tag, $function) public function compile($args, $compiler, $parameter, $tag, $function)
@@ -79,9 +79,8 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
} }
$output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
} }
return $output . "\n"; return $output . "\n";
} }
} }
?>

17
libs/sysplugins/smarty_internal_compile_private_function_plugin.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -35,11 +35,11 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
/** /**
* Compiles code for the execution of function plugin * Compiles code for the execution of function plugin
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @param string $tag name of function plugin * @param string $tag name of function plugin
* @param string $function PHP function name * @param string $function PHP function name
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter, $tag, $function) public function compile($args, $compiler, $parameter, $tag, $function)
@@ -65,9 +65,8 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
$_params = 'array(' . implode(",", $_paramsArray) . ')'; $_params = 'array(' . implode(",", $_paramsArray) . ')';
// compile code // compile code
$output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n"; $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
return $output; return $output;
} }
} }
?>

16
libs/sysplugins/smarty_internal_compile_private_modifier.php
View File

@@ -16,17 +16,18 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for modifier execution * Compiles code for modifier execution
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) { public function compile($args, $compiler, $parameter)
{
// check and get attributes // check and get attributes
$_attr = $this->getAttributes($compiler, $args); $_attr = $this->getAttributes($compiler, $args);
$output = $parameter['value']; $output = $parameter['value'];
@@ -132,9 +133,8 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
$compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", $compiler->lex->taglineno); $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", $compiler->lex->taglineno);
} }
} }
return $output; return $output;
} }
} }
?>

17
libs/sysplugins/smarty_internal_compile_private_object_block_function.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -28,11 +28,11 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
/** /**
* Compiles code for the execution of block plugin * Compiles code for the execution of block plugin
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @param string $tag name of block object * @param string $tag name of block object
* @param string $method name of method to call * @param string $method name of method to call
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter, $tag, $method) public function compile($args, $compiler, $parameter, $tag, $method)
@@ -80,9 +80,8 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
} }
$output = "<?php \$_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . " } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; $output = "<?php \$_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . " } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
} }
return $output . "\n"; return $output . "\n";
} }
} }
?>

48
libs/sysplugins/smarty_internal_compile_private_object_function.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -28,11 +28,11 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
/** /**
* Compiles code for the execution of function plugin * Compiles code for the execution of function plugin
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @param string $tag name of function * @param string $tag name of function
* @param string $method name of method to call * @param string $method name of method to call
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter, $tag, $method) public function compile($args, $compiler, $parameter, $tag, $method)
@@ -48,22 +48,29 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
$_assign = $_attr['assign']; $_assign = $_attr['assign'];
unset($_attr['assign']); unset($_attr['assign']);
} }
// convert attributes into parameter array string // method or property ?
if ($compiler->smarty->registered_objects[$tag][2]) { if (method_exists($compiler->smarty->registered_objects[$tag][0], $method)) {
$_paramsArray = array(); // convert attributes into parameter array string
foreach ($_attr as $_key => $_value) { if ($compiler->smarty->registered_objects[$tag][2]) {
if (is_int($_key)) { $_paramsArray = array();
$_paramsArray[] = "$_key=>$_value"; foreach ($_attr as $_key => $_value) {
} else { if (is_int($_key)) {
$_paramsArray[] = "'$_key'=>$_value"; $_paramsArray[] = "$_key=>$_value";
} else {
$_paramsArray[] = "'$_key'=>$_value";
}
} }
$_params = 'array(' . implode(",", $_paramsArray) . ')';
$return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
} else {
$_params = implode(",", $_attr);
$return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
} }
$_params = 'array(' . implode(",", $_paramsArray) . ')';
$return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
} else { } else {
$_params = implode(",", $_attr); // object property
$return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})"; $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}";
} }
if (empty($_assign)) { if (empty($_assign)) {
// This tag does create output // This tag does create output
$compiler->has_output = true; $compiler->has_output = true;
@@ -71,9 +78,8 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
} else { } else {
$output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n"; $output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n";
} }
return $output; return $output;
} }
} }
?>

14
libs/sysplugins/smarty_internal_compile_private_print_expression.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -90,8 +90,8 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) { foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) {
if (!is_array($function)) { if (!is_array($function)) {
$output = "{$function}({$output},\$_smarty_tpl)"; $output = "{$function}({$output},\$_smarty_tpl)";
} else if (is_object($function[0])) { } elseif (is_object($function[0])) {
$output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE][{$key}][0]->{$function[1]}({$output},\$_smarty_tpl)"; $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE]['{$key}'][0]->{$function[1]}({$output},\$_smarty_tpl)";
} else { } else {
$output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)"; $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)";
} }
@@ -99,7 +99,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
} }
// auto loaded filters // auto loaded filters
if (isset($compiler->smarty->autoload_filters[Smarty::FILTER_VARIABLE])) { if (isset($compiler->smarty->autoload_filters[Smarty::FILTER_VARIABLE])) {
foreach ((array)$compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) { foreach ((array) $compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) {
$result = $this->compile_output_filter($compiler, $name, $output); $result = $this->compile_output_filter($compiler, $name, $output);
if ($result !== false) { if ($result !== false) {
$output = $result; $output = $result;
@@ -123,6 +123,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
$compiler->has_output = true; $compiler->has_output = true;
$output = "<?php echo {$output};?>"; $output = "<?php echo {$output};?>";
} }
return $output; return $output;
} }
@@ -148,9 +149,8 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
// not found // not found
return false; return false;
} }
return "{$plugin_name}({$output},\$_smarty_tpl)"; return "{$plugin_name}({$output},\$_smarty_tpl)";
} }
} }
?>

19
libs/sysplugins/smarty_internal_compile_private_registered_block.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -28,10 +28,10 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
/** /**
* Compiles code for the execution of a block function * Compiles code for the execution of a block function
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @param string $tag name of block function * @param string $tag name of block function
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter, $tag) public function compile($args, $compiler, $parameter, $tag)
@@ -70,7 +70,7 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
// compile code // compile code
if (!is_array($function)) { if (!is_array($function)) {
$output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
} else if (is_object($function[0])) { } elseif (is_object($function[0])) {
$output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
} else { } else {
$output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
@@ -99,15 +99,14 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
} }
if (!is_array($function)) { if (!is_array($function)) {
$output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
} else if (is_object($function[0])) { } elseif (is_object($function[0])) {
$output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
} else { } else {
$output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
} }
} }
return $output . "\n"; return $output . "\n";
} }
} }
?>

17
libs/sysplugins/smarty_internal_compile_private_registered_function.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -28,10 +28,10 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
/** /**
* Compiles code for the execution of a registered function * Compiles code for the execution of a registered function
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @param string $tag name of function * @param string $tag name of function
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter, $tag) public function compile($args, $compiler, $parameter, $tag)
@@ -68,14 +68,13 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
// compile code // compile code
if (!is_array($function)) { if (!is_array($function)) {
$output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n"; $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
} else if (is_object($function[0])) { } elseif (is_object($function[0])) {
$output = "<?php echo \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n"; $output = "<?php echo \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n";
} else { } else {
$output = "<?php echo {$function[0]}::{$function[1]}({$_params},\$_smarty_tpl);?>\n"; $output = "<?php echo {$function[0]}::{$function[1]}({$_params},\$_smarty_tpl);?>\n";
} }
return $output; return $output;
} }
} }
?>

15
libs/sysplugins/smarty_internal_compile_private_special_variable.php
View File

@@ -15,13 +15,13 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the speical $smarty variables * Compiles code for the speical $smarty variables
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -70,6 +70,7 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
case 'version': case 'version':
$_version = Smarty::SMARTY_VERSION; $_version = Smarty::SMARTY_VERSION;
return "'$_version'"; return "'$_version'";
case 'const': case 'const':
@@ -77,6 +78,7 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
$compiler->trigger_template_error("(secure mode) constants not permitted"); $compiler->trigger_template_error("(secure mode) constants not permitted");
break; break;
} }
return "@constant({$_index[1]})"; return "@constant({$_index[1]})";
case 'config': case 'config':
@@ -87,10 +89,12 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
} }
case 'ldelim': case 'ldelim':
$_ldelim = $compiler->smarty->left_delimiter; $_ldelim = $compiler->smarty->left_delimiter;
return "'$_ldelim'"; return "'$_ldelim'";
case 'rdelim': case 'rdelim':
$_rdelim = $compiler->smarty->right_delimiter; $_rdelim = $compiler->smarty->right_delimiter;
return "'$_rdelim'"; return "'$_rdelim'";
default: default:
@@ -103,9 +107,8 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
$compiled_ref = $compiled_ref . "[$_ind]"; $compiled_ref = $compiled_ref . "[$_ind]";
} }
} }
return $compiled_ref; return $compiled_ref;
} }
} }
?>

11
libs/sysplugins/smarty_internal_compile_rdelim.php
View File

@@ -14,15 +14,15 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {rdelim} tag * Compiles code for the {rdelim} tag
* *
* This tag does output the right delimiter. * This tag does output the right delimiter.
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -33,9 +33,8 @@ class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase {
} }
// this tag does not return compiled code // this tag does not return compiled code
$compiler->has_code = true; $compiler->has_code = true;
return $compiler->smarty->right_delimiter; return $compiler->smarty->right_delimiter;
} }
} }
?>

35
libs/sysplugins/smarty_internal_compile_section.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase
{
/** /**
* Attribute definition: Overwrites base class. * Attribute definition: Overwrites base class.
* *
@@ -42,8 +42,8 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
/** /**
* Compiles code for the {section} tag * Compiles code for the {section} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -65,14 +65,14 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
foreach ($_attr as $attr_name => $attr_value) { foreach ($_attr as $attr_name => $attr_value) {
switch ($attr_name) { switch ($attr_name) {
case 'loop': case 'loop':
$output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n"; $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop); unset(\$_loop);\n";
break; break;
case 'show': case 'show':
if (is_bool($attr_value)) if (is_bool($attr_value))
$show_attr_value = $attr_value ? 'true' : 'false'; $show_attr_value = $attr_value ? 'true' : 'false';
else else
$show_attr_value = "(bool)$attr_value"; $show_attr_value = "(bool) $attr_value";
$output .= "{$section_props}['show'] = $show_attr_value;\n"; $output .= "{$section_props}['show'] = $show_attr_value;\n";
break; break;
@@ -82,11 +82,11 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
case 'max': case 'max':
case 'start': case 'start':
$output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n"; $output .= "{$section_props}['$attr_name'] = (int) $attr_value;\n";
break; break;
case 'step': case 'step':
$output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n"; $output .= "{$section_props}['$attr_name'] = ((int) $attr_value) == 0 ? 1 : (int) $attr_value;\n";
break; break;
} }
} }
@@ -131,6 +131,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
$output .= "{$section_props}['last'] = ({$section_props}['iteration'] == {$section_props}['total']);\n"; $output .= "{$section_props}['last'] = ({$section_props}['iteration'] == {$section_props}['total']);\n";
$output .= "?>"; $output .= "?>";
return $output; return $output;
} }
@@ -142,13 +143,13 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {sectionelse} tag * Compiles code for the {sectionelse} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -170,13 +171,13 @@ class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {/section} tag * Compiles code for the {/section} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -199,5 +200,3 @@ class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase {
} }
} }
?>

22
libs/sysplugins/smarty_internal_compile_setfilter.php
View File

@@ -15,14 +15,14 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for setfilter tag * Compiles code for setfilter tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -31,6 +31,7 @@ class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase {
$compiler->template->variable_filters = $parameter['modifier_list']; $compiler->template->variable_filters = $parameter['modifier_list'];
// this tag does not return compiled code // this tag does not return compiled code
$compiler->has_code = false; $compiler->has_code = false;
return true; return true;
} }
@@ -42,15 +43,15 @@ class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {/setfilter} tag * Compiles code for the {/setfilter} tag
* *
* This tag does not generate compiled output. It resets variable filter. * This tag does not generate compiled output. It resets variable filter.
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -64,9 +65,8 @@ class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
} }
// this tag does not return compiled code // this tag does not return compiled code
$compiler->has_code = false; $compiler->has_code = false;
return true; return true;
} }
} }
?>

28
libs/sysplugins/smarty_internal_compile_while.php
View File

@@ -15,14 +15,14 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {while} tag * Compiles code for the {while} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $parameter array with compilation parameter * @param array $parameter array with compilation parameter
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler, $parameter) public function compile($args, $compiler, $parameter)
@@ -51,14 +51,15 @@ class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase {
} }
if (is_array($parameter['if condition']['var'])) { if (is_array($parameter['if condition']['var'])) {
$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
$_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>"; $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
} else { } else {
$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});"; $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
$_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>"; $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
} }
return $_output; return $_output;
} else { } else {
return "<?php while ({$parameter['if condition']}){?>"; return "<?php while ({$parameter['if condition']}) {?>";
} }
} }
@@ -70,13 +71,13 @@ class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase {
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase { class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase
{
/** /**
* Compiles code for the {/while} tag * Compiles code for the {/while} tag
* *
* @param array $args array with attributes from parser * @param array $args array with attributes from parser
* @param object $compiler compiler object * @param object $compiler compiler object
* @return string compiled code * @return string compiled code
*/ */
public function compile($args, $compiler) public function compile($args, $compiler)
@@ -86,9 +87,8 @@ class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase {
$compiler->tag_nocache = true; $compiler->tag_nocache = true;
} }
$compiler->nocache = $this->closeTag($compiler, array('while')); $compiler->nocache = $this->closeTag($compiler, array('while'));
return "<?php }?>"; return "<?php }?>";
} }
} }
?>

34
libs/sysplugins/smarty_internal_compilebase.php
View File

@@ -13,8 +13,8 @@
* @package Smarty * @package Smarty
* @subpackage Compiler * @subpackage Compiler
*/ */
abstract class Smarty_Internal_CompileBase { abstract class Smarty_Internal_CompileBase
{
/** /**
* Array of names of required attribute required by tag * Array of names of required attribute required by tag
* *
@@ -49,9 +49,9 @@ abstract class Smarty_Internal_CompileBase {
* the corresponding list. The keyword '_any' specifies that any attribute will be accepted * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
* as valid * as valid
* *
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array $attributes attributes applied to the tag * @param array $attributes attributes applied to the tag
* @return array of mapped attributes for further processing * @return array of mapped attributes for further processing
*/ */
public function getAttributes($compiler, $attributes) public function getAttributes($compiler, $attributes)
{ {
@@ -64,7 +64,7 @@ abstract class Smarty_Internal_CompileBase {
if (in_array(trim($mixed, '\'"'), $this->option_flags)) { if (in_array(trim($mixed, '\'"'), $this->option_flags)) {
$_indexed_attr[trim($mixed, '\'"')] = true; $_indexed_attr[trim($mixed, '\'"')] = true;
// shorthand attribute ? // shorthand attribute ?
} else if (isset($this->shorttag_order[$key])) { } elseif (isset($this->shorttag_order[$key])) {
$_indexed_attr[$this->shorttag_order[$key]] = $mixed; $_indexed_attr[$this->shorttag_order[$key]] = $mixed;
} else { } else {
// too many shorthands // too many shorthands
@@ -77,13 +77,13 @@ abstract class Smarty_Internal_CompileBase {
if (in_array($kv['key'], $this->option_flags)) { if (in_array($kv['key'], $this->option_flags)) {
if (is_bool($kv['value'])) { if (is_bool($kv['value'])) {
$_indexed_attr[$kv['key']] = $kv['value']; $_indexed_attr[$kv['key']] = $kv['value'];
} else if (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) { } elseif (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) {
if (trim($kv['value']) == 'true') { if (trim($kv['value']) == 'true') {
$_indexed_attr[$kv['key']] = true; $_indexed_attr[$kv['key']] = true;
} else { } else {
$_indexed_attr[$kv['key']] = false; $_indexed_attr[$kv['key']] = false;
} }
} else if (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) { } elseif (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) {
if ($kv['value'] == 1) { if ($kv['value'] == 1) {
$_indexed_attr[$kv['key']] = true; $_indexed_attr[$kv['key']] = true;
} else { } else {
@@ -129,9 +129,9 @@ abstract class Smarty_Internal_CompileBase {
* *
* Optionally additional data can be saved on stack * Optionally additional data can be saved on stack
* *
* @param object $compiler compiler object * @param object $compiler compiler object
* @param string $openTag the opening tag's name * @param string $openTag the opening tag's name
* @param mixed $data optional data saved * @param mixed $data optional data saved
*/ */
public function openTag($compiler, $openTag, $data = null) public function openTag($compiler, $openTag, $data = null)
{ {
@@ -143,9 +143,9 @@ abstract class Smarty_Internal_CompileBase {
* *
* Raise an error if this stack-top doesn't match with expected opening tags * Raise an error if this stack-top doesn't match with expected opening tags
* *
* @param object $compiler compiler object * @param object $compiler compiler object
* @param array|string $expectedTag the expected opening tag names * @param array|string $expectedTag the expected opening tag names
* @return mixed any type the opening tag's name or saved data * @return mixed any type the opening tag's name or saved data
*/ */
public function closeTag($compiler, $expectedTag) public function closeTag($compiler, $expectedTag)
{ {
@@ -163,14 +163,14 @@ abstract class Smarty_Internal_CompileBase {
} }
} }
// wrong nesting of tags // wrong nesting of tags
$compiler->trigger_template_error("unclosed {" . $_openTag . "} tag"); $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag . "{$compiler->smarty->right_delimiter} tag");
return; return;
} }
// wrong nesting of tags // wrong nesting of tags
$compiler->trigger_template_error("unexpected closing tag", $compiler->lex->taglineno); $compiler->trigger_template_error("unexpected closing tag", $compiler->lex->taglineno);
return; return;
} }
} }
?>

27
libs/sysplugins/smarty_internal_config.php
View File

@@ -19,8 +19,8 @@
* @property Smarty_Config_Compiled $compiled * @property Smarty_Config_Compiled $compiled
* @ignore * @ignore
*/ */
class Smarty_Internal_Config { class Smarty_Internal_Config
{
/** /**
* Samrty instance * Samrty instance
* *
@@ -72,8 +72,8 @@ class Smarty_Internal_Config {
* Constructor of config file object * Constructor of config file object
* *
* @param string $config_resource config file resource name * @param string $config_resource config file resource name
* @param Smarty $smarty Smarty instance * @param Smarty $smarty Smarty instance
* @param object $data object for config vars storage * @param object $data object for config vars storage
*/ */
public function __construct($config_resource, $smarty, $data = null) public function __construct($config_resource, $smarty, $data = null)
{ {
@@ -104,7 +104,7 @@ class Smarty_Internal_Config {
$_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null; $_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null;
$_flag = (int) $this->smarty->config_read_hidden + (int) $this->smarty->config_booleanize * 2 $_flag = (int) $this->smarty->config_read_hidden + (int) $this->smarty->config_booleanize * 2
+ (int) $this->smarty->config_overwrite * 4; + (int) $this->smarty->config_overwrite * 4;
$_filepath = sha1($this->source->name . $_flag); $_filepath = sha1($this->source->filepath . $_flag);
// if use_sub_dirs, break file into directories // if use_sub_dirs, break file into directories
if ($this->smarty->use_sub_dirs) { if ($this->smarty->use_sub_dirs) {
$_filepath = substr($_filepath, 0, 2) . DS $_filepath = substr($_filepath, 0, 2) . DS
@@ -117,6 +117,7 @@ class Smarty_Internal_Config {
$_filepath = $_compile_id . $_compile_dir_sep . $_filepath; $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
} }
$_compile_dir = $this->smarty->getCompileDir(); $_compile_dir = $this->smarty->getCompileDir();
return $_compile_dir . $_filepath . '.' . basename($this->source->name) . '.config' . '.php'; return $_compile_dir . $_filepath . '.' . basename($this->source->name) . '.config' . '.php';
} }
@@ -163,6 +164,7 @@ class Smarty_Internal_Config {
$this->compiled_config = file_get_contents($this->getCompiledFilepath()); $this->compiled_config = file_get_contents($this->getCompiledFilepath());
} }
} }
return $this->compiled_config; return $this->compiled_config;
} }
@@ -202,8 +204,8 @@ class Smarty_Internal_Config {
/** /**
* load config variables * load config variables
* *
* @param mixed $sections array of section names, single section or null * @param mixed $sections array of section names, single section or null
* @param object $scope global,parent or local * @param object $scope global,parent or local
*/ */
public function loadConfigVars($sections = null, $scope = 'local') public function loadConfigVars($sections = null, $scope = 'local')
{ {
@@ -257,8 +259,8 @@ class Smarty_Internal_Config {
/** /**
* set Smarty property in template context * set Smarty property in template context
* *
* @param string $property_name property name * @param string $property_name property name
* @param mixed $value value * @param mixed $value value
* @throws SmartyException if $property_name is not valid * @throws SmartyException if $property_name is not valid
*/ */
public function __set($property_name, $value) public function __set($property_name, $value)
@@ -267,6 +269,7 @@ class Smarty_Internal_Config {
case 'source': case 'source':
case 'compiled': case 'compiled':
$this->$property_name = $value; $this->$property_name = $value;
return; return;
} }
@@ -276,7 +279,7 @@ class Smarty_Internal_Config {
/** /**
* get Smarty property in template context * get Smarty property in template context
* *
* @param string $property_name property name * @param string $property_name property name
* @throws SmartyException if $property_name is not valid * @throws SmartyException if $property_name is not valid
*/ */
public function __get($property_name) public function __get($property_name)
@@ -287,10 +290,12 @@ class Smarty_Internal_Config {
throw new SmartyException("Unable to parse resource name \"{$this->config_resource}\""); throw new SmartyException("Unable to parse resource name \"{$this->config_resource}\"");
} }
$this->source = Smarty_Resource::config($this); $this->source = Smarty_Resource::config($this);
return $this->source; return $this->source;
case 'compiled': case 'compiled':
$this->compiled = $this->source->getCompiled($this); $this->compiled = $this->source->getCompiled($this);
return $this->compiled; return $this->compiled;
} }
@@ -298,5 +303,3 @@ class Smarty_Internal_Config {
} }
} }
?>

8
libs/sysplugins/smarty_internal_config_file_compiler.php
View File

@@ -16,8 +16,8 @@
* @package Smarty * @package Smarty
* @subpackage Config * @subpackage Config
*/ */
class Smarty_Internal_Config_File_Compiler { class Smarty_Internal_Config_File_Compiler
{
/** /**
* Lexer object * Lexer object
* *
@@ -69,7 +69,7 @@ class Smarty_Internal_Config_File_Compiler {
* Method to compile a Smarty template. * Method to compile a Smarty template.
* *
* @param Smarty_Internal_Config $config config object * @param Smarty_Internal_Config $config config object
* @return bool true if compiling succeeded, false if it failed * @return bool true if compiling succeeded, false if it failed
*/ */
public function compileSource(Smarty_Internal_Config $config) public function compileSource(Smarty_Internal_Config $config)
{ {
@@ -140,5 +140,3 @@ class Smarty_Internal_Config_File_Compiler {
} }
} }
?>

102
libs/sysplugins/smarty_internal_configfilelexer.php
View File

@@ -21,10 +21,9 @@ class Smarty_Internal_Configfilelexer
public $line; public $line;
private $state = 1; private $state = 1;
public $smarty_token_names = array ( // Text for parser error messages public $smarty_token_names = array ( // Text for parser error messages
); );
public function __construct($data, $smarty)
function __construct($data, $smarty)
{ {
// set instance object // set instance object
self::instance($this); self::instance($this);
@@ -39,39 +38,35 @@ class Smarty_Internal_Configfilelexer
static $instance = null; static $instance = null;
if (isset($new_instance) && is_object($new_instance)) if (isset($new_instance) && is_object($new_instance))
$instance = $new_instance; $instance = $new_instance;
return $instance; return $instance;
} }
private $_yy_state = 1; private $_yy_state = 1;
private $_yy_stack = array(); private $_yy_stack = array();
function yylex() public function yylex()
{ {
return $this->{'yylex' . $this->_yy_state}(); return $this->{'yylex' . $this->_yy_state}();
} }
function yypushstate($state) public function yypushstate($state)
{ {
array_push($this->_yy_stack, $this->_yy_state); array_push($this->_yy_stack, $this->_yy_state);
$this->_yy_state = $state; $this->_yy_state = $state;
} }
function yypopstate() public function yypopstate()
{ {
$this->_yy_state = array_pop($this->_yy_stack); $this->_yy_state = array_pop($this->_yy_stack);
} }
function yybegin($state) public function yybegin($state)
{ {
$this->_yy_state = $state; $this->_yy_state = $state;
} }
public function yylex1()
function yylex1()
{ {
$tokenMap = array ( $tokenMap = array (
1 => 0, 1 => 0,
@@ -134,55 +129,51 @@ class Smarty_Internal_Configfilelexer
} // end function } // end function
const START = 1; const START = 1;
function yy_r1_1($yy_subpatterns) public function yy_r1_1($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART; $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
$this->yypushstate(self::COMMENT); $this->yypushstate(self::COMMENT);
} }
function yy_r1_2($yy_subpatterns) public function yy_r1_2($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_OPENB; $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
$this->yypushstate(self::SECTION); $this->yypushstate(self::SECTION);
} }
function yy_r1_3($yy_subpatterns) public function yy_r1_3($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB; $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
} }
function yy_r1_4($yy_subpatterns) public function yy_r1_4($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_EQUAL; $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
$this->yypushstate(self::VALUE); $this->yypushstate(self::VALUE);
} }
function yy_r1_5($yy_subpatterns) public function yy_r1_5($yy_subpatterns)
{ {
return false; return false;
} }
function yy_r1_6($yy_subpatterns) public function yy_r1_6($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
} }
function yy_r1_7($yy_subpatterns) public function yy_r1_7($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_ID; $this->token = Smarty_Internal_Configfileparser::TPC_ID;
} }
function yy_r1_8($yy_subpatterns) public function yy_r1_8($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_OTHER; $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
} }
public function yylex2()
function yylex2()
{ {
$tokenMap = array ( $tokenMap = array (
1 => 0, 1 => 0,
@@ -246,62 +237,61 @@ class Smarty_Internal_Configfilelexer
} // end function } // end function
const VALUE = 2; const VALUE = 2;
function yy_r2_1($yy_subpatterns) public function yy_r2_1($yy_subpatterns)
{ {
return false; return false;
} }
function yy_r2_2($yy_subpatterns) public function yy_r2_2($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_FLOAT; $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
$this->yypopstate(); $this->yypopstate();
} }
function yy_r2_3($yy_subpatterns) public function yy_r2_3($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_INT; $this->token = Smarty_Internal_Configfileparser::TPC_INT;
$this->yypopstate(); $this->yypopstate();
} }
function yy_r2_4($yy_subpatterns) public function yy_r2_4($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES; $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
$this->yypushstate(self::TRIPPLE); $this->yypushstate(self::TRIPPLE);
} }
function yy_r2_5($yy_subpatterns) public function yy_r2_5($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING; $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
$this->yypopstate(); $this->yypopstate();
} }
function yy_r2_6($yy_subpatterns) public function yy_r2_6($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING; $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
$this->yypopstate(); $this->yypopstate();
} }
function yy_r2_7($yy_subpatterns) public function yy_r2_7($yy_subpatterns)
{ {
if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) { if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) {
$this->yypopstate(); $this->yypopstate();
$this->yypushstate(self::NAKED_STRING_VALUE); $this->yypushstate(self::NAKED_STRING_VALUE);
return true; //reprocess in new state return true; //reprocess in new state
} else { } else {
$this->token = Smarty_Internal_Configfileparser::TPC_BOOL; $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
$this->yypopstate(); $this->yypopstate();
} }
} }
function yy_r2_8($yy_subpatterns) public function yy_r2_8($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
$this->yypopstate(); $this->yypopstate();
} }
function yy_r2_9($yy_subpatterns) public function yy_r2_9($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
@@ -309,9 +299,7 @@ class Smarty_Internal_Configfilelexer
$this->yypopstate(); $this->yypopstate();
} }
public function yylex3()
function yylex3()
{ {
$tokenMap = array ( $tokenMap = array (
1 => 0, 1 => 0,
@@ -367,18 +355,15 @@ class Smarty_Internal_Configfilelexer
} // end function } // end function
const NAKED_STRING_VALUE = 3; const NAKED_STRING_VALUE = 3;
function yy_r3_1($yy_subpatterns) public function yy_r3_1($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
$this->yypopstate(); $this->yypopstate();
} }
public function yylex4()
function yylex4()
{ {
$tokenMap = array ( $tokenMap = array (
1 => 0, 1 => 0,
@@ -436,28 +421,24 @@ class Smarty_Internal_Configfilelexer
} // end function } // end function
const COMMENT = 4; const COMMENT = 4;
function yy_r4_1($yy_subpatterns) public function yy_r4_1($yy_subpatterns)
{ {
return false; return false;
} }
function yy_r4_2($yy_subpatterns) public function yy_r4_2($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
} }
function yy_r4_3($yy_subpatterns) public function yy_r4_3($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
$this->yypopstate(); $this->yypopstate();
} }
public function yylex5()
function yylex5()
{ {
$tokenMap = array ( $tokenMap = array (
1 => 0, 1 => 0,
@@ -514,22 +495,20 @@ class Smarty_Internal_Configfilelexer
} // end function } // end function
const SECTION = 5; const SECTION = 5;
function yy_r5_1($yy_subpatterns) public function yy_r5_1($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_DOT; $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
} }
function yy_r5_2($yy_subpatterns) public function yy_r5_2($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_SECTION; $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
$this->yypopstate(); $this->yypopstate();
} }
public function yylex6()
function yylex6()
{ {
$tokenMap = array ( $tokenMap = array (
1 => 0, 1 => 0,
@@ -586,16 +565,15 @@ class Smarty_Internal_Configfilelexer
} // end function } // end function
const TRIPPLE = 6; const TRIPPLE = 6;
function yy_r6_1($yy_subpatterns) public function yy_r6_1($yy_subpatterns)
{ {
$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END; $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
$this->yypopstate(); $this->yypopstate();
$this->yypushstate(self::START); $this->yypushstate(self::START);
} }
function yy_r6_2($yy_subpatterns) public function yy_r6_2($yy_subpatterns)
{ {
if ($this->mbstring_overload) { if ($this->mbstring_overload) {
@@ -617,6 +595,4 @@ class Smarty_Internal_Configfilelexer
$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT; $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
} }
} }
?>

170
libs/sysplugins/smarty_internal_configfileparser.php
View File

@@ -14,7 +14,7 @@ class TPC_yyToken implements ArrayAccess
public $string = ''; public $string = '';
public $metadata = array(); public $metadata = array();
function __construct($s, $m = array()) public function __construct($s, $m = array())
{ {
if ($s instanceof TPC_yyToken) { if ($s instanceof TPC_yyToken) {
$this->string = $s->string; $this->string = $s->string;
@@ -29,28 +29,29 @@ class TPC_yyToken implements ArrayAccess
} }
} }
function __toString() public function __toString()
{ {
return $this->_string; return $this->_string;
} }
function offsetExists($offset) public function offsetExists($offset)
{ {
return isset($this->metadata[$offset]); return isset($this->metadata[$offset]);
} }
function offsetGet($offset) public function offsetGet($offset)
{ {
return $this->metadata[$offset]; return $this->metadata[$offset];
} }
function offsetSet($offset, $value) public function offsetSet($offset, $value)
{ {
if ($offset === null) { if ($offset === null) {
if (isset($value[0])) { if (isset($value[0])) {
$x = ($value instanceof TPC_yyToken) ? $x = ($value instanceof TPC_yyToken) ?
$value->metadata : $value; $value->metadata : $value;
$this->metadata = array_merge($this->metadata, $x); $this->metadata = array_merge($this->metadata, $x);
return; return;
} }
$offset = count($this->metadata); $offset = count($this->metadata);
@@ -67,7 +68,7 @@ class TPC_yyToken implements ArrayAccess
} }
} }
function offsetUnset($offset) public function offsetUnset($offset)
{ {
unset($this->metadata[$offset]); unset($this->metadata[$offset]);
} }
@@ -82,7 +83,6 @@ class TPC_yyStackEntry
** is the value of the token */ ** is the value of the token */
}; };
#line 12 "smarty_internal_configfileparser.y" #line 12 "smarty_internal_configfileparser.y"
class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser.php" class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser.php"
{ {
@@ -94,7 +94,8 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
private $lex; private $lex;
private $internalError = false; private $internalError = false;
function __construct($lex, $compiler) { public function __construct($lex, $compiler)
{
// set instance object // set instance object
self::instance($this); self::instance($this);
$this->lex = $lex; $this->lex = $lex;
@@ -106,21 +107,25 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
static $instance = null; static $instance = null;
if (isset($new_instance) && is_object($new_instance)) if (isset($new_instance) && is_object($new_instance))
$instance = $new_instance; $instance = $new_instance;
return $instance; return $instance;
} }
private function parse_bool($str) { private function parse_bool($str)
{
if (in_array(strtolower($str) ,array('on','yes','true'))) { if (in_array(strtolower($str) ,array('on','yes','true'))) {
$res = true; $res = true;
} else { } else {
$res = false; $res = false;
} }
return $res; return $res;
} }
private static $escapes_single = Array('\\' => '\\', private static $escapes_single = Array('\\' => '\\',
'\'' => '\''); '\'' => '\'');
private static function parse_single_quoted_string($qstr) { private static function parse_single_quoted_string($qstr)
{
$escaped_string = substr($qstr, 1, strlen($qstr)-2); //remove outer quotes $escaped_string = substr($qstr, 1, strlen($qstr)-2); //remove outer quotes
$ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE); $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -139,16 +144,20 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
return $str; return $str;
} }
private static function parse_double_quoted_string($qstr) { private static function parse_double_quoted_string($qstr)
{
$inner_str = substr($qstr, 1, strlen($qstr)-2); $inner_str = substr($qstr, 1, strlen($qstr)-2);
return stripcslashes($inner_str); return stripcslashes($inner_str);
} }
private static function parse_tripple_double_quoted_string($qstr) { private static function parse_tripple_double_quoted_string($qstr)
{
return stripcslashes($qstr); return stripcslashes($qstr);
} }
private function set_var(Array $var, Array &$target_array) { private function set_var(Array $var, Array &$target_array)
{
$key = $var["key"]; $key = $var["key"];
$value = $var["value"]; $value = $var["value"];
@@ -160,7 +169,8 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
} }
} }
private function add_global_vars(Array $vars) { private function add_global_vars(Array $vars)
{
if (!isset($this->compiler->config_data['vars'])) { if (!isset($this->compiler->config_data['vars'])) {
$this->compiler->config_data['vars'] = Array(); $this->compiler->config_data['vars'] = Array();
} }
@@ -169,7 +179,8 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser
} }
} }
private function add_section_vars($section_name, Array $vars) { private function add_section_vars($section_name, Array $vars)
{
if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) { if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
$this->compiler->config_data['sections'][$section_name]['vars'] = Array(); $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
} }
@@ -208,7 +219,7 @@ static public $yy_action = array(
/* 20 */ 15, 17, 23, 18, 27, 26, 4, 5, 6, 32, /* 20 */ 15, 17, 23, 18, 27, 26, 4, 5, 6, 32,
/* 30 */ 2, 11, 28, 22, 16, 9, 7, 10, /* 30 */ 2, 11, 28, 22, 16, 9, 7, 10,
); );
static public $yy_lookahead = array( public static $yy_lookahead = array(
/* 0 */ 7, 8, 9, 10, 11, 12, 5, 27, 15, 16, /* 0 */ 7, 8, 9, 10, 11, 12, 5, 27, 15, 16,
/* 10 */ 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, /* 10 */ 20, 21, 23, 23, 17, 18, 13, 14, 17, 18,
/* 20 */ 15, 2, 17, 4, 25, 26, 6, 3, 3, 14, /* 20 */ 15, 2, 17, 4, 25, 26, 6, 3, 3, 14,
@@ -216,17 +227,17 @@ static public $yy_action = array(
); );
const YY_SHIFT_USE_DFLT = -8; const YY_SHIFT_USE_DFLT = -8;
const YY_SHIFT_MAX = 19; const YY_SHIFT_MAX = 19;
static public $yy_shift_ofst = array( public static $yy_shift_ofst = array(
/* 0 */ -8, 1, 1, 1, -7, -3, -3, 30, -8, -8, /* 0 */ -8, 1, 1, 1, -7, -3, -3, 30, -8, -8,
/* 10 */ -8, 19, 5, 3, 15, 16, 24, 25, 32, 20, /* 10 */ -8, 19, 5, 3, 15, 16, 24, 25, 32, 20,
); );
const YY_REDUCE_USE_DFLT = -21; const YY_REDUCE_USE_DFLT = -21;
const YY_REDUCE_MAX = 10; const YY_REDUCE_MAX = 10;
static public $yy_reduce_ofst = array( public static $yy_reduce_ofst = array(
/* 0 */ -10, -1, -1, -1, -20, 10, 12, 8, 14, 7, /* 0 */ -10, -1, -1, -1, -20, 10, 12, 8, 14, 7,
/* 10 */ -11, /* 10 */ -11,
); );
static public $yyExpectedTokens = array( public static $yyExpectedTokens = array(
/* 0 */ array(), /* 0 */ array(),
/* 1 */ array(5, 17, 18, ), /* 1 */ array(5, 17, 18, ),
/* 2 */ array(5, 17, 18, ), /* 2 */ array(5, 17, 18, ),
@@ -264,7 +275,7 @@ static public $yy_action = array(
/* 34 */ array(), /* 34 */ array(),
/* 35 */ array(), /* 35 */ array(),
); );
static public $yy_default = array( public static $yy_default = array(
/* 0 */ 44, 37, 41, 40, 58, 58, 58, 36, 39, 44, /* 0 */ 44, 37, 41, 40, 58, 58, 58, 36, 39, 44,
/* 10 */ 44, 58, 58, 58, 58, 58, 58, 58, 58, 58, /* 10 */ 44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
/* 20 */ 55, 54, 57, 56, 50, 45, 43, 42, 38, 46, /* 20 */ 55, 54, 57, 56, 50, 45, 43, 42, 38, 46,
@@ -277,9 +288,9 @@ static public $yy_action = array(
const YYERRORSYMBOL = 19; const YYERRORSYMBOL = 19;
const YYERRSYMDT = 'yy0'; const YYERRSYMDT = 'yy0';
const YYFALLBACK = 0; const YYFALLBACK = 0;
static public $yyFallback = array( public static $yyFallback = array(
); );
static function Trace($TraceFILE, $zTracePrompt) public static function Trace($TraceFILE, $zTracePrompt)
{ {
if (!$TraceFILE) { if (!$TraceFILE) {
$zTracePrompt = 0; $zTracePrompt = 0;
@@ -290,14 +301,14 @@ static public $yy_action = array(
self::$yyTracePrompt = $zTracePrompt; self::$yyTracePrompt = $zTracePrompt;
} }
static function PrintTrace() public static function PrintTrace()
{ {
self::$yyTraceFILE = fopen('php://output', 'w'); self::$yyTraceFILE = fopen('php://output', 'w');
self::$yyTracePrompt = '<br>'; self::$yyTracePrompt = '<br>';
} }
static public $yyTraceFILE; public static $yyTraceFILE;
static public $yyTracePrompt; public static $yyTracePrompt;
public $yyidx; /* Index of top element in stack */ public $yyidx; /* Index of top element in stack */
public $yyerrcnt; /* Shifts left before out of the error */ public $yyerrcnt; /* Shifts left before out of the error */
public $yystack = array(); /* The parser's stack */ public $yystack = array(); /* The parser's stack */
@@ -312,7 +323,7 @@ static public $yy_action = array(
'section', 'newline', 'var', 'value', 'section', 'newline', 'var', 'value',
); );
static public $yyRuleName = array( public static $yyRuleName = array(
/* 0 */ "start ::= global_vars sections", /* 0 */ "start ::= global_vars sections",
/* 1 */ "global_vars ::= var_list", /* 1 */ "global_vars ::= var_list",
/* 2 */ "sections ::= sections section", /* 2 */ "sections ::= sections section",
@@ -337,7 +348,7 @@ static public $yy_action = array(
/* 21 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE", /* 21 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
); );
function tokenName($tokenType) public function tokenName($tokenType)
{ {
if ($tokenType === 0) { if ($tokenType === 0) {
return 'End of Input'; return 'End of Input';
@@ -349,14 +360,14 @@ static public $yy_action = array(
} }
} }
static function yy_destructor($yymajor, $yypminor) public static function yy_destructor($yymajor, $yypminor)
{ {
switch ($yymajor) { switch ($yymajor) {
default: break; /* If no destructor action specified: do nothing */ default: break; /* If no destructor action specified: do nothing */
} }
} }
function yy_pop_parser_stack() public function yy_pop_parser_stack()
{ {
if (!count($this->yystack)) { if (!count($this->yystack)) {
return; return;
@@ -370,10 +381,11 @@ static public $yy_action = array(
$yymajor = $yytos->major; $yymajor = $yytos->major;
self::yy_destructor($yymajor, $yytos->minor); self::yy_destructor($yymajor, $yytos->minor);
$this->yyidx--; $this->yyidx--;
return $yymajor; return $yymajor;
} }
function __destruct() public function __destruct()
{ {
while ($this->yystack !== Array()) { while ($this->yystack !== Array()) {
$this->yy_pop_parser_stack(); $this->yy_pop_parser_stack();
@@ -383,7 +395,7 @@ static public $yy_action = array(
} }
} }
function yy_get_expected_tokens($token) public function yy_get_expected_tokens($token)
{ {
$state = $this->yystack[$this->yyidx]->stateno; $state = $this->yystack[$this->yyidx]->stateno;
$expected = self::$yyExpectedTokens[$state]; $expected = self::$yyExpectedTokens[$state];
@@ -411,11 +423,12 @@ static public $yy_action = array(
$this->yystack[$this->yyidx]->stateno, $this->yystack[$this->yyidx]->stateno,
self::$yyRuleInfo[$yyruleno]['lhs']); self::$yyRuleInfo[$yyruleno]['lhs']);
if (isset(self::$yyExpectedTokens[$nextstate])) { if (isset(self::$yyExpectedTokens[$nextstate])) {
$expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]); $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
if (in_array($token, if (in_array($token,
self::$yyExpectedTokens[$nextstate], true)) { self::$yyExpectedTokens[$nextstate], true)) {
$this->yyidx = $yyidx; $this->yyidx = $yyidx;
$this->yystack = $stack; $this->yystack = $stack;
return array_unique($expected); return array_unique($expected);
} }
} }
@@ -446,12 +459,13 @@ static public $yy_action = array(
} }
break; break;
} while (true); } while (true);
$this->yyidx = $yyidx; $this->yyidx = $yyidx;
$this->yystack = $stack; $this->yystack = $stack;
return array_unique($expected); return array_unique($expected);
} }
function yy_is_expected_token($token) public function yy_is_expected_token($token)
{ {
if ($token === 0) { if ($token === 0) {
return true; // 0 is not part of this return true; // 0 is not part of this
@@ -484,6 +498,7 @@ static public $yy_action = array(
in_array($token, self::$yyExpectedTokens[$nextstate], true)) { in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
$this->yyidx = $yyidx; $this->yyidx = $yyidx;
$this->yystack = $stack; $this->yystack = $stack;
return true; return true;
} }
if ($nextstate < self::YYNSTATE) { if ($nextstate < self::YYNSTATE) {
@@ -519,10 +534,11 @@ static public $yy_action = array(
} while (true); } while (true);
$this->yyidx = $yyidx; $this->yyidx = $yyidx;
$this->yystack = $stack; $this->yystack = $stack;
return true; return true;
} }
function yy_find_shift_action($iLookAhead) public function yy_find_shift_action($iLookAhead)
{ {
$stateno = $this->yystack[$this->yyidx]->stateno; $stateno = $this->yystack[$this->yyidx]->stateno;
@@ -548,15 +564,17 @@ static public $yy_action = array(
$this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iLookAhead] . " => " .
$this->yyTokenName[$iFallback] . "\n"); $this->yyTokenName[$iFallback] . "\n");
} }
return $this->yy_find_shift_action($iFallback); return $this->yy_find_shift_action($iFallback);
} }
return self::$yy_default[$stateno]; return self::$yy_default[$stateno];
} else { } else {
return self::$yy_action[$i]; return self::$yy_action[$i];
} }
} }
function yy_find_reduce_action($stateno, $iLookAhead) public function yy_find_reduce_action($stateno, $iLookAhead)
{ {
/* $stateno = $this->yystack[$this->yyidx]->stateno; */ /* $stateno = $this->yystack[$this->yyidx]->stateno; */
@@ -579,7 +597,7 @@ static public $yy_action = array(
} }
} }
function yy_shift($yyNewState, $yyMajor, $yypMinor) public function yy_shift($yyNewState, $yyMajor, $yypMinor)
{ {
$this->yyidx++; $this->yyidx++;
if ($this->yyidx >= self::YYSTACKDEPTH) { if ($this->yyidx >= self::YYSTACKDEPTH) {
@@ -595,6 +613,7 @@ static public $yy_action = array(
$this->internalError = true; $this->internalError = true;
$this->compiler->trigger_config_file_error("Stack overflow in configfile parser"); $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
#line 593 "smarty_internal_configfileparser.php" #line 593 "smarty_internal_configfileparser.php"
return; return;
} }
$yytos = new TPC_yyStackEntry; $yytos = new TPC_yyStackEntry;
@@ -606,7 +625,7 @@ static public $yy_action = array(
fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt, fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
$yyNewState); $yyNewState);
fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt); fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
for($i = 1; $i <= $this->yyidx; $i++) { for ($i = 1; $i <= $this->yyidx; $i++) {
fprintf(self::$yyTraceFILE, " %s", fprintf(self::$yyTraceFILE, " %s",
$this->yyTokenName[$this->yystack[$i]->major]); $this->yyTokenName[$this->yystack[$i]->major]);
} }
@@ -614,7 +633,7 @@ static public $yy_action = array(
} }
} }
static public $yyRuleInfo = array( public static $yyRuleInfo = array(
array( 'lhs' => 20, 'rhs' => 2 ), array( 'lhs' => 20, 'rhs' => 2 ),
array( 'lhs' => 21, 'rhs' => 1 ), array( 'lhs' => 21, 'rhs' => 1 ),
array( 'lhs' => 22, 'rhs' => 2 ), array( 'lhs' => 22, 'rhs' => 2 ),
@@ -639,7 +658,7 @@ static public $yy_action = array(
array( 'lhs' => 25, 'rhs' => 3 ), array( 'lhs' => 25, 'rhs' => 3 ),
); );
static public $yyReduceMap = array( public static $yyReduceMap = array(
0 => 0, 0 => 0,
2 => 0, 2 => 0,
3 => 0, 3 => 0,
@@ -664,23 +683,27 @@ static public $yy_action = array(
18 => 17, 18 => 17,
); );
#line 131 "smarty_internal_configfileparser.y" #line 131 "smarty_internal_configfileparser.y"
function yy_r0(){ public function yy_r0()
{
$this->_retvalue = null; $this->_retvalue = null;
} }
#line 666 "smarty_internal_configfileparser.php" #line 666 "smarty_internal_configfileparser.php"
#line 136 "smarty_internal_configfileparser.y" #line 136 "smarty_internal_configfileparser.y"
function yy_r1(){ public function yy_r1()
{
$this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null; $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null;
} }
#line 671 "smarty_internal_configfileparser.php" #line 671 "smarty_internal_configfileparser.php"
#line 149 "smarty_internal_configfileparser.y" #line 149 "smarty_internal_configfileparser.y"
function yy_r4(){ public function yy_r4()
{
$this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
$this->_retvalue = null; $this->_retvalue = null;
} }
#line 677 "smarty_internal_configfileparser.php" #line 677 "smarty_internal_configfileparser.php"
#line 154 "smarty_internal_configfileparser.y" #line 154 "smarty_internal_configfileparser.y"
function yy_r5(){ public function yy_r5()
{
if ($this->smarty->config_read_hidden) { if ($this->smarty->config_read_hidden) {
$this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
} }
@@ -688,69 +711,81 @@ static public $yy_action = array(
} }
#line 685 "smarty_internal_configfileparser.php" #line 685 "smarty_internal_configfileparser.php"
#line 162 "smarty_internal_configfileparser.y" #line 162 "smarty_internal_configfileparser.y"
function yy_r6(){ public function yy_r6()
{
$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
} }
#line 690 "smarty_internal_configfileparser.php" #line 690 "smarty_internal_configfileparser.php"
#line 166 "smarty_internal_configfileparser.y" #line 166 "smarty_internal_configfileparser.y"
function yy_r7(){ public function yy_r7()
{
$this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor)); $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
} }
#line 695 "smarty_internal_configfileparser.php" #line 695 "smarty_internal_configfileparser.php"
#line 170 "smarty_internal_configfileparser.y" #line 170 "smarty_internal_configfileparser.y"
function yy_r8(){ public function yy_r8()
{
$this->_retvalue = Array(); $this->_retvalue = Array();
} }
#line 700 "smarty_internal_configfileparser.php" #line 700 "smarty_internal_configfileparser.php"
#line 176 "smarty_internal_configfileparser.y" #line 176 "smarty_internal_configfileparser.y"
function yy_r9(){ public function yy_r9()
{
$this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
} }
#line 705 "smarty_internal_configfileparser.php" #line 705 "smarty_internal_configfileparser.php"
#line 181 "smarty_internal_configfileparser.y" #line 181 "smarty_internal_configfileparser.y"
function yy_r10(){ public function yy_r10()
{
$this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
} }
#line 710 "smarty_internal_configfileparser.php" #line 710 "smarty_internal_configfileparser.php"
#line 185 "smarty_internal_configfileparser.y" #line 185 "smarty_internal_configfileparser.y"
function yy_r11(){ public function yy_r11()
{
$this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
} }
#line 715 "smarty_internal_configfileparser.php" #line 715 "smarty_internal_configfileparser.php"
#line 189 "smarty_internal_configfileparser.y" #line 189 "smarty_internal_configfileparser.y"
function yy_r12(){ public function yy_r12()
{
$this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
} }
#line 720 "smarty_internal_configfileparser.php" #line 720 "smarty_internal_configfileparser.php"
#line 193 "smarty_internal_configfileparser.y" #line 193 "smarty_internal_configfileparser.y"
function yy_r13(){ public function yy_r13()
{
$this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
} }
#line 725 "smarty_internal_configfileparser.php" #line 725 "smarty_internal_configfileparser.php"
#line 197 "smarty_internal_configfileparser.y" #line 197 "smarty_internal_configfileparser.y"
function yy_r14(){ public function yy_r14()
{
$this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
} }
#line 730 "smarty_internal_configfileparser.php" #line 730 "smarty_internal_configfileparser.php"
#line 201 "smarty_internal_configfileparser.y" #line 201 "smarty_internal_configfileparser.y"
function yy_r15(){ public function yy_r15()
{
$this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor); $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
} }
#line 735 "smarty_internal_configfileparser.php" #line 735 "smarty_internal_configfileparser.php"
#line 205 "smarty_internal_configfileparser.y" #line 205 "smarty_internal_configfileparser.y"
function yy_r16(){ public function yy_r16()
{
$this->_retvalue = ''; $this->_retvalue = '';
} }
#line 740 "smarty_internal_configfileparser.php" #line 740 "smarty_internal_configfileparser.php"
#line 209 "smarty_internal_configfileparser.y" #line 209 "smarty_internal_configfileparser.y"
function yy_r17(){ public function yy_r17()
{
$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
} }
#line 745 "smarty_internal_configfileparser.php" #line 745 "smarty_internal_configfileparser.php"
private $_retvalue; private $_retvalue;
function yy_reduce($yyruleno) public function yy_reduce($yyruleno)
{ {
$yymsp = $this->yystack[$this->yyidx]; $yymsp = $this->yystack[$this->yyidx];
if (self::$yyTraceFILE && $yyruleno >= 0 if (self::$yyTraceFILE && $yyruleno >= 0
@@ -770,7 +805,7 @@ static public $yy_action = array(
$yygoto = self::$yyRuleInfo[$yyruleno]['lhs']; $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
$yysize = self::$yyRuleInfo[$yyruleno]['rhs']; $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
$this->yyidx -= $yysize; $this->yyidx -= $yysize;
for($i = $yysize; $i; $i--) { for ($i = $yysize; $i; $i--) {
// pop all of the right-hand side parameters // pop all of the right-hand side parameters
array_pop($this->yystack); array_pop($this->yystack);
} }
@@ -791,17 +826,16 @@ static public $yy_action = array(
} }
} }
function yy_parse_failed() public function yy_parse_failed()
{ {
if (self::$yyTraceFILE) { if (self::$yyTraceFILE) {
fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt); fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
} } while ($this->yyidx >= 0) {
while ($this->yyidx >= 0) {
$this->yy_pop_parser_stack(); $this->yy_pop_parser_stack();
} }
} }
function yy_syntax_error($yymajor, $TOKEN) public function yy_syntax_error($yymajor, $TOKEN)
{ {
#line 118 "smarty_internal_configfileparser.y" #line 118 "smarty_internal_configfileparser.y"
@@ -811,12 +845,11 @@ static public $yy_action = array(
#line 808 "smarty_internal_configfileparser.php" #line 808 "smarty_internal_configfileparser.php"
} }
function yy_accept() public function yy_accept()
{ {
if (self::$yyTraceFILE) { if (self::$yyTraceFILE) {
fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt); fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
} } while ($this->yyidx >= 0) {
while ($this->yyidx >= 0) {
$stack = $this->yy_pop_parser_stack(); $stack = $this->yy_pop_parser_stack();
} }
#line 110 "smarty_internal_configfileparser.y" #line 110 "smarty_internal_configfileparser.y"
@@ -828,7 +861,7 @@ static public $yy_action = array(
#line 826 "smarty_internal_configfileparser.php" #line 826 "smarty_internal_configfileparser.php"
} }
function doParse($yymajor, $yytokenvalue) public function doParse($yymajor, $yytokenvalue)
{ {
$yyerrorhit = 0; /* True if yymajor has invoked an error */ $yyerrorhit = 0; /* True if yymajor has invoked an error */
@@ -875,7 +908,7 @@ static public $yy_action = array(
$this->yy_syntax_error($yymajor, $yytokenvalue); $this->yy_syntax_error($yymajor, $yytokenvalue);
} }
$yymx = $this->yystack[$this->yyidx]->major; $yymx = $this->yystack[$this->yyidx]->major;
if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){ if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
if (self::$yyTraceFILE) { if (self::$yyTraceFILE) {
fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n", fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
self::$yyTracePrompt, $this->yyTokenName[$yymajor]); self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
@@ -918,4 +951,3 @@ static public $yy_action = array(
} while ($yymajor != self::YYNOCODE && $this->yyidx >= 0); } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
} }
} }
?>

101
libs/sysplugins/smarty_internal_data.php
View File

@@ -15,8 +15,8 @@
* @package Smarty * @package Smarty
* @subpackage Template * @subpackage Template
*/ */
class Smarty_Internal_Data { class Smarty_Internal_Data
{
/** /**
* name of class used for templates * name of class used for templates
* *
@@ -45,10 +45,10 @@ class Smarty_Internal_Data {
/** /**
* assigns a Smarty variable * assigns a Smarty variable
* *
* @param array|string $tpl_var the template variable name(s) * @param array|string $tpl_var the template variable name(s)
* @param mixed $value the value to assign * @param mixed $value the value to assign
* @param boolean $nocache if true any output of this variable will be not cached * @param boolean $nocache if true any output of this variable will be not cached
* @param boolean $scope the scope the variable will have (local,parent or root) * @param boolean $scope the scope the variable will have (local,parent or root)
* @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
*/ */
public function assign($tpl_var, $value = null, $nocache = false) public function assign($tpl_var, $value = null, $nocache = false)
@@ -71,9 +71,9 @@ class Smarty_Internal_Data {
/** /**
* assigns a global Smarty variable * assigns a global Smarty variable
* *
* @param string $varname the global variable name * @param string $varname the global variable name
* @param mixed $value the value to assign * @param mixed $value the value to assign
* @param boolean $nocache if true any output of this variable will be not cached * @param boolean $nocache if true any output of this variable will be not cached
* @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
*/ */
public function assignGlobal($varname, $value = null, $nocache = false) public function assignGlobal($varname, $value = null, $nocache = false)
@@ -94,7 +94,7 @@ class Smarty_Internal_Data {
* *
* @param string $tpl_var the template variable name * @param string $tpl_var the template variable name
* @param mixed $ &$value the referenced value to assign * @param mixed $ &$value the referenced value to assign
* @param boolean $nocache if true any output of this variable will be not cached * @param boolean $nocache if true any output of this variable will be not cached
* @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
*/ */
public function assignByRef($tpl_var, &$value, $nocache = false) public function assignByRef($tpl_var, &$value, $nocache = false)
@@ -110,10 +110,10 @@ class Smarty_Internal_Data {
/** /**
* appends values to template variables * appends values to template variables
* *
* @param array|string $tpl_var the template variable name(s) * @param array|string $tpl_var the template variable name(s)
* @param mixed $value the value to append * @param mixed $value the value to append
* @param boolean $merge flag if array elements shall be merged * @param boolean $merge flag if array elements shall be merged
* @param boolean $nocache if true any output of this variable will be not cached * @param boolean $nocache if true any output of this variable will be not cached
* @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
*/ */
public function append($tpl_var, $value = null, $merge = false, $nocache = false) public function append($tpl_var, $value = null, $merge = false, $nocache = false)
@@ -134,7 +134,7 @@ class Smarty_Internal_Data {
settype($this->tpl_vars[$_key]->value, 'array'); settype($this->tpl_vars[$_key]->value, 'array');
} }
if ($merge && is_array($_val)) { if ($merge && is_array($_val)) {
foreach($_val as $_mkey => $_mval) { foreach ($_val as $_mkey => $_mval) {
$this->tpl_vars[$_key]->value[$_mkey] = $_mval; $this->tpl_vars[$_key]->value[$_mkey] = $_mval;
} }
} else { } else {
@@ -156,7 +156,7 @@ class Smarty_Internal_Data {
settype($this->tpl_vars[$tpl_var]->value, 'array'); settype($this->tpl_vars[$tpl_var]->value, 'array');
} }
if ($merge && is_array($value)) { if ($merge && is_array($value)) {
foreach($value as $_mkey => $_mval) { foreach ($value as $_mkey => $_mval) {
$this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval; $this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
} }
} else { } else {
@@ -171,9 +171,9 @@ class Smarty_Internal_Data {
/** /**
* appends values to template variables by reference * appends values to template variables by reference
* *
* @param string $tpl_var the template variable name * @param string $tpl_var the template variable name
* @param mixed &$value the referenced value to append * @param mixed &$value the referenced value to append
* @param boolean $merge flag if array elements shall be merged * @param boolean $merge flag if array elements shall be merged
* @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
*/ */
public function appendByRef($tpl_var, &$value, $merge = false) public function appendByRef($tpl_var, &$value, $merge = false)
@@ -186,7 +186,7 @@ class Smarty_Internal_Data {
settype($this->tpl_vars[$tpl_var]->value, 'array'); settype($this->tpl_vars[$tpl_var]->value, 'array');
} }
if ($merge && is_array($value)) { if ($merge && is_array($value)) {
foreach($value as $_key => $_val) { foreach ($value as $_key => $_val) {
$this->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key]; $this->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key];
} }
} else { } else {
@@ -200,10 +200,10 @@ class Smarty_Internal_Data {
/** /**
* Returns a single or all template variables * Returns a single or all template variables
* *
* @param string $varname variable name or null * @param string $varname variable name or null
* @param string $_ptr optional pointer to data object * @param string $_ptr optional pointer to data object
* @param boolean $search_parents include parent templates? * @param boolean $search_parents include parent templates?
* @return string variable value or or array of variables * @return string variable value or or array of variables
*/ */
public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true) public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
{ {
@@ -238,6 +238,7 @@ class Smarty_Internal_Data {
} }
} }
} }
return $_result; return $_result;
} }
} }
@@ -245,7 +246,7 @@ class Smarty_Internal_Data {
/** /**
* clear the given assigned template variable. * clear the given assigned template variable.
* *
* @param string|array $tpl_var the template variable(s) to clear * @param string|array $tpl_var the template variable(s) to clear
* @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
*/ */
public function clearAssign($tpl_var) public function clearAssign($tpl_var)
@@ -268,14 +269,15 @@ class Smarty_Internal_Data {
public function clearAllAssign() public function clearAllAssign()
{ {
$this->tpl_vars = array(); $this->tpl_vars = array();
return $this; return $this;
} }
/** /**
* load a config file, optionally load just selected sections * load a config file, optionally load just selected sections
* *
* @param string $config_file filename * @param string $config_file filename
* @param mixed $sections array of section names, single section or null * @param mixed $sections array of section names, single section or null
* @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
*/ */
public function configLoad($config_file, $sections = null) public function configLoad($config_file, $sections = null)
@@ -283,16 +285,17 @@ class Smarty_Internal_Data {
// load Config class // load Config class
$config = new Smarty_Internal_Config($config_file, $this->smarty, $this); $config = new Smarty_Internal_Config($config_file, $this->smarty, $this);
$config->loadConfigVars($sections); $config->loadConfigVars($sections);
return $this; return $this;
} }
/** /**
* gets the object of a Smarty variable * gets the object of a Smarty variable
* *
* @param string $variable the name of the Smarty variable * @param string $variable the name of the Smarty variable
* @param object $_ptr optional pointer to data object * @param object $_ptr optional pointer to data object
* @param boolean $search_parents search also in parent data * @param boolean $search_parents search also in parent data
* @return object the object of the variable * @return object the object of the variable
*/ */
public function getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true) public function getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true)
{ {
@@ -318,14 +321,15 @@ class Smarty_Internal_Data {
// force a notice // force a notice
$x = $$variable; $x = $$variable;
} }
return new Undefined_Smarty_Variable; return new Undefined_Smarty_Variable;
} }
/** /**
* gets a config variable * gets a config variable
* *
* @param string $variable the name of the config variable * @param string $variable the name of the config variable
* @return mixed the value of the config variable * @return mixed the value of the config variable
*/ */
public function getConfigVariable($variable, $error_enable = true) public function getConfigVariable($variable, $error_enable = true)
{ {
@@ -342,14 +346,15 @@ class Smarty_Internal_Data {
// force a notice // force a notice
$x = $$variable; $x = $$variable;
} }
return null; return null;
} }
/** /**
* gets a stream variable * gets a stream variable
* *
* @param string $variable the stream of the variable * @param string $variable the stream of the variable
* @return mixed the value of the stream variable * @return mixed the value of the stream variable
*/ */
public function getStreamVariable($variable) public function getStreamVariable($variable)
{ {
@@ -360,6 +365,7 @@ class Smarty_Internal_Data {
$_result .= $current_line; $_result .= $current_line;
} }
fclose($fp); fclose($fp);
return $_result; return $_result;
} }
@@ -373,7 +379,7 @@ class Smarty_Internal_Data {
/** /**
* Returns a single or all config variables * Returns a single or all config variables
* *
* @param string $varname variable name or null * @param string $varname variable name or null
* @return string variable value or or array of variables * @return string variable value or or array of variables
*/ */
public function getConfigVars($varname = null, $search_parents = true) public function getConfigVars($varname = null, $search_parents = true)
@@ -405,7 +411,7 @@ class Smarty_Internal_Data {
/** /**
* Deassigns a single or all config variables * Deassigns a single or all config variables
* *
* @param string $varname variable name or null * @param string $varname variable name or null
* @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
*/ */
public function clearConfig($varname = null) public function clearConfig($varname = null)
@@ -415,6 +421,7 @@ class Smarty_Internal_Data {
} else { } else {
$this->config_vars = array(); $this->config_vars = array();
} }
return $this; return $this;
} }
@@ -428,8 +435,8 @@ class Smarty_Internal_Data {
* @package Smarty * @package Smarty
* @subpackage Template * @subpackage Template
*/ */
class Smarty_Data extends Smarty_Internal_Data { class Smarty_Data extends Smarty_Internal_Data
{
/** /**
* Smarty object * Smarty object
* *
@@ -440,8 +447,8 @@ class Smarty_Data extends Smarty_Internal_Data {
/** /**
* create Smarty data object * create Smarty data object
* *
* @param Smarty|array $_parent parent template * @param Smarty|array $_parent parent template
* @param Smarty $smarty global smarty instance * @param Smarty $smarty global smarty instance
*/ */
public function __construct ($_parent = null, $smarty = null) public function __construct ($_parent = null, $smarty = null)
{ {
@@ -469,8 +476,8 @@ class Smarty_Data extends Smarty_Internal_Data {
* @package Smarty * @package Smarty
* @subpackage Template * @subpackage Template
*/ */
class Smarty_Variable { class Smarty_Variable
{
/** /**
* template variable * template variable
* *
@@ -524,12 +531,12 @@ class Smarty_Variable {
* @package Smarty * @package Smarty
* @subpackage Template * @subpackage Template
*/ */
class Undefined_Smarty_Variable { class Undefined_Smarty_Variable
{
/** /**
* Returns FALSE for 'nocache' and NULL otherwise. * Returns FALSE for 'nocache' and NULL otherwise.
* *
* @param string $name * @param string $name
* @return bool * @return bool
*/ */
public function __get($name) public function __get($name)
@@ -552,5 +559,3 @@ class Undefined_Smarty_Variable {
} }
} }
?>

Some files were not shown because too many files have changed in this diff Show More