Merge pull request #1122 from tugelbend/master
Updated smarty template to 3.1.19
This commit is contained in:
fabrixxm
commit
181ecc2197
157 changed files with 16492 additions and 15310 deletions
|
|
@ -101,10 +101,6 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
// fancyboxes
|
// fancyboxes
|
||||||
/*$("a.popupbox").fancybox({
|
|
||||||
'transitionIn' : 'elastic',
|
|
||||||
'transitionOut' : 'elastic'
|
|
||||||
});*/
|
|
||||||
$("a.popupbox").colorbox({
|
$("a.popupbox").colorbox({
|
||||||
'inline' : true,
|
'inline' : true,
|
||||||
'transition' : 'elastic'
|
'transition' : 'elastic'
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
Smarty 3.1.11
|
Smarty 3.1.19
|
||||||
|
|
||||||
Author: Monte Ohrt <monte at ohrt dot com >
|
Author: Monte Ohrt <monte at ohrt dot com >
|
||||||
Author: Uwe Tews
|
Author: Uwe Tews
|
||||||
|
|
@ -120,7 +120,7 @@ $smarty->unregisterObject($object_name)
|
||||||
$smarty->unregisterFilter($type, $function_name)
|
$smarty->unregisterFilter($type, $function_name)
|
||||||
$smarty->unregisterResource($resource_type)
|
$smarty->unregisterResource($resource_type)
|
||||||
|
|
||||||
$smarty->compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
|
$smarty->compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
|
||||||
$smarty->clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
|
$smarty->clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
|
||||||
$smarty->testInstall()
|
$smarty->testInstall()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -199,7 +199,7 @@ Relative paths are available with {include file="..."} and
|
||||||
$smarty->fetch('./foo.tpl') cannot be relative to a template, an
|
$smarty->fetch('./foo.tpl') cannot be relative to a template, an
|
||||||
exception is thrown.
|
exception is thrown.
|
||||||
|
|
||||||
Adressing a specific $template_dir
|
Addressing a specific $template_dir
|
||||||
|
|
||||||
Smarty 3.1 introduces the $template_dir index notation.
|
Smarty 3.1 introduces the $template_dir index notation.
|
||||||
$smarty->fetch('[foo]bar.tpl') and {include file="[foo]bar.tpl"}
|
$smarty->fetch('[foo]bar.tpl') and {include file="[foo]bar.tpl"}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,297 @@
|
||||||
===== trunk =====
|
===== 3.1.20-dev ===== (xx.xx.2014)
|
||||||
|
===== 3.1.19 ===== (06.30.2014)
|
||||||
|
20.06.2014
|
||||||
|
- bugfix template variables could not be passed as paramter in {include} when the include was in a {nocache} section (topic 25131)
|
||||||
|
|
||||||
|
17.06.2014
|
||||||
|
- bugfix large template text of some charsets could cause parsing errors (topic 24630)
|
||||||
|
|
||||||
|
08.06.2014
|
||||||
|
- bugfix registered objects did not work after spelling fixes of 06.06.2014
|
||||||
|
- bugfix {block} tags within {literal} .. {/literal} got not displayed correctly (topic 25024)
|
||||||
|
- bugfix UNC WINDOWS PATH like "\\psf\path\to\dir" did not work as template directory (Issue 192)
|
||||||
|
- bugfix {html_image} security check did fail on files relative to basedir (Issue 191)
|
||||||
|
|
||||||
|
06.06.2014
|
||||||
|
- fixed PHPUnit outputFilterTrimWhitespaceTests.php assertion of test result
|
||||||
|
- fixed spelling, PHPDoc , minor errors, code cleanup
|
||||||
|
|
||||||
|
02.06.2014
|
||||||
|
- using multiple cwd with relative template dirs could result in identical compiled file names. (issue 194 and topic 25099)
|
||||||
|
|
||||||
|
19.04.2014
|
||||||
|
- bugfix calling createTemplate(template, data) with empty data array caused notice of array to string conversion (Issue 189)
|
||||||
|
- bugfix clearCompiledTemplate() did not delete files on WINDOWS when a compile_id was specified
|
||||||
|
|
||||||
|
18.04.2014
|
||||||
|
- revert bugfix of 5.4.2014 because %-e date format is not supported on all operating systems
|
||||||
|
|
||||||
|
===== 3.1.18 ===== (07.04.2014)
|
||||||
|
06.04.2014
|
||||||
|
- bugfix template inheritance fail when using custom resource after patch of 8.3.2014 (Issue 187)
|
||||||
|
- bugfix update of composer file (Issue 168 and 184)
|
||||||
|
|
||||||
|
05.04.2014
|
||||||
|
- bugfix default date format leads to extra spaces when displaying dates with single digit days (Issue 165)
|
||||||
|
|
||||||
|
26.03.2014
|
||||||
|
- bugfix Smart_Resource_Custom should not lowercase the resource name (Issue 183)
|
||||||
|
|
||||||
|
24.03.2014
|
||||||
|
- bugfix using a {foreach} property like @iteration could fail when used in inheritance parent templates (Issue 182)
|
||||||
|
|
||||||
|
20.03.2014
|
||||||
|
- bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
|
||||||
|
|
||||||
|
18.03.2014
|
||||||
|
- revert change of 17.03.2014
|
||||||
|
|
||||||
|
17.03.2014
|
||||||
|
- bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
|
||||||
|
|
||||||
|
15.03.2014
|
||||||
|
- bugfix Smarty_CacheResource_Keyvaluestore did use different keys on read/writes and clearCache() calls (Issue 169)
|
||||||
|
|
||||||
|
13.03.2014
|
||||||
|
- bugfix clearXxx() change of 27.1.2014 did not work when specifing cache_id or compile_id (forum topic 24868 and 24867)
|
||||||
|
|
||||||
|
===== 3.1.17 =====
|
||||||
|
08.03.2014
|
||||||
|
- bugfix relative file path {include} within {block} of child templates did throw exception on first call (Issue 177)
|
||||||
|
|
||||||
|
17.02.2014
|
||||||
|
- bugfix Smarty failed when executing PHP on HHVM (Hip Hop 2.4) because uniqid('',true) does return string with ',' (forum topic 20343)
|
||||||
|
|
||||||
|
16.02.2014
|
||||||
|
- bugfix a '//' or '\\' in template_dir path could produce wrong path on relative filepath in {include} (Issue 175)
|
||||||
|
|
||||||
|
05.02.2014
|
||||||
|
- bugfix shared.literal_compiler_param.php did throw an exception when literal did contain a '-' (smarty-developers group)
|
||||||
|
|
||||||
|
27.01.2014
|
||||||
|
- bugfix $smarty->debugging = true; did show the variable of the $smarty object not the variables used in display() call (forum topic 24764)
|
||||||
|
- bugfix clearCompiledTemplate(), clearAll() and clear() should use realpath to avoid possible exception from RecursiveDirectoryIterator (Issue 171)
|
||||||
|
|
||||||
|
26.01.2014
|
||||||
|
- bugfix undo block nesting checks for {nocache} for reasons like forum topic 23280 (forum topic 24762)
|
||||||
|
|
||||||
|
18.01.2014
|
||||||
|
- bugfix the compiler did fail when using template inheritance and recursive {include} (smarty-developers group)
|
||||||
|
|
||||||
|
11.01.2014
|
||||||
|
- bugfix "* }" (spaces before right delimiter) was interpreted by mistake as comment end tag (Issue 170)
|
||||||
|
- internals content cache should be clear when updating cache file
|
||||||
|
|
||||||
|
08.01.2014
|
||||||
|
- bugfix Smarty_CacheResource_Custom did not handle template resource type specifications on clearCache() calls (Issue 169)
|
||||||
|
- bugfix SmartyBC.class.php should use require_once to load Smarty.class.php (forum topic 24683)
|
||||||
|
|
||||||
|
===== 3.1.16 =====
|
||||||
|
15.12.2013
|
||||||
|
- bugfix {include} with {block} tag handling (forum topic 24599, 24594, 24682) (Issue 161)
|
||||||
|
Read 3.1.16_RELEASE_NOTES for more details
|
||||||
|
- enhancement additional debug output at $smarty->_parserdebug = true;
|
||||||
|
|
||||||
|
07.11.2013
|
||||||
|
- bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599)
|
||||||
|
- bugfix compiler could fail if PHP mbstring.func_overload is enabled (Issue 164)
|
||||||
|
|
||||||
|
28.10.2013
|
||||||
|
- bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163)
|
||||||
|
- bugfix notice "Trying to get property of non-object" removed (Issue 163)
|
||||||
|
- bugfix correction of modifier capitalize fix from 3.10.2013 (issue 159)
|
||||||
|
- bugfix multiple {block}s with same name in parent did not work (forum topic 24631)
|
||||||
|
|
||||||
|
20.10.2013
|
||||||
|
- bugfix a variable file name at {extends} tag did fail (forum topic 24618)
|
||||||
|
|
||||||
|
14.10.2013
|
||||||
|
- bugfix yesterdays fix could result in an undefined variable
|
||||||
|
|
||||||
|
13.10.2013
|
||||||
|
- bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24594) (Issue 161)
|
||||||
|
.- bugfix relative includes with same name like {include './foo.tpl'} from different folder failed (forum topic 24590)(Issue 161)
|
||||||
|
|
||||||
|
04.10.2013
|
||||||
|
- bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of
|
||||||
|
template inheritance of 24.08.2013 (forum topic 24585)
|
||||||
|
|
||||||
|
03.10.2013
|
||||||
|
- bugfix loops using modifier capitalize did eat up memory (issue 159)
|
||||||
|
|
||||||
|
===== Smarty 3.1.15 =====
|
||||||
|
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
|
||||||
|
- bugfix removed PHP 5.5 deprecated preg_replace /e option in modifier capitalize (forum topic 24389)
|
||||||
|
|
||||||
|
17.06.2013
|
||||||
|
- fixed spelling in sources and documentation (from smarty-developers forum Veres Lajos)
|
||||||
|
- enhancement added constant SMARTY::CLEAR_EXPIRED for the change of 26.05.2013 (forum topic 24310)
|
||||||
|
- bugfix added smarty_security.php to composer.json (Issue 135)
|
||||||
|
|
||||||
|
26.05.2013
|
||||||
|
- enhancement an expire_time of -1 in clearCache() and clearAllCache() will delete outdated cache files
|
||||||
|
by their individual cache_lifetime used at creation (forum topic 24310)
|
||||||
|
|
||||||
|
21.05.2013
|
||||||
|
- bugfix modifier strip_tags:true was compiled into wrong code (Forum Topic 24287)
|
||||||
|
- bugfix /n after ?> in Smarty.class.php did start output buffering (Issue 138)
|
||||||
|
|
||||||
|
25.04.2013
|
||||||
|
- bugfix escape and wordrap modifier could be compiled into wrong code when used in {nocache}{/nocache}
|
||||||
|
section but caching is disabled (Forum Topic 24260)
|
||||||
|
|
||||||
|
05.04.2013
|
||||||
|
- bugfix post filter must not run when compiling inheritance child blocks (Forum Topic 24094)
|
||||||
|
- bugfix after the fix for Issue #130 compiler exceptions got double escaped (Forum Topic 24199)
|
||||||
|
|
||||||
|
28.02.2013
|
||||||
|
- bugfix nocache blocks could be lost when using CACHING_LIFETIME_SAVED (Issue #133)
|
||||||
|
- bugfix Compile ID gets nulled when compiling child blocks (Issue #134)
|
||||||
|
|
||||||
|
|
||||||
|
24.01.2013
|
||||||
|
- bugfix wrong tag type in smarty_internal_templatecompilerbase.php could cause wrong plugin search order (Forum Topic 24028)
|
||||||
|
|
||||||
|
===== Smarty-3.1.13 =====
|
||||||
|
13.01.2013
|
||||||
|
- enhancement allow to disable exception message escaping by SmartyException::$escape = false; (Issue #130)
|
||||||
|
|
||||||
|
09.01.2013
|
||||||
|
- bugfix compilation did fail when a prefilter did modify an {extends} tag c
|
||||||
|
- bugfix template inheritance could fail if nested {block} tags in childs did contain {$smarty.block.child} (Issue #127)
|
||||||
|
- bugfix template inheritance could fail if {block} tags in childs did have similar name as used plugins (Issue #128)
|
||||||
|
- added abstract method declaration doCompile() in Smarty_Internal_TemplateCompilerBase (Forum Topic 23969)
|
||||||
|
|
||||||
|
06.01.2013
|
||||||
|
- Allow '://' URL syntax in template names of stream resources (Issue #129)
|
||||||
|
|
||||||
|
27.11.2012
|
||||||
|
- bugfix wrong variable usage in smarty_internal_utility.php (Issue #125)
|
||||||
|
|
||||||
|
26.11.2012
|
||||||
|
- bugfix global variable assigned within template function are not seen after template function exit (Forum Topic 23800)
|
||||||
|
|
||||||
|
24.11.2012
|
||||||
|
- made SmartyBC loadable via composer (Issue #124)
|
||||||
|
|
||||||
|
20.11.2012
|
||||||
|
- bugfix assignGlobal() called from plugins did not work (Forum Topic 23771)
|
||||||
|
|
||||||
|
13.11.2012
|
||||||
|
- adding attribute "strict" to html_options, html_checkboxes, html_radios to only print disabled/readonly attributes if their values are true or "disabled"/"readonly" (Issue #120)
|
||||||
|
|
||||||
|
01.11.2012
|
||||||
|
- bugfix muteExcpetedErrors() would screw up for non-readable paths (Issue #118)
|
||||||
|
|
||||||
|
===== Smarty-3.1.12 =====
|
||||||
|
14.09.2012
|
||||||
|
- bugfix template inheritance failed to compile with delimiters {/ and /} (Forum Topic 23008)
|
||||||
|
|
||||||
|
11.09.2012
|
||||||
|
- bugfix escape Smarty exception messages to avoid possible script execution
|
||||||
|
|
||||||
|
10.09.2012
|
||||||
|
- bugfix tag option flags and shorttag attributes did not work when rdel started with '=' (Forum Topic 22979)
|
||||||
|
|
||||||
|
31.08.2012
|
||||||
|
- bugfix resolving relative paths broke in some circumstances (Issue #114)
|
||||||
|
|
||||||
|
22.08.2012
|
||||||
|
- bugfix test MBString availability through mb_split, as it could've been compiled without regex support (--enable-mbregex).
|
||||||
|
Either we get MBstring's full package, or we pretend it's not there at all.
|
||||||
|
|
||||||
|
21.08.2012
|
||||||
|
- bugfix $auto_literal = false did not work with { block} tags in child templates
|
||||||
|
(problem was reintroduced after fix in 3.1.7)(Forum Topic 20581)
|
||||||
|
|
||||||
|
17.08.2012
|
||||||
|
- bugfix compiled code of nocache sections could contain wrong escaping (Forum Topic 22810)
|
||||||
|
|
||||||
|
15.08.2012
|
||||||
|
- bugfix template inheritance did produce wrong code if subtemplates with {block} was
|
||||||
|
included several times (from smarty-developers forum)
|
||||||
|
|
||||||
|
14.08.2012
|
||||||
|
- bugfix PHP5.2 compatibility compromised by SplFileInfo::getBasename() (Issue 110)
|
||||||
|
|
||||||
|
01.08.2012
|
||||||
|
- bugfix avoid PHP error on $smarty->configLoad(...) with invalid section specification (Forum Topic 22608)
|
||||||
|
|
||||||
|
30.07.2012
|
||||||
|
-bugfix {assign} in a nocache section should not overwrite existing variable values
|
||||||
|
during compilation (issue 109)
|
||||||
|
|
||||||
|
28.07.2012
|
||||||
|
- bugfix array access of config variables did not work (Forum Topic 22527)
|
||||||
|
|
||||||
|
19.07.2012
|
||||||
|
- bugfix the default plugin handler did create wrong compiled code for static class methods
|
||||||
|
from external script files (issue 108)
|
||||||
|
|
||||||
===== Smarty-3.1.11 =====
|
===== Smarty-3.1.11 =====
|
||||||
30.06.2012
|
30.06.2012
|
||||||
- bugfix {block.. hide} did not work as nested child (Forum Topic 22216)
|
- bugfix {block.. hide} did not work as nested child (Forum Topic 22216)
|
||||||
|
|
@ -342,7 +635,7 @@
|
||||||
03/09/2011
|
03/09/2011
|
||||||
- bugfix createTemplate() must default to cache_id and compile_id of Smarty object
|
- bugfix createTemplate() must default to cache_id and compile_id of Smarty object
|
||||||
- bugfix Smarty_CacheResource_KeyValueStore must include $source->uid in cache filepath to keep templates with same
|
- bugfix Smarty_CacheResource_KeyValueStore must include $source->uid in cache filepath to keep templates with same
|
||||||
name but different folders seperated
|
name but different folders separated
|
||||||
- added cacheresource.apc.php example in demo folder
|
- added cacheresource.apc.php example in demo folder
|
||||||
|
|
||||||
02/09/2011
|
02/09/2011
|
||||||
|
|
@ -533,7 +826,7 @@
|
||||||
- changed ./ and ../ behaviour
|
- changed ./ and ../ behaviour
|
||||||
|
|
||||||
14/02/2011
|
14/02/2011
|
||||||
- added {block ... hide} option to supress block if no child is defined
|
- added {block ... hide} option to suppress block if no child is defined
|
||||||
|
|
||||||
13/02/2011
|
13/02/2011
|
||||||
- update handling of recursive subtemplate calls
|
- update handling of recursive subtemplate calls
|
||||||
|
|
@ -647,7 +940,7 @@
|
||||||
- bugfix on compiler object destruction. compiler_object property was by mistake unset.
|
- bugfix on compiler object destruction. compiler_object property was by mistake unset.
|
||||||
|
|
||||||
09/03/2011
|
09/03/2011
|
||||||
-bugfix a variable filter should run before modifers on an output tag (see change of 23/07/2010)
|
-bugfix a variable filter should run before modifiers on an output tag (see change of 23/07/2010)
|
||||||
|
|
||||||
08/03/2011
|
08/03/2011
|
||||||
- bugfix loading config file without section should load only defaults
|
- bugfix loading config file without section should load only defaults
|
||||||
|
|
@ -951,10 +1244,10 @@ request_use_auto_globals
|
||||||
- bugfix passing scope attributes in doublequoted strings did not work at {include} {assign} and {append}
|
- bugfix passing scope attributes in doublequoted strings did not work at {include} {assign} and {append}
|
||||||
|
|
||||||
25/07/2010
|
25/07/2010
|
||||||
- another bugfix of change from 23/07/2010 when compiling modifer
|
- another bugfix of change from 23/07/2010 when compiling modifier
|
||||||
|
|
||||||
24/07/2010
|
24/07/2010
|
||||||
- bugfix of change from 23/07/2010 when compiling modifer
|
- bugfix of change from 23/07/2010 when compiling modifier
|
||||||
|
|
||||||
23/07/2010
|
23/07/2010
|
||||||
- changed execution order. A variable filter does now run before modifiers on output of variables
|
- changed execution order. A variable filter does now run before modifiers on output of variables
|
||||||
|
|
@ -1261,7 +1554,7 @@ request_use_auto_globals
|
||||||
- bugfix on {if} tags
|
- bugfix on {if} tags
|
||||||
|
|
||||||
01/12/2010
|
01/12/2010
|
||||||
- changed back modifer handling in parser. Some restrictions still apply:
|
- changed back modifier handling in parser. Some restrictions still apply:
|
||||||
if modifiers are used in side {if...} expression or in mathematical expressions
|
if modifiers are used in side {if...} expression or in mathematical expressions
|
||||||
parentheses must be used.
|
parentheses must be used.
|
||||||
- bugfix the {function..} tag did not accept the name attribute in double quotes
|
- bugfix the {function..} tag did not accept the name attribute in double quotes
|
||||||
|
|
@ -1873,7 +2166,7 @@ NOTICE: existing compiled template and cache files must be deleted
|
||||||
- fixed exceptions in function plugins
|
- fixed exceptions in function plugins
|
||||||
- fixed notice error in Smarty.class.php
|
- fixed notice error in Smarty.class.php
|
||||||
- allow chained objects to span multiple lines
|
- allow chained objects to span multiple lines
|
||||||
- fixed error in modifers
|
- fixed error in modifiers
|
||||||
|
|
||||||
03/20/2009
|
03/20/2009
|
||||||
- moved /plugins folder into /libs folder
|
- moved /plugins folder into /libs folder
|
||||||
|
|
@ -1881,7 +2174,7 @@ NOTICE: existing compiled template and cache files must be deleted
|
||||||
- autoappend a directory separator if the xxxxx_dir definition have no trailing one
|
- autoappend a directory separator if the xxxxx_dir definition have no trailing one
|
||||||
|
|
||||||
03/19/2009
|
03/19/2009
|
||||||
- allow array definition as modifer parameter
|
- allow array definition as modifier parameter
|
||||||
- changed modifier to use multi byte string funktions.
|
- changed modifier to use multi byte string funktions.
|
||||||
|
|
||||||
03/17/2009
|
03/17/2009
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,14 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Example Application
|
* Example Application
|
||||||
|
*
|
||||||
* @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;
|
||||||
|
|
@ -30,4 +28,3 @@ $smarty->assign("option_output", array("New York","Nebraska","Kansas","Iowa","Ok
|
||||||
$smarty->assign("option_selected", "NE");
|
$smarty->assign("option_selected", "NE");
|
||||||
|
|
||||||
$smarty->display('index.tpl');
|
$smarty->display('index.tpl');
|
||||||
?>
|
|
||||||
|
|
|
||||||
|
|
@ -2,15 +2,15 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APC CacheResource
|
* APC CacheResource
|
||||||
*
|
|
||||||
* CacheResource Implementation based on the KeyValueStore API to use
|
* CacheResource Implementation based on the KeyValueStore API to use
|
||||||
* memcache as the storage resource for Smarty's output caching.
|
* memcache as the storage resource for Smarty's output caching.
|
||||||
* *
|
* *
|
||||||
|
*
|
||||||
* @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
|
||||||
|
|
@ -23,6 +23,7 @@ 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
|
||||||
*/
|
*/
|
||||||
|
|
@ -33,6 +34,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -41,6 +43,7 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore {
|
||||||
*
|
*
|
||||||
* @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,6 +51,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -55,6 +59,7 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore {
|
||||||
* 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 +67,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,19 +2,19 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Memcache CacheResource
|
* Memcache CacheResource
|
||||||
*
|
|
||||||
* CacheResource Implementation based on the KeyValueStore API to use
|
* CacheResource Implementation based on the KeyValueStore API to use
|
||||||
* memcache as the storage resource for Smarty's output caching.
|
* memcache as the storage resource for Smarty's output caching.
|
||||||
*
|
|
||||||
* Note that memcache has a limitation of 256 characters per cache-key.
|
* Note that memcache has a limitation of 256 characters per cache-key.
|
||||||
* To avoid complications all cache-keys are translated to a sha1 hash.
|
* To avoid complications all cache-keys are translated to a sha1 hash.
|
||||||
*
|
*
|
||||||
* @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
|
||||||
*/
|
*/
|
||||||
protected $memcache = null;
|
protected $memcache = null;
|
||||||
|
|
@ -29,6 +29,7 @@ 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
|
||||||
*/
|
*/
|
||||||
|
|
@ -45,6 +46,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -53,6 +55,7 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore {
|
||||||
*
|
*
|
||||||
* @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,6 +64,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -68,6 +72,7 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore {
|
||||||
* 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 +81,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -86,6 +92,6 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore {
|
||||||
*/
|
*/
|
||||||
protected function purge()
|
protected function purge()
|
||||||
{
|
{
|
||||||
return $this->memcache->flush();
|
$this->memcache->flush();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,8 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MySQL CacheResource
|
* MySQL CacheResource
|
||||||
*
|
|
||||||
* CacheResource Implementation based on the Custom API to use
|
* CacheResource Implementation based on the Custom API to use
|
||||||
* MySQL as the storage resource for Smarty's output caching.
|
* MySQL as the storage resource for Smarty's output caching.
|
||||||
*
|
|
||||||
* Table definition:
|
* Table definition:
|
||||||
* <pre>CREATE TABLE IF NOT EXISTS `output_cache` (
|
* <pre>CREATE TABLE IF NOT EXISTS `output_cache` (
|
||||||
* `id` CHAR(40) NOT NULL COMMENT 'sha1 hash',
|
* `id` CHAR(40) NOT NULL COMMENT 'sha1 hash',
|
||||||
|
|
@ -24,17 +22,20 @@
|
||||||
* @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());
|
||||||
}
|
}
|
||||||
$this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
|
$this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
|
||||||
|
|
@ -52,6 +53,7 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom {
|
||||||
* @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,12 @@ 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,6 +87,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -95,6 +100,7 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom {
|
||||||
* @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,6 +112,7 @@ 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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -116,6 +123,7 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom {
|
||||||
* @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 +132,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 +156,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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,20 +2,20 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extends All Resource
|
* Extends All Resource
|
||||||
*
|
|
||||||
* Resource Implementation modifying the extends-Resource to walk
|
* Resource Implementation modifying the extends-Resource to walk
|
||||||
* through the template_dirs and inherit all templates of the same name
|
* through the template_dirs and inherit all templates of the same name
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -32,12 +32,14 @@ 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 +58,3 @@ class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends {
|
||||||
$source->template = $_template;
|
$source->template = $_template;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -2,10 +2,8 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MySQL Resource
|
* MySQL Resource
|
||||||
*
|
|
||||||
* Resource Implementation based on the Custom API to use
|
* Resource Implementation based on the Custom API to use
|
||||||
* MySQL as the storage resource for Smarty's templates and configs.
|
* MySQL as the storage resource for Smarty's templates and configs.
|
||||||
*
|
|
||||||
* Table definition:
|
* Table definition:
|
||||||
* <pre>CREATE TABLE IF NOT EXISTS `templates` (
|
* <pre>CREATE TABLE IF NOT EXISTS `templates` (
|
||||||
* `name` varchar(100) NOT NULL,
|
* `name` varchar(100) NOT NULL,
|
||||||
|
|
@ -13,14 +11,14 @@
|
||||||
* `source` text,
|
* `source` text,
|
||||||
* PRIMARY KEY (`name`)
|
* PRIMARY KEY (`name`)
|
||||||
* ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
|
* ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
|
||||||
*
|
|
||||||
* Demo data:
|
* Demo data:
|
||||||
* <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
|
* <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
|
||||||
*
|
*
|
||||||
* @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,10 +26,12 @@ 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());
|
||||||
}
|
}
|
||||||
$this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
|
$this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
|
||||||
|
|
@ -44,6 +44,7 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom {
|
||||||
* @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 +65,17 @@ 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,10 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MySQL Resource
|
* MySQL Resource
|
||||||
*
|
|
||||||
* Resource Implementation based on the Custom API to use
|
* Resource Implementation based on the Custom API to use
|
||||||
* MySQL as the storage resource for Smarty's templates and configs.
|
* MySQL as the storage resource for Smarty's templates and configs.
|
||||||
*
|
|
||||||
* Note that this MySQL implementation fetches the source and timestamps in
|
* Note that this MySQL implementation fetches the source and timestamps in
|
||||||
* a single database query, instead of two seperate like resource.mysql.php does.
|
* a single database query, instead of two separate like resource.mysql.php does.
|
||||||
*
|
|
||||||
* Table definition:
|
* Table definition:
|
||||||
* <pre>CREATE TABLE IF NOT EXISTS `templates` (
|
* <pre>CREATE TABLE IF NOT EXISTS `templates` (
|
||||||
* `name` varchar(100) NOT NULL,
|
* `name` varchar(100) NOT NULL,
|
||||||
|
|
@ -16,23 +13,25 @@
|
||||||
* `source` text,
|
* `source` text,
|
||||||
* PRIMARY KEY (`name`)
|
* PRIMARY KEY (`name`)
|
||||||
* ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
|
* ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
|
||||||
*
|
|
||||||
* Demo data:
|
* Demo data:
|
||||||
* <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
|
* <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
|
||||||
*
|
*
|
||||||
* @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());
|
||||||
}
|
}
|
||||||
$this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
|
$this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
|
||||||
|
|
@ -44,6 +43,7 @@ class Smarty_Resource_Mysqls extends Smarty_Resource_Custom {
|
||||||
* @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)
|
||||||
|
|
|
||||||
|
|
@ -38,9 +38,14 @@ loop=$FirstName}
|
||||||
An example of section looped key values:
|
An example of section looped key values:
|
||||||
|
|
||||||
{section name=sec1 loop=$contacts}
|
{section name=sec1 loop=$contacts}
|
||||||
phone: {$contacts[sec1].phone}<br>
|
phone: {$contacts[sec1].phone}
|
||||||
fax: {$contacts[sec1].fax}<br>
|
<br>
|
||||||
cell: {$contacts[sec1].cell}<br>
|
|
||||||
|
fax: {$contacts[sec1].fax}
|
||||||
|
<br>
|
||||||
|
|
||||||
|
cell: {$contacts[sec1].cell}
|
||||||
|
<br>
|
||||||
{/section}
|
{/section}
|
||||||
<p>
|
<p>
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -3,21 +3,17 @@
|
||||||
* Project: Smarty: the PHP compiling template engine
|
* Project: Smarty: the PHP compiling template engine
|
||||||
* File: SmartyBC.class.php
|
* File: SmartyBC.class.php
|
||||||
* SVN: $Id: $
|
* SVN: $Id: $
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
* License as published by the Free Software Foundation; either
|
* License as published by the Free Software Foundation; either
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
* This library is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* Lesser General Public License for more details.
|
* Lesser General Public License for more details.
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
* License along with this library; if not, write to the Free Software
|
* License along with this library; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*
|
|
||||||
* For questions, help, comments, discussion, etc., please join the
|
* For questions, help, comments, discussion, etc., please join the
|
||||||
* Smarty mailing list. Send a blank e-mail to
|
* Smarty mailing list. Send a blank e-mail to
|
||||||
* smarty-discussion-subscribe@googlegroups.com
|
* smarty-discussion-subscribe@googlegroups.com
|
||||||
|
|
@ -32,17 +28,18 @@
|
||||||
/**
|
/**
|
||||||
* @ignore
|
* @ignore
|
||||||
*/
|
*/
|
||||||
require(dirname(__FILE__) . '/Smarty.class.php');
|
require_once(dirname(__FILE__) . '/Smarty.class.php');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty Backward Compatability Wrapper Class
|
* Smarty Backward Compatability Wrapper Class
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
*/
|
*/
|
||||||
class SmartyBC extends Smarty {
|
class SmartyBC extends Smarty
|
||||||
|
{
|
||||||
/**
|
/**
|
||||||
* Smarty 2 BC
|
* Smarty 2 BC
|
||||||
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public $_version = self::SMARTY_VERSION;
|
public $_version = self::SMARTY_VERSION;
|
||||||
|
|
@ -122,7 +119,10 @@ class SmartyBC extends Smarty {
|
||||||
* @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_methods list of methods that are block format
|
||||||
|
*
|
||||||
|
* @throws SmartyException
|
||||||
|
* @internal 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())
|
||||||
{
|
{
|
||||||
|
|
@ -309,6 +309,7 @@ class SmartyBC extends Smarty {
|
||||||
* @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)
|
||||||
|
|
@ -320,6 +321,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)
|
||||||
|
|
@ -333,6 +335,7 @@ class SmartyBC extends Smarty {
|
||||||
* @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)
|
||||||
|
|
@ -356,6 +359,7 @@ class SmartyBC extends Smarty {
|
||||||
* @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)
|
||||||
|
|
@ -367,6 +371,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)
|
||||||
|
|
@ -378,6 +383,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)
|
||||||
|
|
@ -389,6 +395,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)
|
||||||
|
|
@ -412,6 +419,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)
|
||||||
|
|
@ -439,7 +447,6 @@ class SmartyBC extends Smarty {
|
||||||
{
|
{
|
||||||
trigger_error("Smarty error: $error_msg", $error_type);
|
trigger_error("Smarty error: $error_msg", $error_type);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -449,12 +456,12 @@ class SmartyBC extends Smarty {
|
||||||
* @param string $content contents of the block
|
* @param string $content contents of the block
|
||||||
* @param object $template template object
|
* @param object $template template object
|
||||||
* @param boolean &$repeat repeat flag
|
* @param boolean &$repeat repeat flag
|
||||||
|
*
|
||||||
* @return string content re-formatted
|
* @return string content re-formatted
|
||||||
*/
|
*/
|
||||||
function smarty_php_tag($params, $content, $template, &$repeat)
|
function smarty_php_tag($params, $content, $template, &$repeat)
|
||||||
{
|
{
|
||||||
eval($content);
|
eval($content);
|
||||||
|
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -81,21 +81,23 @@ td {
|
||||||
#table_config_vars th {
|
#table_config_vars th {
|
||||||
color: maroon;
|
color: maroon;
|
||||||
}
|
}
|
||||||
|
|
||||||
{/literal}
|
{/literal}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<h1>Smarty Debug Console - {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
|
<h1>Smarty Debug Console
|
||||||
|
- {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
|
||||||
|
|
||||||
{if !empty($template_data)}
|
{if !empty($template_data)}
|
||||||
<h2>included templates & config files (load time in seconds)</h2>
|
<h2>included templates & config files (load time in seconds)</h2>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
{foreach $template_data as $template}
|
{foreach $template_data as $template}
|
||||||
<font color=brown>{$template.name}</font>
|
<font color=brown>{$template.name}</font>
|
||||||
<span class="exectime">
|
<span class="exectime">
|
||||||
(compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
|
(compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"}
|
||||||
|
)
|
||||||
</span>
|
</span>
|
||||||
<br>
|
<br>
|
||||||
{/foreach}
|
{/foreach}
|
||||||
|
|
@ -108,7 +110,8 @@ td {
|
||||||
{foreach $assigned_vars as $vars}
|
{foreach $assigned_vars as $vars}
|
||||||
<tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
|
<tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
|
||||||
<th>${$vars@key|escape:'html'}</th>
|
<th>${$vars@key|escape:'html'}</th>
|
||||||
<td>{$vars|debug_print_var nofilter}</td></tr>
|
<td>{$vars|debug_print_var nofilter}</td>
|
||||||
|
</tr>
|
||||||
{/foreach}
|
{/foreach}
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
@ -118,7 +121,8 @@ td {
|
||||||
{foreach $config_vars as $vars}
|
{foreach $config_vars as $vars}
|
||||||
<tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
|
<tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
|
||||||
<th>{$vars@key|escape:'html'}</th>
|
<th>{$vars@key|escape:'html'}</th>
|
||||||
<td>{$vars|debug_print_var nofilter}</td></tr>
|
<td>{$vars|debug_print_var nofilter}</td>
|
||||||
|
</tr>
|
||||||
{/foreach}
|
{/foreach}
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {textformat}{/textformat} block plugin
|
* Smarty {textformat}{/textformat} block plugin
|
||||||
*
|
|
||||||
* Type: block function<br>
|
* Type: block function<br>
|
||||||
* Name: textformat<br>
|
* Name: textformat<br>
|
||||||
* Purpose: format text a certain way with preset styles
|
* Purpose: format text a certain way with preset styles
|
||||||
|
|
@ -25,10 +24,12 @@
|
||||||
*
|
*
|
||||||
* @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
|
* @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param string $content contents of the block
|
* @param string $content contents of the block
|
||||||
* @param Smarty_Internal_Template $template template object
|
* @param Smarty_Internal_Template $template template object
|
||||||
* @param boolean &$repeat repeat flag
|
* @param boolean &$repeat repeat flag
|
||||||
|
*
|
||||||
* @return string content re-formatted
|
* @return string content re-formatted
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
*/
|
*/
|
||||||
|
|
@ -76,8 +77,6 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
|
||||||
}
|
}
|
||||||
// split into paragraphs
|
// split into paragraphs
|
||||||
$_paragraphs = preg_split('![\r\n]{2}!', $content);
|
$_paragraphs = preg_split('![\r\n]{2}!', $content);
|
||||||
$_output = '';
|
|
||||||
|
|
||||||
|
|
||||||
foreach ($_paragraphs as &$_paragraph) {
|
foreach ($_paragraphs as &$_paragraph) {
|
||||||
if (!$_paragraph) {
|
if (!$_paragraph) {
|
||||||
|
|
@ -109,5 +108,3 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
|
||||||
return $_output;
|
return $_output;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty plugin
|
* Smarty plugin
|
||||||
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
* @subpackage PluginsFunction
|
* @subpackage PluginsFunction
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {counter} function plugin
|
* Smarty {counter} function plugin
|
||||||
*
|
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: counter<br>
|
* Name: counter<br>
|
||||||
* Purpose: print out a counter value
|
* Purpose: print out a counter value
|
||||||
|
|
@ -15,8 +15,10 @@
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @link http://www.smarty.net/manual/en/language.function.counter.php {counter}
|
* @link http://www.smarty.net/manual/en/language.function.counter.php {counter}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param Smarty_Internal_Template $template template object
|
* @param Smarty_Internal_Template $template template object
|
||||||
|
*
|
||||||
* @return string|null
|
* @return string|null
|
||||||
*/
|
*/
|
||||||
function smarty_function_counter($params, $template)
|
function smarty_function_counter($params, $template)
|
||||||
|
|
@ -66,13 +68,11 @@ function smarty_function_counter($params, $template)
|
||||||
$counter['direction'] = $params['direction'];
|
$counter['direction'] = $params['direction'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($counter['direction'] == "down")
|
if ($counter['direction'] == "down") {
|
||||||
$counter['count'] -= $counter['skip'];
|
$counter['count'] -= $counter['skip'];
|
||||||
else
|
} else {
|
||||||
$counter['count'] += $counter['skip'];
|
$counter['count'] += $counter['skip'];
|
||||||
|
|
||||||
return $retval;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
return $retval;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {cycle} function plugin
|
* Smarty {cycle} function plugin
|
||||||
*
|
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: cycle<br>
|
* Name: cycle<br>
|
||||||
* Date: May 3, 2002<br>
|
* Date: May 3, 2002<br>
|
||||||
|
|
@ -38,8 +37,10 @@
|
||||||
* @author credit to Gerard <gerard@interfold.com>
|
* @author credit to Gerard <gerard@interfold.com>
|
||||||
* @author credit to Jason Sweat <jsweat_php@yahoo.com>
|
* @author credit to Jason Sweat <jsweat_php@yahoo.com>
|
||||||
* @version 1.3
|
* @version 1.3
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param Smarty_Internal_Template $template template object
|
* @param Smarty_Internal_Template $template template object
|
||||||
|
*
|
||||||
* @return string|null
|
* @return string|null
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -55,11 +56,13 @@ function smarty_function_cycle($params, $template)
|
||||||
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 {
|
||||||
if (isset($cycle_vars[$name]['values'])
|
if (isset($cycle_vars[$name]['values'])
|
||||||
&& $cycle_vars[$name]['values'] != $params['values'] ) {
|
&& $cycle_vars[$name]['values'] != $params['values']
|
||||||
|
) {
|
||||||
$cycle_vars[$name]['index'] = 0;
|
$cycle_vars[$name]['index'] = 0;
|
||||||
}
|
}
|
||||||
$cycle_vars[$name]['values'] = $params['values'];
|
$cycle_vars[$name]['values'] = $params['values'];
|
||||||
|
|
@ -102,5 +105,3 @@ function smarty_function_cycle($params, $template)
|
||||||
|
|
||||||
return $retval;
|
return $retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {fetch} plugin
|
* Smarty {fetch} plugin
|
||||||
*
|
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: fetch<br>
|
* Name: fetch<br>
|
||||||
* Purpose: fetch file, web or ftp data and display results
|
* Purpose: fetch file, web or ftp data and display results
|
||||||
|
|
@ -16,14 +15,18 @@
|
||||||
* @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
|
* @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param Smarty_Internal_Template $template template object
|
* @param Smarty_Internal_Template $template template object
|
||||||
|
*
|
||||||
|
* @throws SmartyException
|
||||||
* @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
|
* @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
|
||||||
*/
|
*/
|
||||||
function smarty_function_fetch($params, $template)
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -101,6 +104,7 @@ function smarty_function_fetch($params, $template)
|
||||||
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;
|
||||||
|
|
@ -117,6 +121,7 @@ function smarty_function_fetch($params, $template)
|
||||||
$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;
|
||||||
|
|
@ -135,11 +140,13 @@ function smarty_function_fetch($params, $template)
|
||||||
$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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -152,6 +159,7 @@ function smarty_function_fetch($params, $template)
|
||||||
|
|
||||||
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) {
|
||||||
|
|
@ -195,6 +203,7 @@ function smarty_function_fetch($params, $template)
|
||||||
}
|
}
|
||||||
} 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 +219,3 @@ function smarty_function_fetch($params, $template)
|
||||||
return $content;
|
return $content;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {html_checkboxes} function plugin
|
* Smarty {html_checkboxes} function plugin
|
||||||
*
|
|
||||||
* File: function.html_checkboxes.php<br>
|
* File: function.html_checkboxes.php<br>
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: html_checkboxes<br>
|
* Name: html_checkboxes<br>
|
||||||
|
|
@ -37,8 +36,10 @@
|
||||||
* @author Christopher Kvarme <christopher.kvarme@flashjab.com>
|
* @author Christopher Kvarme <christopher.kvarme@flashjab.com>
|
||||||
* @author credits to Monte Ohrt <monte at ohrt dot com>
|
* @author credits to Monte Ohrt <monte at ohrt dot com>
|
||||||
* @version 1.0
|
* @version 1.0
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param object $template template object
|
* @param object $template template object
|
||||||
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @uses smarty_function_escape_special_chars()
|
* @uses smarty_function_escape_special_chars()
|
||||||
*/
|
*/
|
||||||
|
|
@ -116,6 +117,24 @@ function smarty_function_html_checkboxes($params, $template)
|
||||||
case 'assign':
|
case 'assign':
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'strict':
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'disabled':
|
||||||
|
case 'readonly':
|
||||||
|
if (!empty($params['strict'])) {
|
||||||
|
if (!is_scalar($_val)) {
|
||||||
|
trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute", E_USER_NOTICE);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($_val === true || $_val === $_key) {
|
||||||
|
$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// 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) . '"';
|
||||||
|
|
@ -126,8 +145,9 @@ function smarty_function_html_checkboxes($params, $template)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($options) && !isset($values))
|
if (!isset($options) && !isset($values)) {
|
||||||
return ''; /* raise error here? */
|
return '';
|
||||||
|
} /* raise error here? */
|
||||||
|
|
||||||
$_html_result = array();
|
$_html_result = array();
|
||||||
|
|
||||||
|
|
@ -147,10 +167,10 @@ function smarty_function_html_checkboxes($params, $template)
|
||||||
} else {
|
} else {
|
||||||
return implode("\n", $_html_result);
|
return implode("\n", $_html_result);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
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)) {
|
||||||
|
|
@ -158,6 +178,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 {
|
||||||
|
|
@ -169,6 +190,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 {
|
||||||
|
|
@ -210,7 +232,6 @@ function smarty_function_html_checkboxes_output($name, $value, $output, $selecte
|
||||||
}
|
}
|
||||||
|
|
||||||
$_output .= $separator;
|
$_output .= $separator;
|
||||||
|
|
||||||
return $_output;
|
return $_output;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {html_image} function plugin
|
* Smarty {html_image} function plugin
|
||||||
*
|
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: html_image<br>
|
* Name: html_image<br>
|
||||||
* Date: Feb 24, 2003<br>
|
* Date: Feb 24, 2003<br>
|
||||||
|
|
@ -29,8 +28,11 @@
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @author credits to Duda <duda@big.hu>
|
* @author credits to Duda <duda@big.hu>
|
||||||
* @version 1.0
|
* @version 1.0
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param Smarty_Internal_Template $template template object
|
* @param Smarty_Internal_Template $template template object
|
||||||
|
*
|
||||||
|
* @throws SmartyException
|
||||||
* @return string
|
* @return string
|
||||||
* @uses smarty_function_escape_special_chars()
|
* @uses smarty_function_escape_special_chars()
|
||||||
*/
|
*/
|
||||||
|
|
@ -84,6 +86,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -111,7 +114,7 @@ function smarty_function_html_image($params, $template)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// local file
|
// local file
|
||||||
if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
|
if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -122,12 +125,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;
|
||||||
} elseif (!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 +161,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {html_options} function plugin
|
* Smarty {html_options} function plugin
|
||||||
*
|
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: html_options<br>
|
* Name: html_options<br>
|
||||||
* Purpose: Prints the list of <option> tags generated from
|
* Purpose: Prints the list of <option> tags generated from
|
||||||
|
|
@ -28,12 +27,13 @@
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
|
* @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param Smarty_Internal_Template $template template object
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @uses smarty_function_escape_special_chars()
|
* @uses smarty_function_escape_special_chars()
|
||||||
*/
|
*/
|
||||||
function smarty_function_html_options($params, $template)
|
function smarty_function_html_options($params)
|
||||||
{
|
{
|
||||||
require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
|
require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
|
||||||
|
|
||||||
|
|
@ -91,6 +91,24 @@ function smarty_function_html_options($params, $template)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'strict':
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'disabled':
|
||||||
|
case 'readonly':
|
||||||
|
if (!empty($params['strict'])) {
|
||||||
|
if (!is_scalar($_val)) {
|
||||||
|
trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute", E_USER_NOTICE);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($_val === true || $_val === $_key) {
|
||||||
|
$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// 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) . '"';
|
||||||
|
|
@ -103,6 +121,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 '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -148,6 +167,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 {
|
||||||
|
|
@ -160,6 +180,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -170,7 +191,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,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {html_radios} function plugin
|
* Smarty {html_radios} function plugin
|
||||||
*
|
|
||||||
* File: function.html_radios.php<br>
|
* File: function.html_radios.php<br>
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: html_radios<br>
|
* Name: html_radios<br>
|
||||||
|
|
@ -37,8 +36,10 @@
|
||||||
* @author Christopher Kvarme <christopher.kvarme@flashjab.com>
|
* @author Christopher Kvarme <christopher.kvarme@flashjab.com>
|
||||||
* @author credits to Monte Ohrt <monte at ohrt dot com>
|
* @author credits to Monte Ohrt <monte at ohrt dot com>
|
||||||
* @version 1.0
|
* @version 1.0
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param Smarty_Internal_Template $template template object
|
* @param Smarty_Internal_Template $template template object
|
||||||
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @uses smarty_function_escape_special_chars()
|
* @uses smarty_function_escape_special_chars()
|
||||||
*/
|
*/
|
||||||
|
|
@ -102,6 +103,24 @@ function smarty_function_html_radios($params, $template)
|
||||||
case 'assign':
|
case 'assign':
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'strict':
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'disabled':
|
||||||
|
case 'readonly':
|
||||||
|
if (!empty($params['strict'])) {
|
||||||
|
if (!is_scalar($_val)) {
|
||||||
|
trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute", E_USER_NOTICE);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($_val === true || $_val === $_key) {
|
||||||
|
$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// 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) . '"';
|
||||||
|
|
@ -114,6 +133,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 '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -146,6 +166,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 {
|
||||||
|
|
@ -157,6 +178,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 {
|
||||||
|
|
@ -194,7 +216,6 @@ function smarty_function_html_radios_output($name, $value, $output, $selected, $
|
||||||
}
|
}
|
||||||
|
|
||||||
$_output .= $separator;
|
$_output .= $separator;
|
||||||
|
|
||||||
return $_output;
|
return $_output;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -17,11 +17,9 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {html_select_date} plugin
|
* Smarty {html_select_date} plugin
|
||||||
*
|
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: html_select_date<br>
|
* Name: html_select_date<br>
|
||||||
* Purpose: Prints the dropdowns for date selection.
|
* Purpose: Prints the dropdowns for date selection.
|
||||||
*
|
|
||||||
* ChangeLog:
|
* ChangeLog:
|
||||||
* <pre>
|
* <pre>
|
||||||
* - 1.0 initial release
|
* - 1.0 initial release
|
||||||
|
|
@ -47,11 +45,12 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
|
||||||
* @author Andrei Zmievski
|
* @author Andrei Zmievski
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @author Rodney Rehm
|
* @author Rodney Rehm
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param Smarty_Internal_Template $template template object
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_function_html_select_date($params, $template)
|
function smarty_function_html_select_date($params)
|
||||||
{
|
{
|
||||||
// generate timestamps used for month names only
|
// generate timestamps used for month names only
|
||||||
static $_month_timestamps = null;
|
static $_month_timestamps = null;
|
||||||
|
|
@ -187,7 +186,6 @@ function smarty_function_html_select_date($params, $template)
|
||||||
? $params['time'][$prefix . $_elementName]
|
? $params['time'][$prefix . $_elementName]
|
||||||
: date($_elementKey);
|
: date($_elementKey);
|
||||||
}
|
}
|
||||||
$time = mktime(0, 0, 0, $_month, $_day, $_year);
|
|
||||||
} elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
|
} elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
|
||||||
// $_REQUEST given
|
// $_REQUEST given
|
||||||
foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
|
foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
|
||||||
|
|
@ -196,7 +194,6 @@ function smarty_function_html_select_date($params, $template)
|
||||||
? $params['time'][$field_array][$prefix . $_elementName]
|
? $params['time'][$field_array][$prefix . $_elementName]
|
||||||
: date($_elementKey);
|
: date($_elementKey);
|
||||||
}
|
}
|
||||||
$time = mktime(0, 0, 0, $_month, $_day, $_year);
|
|
||||||
} else {
|
} else {
|
||||||
// no date found, use NOW
|
// no date found, use NOW
|
||||||
list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
|
list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
|
||||||
|
|
@ -219,9 +216,9 @@ function smarty_function_html_select_date($params, $template)
|
||||||
if ($t === null) {
|
if ($t === null) {
|
||||||
$$key = (int) $_current_year;
|
$$key = (int) $_current_year;
|
||||||
} elseif ($t[0] == '+') {
|
} elseif ($t[0] == '+') {
|
||||||
$$key = (int)($_current_year + trim(substr($t, 1)));
|
$$key = (int) ($_current_year + (int)trim(substr($t, 1)));
|
||||||
} elseif ($t[0] == '-') {
|
} elseif ($t[0] == '-') {
|
||||||
$$key = (int)($_current_year - trim(substr($t, 1)));
|
$$key = (int) ($_current_year - (int)trim(substr($t, 1)));
|
||||||
} else {
|
} else {
|
||||||
$$key = (int) $$key;
|
$$key = (int) $$key;
|
||||||
}
|
}
|
||||||
|
|
@ -236,7 +233,6 @@ function smarty_function_html_select_date($params, $template)
|
||||||
|
|
||||||
// generate year <select> or <input>
|
// generate year <select> or <input>
|
||||||
if ($display_years) {
|
if ($display_years) {
|
||||||
$_html_years = '';
|
|
||||||
$_extra = '';
|
$_extra = '';
|
||||||
$_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
|
$_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
|
||||||
if ($all_extra) {
|
if ($all_extra) {
|
||||||
|
|
@ -277,7 +273,6 @@ function smarty_function_html_select_date($params, $template)
|
||||||
|
|
||||||
// generate month <select> or <input>
|
// generate month <select> or <input>
|
||||||
if ($display_months) {
|
if ($display_months) {
|
||||||
$_html_month = '';
|
|
||||||
$_extra = '';
|
$_extra = '';
|
||||||
$_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
|
$_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
|
||||||
if ($all_extra) {
|
if ($all_extra) {
|
||||||
|
|
@ -316,7 +311,6 @@ function smarty_function_html_select_date($params, $template)
|
||||||
|
|
||||||
// generate day <select> or <input>
|
// generate day <select> or <input>
|
||||||
if ($display_days) {
|
if ($display_days) {
|
||||||
$_html_day = '';
|
|
||||||
$_extra = '';
|
$_extra = '';
|
||||||
$_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
|
$_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
|
||||||
if ($all_extra) {
|
if ($all_extra) {
|
||||||
|
|
@ -388,7 +382,6 @@ function smarty_function_html_select_date($params, $template)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $_html;
|
return $_html;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -17,7 +17,6 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {html_select_time} function plugin
|
* Smarty {html_select_time} function plugin
|
||||||
*
|
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: html_select_time<br>
|
* Name: html_select_time<br>
|
||||||
* Purpose: Prints the dropdowns for time selection
|
* Purpose: Prints the dropdowns for time selection
|
||||||
|
|
@ -26,12 +25,13 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
* @author Roberto Berto <roberto@berto.net>
|
* @author Roberto Berto <roberto@berto.net>
|
||||||
* @author Monte Ohrt <monte AT ohrt DOT com>
|
* @author Monte Ohrt <monte AT ohrt DOT com>
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param Smarty_Internal_Template $template template object
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @uses smarty_make_timestamp()
|
* @uses smarty_make_timestamp()
|
||||||
*/
|
*/
|
||||||
function smarty_function_html_select_time($params, $template)
|
function smarty_function_html_select_time($params)
|
||||||
{
|
{
|
||||||
$prefix = "Time_";
|
$prefix = "Time_";
|
||||||
$field_array = null;
|
$field_array = null;
|
||||||
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {html_table} function plugin
|
* Smarty {html_table} function plugin
|
||||||
*
|
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: html_table<br>
|
* Name: html_table<br>
|
||||||
* Date: Feb 17, 2003<br>
|
* Date: Feb 17, 2003<br>
|
||||||
|
|
@ -43,11 +42,12 @@
|
||||||
* @version 1.1
|
* @version 1.1
|
||||||
* @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
|
* @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param Smarty_Internal_Template $template template object
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_function_html_table($params, $template)
|
function smarty_function_html_table($params)
|
||||||
{
|
{
|
||||||
$table_attr = 'border="1"';
|
$table_attr = 'border="1"';
|
||||||
$tr_attr = '';
|
$tr_attr = '';
|
||||||
|
|
@ -64,6 +64,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -173,5 +174,3 @@ function smarty_function_html_table_cycle($name, $var, $no)
|
||||||
|
|
||||||
return ($ret) ? ' ' . $ret : '';
|
return ($ret) ? ' ' . $ret : '';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {mailto} function plugin
|
* Smarty {mailto} function plugin
|
||||||
*
|
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: mailto<br>
|
* Name: mailto<br>
|
||||||
* Date: May 21, 2002
|
* Date: May 21, 2002
|
||||||
|
|
@ -44,17 +43,19 @@
|
||||||
* @version 1.2
|
* @version 1.2
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @author credits to Jason Sweat (added cc, bcc and subject functionality)
|
* @author credits to Jason Sweat (added cc, bcc and subject functionality)
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param Smarty_Internal_Template $template template object
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_function_mailto($params, $template)
|
function smarty_function_mailto($params)
|
||||||
{
|
{
|
||||||
static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
|
static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
|
||||||
$extra = '';
|
$extra = '';
|
||||||
|
|
||||||
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'];
|
||||||
|
|
@ -71,8 +72,9 @@ function smarty_function_mailto($params, $template)
|
||||||
case 'cc':
|
case 'cc':
|
||||||
case 'bcc':
|
case 'bcc':
|
||||||
case 'followupto':
|
case 'followupto':
|
||||||
if (!empty($value))
|
if (!empty($value)) {
|
||||||
$mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
|
$mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'subject':
|
case 'subject':
|
||||||
|
|
@ -95,6 +97,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!
|
||||||
|
|
@ -126,6 +129,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 +146,10 @@ function smarty_function_mailto($params, $template)
|
||||||
}
|
}
|
||||||
|
|
||||||
$mailto = "mailto:";
|
$mailto = "mailto:";
|
||||||
|
|
||||||
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>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,15 +1,14 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty plugin
|
* Smarty plugin
|
||||||
*
|
|
||||||
* This plugin is only for Smarty2 BC
|
* This plugin is only for Smarty2 BC
|
||||||
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
* @subpackage PluginsFunction
|
* @subpackage PluginsFunction
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty {math} function plugin
|
* Smarty {math} function plugin
|
||||||
*
|
|
||||||
* Type: function<br>
|
* Type: function<br>
|
||||||
* Name: math<br>
|
* Name: math<br>
|
||||||
* Purpose: handle math computations in template
|
* Purpose: handle math computations in template
|
||||||
|
|
@ -17,8 +16,10 @@
|
||||||
* @link http://www.smarty.net/manual/en/language.function.math.php {math}
|
* @link http://www.smarty.net/manual/en/language.function.math.php {math}
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
* @param Smarty_Internal_Template $template template object
|
* @param Smarty_Internal_Template $template template object
|
||||||
|
*
|
||||||
* @return string|null
|
* @return string|null
|
||||||
*/
|
*/
|
||||||
function smarty_function_math($params, $template)
|
function smarty_function_math($params, $template)
|
||||||
|
|
@ -31,6 +32,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,6 +41,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -48,6 +51,7 @@ function smarty_function_math($params, $template)
|
||||||
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -57,10 +61,12 @@ function smarty_function_math($params, $template)
|
||||||
// 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);
|
||||||
|
|
@ -83,5 +89,3 @@ function smarty_function_math($params, $template)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,16 +8,15 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty capitalize modifier plugin
|
* Smarty capitalize modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: capitalize<br>
|
* Name: capitalize<br>
|
||||||
* Purpose: capitalize words in the string
|
* Purpose: capitalize words in the string
|
||||||
*
|
|
||||||
* {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
|
* {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
|
||||||
*
|
*
|
||||||
* @param string $string string to capitalize
|
* @param string $string string to capitalize
|
||||||
* @param boolean $uc_digits also capitalize "x123" to "X123"
|
* @param boolean $uc_digits also capitalize "x123" to "X123"
|
||||||
* @param boolean $lc_rest capitalize first letters, lowercase all following letters "aAa" to "Aaa"
|
* @param boolean $lc_rest capitalize first letters, lowercase all following letters "aAa" to "Aaa"
|
||||||
|
*
|
||||||
* @return string capitalized string
|
* @return string capitalized string
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @author Rodney Rehm
|
* @author Rodney Rehm
|
||||||
|
|
@ -30,7 +29,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
|
||||||
$upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
|
$upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
|
||||||
} else {
|
} else {
|
||||||
// uppercase word breaks
|
// uppercase word breaks
|
||||||
$upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!eS" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').mb_convert_case(stripslashes('\\2'),MB_CASE_UPPER, '" . addslashes(Smarty::$_CHARSET) . "')", $string);
|
$upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert_cb', $string);
|
||||||
}
|
}
|
||||||
// check uc_digits case
|
// check uc_digits case
|
||||||
if (!$uc_digits) {
|
if (!$uc_digits) {
|
||||||
|
|
@ -40,7 +39,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$upper_string = preg_replace("!((^|\s)['\"])(\w)!e" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').mb_convert_case(stripslashes('\\3'),MB_CASE_UPPER, '" . addslashes(Smarty::$_CHARSET) . "')", $upper_string);
|
$upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb', $upper_string);
|
||||||
return $upper_string;
|
return $upper_string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -49,7 +48,7 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
|
||||||
$string = strtolower($string);
|
$string = strtolower($string);
|
||||||
}
|
}
|
||||||
// uppercase (including hyphenated words)
|
// uppercase (including hyphenated words)
|
||||||
$upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!eS" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').ucfirst(stripslashes('\\2'))", $string);
|
$upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst_cb', $string);
|
||||||
// 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)) {
|
||||||
|
|
@ -58,8 +57,34 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$upper_string = preg_replace("!((^|\s)['\"])(\w)!e" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').strtoupper(stripslashes('\\3'))", $upper_string);
|
$upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst2_cb', $upper_string);
|
||||||
return $upper_string;
|
return $upper_string;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
/*
|
||||||
|
*
|
||||||
|
* Bug: create_function() use exhausts memory when used in long loops
|
||||||
|
* Fix: use declared functions for callbacks instead of using create_function()
|
||||||
|
* Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3
|
||||||
|
*
|
||||||
|
* @author Kyle Renfrow
|
||||||
|
*/
|
||||||
|
function smarty_mod_cap_mbconvert_cb($matches)
|
||||||
|
{
|
||||||
|
return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[2]), MB_CASE_UPPER, Smarty::$_CHARSET);
|
||||||
|
}
|
||||||
|
|
||||||
|
function smarty_mod_cap_mbconvert2_cb($matches)
|
||||||
|
{
|
||||||
|
return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[3]), MB_CASE_UPPER, Smarty::$_CHARSET);
|
||||||
|
}
|
||||||
|
|
||||||
|
function smarty_mod_cap_ucfirst_cb($matches)
|
||||||
|
{
|
||||||
|
return stripslashes($matches[1]) . ucfirst(stripslashes($matches[2]));
|
||||||
|
}
|
||||||
|
|
||||||
|
function smarty_mod_cap_ucfirst2_cb($matches)
|
||||||
|
{
|
||||||
|
return stripslashes($matches[1]) . ucfirst(stripslashes($matches[3]));
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty date_format modifier plugin
|
* Smarty date_format modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: date_format<br>
|
* Name: date_format<br>
|
||||||
* Purpose: format datestamps via strftime<br>
|
* Purpose: format datestamps via strftime<br>
|
||||||
|
|
@ -19,10 +18,12 @@
|
||||||
*
|
*
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
|
* @link http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
|
*
|
||||||
* @param string $string input date string
|
* @param string $string input date string
|
||||||
* @param string $format strftime format for output
|
* @param string $format strftime format for output
|
||||||
* @param string $default_date default date if $string is empty
|
* @param string $default_date default date if $string is empty
|
||||||
* @param string $formatter either 'strftime' or 'auto'
|
* @param string $formatter either 'strftime' or 'auto'
|
||||||
|
*
|
||||||
* @return string |void
|
* @return string |void
|
||||||
* @uses smarty_make_timestamp()
|
* @uses smarty_make_timestamp()
|
||||||
*/
|
*/
|
||||||
|
|
@ -56,10 +57,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,15 +8,16 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty debug_print_var modifier plugin
|
* Smarty debug_print_var modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: debug_print_var<br>
|
* Name: debug_print_var<br>
|
||||||
* Purpose: formats variable contents for display in the console
|
* Purpose: formats variable contents for display in the console
|
||||||
*
|
*
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
|
*
|
||||||
* @param array|object $var variable to be formatted
|
* @param array|object $var variable to be formatted
|
||||||
* @param integer $depth maximum recursion depth if $var is an array
|
* @param integer $depth maximum recursion depth if $var is an array
|
||||||
* @param integer $length maximum string length if $var is a string
|
* @param integer $length maximum string length if $var is a string
|
||||||
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
|
function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
|
||||||
|
|
@ -101,5 +102,3 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
|
||||||
|
|
||||||
return $results;
|
return $results;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,17 +8,18 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty escape modifier plugin
|
* Smarty escape modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: escape<br>
|
* Name: escape<br>
|
||||||
* Purpose: escape string for output
|
* Purpose: escape string for output
|
||||||
*
|
*
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
|
* @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
|
*
|
||||||
* @param string $string input string
|
* @param string $string input string
|
||||||
* @param string $esc_type escape type
|
* @param string $esc_type escape type
|
||||||
* @param string $char_set character set, used for htmlspecialchars() or htmlentities()
|
* @param string $char_set character set, used for htmlspecialchars() or htmlentities()
|
||||||
* @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
|
* @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
|
||||||
|
*
|
||||||
* @return string escaped input string
|
* @return string escaped input string
|
||||||
*/
|
*/
|
||||||
function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
|
function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
|
||||||
|
|
@ -39,13 +40,14 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
|
||||||
return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
|
return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
|
||||||
} else {
|
} else {
|
||||||
if ($double_encode) {
|
if ($double_encode) {
|
||||||
// php <5.3.2 - only handle double encoding
|
// php <5.2.3 - only handle double encoding
|
||||||
return htmlspecialchars($string, ENT_QUOTES, $char_set);
|
return htmlspecialchars($string, ENT_QUOTES, $char_set);
|
||||||
} else {
|
} else {
|
||||||
// php <5.3.2 - prevent double encoding
|
// php <5.2.3 - prevent double encoding
|
||||||
$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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -58,13 +60,14 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
|
||||||
$string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
|
$string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
|
||||||
} else {
|
} else {
|
||||||
if ($double_encode) {
|
if ($double_encode) {
|
||||||
// php <5.3.2 - only handle double encoding
|
// php <5.2.3 - only handle double encoding
|
||||||
$string = htmlspecialchars($string, ENT_QUOTES, $char_set);
|
$string = htmlspecialchars($string, ENT_QUOTES, $char_set);
|
||||||
} else {
|
} else {
|
||||||
// php <5.3.2 - prevent double encoding
|
// php <5.2.3 - prevent double encoding
|
||||||
$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 +86,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 +109,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 +120,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 +128,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 +139,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 +147,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 +157,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 +175,7 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
|
||||||
$return .= chr($unicode);
|
$return .= chr($unicode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $return;
|
return $return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -178,11 +189,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,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty regex_replace modifier plugin
|
* Smarty regex_replace modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: regex_replace<br>
|
* Name: regex_replace<br>
|
||||||
* Purpose: regular expression search/replace
|
* Purpose: regular expression search/replace
|
||||||
|
|
@ -16,9 +15,11 @@
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
|
* @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
|
||||||
* regex_replace (Smarty online manual)
|
* regex_replace (Smarty online manual)
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
|
*
|
||||||
* @param string $string input string
|
* @param string $string input string
|
||||||
* @param string|array $search regular expression(s) to search for
|
* @param string|array $search regular expression(s) to search for
|
||||||
* @param string|array $replace string(s) that should be replaced
|
* @param string|array $replace string(s) that should be replaced
|
||||||
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_modifier_regex_replace($string, $search, $replace)
|
function smarty_modifier_regex_replace($string, $search, $replace)
|
||||||
|
|
@ -30,11 +31,13 @@ function smarty_modifier_regex_replace($string, $search, $replace)
|
||||||
} 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $search string(s) that should be replaced
|
* @param string $search string(s) that should be replaced
|
||||||
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @ignore
|
* @ignore
|
||||||
*/
|
*/
|
||||||
|
|
@ -49,7 +52,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty plugin
|
* Smarty plugin
|
||||||
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
* @subpackage PluginsModifier
|
* @subpackage PluginsModifier
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty replace modifier plugin
|
* Smarty replace modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: replace<br>
|
* Name: replace<br>
|
||||||
* Purpose: simple search/replace
|
* Purpose: simple search/replace
|
||||||
|
|
@ -15,19 +15,20 @@
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
|
* @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param string $string input string
|
* @param string $string input string
|
||||||
* @param string $search text to search for
|
* @param string $search text to search for
|
||||||
* @param string $replace replacement text
|
* @param string $replace replacement text
|
||||||
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_modifier_replace($string, $search, $replace)
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,21 +1,23 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty plugin
|
* Smarty plugin
|
||||||
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
* @subpackage PluginsModifier
|
* @subpackage PluginsModifier
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty spacify modifier plugin
|
* Smarty spacify modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: spacify<br>
|
* Name: spacify<br>
|
||||||
* Purpose: add spaces between characters in a string
|
* Purpose: add spaces between characters in a string
|
||||||
*
|
*
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
|
* @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
|
*
|
||||||
* @param string $string input string
|
* @param string $string input string
|
||||||
* @param string $spacify_char string to insert between characters.
|
* @param string $spacify_char string to insert between characters.
|
||||||
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function smarty_modifier_spacify($string, $spacify_char = ' ')
|
function smarty_modifier_spacify($string, $spacify_char = ' ')
|
||||||
|
|
@ -23,5 +25,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));
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty truncate modifier plugin
|
* Smarty truncate modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: truncate<br>
|
* Name: truncate<br>
|
||||||
* Purpose: Truncate a string to a certain length if necessary,
|
* Purpose: Truncate a string to a certain length if necessary,
|
||||||
|
|
@ -17,16 +16,20 @@
|
||||||
*
|
*
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
|
* @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
|
*
|
||||||
* @param string $string input string
|
* @param string $string input string
|
||||||
* @param integer $length length of truncated text
|
* @param integer $length length of truncated text
|
||||||
* @param string $etc end string
|
* @param string $etc end string
|
||||||
* @param boolean $break_words truncate at word boundary
|
* @param boolean $break_words truncate at word boundary
|
||||||
* @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 '';
|
||||||
|
}
|
||||||
|
|
||||||
if (Smarty::$_MBSTRING) {
|
if (Smarty::$_MBSTRING) {
|
||||||
if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
|
if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
|
||||||
|
|
@ -37,8 +40,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 +56,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty cat modifier plugin
|
* Smarty cat modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: cat<br>
|
* Name: cat<br>
|
||||||
* Date: Feb 24, 2003<br>
|
* Date: Feb 24, 2003<br>
|
||||||
|
|
@ -19,12 +18,12 @@
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
|
* @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
|
||||||
* (Smarty online manual)
|
* (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_cat($params, $compiler)
|
function smarty_modifiercompiler_cat($params)
|
||||||
{
|
{
|
||||||
return '(' . implode(').(', $params) . ')';
|
return '(' . implode(').(', $params) . ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,17 +8,18 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty count_characters modifier plugin
|
* Smarty count_characters modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: count_characteres<br>
|
* Name: count_characteres<br>
|
||||||
* Purpose: count the number of characters in a text
|
* Purpose: count the number of characters in a text
|
||||||
*
|
*
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
|
* @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_count_characters($params, $compiler)
|
function smarty_modifiercompiler_count_characters($params)
|
||||||
{
|
{
|
||||||
if (!isset($params[1]) || $params[1] != 'true') {
|
if (!isset($params[1]) || $params[1] != 'true') {
|
||||||
return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)';
|
return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)';
|
||||||
|
|
@ -29,5 +30,3 @@ function smarty_modifiercompiler_count_characters($params, $compiler)
|
||||||
// no MBString fallback
|
// no MBString fallback
|
||||||
return 'strlen(' . $params[0] . ')';
|
return 'strlen(' . $params[0] . ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty count_paragraphs modifier plugin
|
* Smarty count_paragraphs modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: count_paragraphs<br>
|
* Name: count_paragraphs<br>
|
||||||
* Purpose: count the number of paragraphs in a text
|
* Purpose: count the number of paragraphs in a text
|
||||||
|
|
@ -16,13 +15,13 @@
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
|
* @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
|
||||||
* count_paragraphs (Smarty online manual)
|
* count_paragraphs (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_count_paragraphs($params, $compiler)
|
function smarty_modifiercompiler_count_paragraphs($params)
|
||||||
{
|
{
|
||||||
// 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)';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty count_sentences modifier plugin
|
* Smarty count_sentences modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: count_sentences
|
* Name: count_sentences
|
||||||
* Purpose: count the number of sentences in a text
|
* Purpose: count the number of sentences in a text
|
||||||
|
|
@ -16,13 +15,13 @@
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
|
* @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
|
||||||
* count_sentences (Smarty online manual)
|
* count_sentences (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_count_sentences($params, $compiler)
|
function smarty_modifiercompiler_count_sentences($params)
|
||||||
{
|
{
|
||||||
// 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)';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,17 +8,18 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty count_words modifier plugin
|
* Smarty count_words modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: count_words<br>
|
* Name: count_words<br>
|
||||||
* Purpose: count the number of words in a text
|
* Purpose: count the number of words in a text
|
||||||
*
|
*
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
|
* @link http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_count_words($params, $compiler)
|
function smarty_modifiercompiler_count_words($params)
|
||||||
{
|
{
|
||||||
if (Smarty::$_MBSTRING) {
|
if (Smarty::$_MBSTRING) {
|
||||||
// return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
|
// return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
|
||||||
|
|
@ -28,5 +29,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] . ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,17 +8,18 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty default modifier plugin
|
* Smarty default modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: default<br>
|
* Name: default<br>
|
||||||
* Purpose: designate default value for empty variables
|
* Purpose: designate default value for empty variables
|
||||||
*
|
*
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
|
* @link http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_default ($params, $compiler)
|
function smarty_modifiercompiler_default($params)
|
||||||
{
|
{
|
||||||
$output = $params[0];
|
$output = $params[0];
|
||||||
if (!isset($params[1])) {
|
if (!isset($params[1])) {
|
||||||
|
|
@ -29,7 +30,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -13,14 +13,16 @@ require_once( SMARTY_PLUGINS_DIR .'shared.literal_compiler_param.php' );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty escape modifier plugin
|
* Smarty escape modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: escape<br>
|
* Name: escape<br>
|
||||||
* Purpose: escape string for output
|
* Purpose: escape string for output
|
||||||
*
|
*
|
||||||
* @link http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
|
* @link http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
|
||||||
* @author Rodney Rehm
|
* @author Rodney Rehm
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
* @param $compiler
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_escape($params, $compiler)
|
function smarty_modifiercompiler_escape($params, $compiler)
|
||||||
|
|
@ -57,7 +59,7 @@ function smarty_modifiercompiler_escape($params, $compiler)
|
||||||
case 'htmlall':
|
case 'htmlall':
|
||||||
if (Smarty::$_MBSTRING) {
|
if (Smarty::$_MBSTRING) {
|
||||||
if ($_double_encode) {
|
if ($_double_encode) {
|
||||||
// php >=5.3.2 - go native
|
// php >=5.2.3 - go native
|
||||||
return 'mb_convert_encoding(htmlspecialchars('
|
return 'mb_convert_encoding(htmlspecialchars('
|
||||||
. $params[0] . ', ENT_QUOTES, '
|
. $params[0] . ', ENT_QUOTES, '
|
||||||
. var_export($char_set, true) . ', '
|
. var_export($char_set, true) . ', '
|
||||||
|
|
@ -65,7 +67,7 @@ function smarty_modifiercompiler_escape($params, $compiler)
|
||||||
. '), "HTML-ENTITIES", '
|
. '), "HTML-ENTITIES", '
|
||||||
. var_export($char_set, true) . ')';
|
. var_export($char_set, true) . ')';
|
||||||
} elseif ($double_encode) {
|
} elseif ($double_encode) {
|
||||||
// php <5.3.2 - 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, '
|
||||||
. var_export($char_set, true)
|
. var_export($char_set, true)
|
||||||
|
|
@ -78,13 +80,13 @@ function smarty_modifiercompiler_escape($params, $compiler)
|
||||||
|
|
||||||
// no MBString fallback
|
// no MBString fallback
|
||||||
if ($_double_encode) {
|
if ($_double_encode) {
|
||||||
// php >=5.3.2 - go native
|
// php >=5.2.3 - go native
|
||||||
return 'htmlentities('
|
return 'htmlentities('
|
||||||
. $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) . ')';
|
||||||
} elseif ($double_encode) {
|
} elseif ($double_encode) {
|
||||||
// php <5.3.2 - only handle double encoding
|
// php <5.2.3 - only handle double encoding
|
||||||
return 'htmlentities('
|
return 'htmlentities('
|
||||||
. $params[0] . ', ENT_QUOTES, '
|
. $params[0] . ', ENT_QUOTES, '
|
||||||
. var_export($char_set, true) . ')';
|
. var_export($char_set, true) . ')';
|
||||||
|
|
@ -105,21 +107,20 @@ function smarty_modifiercompiler_escape($params, $compiler)
|
||||||
case 'javascript':
|
case 'javascript':
|
||||||
// escape quotes and backslashes, newlines, etc.
|
// escape quotes and backslashes, newlines, etc.
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
// could not optimize |escape call, so fallback to regular plugin
|
// could not optimize |escape call, so fallback to regular plugin
|
||||||
if ($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->template->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
|
||||||
$compiler->template->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
|
$compiler->template->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->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) . ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,16 +8,17 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty from_charset modifier plugin
|
* Smarty from_charset modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: from_charset<br>
|
* Name: from_charset<br>
|
||||||
* Purpose: convert character encoding from $charset to internal encoding
|
* Purpose: convert character encoding from $charset to internal encoding
|
||||||
*
|
*
|
||||||
* @author Rodney Rehm
|
* @author Rodney Rehm
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_from_charset($params, $compiler)
|
function smarty_modifiercompiler_from_charset($params)
|
||||||
{
|
{
|
||||||
if (!Smarty::$_MBSTRING) {
|
if (!Smarty::$_MBSTRING) {
|
||||||
// FIXME: (rodneyrehm) shouldn't this throw an error?
|
// FIXME: (rodneyrehm) shouldn't this throw an error?
|
||||||
|
|
@ -30,5 +31,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] . ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,24 +1,26 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty plugin
|
* Smarty plugin
|
||||||
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
* @subpackage PluginsModifierCompiler
|
* @subpackage PluginsModifierCompiler
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty indent modifier plugin
|
* Smarty indent modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: indent<br>
|
* Name: indent<br>
|
||||||
* Purpose: indent lines of text
|
* Purpose: indent lines of text
|
||||||
*
|
*
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
|
* @link http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function smarty_modifiercompiler_indent($params, $compiler)
|
function smarty_modifiercompiler_indent($params)
|
||||||
{
|
{
|
||||||
if (!isset($params[1])) {
|
if (!isset($params[1])) {
|
||||||
$params[1] = 4;
|
$params[1] = 4;
|
||||||
|
|
@ -26,7 +28,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] . ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty plugin
|
* Smarty plugin
|
||||||
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
* @subpackage PluginsModifierCompiler
|
* @subpackage PluginsModifierCompiler
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty lower modifier plugin
|
* Smarty lower modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: lower<br>
|
* Name: lower<br>
|
||||||
* Purpose: convert string to lowercase
|
* Purpose: convert string to lowercase
|
||||||
|
|
@ -15,11 +15,13 @@
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
|
* @link http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function smarty_modifiercompiler_lower($params, $compiler)
|
function smarty_modifiercompiler_lower($params)
|
||||||
{
|
{
|
||||||
if (Smarty::$_MBSTRING) {
|
if (Smarty::$_MBSTRING) {
|
||||||
return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
|
return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
|
||||||
|
|
@ -27,5 +29,3 @@ function smarty_modifiercompiler_lower($params, $compiler)
|
||||||
// no MBString fallback
|
// no MBString fallback
|
||||||
return 'strtolower(' . $params[0] . ')';
|
return 'strtolower(' . $params[0] . ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,18 +8,14 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty noprint modifier plugin
|
* Smarty noprint modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: noprint<br>
|
* Name: noprint<br>
|
||||||
* Purpose: return an empty string
|
* Purpose: return an empty string
|
||||||
*
|
*
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
* @param array $params parameters
|
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_noprint($params, $compiler)
|
function smarty_modifiercompiler_noprint()
|
||||||
{
|
{
|
||||||
return "''";
|
return "''";
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,19 +8,18 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty string_format modifier plugin
|
* Smarty string_format modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: string_format<br>
|
* Name: string_format<br>
|
||||||
* Purpose: format strings via sprintf
|
* Purpose: format strings via sprintf
|
||||||
*
|
*
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
|
* @link http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_string_format($params, $compiler)
|
function smarty_modifiercompiler_string_format($params)
|
||||||
{
|
{
|
||||||
return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
|
return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty strip modifier plugin
|
* Smarty strip modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: strip<br>
|
* Name: strip<br>
|
||||||
* Purpose: Replace all repeated spaces, newlines, tabs
|
* Purpose: Replace all repeated spaces, newlines, tabs
|
||||||
|
|
@ -18,16 +17,17 @@
|
||||||
*
|
*
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
|
* @link http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function smarty_modifiercompiler_strip($params, $compiler)
|
function smarty_modifiercompiler_strip($params)
|
||||||
{
|
{
|
||||||
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]})";
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,26 +8,22 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty strip_tags modifier plugin
|
* Smarty strip_tags modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: strip_tags<br>
|
* Name: strip_tags<br>
|
||||||
* Purpose: strip html tags from text
|
* Purpose: strip html tags from text
|
||||||
*
|
*
|
||||||
* @link http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
|
* @link http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_strip_tags($params, $compiler)
|
function smarty_modifiercompiler_strip_tags($params)
|
||||||
{
|
{
|
||||||
if (!isset($params[1])) {
|
if (!isset($params[1]) || $params[1] === true || trim($params[1], '"') == 'true') {
|
||||||
$params[1] = true;
|
|
||||||
}
|
|
||||||
if ($params[1] === true) {
|
|
||||||
return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
|
return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
|
||||||
} else {
|
} else {
|
||||||
return 'strip_tags(' . $params[0] . ')';
|
return 'strip_tags(' . $params[0] . ')';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,16 +8,17 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty to_charset modifier plugin
|
* Smarty to_charset modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: to_charset<br>
|
* Name: to_charset<br>
|
||||||
* Purpose: convert character encoding from internal encoding to $charset
|
* Purpose: convert character encoding from internal encoding to $charset
|
||||||
*
|
*
|
||||||
* @author Rodney Rehm
|
* @author Rodney Rehm
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_to_charset($params, $compiler)
|
function smarty_modifiercompiler_to_charset($params)
|
||||||
{
|
{
|
||||||
if (!Smarty::$_MBSTRING) {
|
if (!Smarty::$_MBSTRING) {
|
||||||
// FIXME: (rodneyrehm) shouldn't this throw an error?
|
// FIXME: (rodneyrehm) shouldn't this throw an error?
|
||||||
|
|
@ -30,5 +31,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) . '")';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,16 +8,17 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty unescape modifier plugin
|
* Smarty unescape modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: unescape<br>
|
* Name: unescape<br>
|
||||||
* Purpose: unescape html entities
|
* Purpose: unescape html entities
|
||||||
*
|
*
|
||||||
* @author Rodney Rehm
|
* @author Rodney Rehm
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_unescape($params, $compiler)
|
function smarty_modifiercompiler_unescape($params)
|
||||||
{
|
{
|
||||||
if (!isset($params[1])) {
|
if (!isset($params[1])) {
|
||||||
$params[1] = 'html';
|
$params[1] = 'html';
|
||||||
|
|
@ -47,5 +48,3 @@ function smarty_modifiercompiler_unescape($params, $compiler)
|
||||||
return $params[0];
|
return $params[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,17 +8,18 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty upper modifier plugin
|
* Smarty upper modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: lower<br>
|
* Name: lower<br>
|
||||||
* Purpose: convert string to uppercase
|
* Purpose: convert string to uppercase
|
||||||
*
|
*
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
|
* @link http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_upper($params, $compiler)
|
function smarty_modifiercompiler_upper($params)
|
||||||
{
|
{
|
||||||
if (Smarty::$_MBSTRING) {
|
if (Smarty::$_MBSTRING) {
|
||||||
return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
|
return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
|
||||||
|
|
@ -26,5 +27,3 @@ function smarty_modifiercompiler_upper($params, $compiler)
|
||||||
// no MBString fallback
|
// no MBString fallback
|
||||||
return 'strtoupper(' . $params[0] . ')';
|
return 'strtoupper(' . $params[0] . ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,14 +8,16 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty wordwrap modifier plugin
|
* Smarty wordwrap modifier plugin
|
||||||
*
|
|
||||||
* Type: modifier<br>
|
* Type: modifier<br>
|
||||||
* Name: wordwrap<br>
|
* Name: wordwrap<br>
|
||||||
* Purpose: wrap a string of text at a given length
|
* Purpose: wrap a string of text at a given length
|
||||||
*
|
*
|
||||||
* @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
|
* @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
* @param array $params parameters
|
* @param array $params parameters
|
||||||
|
* @param $compiler
|
||||||
|
*
|
||||||
* @return string with compiled code
|
* @return string with compiled code
|
||||||
*/
|
*/
|
||||||
function smarty_modifiercompiler_wordwrap($params, $compiler)
|
function smarty_modifiercompiler_wordwrap($params, $compiler)
|
||||||
|
|
@ -31,7 +33,7 @@ function smarty_modifiercompiler_wordwrap($params, $compiler)
|
||||||
}
|
}
|
||||||
$function = 'wordwrap';
|
$function = 'wordwrap';
|
||||||
if (Smarty::$_MBSTRING) {
|
if (Smarty::$_MBSTRING) {
|
||||||
if ($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->template->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 {
|
||||||
|
|
@ -40,7 +42,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] . ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty trimwhitespace outputfilter plugin
|
* Smarty trimwhitespace outputfilter plugin
|
||||||
*
|
|
||||||
* Trim unnecessary whitespace from HTML markup.
|
* Trim unnecessary whitespace from HTML markup.
|
||||||
*
|
*
|
||||||
* @author Rodney Rehm
|
* @author Rodney Rehm
|
||||||
|
*
|
||||||
* @param string $source input string
|
* @param string $source input string
|
||||||
* @param Smarty_Internal_Template $smarty Smarty object
|
*
|
||||||
* @return string filtered output
|
* @return string filtered output
|
||||||
* @todo substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
|
* @todo substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
|
||||||
*/
|
*/
|
||||||
function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $smarty)
|
function smarty_outputfilter_trimwhitespace($source)
|
||||||
{
|
{
|
||||||
$store = array();
|
$store = array();
|
||||||
$_store = 0;
|
$_store = 0;
|
||||||
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -9,13 +9,14 @@
|
||||||
if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
|
if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
|
||||||
/**
|
/**
|
||||||
* escape_special_chars common function
|
* escape_special_chars common function
|
||||||
*
|
|
||||||
* Function: smarty_function_escape_special_chars<br>
|
* Function: smarty_function_escape_special_chars<br>
|
||||||
* Purpose: used by other smarty functions to escape
|
* Purpose: used by other smarty functions to escape
|
||||||
* 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,18 +24,20 @@ 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 {
|
||||||
/**
|
/**
|
||||||
* escape_special_chars common function
|
* escape_special_chars common function
|
||||||
*
|
|
||||||
* Function: smarty_function_escape_special_chars<br>
|
* Function: smarty_function_escape_special_chars<br>
|
||||||
* Purpose: used by other smarty functions to escape
|
* Purpose: used by other smarty functions to escape
|
||||||
* 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 +47,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
* @param array $params parameter array as given to the compiler function
|
* @param array $params parameter array as given to the compiler function
|
||||||
* @param integer $index array index of the parameter to convert
|
* @param integer $index array index of the parameter to convert
|
||||||
* @param mixed $default value to be returned if the parameter is not present
|
* @param mixed $default value to be returned if the parameter is not present
|
||||||
|
*
|
||||||
* @return mixed evaluated value of parameter or $default
|
* @return mixed evaluated value of parameter or $default
|
||||||
* @throws SmartyException if parameter is not a literal (but an expression, variable, …)
|
* @throws SmartyException if parameter is not a literal (but an expression, variable, …)
|
||||||
* @author Rodney Rehm
|
* @author Rodney Rehm
|
||||||
|
|
@ -23,11 +24,12 @@ function smarty_literal_compiler_param($params, $index, $default=null)
|
||||||
return $default;
|
return $default;
|
||||||
}
|
}
|
||||||
// test if param is a literal
|
// test if param is a literal
|
||||||
if (!preg_match('/^([\'"]?)[a-zA-Z0-9]+(\\1)$/', $params[$index])) {
|
if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[$index])) {
|
||||||
throw new SmartyException('$param[' . $index . '] is not a literal and is thus not evaluatable at compile time');
|
throw new SmartyException('$param[' . $index . '] is not a literal and is thus not evaluatable at compile time');
|
||||||
}
|
}
|
||||||
|
|
||||||
$t = null;
|
$t = null;
|
||||||
eval("\$t = " . $params[$index] . ";");
|
eval("\$t = " . $params[$index] . ";");
|
||||||
|
|
||||||
return $t;
|
return $t;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,9 @@
|
||||||
* Purpose: used by other smarty functions to make a timestamp from a string.
|
* Purpose: used by other smarty functions to make a timestamp from a string.
|
||||||
*
|
*
|
||||||
* @author Monte Ohrt <monte at ohrt dot com>
|
* @author Monte Ohrt <monte at ohrt dot com>
|
||||||
|
*
|
||||||
* @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
|
* @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
|
||||||
|
*
|
||||||
* @return int
|
* @return int
|
||||||
*/
|
*/
|
||||||
function smarty_make_timestamp($string)
|
function smarty_make_timestamp($string)
|
||||||
|
|
@ -35,8 +37,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ if (!function_exists('smarty_mb_str_replace')) {
|
||||||
* @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 +49,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
|
||||||
|
|
@ -10,17 +10,21 @@
|
||||||
* convert characters to their decimal unicode equivalents
|
* convert characters to their decimal unicode equivalents
|
||||||
*
|
*
|
||||||
* @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
|
* @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
|
||||||
|
*
|
||||||
* @param string $string characters to calculate unicode of
|
* @param string $string characters to calculate unicode of
|
||||||
* @param string $encoding encoding of $string, if null mb_internal_encoding() is used
|
* @param string $encoding encoding of $string, if null mb_internal_encoding() is used
|
||||||
|
*
|
||||||
* @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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -28,12 +32,15 @@ function smarty_mb_to_unicode($string, $encoding=null) {
|
||||||
* convert unicodes to the character of given encoding
|
* convert unicodes to the character of given encoding
|
||||||
*
|
*
|
||||||
* @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
|
* @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
|
||||||
|
*
|
||||||
* @param integer|array $unicode single unicode or list of unicodes to convert
|
* @param integer|array $unicode single unicode or list of unicodes to convert
|
||||||
* @param string $encoding encoding of returned string, if null mb_internal_encoding() is used
|
* @param string $encoding encoding of returned string, if null mb_internal_encoding() is used
|
||||||
|
*
|
||||||
* @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();
|
||||||
|
|
@ -42,7 +49,6 @@ function smarty_mb_from_unicode($unicode, $encoding=null) {
|
||||||
$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;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -12,10 +12,12 @@ 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
|
||||||
*/
|
*/
|
||||||
|
|
@ -78,6 +80,4 @@ if(!function_exists('smarty_mb_wordwrap')) {
|
||||||
|
|
||||||
return $t;
|
return $t;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
|
||||||
|
|
@ -10,12 +10,10 @@
|
||||||
* Smarty htmlspecialchars variablefilter plugin
|
* Smarty htmlspecialchars variablefilter plugin
|
||||||
*
|
*
|
||||||
* @param string $source input string
|
* @param string $source input string
|
||||||
* @param Smarty_Internal_Template $smarty Smarty object
|
*
|
||||||
* @return string filtered output
|
* @return string filtered output
|
||||||
*/
|
*/
|
||||||
function smarty_variablefilter_htmlspecialchars($source, $smarty)
|
function smarty_variablefilter_htmlspecialchars($source)
|
||||||
{
|
{
|
||||||
return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
|
return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -13,15 +13,18 @@
|
||||||
* @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
|
||||||
*/
|
*/
|
||||||
public static $resources = array();
|
public static $resources = array();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* resource types provided by the core
|
* resource types provided by the core
|
||||||
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected static $sysplugins = array(
|
protected static $sysplugins = array(
|
||||||
|
|
@ -33,49 +36,56 @@ abstract class Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 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
|
||||||
*
|
*
|
||||||
* @param Smarty_Template_Cached $source cached object
|
* @param Smarty_Template_Cached $cached
|
||||||
|
*
|
||||||
* @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
|
||||||
*
|
*
|
||||||
* @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 boolean 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
|
||||||
*
|
*
|
||||||
* @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 abstract function writeCachedContent(Smarty_Internal_Template $_template, $content);
|
abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return cached content
|
* Return cached content
|
||||||
*
|
*
|
||||||
* @param Smarty_Internal_Template $_template template object
|
* @param Smarty_Internal_Template $_template template object
|
||||||
* @param string $content content of cache
|
*
|
||||||
|
* @return null|string
|
||||||
*/
|
*/
|
||||||
public function getCachedContent(Smarty_Internal_Template $_template)
|
public function getCachedContent(Smarty_Internal_Template $_template)
|
||||||
{
|
{
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -84,9 +94,10 @@ abstract class Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 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
|
||||||
|
|
@ -96,11 +107,17 @@ abstract class Smarty_CacheResource {
|
||||||
* @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 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);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Smarty $smarty
|
||||||
|
* @param Smarty_Template_Cached $cached
|
||||||
|
*
|
||||||
|
* @return bool|null
|
||||||
|
*/
|
||||||
public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
|
public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
|
||||||
{
|
{
|
||||||
// theoretically locking_timeout should be checked against time_limit (max_execution_time)
|
// theoretically locking_timeout should be checked against time_limit (max_execution_time)
|
||||||
|
|
@ -114,33 +131,59 @@ abstract class Smarty_CacheResource {
|
||||||
}
|
}
|
||||||
sleep(1);
|
sleep(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $hadLock;
|
return $hadLock;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check is cache is locked for this template
|
||||||
|
*
|
||||||
|
* @param Smarty $smarty
|
||||||
|
* @param Smarty_Template_Cached $cached
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
||||||
{
|
{
|
||||||
// check if lock exists
|
// check if lock exists
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Lock cache for this template
|
||||||
|
*
|
||||||
|
* @param Smarty $smarty
|
||||||
|
* @param Smarty_Template_Cached $cached
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
||||||
{
|
{
|
||||||
// create lock
|
// create lock
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unlock cache for this template
|
||||||
|
*
|
||||||
|
* @param Smarty $smarty
|
||||||
|
* @param Smarty_Template_Cached $cached
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
||||||
{
|
{
|
||||||
// release lock
|
// release lock
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load Cache Resource Handler
|
* Load Cache Resource Handler
|
||||||
*
|
*
|
||||||
* @param Smarty $smarty Smarty object
|
* @param Smarty $smarty Smarty object
|
||||||
* @param string $type name of the cache resource
|
* @param string $type name of the cache resource
|
||||||
|
*
|
||||||
|
* @throws SmartyException
|
||||||
* @return Smarty_CacheResource Cache Resource Handler
|
* @return Smarty_CacheResource Cache Resource Handler
|
||||||
*/
|
*/
|
||||||
public static function load(Smarty $smarty, $type = null)
|
public static function load(Smarty $smarty, $type = null)
|
||||||
|
|
@ -165,6 +208,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 +217,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
|
||||||
|
|
@ -197,82 +242,94 @@ abstract class Smarty_CacheResource {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty Resource Data Object
|
* Smarty Resource Data Object
|
||||||
*
|
|
||||||
* Cache Data Container for Template Files
|
* Cache Data Container for Template Files
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
* @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
|
||||||
*/
|
*/
|
||||||
public $filepath = false;
|
public $filepath = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Source Content
|
* Source Content
|
||||||
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public $content = null;
|
public $content = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Source Timestamp
|
* Source Timestamp
|
||||||
|
*
|
||||||
* @var integer
|
* @var integer
|
||||||
*/
|
*/
|
||||||
public $timestamp = false;
|
public $timestamp = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Source Existance
|
* Source Existence
|
||||||
|
*
|
||||||
* @var boolean
|
* @var boolean
|
||||||
*/
|
*/
|
||||||
public $exists = false;
|
public $exists = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Cache Is Valid
|
* Cache Is Valid
|
||||||
|
*
|
||||||
* @var boolean
|
* @var boolean
|
||||||
*/
|
*/
|
||||||
public $valid = false;
|
public $valid = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Cache was processed
|
* Cache was processed
|
||||||
|
*
|
||||||
* @var boolean
|
* @var boolean
|
||||||
*/
|
*/
|
||||||
public $processed = false;
|
public $processed = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CacheResource Handler
|
* CacheResource Handler
|
||||||
|
*
|
||||||
* @var Smarty_CacheResource
|
* @var Smarty_CacheResource
|
||||||
*/
|
*/
|
||||||
public $handler = null;
|
public $handler = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Template Compile Id (Smarty_Internal_Template::$compile_id)
|
* Template Compile Id (Smarty_Internal_Template::$compile_id)
|
||||||
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public $compile_id = null;
|
public $compile_id = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Template Cache Id (Smarty_Internal_Template::$cache_id)
|
* Template Cache Id (Smarty_Internal_Template::$cache_id)
|
||||||
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public $cache_id = null;
|
public $cache_id = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Id for cache locking
|
* Id for cache locking
|
||||||
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public $lock_id = null;
|
public $lock_id = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* flag that cache is locked by this instance
|
* flag that cache is locked by this instance
|
||||||
|
*
|
||||||
* @var bool
|
* @var bool
|
||||||
*/
|
*/
|
||||||
public $is_locked = false;
|
public $is_locked = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Source Object
|
* Source Object
|
||||||
|
*
|
||||||
* @var Smarty_Template_Source
|
* @var Smarty_Template_Source
|
||||||
*/
|
*/
|
||||||
public $source = null;
|
public $source = null;
|
||||||
|
|
@ -300,6 +357,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) {
|
||||||
|
|
@ -347,6 +405,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;
|
||||||
|
|
@ -359,23 +418,25 @@ class Smarty_Template_Cached {
|
||||||
*
|
*
|
||||||
* @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 write(Smarty_Internal_Template $_template, $content)
|
public function write(Smarty_Internal_Template $_template, $content)
|
||||||
{
|
{
|
||||||
if (!$_template->source->recompiled) {
|
if (!$_template->source->recompiled) {
|
||||||
if ($this->handler->writeCachedContent($_template, $content)) {
|
if ($this->handler->writeCachedContent($_template, $content)) {
|
||||||
|
$this->content = null;
|
||||||
$this->timestamp = time();
|
$this->timestamp = time();
|
||||||
$this->exists = true;
|
$this->exists = true;
|
||||||
$this->valid = true;
|
$this->valid = true;
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
|
||||||
|
|
@ -13,8 +13,8 @@
|
||||||
* @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
|
||||||
*
|
*
|
||||||
|
|
@ -24,13 +24,13 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
* @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
|
||||||
*
|
|
||||||
* {@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.}}
|
||||||
*
|
*
|
||||||
|
|
@ -38,6 +38,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
* @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)
|
||||||
|
|
@ -54,9 +55,10 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
* @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
|
||||||
|
|
@ -65,15 +67,17 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
* @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 +92,8 @@ 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 $cached
|
||||||
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function populateTimestamp(Smarty_Template_Cached $cached)
|
public function populateTimestamp(Smarty_Template_Cached $cached)
|
||||||
|
|
@ -97,6 +102,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;
|
||||||
|
|
@ -110,7 +116,8 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 boolean 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)
|
||||||
{
|
{
|
||||||
|
|
@ -130,10 +137,15 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (isset($content)) {
|
if (isset($content)) {
|
||||||
|
/** @var Smarty_Internal_Template $_smarty_tpl
|
||||||
|
* used in evaluated code
|
||||||
|
*/
|
||||||
$_smarty_tpl = $_template;
|
$_smarty_tpl = $_template;
|
||||||
eval("?>" . $content);
|
eval("?>" . $content);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -142,6 +154,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -161,11 +174,13 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -177,12 +192,40 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
* @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);
|
$cache_name = null;
|
||||||
|
|
||||||
|
if (isset($resource_name)) {
|
||||||
|
$_save_stat = $smarty->caching;
|
||||||
|
$smarty->caching = true;
|
||||||
|
$tpl = new $smarty->template_class($resource_name, $smarty);
|
||||||
|
$smarty->caching = $_save_stat;
|
||||||
|
|
||||||
|
if ($tpl->source->exists) {
|
||||||
|
$cache_name = $tpl->source->name;
|
||||||
|
} else {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
// remove from template cache
|
||||||
|
if ($smarty->allow_ambiguous_resources) {
|
||||||
|
$_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
|
||||||
|
} else {
|
||||||
|
$_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
|
||||||
|
}
|
||||||
|
if (isset($_templateId[150])) {
|
||||||
|
$_templateId = sha1($_templateId);
|
||||||
|
}
|
||||||
|
unset($smarty->template_objects[$_templateId]);
|
||||||
|
// template object no longer needed
|
||||||
|
unset($tpl);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->delete($cache_name, $cache_id, $compile_id, $exp_time);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -190,7 +233,8 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 boolean 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)
|
||||||
{
|
{
|
||||||
|
|
@ -210,6 +254,8 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 bool|void
|
||||||
*/
|
*/
|
||||||
public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
||||||
{
|
{
|
||||||
|
|
@ -225,6 +271,8 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 bool|void
|
||||||
*/
|
*/
|
||||||
public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
||||||
{
|
{
|
||||||
|
|
@ -234,4 +282,3 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
|
||||||
$this->delete($name, null, null, null);
|
$this->delete($name, null, null, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
|
||||||
|
|
@ -8,19 +8,16 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty Cache Handler Base for Key/Value Storage Implementations
|
* Smarty Cache Handler Base for Key/Value Storage Implementations
|
||||||
*
|
|
||||||
* This class implements the functionality required to use simple key/value stores
|
* This class implements the functionality required to use simple key/value stores
|
||||||
* for hierarchical cache groups. key/value stores like memcache or APC do not support
|
* for hierarchical cache groups. key/value stores like memcache or APC do not support
|
||||||
* wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
|
* wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
|
||||||
* is no problem to filesystem and RDBMS implementations.
|
* is no problem to filesystem and RDBMS implementations.
|
||||||
*
|
|
||||||
* This implementation is based on the concept of invalidation. While one specific cache
|
* This implementation is based on the concept of invalidation. While one specific cache
|
||||||
* can be identified and cleared, any range of caches cannot be identified. For this reason
|
* can be identified and cleared, any range of caches cannot be identified. For this reason
|
||||||
* each level of the cache group hierarchy can have its own value in the store. These values
|
* each level of the cache group hierarchy can have its own value in the store. These values
|
||||||
* are nothing but microtimes, telling us when a particular cache group was cleared for the
|
* are nothing but microtimes, telling us when a particular cache group was cleared for the
|
||||||
* last time. These keys are evaluated for every cache read to determine if the cache has
|
* last time. These keys are evaluated for every cache read to determine if the cache has
|
||||||
* been invalidated since it was created and should hence be treated as inexistent.
|
* been invalidated since it was created and should hence be treated as inexistent.
|
||||||
*
|
|
||||||
* Although deep hierarchies are possible, they are not recommended. Try to keep your
|
* Although deep hierarchies are possible, they are not recommended. Try to keep your
|
||||||
* cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
|
* cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
|
||||||
* »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
|
* »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
|
||||||
|
|
@ -31,15 +28,17 @@
|
||||||
* @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
|
||||||
*/
|
*/
|
||||||
protected $contents = array();
|
protected $contents = array();
|
||||||
/**
|
/**
|
||||||
* cache for timestamps
|
* cache for timestamps
|
||||||
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $timestamps = array();
|
protected $timestamps = array();
|
||||||
|
|
@ -49,12 +48,13 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
{
|
{
|
||||||
$cached->filepath = $_template->source->uid
|
$cached->filepath = $_template->source->uid
|
||||||
. '#' . $this->sanitize($cached->source->name)
|
. '#' . $this->sanitize($cached->source->resource)
|
||||||
. '#' . $this->sanitize($cached->cache_id)
|
. '#' . $this->sanitize($cached->cache_id)
|
||||||
. '#' . $this->sanitize($cached->compile_id);
|
. '#' . $this->sanitize($cached->compile_id);
|
||||||
|
|
||||||
|
|
@ -65,6 +65,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)
|
||||||
|
|
@ -82,7 +83,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 boolean 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)
|
||||||
{
|
{
|
||||||
|
|
@ -97,10 +99,15 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isset($content)) {
|
if (isset($content)) {
|
||||||
|
/** @var Smarty_Internal_Template $_smarty_tpl
|
||||||
|
* used in evaluated code
|
||||||
|
*/
|
||||||
$_smarty_tpl = $_template;
|
$_smarty_tpl = $_template;
|
||||||
eval("?>" . $content);
|
eval("?>" . $content);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -109,21 +116,23 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Empty cache
|
* Empty cache
|
||||||
*
|
|
||||||
* {@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,12 +142,12 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
if (!$this->purge()) {
|
if (!$this->purge()) {
|
||||||
$this->invalidate(null);
|
$this->invalidate(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
return - 1;
|
return - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Empty cache for a specific template
|
* Empty cache for a specific template
|
||||||
*
|
|
||||||
* {@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
|
||||||
|
|
@ -146,6 +155,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
* @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,8 +167,10 @@ 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
|
||||||
*
|
*
|
||||||
|
|
@ -166,6 +178,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
* @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,6 +201,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
}
|
}
|
||||||
unset($smarty->template_objects[$_templateId]);
|
unset($smarty->template_objects[$_templateId]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $uid;
|
return $uid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -195,6 +209,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
* 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,6 +219,7 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -217,6 +233,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
* @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)
|
||||||
|
|
@ -238,7 +255,6 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add current microtime to the beginning of $cache_content
|
* Add current microtime to the beginning of $cache_content
|
||||||
*
|
|
||||||
* {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
|
* {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
|
||||||
*
|
*
|
||||||
* @param string &$content the content to be cached
|
* @param string &$content the content to be cached
|
||||||
|
|
@ -254,6 +270,7 @@ 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)
|
||||||
|
|
@ -261,6 +278,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
$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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -272,6 +290,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
* @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)
|
||||||
|
|
@ -281,23 +300,25 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
// invalidate everything
|
// invalidate everything
|
||||||
if (!$resource_name && !$cache_id && !$compile_id) {
|
if (!$resource_name && !$cache_id && !$compile_id) {
|
||||||
$key = 'IVK#ALL';
|
$key = 'IVK#ALL';
|
||||||
}
|
} // invalidate all caches by template
|
||||||
// invalidate all caches by template
|
else {
|
||||||
else if ($resource_name && !$cache_id && !$compile_id) {
|
if ($resource_name && !$cache_id && !$compile_id) {
|
||||||
$key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
|
$key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
|
||||||
}
|
} // invalidate all caches by cache group
|
||||||
// invalidate all caches by cache group
|
else {
|
||||||
else if (!$resource_name && $cache_id && !$compile_id) {
|
if (!$resource_name && $cache_id && !$compile_id) {
|
||||||
$key = 'IVK#CACHE#' . $this->sanitize($cache_id);
|
$key = 'IVK#CACHE#' . $this->sanitize($cache_id);
|
||||||
}
|
} // invalidate all caches by compile id
|
||||||
// invalidate all caches by compile id
|
else {
|
||||||
else if (!$resource_name && !$cache_id && $compile_id) {
|
if (!$resource_name && !$cache_id && $compile_id) {
|
||||||
$key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
|
$key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
|
||||||
}
|
} // invalidate by combination
|
||||||
// invalidate by combination
|
|
||||||
else {
|
else {
|
||||||
$key = 'IVK#CID#' . $cid;
|
$key = 'IVK#CID#' . $cid;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
$this->write(array($key => $now));
|
$this->write(array($key => $now));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -309,6 +330,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
* @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,12 +350,12 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Translate a CacheID into the list of applicable InvalidationKeys.
|
* Translate a CacheID into the list of applicable InvalidationKeys.
|
||||||
*
|
|
||||||
* 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
|
||||||
|
|
@ -341,6 +363,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
* @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
|
||||||
*/
|
*/
|
||||||
|
|
@ -380,6 +403,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
// skip past delimiter position
|
// skip past delimiter position
|
||||||
$i ++;
|
$i ++;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $t;
|
return $t;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -388,12 +412,14 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 boolean 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -402,6 +428,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 bool|void
|
||||||
*/
|
*/
|
||||||
public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
||||||
{
|
{
|
||||||
|
|
@ -415,6 +443,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 bool|void
|
||||||
*/
|
*/
|
||||||
public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
||||||
{
|
{
|
||||||
|
|
@ -427,26 +457,29 @@ 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
|
||||||
|
|
@ -457,7 +490,4 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -8,19 +8,17 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty Resource Data Object
|
* Smarty Resource Data Object
|
||||||
*
|
|
||||||
* Meta Data Container for Config Files
|
* Meta Data Container for Config Files
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
* @subpackage TemplateResources
|
* @subpackage TemplateResources
|
||||||
* @author Rodney Rehm
|
* @author Rodney Rehm
|
||||||
*
|
|
||||||
* @property string $content
|
* @property string $content
|
||||||
* @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
|
||||||
*
|
*
|
||||||
|
|
@ -52,6 +50,7 @@ class Smarty_Config_Source extends Smarty_Template_Source {
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -72,6 +71,8 @@ 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
|
||||||
|
*
|
||||||
|
* @return mixed|void
|
||||||
* @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 +81,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':
|
||||||
|
|
@ -89,7 +91,4 @@ class Smarty_Config_Source extends Smarty_Template_Source {
|
||||||
throw new SmartyException("config property '$property_name' does not exist.");
|
throw new SmartyException("config property '$property_name' does not exist.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -10,19 +10,19 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class does contain all necessary methods for the HTML cache on file system
|
* This class does contain all necessary methods for the HTML cache on file system
|
||||||
*
|
|
||||||
* Implements the file system as resource for the HTML cache Version ussing nocache inserts.
|
* Implements the file system as resource for the HTML cache Version ussing nocache inserts.
|
||||||
*
|
*
|
||||||
* @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
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -69,6 +69,7 @@ class Smarty_Internal_CacheResource_File 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)
|
||||||
|
|
@ -82,11 +83,16 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 booleantrue 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)
|
||||||
{
|
{
|
||||||
|
/** @var Smarty_Internal_Template $_smarty_tpl
|
||||||
|
* used in included file
|
||||||
|
*/
|
||||||
$_smarty_tpl = $_template;
|
$_smarty_tpl = $_template;
|
||||||
|
|
||||||
return @include $_template->cached->filepath;
|
return @include $_template->cached->filepath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -95,6 +101,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -106,14 +113,16 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Empty cache
|
* Empty cache
|
||||||
*
|
*
|
||||||
* @param Smarty_Internal_Template $_template template object
|
* @param Smarty $smarty
|
||||||
* @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)
|
||||||
|
|
@ -124,11 +133,12 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
/**
|
/**
|
||||||
* Empty cache for a specific template
|
* Empty cache for a specific template
|
||||||
*
|
*
|
||||||
* @param Smarty $_template template object
|
* @param Smarty $smarty
|
||||||
* @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)
|
||||||
|
|
@ -137,7 +147,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
$_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
|
$_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
|
||||||
$_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
|
$_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
|
||||||
$_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
|
$_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
|
||||||
$_dir = $smarty->getCacheDir();
|
$_dir = realpath($smarty->getCacheDir()) . '/';
|
||||||
$_dir_length = strlen($_dir);
|
$_dir_length = strlen($_dir);
|
||||||
if (isset($_cache_id)) {
|
if (isset($_cache_id)) {
|
||||||
$_cache_id_parts = explode('|', $_cache_id);
|
$_cache_id_parts = explode('|', $_cache_id);
|
||||||
|
|
@ -178,7 +188,9 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
$_cacheDirs = new RecursiveDirectoryIterator($_dir);
|
$_cacheDirs = new RecursiveDirectoryIterator($_dir);
|
||||||
$_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
|
$_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
|
||||||
foreach ($_cache as $_file) {
|
foreach ($_cache as $_file) {
|
||||||
if (substr($_file->getBasename(),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
|
if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
// directory ?
|
// directory ?
|
||||||
if ($_file->isDir()) {
|
if ($_file->isDir()) {
|
||||||
if (!$_cache->isDot()) {
|
if (!$_cache->isDot()) {
|
||||||
|
|
@ -206,17 +218,29 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
for ($i = 0; $i < $_cache_id_parts_count; $i ++) {
|
for ($i = 0; $i < $_cache_id_parts_count; $i ++) {
|
||||||
if ($_parts[$i] != $_cache_id_parts[$i]) continue 2;
|
if ($_parts[$i] != $_cache_id_parts[$i]) {
|
||||||
|
continue 2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// expired ?
|
// expired ?
|
||||||
if (isset($exp_time) && $_time - @filemtime($_file) < $exp_time) {
|
if (isset($exp_time)) {
|
||||||
|
if ($exp_time < 0) {
|
||||||
|
preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match);
|
||||||
|
if ($_time < (@filemtime($_file) + $match[1])) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
if ($_time - @filemtime($_file) < $exp_time) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
$_count += @unlink((string) $_file) ? 1 : 0;
|
$_count += @unlink((string) $_file) ? 1 : 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $_count;
|
return $_count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -225,7 +249,8 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 boolean 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)
|
||||||
{
|
{
|
||||||
|
|
@ -235,6 +260,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -243,6 +269,8 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 bool|void
|
||||||
*/
|
*/
|
||||||
public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
||||||
{
|
{
|
||||||
|
|
@ -255,6 +283,8 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
*
|
*
|
||||||
* @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 bool|void
|
||||||
*/
|
*/
|
||||||
public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
|
||||||
{
|
{
|
||||||
|
|
@ -262,5 +292,3 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
|
||||||
@unlink($cached->lock_id);
|
@unlink($cached->lock_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Append
|
* Smarty Internal Plugin Compile Append
|
||||||
*
|
|
||||||
* Compiles the {append} tag
|
* Compiles the {append} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,14 +14,15 @@
|
||||||
* @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)
|
||||||
|
|
@ -47,7 +47,4 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
|
||||||
// call compile assign
|
// call compile assign
|
||||||
return parent::compile($_new_attr, $compiler, $_params);
|
return parent::compile($_new_attr, $compiler, $_params);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Assign
|
* Smarty Internal Plugin Compile Assign
|
||||||
*
|
|
||||||
* Compiles the {assign} tag
|
* Compiles the {assign} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,14 +14,15 @@
|
||||||
* @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)
|
||||||
|
|
@ -39,8 +39,12 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
|
||||||
if ($compiler->tag_nocache || $compiler->nocache) {
|
if ($compiler->tag_nocache || $compiler->nocache) {
|
||||||
$_nocache = 'true';
|
$_nocache = 'true';
|
||||||
// create nocache var to make it know for further compiling
|
// create nocache var to make it know for further compiling
|
||||||
|
if (isset($compiler->template->tpl_vars[trim($_attr['var'], "'")])) {
|
||||||
|
$compiler->template->tpl_vars[trim($_attr['var'], "'")]->nocache = true;
|
||||||
|
} else {
|
||||||
$compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true);
|
$compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// scope setup
|
// scope setup
|
||||||
if (isset($_attr['scope'])) {
|
if (isset($_attr['scope'])) {
|
||||||
$_attr['scope'] = trim($_attr['scope'], "'\"");
|
$_attr['scope'] = trim($_attr['scope'], "'\"");
|
||||||
|
|
@ -76,9 +80,7 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
|
||||||
$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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Block
|
* Smarty Internal Plugin Compile Block
|
||||||
*
|
|
||||||
* Compiles the {block}{/block} tags
|
* Compiles the {block}{/block} tags
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -16,8 +15,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 +33,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,109 +41,76 @@ 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);
|
||||||
|
// 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}' type='{$compiler->template->source->type}' resource='{$compiler->template->template_resource}'" .
|
||||||
|
" 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
|
// set flag for {block} tag
|
||||||
$compiler->inheritance = true;
|
$compiler->inheritance = true;
|
||||||
|
$compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
|
||||||
|
$compiler->has_code = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
// 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 . '" "' . htmlspecialchars($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}
|
|
||||||
// do we have {$smart.block.child} in nested {block} tags?
|
|
||||||
if (0 != preg_match_all("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")([\s\S]*?)(hide)?(\s*{$_rdl})([\s\S]*?)({$_ldl}{$al}\\\$smarty\.block\.child{$_rdl})([\s\S]*?{$_ldl}{$al}/block{$_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
|
|
||||||
$search = array("%({$_ldl}{$al}block[\s\S]*?{$name}[\s\S]*?{$_rdl})([\s\S]*?)({$_ldl}{$al}\\\$smarty\.block\.child{$_rdl})([\s\S]*?)({$_ldl}{$al}/block{$_rdl})%", "/§§§child§§§/");
|
|
||||||
$replace = array('\2§§§child§§§\4', $replacement);
|
|
||||||
$block_content = preg_replace($search, $replace, $block_content);
|
|
||||||
} else {
|
|
||||||
// remove hidden blocks
|
|
||||||
$block_content = preg_replace("%({$_ldl}{$al}block[\s\S]*?{$name}[\s\S]*?{$_rdl}[\s\S]*?{$_ldl}{$al}/block{$_rdl})%", '', $block_content);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// do we have not nested {$smart.block.child}
|
|
||||||
if (0 != preg_match("/({$_ldl}{$al}\\\$smarty\.block\.child{$_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{$_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';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -150,51 +118,65 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
|
||||||
*
|
*
|
||||||
* @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 = null, $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->tpl_vars = $compiler->template->tpl_vars;
|
||||||
$_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->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']);
|
||||||
|
|
@ -216,9 +198,53 @@ 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 child 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 $compiler
|
||||||
|
* @param string $source source text
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
static function blockSource($compiler, $source)
|
||||||
|
{
|
||||||
|
Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= $source;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -227,51 +253,186 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
|
||||||
* @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}";
|
||||||
|
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();
|
||||||
}
|
}
|
||||||
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', 'type', 'resource');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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);
|
||||||
|
|
||||||
|
// update template with original template resource of {block}
|
||||||
|
if (trim($_attr['type'], "'") == 'file') {
|
||||||
|
$compiler->template->template_resource = realpath(trim($_attr['file'], "'"));
|
||||||
|
} else {
|
||||||
|
$compiler->template->template_resource = trim($_attr['resource'], "'");
|
||||||
|
}
|
||||||
|
// source object
|
||||||
|
unset ($compiler->template->source);
|
||||||
|
$exists = $compiler->template->source->exists;
|
||||||
|
|
||||||
|
// 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,21 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Break
|
* Smarty Internal Plugin Compile Break
|
||||||
*
|
|
||||||
* Compiles the {break} tag
|
* Compiles the {break} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
* @subpackage Compiler
|
* @subpackage Compiler
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Break Class
|
* Smarty Internal Plugin Compile Break Class
|
||||||
*
|
*
|
||||||
* @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.
|
||||||
*
|
*
|
||||||
|
|
@ -37,6 +37,7 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
|
||||||
* @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 +69,7 @@ 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}?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Function_Call
|
* Smarty Internal Plugin Compile Function_Call
|
||||||
*
|
|
||||||
* Compiles the calls of user defined tags defined by {function}
|
* Compiles the calls of user defined tags defined by {function}
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -44,7 +43,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
|
||||||
*
|
*
|
||||||
* @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
|
*
|
||||||
* @return string compiled code
|
* @return string compiled code
|
||||||
*/
|
*/
|
||||||
public function compile($args, $compiler)
|
public function compile($args, $compiler)
|
||||||
|
|
@ -53,7 +52,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
|
||||||
$_attr = $this->getAttributes($compiler, $args);
|
$_attr = $this->getAttributes($compiler, $args);
|
||||||
// save possible attributes
|
// save possible attributes
|
||||||
if (isset($_attr['assign'])) {
|
if (isset($_attr['assign'])) {
|
||||||
// output will be stored in a smarty variable instead of beind displayed
|
// output will be stored in a smarty variable instead of being displayed
|
||||||
$_assign = $_attr['assign'];
|
$_assign = $_attr['assign'];
|
||||||
}
|
}
|
||||||
$_name = $_attr['name'];
|
$_name = $_attr['name'];
|
||||||
|
|
@ -96,7 +95,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//varibale name?
|
//variable name?
|
||||||
if (!(strpos($_name, '$') === false)) {
|
if (!(strpos($_name, '$') === false)) {
|
||||||
$call_cache = $_name;
|
$call_cache = $_name;
|
||||||
$call_function = '$tmp = "smarty_template_function_".' . $_name . '; $tmp';
|
$call_function = '$tmp = "smarty_template_function_".' . $_name . '; $tmp';
|
||||||
|
|
@ -122,9 +121,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Capture
|
* Smarty Internal Plugin Compile Capture
|
||||||
*
|
|
||||||
* Compiles the {capture} tag
|
* Compiles the {capture} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -37,6 +36,7 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -55,7 +55,6 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
|
||||||
|
|
||||||
return $_output;
|
return $_output;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -64,13 +63,14 @@ 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,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Config Load
|
* Smarty Internal Plugin Compile Config Load
|
||||||
*
|
|
||||||
* Compiles the {config load} tag
|
* Compiles the {config load} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -44,6 +43,7 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
|
||||||
*
|
*
|
||||||
* @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,8 +56,7 @@ 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 possible attributes
|
||||||
// save posible attributes
|
|
||||||
$conf_file = $_attr['file'];
|
$conf_file = $_attr['file'];
|
||||||
if (isset($_attr['section'])) {
|
if (isset($_attr['section'])) {
|
||||||
$section = $_attr['section'];
|
$section = $_attr['section'];
|
||||||
|
|
@ -77,9 +76,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Continue
|
* Smarty Internal Plugin Compile Continue
|
||||||
*
|
|
||||||
* Compiles the {continue} tag
|
* Compiles the {continue} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -38,6 +37,7 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
|
||||||
* @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,7 @@ 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}?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Debug
|
* Smarty Internal Plugin Compile Debug
|
||||||
*
|
|
||||||
* Compiles the {debug} tag.
|
* Compiles the {debug} tag.
|
||||||
* It opens a window the the Smarty Debugging Console.
|
* It opens a window the the Smarty Debugging Console.
|
||||||
*
|
*
|
||||||
|
|
@ -16,13 +15,14 @@
|
||||||
* @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,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Eval
|
* Smarty Internal Plugin Compile Eval
|
||||||
*
|
|
||||||
* Compiles the {eval} tag.
|
* Compiles the {eval} tag.
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -44,6 +43,7 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -53,7 +53,7 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
|
||||||
// check and get attributes
|
// check and get attributes
|
||||||
$_attr = $this->getAttributes($compiler, $args);
|
$_attr = $this->getAttributes($compiler, $args);
|
||||||
if (isset($_attr['assign'])) {
|
if (isset($_attr['assign'])) {
|
||||||
// output will be stored in a smarty variable instead of beind displayed
|
// output will be stored in a smarty variable instead of being displayed
|
||||||
$_assign = $_attr['assign'];
|
$_assign = $_attr['assign'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -65,9 +65,7 @@ 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 ?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile extend
|
* Smarty Internal Plugin Compile extend
|
||||||
*
|
|
||||||
* Compiles the {extends} tag
|
* Compiles the {extends} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -16,8 +15,8 @@
|
||||||
* @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.
|
||||||
*
|
*
|
||||||
|
|
@ -32,97 +31,55 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase {
|
||||||
* @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);
|
|
||||||
$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'] . ';');
|
|
||||||
|
$name = $_attr['file'];
|
||||||
|
/** @var Smarty_Internal_Template $_smarty_tpl
|
||||||
|
* used in evaluated code
|
||||||
|
*/
|
||||||
|
$_smarty_tpl = $compiler->template;
|
||||||
|
eval("\$tpl_name = $name;");
|
||||||
// create template object
|
// create template object
|
||||||
$_template = new $compiler->smarty->template_class($include_file, $compiler->smarty, $compiler->template);
|
$_template = new $compiler->smarty->template_class($tpl_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\"", $compiler->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);
|
||||||
|
$uid = $source->uid;
|
||||||
|
if (isset($compiler->extends_uid[$uid])) {
|
||||||
|
$compiler->trigger_template_error("illegal recursive call of \"{$source->filepath}\"", $compiler->lex->line - 1);
|
||||||
}
|
}
|
||||||
if (isset($compiler->template->properties['file_dependency'][$template_sha1])) {
|
$compiler->extends_uid[$uid] = true;
|
||||||
$compiler->trigger_template_error("illegal recursive call of \"{$include_file}\"", $compiler->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->template->source->content, $compiler->lex->counter - 1, 20000000, 'latin1') : substr($compiler->template->source->content, $compiler->lex->counter - 1));
|
|
||||||
if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $s) !=
|
|
||||||
preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $c)) {
|
|
||||||
$compiler->trigger_template_error('unmatched {block} {/block} pairs');
|
|
||||||
}
|
|
||||||
preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$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], '/')) {
|
|
||||||
$_level++;
|
|
||||||
} else {
|
|
||||||
$_level--;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$_block_content = str_replace($compiler->smarty->left_delimiter . '$smarty.block.parent' . $compiler->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
|
unset ($_template);
|
||||||
($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]))));
|
$compiler->inheritance_child = true;
|
||||||
Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath);
|
$compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
|
||||||
$_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;
|
|
||||||
$compiler->abort_and_recompile = true;
|
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile For
|
* Smarty Internal Plugin Compile For
|
||||||
*
|
|
||||||
* Compiles the {for} {forelse} {/for} tags
|
* Compiles the {for} {forelse} {/for} tags
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,25 +14,22 @@
|
||||||
* @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
|
||||||
*
|
* Smarty 3 does implement two different syntax's:
|
||||||
* Smarty 3 does implement two different sytaxes:
|
|
||||||
*
|
|
||||||
* - {for $var in $array}
|
* - {for $var in $array}
|
||||||
* For looping over arrays or iterators
|
* For looping over arrays or iterators
|
||||||
*
|
|
||||||
* - {for $x=0; $x<$y; $x++}
|
* - {for $x=0; $x<$y; $x++}
|
||||||
* For general loops
|
* For general loops
|
||||||
*
|
* The parser is generating different sets of attribute by which this compiler can
|
||||||
* The parser is gereration different sets of attribute by which this compiler can
|
* determine 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)
|
||||||
|
|
@ -81,7 +77,6 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
|
||||||
// return compiled code
|
// return compiled code
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -90,14 +85,15 @@ 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,9 +103,9 @@ 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 +114,15 @@ 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)
|
||||||
|
|
@ -145,7 +142,4 @@ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase {
|
||||||
return "<?php }} ?>";
|
return "<?php }} ?>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Foreach
|
* Smarty Internal Plugin Compile Foreach
|
||||||
*
|
|
||||||
* Compiles the {foreach} {foreachelse} {/foreach} tags
|
* Compiles the {foreach} {foreachelse} {/foreach} tags
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,7 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -44,11 +44,11 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
|
||||||
* @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)
|
||||||
{
|
{
|
||||||
$tpl = $compiler->template;
|
|
||||||
// check and get attributes
|
// check and get attributes
|
||||||
$_attr = $this->getAttributes($compiler, $args);
|
$_attr = $this->getAttributes($compiler, $args);
|
||||||
|
|
||||||
|
|
@ -79,12 +79,12 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
|
||||||
$ItemVarName = '$' . trim($item, '\'"') . '@';
|
$ItemVarName = '$' . trim($item, '\'"') . '@';
|
||||||
// evaluates which Smarty variables and properties have to be computed
|
// evaluates which Smarty variables and properties have to be computed
|
||||||
if ($has_name) {
|
if ($has_name) {
|
||||||
$usesSmartyFirst = strpos($tpl->source->content, $SmartyVarName . 'first') !== false;
|
$usesSmartyFirst = strpos($compiler->lex->data, $SmartyVarName . 'first') !== false;
|
||||||
$usesSmartyLast = strpos($tpl->source->content, $SmartyVarName . 'last') !== false;
|
$usesSmartyLast = strpos($compiler->lex->data, $SmartyVarName . 'last') !== false;
|
||||||
$usesSmartyIndex = strpos($tpl->source->content, $SmartyVarName . 'index') !== false;
|
$usesSmartyIndex = strpos($compiler->lex->data, $SmartyVarName . 'index') !== false;
|
||||||
$usesSmartyIteration = strpos($tpl->source->content, $SmartyVarName . 'iteration') !== false;
|
$usesSmartyIteration = strpos($compiler->lex->data, $SmartyVarName . 'iteration') !== false;
|
||||||
$usesSmartyShow = strpos($tpl->source->content, $SmartyVarName . 'show') !== false;
|
$usesSmartyShow = strpos($compiler->lex->data, $SmartyVarName . 'show') !== false;
|
||||||
$usesSmartyTotal = strpos($tpl->source->content, $SmartyVarName . 'total') !== false;
|
$usesSmartyTotal = strpos($compiler->lex->data, $SmartyVarName . 'total') !== false;
|
||||||
} else {
|
} else {
|
||||||
$usesSmartyFirst = false;
|
$usesSmartyFirst = false;
|
||||||
$usesSmartyLast = false;
|
$usesSmartyLast = false;
|
||||||
|
|
@ -92,12 +92,12 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
|
||||||
$usesSmartyShow = false;
|
$usesSmartyShow = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$usesPropFirst = $usesSmartyFirst || strpos($tpl->source->content, $ItemVarName . 'first') !== false;
|
$usesPropFirst = $usesSmartyFirst || strpos($compiler->lex->data, $ItemVarName . 'first') !== false;
|
||||||
$usesPropLast = $usesSmartyLast || strpos($tpl->source->content, $ItemVarName . 'last') !== false;
|
$usesPropLast = $usesSmartyLast || strpos($compiler->lex->data, $ItemVarName . 'last') !== false;
|
||||||
$usesPropIndex = $usesPropFirst || strpos($tpl->source->content, $ItemVarName . 'index') !== false;
|
$usesPropIndex = $usesPropFirst || strpos($compiler->lex->data, $ItemVarName . 'index') !== false;
|
||||||
$usesPropIteration = $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'iteration') !== false;
|
$usesPropIteration = $usesPropLast || strpos($compiler->lex->data, $ItemVarName . 'iteration') !== false;
|
||||||
$usesPropShow = strpos($tpl->source->content, $ItemVarName . 'show') !== false;
|
$usesPropShow = strpos($compiler->lex->data, $ItemVarName . 'show') !== false;
|
||||||
$usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'total') !== false;
|
$usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($compiler->lex->data, $ItemVarName . 'total') !== false;
|
||||||
// generate output code
|
// generate output code
|
||||||
$output = "<?php ";
|
$output = "<?php ";
|
||||||
$output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable; \$_smarty_tpl->tpl_vars[$item]->_loop = false;\n";
|
$output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable; \$_smarty_tpl->tpl_vars[$item]->_loop = false;\n";
|
||||||
|
|
@ -173,14 +173,15 @@ 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)
|
||||||
|
|
@ -193,7 +194,6 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase {
|
||||||
|
|
||||||
return "<?php }\nif (!\$_smarty_tpl->tpl_vars[$item]->_loop) {\n?>";
|
return "<?php }\nif (!\$_smarty_tpl->tpl_vars[$item]->_loop) {\n?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -202,14 +202,15 @@ 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)
|
||||||
|
|
@ -225,7 +226,4 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase {
|
||||||
|
|
||||||
return "<?php } ?>";
|
return "<?php } ?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Function
|
* Smarty Internal Plugin Compile Function
|
||||||
*
|
|
||||||
* Compiles the {function} {/function} tags
|
* Compiles the {function} {/function} tags
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -45,6 +44,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
|
||||||
* @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)
|
||||||
|
|
@ -64,6 +64,9 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
|
||||||
// set flag that we are compiling a template function
|
// set flag that we are compiling a template function
|
||||||
$compiler->compiles_template_function = true;
|
$compiler->compiles_template_function = true;
|
||||||
$compiler->template->properties['function'][$_name]['parameter'] = array();
|
$compiler->template->properties['function'][$_name]['parameter'] = array();
|
||||||
|
/** @var Smarty_Internal_Template $_smarty_tpl
|
||||||
|
* used in evaluated code
|
||||||
|
*/
|
||||||
$_smarty_tpl = $compiler->template;
|
$_smarty_tpl = $compiler->template;
|
||||||
foreach ($_attr as $_key => $_data) {
|
foreach ($_attr as $_key => $_data) {
|
||||||
eval ('$tmp=' . $_data . ';');
|
eval ('$tmp=' . $_data . ';');
|
||||||
|
|
@ -79,7 +82,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
|
||||||
foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
|
foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
|
||||||
foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
|
foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
|
||||||
}
|
}
|
||||||
// Init temporay context
|
// Init temporary context
|
||||||
$compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
|
$compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
|
||||||
$compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
|
$compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
|
||||||
$compiler->parser->current_buffer->append_subtree(new _smarty_tag($compiler->parser, $output));
|
$compiler->parser->current_buffer->append_subtree(new _smarty_tag($compiler->parser, $output));
|
||||||
|
|
@ -88,7 +91,6 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
|
||||||
$compiler->template->properties['function'][$_name]['compiled'] = '';
|
$compiler->template->properties['function'][$_name]['compiled'] = '';
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -97,14 +99,15 @@ 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)
|
||||||
|
|
@ -149,7 +152,8 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
|
||||||
$compiler->has_code = false;
|
$compiler->has_code = false;
|
||||||
$output = true;
|
$output = true;
|
||||||
} else {
|
} else {
|
||||||
$output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}}?>\n";
|
$output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;
|
||||||
|
foreach (Smarty::\$global_tpl_vars as \$key => \$value) if(!isset(\$_smarty_tpl->tpl_vars[\$key])) \$_smarty_tpl->tpl_vars[\$key] = \$value;}}?>\n";
|
||||||
}
|
}
|
||||||
// reset flag that we are compiling a template function
|
// reset flag that we are compiling a template function
|
||||||
$compiler->compiles_template_function = false;
|
$compiler->compiles_template_function = false;
|
||||||
|
|
@ -157,9 +161,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
|
||||||
$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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile If
|
* Smarty Internal Plugin Compile If
|
||||||
*
|
|
||||||
* Compiles the {if} {else} {elseif} {/if} tags
|
* Compiles the {if} {else} {elseif} {/if} tags
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,14 +14,15 @@
|
||||||
* @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
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -56,12 +56,12 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
|
||||||
$_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,14 +70,15 @@ 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
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -87,7 +88,6 @@ class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase {
|
||||||
|
|
||||||
return "<?php } else { ?>";
|
return "<?php } else { ?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -96,14 +96,15 @@ 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
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -144,15 +145,18 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
|
||||||
$_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 = '';
|
||||||
foreach ($compiler->prefix_code as $code)
|
foreach ($compiler->prefix_code as $code) {
|
||||||
$tmp .= $code;
|
$tmp .= $code;
|
||||||
|
}
|
||||||
$compiler->prefix_code = array();
|
$compiler->prefix_code = array();
|
||||||
$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) {
|
||||||
|
|
@ -163,13 +167,13 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
|
||||||
$_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,14 +182,15 @@ 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
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -199,9 +204,7 @@ 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}?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Include
|
* Smarty Internal Plugin Compile Include
|
||||||
*
|
|
||||||
* Compiles the {include} tag
|
* Compiles the {include} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,8 @@
|
||||||
* @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
|
||||||
*/
|
*/
|
||||||
|
|
@ -56,17 +55,18 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
|
||||||
* @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);
|
||||||
// save posible attributes
|
// save possible attributes
|
||||||
$include_file = $_attr['file'];
|
$include_file = $_attr['file'];
|
||||||
|
|
||||||
if (isset($_attr['assign'])) {
|
if (isset($_attr['assign'])) {
|
||||||
// output will be stored in a smarty variable instead of beind displayed
|
// output will be stored in a smarty variable instead of being displayed
|
||||||
$_assign = $_attr['assign'];
|
$_assign = $_attr['assign'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -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;
|
||||||
}
|
|
||||||
// default for included templates
|
// flag if included template code should be merged into caller
|
||||||
if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
|
$merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) || $_attr['inline'] === true) && !$compiler->template->source->recompiled;
|
||||||
|
|
||||||
|
// 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,32 +121,73 @@ 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) {
|
||||||
|
$_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 && $_attr['inline'] !== true) {
|
||||||
&& !($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) {
|
) {
|
||||||
|
$merge_compiled_includes = false;
|
||||||
|
if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) {
|
||||||
|
$compiler->trigger_template_error(' variable template file names not allow within {block} tags');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 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->smarty->inheritance_merge_compiled_includes) {
|
||||||
|
$compiler->trigger_template_error(' variable compile_id not allow within {block} tags');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($merge_compiled_includes) {
|
||||||
|
if ($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache) && $_caching != self::CACHING_NOCACHE_CODE) {
|
||||||
|
$merge_compiled_includes = false;
|
||||||
|
if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) {
|
||||||
|
$compiler->trigger_template_error(' invalid caching mode of subtemplate within {block} tags');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($merge_compiled_includes) {
|
||||||
|
// we must observe different compile_id
|
||||||
|
$uid = sha1($_compile_id);
|
||||||
$tpl_name = null;
|
$tpl_name = null;
|
||||||
|
$nocache = false;
|
||||||
|
/** @var Smarty_Internal_Template $_smarty_tpl
|
||||||
|
* used in evaluated code
|
||||||
|
*/
|
||||||
|
$_smarty_tpl = $compiler->template;
|
||||||
eval("\$tpl_name = $include_file;");
|
eval("\$tpl_name = $include_file;");
|
||||||
if (!isset($compiler->smarty->merged_templates_func[$tpl_name]) || $compiler->inheritance) {
|
if (!isset($compiler->smarty->merged_templates_func[$tpl_name][$uid])) {
|
||||||
$tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
|
$tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
|
||||||
// save unique function name
|
// save unique function name
|
||||||
$compiler->smarty->merged_templates_func[$tpl_name]['func'] = $tpl->properties['unifunc'] = 'content_'. str_replace('.', '_', uniqid('', true));
|
$compiler->smarty->merged_templates_func[$tpl_name][$uid]['func'] = $tpl->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
|
||||||
// use current nocache hash for inlined code
|
// 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'];
|
$compiler->smarty->merged_templates_func[$tpl_name][$uid]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
|
||||||
if ($compiler->template->caching) {
|
if ($compiler->template->caching && $_caching == self::CACHING_NOCACHE_CODE) {
|
||||||
// needs code for cached page but no cache file
|
// all code must be nocache
|
||||||
$tpl->caching = self::CACHING_NOCACHE_CODE;
|
$nocache = true;
|
||||||
}
|
}
|
||||||
// make sure whole chain gest compiled
|
if ($compiler->inheritance) {
|
||||||
|
$tpl->compiler->inheritance = true;
|
||||||
|
}
|
||||||
|
// make sure whole chain gets compiled
|
||||||
$tpl->mustCompile = true;
|
$tpl->mustCompile = true;
|
||||||
if (!($tpl->source->uncompiled) && $tpl->source->exists) {
|
if (!($tpl->source->uncompiled) && $tpl->source->exists) {
|
||||||
|
|
||||||
// get compiled code
|
// get compiled code
|
||||||
$compiled_code = $tpl->compiler->compileTemplate($tpl);
|
$compiled_code = $tpl->compiler->compileTemplate($tpl, $nocache);
|
||||||
// release compiler object to free memory
|
// release compiler object to free memory
|
||||||
unset($tpl->compiler);
|
unset($tpl->compiler);
|
||||||
// merge compiled code for {function} tags
|
// merge compiled code for {function} tags
|
||||||
|
|
@ -160,44 +204,52 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
|
||||||
}
|
}
|
||||||
$compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
|
$compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
|
||||||
$has_compiled_template = true;
|
$has_compiled_template = true;
|
||||||
|
unset ($tpl);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$has_compiled_template = true;
|
$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']);
|
||||||
// remaining attributes must be assigned as smarty variable
|
// remaining attributes must be assigned as smarty variable
|
||||||
if (!empty($_attr)) {
|
if (!empty($_attr)) {
|
||||||
if ($_parent_scope == Smarty::SCOPE_LOCAL) {
|
if ($_parent_scope == Smarty::SCOPE_LOCAL) {
|
||||||
// create variables
|
// create variables
|
||||||
|
$nccode = '';
|
||||||
foreach ($_attr as $key => $value) {
|
foreach ($_attr as $key => $value) {
|
||||||
$_pairs[] = "'$key'=>$value";
|
$_pairs[] = "'$key'=>$value";
|
||||||
|
$nccode .= "\$_smarty_tpl->tpl_vars['$key'] = new Smarty_variable($value);\n";
|
||||||
}
|
}
|
||||||
$_vars = 'array(' . join(',', $_pairs) . ')';
|
$_vars = 'array(' . join(',', $_pairs) . ')';
|
||||||
$_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);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$_vars = 'array()';
|
$_vars = 'array()';
|
||||||
$_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";
|
||||||
|
if (!empty($nccode) && $_caching == 9999 && $_smarty_tpl->caching) {
|
||||||
|
$compiler->suppressNocacheProcessing = false;
|
||||||
|
$_output .= substr($compiler->processNocacheCode('<?php ' .$nccode . "?>\n", true), 6, -3);
|
||||||
|
$compiler->suppressNocacheProcessing = true;
|
||||||
|
}
|
||||||
$_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 +259,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Include PHP
|
* Smarty Internal Plugin Compile Include PHP
|
||||||
*
|
|
||||||
* Compiles the {include_php} tag
|
* Compiles the {include_php} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -44,6 +43,8 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
|
||||||
*
|
*
|
||||||
* @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
|
||||||
|
*
|
||||||
|
* @throws SmartyException
|
||||||
* @return string compiled code
|
* @return string compiled code
|
||||||
*/
|
*/
|
||||||
public function compile($args, $compiler)
|
public function compile($args, $compiler)
|
||||||
|
|
@ -54,8 +55,9 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
|
||||||
// check and get attributes
|
// check and get attributes
|
||||||
$_attr = $this->getAttributes($compiler, $args);
|
$_attr = $this->getAttributes($compiler, $args);
|
||||||
|
|
||||||
$_output = '<?php ';
|
/** @var Smarty_Internal_Template $_smarty_tpl
|
||||||
|
* used in evaluated code
|
||||||
|
*/
|
||||||
$_smarty_tpl = $compiler->template;
|
$_smarty_tpl = $compiler->template;
|
||||||
$_filepath = false;
|
$_filepath = false;
|
||||||
eval('$_file = ' . $_attr['file'] . ';');
|
eval('$_file = ' . $_attr['file'] . ';');
|
||||||
|
|
@ -102,7 +104,4 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
|
||||||
return "<?php include{$_once} ('{$_filepath}');?>\n";
|
return "<?php include{$_once} ('{$_filepath}');?>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Insert
|
* Smarty Internal Plugin Compile Insert
|
||||||
*
|
|
||||||
* Compiles the {insert} tag
|
* Compiles the {insert} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -16,8 +15,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.
|
||||||
*
|
*
|
||||||
|
|
@ -45,6 +44,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -59,12 +59,12 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
|
||||||
$_script = null;
|
$_script = null;
|
||||||
|
|
||||||
$_output = '<?php ';
|
$_output = '<?php ';
|
||||||
// save posible attributes
|
// save possible attributes
|
||||||
eval('$_name = ' . $_attr['name'] . ';');
|
eval('$_name = ' . $_attr['name'] . ';');
|
||||||
if (isset($_attr['assign'])) {
|
if (isset($_attr['assign'])) {
|
||||||
// output will be stored in a smarty variable instead of being displayed
|
// output will be stored in a smarty variable instead of being displayed
|
||||||
$_assign = $_attr['assign'];
|
$_assign = $_attr['assign'];
|
||||||
// create variable to make shure that the compiler knows about its nocache status
|
// create variable to make sure that the compiler knows about its nocache status
|
||||||
$compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true);
|
$compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true);
|
||||||
}
|
}
|
||||||
if (isset($_attr['script'])) {
|
if (isset($_attr['script'])) {
|
||||||
|
|
@ -134,9 +134,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Ldelim
|
* Smarty Internal Plugin Compile Ldelim
|
||||||
*
|
|
||||||
* Compiles the {ldelim} tag
|
* Compiles the {ldelim} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,14 +14,15 @@
|
||||||
* @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,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Nocache
|
* Smarty Internal Plugin Compile Nocache
|
||||||
*
|
|
||||||
* Compiles the {nocache} {/nocache} tags.
|
* Compiles the {nocache} {/nocache} tags.
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -10,20 +9,20 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Nocache Classv
|
* Smarty Internal Plugin Compile Nocache Class
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -36,9 +35,9 @@ class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase {
|
||||||
$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,15 +46,15 @@ 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)
|
||||||
|
|
@ -65,9 +64,7 @@ class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase {
|
||||||
$compiler->nocache = false;
|
$compiler->nocache = false;
|
||||||
// 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Block Plugin
|
* Smarty Internal Plugin Compile Block Plugin
|
||||||
*
|
|
||||||
* Compiles code for the execution of block plugin
|
* Compiles code for the execution of block plugin
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -33,6 +32,7 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
|
||||||
* @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,7 @@ 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";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Function Plugin
|
* Smarty Internal Plugin Compile Function Plugin
|
||||||
*
|
|
||||||
* Compiles code for the execution of function plugin
|
* Compiles code for the execution of function plugin
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -40,6 +39,7 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
|
||||||
* @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,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Modifier
|
* Smarty Internal Plugin Compile Modifier
|
||||||
*
|
|
||||||
* Compiles code for modifier execution
|
* Compiles code for modifier execution
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -16,17 +15,19 @@
|
||||||
* @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,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Object Block Function
|
* Smarty Internal Plugin Compile Object Block Function
|
||||||
*
|
|
||||||
* Compiles code for registered objects as block function
|
* Compiles code for registered objects as block function
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -33,6 +32,7 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
|
||||||
* @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,7 @@ 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";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Object Funtion
|
* Smarty Internal Plugin Compile Object Function
|
||||||
*
|
|
||||||
* Compiles code for registered objects as function
|
* Compiles code for registered objects as function
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -33,6 +32,7 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
|
||||||
* @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,6 +48,8 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
|
||||||
$_assign = $_attr['assign'];
|
$_assign = $_attr['assign'];
|
||||||
unset($_attr['assign']);
|
unset($_attr['assign']);
|
||||||
}
|
}
|
||||||
|
// method or property ?
|
||||||
|
if (method_exists($compiler->smarty->registered_objects[$tag][0], $method)) {
|
||||||
// convert attributes into parameter array string
|
// convert attributes into parameter array string
|
||||||
if ($compiler->smarty->registered_objects[$tag][2]) {
|
if ($compiler->smarty->registered_objects[$tag][2]) {
|
||||||
$_paramsArray = array();
|
$_paramsArray = array();
|
||||||
|
|
@ -64,6 +66,11 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
|
||||||
$_params = implode(",", $_attr);
|
$_params = implode(",", $_attr);
|
||||||
$return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
|
$return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// object property
|
||||||
|
$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,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Print Expression
|
* Smarty Internal Plugin Compile Print Expression
|
||||||
*
|
|
||||||
* Compiles any tag which will output an expression or variable
|
* Compiles any tag which will output an expression or variable
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -33,11 +32,13 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
|
||||||
public $option_flags = array('nocache', 'nofilter');
|
public $option_flags = array('nocache', 'nofilter');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compiles code for gererting output from any expression
|
* Compiles code for generating output from any expression
|
||||||
*
|
*
|
||||||
* @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
|
||||||
|
*
|
||||||
|
* @throws SmartyException
|
||||||
* @return string compiled code
|
* @return string compiled code
|
||||||
*/
|
*/
|
||||||
public function compile($args, $compiler, $parameter)
|
public function compile($args, $compiler, $parameter)
|
||||||
|
|
@ -48,12 +49,6 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
|
||||||
if ($_attr['nocache'] === true) {
|
if ($_attr['nocache'] === true) {
|
||||||
$compiler->tag_nocache = true;
|
$compiler->tag_nocache = true;
|
||||||
}
|
}
|
||||||
// filter handling
|
|
||||||
if ($_attr['nofilter'] === true) {
|
|
||||||
$_filter = 'false';
|
|
||||||
} else {
|
|
||||||
$_filter = 'true';
|
|
||||||
}
|
|
||||||
if (isset($_attr['assign'])) {
|
if (isset($_attr['assign'])) {
|
||||||
// assign output to variable
|
// assign output to variable
|
||||||
$output = "<?php \$_smarty_tpl->assign({$_attr['assign']},{$parameter['value']});?>";
|
$output = "<?php \$_smarty_tpl->assign({$_attr['assign']},{$parameter['value']});?>";
|
||||||
|
|
@ -85,13 +80,13 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
|
||||||
if ($compiler->template->smarty->escape_html) {
|
if ($compiler->template->smarty->escape_html) {
|
||||||
$output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
|
$output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
|
||||||
}
|
}
|
||||||
// loop over registerd filters
|
// loop over registered filters
|
||||||
if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) {
|
if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) {
|
||||||
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)";
|
||||||
} elseif (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)";
|
||||||
}
|
}
|
||||||
|
|
@ -123,13 +118,15 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param object $compiler compiler object
|
* @param object $compiler compiler object
|
||||||
* @param string $name name of variable filter
|
* @param string $name name of variable filter
|
||||||
* @param type $output embedded output
|
* @param string $output embedded output
|
||||||
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
private function compile_output_filter($compiler, $name, $output)
|
private function compile_output_filter($compiler, $name, $output)
|
||||||
|
|
@ -148,9 +145,7 @@ 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)";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Registered Block
|
* Smarty Internal Plugin Compile Registered Block
|
||||||
*
|
|
||||||
* Compiles code for the execution of a registered block function
|
* Compiles code for the execution of a registered block function
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -32,6 +31,7 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
|
||||||
* @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)
|
||||||
|
|
@ -105,9 +105,7 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
|
||||||
$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";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Registered Function
|
* Smarty Internal Plugin Compile Registered Function
|
||||||
*
|
|
||||||
* Compiles code for the execution of a registered function
|
* Compiles code for the execution of a registered function
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -32,6 +31,7 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
|
||||||
* @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)
|
||||||
|
|
@ -73,9 +73,7 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
|
||||||
} 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Special Smarty Variable
|
* Smarty Internal Plugin Compile Special Smarty Variable
|
||||||
*
|
|
||||||
* Compiles the special $smarty variables
|
* Compiles the special $smarty variables
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,13 +14,15 @@
|
||||||
* @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 special $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
|
||||||
|
* @param $parameter
|
||||||
|
*
|
||||||
* @return string compiled code
|
* @return string compiled code
|
||||||
*/
|
*/
|
||||||
public function compile($args, $compiler, $parameter)
|
public function compile($args, $compiler, $parameter)
|
||||||
|
|
@ -70,6 +71,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,16 +79,23 @@ 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 '@' . trim($_index[1], "'");
|
|
||||||
|
return "@constant({$_index[1]})";
|
||||||
|
|
||||||
case 'config':
|
case 'config':
|
||||||
|
if (isset($_index[2])) {
|
||||||
|
return "(is_array(\$tmp = \$_smarty_tpl->getConfigVariable($_index[1])) ? \$tmp[$_index[2]] : null)";
|
||||||
|
} else {
|
||||||
return "\$_smarty_tpl->getConfigVariable($_index[1])";
|
return "\$_smarty_tpl->getConfigVariable($_index[1])";
|
||||||
|
}
|
||||||
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:
|
||||||
|
|
@ -99,9 +108,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Rdelim
|
* Smarty Internal Plugin Compile Rdelim
|
||||||
*
|
|
||||||
* Compiles the {rdelim} tag
|
* Compiles the {rdelim} tag
|
||||||
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
* @subpackage Compiler
|
* @subpackage Compiler
|
||||||
* @author Uwe Tews
|
* @author Uwe Tews
|
||||||
|
|
@ -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,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Section
|
* Smarty Internal Plugin Compile Section
|
||||||
*
|
|
||||||
* Compiles the {section} {sectionelse} {/section} tags
|
* Compiles the {section} {sectionelse} {/section} tags
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,8 +14,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.
|
||||||
*
|
*
|
||||||
|
|
@ -44,6 +43,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
|
|
@ -69,10 +69,11 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
|
||||||
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;
|
||||||
|
|
||||||
|
|
@ -91,23 +92,27 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($_attr['show']))
|
if (!isset($_attr['show'])) {
|
||||||
$output .= "{$section_props}['show'] = true;\n";
|
$output .= "{$section_props}['show'] = true;\n";
|
||||||
|
}
|
||||||
|
|
||||||
if (!isset($_attr['loop']))
|
if (!isset($_attr['loop'])) {
|
||||||
$output .= "{$section_props}['loop'] = 1;\n";
|
$output .= "{$section_props}['loop'] = 1;\n";
|
||||||
|
}
|
||||||
|
|
||||||
if (!isset($_attr['max']))
|
if (!isset($_attr['max'])) {
|
||||||
$output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
|
$output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
|
||||||
else
|
} else {
|
||||||
$output .= "if ({$section_props}['max'] < 0)\n" . " {$section_props}['max'] = {$section_props}['loop'];\n";
|
$output .= "if ({$section_props}['max'] < 0)\n" . " {$section_props}['max'] = {$section_props}['loop'];\n";
|
||||||
|
}
|
||||||
|
|
||||||
if (!isset($_attr['step']))
|
if (!isset($_attr['step'])) {
|
||||||
$output .= "{$section_props}['step'] = 1;\n";
|
$output .= "{$section_props}['step'] = 1;\n";
|
||||||
|
}
|
||||||
|
|
||||||
if (!isset($_attr['start']))
|
if (!isset($_attr['start'])) {
|
||||||
$output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
|
$output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
|
||||||
else {
|
} else {
|
||||||
$output .= "if ({$section_props}['start'] < 0)\n" . " {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . " {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
|
$output .= "if ({$section_props}['start'] < 0)\n" . " {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . " {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -131,9 +136,9 @@ 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 +147,14 @@ 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)
|
||||||
|
|
@ -161,7 +167,6 @@ class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase {
|
||||||
|
|
||||||
return "<?php endfor; else: ?>";
|
return "<?php endfor; else: ?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -170,13 +175,14 @@ 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)
|
||||||
|
|
@ -197,7 +203,4 @@ class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase {
|
||||||
return "<?php endfor; endif; ?>";
|
return "<?php endfor; endif; ?>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile Setfilter
|
* Smarty Internal Plugin Compile Setfilter
|
||||||
*
|
|
||||||
* Compiles code for setfilter tag
|
* Compiles code for setfilter tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,14 +14,15 @@
|
||||||
* @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,9 +31,9 @@ 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 +42,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 +64,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Smarty Internal Plugin Compile While
|
* Smarty Internal Plugin Compile While
|
||||||
*
|
|
||||||
* Compiles the {while} tag
|
* Compiles the {while} tag
|
||||||
*
|
*
|
||||||
* @package Smarty
|
* @package Smarty
|
||||||
|
|
@ -15,14 +14,15 @@
|
||||||
* @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)
|
||||||
|
|
@ -56,12 +56,12 @@ class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase {
|
||||||
$_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 +70,14 @@ 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,7 @@ 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 }?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue