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

replace property array by object properties

Browse Source
This commit is contained in:
uwetews
2015-08-09 20:45:28 +02:00
parent d16e2d3a15
commit c08191d191
4 changed files with 23 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,11 +115,11 @@ function smarty_modifiercompiler_escape($params, $compiler)
// could not optimize |escape call, so fallback to regular plugin // could not optimize |escape call, so fallback to regular plugin
if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) { if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
$compiler->template->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php'; $compiler->parent_compiler->template->compiled->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
$compiler->template->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape'; $compiler->parent_compiler->template->compiled->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
} else { } else {
$compiler->template->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php'; $compiler->parent_compiler->template->compiled->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
$compiler->template->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape'; $compiler->parent_compiler->template->compiled->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
} }
return 'smarty_modifier_escape(' . join(', ', $params) . ')'; return 'smarty_modifier_escape(' . join(', ', $params) . ')';

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

@@ -34,11 +34,11 @@ function smarty_modifiercompiler_wordwrap($params, $compiler)
$function = 'wordwrap'; $function = 'wordwrap';
if (Smarty::$_MBSTRING) { if (Smarty::$_MBSTRING) {
if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) { if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
$compiler->template->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php'; $compiler->parent_compiler->template->compiled->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
$compiler->template->required_plugins['nocache']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap'; $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
} else { } else {
$compiler->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php'; $compiler->parent_compiler->template->compiled->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
$compiler->template->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap'; $compiler->parent_compiler->template->compiled->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
} }
$function = 'smarty_mb_wordwrap'; $function = 'smarty_mb_wordwrap';
} }

2
libs/sysplugins/smarty_internal_debug.php
View File

@@ -70,7 +70,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
{ {
$key = self::get_key($template); $key = self::get_key($template);
self::$template_data[self::$index][$key]['total_time'] += microtime(true) - self::$template_data[self::$index][$key]['start_template_time']; self::$template_data[self::$index][$key]['total_time'] += microtime(true) - self::$template_data[self::$index][$key]['start_template_time'];
self::$template_data[self::$index][$key]['properties'] = $template->properties; //self::$template_data[self::$index][$key]['properties'] = $template->properties;
} }
/** /**

66
libs/sysplugins/smarty_template_cached.php
View File

@@ -14,15 +14,8 @@
* @subpackage TemplateResources * @subpackage TemplateResources
* @author Rodney Rehm * @author Rodney Rehm
*/ */
class Smarty_Template_Cached class Smarty_Template_Cached extends Smarty_Template_Resource_Base
{ {
/**
* Source Filepath
*
* @var string
*/
public $filepath = false;
/** /**
* Source Content * Source Content
* *
@@ -30,34 +23,13 @@ class Smarty_Template_Cached
*/ */
public $content = null; public $content = null;
/** /**
* Source Timestamp
*
* @var integer
*/
public $timestamp = false;
/**
* Source Existence
*
* @var boolean
*/
public $exists = false;
/**
* Cache Is Valid * Cache Is Valid
* *
* @var boolean * @var boolean
*/ */
public $valid = null; public $valid = null;
/**
* Cache was processed
*
* @var boolean
*/
public $processed = false;
/** /**
* CacheResource Handler * CacheResource Handler
* *
@@ -65,13 +37,6 @@ class Smarty_Template_Cached
*/ */
public $handler = null; public $handler = null;
/**
* Template Compile Id (Smarty_Internal_Template::$compile_id)
*
* @var string
*/
public $compile_id = null;
/** /**
* Template Cache Id (Smarty_Internal_Template::$cache_id) * Template Cache Id (Smarty_Internal_Template::$cache_id)
* *
@@ -100,6 +65,7 @@ class Smarty_Template_Cached
*/ */
public $source = null; public $source = null;
/** /**
* create Cached Object container * create Cached Object container
* *
@@ -188,7 +154,7 @@ class Smarty_Template_Cached
} else { } else {
return $this->valid; return $this->valid;
} }
if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) { if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->cached->cache_lifetime >= 0 && (time() > ($_template->cached->timestamp + $_template->cached->cache_lifetime))) {
$this->valid = false; $this->valid = false;
} }
if ($_template->smarty->cache_locking) { if ($_template->smarty->cache_locking) {
@@ -234,7 +200,7 @@ class Smarty_Template_Cached
if (!$this->processed) { if (!$this->processed) {
$this->process($_template); $this->process($_template);
} }
return $_template->getRenderedTemplateCode(); return $_template->getRenderedTemplateCode($this->unifunc);
} }
/** /**
@@ -249,7 +215,7 @@ class Smarty_Template_Cached
{ {
if (!$_template->source->recompiled) { if (!$_template->source->recompiled) {
if ($this->handler->writeCachedContent($_template, $content)) { if ($this->handler->writeCachedContent($_template, $content)) {
$this->content = null; $this->buffer = null;
$this->timestamp = time(); $this->timestamp = time();
$this->exists = true; $this->exists = true;
$this->valid = true; $this->valid = true;
@@ -260,7 +226,7 @@ class Smarty_Template_Cached
return true; return true;
} }
$this->content = null; $this->buffer = null;
$this->timestamp = false; $this->timestamp = false;
$this->exists = false; $this->exists = false;
$this->valid = false; $this->valid = false;
@@ -296,22 +262,22 @@ class Smarty_Template_Cached
*/ */
public function updateCache(Smarty_Internal_Template $_template, $content, $no_output_filter) public function updateCache(Smarty_Internal_Template $_template, $content, $no_output_filter)
{ {
$_template->properties['has_nocache_code'] = false; $_template->cached->has_nocache_code = false;
// get text between non-cached items // get text between non-cached items
$cache_split = preg_split("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $content); $cache_split = preg_split("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s", $content);
// get non-cached items // get non-cached items
preg_match_all("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $content, $cache_parts); preg_match_all("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s", $content, $cache_parts);
$output = ''; $output = '';
// loop over items, stitch back together // loop over items, stitch back together
foreach ($cache_split as $curr_idx => $curr_split) { foreach ($cache_split as $curr_idx => $curr_split) {
// escape PHP tags in template content // escape PHP tags in template content
$output .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/', "<?php echo '\$1'; ?>\n", $curr_split); $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/', "<?php echo '\$1'; ?>\n", $curr_split);
if (isset($cache_parts[0][$curr_idx])) { if (isset($cache_parts[0][$curr_idx])) {
$_template->properties['has_nocache_code'] = true; $_template->cached->has_nocache_code = true;
$output .= $cache_parts[1][$curr_idx]; $output .= $cache_parts[1][$curr_idx];
} }
} }
if (!$no_output_filter && !$_template->has_nocache_code && (isset($_template->smarty->autoload_filters['output']) || isset($_template->smarty->registered_filters['output']))) { if (!$no_output_filter && !$_template->compiled->has_nocache_code && (isset($_template->smarty->autoload_filters['output']) || isset($_template->smarty->registered_filters['output']))) {
$output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $_template); $output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $_template);
} }
// write cache file content // write cache file content
@@ -332,11 +298,9 @@ class Smarty_Template_Cached
// don't write cache file // don't write cache file
return false; return false;
} }
$_template->properties['cache_lifetime'] = $_template->cache_lifetime;
$_template->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
$content = Smarty_Internal_Extension_CodeFrame::create($_template, $content, true); $content = Smarty_Internal_Extension_CodeFrame::create($_template, $content, true);
if (!empty($_template->properties['tpl_function'])) { if (!empty($_template->cached->tpl_function)) {
foreach ($_template->properties['tpl_function'] as $funcParam) { foreach ($_template->cached->tpl_function as $funcParam) {
if (is_file($funcParam['compiled_filepath'])) { if (is_file($funcParam['compiled_filepath'])) {
// read compiled file // read compiled file
$code = file_get_contents($funcParam['compiled_filepath']); $code = file_get_contents($funcParam['compiled_filepath']);
@@ -359,7 +323,7 @@ class Smarty_Template_Cached
*/ */
public function cacheModifiedCheck(Smarty_Internal_Template $_template, $content) public function cacheModifiedCheck(Smarty_Internal_Template $_template, $content)
{ {
$_isCached = $_template->isCached() && !$_template->has_nocache_code; $_isCached = $_template->isCached() && !$_template->compiled->has_nocache_code;
$_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3); $_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
if ($_isCached && $this->timestamp <= strtotime($_last_modified_date)) { if ($_isCached && $this->timestamp <= strtotime($_last_modified_date)) {
switch (PHP_SAPI) { switch (PHP_SAPI) {