diff options
148 files changed, 12257 insertions, 11558 deletions
diff --git a/Widgets/.gitignore b/Widgets/.gitignore index 98b092a9..105c1b43 100644 --- a/Widgets/.gitignore +++ b/Widgets/.gitignore @@ -2,3 +2,4 @@ *~ *.kate-swp .*.swp +compiled_templates/ diff --git a/Widgets/WidgetRenderer.php b/Widgets/WidgetRenderer.php index e5a96474..b460ae92 100644 --- a/Widgets/WidgetRenderer.php +++ b/Widgets/WidgetRenderer.php @@ -4,15 +4,18 @@ */ class WidgetRenderer { + // The prefix and suffix for the widget strip marker. + private static $markerPrefix = "START_WIDGET"; + private static $markerSuffix = "END_WIDGET"; - // A randomly-generated string, used to prevent malicious users from - // spoofing the output of #widget in order to have arbitrary - // JavaScript show up in the page's output. - static $mRandomString; + // Stores the compiled widgets for after the parser has run. + // Must be public for use in anonymous callback function in PHP 5.3 + public static $widgets = array(); public static function initRandomString() { - // Set the random string, used in both encoding and decoding. - self::$mRandomString = substr( base64_encode( rand() ), 0, 7 ); + // Add a random string to the prefix to ensure no conflicts + // with normal content. + self::$markerPrefix .= wfRandomString( 16 ); } public static function renderWidget( &$parser, $widgetName ) { @@ -127,20 +130,22 @@ class WidgetRenderer { try { $output = $smarty->fetch( "wiki:$widgetName" ); } catch ( Exception $e ) { - return '<div class=\"error\">' . wfMsgExt( 'widgets-error', array( 'parsemag' ), htmlentities( $widgetName ) ) . '</div>'; + return '<div class="error">' . wfMessage( 'widgets-error', htmlentities( $widgetName ) )->text() . '</div>'; } - // Hide the widget from the parser. - $output = 'ENCODED_CONTENT ' . self::$mRandomString . base64_encode($output) . ' END_ENCODED_CONTENT'; - return array( $output, 'noparse' => true, 'isHTML' => true ); + // To prevent the widget output from being tampered with, the + // compiled HTML is stored and a strip marker with an index to + // retrieve it later is returned. + $index = array_push( self::$widgets, $output ) - 1; + return self::$markerPrefix . '-' . $index . self::$markerSuffix; } - public static function processEncodedWidgetOutput( &$out, &$text ) { - // Find all hidden content and restore to normal + public static function outputCompiledWidget( &$out, &$text ) { $text = preg_replace_callback( - '/ENCODED_CONTENT ' . self::$mRandomString . '([0-9a-zA-Z\/+]+=*)* END_ENCODED_CONTENT/', + '/' . self::$markerPrefix . '-(\d+)' . self::$markerSuffix . '/S', function( $matches ) { - return base64_decode( $matches[1]); + // Can't use self:: in an anonymous function pre PHP 5.4 + return WidgetRenderer::$widgets[$matches[1]]; }, $text ); @@ -148,10 +153,11 @@ class WidgetRenderer { return true; } - // the following four functions are all registered with Smarty + // The following four functions are all registered with Smarty. + public static function wiki_get_template( $widgetName, &$widgetCode, $smarty_obj ) { global $wgWidgetsUseFlaggedRevs; - + $widgetTitle = Title::newFromText( $widgetName, NS_WIDGET ); if ( $widgetTitle && $widgetTitle->exists() ) { diff --git a/Widgets/Widgets.i18n.magic.php b/Widgets/Widgets.i18n.magic.php index 92bd0da0..9e896c54 100644 --- a/Widgets/Widgets.i18n.magic.php +++ b/Widgets/Widgets.i18n.magic.php @@ -27,7 +27,7 @@ $magicWords['azb'] = array( /** Chechen (нохчийн) */ $magicWords['ce'] = array( - 'widget' => array( 0, 'тlехьажар', 'виджет' ), + 'widget' => array( 0, 'тӀехьажар', 'виджет' ), ); /** German (Deutsch) */ diff --git a/Widgets/Widgets.php b/Widgets/Widgets.php index 6c52c5a7..887ca435 100644 --- a/Widgets/Widgets.php +++ b/Widgets/Widgets.php @@ -17,7 +17,7 @@ $wgExtensionCredits['parserhook'][] = array( 'name' => 'Widgets', 'descriptionmsg' => 'widgets-desc', 'version' => '1.1', - 'author' => '[http://www.sergeychernyshev.com Sergey Chernyshev]', + 'author' => array( '[http://www.sergeychernyshev.com Sergey Chernyshev]', '...' ), 'url' => 'https://www.mediawiki.org/wiki/Extension:Widgets' ); @@ -50,11 +50,11 @@ $wgWidgetsUseFlaggedRevs = false; // Set a default directory for storage of compiled templates $wgWidgetsCompileDir = "$IP/extensions/Widgets/compiled_templates/"; -$dir = dirname( __FILE__ ) . '/'; +$dir = __DIR__ . '/'; // Initialize Smarty require_once( $dir . 'smarty/libs/Smarty.class.php' ); -$wgMessagesDirs['Widgets'] = __DIR__ . '/i18n'; +$wgMessagesDirs['Widgets'] = $dir . 'i18n'; $wgExtensionMessagesFiles['Widgets'] = $dir . 'Widgets.i18n.php'; $wgExtensionMessagesFiles['WidgetsNamespaces'] = $dir . 'Widgets.i18n.namespaces.php'; $wgAutoloadClasses['WidgetRenderer'] = $dir . 'WidgetRenderer.php'; @@ -65,7 +65,7 @@ $wgExtensionMessagesFiles['WidgetsMagic'] = $dir . 'Widgets.i18n.magic.php'; $wgExtensionFunctions[] = 'widgetNamespacesInit'; $wgExtensionFunctions[] = 'WidgetRenderer::initRandomString'; $wgHooks['ParserFirstCallInit'][] = 'widgetParserFunctions'; -$wgHooks['ParserAfterTidy'][] = 'WidgetRenderer::processEncodedWidgetOutput'; +$wgHooks['ParserAfterTidy'][] = 'WidgetRenderer::outputCompiledWidget'; $wgHooks['CanonicalNamespaces'][] = 'widgetsAddNamespaces'; /** @@ -73,7 +73,7 @@ $wgHooks['CanonicalNamespaces'][] = 'widgetsAddNamespaces'; * @return bool */ function widgetParserFunctions( &$parser ) { - $parser->setFunctionHook( 'widget', array( 'WidgetRenderer', 'renderWidget' ) ); + $parser->setFunctionHook( 'widget', 'WidgetRenderer::renderWidget' ); return true; } diff --git a/Widgets/i18n/id.json b/Widgets/i18n/id.json index ebf12b19..7fa7af2d 100644 --- a/Widgets/i18n/id.json +++ b/Widgets/i18n/id.json @@ -5,7 +5,7 @@ "Irwangatot" ] }, - "widgets-desc": "Mengijinkan pengurus wiki untuk menambahkan formulir bebas widget ke wiki dengan menyunting halaman di ruang nama {{ns:widget}}.\nkomunitas kontribusi widgets dapat di temuai pada [http://www.mediawikiwidgets.org/Main_Page MediaWikiWidgets.org]", + "widgets-desc": "Mengizinkan pengurus wiki untuk menambahkan ''free-form widget'' ke wiki dengan menyunting halaman di ruang nama {{ns:widget}}.\nWidget (gawai) kontribusi komunitas dapat ditemukan di [http://www.mediawikiwidgets.org/Main_Page MediaWikiWidgets.org]", "widgets-error": "Kesalahan pada [[{{ns:widget}}:$1|widget $1]]", "group-widgeteditor": "Penyunting widget", "group-widgeteditor-member": "Penyunting widget", diff --git a/Widgets/i18n/ms.json b/Widgets/i18n/ms.json index 487c3084..443c823e 100644 --- a/Widgets/i18n/ms.json +++ b/Widgets/i18n/ms.json @@ -1,10 +1,11 @@ { "@metadata": { "authors": [ - "Anakmalaysia" + "Anakmalaysia", + "Pizza1016" ] }, - "widgets-desc": "Membolehkan pentadbir wiki untuk menambahkan widget berbentuk bebas pada wiki dengan menyunting laman di dalam ruang nama {{ns:widget}}.\nWidget sumbangan komuniti boleh didapati di [http://www.mediawikiwidgets.org/Main_Page MediaWikiWidgets.org]", + "widgets-desc": "Membolehkan penyelia wiki untuk menambahkan widget berbentuk bebas pada wiki dengan menyunting lelaman di dalam ruang nama {{ns:widget}}.\nWidget sumbangan komuniti boleh didapati di [http://www.mediawikiwidgets.org/Main_Page MediaWikiWidgets.org]", "widgets-error": "Ralat pada [[{{ns:widget}}:$1|widget $1]]", "group-widgeteditor": "Penyunting widget", "group-widgeteditor-member": "{{GENDER:$1|Penyunting widget}}", diff --git a/Widgets/i18n/pt-br.json b/Widgets/i18n/pt-br.json index 9d3c6bfb..ff1d726b 100644 --- a/Widgets/i18n/pt-br.json +++ b/Widgets/i18n/pt-br.json @@ -4,7 +4,8 @@ "Cainamarques", "Eduardo.mps", "Giro720", - "Helder.wiki" + "Helder.wiki", + "He7d3r" ] }, "widgets-desc": "Permite que os administradores da wiki adicionem ''widgets free-form'' à wiki, editando páginas no espaço nominal {{ns:widget}}.\nWidgets fornecidos pela comunidade podem ser encontrados na [http://www.mediawikiwidgets.org/Main_Page MediaWikiWidgets.org]", diff --git a/Widgets/i18n/qqq.json b/Widgets/i18n/qqq.json index 913b2997..057e00ab 100644 --- a/Widgets/i18n/qqq.json +++ b/Widgets/i18n/qqq.json @@ -10,7 +10,7 @@ "아라" ] }, - "widgets-desc": "{{desc|name=Widgets|url=http://www.mediawiki.org/wiki/Extension:Widgets}}", + "widgets-desc": "{{desc|name=Widgets|url=https://www.mediawiki.org/wiki/Extension:Widgets}}", "widgets-error": "{{doc-important|Do not translate <code><nowiki>{{ns:widget}}</nowiki></code>.}}\nUsed as error message. Parameters:\n* $1 - widget name", "group-widgeteditor": "{{doc-group|widgeteditor}}", "group-widgeteditor-member": "{{doc-group|widgeteditor|member}}", diff --git a/Widgets/i18n/sr-ec.json b/Widgets/i18n/sr-ec.json index 3203d4c6..c3a35355 100644 --- a/Widgets/i18n/sr-ec.json +++ b/Widgets/i18n/sr-ec.json @@ -10,5 +10,5 @@ "group-widgeteditor": "Уредници елемената", "group-widgeteditor-member": "{{GENDER:$1|Уредник елемената|Уредница елемената|Уредник елемената}}", "grouppage-widgeteditor": "{{ns:project}}:Уредници елемената", - "right-editwidgets": "Прављење и уређивање [https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Widgets елемената] у именском простору <tt>{{ns:widget}}</tt>" + "right-editwidgets": "прављење и уређивање [https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Widgets елемената] у именском простору <tt>{{ns:widget}}</tt>" } diff --git a/Widgets/i18n/vi.json b/Widgets/i18n/vi.json index 7cc9338b..24c40a31 100644 --- a/Widgets/i18n/vi.json +++ b/Widgets/i18n/vi.json @@ -1,15 +1,16 @@ { "@metadata": { "authors": [ - "Minh Nguyen" + "Minh Nguyen", + "Prenn" ] }, - "widgets-desc": "Cho phép các bảo quản viên wiki thêm công cụ đa năng vào wiki bằng cách sửa đổi trang trong không gian tên {{ns:widget}}.\nCó thể lấy thêm công cụ đa năng do cộng đồng đóng góp tại [http://www.mediawikiwidgets.org/Main_Page MediaWikiWidgets.org].", - "widgets-error": "Lỗi trong [[{{ns:widget}}:$1|công cụ đa năng $1]]", + "widgets-desc": "Cho phép các bảo quản viên wiki thêm tiện ích vào wiki bằng cách sửa đổi trang trong không gian tên {{ns:widget}}.\nCó thể lấy thêm tiện ích do cộng đồng đóng góp tại [http://www.mediawikiwidgets.org/Main_Page MediaWikiWidgets.org].", + "widgets-error": "Lỗi [[{{ns:widget}}:$1|tiện ích $1]]", "group-widgeteditor": "Người sửa công cụ đa năng", "group-widgeteditor-member": "người sửa công cụ đa năng", "grouppage-widgeteditor": "{{ns:project}}:Người sửa công cụ đa năng", - "right-editwidgets": "Tạo và sửa [https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Widgets?uselang=vi công cụ đa năng] trong không gian tên <tt>{{ns:widget}}</tt>", + "right-editwidgets": "Tạo và sửa [https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Widgets?uselang=vi tiện ích] trong không gian tên <tt>{{ns:widget}}</tt>", "group-widgeteditor.css": "/* Mã CSS tại đây sẽ chỉ ảnh hưởng đến những người sửa công cụ đa năng */", "group-widgeteditor.js": "/* Mã JS tại đây sẽ chỉ ảnh hưởng đến những người sửa công cụ đa năng */" } diff --git a/Widgets/smarty/COPYING.lib b/Widgets/smarty/COPYING.lib new file mode 100644 index 00000000..02bbb60b --- /dev/null +++ b/Widgets/smarty/COPYING.lib @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library.
\ No newline at end of file diff --git a/Widgets/smarty/README b/Widgets/smarty/README new file mode 100644 index 00000000..901c4733 --- /dev/null +++ b/Widgets/smarty/README @@ -0,0 +1,574 @@ +Smarty 3.1.7 + +Author: Monte Ohrt <monte at ohrt dot com > +Author: Uwe Tews + +AN INTRODUCTION TO SMARTY 3 + +NOTICE FOR 3.1 release: + +Please see the SMARTY_3.1_NOTES.txt file that comes with the distribution. + +NOTICE for 3.0.5 release: + +Smarty now follows the PHP error_reporting level by default. If PHP does not mask E_NOTICE and you try to access an unset template variable, you will now get an E_NOTICE warning. To revert to the old behavior: + +$smarty->error_reporting = E_ALL & ~E_NOTICE; + +NOTICE for 3.0 release: + +IMPORTANT: Some API adjustments have been made between the RC4 and 3.0 release. +We felt it is better to make these now instead of after a 3.0 release, then have to +immediately deprecate APIs in 3.1. Online documentation has been updated +to reflect these changes. Specifically: + +---- API CHANGES RC4 -> 3.0 ---- + +$smarty->register->* +$smarty->unregister->* +$smarty->utility->* +$samrty->cache->* + +Have all been changed to local method calls such as: + +$smarty->clearAllCache() +$smarty->registerFoo() +$smarty->unregisterFoo() +$smarty->testInstall() +etc. + +Registration of function, block, compiler, and modifier plugins have been +consolidated under two API calls: + +$smarty->registerPlugin(...) +$smarty->unregisterPlugin(...) + +Registration of pre, post, output and variable filters have been +consolidated under two API calls: + +$smarty->registerFilter(...) +$smarty->unregisterFilter(...) + +Please refer to the online documentation for all specific changes: + +http://www.smarty.net/documentation + +---- + +The Smarty 3 API has been refactored to a syntax geared +for consistency and modularity. The Smarty 2 API syntax is still supported, but +will throw a deprecation notice. You can disable the notices, but it is highly +recommended to adjust your syntax to Smarty 3, as the Smarty 2 syntax must run +through an extra rerouting wrapper. + +Basically, all Smarty methods now follow the "fooBarBaz" camel case syntax. Also, +all Smarty properties now have getters and setters. So for example, the property +$smarty->cache_dir can be set with $smarty->setCacheDir('foo/') and can be +retrieved with $smarty->getCacheDir(). + +Some of the Smarty 3 APIs have been revoked such as the "is*" methods that were +just duplicate functions of the now available "get*" methods. + +Here is a rundown of the Smarty 3 API: + +$smarty->fetch($template, $cache_id = null, $compile_id = null, $parent = null) +$smarty->display($template, $cache_id = null, $compile_id = null, $parent = null) +$smarty->isCached($template, $cache_id = null, $compile_id = null) +$smarty->createData($parent = null) +$smarty->createTemplate($template, $cache_id = null, $compile_id = null, $parent = null) +$smarty->enableSecurity() +$smarty->disableSecurity() +$smarty->setTemplateDir($template_dir) +$smarty->addTemplateDir($template_dir) +$smarty->templateExists($resource_name) +$smarty->loadPlugin($plugin_name, $check = true) +$smarty->loadFilter($type, $name) +$smarty->setExceptionHandler($handler) +$smarty->addPluginsDir($plugins_dir) +$smarty->getGlobal($varname = null) +$smarty->getRegisteredObject($name) +$smarty->getDebugTemplate() +$smarty->setDebugTemplate($tpl_name) +$smarty->assign($tpl_var, $value = null, $nocache = false) +$smarty->assignGlobal($varname, $value = null, $nocache = false) +$smarty->assignByRef($tpl_var, &$value, $nocache = false) +$smarty->append($tpl_var, $value = null, $merge = false, $nocache = false) +$smarty->appendByRef($tpl_var, &$value, $merge = false) +$smarty->clearAssign($tpl_var) +$smarty->clearAllAssign() +$smarty->configLoad($config_file, $sections = null) +$smarty->getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true) +$smarty->getConfigVariable($variable) +$smarty->getStreamVariable($variable) +$smarty->getConfigVars($varname = null) +$smarty->clearConfig($varname = null) +$smarty->getTemplateVars($varname = null, $_ptr = null, $search_parents = true) +$smarty->clearAllCache($exp_time = null, $type = null) +$smarty->clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null) + +$smarty->registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = array()) + +$smarty->registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array()) + +$smarty->registerFilter($type, $function_name) +$smarty->registerResource($resource_type, $function_names) +$smarty->registerDefaultPluginHandler($function_name) +$smarty->registerDefaultTemplateHandler($function_name) + +$smarty->unregisterPlugin($type, $tag) +$smarty->unregisterObject($object_name) +$smarty->unregisterFilter($type, $function_name) +$smarty->unregisterResource($resource_type) + +$smarty->compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null) +$smarty->clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) +$smarty->testInstall() + +// then all the getters/setters, available for all properties. Here are a few: + +$caching = $smarty->getCaching(); // get $smarty->caching +$smarty->setCaching(true); // set $smarty->caching +$smarty->setDeprecationNotices(false); // set $smarty->deprecation_notices +$smarty->setCacheId($id); // set $smarty->cache_id +$debugging = $smarty->getDebugging(); // get $smarty->debugging + + +FILE STRUCTURE + +The Smarty 3 file structure is similar to Smarty 2: + +/libs/ + Smarty.class.php +/libs/sysplugins/ + internal.* +/libs/plugins/ + function.mailto.php + modifier.escape.php + ... + +A lot of Smarty 3 core functionality lies in the sysplugins directory; you do +not need to change any files here. The /libs/plugins/ folder is where Smarty +plugins are located. You can add your own here, or create a separate plugin +directory, just the same as Smarty 2. You will still need to create your own +/cache/, /templates/, /templates_c/, /configs/ folders. Be sure /cache/ and +/templates_c/ are writable. + +The typical way to use Smarty 3 should also look familiar: + +require('Smarty.class.php'); +$smarty = new Smarty; +$smarty->assign('foo','bar'); +$smarty->display('index.tpl'); + + +However, Smarty 3 works completely different on the inside. Smarty 3 is mostly +backward compatible with Smarty 2, except for the following items: + +*) Smarty 3 is PHP 5 only. It will not work with PHP 4. +*) The {php} tag is disabled by default. Enable with $smarty->allow_php_tag=true. +*) Delimiters surrounded by whitespace are no longer treated as Smarty tags. + Therefore, { foo } will not compile as a tag, you must use {foo}. This change + Makes Javascript/CSS easier to work with, eliminating the need for {literal}. + This can be disabled by setting $smarty->auto_literal = false; +*) The Smarty 3 API is a bit different. Many Smarty 2 API calls are deprecated + but still work. You will want to update your calls to Smarty 3 for maximum + efficiency. + + +There are many things that are new to Smarty 3. Here are the notable items: + +LEXER/PARSER +============ + +Smarty 3 now uses a lexing tokenizer for its parser/compiler. Basically, this +means Smarty has some syntax additions that make life easier such as in-template +math, shorter/intuitive function parameter options, infinite function recursion, +more accurate error handling, etc. + + +WHAT IS NEW IN SMARTY TEMPLATE SYNTAX +===================================== + +Smarty 3 allows expressions almost anywhere. Expressions can include PHP +functions as long as they are not disabled by the security policy, object +methods and properties, etc. The {math} plugin is no longer necessary but +is still supported for BC. + +Examples: +{$x+$y} will output the sum of x and y. +{$foo = strlen($bar)} function in assignment +{assign var=foo value= $x+$y} in attributes +{$foo = myfunct( ($x+$y)*3 )} as function parameter +{$foo[$x+3]} as array index + +Smarty tags can be used as values within other tags. +Example: {$foo={counter}+3} + +Smarty tags can also be used inside double quoted strings. +Example: {$foo="this is message {counter}"} + +You can define arrays within templates. +Examples: +{assign var=foo value=[1,2,3]} +{assign var=foo value=['y'=>'yellow','b'=>'blue']} +Arrays can be nested. +{assign var=foo value=[1,[9,8],3]} + +There is a new short syntax supported for assigning variables. +Example: {$foo=$bar+2} + +You can assign a value to a specific array element. If the variable exists but +is not an array, it is converted to an array before the new values are assigned. +Examples: +{$foo['bar']=1} +{$foo['bar']['blar']=1} + +You can append values to an array. If the variable exists but is not an array, +it is converted to an array before the new values are assigned. +Example: {$foo[]=1} + +You can use a PHP-like syntax for accessing array elements, as well as the +original "dot" notation. +Examples: +{$foo[1]} normal access +{$foo['bar']} +{$foo['bar'][1]} +{$foo[$x+$x]} index may contain any expression +{$foo[$bar[1]]} nested index +{$foo[section_name]} smarty section access, not array access! + +The original "dot" notation stays, and with improvements. +Examples: +{$foo.a.b.c} => $foo['a']['b']['c'] +{$foo.a.$b.c} => $foo['a'][$b]['c'] with variable index +{$foo.a.{$b+4}.c} => $foo['a'][$b+4]['c'] with expression as index +{$foo.a.{$b.c}} => $foo['a'][$b['c']] with nested index + +note that { and } are used to address ambiguties when nesting the dot syntax. + +Variable names themselves can be variable and contain expressions. +Examples: +$foo normal variable +$foo_{$bar} variable name containing other variable +$foo_{$x+$y} variable name containing expressions +$foo_{$bar}_buh_{$blar} variable name with multiple segments +{$foo_{$x}} will output the variable $foo_1 if $x has a value of 1. + +Object method chaining is implemented. +Example: {$object->method1($x)->method2($y)} + +{for} tag added for looping (replacement for {section} tag): +{for $x=0, $y=count($foo); $x<$y; $x++} .... {/for} +Any number of statements can be used separated by comma as the first +inital expression at {for}. + +{for $x = $start to $end step $step} ... {/for}is in the SVN now . +You can use also +{for $x = $start to $end} ... {/for} +In this case the step value will be automaticall 1 or -1 depending on the start and end values. +Instead of $start and $end you can use any valid expression. +Inside the loop the following special vars can be accessed: +$x@iteration = number of iteration +$x@total = total number of iterations +$x@first = true on first iteration +$x@last = true on last iteration + + +The Smarty 2 {section} syntax is still supported. + +New shorter {foreach} syntax to loop over an array. +Example: {foreach $myarray as $var}...{/foreach} + +Within the foreach loop, properties are access via: + +$var@key foreach $var array key +$var@iteration foreach current iteration count (1,2,3...) +$var@index foreach current index count (0,1,2...) +$var@total foreach $var array total +$var@first true on first iteration +$var@last true on last iteration + +The Smarty 2 {foreach} tag syntax is still supported. + +NOTE: {$bar[foo]} still indicates a variable inside of a {section} named foo. +If you want to access an array element with index foo, you must use quotes +such as {$bar['foo']}, or use the dot syntax {$bar.foo}. + +while block tag is now implemented: +{while $foo}...{/while} +{while $x lt 10}...{/while} + +Direct access to PHP functions: +Just as you can use PHP functions as modifiers directly, you can now access +PHP functions directly, provided they are permitted by security settings: +{time()} + +There is a new {function}...{/function} block tag to implement a template function. +This enables reuse of code sequences like a plugin function. It can call itself recursively. +Template function must be called with the new {call name=foo...} tag. + +Example: + +Template file: +{function name=menu level=0} + <ul class="level{$level}"> + {foreach $data as $entry} + {if is_array($entry)} + <li>{$entry@key}</li> + {call name=menu data=$entry level=$level+1} + {else} + <li>{$entry}</li> + {/if} + {/foreach} + </ul> +{/function} + +{$menu = ['item1','item2','item3' => ['item3-1','item3-2','item3-3' => + ['item3-3-1','item3-3-2']],'item4']} + +{call name=menu data=$menu} + + +Generated output: + * item1 + * item2 + * item3 + o item3-1 + o item3-2 + o item3-3 + + item3-3-1 + + item3-3-2 + * item4 + +The function tag itself must have the "name" attribute. This name is the tag +name when calling the function. The function tag may have any number of +additional attributes. These will be default settings for local variables. + +New {nocache} block function: +{nocache}...{/nocache} will declare a section of the template to be non-cached +when template caching is enabled. + +New nocache attribute: +You can declare variable/function output as non-cached with the nocache attribute. +Examples: + +{$foo nocache=true} +{$foo nocache} /* same */ + +{foo bar="baz" nocache=true} +{foo bar="baz" nocache} /* same */ + +{time() nocache=true} +{time() nocache} /* same */ + +Or you can also assign the variable in your script as nocache: +$smarty->assign('foo',$something,true); // third param is nocache setting +{$foo} /* non-cached */ + +$smarty.current_dir returns the directory name of the current template. + +You can use strings directly as templates with the "string" resource type. +Examples: +$smarty->display('string:This is my template, {$foo}!'); // php +{include file="string:This is my template, {$foo}!"} // template + + + +VARIABLE SCOPE / VARIABLE STORAGE +================================= + +In Smarty 2, all assigned variables were stored within the Smarty object. +Therefore, all variables assigned in PHP were accessible by all subsequent +fetch and display template calls. + +In Smarty 3, we have the choice to assign variables to the main Smarty object, +to user-created data objects, and to user-created template objects. +These objects can be chained. The object at the end of a chain can access all +variables belonging to that template and all variables within the parent objects. +The Smarty object can only be the root of a chain, but a chain can be isolated +from the Smarty object. + +All known Smarty assignment interfaces will work on the data and template objects. + +Besides the above mentioned objects, there is also a special storage area for +global variables. + +A Smarty data object can be created as follows: +$data = $smarty->createData(); // create root data object +$data->assign('foo','bar'); // assign variables as usual +$data->config_load('my.conf'); // load config file + +$data= $smarty->createData($smarty); // create data object having a parent link to +the Smarty object + +$data2= $smarty->createData($data); // create data object having a parent link to +the $data data object + +A template object can be created by using the createTemplate method. It has the +same parameter assignments as the fetch() or display() method. +Function definition: +function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null) + +The first parameter can be a template name, a smarty object or a data object. + +Examples: +$tpl = $smarty->createTemplate('mytpl.tpl'); // create template object not linked to any parent +$tpl->assign('foo','bar'); // directly assign variables +$tpl->config_load('my.conf'); // load config file + +$tpl = $smarty->createTemplate('mytpl.tpl',$smarty); // create template having a parent link to the Smarty object +$tpl = $smarty->createTemplate('mytpl.tpl',$data); // create template having a parent link to the $data object + +The standard fetch() and display() methods will implicitly create a template object. +If the $parent parameter is not specified in these method calls, the template object +is will link back to the Smarty object as it's parent. + +If a template is called by an {include...} tag from another template, the +subtemplate links back to the calling template as it's parent. + +All variables assigned locally or from a parent template are accessible. If the +template creates or modifies a variable by using the {assign var=foo...} or +{$foo=...} tags, these new values are only known locally (local scope). When the +template exits, none of the new variables or modifications can be seen in the +parent template(s). This is same behavior as in Smarty 2. + +With Smarty 3, we can assign variables with a scope attribute which allows the +availablility of these new variables or modifications globally (ie in the parent +templates.) + +Possible scopes are local, parent, root and global. +Examples: +{assign var=foo value='bar'} // no scope is specified, the default 'local' +{$foo='bar'} // same, local scope +{assign var=foo value='bar' scope='local'} // same, local scope + +{assign var=foo value='bar' scope='parent'} // Values will be available to the parent object +{$foo='bar' scope='parent'} // (normally the calling template) + +{assign var=foo value='bar' scope='root'} // Values will be exported up to the root object, so they can +{$foo='bar' scope='root'} // be seen from all templates using the same root. + +{assign var=foo value='bar' scope='global'} // Values will be exported to global variable storage, +{$foo='bar' scope='global'} // they are available to any and all templates. + + +The scope attribute can also be attached to the {include...} tag. In this case, +the specified scope will be the default scope for all assignments within the +included template. + + +PLUGINS +======= + +Smarty3 are following the same coding rules as in Smarty2. +The only difference is that the template object is passed as additional third parameter. + +smarty_plugintype_name (array $params, object $smarty, object $template) + +The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty2 internals. + + +TEMPLATE INHERITANCE: +===================== + +With template inheritance you can define blocks, which are areas that can be +overriden by child templates, so your templates could look like this: + +parent.tpl: +<html> + <head> + <title>{block name='title'}My site name{/block}</title> + </head> + <body> + <h1>{block name='page-title'}Default page title{/block}</h1> + <div id="content"> + {block name='content'} + Default content + {/block} + </div> + </body> +</html> + +child.tpl: +{extends file='parent.tpl'} +{block name='title'} +Child title +{/block} + +grandchild.tpl: +{extends file='child.tpl'} +{block name='title'}Home - {$smarty.block.parent}{/block} +{block name='page-title'}My home{/block} +{block name='content'} + {foreach $images as $img} + <img src="{$img.url}" alt="{$img.description}" /> + {/foreach} +{/block} + +We redefined all the blocks here, however in the title block we used {$smarty.block.parent}, +which tells Smarty to insert the default content from the parent template in its place. +The content block was overriden to display the image files, and page-title has also be +overriden to display a completely different title. + +If we render grandchild.tpl we will get this: +<html> + <head> + <title>Home - Child title</title> + </head> + <body> + <h1>My home</h1> + <div id="content"> + <img src="/example.jpg" alt="image" /> + <img src="/example2.jpg" alt="image" /> + <img src="/example3.jpg" alt="image" /> + </div> + </body> +</html> + +NOTE: In the child templates everything outside the {extends} or {block} tag sections +is ignored. + +The inheritance tree can be as big as you want (meaning you can extend a file that +extends another one that extends another one and so on..), but be aware that all files +have to be checked for modifications at runtime so the more inheritance the more overhead you add. + +Instead of defining the parent/child relationships with the {extends} tag in the child template you +can use the resource as follow: + +$smarty->display('extends:parent.tpl|child.tpl|grandchild.tpl'); + +Child {block} tags may optionally have a append or prepend attribute. In this case the parent block content +is appended or prepended to the child block content. + +{block name='title' append} My title {/block} + + +PHP STREAMS: +============ + +(see online documentation) + +VARIBLE FILTERS: +================ + +(see online documentation) + + +STATIC CLASS ACCESS AND NAMESPACE SUPPORT +========================================= + +You can register a class with optional namespace for the use in the template like: + +$smarty->register->templateClass('foo','name\name2\myclass'); + +In the template you can use it like this: +{foo::method()} etc. + + +======================= + +Please look through it and send any questions/suggestions/etc to the forums. + +http://www.phpinsider.com/smarty-forum/viewtopic.php?t=14168 + +Monte and Uwe diff --git a/Widgets/smarty/SMARTY_2_BC_NOTES.txt b/Widgets/smarty/SMARTY_2_BC_NOTES.txt new file mode 100644 index 00000000..79a2cb1b --- /dev/null +++ b/Widgets/smarty/SMARTY_2_BC_NOTES.txt @@ -0,0 +1,109 @@ += Known incompatibilities with Smarty 2 = + +== Syntax == + +Smarty 3 API has a new syntax. Much of the Smarty 2 syntax is supported +by a wrapper but deprecated. See the README that comes with Smarty 3 for more +information. + +The {$array|@mod} syntax has always been a bit confusing, where an "@" is required +to apply a modifier to an array instead of the individual elements. Normally you +always want the modifier to apply to the variable regardless of its type. In Smarty 3, +{$array|mod} and {$array|@mod} behave identical. It is safe to drop the "@" and the +modifier will still apply to the array. If you really want the modifier to apply to +each array element, you must loop the array in-template, or use a custom modifier that +supports array iteration. Most smarty functions already escape values where necessary +such as {html_options} + +== PHP Version == +Smarty 3 is PHP 5 only. It will not work with PHP 4. + +== {php} Tag == +The {php} tag is disabled by default. The use of {php} tags is +deprecated. It can be enabled with $smarty->allow_php_tag=true. + +But if you scatter PHP code which belongs together into several +{php} tags it may not work any longer. + +== Delimiters and whitespace == +Delimiters surrounded by whitespace are no longer treated as Smarty tags. +Therefore, { foo } will not compile as a tag, you must use {foo}. This change +Makes Javascript/CSS easier to work with, eliminating the need for {literal}. +This can be disabled by setting $smarty->auto_literal = false; + +== Unquoted Strings == +Smarty 2 was a bit more forgiving (and ambiguous) when it comes to unquoted strings +in parameters. Smarty3 is more restrictive. You can still pass strings without quotes +so long as they contain no special characters. (anything outside of A-Za-z0-9_) + +For example filename strings must be quoted +<source lang="smarty"> +{include file='path/foo.tpl'} +</source> + +== Extending the Smarty class == +Smarty 3 makes use of the __construct method for initialization. If you are extending +the Smarty class, its constructor is not called implicitly if the your child class defines +its own constructor. In order to run Smarty's constructor, a call to parent::__construct() +within your child constructor is required. + +<source lang="php"> +class MySmarty extends Smarty { + function __construct() { + parent::__construct(); + + // your initialization code goes here + + } +} +</source> + +== Autoloader == +Smarty 3 does register its own autoloader with spl_autoload_register. If your code has +an existing __autoload function then this function must be explicitly registered on +the __autoload stack. See http://us3.php.net/manual/en/function.spl-autoload-register.php +for further details. + +== Plugin Filenames == +Smarty 3 optionally supports the PHP spl_autoloader. The autoloader requires filenames +to be lower case. Because of this, Smarty plugin file names must also be lowercase. +In Smarty 2, mixed case file names did work. + +== Scope of Special Smarty Variables == +In Smarty 2 the special Smarty variables $smarty.section... and $smarty.foreach... +had global scope. If you had loops with the same name in subtemplates you could accidentally +overwrite values of parent template. + +In Smarty 3 these special Smarty variable have only local scope in the template which +is defining the loop. If you need their value in a subtemplate you have to pass them +as parameter. +<source lang="smarty"> +{include file='path/foo.tpl' index=$smarty.section.foo.index} +</source> + +== SMARTY_RESOURCE_CHAR_SET == +Smarty 3 sets the constant SMARTY_RESOURCE_CHAR_SET to utf-8 as default template charset. +This is now used also on modifiers like escape as default charset. If your templates use +other charsets make sure that you define the constant accordingly. Otherwise you may not +get any output. + +== newline at {if} tags == +A \n was added to the compiled code of the {if},{else},{elseif},{/if} tags to get output of newlines as expected by the template source. +If one of the {if} tags is at the line end you will now get a newline in the HTML output. + +== trigger_error() == +The API function trigger_error() has been removed because it did just map to PHP trigger_error. +However it's still included in the Smarty2 API wrapper. + +== Smarty constants == +The constants +SMARTY_PHP_PASSTHRU +SMARTY_PHP_QUOTE +SMARTY_PHP_REMOVE +SMARTY_PHP_ALLOW +have been replaced with class constants +Smarty::PHP_PASSTHRU +Smarty::PHP_QUOTE +Smarty::PHP_REMOVE +Smarty::PHP_ALLOW + diff --git a/Widgets/smarty/SMARTY_3.0_BC_NOTES.txt b/Widgets/smarty/SMARTY_3.0_BC_NOTES.txt new file mode 100644 index 00000000..fd8b540c --- /dev/null +++ b/Widgets/smarty/SMARTY_3.0_BC_NOTES.txt @@ -0,0 +1,24 @@ +== Smarty2 backward compatibility == +All Smarty2 specific API functions and deprecated functionallity has been moved +to the SmartyBC class. + +== {php} Tag == +The {php} tag is no longer available in the standard Smarty calls. +The use of {php} tags is deprecated and only available in the SmartyBC class. + +== {include_php} Tag == +The {include_php} tag is no longer available in the standard Smarty calls. +The use of {include_php} tags is deprecated and only available in the SmartyBC class. + +== php template resource == +The support of the php template resource is removed. + +== $cache_dir, $compile_dir, $config_dir, $template_dir access == +The mentioned properties can't be accessed directly any longer. You must use +corresponding getter/setters like addConfigDir(), setConfigDir(), getConfigDir() + +== obsolete Smarty class properties == +The following no longer used properties are removed: +$allow_php_tag +$allow_php_template +$deprecation_notices
\ No newline at end of file diff --git a/Widgets/smarty/SMARTY_3.1_NOTES.txt b/Widgets/smarty/SMARTY_3.1_NOTES.txt new file mode 100644 index 00000000..e56e56f6 --- /dev/null +++ b/Widgets/smarty/SMARTY_3.1_NOTES.txt @@ -0,0 +1,306 @@ +Smarty 3.1 Notes +================ + +Smarty 3.1 is a departure from 2.0 compatibility. Most notably, all +backward compatibility has been moved to a separate class file named +SmartyBC.class.php. If you require compatibility with 2.0, you will +need to use this class. + +Some differences from 3.0 are also present. 3.1 begins the journey of +requiring setters/getters for property access. So far this is only +implemented on the five directory properties: template_dir, +plugins_dir, configs_dir, compile_dir and cache_dir. These properties +are now protected, it is required to use the setters/getters instead. +That said, direct property access will still work, however slightly +slower since they will now fall through __set() and __get() and in +turn passed through the setter/getter methods. 3.2 will exhibit a full +list of setter/getter methods for all (currently) public properties, +so code-completion in your IDE will work as expected. + +There is absolutely no PHP allowed in templates any more. All +deprecated features of Smarty 2.0 are gone. Again, use the SmartyBC +class if you need any backward compatibility. + +Internal Changes + + Full UTF-8 Compatibility + +The plugins shipped with Smarty 3.1 have been rewritten to fully +support UTF-8 strings if Multibyte String is available. Without +MBString UTF-8 cannot be handled properly. For those rare cases where +templates themselves have to juggle encodings, the new modifiers +to_charset and from_charset may come in handy. + + Plugin API and Performance + +All Plugins (modifiers, functions, blocks, resources, +default_template_handlers, etc) are now receiving the +Smarty_Internal_Template instance, where they were supplied with the +Smarty instance in Smarty 3.0. *. As The Smarty_Internal_Template +mimics the behavior of Smarty, this API simplification should not +require any changes to custom plugins. + +The plugins shipped with Smarty 3.1 have been rewritten for better +performance. Most notably {html_select_date} and {html_select_time} +have been improved vastly. Performance aside, plugins have also been +reviewed and generalized in their API. {html_select_date} and +{html_select_time} now share almost all available options. + +The escape modifier now knows the $double_encode option, which will +prevent entities from being encoded again. + +The capitalize modifier now know the $lc_rest option, which makes sure +all letters following a captial letter are lower-cased. + +The count_sentences modifier now accepts (.?!) as +legitimate endings of a sentence - previously only (.) was +accepted + +The new unescape modifier is there to reverse the effects of the +escape modifier. This applies to the escape formats html, htmlall and +entity. + + default_template_handler_func + +The invocation of $smarty->$default_template_handler_func had to be +altered. Instead of a Smarty_Internal_Template, the fifth argument is +now provided with the Smarty instance. New footprint: + + +/** + * Default Template Handler + * + * called when Smarty's file: resource is unable to load a requested file + * + * @param string $type resource type (e.g. "file", "string", "eval", "resource") + * @param string $name resource name (e.g. "foo/bar.tpl") + * @param string &$content template's content + * @param integer &$modified template's modification time + * @param Smarty $smarty Smarty instance + * @return string|boolean path to file or boolean true if $content and $modified + * have been filled, boolean false if no default template + * could be loaded + */ +function default_template_handler_func($type, $name, &$content, &$modified, Smarty $smarty) { + if (false) { + // return corrected filepath + return "/tmp/some/foobar.tpl"; + } elseif (false) { + // return a template directly + $content = "the template source"; + $modified = time(); + return true; + } else { + // tell smarty that we failed + return false; + } +} + + Stuff done to the compiler + +Many performance improvements have happened internally. One notable +improvement is that all compiled templates are now handled as PHP +functions. This speeds up repeated templates tremendously, as each one +calls an (in-memory) PHP function instead of performing another file +include/scan. + +New Features + + Template syntax + + {block}..{/block} + +The {block} tag has a new hide option flag. It does suppress the block +content if no corresponding child block exists. +EXAMPLE: +parent.tpl +{block name=body hide} child content "{$smarty.block.child}" was +inserted {block} +In the above example the whole block will be suppressed if no child +block "body" is existing. + + {setfilter}..{/setfilter} + +The new {setfilter} block tag allows the definition of filters which +run on variable output. +SYNTAX: +{setfilter filter1|filter2|filter3....} +Smarty3 will lookup up matching filters in the following search order: +1. varibale filter plugin in plugins_dir. +2. a valid modifier. A modifier specification will also accept +additional parameter like filter2:'foo' +3. a PHP function +{/setfilter} will turn previous filter setting off again. +{setfilter} tags can be nested. +EXAMPLE: +{setfilter filter1} + {$foo} + {setfilter filter2} + {$bar} + {/setfilter} + {$buh} +{/setfilter} +{$blar} +In the above example filter1 will run on the output of $foo, filter2 +on $bar, filter1 again on $buh and no filter on $blar. +NOTES: +- {$foo nofilter} will suppress the filters +- These filters will run in addition to filters defined by +registerFilter('variable',...), autoLoadFilter('variable',...) and +defined default modifier. +- {setfilter} will effect only the current template, not included +subtemplates. + + Resource API + +Smarty 3.1 features a new approach to resource management. The +Smarty_Resource API allows simple, yet powerful integration of custom +resources for templates and configuration files. It offers simple +functions for loading data from a custom resource (e.g. database) as +well as define new template types adhering to the special +non-compiling (e,g, plain php) and non-compile-caching (e.g. eval: +resource type) resources. + +See demo/plugins/resource.mysql.php for an example custom database +resource. + +Note that old-fashioned registration of callbacks for resource +management has been deprecated but is still possible with SmartyBC. + + CacheResource API + +In line with the Resource API, the CacheResource API offers a more +comfortable handling of output-cache data. With the +Smarty_CacheResource_Custom accessing databases is made simple. With +the introduction of Smarty_CacheResource_KeyValueStore the +implementation of resources like memcache or APC became a no-brainer; +simple hash-based storage systems are now supporting hierarchical +output-caches. + +See demo/plugins/cacheresource.mysql.php for an example custom +database CacheResource. +See demo/plugins/cacheresource.memcache.php for an example custom +memcache CacheResource using the KeyValueStore helper. + +Note that old-fashioned registration of $cache_handler is not possible +anymore. As the functionality had not been ported to Smarty 3.0.x +properly, it has been dropped from 3.1 completely. + +Locking facilities have been implemented to avoid concurrent cache +generation. Enable cache locking by setting +$smarty->cache_locking = true; + + Relative Paths in Templates (File-Resource) + +As of Smarty 3.1 {include file="../foo.tpl"} and {include +file="./foo.tpl"} will resolve relative to the template they're in. +Relative paths are available with {include file="..."} and +{extends file="..."}. As $smarty->fetch('../foo.tpl') and +$smarty->fetch('./foo.tpl') cannot be relative to a template, an +exception is thrown. + + Adressing a specific $template_dir + +Smarty 3.1 introduces the $template_dir index notation. +$smarty->fetch('[foo]bar.tpl') and {include file="[foo]bar.tpl"} +require the template bar.tpl to be loaded from $template_dir['foo']; +Smarty::setTemplateDir() and Smarty::addTemplateDir() offer ways to +define indexes along with the actual directories. + + Mixing Resources in extends-Resource + +Taking the php extends: template resource one step further, it is now +possible to mix resources within an extends: call like +$smarty->fetch("extends:file:foo.tpl|db:bar.tpl"); + +To make eval: and string: resources available to the inheritance +chain, eval:base64:TPL_STRING and eval:urlencode:TPL_STRING have been +introduced. Supplying the base64 or urlencode flags will trigger +decoding the TPL_STRING in with either base64_decode() or urldecode(). + + extends-Resource in template inheritance + +Template based inheritance may now inherit from php's extends: +resource like {extends file="extends:foo.tpl|db:bar.tpl"}. + + New Smarty property escape_html + +$smarty->escape_html = true will autoescape all template variable +output by calling htmlspecialchars({$output}, ENT_QUOTES, +SMARTY_RESOURCE_CHAR_SET). +NOTE: +This is a compile time option. If you change the setting you must make +sure that the templates get recompiled. + + New option at Smarty property compile_check + +The automatic recompilation of modified templates can now be +controlled by the following settings: +$smarty->compile_check = COMPILECHECK_OFF (false) - template files +will not be checked +$smarty->compile_check = COMPILECHECK_ON (true) - template files will +always be checked +$smarty->compile_check = COMPILECHECK_CACHEMISS - template files will +be checked if caching is enabled and there is no existing cache file +or it has expired + + Automatic recompilation on Smarty version change + +Templates will now be automatically recompiled on Smarty version +changes to avoide incompatibillities in the compiled code. Compiled +template checked against the current setting of the SMARTY_VERSION +constant. + + default_config_handler_func() + +Analogous to the default_template_handler_func() +default_config_handler_func() has been introduced. + + default_plugin_handler_func() + +An optional default_plugin_handler_func() can be defined which gets called +by the compiler on tags which can't be resolved internally or by plugins. +The default_plugin_handler() can map tags to plugins on the fly. + +New getters/setters + +The following setters/getters will be part of the official +documentation, and will be strongly recommended. Direct property +access will still work for the foreseeable future... it will be +transparently routed through the setters/getters, and consequently a +bit slower. + +array|string getTemplateDir( [string $index] ) +replaces $smarty->template_dir; and $smarty->template_dir[$index]; +Smarty setTemplateDir( array|string $path ) +replaces $smarty->template_dir = "foo"; and $smarty->template_dir = +array("foo", "bar"); +Smarty addTemplateDir( array|string $path, [string $index]) +replaces $smarty->template_dir[] = "bar"; and +$smarty->template_dir[$index] = "bar"; + +array|string getConfigDir( [string $index] ) +replaces $smarty->config_dir; and $smarty->config_dir[$index]; +Smarty setConfigDir( array|string $path ) +replaces $smarty->config_dir = "foo"; and $smarty->config_dir = +array("foo", "bar"); +Smarty addConfigDir( array|string $path, [string $index]) +replaces $smarty->config_dir[] = "bar"; and +$smarty->config_dir[$index] = "bar"; + +array getPluginsDir() +replaces $smarty->plugins_dir; +Smarty setPluginsDir( array|string $path ) +replaces $smarty->plugins_dir = "foo"; +Smarty addPluginsDir( array|string $path ) +replaces $smarty->plugins_dir[] = "bar"; + +string getCompileDir() +replaces $smarty->compile_dir; +Smarty setCompileDir( string $path ) +replaces $smarty->compile_dir = "foo"; + +string getCacheDir() +replaces $smarty->cache_dir; +Smarty setCacheDir( string $path ) +replaces $smarty->cache_dir; diff --git a/Widgets/smarty/change_log.txt b/Widgets/smarty/change_log.txt new file mode 100644 index 00000000..26bf137f --- /dev/null +++ b/Widgets/smarty/change_log.txt @@ -0,0 +1,1958 @@ +===== Smarty-3.1.7 ===== +18.12.2011 +- bugfix strings ending with " in multiline strings of config files failed to compile (isse #67) +- added chaining to Smarty_Internal_Templatebase +- changed unloadFilter() to not return a boolean in favor of chaining and API conformity +- bugfix unregisterObject() raised notice when object to unregister did not exist +- changed internals to use Smarty::$_MBSTRING ($_CHARSET, $_DATE_FORMAT) for better unit testing +- added Smarty::$_UTF8_MODIFIER for proper PCRE charset handling (Forum Topic 20452) +- added Smarty_Security::isTrustedUri() and Smarty_Security::$trusted_uri to validate + remote resource calls through {fetch} and {html_image} (Forum Topic 20627) + +17.12.2011 +- improvement of compiling speed by new handling of plain text blocks in the lexer/parser (issue #68) + +16.12.2011 +- bugfix the source exits flag and timestamp was not setup when template was in php include path (issue #69) + +9.12.2011 +- bugfix {capture} tags around recursive {include} calls did throw exception (Forum Topic 20549) +- bugfix $auto_literal = false did not work with { block} tags in child templates (Forum Topic 20581) +- bugfix template inheritance: do not include code of {include} in overloaded {block} into compiled + parent template (Issue #66} +- bugfix template inheritance: {$smarty.block.child} in nested child {block} tags did not return expected + result (Forum Topic 20564) + +===== Smarty-3.1.6 ===== +30.11.2011 +- bugfix is_cache() for individual cached subtemplates with $smarty->caching = CACHING_OFF did produce + an exception (Forum Topic 20531) + +29.11.2011 +- bugfix added exception if the default plugin handler did return a not static callback (Forum Topic 20512) + +25.11.2011 +- bugfix {html_select_date} and {html_slecet_time} did not default to current time if "time" was not specified + since r4432 (issue 60) + +24.11.2011 +- bugfix a subtemplate later used as main template did use old variable values + +21.11.2011 +- bugfix cache file could include unneeded modifier plugins under certain condition + +18.11.2011 +- bugfix declare all directory properties private to map direct access to getter/setter also on extended Smarty class + +16.11.2011 +- bugfix Smarty_Resource::load() did not always return a proper resource handler (Forum Topic 20414) +- added escape argument to html_checkboxes and html_radios (Forum Topic 20425) + +===== Smarty-3.1.5 ===== +14.11.2011 +- bugfix allow space between function name and open bracket (forum topic 20375) + +09.11.2011 +- bugfix different behaviour of uniqid() on cygwin. See https://bugs.php.net/bug.php?id=34908 + (forum topic 20343) + +01.11.2011 +- bugfix {if} and {while} tags without condition did not throw a SmartyCompilerException (Issue #57) +- bugfix multiline strings in config files could fail on longer strings (reopened Issue #55) + +22.10.2011 +- bugfix smarty_mb_from_unicode() would not decode unicode-points properly +- bugfix use catch Exception instead UnexpectedValueException in + clearCompiledTemplate to be PHP 5.2 compatible + +21.10.2011 +- bugfix apostrophe in plugins_dir path name failed (forum topic 20199) +- improvement sha1() for array keys longer than 150 characters +- add Smarty::$allow_ambiguous_resources to activate unique resource handling (Forum Topic 20128) + +20.10.2011 +- @silenced unlink() in Smarty_Internal_Write_File since debuggers go haywire without it. +- bugfix Smarty::clearCompiledTemplate() threw an Exception if $cache_id was not present in $compile_dir when $use_sub_dirs = true. +- bugfix {html_select_date} and {html_select_time} did not properly handle empty time arguments (Forum Topic 20190) +- improvement removed unnecessary sha1() + +19.10.2011 +- revert PHP4 constructor message +- fixed PHP4 constructor message + +===== Smarty-3.1.4 ===== +19.10.2011 +- added exception when using PHP4 style constructor + +16.10.2011 +- bugfix testInstall() did not propery check cache_dir and compile_dir + +15.10.2011 +- bugfix Smarty_Resource and Smarty_CacheResource runtime caching (Forum Post 75264) + +14.10.2011 +- bugfix unique_resource did not properly apply to compiled resources (Forum Topic 20128) +- add locking to custom resources (Forum Post 75252) +- add Smarty_Internal_Template::clearCache() to accompany isCached() fetch() etc. + +13.10.2011 +- add caching for config files in Smarty_Resource +- bugfix disable of caching after isCached() call did not work (Forum Topic 20131) +- add concept unique_resource to combat potentially ambiguous template_resource values when custom resource handlers are used (Forum Topic 20128) +- bugfix multiline strings in config files could fail on longer strings (Issue #55) + +11.10.2011 +- add runtime checks for not matching {capture}/{/capture} calls (Forum Topic 20120) + +10.10.2011 +- bugfix variable name typo in {html_options} and {html_checkboxes} (Issue #54) +- bugfix <?xml> tag did create wrong output when caching enabled and the tag was in included subtemplate +- bugfix Smarty_CacheResource_mysql example was missing strtotime() calls + +===== Smarty-3.1.3 ===== +07.10.2011 +- improvement removed html comments from {mailto} (Forum Topic 20092) +- bugfix testInstall() would not show path to internal plugins_dir (Forum Post 74627) +- improvement testInstall() now showing resolved paths and checking the include_path if necessary +- bugfix html_options plugin did not handle object values properly (Issue #49, Forum Topic 20049) +- improvement html_checkboxes and html_radios to accept null- and object values, and label_ids attribute +- improvement removed some unnecessary count()s +- bugfix parent pointer was not set when fetch() for other template was called on template object + +06.10.2011 +- bugfix switch lexer internals depending on mbstring.func_overload +- bugfix start_year and end_year of {html_select_date} did not use current year as offset base (Issue #53) + +05.10.2011 +- bugfix of problem introduced with r4342 by replacing strlen() with isset() +- add environment configuration issue with mbstring.func_overload Smarty cannot compensate for (Issue #45) +- bugfix nofilter tag option did not disable default modifier +- bugfix html_options plugin did not handle null- and object values properly (Issue #49, Forum Topic 20049) + +04.10.2011 +- bugfix assign() in plugins called in subtemplates did change value also in parent template +- bugfix of problem introduced with r4342 on math plugin +- bugfix output filter should not run on individually cached subtemplates +- add unloadFilter() method +- bugfix has_nocache_code flag was not reset before compilation + +===== Smarty-3.1.2 ===== +03.10.2011 +- improvement add internal $joined_template_dir property instead computing it on the fly several times + +01.10.2011 +- improvement replaced most in_array() calls by more efficient isset() on array_flip()ed haystacks +- improvement replaced some strlen($foo) > 3 calls by isset($foo[3]) +- improvement Smarty_Internal_Utility::clearCompiledTemplate() removed redundant strlen()s + +29.09.2011 +- improvement of Smarty_Internal_Config::loadConfigVars() dropped the in_array for index look up + +28.09.2011 +- bugfix on template functions called nocache calling other template functions + +27.09.2011 +- bugfix possible warning "attempt to modify property of non-object" in {section} (issue #34) +- added chaining to Smarty_Internal_Data so $smarty->assign('a',1)->assign('b',2); is possible now +- bugfix remove race condition when a custom resource did change timestamp during compilation +- bugfix variable property did not work on objects variable in template +- bugfix smarty_make_timestamp() failed to process DateTime objects properly +- bugfix wrong resource could be used on compile check of custom resource + +26.09.2011 +- bugfix repeated calls to same subtemplate did not make use of cached template object + +24.09.2011 +- removed internal muteExpectedErrors() calls in favor of having the implementor call this once from his application +- optimized muteExpectedErrors() to pass errors to the latest registered error handler, if appliccable +- added compile_dir and cache_dir to list of muted directories +- improvment better error message for undefined templates at {include} + +23.09.2011 +- remove unused properties +- optimization use real function instead anonymous function for preg_replace_callback +- bugfix a relative {include} in child template blocks failed +- bugfix direct setting of $template_dir, $config_dir, $plugins_dir in __construct() of an + extended Smarty class created problems +- bugfix error muting was not implemented for cache locking + +===== Smarty 3.1.1 ===== +22.09.2011 +- bugfix {foreachelse} does fail if {section} was nested inside {foreach} +- bugfix debug.tpl did not display correctly when it was compiled with escape_html = true + +21.09.2011 +- bugfix look for mixed case plugin file names as in 3.0 if not found try all lowercase +- added $error_muting to suppress error messages even for badly implemented error_handlers +- optimized autoloader +- reverted ./ and ../ handling in fetch() and display() - they're allowed again + +20.09.2011 +- bugfix removed debug echo output while compiling template inheritance +- bugfix relative paths in $template_dir broke relative path resolving in {include "../foo.tpl"} +- bugfix {include} did not work inside nested {block} tags +- bugfix {assign} with scope root and global did not work in all cases + +19.09.2011 +- bugfix regression in Smarty_CacheReource_KeyValueStore introduced by r4261 +- bugfix output filter shall not run on included subtemplates + +18.09.2011 +- bugfix template caching did not care about file.tpl in different template_dir +- bugfix {include $file} was broken when merge_compiled_incluges = true +- bugfix {include} was broken when merge_compiled_incluges = true and same indluded template + was used in different main templates in one compilation run +- bugfix for Smarty2 style compiler plugins on unnamed attribute passing like {tag $foo $bar} +- bugfix debug.tpl did not display correctly when it was compiled with escape_html = true + +17.09.2011 +- bugfix lock_id for file resource would create invalid filepath +- bugfix resource caching did not care about file.tpl in different template_dir + +===== Smarty 3.1.0 ===== +15/09/2011 +- optimization of {foreach}; call internal _count() method only when "total" or "last" {foreach} properties are used + +11/09/2011 +- added unregisterObject() methode + +06/09/2011 +- bugfix isset() did not work in templates on config variables + +03/09/2011 +- 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 + name but different folders seperated +- added cacheresource.apc.php example in demo folder + +02/09/2011 +- bugfix cache lock file must use absolute filepath + +01/09/2011 +- update of cache locking + +30/08/2011 +- added locking mechanism to CacheResource API (implemented with File and KeyValueStores) + +28/08/2011 +- bugfix clearCompileTemplate() did not work for specific template subfolder or resource + +27/08/2011 +- bugfix {$foo|bar+1} did create syntax error + +26/08/2011 +- bugfix when generating nocache code which contains double \ +- bugfix handle race condition if cache file was deleted between filemtime and include + +17/08/2011 +- bugfix CacheResource_Custom bad internal fetch() call + +15/08/2011 +- bugfix CacheResource would load content twice for KeyValueStore and Custom handlers + +06/08/2011 +- bugfix {include} with scope attribute could execute in wrong scope +- optimization of compile_check processing + +03/08/2011 +- allow comment tags to comment {block} tags out in child templates + +26/07/2011 +- bugfix experimental getTags() method did not work + +24/07/2011 +- sure opened output buffers are closed on exception +- bugfix {foreach} did not work on IteratorAggregate + +22/07/2011 +- clear internal caches on clearAllCache(), clearCache(), clearCompiledTemplate() + +21/07/2011 +- bugfix value changes of variable values assigned to Smarty object could not be seen on repeated $smarty->fetch() calls + +17/07/2011 +- bugfix {$smarty.block.child} did drop a notice at undefined child + +15/07/2011 +- bugfix individual cache_lifetime of {include} did not work correctly inside {block} tags +- added caches for Smarty_Template_Source and Smarty_Template_Compiled to reduce I/O for multiple cache_id rendering + +14/07/2011 +- made Smarty::loadPlugin() respect the include_path if required + +13/07/2011 +- optimized internal file write functionality +- bugfix PHP did eat line break on nocache sections +- fixed typo of Smarty_Security properties $allowed_modifiers and $disabled_modifiers + +06/07/2011 +- bugfix variable modifier must run befor gereral filtering/escaping + +04/07/2011 +- bugfix use (?P<name>) syntax at preg_match as some pcre libraries failed on (?<name>) +- some performance improvement when using generic getter/setter on template objects + +30/06/2011 +- bugfix generic getter/setter of Smarty properties used on template objects did throw exception +- removed is_dir and is_readable checks from directory setters for better performance + +28/06/2011 +- added back support of php template resource as undocumented feature +- bugfix automatic recompilation on version change could drop undefined index notice on old 3.0 cache and compiled files +- update of README_3_1_DEV.txt and moved into the distribution folder +- improvement show first characters of eval and string templates instead sha1 Uid in debug window + +===== Smarty 3.1-RC1 ===== +25/06/2011 +- revert change of 17/06/2011. $_smarty varibale removed. call loadPlugin() from inside plugin code if required +- code cleanup, remove no longer used properties and methods +- update of PHPdoc comments + +23/06/2011 +- bugfix {html_select_date} would not respect current time zone + +19/06/2011 +- added $errors argument to testInstall() functions to suppress output. +- added plugin-file checks to testInstall() + +18/06/2011 +- bugfix mixed use of same subtemplate inline and not inline in same script could cause a warning during compilation + +17/06/2011 +- bugfix/change use $_smarty->loadPlugin() when loading nested depending plugins via loadPlugin +- bugfix {include ... inline} within {block}...{/block} did fail + +16/06/2011 +- bugfix do not overwrite '$smarty' template variable when {include ... scope=parent} is called +- bugfix complete empty inline subtemplates did fail + +15/06/2011 +- bugfix template variables where not accessable within inline subtemplates + +12/06/2011 +- bugfix removed unneeded merging of template variable when fetching includled subtemplates + +10/06/2011 +- made protected properties $template_dir, $plugins_dir, $cache_dir, $compile_dir, $config_dir accessible via magic methods + +09/06/2011 +- fix smarty security_policy issue in plugins {html_image} and {fetch} + +05/06/2011 +- update of SMARTY_VERSION +- bugfix made getTags() working again + +04/06/2011 +- allow extends resource in file attribute of {extends} tag + +03/06/2011 +- added {setfilter} tag to set filters for variable output +- added escape_html property to control autoescaping of variable output + +27/05/2011 +- added allowed/disabled tags and modifiers in security for sandboxing + +23/05/2011 +- added base64: and urlencode: arguments to eval and string resource types + +22/05/2011 +- made time-attribute of {html_select_date} and {html_select_time} accept arrays as defined by attributes prefix and field_array + +13/05/2011 +- remove setOption / getOption calls from SamrtyBC class + +02/05/2011 +- removed experimental setOption() getOption() methods +- output returned content also on opening tag calls of block plugins +- rewrite of default plugin handler +- compile code of variable filters for better performance + +20/04/2011 +- allow {php} {include_php} tags and PHP_ALLOW handling only with the SmartyBC class +- removed support of php template resource + +20/04/2011 +- added extendsall resource example +- optimization of template variable access +- optimization of subtemplate handling {include} +- optimization of template class + +01/04/2011 +- bugfix quote handling in capitalize modifier + +28/03/2011 +- bugfix stripslashes() requried when using PCRE e-modifier + +04/03/2011 +- upgrade to new PHP_LexerGenerator version 0.4.0 for better performance + +27/02/2011 +- ignore .svn folders when clearing cache and compiled files +- string resources do not need a modify check + +26/02/2011 +- replaced smarty_internal_wrapper by SmartyBC class +- load utility functions as static methods instead through __call() +- bugfix in extends resource when subresources are used +- optimization of modify checks + +25/02/2011 +- use $smarty->error_unassigned to control NOTICE handling on unassigned variables + +21/02/2011 +- added new new compile_check mode COMPILECHECK_CACHEMISS +- corrected new cloning behaviour of createTemplate() +- do no longer store the compiler object as property in the compile_tag classes to avoid possible memory leaks + during compilation + +19/02/2011 +- optimizations on merge_compiled_includes handling +- a couple of optimizations and bugfixes related to new resource structure + +17/02/2011 +- changed ./ and ../ behaviour + +14/02/2011 +- added {block ... hide} option to supress block if no child is defined + +13/02/2011 +- update handling of recursive subtemplate calls +- bugfix replace $smarty->triggerError() by exception in smarty_internal_resource_extends.php + +12/02/2011 +- new class Smarty_Internal_TemplateBase with shared methods of Smarty and Template objects +- optimizations of template processing +- made register... methods permanet +- code for default_plugin_handler +- add automatic recompilation at version change + +04/02/2011 +- change in Smarty_CacheResource_Custom +- bugfix cache_lifetime did not compile correctly at {include} after last update +- moved isCached processing into CacheResource class +- bugfix new CacheResource API did not work with disabled compile_check + +03/02/2011 +- handle template content as function to improve speed on multiple calls of same subtemplate and isCached()/display() calls +- bugfixes and improvents in the new resource API +- optimizations of template class code + +25/01/2011 +- optimized function html_select_time + +22/01/2011 +- added Smarty::$use_include_path configuration directive for Resource API + +21/01/2011 +- optimized function html_select_date + +19/01/2011 +- optimized outputfilter trimwhitespace + +18/01/2011 +- bugfix Config to use Smarty_Resource to fetch sources +- optimized Smarty_Security's isTrustedDir() and isTrustedPHPDir() + +17/01/2011 +- bugfix HTTP headers for CGI SAPIs + +16/01/2011 +- optimized internals of Smarty_Resource and Smarty_CacheResource + +14/01/2011 +- added modifiercompiler escape to improve performance of escaping html, htmlall, url, urlpathinfo, quotes, javascript +- added support to choose template_dir to load from: [index]filename.tpl + +12/01/2011 +- added unencode modifier to revert results of encode modifier +- added to_charset and from_charset modifier for character encoding + +11/01/2011 +- added SMARTY_MBSTRING to generalize MBString detection +- added argument $lc_rest to modifier.capitalize to lower-case anything but the first character of a word +- changed strip modifier to consider unicode white-space, too +- changed wordwrap modifier to accept UTF-8 strings +- changed count_sentences modifier to consider unicode characters and treat sequences delimited by ? and ! as sentences, too +- added argument $double_encode to modifier.escape (applies to html and htmlall only) +- changed escape modifier to be UTF-8 compliant +- changed textformat block to be UTF-8 compliant +- optimized performance of mailto function +- fixed spacify modifier so characters are not prepended and appended, made it unicode compatible +- fixed truncate modifier to properly use mb_string if possible +- removed UTF-8 frenzy from count_characters modifier +- fixed count_words modifier to treat "hello-world" as a single word like str_count_words() does +- removed UTF-8 frenzy from upper modifier +- removed UTF-8 frenzy from lower modifier + +01/01/2011 +- optimize smarty_modified_escape for hex, hexentity, decentity. + +28/12/2010 +- changed $tpl_vars, $config_vars and $parent to belong to Smarty_Internal_Data +- added Smarty::registerCacheResource() for dynamic cache resource object registration + +27/12/2010 +- added Smarty_CacheResource API and refactored existing cache resources accordingly +- added Smarty_CacheResource_Custom and Smarty_CacheResource_Mysql + +26/12/2010 +- added Smarty_Resource API and refactored existing resources accordingly +- added Smarty_Resource_Custom and Smarty_Resource_Mysql +- bugfix Smarty::createTemplate() to return properly cloned template instances + +24/12/2010 +- optimize smarty_function_escape_special_chars() for PHP >= 5.2.3 + +===== SVN 3.0 trunk ===== +14/05/2011 +- bugfix error handling at stream resources + +13/05/2011 +- bugfix condition starting with "-" did fail at {if} and {while} tags + +22/04/2011 +- bugfix allow only fixed string as file attribute at {extends} tag + +01/04/2011 +- bugfix do not run filters and default modifier when displaying the debug template +- bugfix of embedded double quotes within multi line strings (""") + +29/03/2011 +- bugfix on error message in smarty_internal_compile_block.php +- bugfix mb handling in strip modifier +- bugfix for Smarty2 style registered compiler function on unnamed attribute passing like {tag $foo $bar} + +17/03/2011 +- bugfix on default {function} parameters when {function} was used in nocache sections +- bugfix on compiler object destruction. compiler_object property was by mistake unset. + +09/03/2011 +-bugfix a variable filter should run before modifers on an output tag (see change of 23/07/2010) + +08/03/2011 +- bugfix loading config file without section should load only defaults + +03/03/2011 +- bugfix "smarty" template variable was not recreated when cached templated had expired +- bugfix internal rendered_content must be cleared after subtemplate was included + +01/03/2011 +- bugfix replace modifier did not work in 3.0.7 on systems without multibyte support +- bugfix {$smarty.template} could return in 3.0.7 parent template name instead of + child name when it needed to compile + +25/02/2011 +- bugfix for Smarty2 style compiler plugins on unnamed attribute passing like {tag $foo $bar} + +24/02/2011 +- bugfix $smarty->clearCache('some.tpl') did by mistake cache the template object + +18/02/2011 +- bugfix removed possible race condition when isCached() was called for an individually cached subtemplate +- bugfix force default debug.tpl to be loaded by the file resource + +17/02/2011 +-improvement not to delete files starting with '.' from cache and template_c folders on clearCompiledTemplate() and clearCache() + +16/02/2011 +-fixed typo in exception message of Smarty_Internal_Template +-improvement allow leading spaces on } tag closing if auto_literal is enabled + +13/02/2011 +- bufix replace $smarty->triggerError() by exception +- removed obsolete {popup_init..} plugin from demo templates +- bugfix replace $smarty->triggerError() by exception in smarty_internal_resource_extends.php + +===== Smarty 3.0.7 ===== +09/02/2011 +- patched vulnerability when using {$smarty.template} + +01/02/2011 +- removed assert() from config and template parser + +31/01/2011 +- bugfix the lexer/parser did fail on special characters like VT + +16/01/2011 +-bugfix of ArrayAccess object handling in internal _count() method +-bugfix of Iterator object handling in internal _count() method + +14/01/2011 +-bugfix removed memory leak while processing compileAllTemplates + +12/01/2011 +- bugfix in {if} and {while} tag compiler when using assignments as condition and nocache mode + +10/01/2011 +- bugfix when using {$smarty.block.child} and name of {block} was in double quoted string +- bugfix updateParentVariables() was called twice when leaving {include} processing + +- bugfix mb_str_replace in replace and escape modifiers work with utf8 + +31/12/2010 +- bugfix dynamic configuration of $debugging_crtl did not work +- bugfix default value of $config_read_hidden changed to false +- bugfix format of attribute array on compiler plugins +- bugfix getTemplateVars() could return value from wrong scope + +28/12/2010 +- bugfix multiple {append} tags failed to compile. + +22/12/2010 +- update do not clone the Smarty object an internal createTemplate() calls to increase performance + +21/12/2010 +- update html_options to support class and id attrs + +17/12/2010 +- bugfix added missing support of $cache_attrs for registered plugins + +15/12/2010 +- bugfix assignment as condition in {while} did drop an E_NOTICE + +14/12/2010 +- bugfix when passing an array as default parameter at {function} tag + +13/12/2010 +- bugfix {$smarty.template} in child template did not return right content +- bugfix Smarty3 did not search the PHP include_path for template files + +===== Smarty 3.0.6 ===== + +12/12/2010 +- bugfix fixed typo regarding yesterdays change to allow streamWrapper + +11/12/2010 +- bugfix nested block tags in template inheritance child templates did not work correctly +- bugfix {$smarty.current_dir} in child template did not point to dir of child template +- bugfix changed code when writing temporary compiled files to allow stream_wrapper + +06/12/2010 +- bugfix getTemplateVars() should return 'null' instead dropping E_NOTICE on an unassigned variable + +05/12/2010 +- bugfix missing declaration of $smarty in Smarty class +- bugfix empty($foo) in {if} did drop a notice when $foo was not assigned + +01/12/2010 +- improvement of {debug} tag output + +27/11/2010 +-change run output filter before cache file is written. (same as in Smarty2) + +24/11/2011 +-bugfix on parser at !$foo|modifier +-change parser logic when assignments used as condition in {if] and {while} to allow assign to array element + +23/11/2011 +-bugfix allow integer as attribute name in plugin calls +-change trimm whitespace from error message, removed long list of expected tokens + +22/11/2010 +- bugfix on template inheritance when an {extends} tag was inserted by a prefilter +- added error message for illegal variable file attributes at {extends...} tags + +===== Smarty 3.0.5 ===== + + +19/11/2010 +- bugfix on block plugins with modifiers + +18/11/2010 +- change on handling of unassigned template variable -- default will drop E_NOTICE +- bugfix on Smarty2 wrapper load_filter() did not work + +17/11/2010 +- bugfix on {call} with variable function name +- bugfix on {block} if name did contain '-' +- bugfix in function.fetch.php , referece to undefined $smarty + +16/11/2010 +- bugfix whitespace in front of "<?php" in smarty_internal_compile_private_block_plugin.php +- bugfix {$smarty.now} did compile incorrectly +- bugfix on reset(),end(),next(),prev(),current() within templates +- bugfix on default parameter for {function} + +15/11/2010 +- bugfix when using {$smarty.session} as object +- bugfix scoping problem on $smarty object passed to filters +- bugfix captured content could not be accessed globally +- bugfix Smarty2 wrapper functions could not be call from within plugins + +===== Smarty 3.0.4 ===== + +14/11/2010 +- bugfix isset() did not allow multiple parameter +- improvment of some error messages +- bugfix html_image did use removed property $request_use_auto_globals +- small performace patch in Smarty class + +13/11/2010 +- bugfix overloading problem when $smarty->fetch()/display() have been used in plugins + (introduced with 3.0.2) +- code cleanup + +===== Smarty 3.0.3 ===== + +13/11/2010 +- bugfix on {debug} +- reverted location of loadPlugin() to Smarty class +- fixed comments in plugins +- fixed internal_config (removed unwanted code line) +- improvement remove last linebreak from {function} definition + +===== Smarty 3.0.2 ===== + +12/11/2010 +- reactivated $error_reporting property handling +- fixed typo in compile_continue +- fixed security in {fetch} plugin +- changed back plugin parameters to two. second is template object + with transparent access to Smarty object +- fixed {config_load} scoping form compile time to run time + +===== Smarty 3.0.0 ===== + + + +11/11/2010 +- major update including some API changes + +10/11/2010 +- observe compile_id also for config files + +09/11/2010 +-bugfix on complex expressions as start value for {for} tag +request_use_auto_globals +04/11/2010 +- bugfix do not allow access of dynamic and private object members of assigned objects when + security is enabled. + +01/11/2010 +- bugfix related to E_NOTICE change. {if empty($foo)} did fail when $foo contained a string + +28/10/2010 +- bugfix on compiling modifiers within $smarty special vars like {$smarty.post.{$foo|lower}} + +27/10/2010 +- bugfix default parameter values did not work for template functions included with {include} + +25/10/2010 +- bugfix for E_NOTICE change, array elements did not work as modifier parameter + +20/10/2010 +- bugfix for the E_NOTICE change + +19/10/2010 +- change Smarty does no longer mask out E_NOTICE by default during template processing + +13/10/2010 +- bugfix removed ambiguity between ternary and stream variable in template syntax +- bugfix use caching properties of template instead of smarty object when compiling child {block} +- bugfix {*block}...{/block*} did throw an exception in template inheritance +- bugfix on template inheritance using nested eval or string resource in {extends} tags +- bugfix on output buffer handling in isCached() method + +===== RC4 ===== + +01/10/2010 +- added {break} and {continue} tags for flow control of {foreach},{section},{for} and {while} loops +- change of 'string' resource. It's no longer evaluated and compiled files are now stored +- new 'eval' resource which evaluates a template without saving the compiled file +- change in isCached() method to allow multiple calls for the same template + +25/09/2010 +- bugfix on some compiling modifiers + +24/09/2010 +- bugfix merge_compiled_includes flag was not restored correctly in {block} tag + +22/09/2010 +- bugfix on default modifier + +18/09/2010 +- bugfix untility compileAllConfig() did not create sha1 code for compiled template file names if template_dir was defined with no trailing DS +- bugfix on templateExists() for extends resource + +17/09/2010 +- bugfix {$smarty.template} and {$smarty.current_dir} did not compile correctly within {block} tags +- bugfix corrected error message on missing template files in extends resource +- bugfix untility compileAllTemplates() did not create sha1 code for compiled template file names if template_dir was defined with no trailing DS + +16/09/2010 +- bugfix when a doublequoted modifier parameter did contain Smarty tags and ':' + +15/09/2010 +- bugfix resolving conflict between '<%'/'%>' as custom Smarty delimiter and ASP tags +- use ucfirst for resource name on internal resource class names + +12/09/2010 +- bugfix for change of 08/09/2010 (final {block} tags in subtemplates did not produce correct results) + +10/09/2010 +- bugfix for change of 08/09/2010 (final {block} tags in subtemplates did not produce correct results) + +08/09/2010 +- allow multiple template inheritance branches starting in subtemplates + +07/09/2010 +- bugfix {counter} and {cycle} plugin assigned result to smarty variable not in local(template) scope +- bugfix templates containing just {strip} {/strip} tags did produce an error + + +23/08/2010 +- fixed E_STRICT errors for uninitialized variables + +22/08/2010 +- added attribute cache_id to {include} tag + +13/08/2010 +- remove exception_handler property from Smarty class +- added Smarty's own exceptions SmartyException and SmartyCompilerException + +09/08/2010 +- bugfix on modifier with doublequoted strings as parameter containing embedded tags + +06/08/2010 +- bugfix when cascading some modifier like |strip|strip_tags modifier + +05/08/2010 +- added plugin type modifiercompiler to produce compiled modifier code +- changed standard modifier plugins to the compiling versions whenever possible +- bugfix in nocache sections {include} must not cache the subtemplate + +02/08/2010 +- bugfix strip did not work correctly in conjunction with comment lines + +31/07/2010 +- bugfix on nocache attribute at {assign} and {append} + +30/07/2010 +- bugfix passing scope attributes in doublequoted strings did not work at {include} {assign} and {append} + +25/07/2010 +- another bugfix of change from 23/07/2010 when compiling modifer + +24/07/2010 +- bugfix of change from 23/07/2010 when compiling modifer + +23/07/2010 +- changed execution order. A variable filter does now run before modifiers on output of variables +- bugfix use always { and } as delimiter for debug.tpl + + +22/07/2010 +- bugfix in templateExists() methode + +20/07/2010 +- fixed handling of { strip } tag with whitespaces + +15/07/2010 +- bufix {$smarty.template} does include now the relative path, not just filename + +===== RC3 ===== + + + + +15/07/2010 +- make the date_format modifier work also on objects of the DateTime class +- implementation of parsetrees in the parser to close security holes and remove unwanted empty line in HTML output + +08/07/2010 +- bugfix on assigning multidimensional arrays within templates +- corrected bugfix for truncate modifier + +07/07/2010 +- bugfix the truncate modifier needs to check if the string is utf-8 encoded or not +- bugfix support of script files relative to trusted_dir + +06/07/2010 +- create exception on recursive {extends} calls +- fixed reported line number at "unexpected closing tag " exception +- bugfix on escape:'mail' modifier +- drop exception if 'item' variable is equal 'from' variable in {foreach} tag + +01/07/2010 +- removed call_user_func_array calls for optimization of compiled code when using registered modifiers and plugins + +25/06/2010 +- bugfix escaping " when block tags are used within doublequoted strings + +24/06/2010 +- replace internal get_time() calls with standard PHP5 microtime(true) calls in Smarty_Internal_Utility +- added $smarty->register->templateClass() and $smarty->unregister->templateClass() methods for supporting static classes with namespace + + +22/06/2010 +- allow spaces between typecast and value in template syntax +- bugfix get correct count of traversables in {foreach} tag + +21/06/2010 +- removed use of PHP shortags SMARTY_PHP_PASSTHRU mode +- improved speed of cache->clear() when a compile_id was specified and use_sub_dirs is true + +20/06/2010 +- replace internal get_time() calls with standard PHP5 microtime(true) calls +- closed security hole when php.ini asp_tags = on + +18/06/2010 +- added __toString method to the Smarty_Variable class + + +14/06/2010 +- make handling of Smarty comments followed by newline BC to Smarty2 + + +===== RC2 ===== + + + +13/06/2010 +- bugfix Smarty3 did not handle hexadecimals like 0x0F as numerical value +- bugifx Smarty3 did not accept numerical constants like .1 or 2. (without a leading or trailing digit) + +11/06/2010 +- bugfix the lexer did fail on larger {literal} ... {/literal} sections + +03/06/2010 +- bugfix on calling template functions like Smarty tags + +01/06/2010 +- bugfix on template functions used with template inheritance +- removed /* vim: set expandtab: */ comments +- bugfix of auto literal problem introduce with fix of 31/05/2010 + +31/05/2010 +- bugfix the parser did not allow some smarty variables with special name like $for, $if, $else and others. + +27/05/2010 +- bugfix on object chaining using variable properties +- make scope of {counter} and {cycle} tags again global as in Smarty2 + +26/05/2010 +- bugfix removed decrepated register_resource call in smarty_internal_template.php + +25/05/2010 +- rewrite of template function handling to improve speed +- bugfix on file dependency when merge_compiled_includes = true + + +16/05/2010 +- bugfix when passing parameter with numeric name like {foo 1='bar' 2='blar'} + +14/05/2010 +- bugfix compile new config files if compile_check and force_compile = false +- added variable static classes names to template syntax + +11/05/2010 +- bugfix make sure that the cache resource is loaded in all conditions when template methods getCached... are called externally +- reverted the change 0f 30/04/2010. With the exception of forward references template functions can be again called by a standard tag. + +10/05/2010 +- bugfix on {foreach} and {for} optimizations of 27/04/2010 + +09/05/2010 +- update of template and config file parser because of minor parser generator bugs + +07/05/2010 +- bugfix on {insert} + +06/05/2010 +- bugfix when merging compiled templates and objects are passed as parameter of the {include} tag + +05/05/2010 +- bugfix on {insert} to cache parameter +- implementation of $smarty->default_modifiers as in Smarty2 +- bugfix on getTemplateVars method + +01/05/2010 +- bugfix on handling of variable method names at object chaning + +30/04/2010 +- bugfix when comparing timestamps in sysplugins/smarty_internal_config.php +- work around of a substr_compare bug in older PHP5 versions +- bugfix on template inheritance for tag names starting with "block" +- bugfix on {function} tag with name attribute in doublequoted strings +- fix to make calling of template functions unambiguously by madatory usage of the {call} tag + +===== RC1 ===== + +27/04/2010 +- change default of $debugging_ctrl to 'NONE' +- optimization of compiled code of {foreach} and {for} loops +- change of compiler for config variables + +27/04/2010 +- bugfix in $smarty->cache->clear() method. (do not cache template object) + + +17/04/2010 +- security fix in {math} plugin + + +12/04/2010 +- bugfix in smarty_internal_templatecompilerbase (overloaded property) +- removed parser restrictions in using true,false and null as ID + +07/04/2010 +- bugfix typo in smarty_internal_templatecompilerbase + +31/03/2010 +- compile locking by touching old compiled files to avoid concurrent compilations + +29/03/2010 +- bugfix allow array definitions as modifier parameter +- bugfix observe compile_check property when loading config files +- added the template object as third filter parameter + +25/03/2010 +- change of utility->compileAllTemplates() log messages +- bugfix on nocache code in {function} tags +- new method utility->compileAllConfig() to compile all config files + +24/03/2010 +- bugfix on register->modifier() error messages + +23/03/2010 +- bugfix on template inheritance when calling multiple child/parent relations +- bugfix on caching mode SMARTY_CACHING_LIFETIME_SAVED and cache_lifetime = 0 + +22/03/2010 +- bugfix make directory separator operating system independend in compileAllTemplates() + +21/03/2010 +- removed unused code in compileAllTemplates() + +19/03/2010 +- bugfix for multiple {/block} tags on same line + +17/03/2010 +- bugfix make $smarty->cache->clear() function independent from caching status + +16/03/2010 +- bugfix on assign attribute at registered template objects +- make handling of modifiers on expression BC to Smarty2 + +15/03/2010 +- bugfix on block plugin calls + +11/03/2010 +- changed parsing of <?php and ?> back to Smarty2 behaviour + +08/03/2010 +- bugfix on uninitialized properties in smarty_internal_template +- bugfix on $smarty->disableSecurity() + +04/03/2010 +- bugfix allow uppercase chars in registered resource names +- bugfix on accessing chained objects of static classes + +01/03/2010 +- bugfix on nocache code in {block} tags if child template was included by {include} + +27/02/2010 +- allow block tags inside double quoted string + +26/02/2010 +- cache modified check implemented +- support of access to a class constant from an object (since PHP 5.3) + +24/02/2010 +- bugfix on expressions in doublequoted string enclosed in backticks +- added security property $static_classes for static class security + +18/02/2010 +- bugfix on parsing Smarty tags inside <?xml ... ?> +- bugfix on truncate modifier + +17/02/2010 +- removed restriction that modifiers did require surrounding parenthesis in some cases +- added {$smarty.block.child} special variable for template inheritance + +16/02/2010 +- bugfix on <?xml ... ?> tags for all php_handling modes +- bugfix on parameter of variablefilter.htmlspecialchars.php plugin + +14/02/2010 +- added missing _plugins property in smarty.class.php +- bugfix $smarty.const... inside doublequoted strings and backticks was compiled into wrong PHP code + +12/02/2010 +- bugfix on nested {block} tags +- changed Smarty special variable $smarty.parent to $smarty.block.parent +- added support of nested {bock} tags + +10/02/2010 +- avoid possible notice on $smarty->cache->clear(...), $smarty->clear_cache(....) +- allow Smarty tags inside <? ... ?> tags in SMARTY_PHP_QUOTE and SMARTY_PHP_PASSTHRU mode +- bugfix at new "for" syntax like {for $x=1 to 10 step 2} + +09/02/2010 +- added $smarty->_tag_stack for tracing block tag hierarchy + +08/02/2010 +- bugfix use template fullpath at §smarty->cache->clear(...), $smarty->clear_cache(....) +- bugfix of cache filename on extended templates when force_compile=true + +07/02/2010 +- bugfix on changes of 05/02/2010 +- preserve line endings type form template source +- API changes (see README file) + +05/02/2010 +- bugfix on modifier and block plugins with same name + +02/02/2010 +- retaining newlines at registered functions and function plugins + +01/25/2010 +- bugfix cache resource was not loaded when caching was globally off but enabled at a template object +- added test that $_SERVER['SCRIPT_NAME'] does exist in Smarty.class.php + +01/22/2010 +- new method $smarty->createData([$parent]) for creating a data object (required for bugfixes below) +- bugfix config_load() method now works also on a data object +- bugfix get_config_vars() method now works also on a data and template objects +- bugfix clear_config() method now works also on a data and template objects + +01/19/2010 +- bugfix on plugins if same plugin was called from a nocache section first and later from a cached section + + +###beta 7### + + +01/17/2010 +- bugfix on $smarty.const... in double quoted strings + +01/16/2010 +- internal change of config file lexer/parser on handling of section names +- bugfix on registered objects (format parameter of register_object was not handled correctly) + +01/14/2010 +- bugfix on backslash within single quoted strings +- bugfix allow absolute filepath for config files +- bugfix on special Smarty variable $smarty.cookies +- revert handling of newline on no output tags like {if...} +- allow special characters in config file section names for Smarty2 BC + +01/13/2010 +- bugfix on {if} tags + +01/12/2010 +- changed back modifer handling in parser. Some restrictions still apply: + if modifiers are used in side {if...} expression or in mathematical expressions + parentheses must be used. +- bugfix the {function..} tag did not accept the name attribute in double quotes +- closed possible security hole at <?php ... ?> tags +- bugfix of config file parser on large config files + + +###beta 6#### + +01/11/2010 +- added \n to the compiled code of the {if},{else},{elseif},{/if} tags to get output of newlines as expected by the template source +- added missing support of insert plugins +- added optional nocache attribute to {block} tags in parent template +- updated <?php...?> handling supporting now heredocs and newdocs. (thanks to Thue Jnaus Kristensen) + +01/09/2010 +- bugfix on nocache {block} tags in parent templates + +01/08/2010 +- bugfix on variable filters. filter/nofilter attributes did not work on output statements + +01/07/2010 +- bugfix on file dependency at template inheritance +- bugfix on nocache code at template inheritance + +01/06/2010 +- fixed typo in smarty_internal_resource_registered +- bugfix for custom delimiter at extends resource and {extends} tag + +01/05/2010 +- bugfix sha1() calculations at extends resource and some general improvments on sha1() handling + + +01/03/2010 +- internal change on building cache files + +01/02/2010 +- update cached_timestamp at the template object after cache file is written to avoid possible side effects +- use internally always SMARTY_CACHING_LIFETIME_* constants + +01/01/2010 +- bugfix for obtaining plugins which must be included (related to change of 12/30/2009) +- bugfix for {php} tag (trow an exception if allow_php_tag = false) + +12/31/2009 +- optimization of generated code for doublequoted strings containing variables +- rewrite of {function} tag handling + - can now be declared in an external subtemplate + - can contain nocache sections (nocache_hash handling) + - can be called in noccache sections (nocache_hash handling) + - new {call..} tag to call template functions with a variable name {call name=$foo} +- fixed nocache_hash handling in merged compiled templates + +12/30/2009 +- bugfix for plugins defined in the script as smarty_function_foo + +12/29/2009 +- use sha1() for filepath encoding +- updates on nocache_hash handling +- internal change on merging some data +- fixed cache filename for custom resources + +12/28/2009 +- update for security fixes +- make modifier plugins always trusted +- fixed bug loading modifiers in child template at template inheritance + +12/27/2009 +--- this is a major update with a couple of internal changes --- +- new config file lexer/parser (thanks to Thue Jnaus Kristensen) +- template lexer/parser fixes for PHP and {literal} handing (thanks to Thue Jnaus Kristensen) +- fix on registered plugins with different type but same name +- rewrite of plugin handling (optimized execution speed) +- closed a security hole regarding PHP code injection into cache files +- fixed bug in clear cache handling +- Renamed a couple of internal classes +- code cleanup for merging compiled templates +- couple of runtime optimizations (still not all done) +- update of getCachedTimestamp() +- fixed bug on modifier plugins at nocache output + +12/19/2009 +- bugfix on comment lines in config files + +12/17/2009 +- bugfix of parent/global variable update at included/merged subtemplates +- encode final template filepath into filename of compiled and cached files +- fixed {strip} handling in auto literals + +12/16/2009 +- update of changelog +- added {include file='foo.tpl' inline} inline option to merge compiled code of subtemplate into the calling template + +12/14/2009 +- fixed sideefect of last modification (objects in array index did not work anymore) + +12/13/2009 +- allow boolean negation ("!") as operator on variables outside {if} tag + +12/12/2009 +- bugfix on single quotes inside {function} tag +- fix short append/prepend attributes in {block} tags + +12/11/2009 +- bugfix on clear_compiled_tpl (avoid possible warning) + +12/10/2009 +- bugfix on {function} tags and template inheritance + +12/05/2009 +- fixed problem when a cached file was fetched several times +- removed unneeded lexer code + +12/04/2009 +- added max attribute to for loop +- added security mode allow_super_globals + +12/03/2009 +- template inheritance: child templates can now call functions defined by the {function} tag in the parent template +- added {for $foo = 1 to 5 step 2} syntax +- bugfix for {$foo.$x.$y.$z} + +12/01/2009 +- fixed parsing of names of special formated tags like if,elseif,while,for,foreach +- removed direct access to constants in templates because of some syntax problems +- removed cache resource plugin for mysql from the distribution +- replaced most hard errors (exceptions) by softerrors(trigger_error) in plugins +- use $template_class property for template class name when compiling {include},{eval} and {extends} tags + +11/30/2009 +- map 'true' to SMARTY_CACHING_LIFETIME_CURRENT for the $smarty->caching parameter +- allow {function} tags within {block} tags + +11/28/2009 +- ignore compile_id at debug template +- added direct access to constants in templates +- some lexer/parser optimizations + +11/27/2009 +- added cache resource MYSQL plugin + +11/26/2009 +- bugfix on nested doublequoted strings +- correct line number on unknown tag error message +- changed {include} compiled code +- fix on checking dynamic varibales with error_unassigned = true + +11/25/2009 +- allow the following writing for boolean: true, TRUE, True, false, FALSE, False +- {strip} tag functionality rewritten + +11/24/2009 +- bugfix for $smarty->config_overwrite = false + +11/23/2009 +- suppress warnings on unlink caused by race conditions +- correct line number on unknown tag error message + +------- beta 5 +11/23/2009 +- fixed configfile parser for text starting with a numeric char +- the default_template_handler_func may now return a filepath to a template source + +11/20/2009 +- bugfix for empty config files +- convert timestamps of registered resources to integer + +11/19/2009 +- compiled templates are no longer touched with the filemtime of template source + +11/18/2009 +- allow integer as attribute name in plugin calls + +------- beta 4 +11/18/2009 +- observe umask settings when setting file permissions +- avoide unneeded cache file creation for subtemplates which did occur in some situations +- make $smarty->_current_file available during compilation for Smarty2 BC + +11/17/2009 +- sanitize compile_id and cache_id (replace illegal chars with _) +- use _dir_perms and _file_perms properties at file creation +- new constant SMARTY_RESOURCE_DATE_FORMAT (default '%b %e, %Y') which is used as default format in modifier date_format +- added {foreach $array as $key=>$value} syntax +- renamed extend tag and resource to extends: {extends file='foo.tol'} , $smarty->display('extends:foo.tpl|bar.tpl); +- bugfix cycle plugin + +11/15/2009 +- lexer/parser optimizations on quoted strings + +11/14/2009 +- bugfix on merging compiled templates when source files got removed or renamed. +- bugfix modifiers on registered object tags +- fixed locaion where outputfilters are running +- fixed config file definitions at EOF +- fix on merging compiled templates with nocache sections in nocache includes +- parser could run into a PHP error on wrong file attribute + +11/12/2009 +- fixed variable filenames in {include_php} and {insert} +- added scope to Smarty variables in the {block} tag compiler +- fix on nocache code in child {block} tags + +11/11/2009 +- fixed {foreachelse}, {forelse}, {sectionelse} compiled code at nocache variables +- removed checking for reserved variables +- changed debugging handling + +11/10/2009 +- fixed preg_qoute on delimiters + +11/09/2009 +- lexer/parser bugfix +- new SMARTY_SPL_AUTOLOAD constant to control the autoloader option +- bugfix for {function} block tags in included templates + +11/08/2009 +- fixed alphanumeric array index +- bugfix on complex double quoted strings + +11/05/2009 +- config_load method can now be called on data and template objects + +11/04/2009 +- added typecasting support for template variables +- bugfix on complex indexed special Smarty variables + +11/03/2009 +- fixed parser error on objects with special smarty vars +- fixed file dependency for {incude} inside {block} tag +- fixed not compiling on non existing compiled templates when compile_check = false +- renamed function names of autoloaded Smarty methods to Smarty_Method_.... +- new security_class property (default is Smarty_Security) + +11/02/2009 +- added neq,lte,gte,mod as aliases to if conditions +- throw exception on illegal Smarty() constructor calls + +10/31/2009 +- change of filenames in sysplugins folder for internal spl_autoload function +- lexer/parser changed for increased compilation speed + +10/27/2009 +- fixed missing quotes in include_php.php + +10/27/2009 +- fixed typo in method.register_resource +- pass {} through as literal + +10/26/2009 +- merge only compiled subtemplates into the compiled code of the main template + +10/24/2009 +- fixed nocache vars at internal block tags +- fixed merging of recursive includes + +10/23/2009 +- fixed nocache var problem + +10/22/2009 +- fix trimwhitespace outputfilter parameter + +10/21/2009 +- added {$foo++}{$foo--} syntax +- buxfix changed PHP "if (..):" to "if (..){" because of possible bad code when concenating PHP tags +- autoload Smarty internal classes +- fixed file dependency for config files +- some code optimizations +- fixed function definitions on some autoloaded methodes +- fixed nocache variable inside if condition of {if} tag + +10/20/2009 +- check at compile time for variable filter to improve rendering speed if no filter is used +- fixed bug at combination of {elseif} tag and {...} in double quoted strings of static class parameter + +10/19/2009 +- fixed compiled template merging on variable double quoted strings as name +- fixed bug in caching mode 2 and cache_lifetime -1 +- fixed modifier support on block tags + +10/17/2009 +- remove ?>\n<?php and ?><?php sequences from compiled template + +10/15/2009 +- buxfix on assigning array elements inside templates +- parser bugfix on array access + +10/15/2009 +- allow bit operator '&' inside {if} tag +- implementation of ternary operator + +10/13/2009 +- do not recompile evaluated templates if reused just with other data +- recompile config files when config properties did change +- some lexer/parser otimizations + +10/11/2009 +- allow {block} tags inside included templates +- bugfix for resource plugins in Smarty2 format +- some optimizations of internal.template.php + +10/11/2009 +- fixed bug when template with same name is used with different data objects +- fixed bug with double quoted name attribute at {insert} tag +- reenabled assign_by_ref and append_by_ref methodes + +10/07/2009 +- removed block nesting checks for {capture} + +10/05/2009 +- added support of "isinstance" to {if} tag + +10/03/2009 +- internal changes to improve performance +- fix registering of filters for classes + +10/01/2009 +- removed default timezone setting +- reactivated PHP resource for simple PHP templates. Must set allow_php_templates = true to enable +- {PHP} tag can be enabled by allow_php_tag = true + +09/30/2009 +- fixed handling template_exits methode for all resource types +- bugfix for other cache resources than file +- the methodes assign_by_ref is now wrapped to assign, append_by_ref to append +- allow arrays of variables pass in display, fetch and createTemplate calls + $data = array('foo'=>'bar','foo2'=>'blar'); + $smarty->display('my.tpl',$data); + +09/29/2009 +- changed {php} tag handling +- removed support of Smarty::instance() +- removed support of PHP resource type +- improved execution speed of {foreach} tags +- fixed bug in {section} tag + +09/23/2009 +- improvements and bugfix on {include} tag handling +NOTICE: existing compiled template and cache files must be deleted + +09/19/2009 +- replace internal "eval()" calls by "include" during rendering process +- speed improvment for templates which have included subtemplates + the compiled code of included templates is merged into the compiled code of the parent template +- added logical operator "xor" for {if} tag +- changed parameter ordering for Smarty2 BC + fetch($template, $cache_id = null, $compile_id = null, $parent = null) + display($template, $cache_id = null, $compile_id = null, $parent = null) + createTemplate($template, $cache_id = null, $compile_id = null, $parent = null) +- property resource_char_set is now replaced by constant SMARTY_RESOURCE_CHAR_SET +- fixed handling of classes in registered blocks +- speed improvement of lexer on text sections + +09/01/2009 +- dropped nl2br as plugin +- added '<>' as comparission operator in {if} tags +- cached caching_lifetime property to cache_liftime for backward compatibility with Smarty2. + {include} optional attribute is also now cache_lifetime +- fixed trigger_error methode (moved into Smarty class) +- version is now Beta!!! + + +08/30/2009 +- some speed optimizations on loading internal plugins + + +08/29/2009 +- implemented caching of registered Resources +- new property 'auto_literal'. if true(default) '{ ' and ' }' interpreted as literal, not as Smarty delimiter + + +08/28/2009 +- Fix on line breaks inside {if} tags + +08/26/2009 +- implemented registered resources as in Smarty2. NOTE: caching does not work yet +- new property 'force_cache'. if true it forces the creation of a new cache file +- fixed modifiers on arrays +- some speed optimization on loading internal classes + + +08/24/2009 +- fixed typo in lexer definition for '!==' operator +- bugfix - the ouput of plugins was not cached +- added global variable SCRIPT_NAME + +08/21/2009 +- fixed problems whitespace in conjuction with custom delimiters +- Smarty tags can now be used as value anywhere + +08/18/2009 +- definition of template class name moded in internal.templatebase.php +- whitespace parser changes + +08/12/2009 +- fixed parser problems + +08/11/2009 +- fixed parser problems with custom delimiter + +08/10/2009 +- update of mb support in plugins + + +08/09/2009 +- fixed problems with doublequoted strings at name attribute of {block} tag +- bugfix at scope attribute of {append} tag + +08/08/2009 +- removed all internal calls of Smarty::instance() +- fixed code in double quoted strings + +08/05/2009 +- bugfix mb_string support +- bugfix of \n.\t etc in double quoted strings + +07/29/2009 +- added syntax for variable config vars like #$foo# + +07/28/2009 +- fixed parsing of $smarty.session vars containing objects + +07/22/2009 +- fix of "$" handling in double quoted strings + +07/21/2009 +- fix that {$smarty.current_dir} return correct value within {block} tags. + +07/20/2009 +- drop error message on unmatched {block} {/block} pairs + +07/01/2009 +- fixed smarty_function_html_options call in plugin function.html_select_date.php (missing ,) + +06/24/2009 +- fixed smarty_function_html_options call in plugin function.html_select_date.php + +06/22/2009 +- fix on \n and spaces inside smarty tags +- removed request_use_auto_globals propert as it is no longer needed because Smarty 3 will always run under PHP 5 + + +06/18/2009 +- fixed compilation of block plugins when caching enabled +- added $smarty.current_dir which returns the current working directory + +06/14/2009 +- fixed array access on super globals +- allow smarty tags within xml tags + +06/13/2009 +- bugfix at extend resource: create unique files for compiled template and cache for each combination of template files +- update extend resource to handle appen and prepend block attributes +- instantiate classes of plugins instead of calling them static + +06/03/2009 +- fixed repeat at block plugins + +05/25/2009 +- fixed problem with caching of compiler plugins + +05/14/2009 +- fixed directory separator handling + +05/09/2009 +- syntax change for stream variables +- fixed bug when using absolute template filepath and caching + +05/08/2009 +- fixed bug of {nocache} tag in included templates + +05/06/2009 +- allow that plugins_dir folder names can end without directory separator + +05/05/2009 +- fixed E_STRICT incompabilities +- {function} tag bug fix +- security policy definitions have been moved from plugins folder to file Security.class.php in libs folder +- added allow_super_global configuration to security + +04/30/2009 +- functions defined with the {function} tag now always have global scope + +04/29/2009 +- fixed problem with directory setter methodes +- allow that cache_dir can end without directory separator + +04/28/2009 +- the {function} tag can no longer overwrite standard smarty tags +- inherit functions defined by the {fuction} tag into subtemplates +- added {while <statement>} sytax to while tag + +04/26/2009 +- added trusted stream checking to security +- internal changes at file dependency check for caching + +04/24/2009 +- changed name of {template} tag to {function} +- added new {template} tag + +04/23/2009 +- fixed access of special smarty variables from included template + +04/22/2009 +- unified template stream syntax with standard Smarty resource syntax $smarty->display('mystream:mytemplate') + +04/21/2009 +- change of new style syntax for forach. Now: {foreach $array as $var} like in PHP + +04/20/2009 +- fixed "$foo.bar ..." variable replacement in double quoted strings +- fixed error in {include} tag with variable file attribute + +04/18/2009 +- added stream resources ($smarty->display('mystream://mytemplate')) +- added stream variables {$mystream:myvar} + +04/14/2009 +- fixed compile_id handling on {include} tags +- fixed append/prepend attributes in {block} tag +- added {if 'expression' is in 'array'} syntax +- use crc32 as hash for compiled config files. + +04/13/2009 +- fixed scope problem with parent variables when appending variables within templates. +- fixed code for {block} without childs (possible sources for notice errors removed) + +04/12/2009 +- added append and prepend attribute to {block} tag + +04/11/2009 +- fixed variables in 'file' attribute of {extend} tag +- fixed problems in modifiers (if mb string functions not present) + +04/10/2009 +- check if mb string functions available otherwise fallback to normal string functions +- added global variable scope SMARTY_GLOBAL_SCOPE +- enable 'variable' filter by default +- fixed {$smarty.block.parent.foo} +- implementation of a 'variable' filter as replacement for default modifier + +04/09/2009 +- fixed execution of filters defined by classes +- compile the always the content of {block} tags to make shure that the filters are running over it +- syntax corrections on variable object property +- syntax corrections on array access in dot syntax + +04/08/2009 +- allow variable object property + +04/07/2009 +- changed variable scopes to SMARTY_LOCAL_SCOPE, SMARTY_PARENT_SCOPE, SMARTY_ROOT_SCOPE to avoid possible conflicts with user constants +- Smarty variable global attribute replaced with scope attribute + +04/06/2009 +- variable scopes LOCAL_SCOPE, PARENT_SCOPE, ROOT_SCOPE +- more getter/setter methodes + +04/05/2009 +- replaced new array looping syntax {for $foo in $array} with {foreach $foo in $array} to avoid confusion +- added append array for short form of assign {$foo[]='bar'} and allow assignments to nested arrays {$foo['bla']['blue']='bar'} + +04/04/2009 +- make output of template default handlers cachable and save compiled source +- some fixes on yesterdays update + +04/03/2006 +- added registerDefaultTemplateHandler methode and functionallity +- added registerDefaultPluginHandler methode and functionallity +- added {append} tag to extend Smarty array variabled + +04/02/2009 +- added setter/getter methodes +- added $foo@first and $foo@last properties at {for} tag +- added $set_timezone (true/false) property to setup optionally the default time zone + +03/31/2009 +- bugfix smarty.class and internal.security_handler +- added compile_check configuration +- added setter/getter methodes + +03/30/2009 +- added all major setter/getter methodes + +03/28/2009 +- {block} tags can be nested now +- md5 hash function replace with crc32 for speed optimization +- file order for exted resource inverted +- clear_compiled_tpl and clear_cache_all will not touch .svn folder any longer + +03/27/2009 +- added extend resource + +03/26/2009 +- fixed parser not to create error on `word` in double quoted strings +- allow PHP array(...) +- implemented $smarty.block.name.parent to access parent block content +- fixed smarty.class + + +03/23/2009 +- fixed {foreachelse} and {forelse} tags + +03/22/2009 +- fixed possible sources for notice errors +- rearrange SVN into distribution and development folders + +03/21/2009 +- fixed exceptions in function plugins +- fixed notice error in Smarty.class.php +- allow chained objects to span multiple lines +- fixed error in modifers + +03/20/2009 +- moved /plugins folder into /libs folder +- added noprint modifier +- autoappend a directory separator if the xxxxx_dir definition have no trailing one + +03/19/2009 +- allow array definition as modifer parameter +- changed modifier to use multi byte string funktions. + +03/17/2009 +- bugfix + +03/15/2009 +- added {include_php} tag for BC +- removed @ error suppression +- bugfix fetch did always repeat output of first call when calling same template several times +- PHPunit tests extended + +03/13/2009 +- changed block syntax to be Smarty like {block:titel} -> {block name=titel} +- compiling of {block} and {extend} tags rewriten for better performance +- added special Smarty variable block ($smarty.block.foo} returns the parent definition of block foo +- optimization of {block} tag compiled code. +- fixed problem with escaped double quotes in double quoted strings + +03/12/2009 +- added support of template inheritance by {extend } and {block } tags. +- bugfix comments within literals +- added scope attribuie to {include} tag + +03/10/2009 +- couple of bugfixes and improvements +- PHPunit tests extended + +03/09/2009 +- added support for global template vars. {assign_global...} $smarty->assign_global(...) +- added direct_access_security +- PHPunit tests extended +- added missing {if} tag conditions like "is div by" etc. + +03/08/2009 +- splitted up the Compiler class to make it easier to use a coustom compiler +- made default plugins_dir relative to Smarty root and not current working directory +- some changes to make the lexer parser better configurable +- implemented {section} tag for Smarty2 BC + +03/07/2009 +- fixed problem with comment tags +- fixed problem with #xxxx in double quoted string +- new {while} tag implemented +- made lexer and paser class configurable as $smarty property +- Smarty method get_template_vars implemented +- Smarty method get_registered_object implemented +- Smarty method trigger_error implemented +- PHPunit tests extended + +03/06/2009 +- final changes on config variable handling +- parser change - unquoted strings will by be converted into single quoted strings +- PHPunit tests extended +- some code cleanup +- fixed problem on catenate strings with expression +- update of count_words modifier +- bugfix on comment tags + + +03/05/2009 +- bugfix on <?xml...> tag with caching enabled +- changes on exception handling (by Monte) + +03/04/2009 +- added support for config variables +- bugfix on <?xml...> tag + +03/02/2009 +- fixed unqouted strings within modifier parameter +- bugfix parsing of mofifier parameter + +03/01/2009 +- modifier chaining works now as in Smarty2 + +02/28/2009 +- changed handling of unqouted strings + +02/26/2009 +- bugfix +- changed $smarty.capture.foo to be global for Smarty2 BC. + +02/24/2009 +- bugfix {php} {/php} tags for backward compatibility +- bugfix for expressions on arrays +- fixed usage of "null" value +- added $smarty.foreach.foo.first and $smarty.foreach.foo.last + +02/06/2009 +- bugfix for request variables without index for example $smarty.get +- experimental solution for variable functions in static class + +02/05/2009 +- update of popup plugin +- added config variables to template parser (load config functions still missing) +- parser bugfix for empty quoted strings + +02/03/2009 +- allow array of objects as static class variabales. +- use htmlentities at source output at template errors. + +02/02/2009 +- changed search order on modifiers to look at plugins folder first +- parser bug fix for modifier on array elements $foo.bar|modifier +- parser bug fix on single quoted srings +- internal: splitted up compiler plugin files + +02/01/2009 +- allow method chaining on static classes +- special Smarty variables $smarty.... implemented +- added {PHP} {/PHP} tags for backward compatibility + +01/31/2009 +- added {math} plugin for Smarty2 BC +- added template_exists method +- changed Smarty3 method enable_security() to enableSecurity() to follow camelCase standards + +01/30/2009 +- bugfix in single quoted strings +- changed syntax for variable property access from $foo:property to $foo@property because of ambiguous syntax at modifiers + +01/29/2009 +- syntax for array definition changed from (1,2,3) to [1,2,3] to remove ambiguous syntax +- allow {for $foo in [1,2,3]} syntax +- bugfix in double quoted strings +- allow <?xml...?> tags in template even if short_tags are enabled + +01/28/2009 +- fixed '!==' if condition. + +01/28/2009 +- added support of {strip} {/strip} tag. + +01/27/2009 +- bug fix on backticks in double quoted strings at objects + +01/25/2009 +- Smarty2 modfiers added to SVN + +01/25/2009 +- bugfix allow arrays at object properties in Smarty syntax +- the template object is now passed as additional parameter at plugin calls +- clear_compiled_tpl methode completed + +01/20/2009 +- access to class constants implemented ( class::CONSTANT ) +- access to static class variables implemented ( class::$variable ) +- call of static class methodes implemented ( class::methode() ) + +01/16/2009 +- reallow leading _ in variable names {$_var} +- allow array of objects {$array.index->methode()} syntax +- finished work on clear_cache and clear_cache_all methodes + +01/11/2009 +- added support of {literal} tag +- added support of {ldelim} and {rdelim} tags +- make code compatible to run with E_STRICT error setting + +01/08/2009 +- moved clear_assign and clear_all_assign to internal.templatebase.php +- added assign_by_ref, append and append_by_ref methodes + +01/02/2009 +- added load_filter methode +- fished work on filter handling +- optimization of plugin loading + +12/30/2008 +- added compiler support of registered object +- added backtick support in doubled quoted strings for backward compatibility +- some minor bug fixes and improvments + +12/23/2008 +- fixed problem of not working "not" operator in if-expressions +- added handling of compiler function plugins +- finished work on (un)register_compiler_function methode +- finished work on (un)register_modifier methode +- plugin handling from plugins folder changed for modifier plugins + deleted - internal.modifier.php +- added modifier chaining to parser + +12/17/2008 +- finished (un)register_function methode +- finished (un)register_block methode +- added security checking for PHP functions in PHP templates +- plugin handling from plugins folder rewritten + new - internal.plugin_handler.php + deleted - internal.block.php + deleted - internal.function.php +- removed plugin checking from security handler + +12/16/2008 + +- new start of this change_log file diff --git a/Widgets/smarty/demo/configs/test.conf b/Widgets/smarty/demo/configs/test.conf new file mode 100644 index 00000000..5eac748e --- /dev/null +++ b/Widgets/smarty/demo/configs/test.conf @@ -0,0 +1,5 @@ +title = Welcome to Smarty! +cutoff_size = 40 + +[setup] +bold = true diff --git a/Widgets/smarty/demo/index.php b/Widgets/smarty/demo/index.php new file mode 100644 index 00000000..74c8e897 --- /dev/null +++ b/Widgets/smarty/demo/index.php @@ -0,0 +1,33 @@ +<?php + /** + * Example Application + + * @package Example-application + */ + +require('../libs/Smarty.class.php'); + +$smarty = new Smarty; + + + +//$smarty->force_compile = true; +$smarty->debugging = true; +$smarty->caching = true; +$smarty->cache_lifetime = 120; + +$smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill",true); +$smarty->assign("FirstName",array("John","Mary","James","Henry")); +$smarty->assign("LastName",array("Doe","Smith","Johnson","Case")); +$smarty->assign("Class",array(array("A","B","C","D"), array("E", "F", "G", "H"), + array("I", "J", "K", "L"), array("M", "N", "O", "P"))); + +$smarty->assign("contacts", array(array("phone" => "1", "fax" => "2", "cell" => "3"), + array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234"))); + +$smarty->assign("option_values", array("NY","NE","KS","IA","OK","TX")); +$smarty->assign("option_output", array("New York","Nebraska","Kansas","Iowa","Oklahoma","Texas")); +$smarty->assign("option_selected", "NE"); + +$smarty->display('index.tpl'); +?> diff --git a/Widgets/smarty/demo/plugins/cacheresource.apc.php b/Widgets/smarty/demo/plugins/cacheresource.apc.php new file mode 100644 index 00000000..00ba5981 --- /dev/null +++ b/Widgets/smarty/demo/plugins/cacheresource.apc.php @@ -0,0 +1,77 @@ +<?php + +/** + * APC CacheResource + * + * CacheResource Implementation based on the KeyValueStore API to use + * memcache as the storage resource for Smarty's output caching. + * * + * @package CacheResource-examples + * @author Uwe Tews + */ +class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore { + + public function __construct() + { + // test if APC is present + if(!function_exists('apc_cache_info')) { + throw new Exception('APC Template Caching Error: APC is not installed'); + } + } + + /** + * Read values for a set of keys from cache + * + * @param array $keys list of keys to fetch + * @return array list of values with the given keys used as indexes + * @return boolean true on success, false on failure + */ + protected function read(array $keys) + { + $_res = array(); + $res = apc_fetch($keys); + foreach ($res as $k => $v) { + $_res[$k] = $v; + } + return $_res; + } + + /** + * Save values for a set of keys to cache + * + * @param array $keys list of values to save + * @param int $expire expiration time + * @return boolean true on success, false on failure + */ + protected function write(array $keys, $expire=null) + { + foreach ($keys as $k => $v) { + apc_store($k, $v, $expire); + } + return true; + } + + /** + * Remove values from cache + * + * @param array $keys list of keys to delete + * @return boolean true on success, false on failure + */ + protected function delete(array $keys) + { + foreach ($keys as $k) { + apc_delete($k); + } + return true; + } + + /** + * Remove *all* values from cache + * + * @return boolean true on success, false on failure + */ + protected function purge() + { + return apc_clear_cache('user'); + } +} diff --git a/Widgets/smarty/demo/plugins/cacheresource.memcache.php b/Widgets/smarty/demo/plugins/cacheresource.memcache.php new file mode 100644 index 00000000..230607d6 --- /dev/null +++ b/Widgets/smarty/demo/plugins/cacheresource.memcache.php @@ -0,0 +1,91 @@ +<?php + +/** + * Memcache CacheResource + * + * CacheResource Implementation based on the KeyValueStore API to use + * memcache as the storage resource for Smarty's output caching. + * + * Note that memcache has a limitation of 256 characters per cache-key. + * To avoid complications all cache-keys are translated to a sha1 hash. + * + * @package CacheResource-examples + * @author Rodney Rehm + */ +class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore { + /** + * memcache instance + * @var Memcache + */ + protected $memcache = null; + + public function __construct() + { + $this->memcache = new Memcache(); + $this->memcache->addServer( '127.0.0.1', 11211 ); + } + + /** + * Read values for a set of keys from cache + * + * @param array $keys list of keys to fetch + * @return array list of values with the given keys used as indexes + * @return boolean true on success, false on failure + */ + protected function read(array $keys) + { + $_keys = $lookup = array(); + foreach ($keys as $k) { + $_k = sha1($k); + $_keys[] = $_k; + $lookup[$_k] = $k; + } + $_res = array(); + $res = $this->memcache->get($_keys); + foreach ($res as $k => $v) { + $_res[$lookup[$k]] = $v; + } + return $_res; + } + + /** + * Save values for a set of keys to cache + * + * @param array $keys list of values to save + * @param int $expire expiration time + * @return boolean true on success, false on failure + */ + protected function write(array $keys, $expire=null) + { + foreach ($keys as $k => $v) { + $k = sha1($k); + $this->memcache->set($k, $v, 0, $expire); + } + return true; + } + + /** + * Remove values from cache + * + * @param array $keys list of keys to delete + * @return boolean true on success, false on failure + */ + protected function delete(array $keys) + { + foreach ($keys as $k) { + $k = sha1($k); + $this->memcache->delete($k); + } + return true; + } + + /** + * Remove *all* values from cache + * + * @return boolean true on success, false on failure + */ + protected function purge() + { + return $this->memcache->flush(); + } +} diff --git a/Widgets/smarty/demo/plugins/cacheresource.mysql.php b/Widgets/smarty/demo/plugins/cacheresource.mysql.php new file mode 100644 index 00000000..ab8c4751 --- /dev/null +++ b/Widgets/smarty/demo/plugins/cacheresource.mysql.php @@ -0,0 +1,152 @@ +<?php + +/** + * MySQL CacheResource + * + * CacheResource Implementation based on the Custom API to use + * MySQL as the storage resource for Smarty's output caching. + * + * Table definition: + * <pre>CREATE TABLE IF NOT EXISTS `output_cache` ( + * `id` CHAR(40) NOT NULL COMMENT 'sha1 hash', + * `name` VARCHAR(250) NOT NULL, + * `cache_id` VARCHAR(250) NULL DEFAULT NULL, + * `compile_id` VARCHAR(250) NULL DEFAULT NULL, + * `modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + * `content` LONGTEXT NOT NULL, + * PRIMARY KEY (`id`), + * INDEX(`name`), + * INDEX(`cache_id`), + * INDEX(`compile_id`), + * INDEX(`modified`) + * ) ENGINE = InnoDB;</pre> + * + * @package CacheResource-examples + * @author Rodney Rehm + */ +class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom { + // PDO instance + protected $db; + protected $fetch; + protected $fetchTimestamp; + protected $save; + + public function __construct() { + try { + $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty"); + } catch (PDOException $e) { + throw new SmartyException('Mysql Resource failed: ' . $e->getMessage()); + } + $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id'); + $this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id'); + $this->save = $this->db->prepare('REPLACE INTO output_cache (id, name, cache_id, compile_id, content) + VALUES (:id, :name, :cache_id, :compile_id, :content)'); + } + + /** + * fetch cached content and its modification time from data source + * + * @param string $id unique cache content identifier + * @param string $name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param string $content cached content + * @param integer $mtime cache modification timestamp (epoch) + * @return void + */ + protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime) + { + $this->fetch->execute(array('id' => $id)); + $row = $this->fetch->fetch(); + $this->fetch->closeCursor(); + if ($row) { + $content = $row['content']; + $mtime = strtotime($row['modified']); + } else { + $content = null; + $mtime = null; + } + } + + /** + * 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. + * @param string $id unique cache content identifier + * @param string $name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @return integer|boolean timestamp (epoch) the template was modified, or false if not found + */ + protected function fetchTimestamp($id, $name, $cache_id, $compile_id) + { + $this->fetchTimestamp->execute(array('id' => $id)); + $mtime = strtotime($this->fetchTimestamp->fetchColumn()); + $this->fetchTimestamp->closeCursor(); + return $mtime; + } + + /** + * Save content to cache + * + * @param string $id unique cache content identifier + * @param string $name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param integer|null $exp_time seconds till expiration time in seconds or null + * @param string $content content to cache + * @return boolean success + */ + protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content) + { + $this->save->execute(array( + 'id' => $id, + 'name' => $name, + 'cache_id' => $cache_id, + 'compile_id' => $compile_id, + 'content' => $content, + )); + return !!$this->save->rowCount(); + } + + /** + * Delete content from cache + * + * @param string $name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param integer|null $exp_time seconds till expiration or null + * @return integer number of deleted caches + */ + protected function delete($name, $cache_id, $compile_id, $exp_time) + { + // delete the whole cache + 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 + $query = $this->db->query('TRUNCATE TABLE output_cache'); + return -1; + } + // build the filter + $where = array(); + // equal test name + if ($name !== null) { + $where[] = 'name = ' . $this->db->quote($name); + } + // equal test compile_id + if ($compile_id !== null) { + $where[] = 'compile_id = ' . $this->db->quote($compile_id); + } + // range test expiration time + if ($exp_time !== null) { + $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)'; + } + // equal test cache_id and match sub-groups + if ($cache_id !== null) { + $where[] = '(cache_id = '. $this->db->quote($cache_id) + . ' OR cache_id LIKE '. $this->db->quote($cache_id .'|%') .')'; + } + // run delete query + $query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where)); + return $query->rowCount(); + } +} diff --git a/Widgets/smarty/demo/plugins/resource.extendsall.php b/Widgets/smarty/demo/plugins/resource.extendsall.php new file mode 100644 index 00000000..d8c40b5b --- /dev/null +++ b/Widgets/smarty/demo/plugins/resource.extendsall.php @@ -0,0 +1,60 @@ +<?php + +/** + * Extends All Resource + * + * Resource Implementation modifying the extends-Resource to walk + * through the template_dirs and inherit all templates of the same name + * + * @package Resource-examples + * @author Rodney Rehm + */ +class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends { + + /** + * populate Source Object with meta data from Resource + * + * @param Smarty_Template_Source $source source object + * @param Smarty_Internal_Template $_template template object + * @return void + */ + public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + { + $uid = ''; + $sources = array(); + $exists = true; + foreach ($_template->smarty->getTemplateDir() as $key => $directory) { + try { + $s = Smarty_Resource::source(null, $source->smarty, '[' . $key . ']' . $source->name ); + if (!$s->exists) { + continue; + } + $sources[$s->uid] = $s; + $uid .= $s->filepath; + } + catch (SmartyException $e) {} + } + + if (!$sources) { + $source->exists = false; + $source->template = $_template; + return; + } + + $sources = array_reverse($sources, true); + reset($sources); + $s = current($sources); + + $source->components = $sources; + $source->filepath = $s->filepath; + $source->uid = sha1($uid); + $source->exists = $exists; + if ($_template && $_template->smarty->compile_check) { + $source->timestamp = $s->timestamp; + } + // need the template at getContent() + $source->template = $_template; + } +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/demo/plugins/resource.mysql.php b/Widgets/smarty/demo/plugins/resource.mysql.php new file mode 100644 index 00000000..312f3fc7 --- /dev/null +++ b/Widgets/smarty/demo/plugins/resource.mysql.php @@ -0,0 +1,76 @@ +<?php + +/** + * MySQL Resource + * + * Resource Implementation based on the Custom API to use + * MySQL as the storage resource for Smarty's templates and configs. + * + * Table definition: + * <pre>CREATE TABLE IF NOT EXISTS `templates` ( + * `name` varchar(100) NOT NULL, + * `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + * `source` text, + * PRIMARY KEY (`name`) + * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre> + * + * Demo data: + * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre> + * + * @package Resource-examples + * @author Rodney Rehm + */ +class Smarty_Resource_Mysql extends Smarty_Resource_Custom { + // PDO instance + protected $db; + // prepared fetch() statement + protected $fetch; + // prepared fetchTimestamp() statement + protected $mtime; + + public function __construct() { + try { + $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty"); + } catch (PDOException $e) { + throw new SmartyException('Mysql Resource failed: ' . $e->getMessage()); + } + $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name'); + $this->mtime = $this->db->prepare('SELECT modified FROM templates WHERE name = :name'); + } + + /** + * Fetch a template and its modification time from database + * + * @param string $name template name + * @param string $source template source + * @param integer $mtime template modification timestamp (epoch) + * @return void + */ + protected function fetch($name, &$source, &$mtime) + { + $this->fetch->execute(array('name' => $name)); + $row = $this->fetch->fetch(); + $this->fetch->closeCursor(); + if ($row) { + $source = $row['source']; + $mtime = strtotime($row['modified']); + } else { + $source = null; + $mtime = null; + } + } + + /** + * 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. + * @param string $name template name + * @return integer timestamp (epoch) the template was modified + */ + protected function fetchTimestamp($name) { + $this->mtime->execute(array('name' => $name)); + $mtime = $this->mtime->fetchColumn(); + $this->mtime->closeCursor(); + return strtotime($mtime); + } +} diff --git a/Widgets/smarty/demo/plugins/resource.mysqls.php b/Widgets/smarty/demo/plugins/resource.mysqls.php new file mode 100644 index 00000000..f9fe1c2f --- /dev/null +++ b/Widgets/smarty/demo/plugins/resource.mysqls.php @@ -0,0 +1,62 @@ +<?php + +/** + * MySQL Resource + * + * Resource Implementation based on the Custom API to use + * MySQL as the storage resource for Smarty's templates and configs. + * + * Note that this MySQL implementation fetches the source and timestamps in + * a single database query, instead of two seperate like resource.mysql.php does. + * + * Table definition: + * <pre>CREATE TABLE IF NOT EXISTS `templates` ( + * `name` varchar(100) NOT NULL, + * `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + * `source` text, + * PRIMARY KEY (`name`) + * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre> + * + * Demo data: + * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre> + * + * @package Resource-examples + * @author Rodney Rehm + */ +class Smarty_Resource_Mysqls extends Smarty_Resource_Custom { + // PDO instance + protected $db; + // prepared fetch() statement + protected $fetch; + + public function __construct() { + try { + $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty"); + } catch (PDOException $e) { + throw new SmartyException('Mysql Resource failed: ' . $e->getMessage()); + } + $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name'); + } + + /** + * Fetch a template and its modification time from database + * + * @param string $name template name + * @param string $source template source + * @param integer $mtime template modification timestamp (epoch) + * @return void + */ + protected function fetch($name, &$source, &$mtime) + { + $this->fetch->execute(array('name' => $name)); + $row = $this->fetch->fetch(); + $this->fetch->closeCursor(); + if ($row) { + $source = $row['source']; + $mtime = strtotime($row['modified']); + } else { + $source = null; + $mtime = null; + } + } +} diff --git a/Widgets/smarty/demo/templates/footer.tpl b/Widgets/smarty/demo/templates/footer.tpl new file mode 100644 index 00000000..e04310fd --- /dev/null +++ b/Widgets/smarty/demo/templates/footer.tpl @@ -0,0 +1,2 @@ +</BODY> +</HTML> diff --git a/Widgets/smarty/demo/templates/header.tpl b/Widgets/smarty/demo/templates/header.tpl new file mode 100644 index 00000000..783210a1 --- /dev/null +++ b/Widgets/smarty/demo/templates/header.tpl @@ -0,0 +1,5 @@ +<HTML> +<HEAD> +<TITLE>{$title} - {$Name}</TITLE> +</HEAD> +<BODY bgcolor="#ffffff"> diff --git a/Widgets/smarty/demo/templates/index.tpl b/Widgets/smarty/demo/templates/index.tpl new file mode 100644 index 00000000..38d23341 --- /dev/null +++ b/Widgets/smarty/demo/templates/index.tpl @@ -0,0 +1,82 @@ +{config_load file="test.conf" section="setup"} +{include file="header.tpl" title=foo} + +<PRE> + +{* bold and title are read from the config file *} +{if #bold#}<b>{/if} +{* capitalize the first letters of each word of the title *} +Title: {#title#|capitalize} +{if #bold#}</b>{/if} + +The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"} + +The value of global assigned variable $SCRIPT_NAME is {$SCRIPT_NAME} + +Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME} + +The value of {ldelim}$Name{rdelim} is <b>{$Name}</b> + +variable modifier example of {ldelim}$Name|upper{rdelim} + +<b>{$Name|upper}</b> + + +An example of a section loop: + +{section name=outer +loop=$FirstName} +{if $smarty.section.outer.index is odd by 2} + {$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]} +{else} + {$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]} +{/if} +{sectionelse} + none +{/section} + +An example of section looped key values: + +{section name=sec1 loop=$contacts} + phone: {$contacts[sec1].phone}<br> + fax: {$contacts[sec1].fax}<br> + cell: {$contacts[sec1].cell}<br> +{/section} +<p> + +testing strip tags +{strip} +<table border=0> + <tr> + <td> + <A HREF="{$SCRIPT_NAME}"> + <font color="red">This is a test </font> + </A> + </td> + </tr> +</table> +{/strip} + +</PRE> + +This is an example of the html_select_date function: + +<form> +{html_select_date start_year=1998 end_year=2010} +</form> + +This is an example of the html_select_time function: + +<form> +{html_select_time use_24_hours=false} +</form> + +This is an example of the html_options function: + +<form> +<select name=states> +{html_options values=$option_values selected=$option_selected output=$option_output} +</select> +</form> + +{include file="footer.tpl"} diff --git a/Widgets/smarty/libs/Smarty.class.php b/Widgets/smarty/libs/Smarty.class.php index 832b0d30..379d8d4f 100644 --- a/Widgets/smarty/libs/Smarty.class.php +++ b/Widgets/smarty/libs/Smarty.class.php @@ -2,29 +2,33 @@ /** * Project: Smarty: the PHP compiling template engine * File: Smarty.class.php - * SVN: $Id: Smarty.class.php 4897 2014-10-14 22:29:58Z Uwe.Tews@googlemail.com $ + * SVN: $Id: Smarty.class.php 4518 2011-12-18 18:48:07Z rodneyrehm $ + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * 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, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * * For questions, help, comments, discussion, etc., please join the * Smarty mailing list. Send a blank e-mail to * smarty-discussion-subscribe@googlegroups.com * - * @link http://www.smarty.net/ + * @link http://www.smarty.net/ * @copyright 2008 New Digital Group, Inc. - * @author Monte Ohrt <monte at ohrt dot com> - * @author Uwe Tews - * @author Rodney Rehm - * @package Smarty - * @version 3.1.21 + * @author Monte Ohrt <monte at ohrt dot com> + * @author Uwe Tews + * @author Rodney Rehm + * @package Smarty + * @version 3.1.7 */ /** @@ -53,7 +57,7 @@ if (!defined('SMARTY_PLUGINS_DIR')) { define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS); } if (!defined('SMARTY_MBSTRING')) { - define('SMARTY_MBSTRING', function_exists('mb_split')); + define('SMARTY_MBSTRING', function_exists('mb_strlen')); } if (!defined('SMARTY_RESOURCE_CHAR_SET')) { // UTF-8 can only be done properly when mbstring is available! @@ -88,21 +92,20 @@ if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR /** * Load always needed external class files */ -include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php'; -include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php'; -include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php'; -include_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php'; -include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_resource_file.php'; -include_once SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php'; -include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_cacheresource_file.php'; +include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_data.php'; +include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_templatebase.php'; +include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_template.php'; +include_once SMARTY_SYSPLUGINS_DIR.'smarty_resource.php'; +include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_resource_file.php'; +include_once SMARTY_SYSPLUGINS_DIR.'smarty_cacheresource.php'; +include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_cacheresource_file.php'; /** * This is the main Smarty class - * * @package Smarty */ -class Smarty extends Smarty_Internal_TemplateBase -{ +class Smarty extends Smarty_Internal_TemplateBase { + /**#@+ * constant definitions */ @@ -110,7 +113,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = 'Smarty-3.1.21-dev'; + const SMARTY_VERSION = 'Smarty-3.1.7'; /** * define variable scopes @@ -126,11 +129,6 @@ class Smarty extends Smarty_Internal_TemplateBase const CACHING_LIFETIME_CURRENT = 1; const CACHING_LIFETIME_SAVED = 2; /** - * define constant for clearing cache files be saved expiration datees - */ - const CLEAR_EXPIRED = - 1; - - /** * define compile check modes */ const COMPILECHECK_OFF = 0; @@ -191,145 +189,114 @@ class Smarty extends Smarty_Internal_TemplateBase * Flag denoting if PCRE should run in UTF-8 mode */ public static $_UTF8_MODIFIER = 'u'; - - /** - * Flag denoting if operating system is windows - */ - public static $_IS_WINDOWS = false; - + + /**#@+ * variables */ /** * auto literal on delimiters with whitspace - * * @var boolean */ public $auto_literal = true; /** * display error on not assigned variables - * * @var boolean */ public $error_unassigned = false; /** * look up relative filepaths in include_path - * * @var boolean */ public $use_include_path = false; /** * template directory - * * @var array */ private $template_dir = array(); /** * joined template directory string used in cache keys - * * @var string */ public $joined_template_dir = null; /** * joined config directory string used in cache keys - * * @var string */ public $joined_config_dir = null; /** * default template handler - * * @var callable */ public $default_template_handler_func = null; /** * default config handler - * * @var callable */ public $default_config_handler_func = null; /** * default plugin handler - * * @var callable */ public $default_plugin_handler_func = null; /** * compile directory - * * @var string */ private $compile_dir = null; /** * plugins directory - * * @var array */ private $plugins_dir = array(); /** * cache directory - * * @var string */ private $cache_dir = null; /** * config directory - * * @var array */ private $config_dir = array(); /** * force template compiling? - * * @var boolean */ public $force_compile = false; /** * check template for modifications? - * * @var boolean */ public $compile_check = true; /** * use sub dirs for compiled/cached files? - * * @var boolean */ public $use_sub_dirs = false; /** * allow ambiguous resources (that are made unique by the resource handler) - * * @var boolean */ public $allow_ambiguous_resources = false; /** * caching enabled - * * @var boolean */ public $caching = false; /** * merge compiled includes - * * @var boolean */ public $merge_compiled_includes = false; /** - * template inheritance merge compiled includes - * - * @var boolean - */ - public $inheritance_merge_compiled_includes = true; - /** * cache lifetime in seconds - * * @var integer */ public $cache_lifetime = 3600; /** * force cache file creation - * * @var boolean */ public $force_cache = false; @@ -349,13 +316,11 @@ class Smarty extends Smarty_Internal_TemplateBase public $compile_id = null; /** * template left-delimiter - * * @var string */ public $left_delimiter = "{"; /** * template right-delimiter - * * @var string */ public $right_delimiter = "}"; @@ -364,6 +329,7 @@ class Smarty extends Smarty_Internal_TemplateBase */ /** * class name + * * This should be instance of Smarty_Security. * * @var string @@ -390,6 +356,7 @@ class Smarty extends Smarty_Internal_TemplateBase public $allow_php_templates = false; /** * Should compiled-templates be prevented from being called directly? + * * {@internal * Currently used by Smarty_Internal_Template only. * }} @@ -400,6 +367,7 @@ class Smarty extends Smarty_Internal_TemplateBase /**#@-*/ /** * debug mode + * * Setting this to true enables the debug-console. * * @var boolean @@ -411,12 +379,12 @@ class Smarty extends Smarty_Internal_TemplateBase * <li>NONE => no debugging control allowed</li> * <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li> * </ul> - * * @var string */ public $debugging_ctrl = 'NONE'; /** * Name of debugging URL-param. + * * Only used when $debugging_ctrl is set to 'URL'. * The name of the URL-parameter that activates debugging. * @@ -425,19 +393,16 @@ class Smarty extends Smarty_Internal_TemplateBase public $smarty_debug_id = 'SMARTY_DEBUG'; /** * Path of debug template. - * * @var string */ public $debug_tpl = null; /** * When set, smarty uses this value as error_reporting-level. - * * @var int */ public $error_reporting = null; /** * Internal flag for getTags() - * * @var boolean */ public $get_used_tags = false; @@ -448,19 +413,16 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Controls whether variables with the same name overwrite each other. - * * @var boolean */ public $config_overwrite = true; /** * Controls whether config values of on/true/yes and off/false/no get converted to boolean. - * * @var boolean */ public $config_booleanize = true; /** * Controls whether hidden config sections/vars are read from the file. - * * @var boolean */ public $config_read_hidden = false; @@ -473,19 +435,16 @@ class Smarty extends Smarty_Internal_TemplateBase /** * locking concurrent compiles - * * @var boolean */ public $compile_locking = true; /** * Controls whether cache resources should emply locking mechanism - * * @var boolean */ public $cache_locking = false; /** * seconds to wait for acquiring a lock before ignoring the write lock - * * @var float */ public $locking_timeout = 10; @@ -494,19 +453,19 @@ class Smarty extends Smarty_Internal_TemplateBase /** * global template functions - * * @var array */ public $template_functions = array(); /** * resource type used if none given - * Must be an valid key of $registered_resources. * + * Must be an valid key of $registered_resources. * @var string */ public $default_resource_type = 'file'; /** * caching type + * * Must be an element of $cache_resource_types. * * @var string @@ -514,145 +473,121 @@ class Smarty extends Smarty_Internal_TemplateBase public $caching_type = 'file'; /** * internal config properties - * * @var array */ public $properties = array(); /** * config type - * * @var string */ public $default_config_type = 'file'; /** * cached template objects - * * @var array */ public $template_objects = array(); /** * check If-Modified-Since headers - * * @var boolean */ public $cache_modified_check = false; /** * registered plugins - * * @var array */ public $registered_plugins = array(); /** * plugin search order - * * @var array */ public $plugin_search_order = array('function', 'block', 'compiler', 'class'); /** * registered objects - * * @var array */ public $registered_objects = array(); /** * registered classes - * * @var array */ public $registered_classes = array(); /** * registered filters - * * @var array */ public $registered_filters = array(); /** * registered resources - * * @var array */ public $registered_resources = array(); /** * resource handler cache - * * @var array */ public $_resource_handlers = array(); /** * registered cache resources - * * @var array */ public $registered_cache_resources = array(); /** * cache resource handler cache - * * @var array */ public $_cacheresource_handlers = array(); /** * autoload filter - * * @var array */ public $autoload_filters = array(); /** * default modifier - * * @var array */ public $default_modifiers = array(); /** * autoescape variable output - * * @var boolean */ public $escape_html = false; /** * global internal smarty vars - * * @var array */ public static $_smarty_vars = array(); /** * start time for execution time calculation - * * @var int */ public $start_time = 0; /** * default file permissions - * * @var int */ public $_file_perms = 0644; /** * default dir permissions - * * @var int */ public $_dir_perms = 0771; /** * block tag hierarchy - * * @var array */ public $_tag_stack = array(); /** * self pointer to Smarty object - * * @var Smarty */ public $smarty; /** * required by the compiler for BC - * * @var string */ public $_current_file = null; /** * internal flag to enable parser debugging - * * @var bool */ public $_parserdebug = false; @@ -662,19 +597,11 @@ class Smarty extends Smarty_Internal_TemplateBase * @var array */ public $merged_templates_func = array(); - - /** - * Cache of is_file results of loadPlugin() - * - * @var array - */ - public static $_is_file_cache= array(); - /**#@-*/ /** * Initialize new Smarty object - + * */ public function __construct() { @@ -697,6 +624,7 @@ class Smarty extends Smarty_Internal_TemplateBase } } + /** * Class destructor */ @@ -713,34 +641,36 @@ class Smarty extends Smarty_Internal_TemplateBase $this->smarty = $this; } + /** * <<magic>> Generic getter. + * * Calls the appropriate getter function. * Issues an E_USER_NOTICE if no valid getter is found. * - * @param string $name property name - * + * @param string $name property name * @return mixed */ public function __get($name) { $allowed = array( - 'template_dir' => 'getTemplateDir', - 'config_dir' => 'getConfigDir', - 'plugins_dir' => 'getPluginsDir', - 'compile_dir' => 'getCompileDir', - 'cache_dir' => 'getCacheDir', + 'template_dir' => 'getTemplateDir', + 'config_dir' => 'getConfigDir', + 'plugins_dir' => 'getPluginsDir', + 'compile_dir' => 'getCompileDir', + 'cache_dir' => 'getCacheDir', ); if (isset($allowed[$name])) { return $this->{$allowed[$name]}(); } else { - trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE); + trigger_error('Undefined property: '. get_class($this) .'::$'. $name, E_USER_NOTICE); } } /** * <<magic>> Generic setter. + * * Calls the appropriate setter function. * Issues an E_USER_NOTICE if no valid setter is found. * @@ -750,11 +680,11 @@ class Smarty extends Smarty_Internal_TemplateBase public function __set($name, $value) { $allowed = array( - 'template_dir' => 'setTemplateDir', - 'config_dir' => 'setConfigDir', - 'plugins_dir' => 'setPluginsDir', - 'compile_dir' => 'setCompileDir', - 'cache_dir' => 'setCacheDir', + 'template_dir' => 'setTemplateDir', + 'config_dir' => 'setConfigDir', + 'plugins_dir' => 'setPluginsDir', + 'compile_dir' => 'setCompileDir', + 'cache_dir' => 'setCacheDir', ); if (isset($allowed[$name])) { @@ -767,8 +697,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Check if a template resource exists * - * @param string $resource_name template name - * + * @param string $resource_name template name * @return boolean status */ public function templateExists($resource_name) @@ -779,15 +708,14 @@ class Smarty extends Smarty_Internal_TemplateBase // check if it does exists $result = $tpl->source->exists; $this->template_objects = $save; - return $result; } /** * Returns a single or all global variables * - * @param string $varname variable name or null - * + * @param object $smarty + * @param string $varname variable name or null * @return string variable value or or array of variables */ public function getGlobal($varname = null) @@ -803,7 +731,6 @@ class Smarty extends Smarty_Internal_TemplateBase foreach (self::$global_tpl_vars AS $key => $var) { $_result[$key] = $var->value; } - return $_result; } } @@ -811,29 +738,26 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Empty cache folder * - * @param integer $exp_time expiration time - * @param string $type resource type - * + * @param integer $exp_time expiration time + * @param string $type resource type * @return integer number of cache files deleted */ - public function clearAllCache($exp_time = null, $type = null) + function clearAllCache($exp_time = null, $type = null) { // load cache resource and call clearAll $_cache_resource = Smarty_CacheResource::load($this, $type); Smarty_CacheResource::invalidLoadedCache($this); - return $_cache_resource->clearAll($this, $exp_time); } /** * Empty cache for a specific template * - * @param string $template_name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param integer $exp_time expiration time - * @param string $type resource type - * + * @param string $template_name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param integer $exp_time expiration time + * @param string $type resource type * @return integer number of cache files deleted */ public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null) @@ -841,23 +765,20 @@ class Smarty extends Smarty_Internal_TemplateBase // load cache resource and call clear $_cache_resource = Smarty_CacheResource::load($this, $type); Smarty_CacheResource::invalidLoadedCache($this); - return $_cache_resource->clear($this, $template_name, $cache_id, $compile_id, $exp_time); } /** * Loads security class and enables security * - * @param string|Smarty_Security $security_class if a string is used, it must be class-name - * - * @return Smarty current Smarty instance for chaining - * @throws SmartyException when an invalid class name is provided + * @param string|Smarty_Security $security_class if a string is used, it must be class-name + * @return Smarty current Smarty instance for chaining + * @throws SmartyException when an invalid class name is provided */ public function enableSecurity($security_class = null) { if ($security_class instanceof Smarty_Security) { $this->security_policy = $security_class; - return $this; } elseif (is_object($security_class)) { throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security."); @@ -878,7 +799,6 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Disable security - * * @return Smarty current Smarty instance for chaining */ public function disableSecurity() @@ -891,164 +811,145 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Set template directory * - * @param string|array $template_dir directory(s) of template sources - * - * @return Smarty current Smarty instance for chaining + * @param string|array $template_dir directory(s) of template sources + * @return Smarty current Smarty instance for chaining */ public function setTemplateDir($template_dir) { $this->template_dir = array(); foreach ((array) $template_dir as $k => $v) { - $this->template_dir[$k] = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS; + $this->template_dir[$k] = rtrim($v, '/\\') . DS; } $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir); - return $this; } /** * Add template directory(s) * - * @param string|array $template_dir directory(s) of template sources - * @param string $key of the array element to assign the template dir to - * - * @return Smarty current Smarty instance for chaining + * @param string|array $template_dir directory(s) of template sources + * @param string $key of the array element to assign the template dir to + * @return Smarty current Smarty instance for chaining * @throws SmartyException when the given template directory is not valid */ - public function addTemplateDir($template_dir, $key = null) + public function addTemplateDir($template_dir, $key=null) { // make sure we're dealing with an array $this->template_dir = (array) $this->template_dir; if (is_array($template_dir)) { foreach ($template_dir as $k => $v) { - $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS; if (is_int($k)) { // indexes are not merged but appended - $this->template_dir[] = $v; + $this->template_dir[] = rtrim($v, '/\\') . DS; } else { // string indexes are overridden - $this->template_dir[$k] = $v; + $this->template_dir[$k] = rtrim($v, '/\\') . DS; } } + } elseif ($key !== null) { + // override directory at specified index + $this->template_dir[$key] = rtrim($template_dir, '/\\') . DS; } else { - $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($template_dir, '/\\')) . DS; - if ($key !== null) { - // override directory at specified index - $this->template_dir[$key] = $v; - } else { - // append new directory - $this->template_dir[] = $v; - } + // append new directory + $this->template_dir[] = rtrim($template_dir, '/\\') . DS; } $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir); - return $this; } /** * Get template directories * - * @param mixed $index index of directory to get, null to get all - * + * @param mixed index of directory to get, null to get all * @return array|string list of template directories, or directory of $index */ - public function getTemplateDir($index = null) + public function getTemplateDir($index=null) { if ($index !== null) { return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null; } - return (array) $this->template_dir; + return (array)$this->template_dir; } /** * Set config directory * - * @param $config_dir - * - * @return Smarty current Smarty instance for chaining + * @param string|array $template_dir directory(s) of configuration sources + * @return Smarty current Smarty instance for chaining */ public function setConfigDir($config_dir) { $this->config_dir = array(); foreach ((array) $config_dir as $k => $v) { - $this->config_dir[$k] = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS; + $this->config_dir[$k] = rtrim($v, '/\\') . DS; } $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir); - return $this; } /** * Add config directory(s) * - * @param string|array $config_dir directory(s) of config sources - * @param mixed $key key of the array element to assign the config dir to - * + * @param string|array $config_dir directory(s) of config sources + * @param string key of the array element to assign the config dir to * @return Smarty current Smarty instance for chaining */ - public function addConfigDir($config_dir, $key = null) + public function addConfigDir($config_dir, $key=null) { // make sure we're dealing with an array $this->config_dir = (array) $this->config_dir; if (is_array($config_dir)) { foreach ($config_dir as $k => $v) { - $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS; if (is_int($k)) { // indexes are not merged but appended - $this->config_dir[] = $v; + $this->config_dir[] = rtrim($v, '/\\') . DS; } else { // string indexes are overridden - $this->config_dir[$k] = $v; + $this->config_dir[$k] = rtrim($v, '/\\') . DS; } } + } elseif( $key !== null ) { + // override directory at specified index + $this->config_dir[$key] = rtrim($config_dir, '/\\') . DS; } else { - $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($config_dir, '/\\')) . DS; - if ($key !== null) { - // override directory at specified index - $this->config_dir[$key] = rtrim($v, '/\\') . DS; - } else { - // append new directory - $this->config_dir[] = rtrim($v, '/\\') . DS; - } + // append new directory + $this->config_dir[] = rtrim($config_dir, '/\\') . DS; } $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir); - return $this; } /** * Get config directory * - * @param mixed $index index of directory to get, null to get all - * + * @param mixed index of directory to get, null to get all * @return array|string configuration directory */ - public function getConfigDir($index = null) + public function getConfigDir($index=null) { if ($index !== null) { return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null; } - return (array) $this->config_dir; + return (array)$this->config_dir; } /** * Set plugins directory * - * @param string|array $plugins_dir directory(s) of plugins - * - * @return Smarty current Smarty instance for chaining + * @param string|array $plugins_dir directory(s) of plugins + * @return Smarty current Smarty instance for chaining */ public function setPluginsDir($plugins_dir) { $this->plugins_dir = array(); - foreach ((array) $plugins_dir as $k => $v) { + foreach ((array)$plugins_dir as $k => $v) { $this->plugins_dir[$k] = rtrim($v, '/\\') . DS; } @@ -1058,8 +959,8 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Adds directory of plugin files * - * @param $plugins_dir - * + * @param object $smarty + * @param string $ |array $ plugins folder * @return Smarty current Smarty instance for chaining */ public function addPluginsDir($plugins_dir) @@ -1083,7 +984,6 @@ class Smarty extends Smarty_Internal_TemplateBase } $this->plugins_dir = array_unique($this->plugins_dir); - return $this; } @@ -1094,14 +994,13 @@ class Smarty extends Smarty_Internal_TemplateBase */ public function getPluginsDir() { - return (array) $this->plugins_dir; + return (array)$this->plugins_dir; } /** * Set compile directory * - * @param string $compile_dir directory to store compiled templates in - * + * @param string $compile_dir directory to store compiled templates in * @return Smarty current Smarty instance for chaining */ public function setCompileDir($compile_dir) @@ -1110,7 +1009,6 @@ class Smarty extends Smarty_Internal_TemplateBase if (!isset(Smarty::$_muted_directories[$this->compile_dir])) { Smarty::$_muted_directories[$this->compile_dir] = null; } - return $this; } @@ -1127,8 +1025,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Set cache directory * - * @param string $cache_dir directory to store cached templates in - * + * @param string $cache_dir directory to store cached templates in * @return Smarty current Smarty instance for chaining */ public function setCacheDir($cache_dir) @@ -1137,7 +1034,6 @@ class Smarty extends Smarty_Internal_TemplateBase if (!isset(Smarty::$_muted_directories[$this->cache_dir])) { Smarty::$_muted_directories[$this->cache_dir] = null; } - return $this; } @@ -1154,23 +1050,20 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Set default modifiers * - * @param array|string $modifiers modifier or list of modifiers to set - * - * @return Smarty current Smarty instance for chaining + * @param array|string $modifiers modifier or list of modifiers to set + * @return Smarty current Smarty instance for chaining */ public function setDefaultModifiers($modifiers) { $this->default_modifiers = (array) $modifiers; - return $this; } /** * Add default modifiers * - * @param array|string $modifiers modifier or list of modifiers to add - * - * @return Smarty current Smarty instance for chaining + * @param array|string $modifiers modifier or list of modifiers to add + * @return Smarty current Smarty instance for chaining */ public function addDefaultModifiers($modifiers) { @@ -1193,15 +1086,15 @@ class Smarty extends Smarty_Internal_TemplateBase return $this->default_modifiers; } + /** * Set autoload filters * - * @param array $filters filters to load automatically - * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types - * + * @param array $filters filters to load automatically + * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types * @return Smarty current Smarty instance for chaining */ - public function setAutoloadFilters($filters, $type = null) + public function setAutoloadFilters($filters, $type=null) { if ($type !== null) { $this->autoload_filters[$type] = (array) $filters; @@ -1215,12 +1108,11 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Add autoload filters * - * @param array $filters filters to load automatically - * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types - * + * @param array $filters filters to load automatically + * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types * @return Smarty current Smarty instance for chaining */ - public function addAutoloadFilters($filters, $type = null) + public function addAutoloadFilters($filters, $type=null) { if ($type !== null) { if (!empty($this->autoload_filters[$type])) { @@ -1244,11 +1136,10 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Get autoload filters * - * @param string $type type of filter to get autoloads for. Defaults to all autoload filters - * - * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified + * @param string $type type of filter to get autoloads for. Defaults to all autoload filters + * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified */ - public function getAutoloadFilters($type = null) + public function getAutoloadFilters($type=null) { if ($type !== null) { return isset($this->autoload_filters[$type]) ? $this->autoload_filters[$type] : array(); @@ -1270,9 +1161,8 @@ class Smarty extends Smarty_Internal_TemplateBase /** * set the debug template * - * @param string $tpl_name - * - * @return Smarty current Smarty instance for chaining + * @param string $tpl_name + * @return Smarty current Smarty instance for chaining * @throws SmartyException if file is not readable */ public function setDebugTemplate($tpl_name) @@ -1288,21 +1178,20 @@ class Smarty extends Smarty_Internal_TemplateBase /** * creates a template object * - * @param string $template the resource handle of the template file - * @param mixed $cache_id cache id to be used with this template - * @param mixed $compile_id compile id to be used with this template - * @param object $parent next higher level of Smarty variables - * @param boolean $do_clone flag is Smarty object shall be cloned - * - * @return object template object + * @param string $template the resource handle of the template file + * @param mixed $cache_id cache id to be used with this template + * @param mixed $compile_id compile id to be used with this template + * @param object $parent next higher level of Smarty variables + * @param boolean $do_clone flag is Smarty object shall be cloned + * @return object template object */ public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true) { - if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) { + if (!empty($cache_id) && (is_object($cache_id) || is_array($cache_id))) { $parent = $cache_id; $cache_id = null; } - if ($parent !== null && is_array($parent)) { + if (!empty($parent) && is_array($parent)) { $data = $parent; $parent = null; } else { @@ -1349,19 +1238,17 @@ class Smarty extends Smarty_Internal_TemplateBase $tpl->tpl_vars[$_key] = new Smarty_variable($_val); } } - return $tpl; } + /** * Takes unknown classes and loads plugin files for them * class name format: Smarty_PluginType_PluginName * plugin filename format: plugintype.pluginname.php * - * @param string $plugin_name class plugin name to load - * @param bool $check check if already loaded - * - * @throws SmartyException + * @param string $plugin_name class plugin name to load + * @param bool $check check if already loaded * @return string |boolean filepath of loaded file or false */ public function loadPlugin($plugin_name, $check = true) @@ -1376,11 +1263,12 @@ class Smarty extends Smarty_Internal_TemplateBase // count($_name_parts) < 3 === !isset($_name_parts[2]) if (!isset($_name_parts[2]) || strtolower($_name_parts[0]) !== 'smarty') { throw new SmartyException("plugin {$plugin_name} is not a valid name format"); + return false; } // if type is "internal", get plugin from sysplugins if (strtolower($_name_parts[1]) == 'internal') { $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php'; - if (isset(self::$_is_file_cache[$file]) ? self::$_is_file_cache[$file] : self::$_is_file_cache[$file] = is_file($file)) { + if (file_exists($file)) { require_once($file); return $file; } else { @@ -1390,30 +1278,21 @@ class Smarty extends Smarty_Internal_TemplateBase // plugin filename is expected to be: [type].[name].php $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php"; - $_stream_resolve_include_path = function_exists('stream_resolve_include_path'); - // loop through plugin dirs and find the plugin - foreach ($this->getPluginsDir() as $_plugin_dir) { + foreach($this->getPluginsDir() as $_plugin_dir) { $names = array( $_plugin_dir . $_plugin_filename, $_plugin_dir . strtolower($_plugin_filename), ); foreach ($names as $file) { - if (isset(self::$_is_file_cache[$file]) ? self::$_is_file_cache[$file] : self::$_is_file_cache[$file] = is_file($file)) { + if (file_exists($file)) { require_once($file); return $file; } if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) { // try PHP include_path - if ($_stream_resolve_include_path) { - $file = stream_resolve_include_path($file); - } else { - $file = Smarty_Internal_Get_Include_Path::getIncludePath($file); - } - - if ($file !== false) { + if (($file = Smarty_Internal_Get_Include_Path::getIncludePath($file)) !== false) { require_once($file); - return $file; } } @@ -1426,40 +1305,37 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Compile all template files * - * @param string $extension file extension - * @param bool $force_compile force all to recompile - * @param int $time_limit - * @param int $max_errors - * + * @param string $extension file extension + * @param bool $force_compile force all to recompile + * @param int $time_limit + * @param int $max_errors * @return integer number of template files recompiled */ - public function compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null) + public function compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null) { - return Smarty_Internal_Utility::compileAllTemplates($extension, $force_compile, $time_limit, $max_errors, $this); + return Smarty_Internal_Utility::compileAllTemplates($extention, $force_compile, $time_limit, $max_errors, $this); } /** * Compile all config files * - * @param string $extension file extension - * @param bool $force_compile force all to recompile - * @param int $time_limit - * @param int $max_errors - * + * @param string $extension file extension + * @param bool $force_compile force all to recompile + * @param int $time_limit + * @param int $max_errors * @return integer number of template files recompiled */ - public function compileAllConfig($extension = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null) + public function compileAllConfig($extention = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null) { - return Smarty_Internal_Utility::compileAllConfig($extension, $force_compile, $time_limit, $max_errors, $this); + return Smarty_Internal_Utility::compileAllConfig($extention, $force_compile, $time_limit, $max_errors, $this); } /** * Delete compiled template file * - * @param string $resource_name template name - * @param string $compile_id compile id - * @param integer $exp_time expiration time - * + * @param string $resource_name template name + * @param string $compile_id compile id + * @param integer $exp_time expiration time * @return integer number of template files deleted */ public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) @@ -1467,12 +1343,12 @@ class Smarty extends Smarty_Internal_TemplateBase return Smarty_Internal_Utility::clearCompiledTemplate($resource_name, $compile_id, $exp_time, $this); } + /** * Return array of tag/attributes of all tags used by an template * - * @param Smarty_Internal_Template $template - * - * @return array of tag/attributes + * @param object $templae template object + * @return array of tag/attributes */ public function getTags(Smarty_Internal_Template $template) { @@ -1482,11 +1358,10 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Run installation test * - * @param array $errors Array to write errors into, rather than outputting them - * + * @param array $errors Array to write errors into, rather than outputting them * @return boolean true if setup is fine, false if something is wrong */ - public function testInstall(&$errors = null) + public function testInstall(&$errors=null) { return Smarty_Internal_Utility::testInstall($this, $errors); } @@ -1495,13 +1370,7 @@ class Smarty extends Smarty_Internal_TemplateBase * Error Handler to mute expected messages * * @link http://php.net/set_error_handler - * - * @param integer $errno Error level - * @param $errstr - * @param $errfile - * @param $errline - * @param $errcontext - * + * @param integer $errno Error level * @return boolean */ public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext) @@ -1511,12 +1380,10 @@ class Smarty extends Smarty_Internal_TemplateBase // add the SMARTY_DIR to the list of muted directories if (!isset(Smarty::$_muted_directories[SMARTY_DIR])) { $smarty_dir = realpath(SMARTY_DIR); - if ($smarty_dir !== false) { - Smarty::$_muted_directories[SMARTY_DIR] = array( - 'file' => $smarty_dir, - 'length' => strlen($smarty_dir), - ); - } + Smarty::$_muted_directories[SMARTY_DIR] = array( + 'file' => $smarty_dir, + 'length' => strlen($smarty_dir), + ); } // walk the muted directories and test against $errfile @@ -1524,13 +1391,8 @@ class Smarty extends Smarty_Internal_TemplateBase if (!$dir) { // resolve directory and length for speedy comparisons $file = realpath($key); - if ($file === false) { - // this directory does not exist, remove and skip it - unset(Smarty::$_muted_directories[$key]); - continue; - } $dir = array( - 'file' => $file, + 'file' => $file, 'length' => strlen($file), ); } @@ -1594,9 +1456,6 @@ class Smarty extends Smarty_Internal_TemplateBase } } -// Check if we're running on windows -Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'; - // let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8 if (Smarty::$_CHARSET !== 'UTF-8') { Smarty::$_UTF8_MODIFIER = ''; @@ -1604,55 +1463,16 @@ if (Smarty::$_CHARSET !== 'UTF-8') { /** * Smarty exception class - * * @package Smarty */ -class SmartyException extends Exception -{ - public static $escape = false; - - public function __toString() - { - return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- '; - } +class SmartyException extends Exception { } /** * Smarty compiler exception class - * * @package Smarty */ -class SmartyCompilerException extends SmartyException -{ - public function __toString() - { - return ' --> Smarty Compiler: ' . $this->message . ' <-- '; - } - - /** - * The line number of the template error - * - * @type int|null - */ - public $line = null; - /** - * The template source snippet relating to the error - * - * @type string|null - */ - public $source = null; - /** - * The raw text of the error message - * - * @type string|null - */ - public $desc = null; - /** - * The resource identifier or template name - * - * @type string|null - */ - public $template = null; +class SmartyCompilerException extends SmartyException { } /** @@ -1661,20 +1481,22 @@ class SmartyCompilerException extends SmartyException function smartyAutoload($class) { $_class = strtolower($class); - static $_classes = array( - 'smarty_config_source' => true, - 'smarty_config_compiled' => true, - 'smarty_security' => true, - 'smarty_cacheresource' => true, - 'smarty_cacheresource_custom' => true, + $_classes = array( + 'smarty_config_source' => true, + 'smarty_config_compiled' => true, + 'smarty_security' => true, + 'smarty_cacheresource' => true, + 'smarty_cacheresource_custom' => true, 'smarty_cacheresource_keyvaluestore' => true, - 'smarty_resource' => true, - 'smarty_resource_custom' => true, - 'smarty_resource_uncompiled' => true, - 'smarty_resource_recompiled' => true, + 'smarty_resource' => true, + 'smarty_resource_custom' => true, + 'smarty_resource_uncompiled' => true, + 'smarty_resource_recompiled' => true, ); if (!strncmp($_class, 'smarty_internal_', 16) || isset($_classes[$_class])) { include SMARTY_SYSPLUGINS_DIR . $_class . '.php'; } } + +?> diff --git a/Widgets/smarty/libs/SmartyBC.class.php b/Widgets/smarty/libs/SmartyBC.class.php index cec94674..589dcca2 100644 --- a/Widgets/smarty/libs/SmartyBC.class.php +++ b/Widgets/smarty/libs/SmartyBC.class.php @@ -3,43 +3,46 @@ * Project: Smarty: the PHP compiling template engine * File: SmartyBC.class.php * SVN: $Id: $ + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * 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, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * * For questions, help, comments, discussion, etc., please join the * Smarty mailing list. Send a blank e-mail to * smarty-discussion-subscribe@googlegroups.com * - * @link http://www.smarty.net/ + * @link http://www.smarty.net/ * @copyright 2008 New Digital Group, Inc. - * @author Monte Ohrt <monte at ohrt dot com> - * @author Uwe Tews - * @author Rodney Rehm - * @package Smarty + * @author Monte Ohrt <monte at ohrt dot com> + * @author Uwe Tews + * @author Rodney Rehm + * @package Smarty */ /** * @ignore */ -require_once(dirname(__FILE__) . '/Smarty.class.php'); +require(dirname(__FILE__) . '/Smarty.class.php'); /** * Smarty Backward Compatability Wrapper Class * * @package Smarty */ -class SmartyBC extends Smarty -{ +class SmartyBC extends Smarty { + /** * Smarty 2 BC - * * @var string */ public $_version = self::SMARTY_VERSION; @@ -49,7 +52,7 @@ class SmartyBC extends Smarty * * @param array $options options to set during initialization, e.g. array( 'forceCompile' => false ) */ - public function __construct(array $options = array()) + public function __construct(array $options=array()) { parent::__construct($options); // register {php} tag @@ -97,7 +100,7 @@ class SmartyBC extends Smarty * @param bool $cacheable * @param mixed $cache_attrs */ - public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null) + public function register_function($function, $function_impl, $cacheable=true, $cache_attrs=null) { $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs); } @@ -119,10 +122,7 @@ class SmartyBC extends Smarty * @param object $object_impl the referenced PHP object to register * @param array $allowed list of allowed methods (empty = all) * @param boolean $smarty_args smarty argument format, else traditional - * @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 + * @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()) { @@ -149,7 +149,7 @@ class SmartyBC extends Smarty * @param bool $cacheable * @param mixed $cache_attrs */ - public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null) + public function register_block($block, $block_impl, $cacheable=true, $cache_attrs=null) { $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs); } @@ -171,7 +171,7 @@ class SmartyBC extends Smarty * @param string $function_impl name of PHP function to register * @param bool $cacheable */ - public function register_compiler_function($function, $function_impl, $cacheable = true) + public function register_compiler_function($function, $function_impl, $cacheable=true) { $this->registerPlugin('compiler', $function, $function_impl, $cacheable); } @@ -189,7 +189,7 @@ class SmartyBC extends Smarty /** * Registers modifier to be used in templates * - * @param string $modifier name of template modifier + * @param string $modifier name of template modifier * @param string $modifier_impl name of PHP function to register */ public function register_modifier($modifier, $modifier_impl) @@ -305,11 +305,10 @@ class SmartyBC extends Smarty /** * clear cached content for the given template and cache id * - * @param string $tpl_file name of template file - * @param string $cache_id name of cache_id - * @param string $compile_id name of compile_id - * @param string $exp_time expiration time - * + * @param string $tpl_file name of template file + * @param string $cache_id name of cache_id + * @param string $compile_id name of compile_id + * @param string $exp_time expiration time * @return boolean */ public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null) @@ -320,8 +319,7 @@ class SmartyBC extends Smarty /** * clear the entire contents of cache (all templates) * - * @param string $exp_time expire time - * + * @param string $exp_time expire time * @return boolean */ public function clear_all_cache($exp_time = null) @@ -332,10 +330,9 @@ class SmartyBC extends Smarty /** * test to see if valid cache exists for this template * - * @param string $tpl_file name of template file - * @param string $cache_id - * @param string $compile_id - * + * @param string $tpl_file name of template file + * @param string $cache_id + * @param string $compile_id * @return boolean */ public function is_cached($tpl_file, $cache_id = null, $compile_id = null) @@ -356,10 +353,9 @@ class SmartyBC extends Smarty * or all compiled template files if one is not specified. * This function is for advanced use only, not normally needed. * - * @param string $tpl_file - * @param string $compile_id - * @param string $exp_time - * + * @param string $tpl_file + * @param string $compile_id + * @param string $exp_time * @return boolean results of {@link smarty_core_rm_auto()} */ public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null) @@ -370,8 +366,7 @@ class SmartyBC extends Smarty /** * Checks whether requested template exists. * - * @param string $tpl_file - * + * @param string $tpl_file * @return boolean */ public function template_exists($tpl_file) @@ -382,11 +377,10 @@ class SmartyBC extends Smarty /** * Returns an array containing template variables * - * @param string $name - * + * @param string $name * @return array */ - public function get_template_vars($name = null) + public function get_template_vars($name=null) { return $this->getTemplateVars($name); } @@ -394,11 +388,10 @@ class SmartyBC extends Smarty /** * Returns an array containing config variables * - * @param string $name - * + * @param string $name * @return array */ - public function get_config_vars($name = null) + public function get_config_vars($name=null) { return $this->getConfigVars($name); } @@ -418,8 +411,7 @@ class SmartyBC extends Smarty /** * return a reference to a registered object * - * @param string $name - * + * @param string $name * @return object */ public function get_registered_object($name) @@ -440,13 +432,14 @@ class SmartyBC extends Smarty /** * trigger Smarty error * - * @param string $error_msg + * @param string $error_msg * @param integer $error_type */ public function trigger_error($error_msg, $error_type = E_USER_WARNING) { trigger_error("Smarty error: $error_msg", $error_type); } + } /** @@ -456,12 +449,12 @@ class SmartyBC extends Smarty * @param string $content contents of the block * @param object $template template object * @param boolean &$repeat repeat flag - * * @return string content re-formatted */ function smarty_php_tag($params, $content, $template, &$repeat) { eval($content); - return ''; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/debug.tpl b/Widgets/smarty/libs/debug.tpl index 61b8876a..12eef0ff 100644 --- a/Widgets/smarty/libs/debug.tpl +++ b/Widgets/smarty/libs/debug.tpl @@ -1,137 +1,133 @@ {capture name='_smarty_debug' assign=debug_output} - <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> - <head> - <title>Smarty Debug Console</title> - <style type="text/css"> - {literal} - body, h1, h2, td, th, p { - font-family: sans-serif; - font-weight: normal; - font-size: 0.9em; - margin: 1px; - padding: 0; - } - - h1 { - margin: 0; - text-align: left; - padding: 2px; - background-color: #f0c040; - color: black; - font-weight: bold; - font-size: 1.2em; - } - - h2 { - background-color: #9B410E; - color: white; - text-align: left; - font-weight: bold; - padding: 2px; - border-top: 1px solid black; - } - - body { - background: black; - } - - p, table, div { - background: #f0ead8; - } - - p { - margin: 0; - font-style: italic; - text-align: center; - } - - table { - width: 100%; - } - - th, td { - font-family: monospace; - vertical-align: top; - text-align: left; - width: 50%; - } - - td { - color: green; - } - - .odd { - background-color: #eeeeee; - } - - .even { - background-color: #fafafa; - } - - .exectime { - font-size: 0.8em; - font-style: italic; - } - - #table_assigned_vars th { - color: blue; - } - - #table_config_vars th { - color: maroon; - } - - {/literal} - </style> - </head> - <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> - - {if !empty($template_data)} - <h2>included templates & config files (load time in seconds)</h2> - <div> - {foreach $template_data as $template} - <font color=brown>{$template.name}</font> - <span class="exectime"> - (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"} - ) +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> + <title>Smarty Debug Console</title> +<style type="text/css"> +{literal} +body, h1, h2, td, th, p { + font-family: sans-serif; + font-weight: normal; + font-size: 0.9em; + margin: 1px; + padding: 0; +} + +h1 { + margin: 0; + text-align: left; + padding: 2px; + background-color: #f0c040; + color: black; + font-weight: bold; + font-size: 1.2em; + } + +h2 { + background-color: #9B410E; + color: white; + text-align: left; + font-weight: bold; + padding: 2px; + border-top: 1px solid black; +} + +body { + background: black; +} + +p, table, div { + background: #f0ead8; +} + +p { + margin: 0; + font-style: italic; + text-align: center; +} + +table { + width: 100%; +} + +th, td { + font-family: monospace; + vertical-align: top; + text-align: left; + width: 50%; +} + +td { + color: green; +} + +.odd { + background-color: #eeeeee; +} + +.even { + background-color: #fafafa; +} + +.exectime { + font-size: 0.8em; + font-style: italic; +} + +#table_assigned_vars th { + color: blue; +} + +#table_config_vars th { + color: maroon; +} +{/literal} +</style> +</head> +<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> + +{if !empty($template_data)} +<h2>included templates & config files (load time in seconds)</h2> + +<div> +{foreach $template_data as $template} + <font color=brown>{$template.name}</font> + <span class="exectime"> + (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"}) </span> - <br> - {/foreach} - </div> - {/if} - - <h2>assigned template variables</h2> - - <table id="table_assigned_vars"> - {foreach $assigned_vars as $vars} - <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}"> - <th>${$vars@key|escape:'html'}</th> - <td>{$vars|debug_print_var nofilter}</td> - </tr> - {/foreach} - </table> - - <h2>assigned config file variables (outer template scope)</h2> - - <table id="table_config_vars"> - {foreach $config_vars as $vars} - <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}"> - <th>{$vars@key|escape:'html'}</th> - <td>{$vars|debug_print_var nofilter}</td> - </tr> - {/foreach} - - </table> - </body> - </html> + <br> +{/foreach} +</div> +{/if} + +<h2>assigned template variables</h2> + +<table id="table_assigned_vars"> + {foreach $assigned_vars as $vars} + <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}"> + <th>${$vars@key|escape:'html'}</th> + <td>{$vars|debug_print_var nofilter}</td></tr> + {/foreach} +</table> + +<h2>assigned config file variables (outer template scope)</h2> + +<table id="table_config_vars"> + {foreach $config_vars as $vars} + <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}"> + <th>{$vars@key|escape:'html'}</th> + <td>{$vars|debug_print_var nofilter}</td></tr> + {/foreach} + +</table> +</body> +</html> {/capture} <script type="text/javascript"> - {$id = $template_name|default:''|md5} - _smarty_console = window.open("", "console{$id}", "width=680,height=600,resizable,scrollbars=yes"); +{$id = $template_name|default:''|md5} + _smarty_console = window.open("","console{$id}","width=680,height=600,resizable,scrollbars=yes"); _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}"); _smarty_console.document.close(); </script> diff --git a/Widgets/smarty/libs/plugins/block.textformat.php b/Widgets/smarty/libs/plugins/block.textformat.php index abf54493..b22b104a 100644 --- a/Widgets/smarty/libs/plugins/block.textformat.php +++ b/Widgets/smarty/libs/plugins/block.textformat.php @@ -2,12 +2,13 @@ /** * Smarty plugin to format text blocks * - * @package Smarty + * @package Smarty * @subpackage PluginsBlock */ /** * Smarty {textformat}{/textformat} block plugin + * * Type: block function<br> * Name: textformat<br> * Purpose: format text a certain way with preset styles @@ -22,14 +23,12 @@ * - wrap_boundary - boolean (true) * </pre> * - * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat} - * (Smarty online manual) - * + * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat} + * (Smarty online manual) * @param array $params parameters * @param string $content contents of the block * @param Smarty_Internal_Template $template template object * @param boolean &$repeat repeat flag - * * @return string content re-formatted * @author Monte Ohrt <monte at ohrt dot com> */ @@ -54,17 +53,17 @@ function smarty_block_textformat($params, $content, $template, &$repeat) case 'indent_char': case 'wrap_char': case 'assign': - $$_key = (string) $_val; + $$_key = (string)$_val; break; case 'indent': case 'indent_first': case 'wrap': - $$_key = (int) $_val; + $$_key = (int)$_val; break; case 'wrap_cut': - $$_key = (bool) $_val; + $$_key = (bool)$_val; break; default: @@ -77,6 +76,8 @@ function smarty_block_textformat($params, $content, $template, &$repeat) } // split into paragraphs $_paragraphs = preg_split('![\r\n]{2}!', $content); + $_output = ''; + foreach ($_paragraphs as &$_paragraph) { if (!$_paragraph) { @@ -101,10 +102,12 @@ function smarty_block_textformat($params, $content, $template, &$repeat) } } $_output = implode($wrap_char . $wrap_char, $_paragraphs); - + if ($assign) { $template->assign($assign, $_output); } else { return $_output; } } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.counter.php b/Widgets/smarty/libs/plugins/function.counter.php index 4da85a14..3906badf 100644 --- a/Widgets/smarty/libs/plugins/function.counter.php +++ b/Widgets/smarty/libs/plugins/function.counter.php @@ -1,24 +1,22 @@ <?php /** * Smarty plugin - * - * @package Smarty + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {counter} function plugin + * * Type: function<br> * Name: counter<br> * Purpose: print out a counter value * * @author Monte Ohrt <monte at ohrt dot com> - * @link http://www.smarty.net/manual/en/language.function.counter.php {counter} - * (Smarty online manual) - * + * @link http://www.smarty.net/manual/en/language.function.counter.php {counter} + * (Smarty online manual) * @param array $params parameters * @param Smarty_Internal_Template $template template object - * * @return string|null */ function smarty_function_counter($params, $template) @@ -28,16 +26,16 @@ function smarty_function_counter($params, $template) $name = (isset($params['name'])) ? $params['name'] : 'default'; if (!isset($counters[$name])) { $counters[$name] = array( - 'start' => 1, - 'skip' => 1, - 'direction' => 'up', - 'count' => 1 - ); + 'start'=>1, + 'skip'=>1, + 'direction'=>'up', + 'count'=>1 + ); } $counter =& $counters[$name]; if (isset($params['start'])) { - $counter['start'] = $counter['count'] = (int) $params['start']; + $counter['start'] = $counter['count'] = (int)$params['start']; } if (!empty($params['assign'])) { @@ -47,9 +45,9 @@ function smarty_function_counter($params, $template) if (isset($counter['assign'])) { $template->assign($counter['assign'], $counter['count']); } - + if (isset($params['print'])) { - $print = (bool) $params['print']; + $print = (bool)$params['print']; } else { $print = empty($counter['assign']); } @@ -63,16 +61,18 @@ function smarty_function_counter($params, $template) if (isset($params['skip'])) { $counter['skip'] = $params['skip']; } - + if (isset($params['direction'])) { $counter['direction'] = $params['direction']; } - if ($counter['direction'] == "down") { + if ($counter['direction'] == "down") $counter['count'] -= $counter['skip']; - } else { + else $counter['count'] += $counter['skip']; - } - + return $retval; + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.cycle.php b/Widgets/smarty/libs/plugins/function.cycle.php index 8dc5cd9d..1778ffb5 100644 --- a/Widgets/smarty/libs/plugins/function.cycle.php +++ b/Widgets/smarty/libs/plugins/function.cycle.php @@ -2,12 +2,13 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {cycle} function plugin + * * Type: function<br> * Name: cycle<br> * Date: May 3, 2002<br> @@ -30,17 +31,15 @@ * {cycle name=row} * </pre> * - * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle} - * (Smarty online manual) - * @author Monte Ohrt <monte at ohrt dot com> - * @author credit to Mark Priatel <mpriatel@rogers.com> - * @author credit to Gerard <gerard@interfold.com> - * @author credit to Jason Sweat <jsweat_php@yahoo.com> + * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle} + * (Smarty online manual) + * @author Monte Ohrt <monte at ohrt dot com> + * @author credit to Mark Priatel <mpriatel@rogers.com> + * @author credit to Gerard <gerard@interfold.com> + * @author credit to Jason Sweat <jsweat_php@yahoo.com> * @version 1.3 - * * @param array $params parameters * @param Smarty_Internal_Template $template template object - * * @return string|null */ @@ -49,20 +48,18 @@ function smarty_function_cycle($params, $template) static $cycle_vars; $name = (empty($params['name'])) ? 'default' : $params['name']; - $print = (isset($params['print'])) ? (bool) $params['print'] : true; - $advance = (isset($params['advance'])) ? (bool) $params['advance'] : true; - $reset = (isset($params['reset'])) ? (bool) $params['reset'] : false; + $print = (isset($params['print'])) ? (bool)$params['print'] : true; + $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true; + $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false; if (!isset($params['values'])) { - if (!isset($cycle_vars[$name]['values'])) { + if(!isset($cycle_vars[$name]['values'])) { trigger_error("cycle: missing 'values' parameter"); - return; } } else { - if (isset($cycle_vars[$name]['values']) - && $cycle_vars[$name]['values'] != $params['values'] - ) { + if(isset($cycle_vars[$name]['values']) + && $cycle_vars[$name]['values'] != $params['values'] ) { $cycle_vars[$name]['index'] = 0; } $cycle_vars[$name]['values'] = $params['values']; @@ -74,13 +71,13 @@ function smarty_function_cycle($params, $template) $cycle_vars[$name]['delimiter'] = ','; } - if (is_array($cycle_vars[$name]['values'])) { + if(is_array($cycle_vars[$name]['values'])) { $cycle_array = $cycle_vars[$name]['values']; } else { - $cycle_array = explode($cycle_vars[$name]['delimiter'], $cycle_vars[$name]['values']); + $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']); } - if (!isset($cycle_vars[$name]['index']) || $reset) { + if(!isset($cycle_vars[$name]['index']) || $reset ) { $cycle_vars[$name]['index'] = 0; } @@ -89,19 +86,21 @@ function smarty_function_cycle($params, $template) $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]); } - if ($print) { + if($print) { $retval = $cycle_array[$cycle_vars[$name]['index']]; } else { $retval = null; } - if ($advance) { - if ($cycle_vars[$name]['index'] >= count($cycle_array) - 1) { + if($advance) { + if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) { $cycle_vars[$name]['index'] = 0; } else { - $cycle_vars[$name]['index'] ++; + $cycle_vars[$name]['index']++; } } return $retval; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.fetch.php b/Widgets/smarty/libs/plugins/function.fetch.php index 3506d4a8..eca1182d 100644 --- a/Widgets/smarty/libs/plugins/function.fetch.php +++ b/Widgets/smarty/libs/plugins/function.fetch.php @@ -2,53 +2,50 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {fetch} plugin + * * Type: function<br> * Name: fetch<br> * Purpose: fetch file, web or ftp data and display results * - * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch} - * (Smarty online manual) + * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch} + * (Smarty online manual) * @author Monte Ohrt <monte at ohrt dot com> - * * @param array $params parameters * @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 */ function smarty_function_fetch($params, $template) { 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; } - + // strip file protocol if (stripos($params['file'], 'file://') === 0) { $params['file'] = substr($params['file'], 7); } - + $protocol = strpos($params['file'], '://'); if ($protocol !== false) { $protocol = strtolower(substr($params['file'], 0, $protocol)); } - + if (isset($template->smarty->security_policy)) { if ($protocol) { // remote resource (or php stream, …) - if (!$template->smarty->security_policy->isTrustedUri($params['file'])) { + if(!$template->smarty->security_policy->isTrustedUri($params['file'])) { return; } } else { // local file - if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) { + if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) { return; } } @@ -57,54 +54,53 @@ function smarty_function_fetch($params, $template) $content = ''; if ($protocol == 'http') { // http fetch - if ($uri_parts = parse_url($params['file'])) { + if($uri_parts = parse_url($params['file'])) { // set defaults $host = $server_name = $uri_parts['host']; $timeout = 30; $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; - $agent = "Smarty Template Engine " . Smarty::SMARTY_VERSION; + $agent = "Smarty Template Engine ". Smarty::SMARTY_VERSION; $referer = ""; $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/'; $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : ''; $_is_proxy = false; - if (empty($uri_parts['port'])) { + if(empty($uri_parts['port'])) { $port = 80; } else { $port = $uri_parts['port']; } - if (!empty($uri_parts['user'])) { + if(!empty($uri_parts['user'])) { $user = $uri_parts['user']; } - if (!empty($uri_parts['pass'])) { + if(!empty($uri_parts['pass'])) { $pass = $uri_parts['pass']; } // loop through parameters, setup headers - foreach ($params as $param_key => $param_value) { - switch ($param_key) { + foreach($params as $param_key => $param_value) { + switch($param_key) { case "file": case "assign": case "assign_headers": break; case "user": - if (!empty($param_value)) { + if(!empty($param_value)) { $user = $param_value; } break; case "pass": - if (!empty($param_value)) { + if(!empty($param_value)) { $pass = $param_value; } break; case "accept": - if (!empty($param_value)) { + if(!empty($param_value)) { $accept = $param_value; } break; case "header": - if (!empty($param_value)) { - if (!preg_match('![\w\d-]+: .+!', $param_value)) { - trigger_error("[plugin] invalid header format '" . $param_value . "'", E_USER_NOTICE); - + if(!empty($param_value)) { + if(!preg_match('![\w\d-]+: .+!',$param_value)) { + trigger_error("[plugin] invalid header format '".$param_value."'",E_USER_NOTICE); return; } else { $extra_headers[] = $param_value; @@ -112,104 +108,99 @@ function smarty_function_fetch($params, $template) } break; case "proxy_host": - if (!empty($param_value)) { + if(!empty($param_value)) { $proxy_host = $param_value; } break; case "proxy_port": - if (!preg_match('!\D!', $param_value)) { + if(!preg_match('!\D!', $param_value)) { $proxy_port = (int) $param_value; } 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; } break; case "agent": - if (!empty($param_value)) { + if(!empty($param_value)) { $agent = $param_value; } break; case "referer": - if (!empty($param_value)) { + if(!empty($param_value)) { $referer = $param_value; } break; case "timeout": - if (!preg_match('!\D!', $param_value)) { + if(!preg_match('!\D!', $param_value)) { $timeout = (int) $param_value; } 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; } break; default: - trigger_error("[plugin] unrecognized attribute '" . $param_key . "'", E_USER_NOTICE); - + trigger_error("[plugin] unrecognized attribute '".$param_key."'",E_USER_NOTICE); return; } } - if (!empty($proxy_host) && !empty($proxy_port)) { + if(!empty($proxy_host) && !empty($proxy_port)) { $_is_proxy = true; - $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout); + $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout); } else { - $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout); + $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout); } - if (!$fp) { - trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE); - + if(!$fp) { + trigger_error("[plugin] unable to fetch: $errstr ($errno)",E_USER_NOTICE); return; } else { - if ($_is_proxy) { + if($_is_proxy) { fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n"); } else { fputs($fp, "GET $uri HTTP/1.0\r\n"); } - if (!empty($host)) { + if(!empty($host)) { fputs($fp, "Host: $host\r\n"); } - if (!empty($accept)) { + if(!empty($accept)) { fputs($fp, "Accept: $accept\r\n"); } - if (!empty($agent)) { + if(!empty($agent)) { fputs($fp, "User-Agent: $agent\r\n"); } - if (!empty($referer)) { + if(!empty($referer)) { fputs($fp, "Referer: $referer\r\n"); } - if (isset($extra_headers) && is_array($extra_headers)) { - foreach ($extra_headers as $curr_header) { - fputs($fp, $curr_header . "\r\n"); + if(isset($extra_headers) && is_array($extra_headers)) { + foreach($extra_headers as $curr_header) { + fputs($fp, $curr_header."\r\n"); } } - if (!empty($user) && !empty($pass)) { - fputs($fp, "Authorization: BASIC " . base64_encode("$user:$pass") . "\r\n"); + if(!empty($user) && !empty($pass)) { + fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n"); } fputs($fp, "\r\n"); - while (!feof($fp)) { - $content .= fgets($fp, 4096); + while(!feof($fp)) { + $content .= fgets($fp,4096); } fclose($fp); - $csplit = preg_split("!\r\n\r\n!", $content, 2); + $csplit = preg_split("!\r\n\r\n!",$content,2); $content = $csplit[1]; - if (!empty($params['assign_headers'])) { - $template->assign($params['assign_headers'], preg_split("!\r\n!", $csplit[0])); + if(!empty($params['assign_headers'])) { + $template->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0])); } } } 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; } } else { $content = @file_get_contents($params['file']); if ($content === false) { - throw new SmartyException("{fetch} cannot read resource '" . $params['file'] . "'"); + throw new SmartyException("{fetch} cannot read resource '" . $params['file'] ."'"); } } @@ -219,3 +210,5 @@ function smarty_function_fetch($params, $template) return $content; } } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.html_checkboxes.php b/Widgets/smarty/libs/plugins/function.html_checkboxes.php index d7868036..fb9584bb 100644 --- a/Widgets/smarty/libs/plugins/function.html_checkboxes.php +++ b/Widgets/smarty/libs/plugins/function.html_checkboxes.php @@ -2,12 +2,13 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {html_checkboxes} function plugin + * * File: function.html_checkboxes.php<br> * Type: function<br> * Name: html_checkboxes<br> @@ -31,17 +32,15 @@ * - escape (optional) - escape the content (not value), defaults to true * </pre> * - * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes} - * (Smarty online manual) + * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes} + * (Smarty online manual) * @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 - * - * @param array $params parameters + * @param array $params parameters * @param object $template template object - * * @return string - * @uses smarty_function_escape_special_chars() + * @uses smarty_function_escape_special_chars() */ function smarty_function_html_checkboxes($params, $template) { @@ -59,8 +58,8 @@ function smarty_function_html_checkboxes($params, $template) $extra = ''; - foreach ($params as $_key => $_val) { - switch ($_key) { + foreach($params as $_key => $_val) { + switch($_key) { case 'name': case 'separator': $$_key = (string) $_val; @@ -90,7 +89,7 @@ function smarty_function_html_checkboxes($params, $template) if (method_exists($_sel, "__toString")) { $_sel = smarty_function_escape_special_chars((string) $_sel->__toString()); } else { - trigger_error("html_checkboxes: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE); + trigger_error("html_checkboxes: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE); continue; } } else { @@ -102,7 +101,7 @@ function smarty_function_html_checkboxes($params, $template) if (method_exists($_val, "__toString")) { $selected = smarty_function_escape_special_chars((string) $_val->__toString()); } else { - trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE); + trigger_error("html_checkboxes: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE); } } else { $selected = smarty_function_escape_special_chars((string) $_val); @@ -117,27 +116,9 @@ function smarty_function_html_checkboxes($params, $template) case 'assign': 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: - if (!is_array($_val)) { - $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"'; + if(!is_array($_val)) { + $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"'; } else { trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE); } @@ -145,79 +126,76 @@ function smarty_function_html_checkboxes($params, $template) } } - if (!isset($options) && !isset($values)) { - return ''; - } /* raise error here? */ + if (!isset($options) && !isset($values)) + return ''; /* raise error here? */ $_html_result = array(); if (isset($options)) { - foreach ($options as $_key => $_val) { + foreach ($options as $_key=>$_val) { $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape); } } else { - foreach ($values as $_i => $_key) { + foreach ($values as $_i=>$_key) { $_val = isset($output[$_i]) ? $output[$_i] : ''; $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape); } } - if (!empty($params['assign'])) { + if(!empty($params['assign'])) { $template->assign($params['assign'], $_html_result); } else { 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 = ''; - + if (is_object($value)) { if (method_exists($value, "__toString")) { $value = (string) $value->__toString(); } 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 ''; } } else { $value = (string) $value; } - + if (is_object($output)) { if (method_exists($output, "__toString")) { $output = (string) $output->__toString(); } 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 ''; } } else { $output = (string) $output; } - + if ($labels) { if ($label_ids) { $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value)); $_output .= '<label for="' . $_id . '">'; } else { $_output .= '<label>'; - } + } } - + $name = smarty_function_escape_special_chars($name); $value = smarty_function_escape_special_chars($value); if ($escape) { $output = smarty_function_escape_special_chars($output); } - + $_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"'; - + if ($labels && $label_ids) { $_output .= ' id="' . $_id . '"'; } - + if (is_array($selected)) { if (isset($selected[$value])) { $_output .= ' checked="checked"'; @@ -225,13 +203,14 @@ function smarty_function_html_checkboxes_output($name, $value, $output, $selecte } elseif ($value === $selected) { $_output .= ' checked="checked"'; } - + $_output .= $extra . ' />' . $output; if ($labels) { $_output .= '</label>'; } - - $_output .= $separator; - + + $_output .= $separator; return $_output; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.html_image.php b/Widgets/smarty/libs/plugins/function.html_image.php index 5037e8bd..6521966b 100644 --- a/Widgets/smarty/libs/plugins/function.html_image.php +++ b/Widgets/smarty/libs/plugins/function.html_image.php @@ -1,13 +1,14 @@ <?php /** * Smarty plugin - * - * @package Smarty + * + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {html_image} function plugin + * * Type: function<br> * Name: html_image<br> * Date: Feb 24, 2003<br> @@ -22,24 +23,21 @@ * - basedir - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT * - path_prefix - prefix for path output (optional, default empty) * </pre> - * - * @link http://www.smarty.net/manual/en/language.function.html.image.php {html_image} - * (Smarty online manual) - * @author Monte Ohrt <monte at ohrt dot com> - * @author credits to Duda <duda@big.hu> + * + * @link http://www.smarty.net/manual/en/language.function.html.image.php {html_image} + * (Smarty online manual) + * @author Monte Ohrt <monte at ohrt dot com> + * @author credits to Duda <duda@big.hu> * @version 1.0 - * * @param array $params parameters * @param Smarty_Internal_Template $template template object - * - * @throws SmartyException - * @return string - * @uses smarty_function_escape_special_chars() + * @return string + * @uses smarty_function_escape_special_chars() */ function smarty_function_html_image($params, $template) { require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'); - + $alt = ''; $file = ''; $height = ''; @@ -49,7 +47,7 @@ function smarty_function_html_image($params, $template) $suffix = ''; $path_prefix = ''; $basedir = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : ''; - foreach ($params as $_key => $_val) { + foreach($params as $_key => $_val) { switch ($_key) { case 'file': case 'height': @@ -65,7 +63,7 @@ function smarty_function_html_image($params, $template) $$_key = smarty_function_escape_special_chars($_val); } else { throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE); - } + } break; case 'link': @@ -79,42 +77,41 @@ function smarty_function_html_image($params, $template) $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"'; } else { throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE); - } + } break; - } - } + } + } if (empty($file)) { trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE); - return; - } + } if ($file[0] == '/') { $_image_path = $basedir . $file; } else { $_image_path = $file; } - + // strip file protocol if (stripos($params['file'], 'file://') === 0) { $params['file'] = substr($params['file'], 7); } - + $protocol = strpos($params['file'], '://'); if ($protocol !== false) { $protocol = strtolower(substr($params['file'], 0, $protocol)); } - + if (isset($template->smarty->security_policy)) { if ($protocol) { // remote resource (or php stream, …) - if (!$template->smarty->security_policy->isTrustedUri($params['file'])) { + if(!$template->smarty->security_policy->isTrustedUri($params['file'])) { return; } } else { // local file - if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) { + if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) { return; } } @@ -125,26 +122,23 @@ function smarty_function_html_image($params, $template) if (!$_image_data = @getimagesize($_image_path)) { if (!file_exists($_image_path)) { trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE); - return; - } elseif (!is_readable($_image_path)) { + } else if (!is_readable($_image_path)) { trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE); - return; } else { trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE); - return; - } + } } if (!isset($params['width'])) { $width = $_image_data[0]; - } + } if (!isset($params['height'])) { $height = $_image_data[1]; - } - } + } + } if (isset($params['dpi'])) { if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) { @@ -153,11 +147,13 @@ function smarty_function_html_image($params, $template) $dpi_default = 72; } else { $dpi_default = 96; - } + } $_resize = $dpi_default / $params['dpi']; $width = round($width * $_resize); $height = round($height * $_resize); - } + } return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix; -} +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.html_options.php b/Widgets/smarty/libs/plugins/function.html_options.php index 7ec3e065..86266e26 100644 --- a/Widgets/smarty/libs/plugins/function.html_options.php +++ b/Widgets/smarty/libs/plugins/function.html_options.php @@ -1,13 +1,14 @@ <?php /** * Smarty plugin - * - * @package Smarty + * + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {html_options} function plugin + * * Type: function<br> * Name: html_options<br> * Purpose: Prints the list of <option> tags generated from @@ -22,18 +23,17 @@ * - id (optional) - string default not set * - class (optional) - string default not set * </pre> - * - * @link http://www.smarty.net/manual/en/language.function.html.options.php {html_image} - * (Smarty online manual) - * @author Monte Ohrt <monte at ohrt dot com> - * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de> - * - * @param array $params parameters - * - * @return string - * @uses smarty_function_escape_special_chars() + * + * @link http://www.smarty.net/manual/en/language.function.html.options.php {html_image} + * (Smarty online manual) + * @author Monte Ohrt <monte at ohrt dot com> + * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de> + * @param array $params parameters + * @param Smarty_Internal_Template $template template object + * @return string + * @uses smarty_function_escape_special_chars() */ -function smarty_function_html_options($params) +function smarty_function_html_options($params, $template) { require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'); @@ -72,7 +72,7 @@ function smarty_function_html_options($params) if (method_exists($_sel, "__toString")) { $_sel = smarty_function_escape_special_chars((string) $_sel->__toString()); } else { - trigger_error("html_options: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE); + trigger_error("html_options: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE); continue; } } else { @@ -84,44 +84,25 @@ function smarty_function_html_options($params) if (method_exists($_val, "__toString")) { $selected = smarty_function_escape_special_chars((string) $_val->__toString()); } else { - trigger_error("html_options: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE); + trigger_error("html_options: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE); } } else { $selected = smarty_function_escape_special_chars((string) $_val); } 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: if (!is_array($_val)) { $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"'; } else { trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE); - } + } break; - } + } } if (!isset($options) && !isset($values)) { /* raise error here? */ - return ''; } @@ -136,14 +117,14 @@ function smarty_function_html_options($params) foreach ($values as $_i => $_key) { $_val = isset($output[$_i]) ? $output[$_i] : ''; $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx); - } + } } if (!empty($name)) { - $_html_class = !empty($class) ? ' class="' . $class . '"' : ''; - $_html_id = !empty($id) ? ' id="' . $id . '"' : ''; + $_html_class = !empty($class) ? ' class="'.$class.'"' : ''; + $_html_id = !empty($id) ? ' id="'.$id.'"' : ''; $_html_result = '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result . '</select>' . "\n"; - } + } return $_html_result; } @@ -160,37 +141,34 @@ function smarty_function_html_options_optoutput($key, $value, $selected, $id, $c } elseif ($_key === $selected) { $_html_result .= ' selected="selected"'; } - $_html_class = !empty($class) ? ' class="' . $class . ' option"' : ''; - $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : ''; + $_html_class = !empty($class) ? ' class="'.$class.' option"' : ''; + $_html_id = !empty($id) ? ' id="'.$id.'-'.$idx.'"' : ''; if (is_object($value)) { if (method_exists($value, "__toString")) { $value = smarty_function_escape_special_chars((string) $value->__toString()); } 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 ''; } - } else { - $value = smarty_function_escape_special_chars((string) $value); } $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n"; - $idx ++; + $idx++; } else { $_idx = 0; - $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null, $class, $_idx); - $idx ++; + $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id.'-'.$idx) : null, $class, $_idx); + $idx++; } - return $_html_result; -} +} function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx) { $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n"; foreach ($values as $key => $value) { $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx); - } + } $optgroup_html .= "</optgroup>\n"; - return $optgroup_html; -} +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.html_radios.php b/Widgets/smarty/libs/plugins/function.html_radios.php index f121d5ea..7c830724 100644 --- a/Widgets/smarty/libs/plugins/function.html_radios.php +++ b/Widgets/smarty/libs/plugins/function.html_radios.php @@ -1,13 +1,14 @@ <?php /** * Smarty plugin - * - * @package Smarty + * + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {html_radios} function plugin + * * File: function.html_radios.php<br> * Type: function<br> * Name: html_radios<br> @@ -30,18 +31,16 @@ * {html_radios values=$ids name='box' separator='<br>' output=$names} * {html_radios values=$ids checked=$checked separator='<br>' output=$names} * </pre> - * - * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios} - * (Smarty online manual) - * @author Christopher Kvarme <christopher.kvarme@flashjab.com> - * @author credits to Monte Ohrt <monte at ohrt dot com> + * + * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios} + * (Smarty online manual) + * @author Christopher Kvarme <christopher.kvarme@flashjab.com> + * @author credits to Monte Ohrt <monte at ohrt dot com> * @version 1.0 - * * @param array $params parameters * @param Smarty_Internal_Template $template template object - * - * @return string - * @uses smarty_function_escape_special_chars() + * @return string + * @uses smarty_function_escape_special_chars() */ function smarty_function_html_radios($params, $template) { @@ -58,7 +57,7 @@ function smarty_function_html_radios($params, $template) $output = null; $extra = ''; - foreach ($params as $_key => $_val) { + foreach($params as $_key => $_val) { switch ($_key) { case 'name': case 'separator': @@ -73,11 +72,11 @@ function smarty_function_html_radios($params, $template) if (method_exists($_val, "__toString")) { $selected = smarty_function_escape_special_chars((string) $_val->__toString()); } else { - trigger_error("html_radios: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE); + trigger_error("html_radios: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE); } } else { $selected = (string) $_val; - } + } break; case 'escape': @@ -103,37 +102,18 @@ function smarty_function_html_radios($params, $template) case 'assign': 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: if (!is_array($_val)) { $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"'; } else { trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE); - } + } break; - } - } + } + } if (!isset($options) && !isset($values)) { /* raise error here? */ - return ''; } @@ -147,59 +127,57 @@ function smarty_function_html_radios($params, $template) foreach ($values as $_i => $_key) { $_val = isset($output[$_i]) ? $output[$_i] : ''; $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape); - } - } + } + } if (!empty($params['assign'])) { $template->assign($params['assign'], $_html_result); } else { return implode("\n", $_html_result); - } -} + } +} function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape) { $_output = ''; - + if (is_object($value)) { if (method_exists($value, "__toString")) { $value = (string) $value->__toString(); } 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 ''; } } else { $value = (string) $value; } - + if (is_object($output)) { if (method_exists($output, "__toString")) { $output = (string) $output->__toString(); } 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 ''; } } else { $output = (string) $output; } - + if ($labels) { if ($label_ids) { $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value)); $_output .= '<label for="' . $_id . '">'; } else { $_output .= '<label>'; - } + } } - + $name = smarty_function_escape_special_chars($name); $value = smarty_function_escape_special_chars($value); if ($escape) { $output = smarty_function_escape_special_chars($output); } - + $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"'; if ($labels && $label_ids) { @@ -209,13 +187,14 @@ function smarty_function_html_radios_output($name, $value, $output, $selected, $ if ($value === $selected) { $_output .= ' checked="checked"'; } - + $_output .= $extra . ' />' . $output; if ($labels) { $_output .= '</label>'; } - + $_output .= $separator; - return $_output; -} +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.html_select_date.php b/Widgets/smarty/libs/plugins/function.html_select_date.php index d6625665..13c50035 100644 --- a/Widgets/smarty/libs/plugins/function.html_select_date.php +++ b/Widgets/smarty/libs/plugins/function.html_select_date.php @@ -1,8 +1,8 @@ <?php /** * Smarty plugin - * - * @package Smarty + * + * @package Smarty * @subpackage PluginsFunction */ @@ -17,9 +17,11 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'); /** * Smarty {html_select_date} plugin + * * Type: function<br> * Name: html_select_date<br> * Purpose: Prints the dropdowns for date selection. + * * ChangeLog: * <pre> * - 1.0 initial release @@ -35,22 +37,21 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'); * dropdown to include given date unless explicitly set (Monte) * - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that * of 0000-00-00 dates (cybot, boots) - * - 2.0 complete rewrite for performance, + * - 2.0 complete rewrite for performance, * added attributes month_names, *_id * </pre> - * - * @link http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date} - * (Smarty online manual) - * @version 2.0 - * @author Andrei Zmievski - * @author Monte Ohrt <monte at ohrt dot com> - * @author Rodney Rehm - * - * @param array $params parameters - * - * @return string + * + * @link http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date} + * (Smarty online manual) + * @version 2.0 + * @author Andrei Zmievski + * @author Monte Ohrt <monte at ohrt dot com> + * @author Rodney Rehm + * @param array $params parameters + * @param Smarty_Internal_Template $template template object + * @return string */ -function smarty_function_html_select_date($params) +function smarty_function_html_select_date($params, $template) { // generate timestamps used for month names only static $_month_timestamps = null; @@ -58,7 +59,7 @@ function smarty_function_html_select_date($params) if ($_month_timestamps === null) { $_current_year = date('Y'); $_month_timestamps = array(); - for ($i = 1; $i <= 12; $i ++) { + for ($i = 1; $i <= 12; $i++) { $_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000); } } @@ -119,7 +120,7 @@ function smarty_function_html_select_date($params) $time = smarty_make_timestamp($_value); } break; - + case 'month_names': if (is_array($_value) && count($_value) == 12) { $$_key = $_value; @@ -127,7 +128,7 @@ function smarty_function_html_select_date($params) trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE); } break; - + case 'prefix': case 'field_array': case 'start_year': @@ -154,7 +155,7 @@ function smarty_function_html_select_date($params) case 'month_id': case 'day_id': case 'year_id': - $$_key = (string) $_value; + $$_key = (string)$_value; break; case 'display_days': @@ -162,7 +163,7 @@ function smarty_function_html_select_date($params) case 'display_years': case 'year_as_text': case 'reverse_years': - $$_key = (bool) $_value; + $$_key = (bool)$_value; break; default: @@ -170,30 +171,32 @@ function smarty_function_html_select_date($params) $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"'; } else { trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE); - } + } break; - } + } } - + // Note: date() is faster than strftime() // Note: explode(date()) is faster than date() date() date() if (isset($params['time']) && is_array($params['time'])) { if (isset($params['time'][$prefix . 'Year'])) { // $_REQUEST[$field_array] given - foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) { + foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) { $_variableName = '_' . strtolower($_elementName); $$_variableName = isset($params['time'][$prefix . $_elementName]) ? $params['time'][$prefix . $_elementName] : date($_elementKey); } + $time = mktime(0, 0, 0, $_month, $_day, $_year); } elseif (isset($params['time'][$field_array][$prefix . 'Year'])) { // $_REQUEST given - foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) { + foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) { $_variableName = '_' . strtolower($_elementName); $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName]) ? $params['time'][$field_array][$prefix . $_elementName] : date($_elementKey); } + $time = mktime(0, 0, 0, $_month, $_day, $_year); } else { // no date found, use NOW list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d')); @@ -214,13 +217,13 @@ function smarty_function_html_select_date($params) $key .= '_year'; $t = $$key; if ($t === null) { - $$key = (int) $_current_year; - } elseif ($t[0] == '+') { - $$key = (int) ($_current_year + (int)trim(substr($t, 1))); - } elseif ($t[0] == '-') { - $$key = (int) ($_current_year - (int)trim(substr($t, 1))); + $$key = (int)$_current_year; + } else if ($t[0] == '+') { + $$key = (int)($_current_year + trim(substr($t, 1))); + } else if ($t[0] == '-') { + $$key = (int)($_current_year - trim(substr($t, 1))); } else { - $$key = (int) $$key; + $$key = (int)$$key; } } @@ -233,71 +236,73 @@ function smarty_function_html_select_date($params) // generate year <select> or <input> if ($display_years) { + $_html_years = ''; $_extra = ''; $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year'); if ($all_extra) { $_extra .= ' ' . $all_extra; - } + } if ($year_extra) { $_extra .= ' ' . $year_extra; } - + if ($year_as_text) { $_html_years = '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra . $extra_attrs . ' />'; } else { $_html_years = '<select name="' . $_name . '"'; if ($year_id !== null || $all_id !== null) { - $_html_years .= ' id="' . smarty_function_escape_special_chars( - $year_id !== null ? ($year_id ? $year_id : $_name) : ($all_id ? ($all_id . $_name) : $_name) - ) . '"'; + $_html_years .= ' id="' . smarty_function_escape_special_chars( + $year_id !== null ? ( $year_id ? $year_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) + ) . '"'; } if ($year_size) { $_html_years .= ' size="' . $year_size . '"'; - } + } $_html_years .= $_extra . $extra_attrs . '>' . $option_separator; - + if (isset($year_empty) || isset($all_empty)) { - $_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' . $option_separator; + $_html_years .= '<option value="">' . ( isset($year_empty) ? $year_empty : $all_empty ) . '</option>' . $option_separator; } - - $op = $start_year > $end_year ? - 1 : 1; - for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) { + + $op = $start_year > $end_year ? -1 : 1; + for ($i=$start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) { $_html_years .= '<option value="' . $i . '"' . ($_year == $i ? ' selected="selected"' : '') . '>' . $i . '</option>' . $option_separator; } - + $_html_years .= '</select>'; } } - + // generate month <select> or <input> if ($display_months) { + $_html_month = ''; $_extra = ''; $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month'); if ($all_extra) { $_extra .= ' ' . $all_extra; - } + } if ($month_extra) { $_extra .= ' ' . $month_extra; } - + $_html_months = '<select name="' . $_name . '"'; if ($month_id !== null || $all_id !== null) { - $_html_months .= ' id="' . smarty_function_escape_special_chars( - $month_id !== null ? ($month_id ? $month_id : $_name) : ($all_id ? ($all_id . $_name) : $_name) - ) . '"'; + $_html_months .= ' id="' . smarty_function_escape_special_chars( + $month_id !== null ? ( $month_id ? $month_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) + ) . '"'; } if ($month_size) { $_html_months .= ' size="' . $month_size . '"'; - } + } $_html_months .= $_extra . $extra_attrs . '>' . $option_separator; - + if (isset($month_empty) || isset($all_empty)) { - $_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' . $option_separator; + $_html_months .= '<option value="">' . ( isset($month_empty) ? $month_empty : $all_empty ) . '</option>' . $option_separator; } - - for ($i = 1; $i <= 12; $i ++) { + + for ($i = 1; $i <= 12; $i++) { $_val = sprintf('%02d', $i); $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[$i]) : ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[$i])); $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[$i]); @@ -305,51 +310,52 @@ function smarty_function_html_select_date($params) . ($_val == $_month ? ' selected="selected"' : '') . '>' . $_text . '</option>' . $option_separator; } - + $_html_months .= '</select>'; } - + // generate day <select> or <input> if ($display_days) { + $_html_day = ''; $_extra = ''; $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day'); if ($all_extra) { $_extra .= ' ' . $all_extra; - } + } if ($day_extra) { $_extra .= ' ' . $day_extra; } - + $_html_days = '<select name="' . $_name . '"'; if ($day_id !== null || $all_id !== null) { - $_html_days .= ' id="' . smarty_function_escape_special_chars( - $day_id !== null ? ($day_id ? $day_id : $_name) : ($all_id ? ($all_id . $_name) : $_name) - ) . '"'; + $_html_days .= ' id="' . smarty_function_escape_special_chars( + $day_id !== null ? ( $day_id ? $day_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) + ) . '"'; } if ($day_size) { $_html_days .= ' size="' . $day_size . '"'; - } + } $_html_days .= $_extra . $extra_attrs . '>' . $option_separator; - + if (isset($day_empty) || isset($all_empty)) { - $_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' . $option_separator; + $_html_days .= '<option value="">' . ( isset($day_empty) ? $day_empty : $all_empty ) . '</option>' . $option_separator; } - - for ($i = 1; $i <= 31; $i ++) { + + for ($i = 1; $i <= 31; $i++) { $_val = sprintf('%02d', $i); $_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i); - $_value = $day_value_format == '%02d' ? $_val : sprintf($day_value_format, $i); + $_value = $day_value_format == '%02d' ? $_val : sprintf($day_value_format, $i); $_html_days .= '<option value="' . $_value . '"' . ($_val == $_day ? ' selected="selected"' : '') . '>' . $_text . '</option>' . $option_separator; } - + $_html_days .= '</select>'; } // order the fields for output $_html = ''; - for ($i = 0; $i <= 2; $i ++) { + for ($i=0; $i <= 2; $i++) { switch ($field_order[$i]) { case 'Y': case 'y': @@ -359,8 +365,8 @@ function smarty_function_html_select_date($params) } $_html .= $_html_years; } - break; - + break; + case 'm': case 'M': if (isset($_html_months)) { @@ -369,8 +375,8 @@ function smarty_function_html_select_date($params) } $_html .= $_html_months; } - break; - + break; + case 'd': case 'D': if (isset($_html_days)) { @@ -379,9 +385,10 @@ function smarty_function_html_select_date($params) } $_html .= $_html_days; } - break; + break; } } - return $_html; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.html_select_time.php b/Widgets/smarty/libs/plugins/function.html_select_time.php index 9af6aad5..9fb8038e 100644 --- a/Widgets/smarty/libs/plugins/function.html_select_time.php +++ b/Widgets/smarty/libs/plugins/function.html_select_time.php @@ -2,7 +2,7 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsFunction */ @@ -17,21 +17,21 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'); /** * Smarty {html_select_time} function plugin + * * Type: function<br> * Name: html_select_time<br> * Purpose: Prints the dropdowns for time selection * - * @link http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time} - * (Smarty online manual) - * @author Roberto Berto <roberto@berto.net> - * @author Monte Ohrt <monte AT ohrt DOT com> - * - * @param array $params parameters - * + * @link http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time} + * (Smarty online manual) + * @author Roberto Berto <roberto@berto.net> + * @author Monte Ohrt <monte AT ohrt DOT com> + * @param array $params parameters + * @param Smarty_Internal_Template $template template object * @return string - * @uses smarty_make_timestamp() + * @uses smarty_make_timestamp() */ -function smarty_function_html_select_time($params) +function smarty_function_html_select_time($params, $template) { $prefix = "Time_"; $field_array = null; @@ -117,7 +117,7 @@ function smarty_function_html_select_time($params) case 'minute_value_format': case 'second_format': case 'second_value_format': - $$_key = (string) $_value; + $$_key = (string)$_value; break; case 'display_hours': @@ -125,7 +125,7 @@ function smarty_function_html_select_time($params) case 'display_seconds': case 'display_meridian': case 'use_24_hours': - $$_key = (bool) $_value; + $$_key = (bool)$_value; break; case 'minute_interval': @@ -135,7 +135,7 @@ function smarty_function_html_select_time($params) case 'minute_size': case 'second_size': case 'meridian_size': - $$_key = (int) $_value; + $$_key = (int)$_value; break; default: @@ -151,7 +151,7 @@ function smarty_function_html_select_time($params) if (isset($params['time']) && is_array($params['time'])) { if (isset($params['time'][$prefix . 'Hour'])) { // $_REQUEST[$field_array] given - foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) { + foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) { $_variableName = '_' . strtolower($_elementName); $$_variableName = isset($params['time'][$prefix . $_elementName]) ? $params['time'][$prefix . $_elementName] @@ -160,11 +160,11 @@ function smarty_function_html_select_time($params) $_meridian = isset($params['time'][$prefix . 'Meridian']) ? (' ' . $params['time'][$prefix . 'Meridian']) : ''; - $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian); + $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian ); list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time)); } elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) { // $_REQUEST given - foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) { + foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) { $_variableName = '_' . strtolower($_elementName); $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName]) ? $params['time'][$field_array][$prefix . $_elementName] @@ -173,7 +173,7 @@ function smarty_function_html_select_time($params) $_meridian = isset($params['time'][$field_array][$prefix . 'Meridian']) ? (' ' . $params['time'][$field_array][$prefix . 'Meridian']) : ''; - $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian); + $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian ); list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time)); } else { // no date found, use NOW @@ -204,8 +204,8 @@ function smarty_function_html_select_time($params) $_html_hours = '<select name="' . $_name . '"'; if ($hour_id !== null || $all_id !== null) { $_html_hours .= ' id="' . smarty_function_escape_special_chars( - $hour_id !== null ? ($hour_id ? $hour_id : $_name) : ($all_id ? ($all_id . $_name) : $_name) - ) . '"'; + $hour_id !== null ? ( $hour_id ? $hour_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) + ) . '"'; } if ($hour_size) { $_html_hours .= ' size="' . $hour_size . '"'; @@ -213,12 +213,12 @@ function smarty_function_html_select_time($params) $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator; if (isset($hour_empty) || isset($all_empty)) { - $_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' . $option_separator; + $_html_hours .= '<option value="">' . ( isset($hour_empty) ? $hour_empty : $all_empty ) . '</option>' . $option_separator; } $start = $use_24_hours ? 0 : 1; $end = $use_24_hours ? 23 : 12; - for ($i = $start; $i <= $end; $i ++) { + for ($i=$start; $i <= $end; $i++) { $_val = sprintf('%02d', $i); $_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i); $_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i); @@ -226,7 +226,7 @@ function smarty_function_html_select_time($params) if (!$use_24_hours) { $_hour12 = $_hour == 0 ? 12 - : ($_hour <= 12 ? $_hour : $_hour - 12); + : ($_hour <= 12 ? $_hour : $_hour -12); } $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null; @@ -253,8 +253,8 @@ function smarty_function_html_select_time($params) $_html_minutes = '<select name="' . $_name . '"'; if ($minute_id !== null || $all_id !== null) { $_html_minutes .= ' id="' . smarty_function_escape_special_chars( - $minute_id !== null ? ($minute_id ? $minute_id : $_name) : ($all_id ? ($all_id . $_name) : $_name) - ) . '"'; + $minute_id !== null ? ( $minute_id ? $minute_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) + ) . '"'; } if ($minute_size) { $_html_minutes .= ' size="' . $minute_size . '"'; @@ -262,11 +262,11 @@ function smarty_function_html_select_time($params) $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator; if (isset($minute_empty) || isset($all_empty)) { - $_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' . $option_separator; + $_html_minutes .= '<option value="">' . ( isset($minute_empty) ? $minute_empty : $all_empty ) . '</option>' . $option_separator; } $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null; - for ($i = 0; $i <= 59; $i += $minute_interval) { + for ($i=0; $i <= 59; $i += $minute_interval) { $_val = sprintf('%02d', $i); $_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i); $_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i); @@ -293,8 +293,8 @@ function smarty_function_html_select_time($params) $_html_seconds = '<select name="' . $_name . '"'; if ($second_id !== null || $all_id !== null) { $_html_seconds .= ' id="' . smarty_function_escape_special_chars( - $second_id !== null ? ($second_id ? $second_id : $_name) : ($all_id ? ($all_id . $_name) : $_name) - ) . '"'; + $second_id !== null ? ( $second_id ? $second_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) + ) . '"'; } if ($second_size) { $_html_seconds .= ' size="' . $second_size . '"'; @@ -302,11 +302,11 @@ function smarty_function_html_select_time($params) $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator; if (isset($second_empty) || isset($all_empty)) { - $_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' . $option_separator; + $_html_seconds .= '<option value="">' . ( isset($second_empty) ? $second_empty : $all_empty ) . '</option>' . $option_separator; } $selected = $_second !== null ? ($_second - $_second % $second_interval) : null; - for ($i = 0; $i <= 59; $i += $second_interval) { + for ($i=0; $i <= 59; $i += $second_interval) { $_val = sprintf('%02d', $i); $_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i); $_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i); @@ -333,8 +333,8 @@ function smarty_function_html_select_time($params) $_html_meridian = '<select name="' . $_name . '"'; if ($meridian_id !== null || $all_id !== null) { $_html_meridian .= ' id="' . smarty_function_escape_special_chars( - $meridian_id !== null ? ($meridian_id ? $meridian_id : $_name) : ($all_id ? ($all_id . $_name) : $_name) - ) . '"'; + $meridian_id !== null ? ( $meridian_id ? $meridian_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) + ) . '"'; } if ($meridian_size) { $_html_meridian .= ' size="' . $meridian_size . '"'; @@ -342,11 +342,11 @@ function smarty_function_html_select_time($params) $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator; if (isset($meridian_empty) || isset($all_empty)) { - $_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 > 0 && $_hour < 12 ? ' selected="selected"' : '') . '>AM</option>' . $option_separator - . '<option value="pm"' . ($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator + $_html_meridian .= '<option value="am"'. ($_hour < 12 ? ' selected="selected"' : '') .'>AM</option>' . $option_separator + . '<option value="pm"'. ($_hour < 12 ? '' : ' selected="selected"') .'>PM</option>' . $option_separator . '</select>'; } @@ -362,3 +362,5 @@ function smarty_function_html_select_time($params) return $_html; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.html_table.php b/Widgets/smarty/libs/plugins/function.html_table.php index ec7ba48a..6b9cb9d1 100644 --- a/Widgets/smarty/libs/plugins/function.html_table.php +++ b/Widgets/smarty/libs/plugins/function.html_table.php @@ -2,12 +2,13 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {html_table} function plugin + * * Type: function<br> * Name: html_table<br> * Date: Feb 17, 2003<br> @@ -36,18 +37,17 @@ * {table loop=$data cols="first,second,third" tr_attr=$colors} * </pre> * - * @author Monte Ohrt <monte at ohrt dot com> - * @author credit to Messju Mohr <messju at lammfellpuschen dot de> - * @author credit to boots <boots dot smarty at yahoo dot com> - * @version 1.1 - * @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table} - * (Smarty online manual) - * - * @param array $params parameters - * + * @author Monte Ohrt <monte at ohrt dot com> + * @author credit to Messju Mohr <messju at lammfellpuschen dot de> + * @author credit to boots <boots dot smarty at yahoo dot com> + * @version 1.1 + * @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table} + * (Smarty online manual) + * @param array $params parameters + * @param Smarty_Internal_Template $template template object * @return string */ -function smarty_function_html_table($params) +function smarty_function_html_table($params, $template) { $table_attr = 'border="1"'; $tr_attr = ''; @@ -63,15 +63,14 @@ function smarty_function_html_table($params) $loop = null; 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; } foreach ($params as $_key => $_value) { switch ($_key) { case 'loop': - $$_key = (array) $_value; + $$_key = (array)$_value; break; case 'cols': @@ -82,14 +81,14 @@ function smarty_function_html_table($params) $cols = explode(',', $_value); $cols_count = count($cols); } elseif (!empty($_value)) { - $cols_count = (int) $_value; + $cols_count = (int)$_value; } else { $cols_count = $cols; } break; case 'rows': - $$_key = (int) $_value; + $$_key = (int)$_value; break; case 'table_attr': @@ -98,7 +97,7 @@ function smarty_function_html_table($params) case 'vdir': case 'inner': case 'caption': - $$_key = (string) $_value; + $$_key = (string)$_value; break; case 'tr_attr': @@ -130,7 +129,7 @@ function smarty_function_html_table($params) $cols = ($hdir == 'right') ? $cols : array_reverse($cols); $output .= "<thead><tr>\n"; - for ($r = 0; $r < $cols_count; $r ++) { + for ($r = 0; $r < $cols_count; $r++) { $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>'; $output .= $cols[$r]; $output .= "</th>\n"; @@ -139,12 +138,12 @@ function smarty_function_html_table($params) } $output .= "<tbody>\n"; - for ($r = 0; $r < $rows; $r ++) { + for ($r = 0; $r < $rows; $r++) { $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n"; - $rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count; + $rx = ($vdir == 'down') ? $r * $cols_count : ($rows-1 - $r) * $cols_count; - for ($c = 0; $c < $cols_count; $c ++) { - $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c; + for ($c = 0; $c < $cols_count; $c++) { + $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count-1 - $c; if ($inner != 'cols') { /* shuffle x to loop over rows*/ $x = floor($x / $cols_count) + ($x % $cols_count) * $rows; @@ -174,3 +173,5 @@ function smarty_function_html_table_cycle($name, $var, $no) return ($ret) ? ' ' . $ret : ''; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.mailto.php b/Widgets/smarty/libs/plugins/function.mailto.php index 520fb7aa..55d5c060 100644 --- a/Widgets/smarty/libs/plugins/function.mailto.php +++ b/Widgets/smarty/libs/plugins/function.mailto.php @@ -2,12 +2,13 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {mailto} function plugin + * * Type: function<br> * Name: mailto<br> * Date: May 21, 2002 @@ -38,24 +39,22 @@ * {mailto address="me@domain.com" extra='class="mailto"'} * </pre> * - * @link http://www.smarty.net/manual/en/language.function.mailto.php {mailto} - * (Smarty online manual) - * @version 1.2 - * @author Monte Ohrt <monte at ohrt dot com> - * @author credits to Jason Sweat (added cc, bcc and subject functionality) - * - * @param array $params parameters - * + * @link http://www.smarty.net/manual/en/language.function.mailto.php {mailto} + * (Smarty online manual) + * @version 1.2 + * @author Monte Ohrt <monte at ohrt dot com> + * @author credits to Jason Sweat (added cc, bcc and subject functionality) + * @param array $params parameters + * @param Smarty_Internal_Template $template template object * @return string */ -function smarty_function_mailto($params) +function smarty_function_mailto($params, $template) { static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true); $extra = ''; if (empty($params['address'])) { - trigger_error("mailto: missing 'address' parameter", E_USER_WARNING); - + trigger_error("mailto: missing 'address' parameter",E_USER_WARNING); return; } else { $address = $params['address']; @@ -72,9 +71,8 @@ function smarty_function_mailto($params) case 'cc': case 'bcc': case 'followupto': - if (!empty($value)) { - $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value)); - } + if (!empty($value)) + $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value)); break; case 'subject': @@ -93,11 +91,10 @@ function smarty_function_mailto($params) if ($mail_parms) { $address .= '?' . join('&', $mail_parms); } - + $encode = (empty($params['encode'])) ? 'none' : $params['encode']; if (!isset($_allowed_encoding[$encode])) { trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex", E_USER_WARNING); - return; } // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed! @@ -105,7 +102,7 @@ function smarty_function_mailto($params) $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');'; $js_encode = ''; - for ($x = 0, $_length = strlen($string); $x < $_length; $x ++) { + for ($x = 0, $_length = strlen($string); $x < $_length; $x++) { $js_encode .= '%' . bin2hex($string[$x]); } @@ -113,7 +110,7 @@ function smarty_function_mailto($params) } elseif ($encode == 'javascript_charcode') { $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>'; - for ($x = 0, $y = strlen($string); $x < $y; $x ++) { + for($x = 0, $y = strlen($string); $x < $y; $x++) { $ord[] = ord($string[$x]); } @@ -128,12 +125,11 @@ function smarty_function_mailto($params) } elseif ($encode == 'hex') { preg_match('!^(.*)(\?.*)$!', $address, $match); 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; } $address_encode = ''; - for ($x = 0, $_length = strlen($address); $x < $_length; $x ++) { + for ($x = 0, $_length = strlen($address); $x < $_length; $x++) { if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[$x])) { $address_encode .= '%' . bin2hex($address[$x]); } else { @@ -141,15 +137,16 @@ function smarty_function_mailto($params) } } $text_encode = ''; - for ($x = 0, $_length = strlen($text); $x < $_length; $x ++) { + for ($x = 0, $_length = strlen($text); $x < $_length; $x++) { $text_encode .= '&#x' . bin2hex($text[$x]) . ';'; } $mailto = "mailto:"; - return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>'; } else { // no encoding return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>'; } } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/function.math.php b/Widgets/smarty/libs/plugins/function.math.php index aba76e82..f4d3f05e 100644 --- a/Widgets/smarty/libs/plugins/function.math.php +++ b/Widgets/smarty/libs/plugins/function.math.php @@ -1,91 +1,87 @@ <?php /** * Smarty plugin - * This plugin is only for Smarty2 BC * - * @package Smarty + * This plugin is only for Smarty2 BC + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {math} function plugin + * * Type: function<br> * Name: math<br> * Purpose: handle math computations in template * - * @link http://www.smarty.net/manual/en/language.function.math.php {math} - * (Smarty online manual) + * @link http://www.smarty.net/manual/en/language.function.math.php {math} + * (Smarty online manual) * @author Monte Ohrt <monte at ohrt dot com> - * * @param array $params parameters * @param Smarty_Internal_Template $template template object - * * @return string|null */ function smarty_function_math($params, $template) { static $_allowed_funcs = array( - 'int' => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true, - 'log' => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true, - 'rand' => true, 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true, 'tan' => true + 'int' => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true, + 'log' => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true, + 'rand' => true, 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true ,'tan' => true ); // be sure equation parameter is present if (empty($params['equation'])) { - trigger_error("math: missing equation parameter", E_USER_WARNING); - + trigger_error("math: missing equation parameter",E_USER_WARNING); return; } $equation = $params['equation']; // make sure parenthesis are balanced - if (substr_count($equation, "(") != substr_count($equation, ")")) { - trigger_error("math: unbalanced parenthesis", E_USER_WARNING); - + if (substr_count($equation,"(") != substr_count($equation,")")) { + trigger_error("math: unbalanced parenthesis",E_USER_WARNING); return; } // match all vars in equation, make sure all are passed - preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!", $equation, $match); + preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match); - foreach ($match[1] as $curr_var) { + foreach($match[1] as $curr_var) { if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) { - 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; } } - foreach ($params as $key => $val) { + foreach($params as $key => $val) { if ($key != "equation" && $key != "format" && $key != "assign") { // make sure value is not empty - if (strlen($val) == 0) { - trigger_error("math: parameter $key is empty", E_USER_WARNING); - + if (strlen($val)==0) { + trigger_error("math: parameter $key is empty",E_USER_WARNING); return; } 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; } $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation); } } $smarty_math_result = null; - eval("\$smarty_math_result = " . $equation . ";"); + eval("\$smarty_math_result = ".$equation.";"); if (empty($params['format'])) { if (empty($params['assign'])) { return $smarty_math_result; } else { - $template->assign($params['assign'], $smarty_math_result); + $template->assign($params['assign'],$smarty_math_result); } } else { - if (empty($params['assign'])) { - printf($params['format'], $smarty_math_result); + if (empty($params['assign'])){ + printf($params['format'],$smarty_math_result); } else { - $template->assign($params['assign'], sprintf($params['format'], $smarty_math_result)); + $template->assign($params['assign'],sprintf($params['format'],$smarty_math_result)); } } } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifier.capitalize.php b/Widgets/smarty/libs/plugins/modifier.capitalize.php index a8ad7637..a78e3632 100644 --- a/Widgets/smarty/libs/plugins/modifier.capitalize.php +++ b/Widgets/smarty/libs/plugins/modifier.capitalize.php @@ -1,24 +1,25 @@ <?php /** * Smarty plugin - * - * @package Smarty + * + * @package Smarty * @subpackage PluginsModifier */ /** * Smarty capitalize modifier plugin + * * Type: modifier<br> * Name: capitalize<br> * Purpose: capitalize words in the string + * * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }} * * @param string $string string to capitalize * @param boolean $uc_digits also capitalize "x123" to "X123" * @param boolean $lc_rest capitalize first letters, lowercase all following letters "aAa" to "Aaa" - * * @return string capitalized string - * @author Monte Ohrt <monte at ohrt dot com> + * @author Monte Ohrt <monte at ohrt dot com> * @author Rodney Rehm */ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false) @@ -26,65 +27,39 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals if (Smarty::$_MBSTRING) { if ($lc_rest) { // uppercase (including hyphenated words) - $upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET); + $upper_string = mb_convert_case( $string, MB_CASE_TITLE, Smarty::$_CHARSET ); } else { // uppercase word breaks - $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert_cb', $string); + $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); } // check uc_digits case if (!$uc_digits) { if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) { - foreach ($matches[1] as $match) { + foreach($matches[1] as $match) { $upper_string = substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1], strlen($match[0])); } - } + } } - $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb', $upper_string); + $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); return $upper_string; } - + // lowercase first if ($lc_rest) { $string = strtolower($string); } // uppercase (including hyphenated words) - $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst_cb', $string); + $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!eS" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').ucfirst(stripslashes('\\2'))", $string); // check uc_digits case if (!$uc_digits) { if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) { - foreach ($matches[1] as $match) { + foreach($matches[1] as $match) { $upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0])); } - } + } } - $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst2_cb', $upper_string); + $upper_string = preg_replace("!((^|\s)['\"])(\w)!e" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').strtoupper(stripslashes('\\3'))", $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])); -} +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifier.date_format.php b/Widgets/smarty/libs/plugins/modifier.date_format.php index 5ad7540b..3cca7d39 100644 --- a/Widgets/smarty/libs/plugins/modifier.date_format.php +++ b/Widgets/smarty/libs/plugins/modifier.date_format.php @@ -1,13 +1,14 @@ <?php /** * Smarty plugin - * - * @package Smarty + * + * @package Smarty * @subpackage PluginsModifier */ /** * Smarty date_format modifier plugin + * * Type: modifier<br> * Name: date_format<br> * Purpose: format datestamps via strftime<br> @@ -15,51 +16,50 @@ * - string: input date string * - format: strftime format for output * - default_date: default date if $string is empty - * - * @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> - * + * + * @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> * @param string $string input date string * @param string $format strftime format for output * @param string $default_date default date if $string is empty * @param string $formatter either 'strftime' or 'auto' - * * @return string |void - * @uses smarty_make_timestamp() + * @uses smarty_make_timestamp() */ -function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto') +function smarty_modifier_date_format($string, $format=null, $default_date='', $formatter='auto') { if ($format === null) { $format = Smarty::$_DATE_FORMAT; } /** - * Include the {@link shared.make_timestamp.php} plugin - */ + * Include the {@link shared.make_timestamp.php} plugin + */ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'); - if ($string != '' && $string != '0000-00-00' && $string != '0000-00-00 00:00:00') { + if ($string != '') { $timestamp = smarty_make_timestamp($string); } elseif ($default_date != '') { $timestamp = smarty_make_timestamp($default_date); } else { return; - } - if ($formatter == 'strftime' || ($formatter == 'auto' && strpos($format, '%') !== false)) { + } + if($formatter=='strftime'||($formatter=='auto'&&strpos($format,'%')!==false)) { if (DS == '\\') { $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T'); $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S'); if (strpos($format, '%e') !== false) { $_win_from[] = '%e'; $_win_to[] = sprintf('%\' 2d', date('j', $timestamp)); - } + } if (strpos($format, '%l') !== false) { $_win_from[] = '%l'; $_win_to[] = sprintf('%\' 2d', date('h', $timestamp)); - } + } $format = str_replace($_win_from, $_win_to, $format); - } - + } return strftime($format, $timestamp); } else { return date($format, $timestamp); } -} +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifier.debug_print_var.php b/Widgets/smarty/libs/plugins/modifier.debug_print_var.php index 66363d25..fa44100e 100644 --- a/Widgets/smarty/libs/plugins/modifier.debug_print_var.php +++ b/Widgets/smarty/libs/plugins/modifier.debug_print_var.php @@ -1,54 +1,53 @@ <?php /** * Smarty plugin - * - * @package Smarty + * + * @package Smarty * @subpackage Debug */ /** * Smarty debug_print_var modifier plugin + * * Type: modifier<br> * Name: debug_print_var<br> * Purpose: formats variable contents for display in the console * - * @author Monte Ohrt <monte at ohrt dot com> - * - * @param array|object $var variable to be formatted - * @param integer $depth maximum recursion depth if $var is an array - * @param integer $length maximum string length if $var is a string - * - * @return string + * @author Monte Ohrt <monte at ohrt dot com> + * @param array|object $var variable to be formatted + * @param integer $depth maximum recursion depth if $var is an array + * @param integer $length maximum string length if $var is a 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) { $_replace = array("\n" => '<i>\n</i>', - "\r" => '<i>\r</i>', - "\t" => '<i>\t</i>' - ); + "\r" => '<i>\r</i>', + "\t" => '<i>\t</i>' + ); switch (gettype($var)) { case 'array' : $results = '<b>Array (' . count($var) . ')</b>'; foreach ($var as $curr_key => $curr_val) { $results .= '<br>' . str_repeat(' ', $depth * 2) - . '<b>' . strtr($curr_key, $_replace) . '</b> => ' - . smarty_modifier_debug_print_var($curr_val, ++$depth, $length); - $depth --; - } + . '<b>' . strtr($curr_key, $_replace) . '</b> => ' + . smarty_modifier_debug_print_var($curr_val, ++$depth, $length); + $depth--; + } break; - + case 'object' : $object_vars = get_object_vars($var); $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>'; foreach ($object_vars as $curr_key => $curr_val) { $results .= '<br>' . str_repeat(' ', $depth * 2) - . '<b> ->' . strtr($curr_key, $_replace) . '</b> = ' - . smarty_modifier_debug_print_var($curr_val, ++$depth, $length); - $depth --; - } + . '<b> ->' . strtr($curr_key, $_replace) . '</b> = ' + . smarty_modifier_debug_print_var($curr_val, ++$depth, $length); + $depth--; + } break; - + case 'boolean' : case 'NULL' : case 'resource' : @@ -60,15 +59,15 @@ function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40) $results = 'null'; } else { $results = htmlspecialchars((string) $var); - } + } $results = '<i>' . $results . '</i>'; break; - + case 'integer' : case 'float' : $results = htmlspecialchars((string) $var); break; - + case 'string' : $results = strtr($var, $_replace); if (Smarty::$_MBSTRING) { @@ -83,7 +82,7 @@ function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40) $results = htmlspecialchars('"' . $results . '"'); break; - + case 'unknown type' : default : $results = strtr((string) $var, $_replace); @@ -96,9 +95,11 @@ function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40) $results = substr($results, 0, $length - 3) . '...'; } } - + $results = htmlspecialchars($results); - } + } return $results; -} +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifier.escape.php b/Widgets/smarty/libs/plugins/modifier.escape.php index 9fdb0702..523d0653 100644 --- a/Widgets/smarty/libs/plugins/modifier.escape.php +++ b/Widgets/smarty/libs/plugins/modifier.escape.php @@ -2,94 +2,45 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifier */ /** * Smarty escape modifier plugin + * * Type: modifier<br> * Name: escape<br> * Purpose: escape string for output * - * @link http://www.smarty.net/docs/en/language.modifier.escape + * @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> - * * @param string $string input string * @param string $esc_type escape type * @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() - * * @return string escaped input string */ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true) { - static $_double_encode = null; - if ($_double_encode === null) { - $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>='); - } - if (!$char_set) { $char_set = Smarty::$_CHARSET; } switch ($esc_type) { case 'html': - if ($_double_encode) { - // php >=5.3.2 - go native - return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode); - } else { - if ($double_encode) { - // php <5.2.3 - only handle double encoding - return htmlspecialchars($string, ENT_QUOTES, $char_set); - } else { - // php <5.2.3 - prevent double encoding - $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); - $string = htmlspecialchars($string, ENT_QUOTES, $char_set); - $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); - - return $string; - } - } + return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode); case 'htmlall': if (Smarty::$_MBSTRING) { // mb_convert_encoding ignores htmlspecialchars() - if ($_double_encode) { - // php >=5.3.2 - go native - $string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode); - } else { - if ($double_encode) { - // php <5.2.3 - only handle double encoding - $string = htmlspecialchars($string, ENT_QUOTES, $char_set); - } else { - // php <5.2.3 - prevent double encoding - $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); - $string = htmlspecialchars($string, ENT_QUOTES, $char_set); - $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); - - return $string; - } - } - + $string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode); // htmlentities() won't convert everything, so use mb_convert_encoding return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set); } // no MBString fallback - if ($_double_encode) { - return htmlentities($string, ENT_QUOTES, $char_set, $double_encode); - } else { - if ($double_encode) { - return htmlentities($string, ENT_QUOTES, $char_set); - } else { - $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); - $string = htmlentities($string, ENT_QUOTES, $char_set); - $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); - - return $string; - } - } + return htmlentities($string, ENT_QUOTES, $char_set, $double_encode); case 'url': return rawurlencode($string); @@ -106,10 +57,9 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ // Note that the UTF-8 encoded character ä will be represented as %c3%a4 $return = ''; $_length = strlen($string); - for ($x = 0; $x < $_length; $x ++) { + for ($x = 0; $x < $_length; $x++) { $return .= '%' . bin2hex($string[$x]); } - return $return; case 'hexentity': @@ -120,15 +70,13 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) { $return .= '&#x' . strtoupper(dechex($unicode)) . ';'; } - return $return; } // no MBString fallback $_length = strlen($string); - for ($x = 0; $x < $_length; $x ++) { + for ($x = 0; $x < $_length; $x++) { $return .= '&#x' . bin2hex($string[$x]) . ';'; } - return $return; case 'decentity': @@ -139,15 +87,13 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) { $return .= '&#' . $unicode . ';'; } - return $return; } // no MBString fallback $_length = strlen($string); - for ($x = 0; $x < $_length; $x ++) { + for ($x = 0; $x < $_length; $x++) { $return .= '&#' . ord($string[$x]) . ';'; } - return $return; case 'javascript': @@ -157,7 +103,6 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ case 'mail': if (Smarty::$_MBSTRING) { require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php'); - return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string); } // no MBString fallback @@ -175,12 +120,11 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ $return .= chr($unicode); } } - return $return; } $_length = strlen($string); - for ($_i = 0; $_i < $_length; $_i ++) { + for ($_i = 0; $_i < $_length; $_i++) { $_ord = ord(substr($string, $_i, 1)); // non-standard char, escape it if ($_ord >= 126) { @@ -189,10 +133,11 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ $return .= substr($string, $_i, 1); } } - return $return; default: return $string; } } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifier.regex_replace.php b/Widgets/smarty/libs/plugins/modifier.regex_replace.php index abb1ff54..f9fd5fa5 100644 --- a/Widgets/smarty/libs/plugins/modifier.regex_replace.php +++ b/Widgets/smarty/libs/plugins/modifier.regex_replace.php @@ -2,42 +2,39 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifier */ /** * Smarty regex_replace modifier plugin + * * Type: modifier<br> * Name: regex_replace<br> * Purpose: regular expression search/replace * - * @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) - * @author Monte Ohrt <monte at ohrt dot com> - * - * @param string $string input string - * @param string|array $search regular expression(s) to search for - * @param string|array $replace string(s) that should be replaced - * + * @author Monte Ohrt <monte at ohrt dot com> + * @param string $string input string + * @param string|array $search regular expression(s) to search for + * @param string|array $replace string(s) that should be replaced * @return string */ function smarty_modifier_regex_replace($string, $search, $replace) { - if (is_array($search)) { - foreach ($search as $idx => $s) { + if(is_array($search)) { + foreach($search as $idx => $s) { $search[$idx] = _smarty_regex_replace_check($s); } } else { $search = _smarty_regex_replace_check($search); } - return preg_replace($search, $replace, $string); } /** * @param string $search string(s) that should be replaced - * * @return string * @ignore */ @@ -45,13 +42,14 @@ function _smarty_regex_replace_check($search) { // null-byte injection detection // anything behind the first null-byte is ignored - if (($pos = strpos($search, "\0")) !== false) { - $search = substr($search, 0, $pos); + if (($pos = strpos($search,"\0")) !== false) { + $search = substr($search,0,$pos); } // remove eval-modifier from $search 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; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifier.replace.php b/Widgets/smarty/libs/plugins/modifier.replace.php index aa5e8570..4d71a6e9 100644 --- a/Widgets/smarty/libs/plugins/modifier.replace.php +++ b/Widgets/smarty/libs/plugins/modifier.replace.php @@ -1,34 +1,33 @@ <?php /** * Smarty plugin - * - * @package Smarty + * @package Smarty * @subpackage PluginsModifier */ /** * Smarty replace modifier plugin + * * Type: modifier<br> * Name: replace<br> * Purpose: simple search/replace - * - * @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual) - * @author Monte Ohrt <monte at ohrt dot com> - * @author Uwe Tews - * + * + * @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual) + * @author Monte Ohrt <monte at ohrt dot com> + * @author Uwe Tews * @param string $string input string * @param string $search text to search for * @param string $replace replacement text - * - * @return string + * @return string */ function smarty_modifier_replace($string, $search, $replace) { if (Smarty::$_MBSTRING) { require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php'); - return smarty_mb_str_replace($search, $replace, $string); } - + return str_replace($search, $replace, $string); -} +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifier.spacify.php b/Widgets/smarty/libs/plugins/modifier.spacify.php index e5c41ad8..a907232f 100644 --- a/Widgets/smarty/libs/plugins/modifier.spacify.php +++ b/Widgets/smarty/libs/plugins/modifier.spacify.php @@ -1,27 +1,27 @@ <?php /** * Smarty plugin - * - * @package Smarty + * @package Smarty * @subpackage PluginsModifier */ /** * Smarty spacify modifier plugin + * * Type: modifier<br> * Name: spacify<br> * Purpose: add spaces between characters in a string - * - * @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual) - * @author Monte Ohrt <monte at ohrt dot com> - * + * + * @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual) + * @author Monte Ohrt <monte at ohrt dot com> * @param string $string input string * @param string $spacify_char string to insert between characters. - * * @return string */ function smarty_modifier_spacify($string, $spacify_char = ' ') { // 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)); +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifier.truncate.php b/Widgets/smarty/libs/plugins/modifier.truncate.php index fbe62e82..9a803ec9 100644 --- a/Widgets/smarty/libs/plugins/modifier.truncate.php +++ b/Widgets/smarty/libs/plugins/modifier.truncate.php @@ -2,63 +2,58 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifier */ - + /** * Smarty truncate modifier plugin + * * Type: modifier<br> * Name: truncate<br> * Purpose: Truncate a string to a certain length if necessary, * optionally splitting in the middle of a word, and * appending the $etc string or inserting $etc into the middle. - * - * @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual) - * @author Monte Ohrt <monte at ohrt dot com> - * + * + * @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual) + * @author Monte Ohrt <monte at ohrt dot com> * @param string $string input string * @param integer $length length of truncated text * @param string $etc end string * @param boolean $break_words truncate at word boundary * @param boolean $middle truncate in the middle of text - * * @return string truncated string */ -function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false) -{ - if ($length == 0) { +function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false) { + if ($length == 0) return ''; - } if (Smarty::$_MBSTRING) { if (mb_strlen($string, Smarty::$_CHARSET) > $length) { $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET)); if (!$break_words && !$middle) { $string = preg_replace('/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER, '', mb_substr($string, 0, $length + 1, Smarty::$_CHARSET)); - } + } if (!$middle) { 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 $string; } - + // no MBString fallback if (isset($string[$length])) { $length -= min($length, strlen($etc)); if (!$break_words && !$middle) { $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1)); - } + } if (!$middle) { return substr($string, 0, $length) . $etc; } - return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2); } - return $string; -} +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.cat.php b/Widgets/smarty/libs/plugins/modifiercompiler.cat.php index db9d81fb..5049c63e 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.cat.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.cat.php @@ -2,12 +2,13 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty cat modifier plugin + * * Type: modifier<br> * Name: cat<br> * Date: Feb 24, 2003<br> @@ -15,15 +16,15 @@ * Input: string to catenate<br> * Example: {$var|cat:"foo"} * - * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat - * (Smarty online manual) + * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat + * (Smarty online manual) * @author Uwe Tews - * * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_cat($params) +function smarty_modifiercompiler_cat($params, $compiler) { - return '(' . implode(').(', $params) . ')'; + return '('.implode(').(', $params).')'; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.count_characters.php b/Widgets/smarty/libs/plugins/modifiercompiler.count_characters.php index f8463d80..0f269c9f 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.count_characters.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.count_characters.php @@ -2,24 +2,23 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty count_characters modifier plugin + * * Type: modifier<br> * Name: count_characteres<br> * 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 - * * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_count_characters($params) +function smarty_modifiercompiler_count_characters($params, $compiler) { if (!isset($params[1]) || $params[1] != 'true') { return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)'; @@ -30,3 +29,5 @@ function smarty_modifiercompiler_count_characters($params) // no MBString fallback return 'strlen(' . $params[0] . ')'; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.count_paragraphs.php b/Widgets/smarty/libs/plugins/modifiercompiler.count_paragraphs.php index 34f0bbb8..853f98f4 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.count_paragraphs.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.count_paragraphs.php @@ -2,26 +2,27 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty count_paragraphs modifier plugin + * * Type: modifier<br> * Name: count_paragraphs<br> * Purpose: count the number of paragraphs in a text * - * @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) - * @author Uwe Tews - * + * @author Uwe Tews * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_count_paragraphs($params) +function smarty_modifiercompiler_count_paragraphs($params, $compiler) { // count \r or \n characters return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)'; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.count_sentences.php b/Widgets/smarty/libs/plugins/modifiercompiler.count_sentences.php index f1ec5600..f8d79b3f 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.count_sentences.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.count_sentences.php @@ -2,26 +2,27 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty count_sentences modifier plugin + * * Type: modifier<br> * Name: count_sentences * Purpose: count the number of sentences in a text * - * @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) - * @author Uwe Tews - * + * @author Uwe Tews * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_count_sentences($params) +function smarty_modifiercompiler_count_sentences($params, $compiler) { // 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)'; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.count_words.php b/Widgets/smarty/libs/plugins/modifiercompiler.count_words.php index 8b4330f1..f53443e2 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.count_words.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.count_words.php @@ -2,24 +2,23 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty count_words modifier plugin + * * Type: modifier<br> * Name: count_words<br> * 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 - * * @param array $params parameters - * * @return string with compiled code - */ -function smarty_modifiercompiler_count_words($params) +*/ +function smarty_modifiercompiler_count_words($params, $compiler) { if (Smarty::$_MBSTRING) { // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)'; @@ -29,3 +28,5 @@ function smarty_modifiercompiler_count_words($params) // no MBString fallback return 'str_word_count(' . $params[0] . ')'; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.default.php b/Widgets/smarty/libs/plugins/modifiercompiler.default.php index fe777623..3554964e 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.default.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.default.php @@ -2,34 +2,34 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty default modifier plugin + * * Type: modifier<br> * Name: default<br> * 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 - * * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_default($params) +function smarty_modifiercompiler_default ($params, $compiler) { $output = $params[0]; if (!isset($params[1])) { $params[1] = "''"; } - + array_shift($params); foreach ($params as $param) { $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)'; } - return $output; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.escape.php b/Widgets/smarty/libs/plugins/modifiercompiler.escape.php index 7e848aae..fef8e848 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.escape.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.escape.php @@ -2,36 +2,29 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * @ignore */ -require_once(SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'); +require_once( SMARTY_PLUGINS_DIR .'shared.literal_compiler_param.php' ); /** * Smarty escape modifier plugin + * * Type: modifier<br> * Name: escape<br> * 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 - * * @param array $params parameters - * @param $compiler - * * @return string with compiled code */ function smarty_modifiercompiler_escape($params, $compiler) { - static $_double_encode = null; - if ($_double_encode === null) { - $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>='); - } - try { $esc_type = smarty_literal_compiler_param($params, 1, 'html'); $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET); @@ -43,56 +36,26 @@ function smarty_modifiercompiler_escape($params, $compiler) switch ($esc_type) { case 'html': - if ($_double_encode) { - return 'htmlspecialchars(' - . $params[0] . ', ENT_QUOTES, ' + return 'htmlspecialchars(' + . $params[0] .', ENT_QUOTES, ' . var_export($char_set, true) . ', ' . var_export($double_encode, true) . ')'; - } elseif ($double_encode) { - return 'htmlspecialchars(' - . $params[0] . ', ENT_QUOTES, ' - . var_export($char_set, true) . ')'; - } else { - // fall back to modifier.escape.php - } case 'htmlall': if (Smarty::$_MBSTRING) { - if ($_double_encode) { - // php >=5.2.3 - go native - return 'mb_convert_encoding(htmlspecialchars(' - . $params[0] . ', ENT_QUOTES, ' + return 'mb_convert_encoding(htmlspecialchars(' + . $params[0] .', ENT_QUOTES, ' . var_export($char_set, true) . ', ' . var_export($double_encode, true) . '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')'; - } elseif ($double_encode) { - // php <5.2.3 - only handle double encoding - return 'mb_convert_encoding(htmlspecialchars(' - . $params[0] . ', ENT_QUOTES, ' - . var_export($char_set, true) - . '), "HTML-ENTITIES", ' - . var_export($char_set, true) . ')'; - } else { - // fall back to modifier.escape.php - } } // no MBString fallback - if ($_double_encode) { - // php >=5.2.3 - go native - return 'htmlentities(' - . $params[0] . ', ENT_QUOTES, ' + return 'htmlentities(' + . $params[0] .', ENT_QUOTES, ' . var_export($char_set, true) . ', ' . var_export($double_encode, true) . ')'; - } elseif ($double_encode) { - // php <5.2.3 - only handle double encoding - return 'htmlentities(' - . $params[0] . ', ENT_QUOTES, ' - . var_export($char_set, true) . ')'; - } else { - // fall back to modifier.escape.php - } case 'url': return 'rawurlencode(' . $params[0] . ')'; @@ -107,20 +70,21 @@ function smarty_modifiercompiler_escape($params, $compiler) case 'javascript': // escape quotes and backslashes, newlines, etc. return 'strtr(' . $params[0] . ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))'; + } - } - catch (SmartyException $e) { + } catch(SmartyException $e) { // pass through to regular plugin fallback } // could not optimize |escape call, so fallback to regular plugin - if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) { - $compiler->template->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php'; + if ($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']['function'] = 'smarty_modifier_escape'; } 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'; } - - return 'smarty_modifier_escape(' . join(', ', $params) . ')'; + return 'smarty_modifier_escape(' . join( ', ', $params ) . ')'; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.from_charset.php b/Widgets/smarty/libs/plugins/modifiercompiler.from_charset.php index dab43e9c..5d6b7889 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.from_charset.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.from_charset.php @@ -2,23 +2,22 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty from_charset modifier plugin + * * Type: modifier<br> * Name: from_charset<br> * Purpose: convert character encoding from $charset to internal encoding * * @author Rodney Rehm - * * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_from_charset($params) +function smarty_modifiercompiler_from_charset($params, $compiler) { if (!Smarty::$_MBSTRING) { // FIXME: (rodneyrehm) shouldn't this throw an error? @@ -31,3 +30,5 @@ function smarty_modifiercompiler_from_charset($params) return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')'; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.indent.php b/Widgets/smarty/libs/plugins/modifiercompiler.indent.php index e3ca2082..26094b7c 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.indent.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.indent.php @@ -1,26 +1,24 @@ <?php /** * Smarty plugin - * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty indent modifier plugin + * * Type: modifier<br> * Name: indent<br> * 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 - * * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_indent($params) +function smarty_modifiercompiler_indent($params, $compiler) { if (!isset($params[1])) { $params[1] = 4; @@ -28,6 +26,7 @@ function smarty_modifiercompiler_indent($params) if (!isset($params[2])) { $params[2] = "' '"; } - return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')'; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.lower.php b/Widgets/smarty/libs/plugins/modifiercompiler.lower.php index 1d255f37..bc3abd72 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.lower.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.lower.php @@ -1,31 +1,31 @@ <?php /** * Smarty plugin - * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty lower modifier plugin + * * Type: modifier<br> * Name: lower<br> * Purpose: convert string to lowercase * - * @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 Uwe Tews - * * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_lower($params) +function smarty_modifiercompiler_lower($params, $compiler) { if (Smarty::$_MBSTRING) { - return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')'; + return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ; } // no MBString fallback return 'strtolower(' . $params[0] . ')'; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.noprint.php b/Widgets/smarty/libs/plugins/modifiercompiler.noprint.php index 4906908b..d7433e98 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.noprint.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.noprint.php @@ -2,20 +2,24 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty noprint modifier plugin + * * Type: modifier<br> * Name: noprint<br> * Purpose: return an empty string * * @author Uwe Tews + * @param array $params parameters * @return string with compiled code */ -function smarty_modifiercompiler_noprint() +function smarty_modifiercompiler_noprint($params, $compiler) { return "''"; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.string_format.php b/Widgets/smarty/libs/plugins/modifiercompiler.string_format.php index 71cdf281..5a8d4357 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.string_format.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.string_format.php @@ -2,24 +2,25 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty string_format modifier plugin + * * Type: modifier<br> * Name: string_format<br> * 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 - * * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_string_format($params) +function smarty_modifiercompiler_string_format($params, $compiler) { return 'sprintf(' . $params[1] . ',' . $params[0] . ')'; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.strip.php b/Widgets/smarty/libs/plugins/modifiercompiler.strip.php index fcd6cbae..8d15ca43 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.strip.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.strip.php @@ -2,12 +2,13 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty strip modifier plugin + * * Type: modifier<br> * Name: strip<br> * Purpose: Replace all repeated spaces, newlines, tabs @@ -15,19 +16,18 @@ * Example: {$var|strip} {$var|strip:" "}<br> * Date: September 25th, 2002 * - * @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 - * * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_strip($params) +function smarty_modifiercompiler_strip($params, $compiler) { if (!isset($params[1])) { $params[1] = "' '"; } - return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})"; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.strip_tags.php b/Widgets/smarty/libs/plugins/modifiercompiler.strip_tags.php index 3e6e1304..9ba71e3d 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.strip_tags.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.strip_tags.php @@ -2,28 +2,32 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty strip_tags modifier plugin + * * Type: modifier<br> * Name: strip_tags<br> * 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 - * * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_strip_tags($params) +function smarty_modifiercompiler_strip_tags($params, $compiler) { - if (!isset($params[1]) || $params[1] === true || trim($params[1], '"') == 'true') { + if (!isset($params[1])) { + $params[1] = true; + } + if ($params[1] === true) { return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})"; } else { return 'strip_tags(' . $params[0] . ')'; } } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.to_charset.php b/Widgets/smarty/libs/plugins/modifiercompiler.to_charset.php index 9122d8bb..d6c0f296 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.to_charset.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.to_charset.php @@ -2,23 +2,22 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty to_charset modifier plugin + * * Type: modifier<br> * Name: to_charset<br> * Purpose: convert character encoding from internal encoding to $charset * * @author Rodney Rehm - * * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_to_charset($params) +function smarty_modifiercompiler_to_charset($params, $compiler) { if (!Smarty::$_MBSTRING) { // FIXME: (rodneyrehm) shouldn't this throw an error? @@ -31,3 +30,5 @@ function smarty_modifiercompiler_to_charset($params) return 'mb_convert_encoding(' . $params[0] . ', ' . $params[1] . ', "' . addslashes(Smarty::$_CHARSET) . '")'; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.unescape.php b/Widgets/smarty/libs/plugins/modifiercompiler.unescape.php index 3b17ea2e..22d4d4c6 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.unescape.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.unescape.php @@ -2,23 +2,22 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty unescape modifier plugin + * * Type: modifier<br> * Name: unescape<br> * Purpose: unescape html entities * * @author Rodney Rehm - * * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_unescape($params) +function smarty_modifiercompiler_unescape($params, $compiler) { if (!isset($params[1])) { $params[1] = 'html'; @@ -31,20 +30,19 @@ function smarty_modifiercompiler_unescape($params) switch (trim($params[1], '"\'')) { case 'entity': + return 'mb_convert_encoding(' . $params[0] . ', ' . $params[2] . ', \'HTML-ENTITIES\')'; case 'htmlall': if (Smarty::$_MBSTRING) { return 'mb_convert_encoding(' . $params[0] . ', ' . $params[2] . ', \'HTML-ENTITIES\')'; } - - return 'html_entity_decode(' . $params[0] . ', ENT_NOQUOTES, ' . $params[2] . ')'; + return 'html_entity_decode(' . $params[0] . ', ENT_QUOTES, ' . $params[2] . ')'; case 'html': return 'htmlspecialchars_decode(' . $params[0] . ', ENT_QUOTES)'; - case 'url': - return 'rawurldecode(' . $params[0] . ')'; - default: return $params[0]; } } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.upper.php b/Widgets/smarty/libs/plugins/modifiercompiler.upper.php index 52ca4e8f..8611fa87 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.upper.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.upper.php @@ -2,28 +2,29 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty upper modifier plugin + * * Type: modifier<br> * Name: lower<br> * Purpose: convert string to uppercase - * - * @link http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual) - * @author Uwe Tews - * + * + * @link http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual) + * @author Uwe Tews * @param array $params parameters - * * @return string with compiled code */ -function smarty_modifiercompiler_upper($params) +function smarty_modifiercompiler_upper($params, $compiler) { if (Smarty::$_MBSTRING) { - return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')'; + return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ; } // no MBString fallback return 'strtoupper(' . $params[0] . ')'; -} +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/modifiercompiler.wordwrap.php b/Widgets/smarty/libs/plugins/modifiercompiler.wordwrap.php index 2ad928ea..8b524f32 100644 --- a/Widgets/smarty/libs/plugins/modifiercompiler.wordwrap.php +++ b/Widgets/smarty/libs/plugins/modifiercompiler.wordwrap.php @@ -2,46 +2,45 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifierCompiler */ /** * Smarty wordwrap modifier plugin + * * Type: modifier<br> * Name: wordwrap<br> * 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) - * @author Uwe Tews - * + * + * @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual) + * @author Uwe Tews * @param array $params parameters - * @param $compiler - * * @return string with compiled code */ function smarty_modifiercompiler_wordwrap($params, $compiler) { if (!isset($params[1])) { $params[1] = 80; - } + } if (!isset($params[2])) { $params[2] = '"\n"'; - } + } if (!isset($params[3])) { $params[3] = 'false'; - } + } $function = 'wordwrap'; if (Smarty::$_MBSTRING) { - if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) { - $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php'; + if ($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']['function'] = 'smarty_mb_wordwrap'; } else { - $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php'; + $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php'; $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap'; } $function = 'smarty_mb_wordwrap'; } - return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')'; -} +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/outputfilter.trimwhitespace.php b/Widgets/smarty/libs/plugins/outputfilter.trimwhitespace.php index 62ab4e77..41828e1d 100644 --- a/Widgets/smarty/libs/plugins/outputfilter.trimwhitespace.php +++ b/Widgets/smarty/libs/plugins/outputfilter.trimwhitespace.php @@ -2,22 +2,21 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsFilter */ /** * Smarty trimwhitespace outputfilter plugin + * * Trim unnecessary whitespace from HTML markup. * * @author Rodney Rehm - * - * @param string $source input string - * + * @param string $source input string + * @param Smarty_Internal_Template $smarty Smarty object * @return string filtered output - * @todo substr_replace() is not overloaded by mbstring.func_overload - so this function might fail! */ -function smarty_outputfilter_trimwhitespace($source) +function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $smarty) { $store = array(); $_store = 0; @@ -35,13 +34,12 @@ function smarty_outputfilter_trimwhitespace($source) $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length); $_offset += $_length - strlen($replace); - $_store ++; + $_store++; } } // Strip all HTML-Comments - // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124 - $source = preg_replace('#<!--.*?-->#ms', '', $source); + $source = preg_replace( '#<!--.*?-->#ms', '', $source ); // capture html elements not to be messed with $_offset = 0; @@ -53,38 +51,42 @@ function smarty_outputfilter_trimwhitespace($source) $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length); $_offset += $_length - strlen($replace); - $_store ++; + $_store++; } } $expressions = array( // replace multiple spaces between tags by a single space // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements - '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2', + '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2', // remove spaces between attributes (but not in attribute values!) '#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4', // note: for some very weird reason trim() seems to remove spaces inside attributes. // maybe a \0 byte or something is interfering? - '#^\s+<#Ss' => '<', - '#>\s+$#Ss' => '>', + '#^\s+<#Ss' => '<', + '#>\s+$#Ss' => '>', ); - $source = preg_replace(array_keys($expressions), array_values($expressions), $source); + $source = preg_replace( array_keys($expressions), array_values($expressions), $source ); // note: for some very weird reason trim() seems to remove spaces inside attributes. // maybe a \0 byte or something is interfering? // $source = trim( $source ); + // capture html elements not to be messed with $_offset = 0; if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) { foreach ($matches as $match) { + $store[] = $match[0][0]; $_length = strlen($match[0][0]); - $replace = $store[$match[1][0]]; + $replace = array_shift($store); $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length); $_offset += strlen($replace) - $_length; - $_store ++; + $_store++; } } return $source; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/shared.escape_special_chars.php b/Widgets/smarty/libs/plugins/shared.escape_special_chars.php index d3bd756b..d2609b67 100644 --- a/Widgets/smarty/libs/plugins/shared.escape_special_chars.php +++ b/Widgets/smarty/libs/plugins/shared.escape_special_chars.php @@ -2,21 +2,20 @@ /** * Smarty shared plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsShared */ if (version_compare(PHP_VERSION, '5.2.3', '>=')) { /** * escape_special_chars common function + * * Function: smarty_function_escape_special_chars<br> * Purpose: used by other smarty functions to escape * special chars except for already escaped ones * * @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 */ function smarty_function_escape_special_chars($string) @@ -24,20 +23,18 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) { if (!is_array($string)) { $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false); } - return $string; - } -} else { + } +} else { /** * escape_special_chars common function + * * Function: smarty_function_escape_special_chars<br> * Purpose: used by other smarty functions to escape * special chars except for already escaped ones * * @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 */ function smarty_function_escape_special_chars($string) @@ -45,9 +42,10 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) { if (!is_array($string)) { $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $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; - } -} + } +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/shared.literal_compiler_param.php b/Widgets/smarty/libs/plugins/shared.literal_compiler_param.php index 47d728a7..dbcd9374 100644 --- a/Widgets/smarty/libs/plugins/shared.literal_compiler_param.php +++ b/Widgets/smarty/libs/plugins/shared.literal_compiler_param.php @@ -2,7 +2,7 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsShared */ @@ -12,24 +12,22 @@ * @param array $params parameter array as given to the compiler function * @param integer $index array index of the parameter to convert * @param mixed $default value to be returned if the parameter is not present - * * @return mixed evaluated value of parameter or $default * @throws SmartyException if parameter is not a literal (but an expression, variable, …) * @author Rodney Rehm */ -function smarty_literal_compiler_param($params, $index, $default = null) +function smarty_literal_compiler_param($params, $index, $default=null) { // not set, go default if (!isset($params[$index])) { return $default; } // 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'); } $t = null; eval("\$t = " . $params[$index] . ";"); - return $t; } diff --git a/Widgets/smarty/libs/plugins/shared.make_timestamp.php b/Widgets/smarty/libs/plugins/shared.make_timestamp.php index 7c94e5f5..5d7c97e9 100644 --- a/Widgets/smarty/libs/plugins/shared.make_timestamp.php +++ b/Widgets/smarty/libs/plugins/shared.make_timestamp.php @@ -2,7 +2,7 @@ /** * Smarty shared plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsShared */ @@ -11,9 +11,7 @@ * Purpose: used by other smarty functions to make a timestamp from a string. * * @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 */ function smarty_make_timestamp($string) @@ -25,19 +23,20 @@ function smarty_make_timestamp($string) return $string->getTimestamp(); } elseif (strlen($string) == 14 && ctype_digit($string)) { // it is mysql timestamp format of YYYYMMDDHHMMSS? - return mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2), - substr($string, 4, 2), substr($string, 6, 2), substr($string, 0, 4)); + return mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2), + substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4)); } elseif (is_numeric($string)) { // it is a numeric string, we handle it as timestamp return (int) $string; } else { // strtotime should handle it $time = strtotime($string); - if ($time == - 1 || $time === false) { + if ($time == -1 || $time === false) { // strtotime() was not able to parse $string, use "now": return time(); } - return $time; } } + +?> diff --git a/Widgets/smarty/libs/plugins/shared.mb_str_replace.php b/Widgets/smarty/libs/plugins/shared.mb_str_replace.php index a5682ed3..ecafeb74 100644 --- a/Widgets/smarty/libs/plugins/shared.mb_str_replace.php +++ b/Widgets/smarty/libs/plugins/shared.mb_str_replace.php @@ -2,7 +2,7 @@ /** * Smarty shared plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsShared */ if (!function_exists('smarty_mb_str_replace')) { @@ -10,15 +10,14 @@ if (!function_exists('smarty_mb_str_replace')) { /** * Multibyte string replace * - * @param string $search the string to be searched - * @param string $replace the replacement string - * @param string $subject the source string - * @param int &$count number of matches found - * + * @param string $search the string to be searched + * @param string $replace the replacement string + * @param string $subject the source string + * @param int &$count number of matches found * @return string replaced string * @author Rodney Rehm */ - function smarty_mb_str_replace($search, $replace, $subject, &$count = 0) + function smarty_mb_str_replace($search, $replace, $subject, &$count=0) { if (!is_array($search) && is_array($replace)) { return false; @@ -26,7 +25,7 @@ if (!function_exists('smarty_mb_str_replace')) { if (is_array($subject)) { // call mb_replace for each single string in $subject foreach ($subject as &$string) { - $string = & smarty_mb_str_replace($search, $replace, $string, $c); + $string = &smarty_mb_str_replace($search, $replace, $string, $c); $count += $c; } } elseif (is_array($search)) { @@ -37,7 +36,7 @@ if (!function_exists('smarty_mb_str_replace')) { } } else { $n = max(count($search), count($replace)); - while ($n --) { + while ($n--) { $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c); $count += $c; next($search); @@ -49,7 +48,8 @@ if (!function_exists('smarty_mb_str_replace')) { $count = count($parts) - 1; $subject = implode($replace, $parts); } - return $subject; } + } +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/shared.mb_unicode.php b/Widgets/smarty/libs/plugins/shared.mb_unicode.php index 0f790b56..e7f839ec 100644 --- a/Widgets/smarty/libs/plugins/shared.mb_unicode.php +++ b/Widgets/smarty/libs/plugins/shared.mb_unicode.php @@ -2,53 +2,47 @@ /** * Smarty shared plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsShared */ /** * 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 $encoding encoding of $string, if null mb_internal_encoding() is used - * * @return array sequence of unicodes * @author Rodney Rehm */ -function smarty_mb_to_unicode($string, $encoding = null) -{ +function smarty_mb_to_unicode($string, $encoding=null) { if ($encoding) { $expanded = mb_convert_encoding($string, "UTF-32BE", $encoding); } else { $expanded = mb_convert_encoding($string, "UTF-32BE"); } - return unpack("N*", $expanded); } /** * 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 string $encoding encoding of returned string, if null mb_internal_encoding() is used - * * @return string unicode as character sequence in given $encoding * @author Rodney Rehm */ -function smarty_mb_from_unicode($unicode, $encoding = null) -{ +function smarty_mb_from_unicode($unicode, $encoding=null) { $t = ''; if (!$encoding) { $encoding = mb_internal_encoding(); } - foreach ((array) $unicode as $utf32be) { + foreach((array) $unicode as $utf32be) { $character = pack("N*", $utf32be); $t .= mb_convert_encoding($character, $encoding, "UTF-32BE"); } - return $t; } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/shared.mb_wordwrap.php b/Widgets/smarty/libs/plugins/shared.mb_wordwrap.php index 31f4acf0..ba3498c7 100644 --- a/Widgets/smarty/libs/plugins/shared.mb_wordwrap.php +++ b/Widgets/smarty/libs/plugins/shared.mb_wordwrap.php @@ -2,40 +2,44 @@ /** * Smarty shared plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsShared */ -if (!function_exists('smarty_mb_wordwrap')) { +if(!function_exists('smarty_mb_wordwrap')) { /** * Wrap a string to a given number of characters * - * @link http://php.net/manual/en/function.wordwrap.php for similarity - * - * @param string $str the string to wrap - * @param int $width the width of the output - * @param string $break the character used to break the line - * @param boolean $cut ignored parameter, just for the sake of - * - * @return string wrapped string + * @link http://php.net/manual/en/function.wordwrap.php for similarity + * @param string $str the string to wrap + * @param int $width the width of the output + * @param string $break the character used to break the line + * @param boolean $cut ignored parameter, just for the sake of + * @return string wrapped string * @author Rodney Rehm */ - function smarty_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false) + function smarty_mb_wordwrap($str, $width=75, $break="\n", $cut=false) { // break words into tokens using white space as a delimiter - $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, - 1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE); + $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE); $length = 0; $t = ''; $_previous = false; - $_space = false; foreach ($tokens as $_token) { $token_length = mb_strlen($_token, Smarty::$_CHARSET); $_tokens = array($_token); if ($token_length > $width) { - if ($cut) { - $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, - 1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE); + // remove last space + $t = mb_substr($t, 0, -1, Smarty::$_CHARSET); + $_previous = false; + $length = 0; + + if ($cut) { + $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE); + // broken words go on a new line + $t .= $break; } } @@ -46,23 +50,27 @@ if (!function_exists('smarty_mb_wordwrap')) { if ($length > $width) { // remove space before inserted break - if ($_previous) { - $t = mb_substr($t, 0, - 1, Smarty::$_CHARSET); + if ($_previous && $token_length < $width) { + $t = mb_substr($t, 0, -1, Smarty::$_CHARSET); } - if (!$_space) { - // add the break before the token - if (!empty($t)) { - $t .= $break; - } - $length = $token_length; + // add the break before the token + $t .= $break; + $length = $token_length; + + // skip space after inserting a break + if ($_space) { + $length = 0; + continue; } - } elseif ($token == "\n") { + } else if ($token == "\n") { // hard break must reset counters $_previous = 0; $length = 0; + } else { + // remember if we had a space or not + $_previous = $_space; } - $_previous = $_space; // add the token $t .= $token; } @@ -70,4 +78,6 @@ if (!function_exists('smarty_mb_wordwrap')) { return $t; } + } +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/plugins/variablefilter.htmlspecialchars.php b/Widgets/smarty/libs/plugins/variablefilter.htmlspecialchars.php index aecd1e7e..aff711e4 100644 --- a/Widgets/smarty/libs/plugins/variablefilter.htmlspecialchars.php +++ b/Widgets/smarty/libs/plugins/variablefilter.htmlspecialchars.php @@ -2,18 +2,20 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsFilter */ /** * 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 */ -function smarty_variablefilter_htmlspecialchars($source) +function smarty_variablefilter_htmlspecialchars($source, $smarty) { return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET); } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_cacheresource.php b/Widgets/smarty/libs/sysplugins/smarty_cacheresource.php index 667bee44..ca18add5 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_cacheresource.php +++ b/Widgets/smarty/libs/sysplugins/smarty_cacheresource.php @@ -1,123 +1,106 @@ <?php /** - * Smarty Internal Plugin - * - * @package Smarty - * @subpackage Cacher - */ +* Smarty Internal Plugin +* +* @package Smarty +* @subpackage Cacher +*/ /** - * Cache Handler API - * - * @package Smarty - * @subpackage Cacher - * @author Rodney Rehm - */ -abstract class Smarty_CacheResource -{ +* Cache Handler API +* +* @package Smarty +* @subpackage Cacher +* @author Rodney Rehm +*/ +abstract class Smarty_CacheResource { /** - * cache for Smarty_CacheResource instances - * - * @var array - */ + * cache for Smarty_CacheResource instances + * @var array + */ public static $resources = array(); /** - * resource types provided by the core - * - * @var array - */ + * resource types provided by the core + * @var array + */ protected static $sysplugins = array( 'file' => true, ); /** - * populate Cached Object with meta data from Resource - * - * @param Smarty_Template_Cached $cached cached object - * @param Smarty_Internal_Template $_template template object - * - * @return void - */ - abstract public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template); + * populate Cached Object with meta data from Resource + * + * @param Smarty_Template_Cached $cached cached object + * @param Smarty_Internal_Template $_template template object + * @return void + */ + public abstract function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template); /** - * populate Cached Object with timestamp and exists from Resource - * - * @param Smarty_Template_Cached $cached - * - * @return void - */ - abstract public function populateTimestamp(Smarty_Template_Cached $cached); + * populate Cached Object with timestamp and exists from Resource + * + * @param Smarty_Template_Cached $source cached object + * @return void + */ + public abstract function populateTimestamp(Smarty_Template_Cached $cached); /** - * Read the cached template and process header - * - * @param Smarty_Internal_Template $_template template object - * @param Smarty_Template_Cached $cached cached object - * - * @return boolean true or false if the cached content does not exist - */ - abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null); + * Read the cached template and process header + * + * @param Smarty_Internal_Template $_template template object + * @param Smarty_Template_Cached $cached cached object + * @return booelan true or false if the cached content does not exist + */ + public abstract function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null); /** - * Write the rendered template output to cache - * - * @param Smarty_Internal_Template $_template template object - * @param string $content content to cache - * - * @return boolean success - */ - abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content); + * Write the rendered template output to cache + * + * @param Smarty_Internal_Template $_template template object + * @param string $content content to cache + * @return boolean success + */ + public abstract function writeCachedContent(Smarty_Internal_Template $_template, $content); /** - * Return cached content - * - * @param Smarty_Internal_Template $_template template object - * - * @return null|string - */ + * Return cached content + * + * @param Smarty_Internal_Template $_template template object + * @param string $content content of cache + */ public function getCachedContent(Smarty_Internal_Template $_template) { if ($_template->cached->handler->process($_template)) { ob_start(); $_template->properties['unifunc']($_template); - return ob_get_clean(); } - return null; } /** - * Empty cache - * - * @param Smarty $smarty Smarty object - * @param integer $exp_time expiration time (number of seconds, not timestamp) - * - * @return integer number of cache files deleted - */ - abstract public function clearAll(Smarty $smarty, $exp_time = null); + * Empty cache + * + * @param Smarty $smarty Smarty object + * @param integer $exp_time expiration time (number of seconds, not timestamp) + * @return integer number of cache files deleted + */ + public abstract function clearAll(Smarty $smarty, $exp_time=null); /** - * Empty cache for a specific template - * - * @param Smarty $smarty Smarty object - * @param string $resource_name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param integer $exp_time expiration time (number of seconds, not timestamp) - * - * @return integer number of cache files deleted - */ - abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time); + * Empty cache for a specific template + * + * @param Smarty $smarty Smarty object + * @param string $resource_name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param integer $exp_time expiration time (number of seconds, not timestamp) + * @return integer number of cache files deleted + */ + public abstract 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) { // theoretically locking_timeout should be checked against time_limit (max_execution_time) @@ -131,61 +114,35 @@ abstract class Smarty_CacheResource } sleep(1); } - 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) { // check if lock exists 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) { // create lock 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) { // release lock return true; } + /** - * Load Cache Resource Handler - * - * @param Smarty $smarty Smarty object - * @param string $type name of the cache resource - * - * @throws SmartyException - * @return Smarty_CacheResource Cache Resource Handler - */ + * Load Cache Resource Handler + * + * @param Smarty $smarty Smarty object + * @param string $type name of the cache resource + * @return Smarty_CacheResource Cache Resource Handler + */ public static function load(Smarty $smarty, $type = null) { if (!isset($type)) { @@ -196,7 +153,7 @@ abstract class Smarty_CacheResource if (isset($smarty->_cacheresource_handlers[$type])) { return $smarty->_cacheresource_handlers[$type]; } - + // try registered resource if (isset($smarty->registered_cache_resources[$type])) { // do not cache these instances as they may vary from instance to instance @@ -208,7 +165,6 @@ abstract class Smarty_CacheResource $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type); self::$resources[$type] = new $cache_resource_class(); } - return $smarty->_cacheresource_handlers[$type] = self::$resources[$type]; } // try plugins dir @@ -217,7 +173,6 @@ abstract class Smarty_CacheResource if (!isset(self::$resources[$type])) { self::$resources[$type] = new $cache_resource_class(); } - return $smarty->_cacheresource_handlers[$type] = self::$resources[$type]; } // give up @@ -225,10 +180,10 @@ abstract class Smarty_CacheResource } /** - * Invalid Loaded Cache Files - * - * @param Smarty $smarty Smarty object - */ + * Invalid Loaded Cache Files + * + * @param Smarty $smarty Smarty object + */ public static function invalidLoadedCache(Smarty $smarty) { foreach ($smarty->template_objects as $tpl) { @@ -241,104 +196,92 @@ abstract class Smarty_CacheResource } /** - * Smarty Resource Data Object - * Cache Data Container for Template Files - * - * @package Smarty - * @subpackage TemplateResources - * @author Rodney Rehm - */ -class Smarty_Template_Cached -{ +* Smarty Resource Data Object +* +* Cache Data Container for Template Files +* +* @package Smarty +* @subpackage TemplateResources +* @author Rodney Rehm +*/ +class Smarty_Template_Cached { /** - * Source Filepath - * - * @var string - */ + * Source Filepath + * @var string + */ public $filepath = false; /** - * Source Content - * - * @var string - */ + * Source Content + * @var string + */ public $content = null; /** - * Source Timestamp - * - * @var integer - */ + * Source Timestamp + * @var integer + */ public $timestamp = false; /** - * Source Existence - * - * @var boolean - */ + * Source Existance + * @var boolean + */ public $exists = false; /** - * Cache Is Valid - * - * @var boolean - */ + * Cache Is Valid + * @var boolean + */ public $valid = false; /** - * Cache was processed - * - * @var boolean - */ + * Cache was processed + * @var boolean + */ public $processed = false; /** - * CacheResource Handler - * - * @var Smarty_CacheResource - */ + * CacheResource Handler + * @var Smarty_CacheResource + */ public $handler = null; /** - * Template Compile Id (Smarty_Internal_Template::$compile_id) - * - * @var string - */ + * Template Compile Id (Smarty_Internal_Template::$compile_id) + * @var string + */ public $compile_id = null; /** - * Template Cache Id (Smarty_Internal_Template::$cache_id) - * - * @var string - */ + * Template Cache Id (Smarty_Internal_Template::$cache_id) + * @var string + */ public $cache_id = null; /** - * Id for cache locking - * - * @var string - */ + * Id for cache locking + * @var string + */ public $lock_id = null; /** - * flag that cache is locked by this instance - * - * @var bool - */ + * flag that cache is locked by this instance + * @var bool + */ public $is_locked = false; /** - * Source Object - * - * @var Smarty_Template_Source - */ + * Source Object + * @var Smarty_Template_Source + */ public $source = null; /** - * create Cached Object container - * - * @param Smarty_Internal_Template $_template template object - */ + * create Cached Object container + * + * @param Smarty_Internal_Template $_template template object + */ public function __construct(Smarty_Internal_Template $_template) { $this->compile_id = $_template->compile_id; @@ -357,7 +300,6 @@ class Smarty_Template_Cached // if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) { $handler->populate($this, $_template); - return; } while (true) { @@ -386,7 +328,7 @@ class Smarty_Template_Cached if ($smarty->debugging) { Smarty_Internal_Debug::start_cache($_template); } - if ($handler->process($_template, $this) === false) { + if($handler->process($_template, $this) === false) { $this->valid = false; } else { $this->processed = true; @@ -405,7 +347,6 @@ class Smarty_Template_Cached } if (!$this->valid && $_template->smarty->cache_locking) { $this->handler->acquireLock($_template->smarty, $this); - return; } else { return; @@ -414,29 +355,27 @@ class Smarty_Template_Cached } /** - * Write this cache object to handler - * - * @param Smarty_Internal_Template $_template template object - * @param string $content content to cache - * - * @return boolean success - */ + * Write this cache object to handler + * + * @param Smarty_Internal_Template $_template template object + * @param string $content content to cache + * @return boolean success + */ public function write(Smarty_Internal_Template $_template, $content) { if (!$_template->source->recompiled) { if ($this->handler->writeCachedContent($_template, $content)) { - $this->content = null; $this->timestamp = time(); $this->exists = true; $this->valid = true; if ($_template->smarty->cache_locking) { $this->handler->releaseLock($_template->smarty, $this); } - return true; } } - return false; } + } +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_cacheresource_custom.php b/Widgets/smarty/libs/sysplugins/smarty_cacheresource_custom.php index a258b2de..16fe72e1 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_cacheresource_custom.php +++ b/Widgets/smarty/libs/sysplugins/smarty_cacheresource_custom.php @@ -2,43 +2,42 @@ /** * Smarty Internal Plugin * - * @package Smarty + * @package Smarty * @subpackage Cacher */ /** * Cache Handler API * - * @package Smarty + * @package Smarty * @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 * - * @param string $id unique cache content identifier - * @param string $name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param string $content cached content - * @param integer $mtime cache modification timestamp (epoch) - * + * @param string $id unique cache content identifier + * @param string $name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param string $content cached content + * @param integer $mtime cache modification timestamp (epoch) * @return void */ - abstract protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime); + protected abstract function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime); /** * Fetch cached content's modification timestamp from data source + * * {@internal 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 $name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * + * @param string $id unique cache content identifier + * @param string $name template name + * @param string $cache_id cache id + * @param string $compile_id compile id * @return integer|boolean timestamp (epoch) the template was modified, or false if not found */ protected function fetchTimestamp($id, $name, $cache_id, $compile_id) @@ -49,35 +48,32 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource /** * Save content to cache * - * @param string $id unique cache content identifier - * @param string $name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param integer|null $exp_time seconds till expiration or null - * @param string $content content to cache - * - * @return boolean success + * @param string $id unique cache content identifier + * @param string $name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param integer|null $exp_time seconds till expiration or null + * @param string $content content to cache + * @return boolean success */ - abstract protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content); + protected abstract function save($id, $name, $cache_id, $compile_id, $exp_time, $content); /** * Delete content from cache * - * @param string $name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param integer|null $exp_time seconds till expiration time in seconds or null - * - * @return integer number of deleted caches + * @param string $name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param integer|null $exp_time seconds till expiration time in seconds or null + * @return integer number of deleted caches */ - abstract protected function delete($name, $cache_id, $compile_id, $exp_time); + protected abstract function delete($name, $cache_id, $compile_id, $exp_time); /** * populate Cached Object with meta data from Resource * - * @param Smarty_Template_Cached $cached cached object - * @param Smarty_Internal_Template $_template template object - * + * @param Smarty_Template_Cached $cached cached object + * @param Smarty_Internal_Template $_template template object * @return void */ public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template) @@ -92,8 +88,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource /** * populate Cached Object with timestamp and exists from Resource * - * @param Smarty_Template_Cached $cached - * + * @param Smarty_Template_Cached $source cached object * @return void */ public function populateTimestamp(Smarty_Template_Cached $cached) @@ -102,7 +97,6 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource if ($mtime !== null) { $cached->timestamp = $mtime; $cached->exists = !!$cached->timestamp; - return; } $timestamp = null; @@ -114,12 +108,11 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource /** * Read the cached template and process the header * - * @param Smarty_Internal_Template $_template template object - * @param Smarty_Template_Cached $cached cached object - * - * @return boolean true or false if the cached content does not exist + * @param Smarty_Internal_Template $_template template object + * @param Smarty_Template_Cached $cached cached object + * @return booelan true or false if the cached content does not exist */ - public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null) + public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null) { if (!$cached) { $cached = $_template->cached; @@ -137,25 +130,19 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource ); } if (isset($content)) { - /** @var Smarty_Internal_Template $_smarty_tpl - * used in evaluated code - */ $_smarty_tpl = $_template; eval("?>" . $content); - return true; } - return false; } /** * Write the rendered template output to cache * - * @param Smarty_Internal_Template $_template template object - * @param string $content content to cache - * - * @return boolean success + * @param Smarty_Internal_Template $_template template object + * @param string $content content to cache + * @return boolean success */ public function writeCachedContent(Smarty_Internal_Template $_template, $content) { @@ -172,95 +159,62 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource /** * Empty cache * - * @param Smarty $smarty Smarty object - * @param integer $exp_time expiration time (number of seconds, not timestamp) - * + * @param Smarty $smarty Smarty object + * @param integer $exp_time expiration time (number of seconds, not timestamp) * @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(); - return $this->delete(null, null, null, $exp_time); } /** * Empty cache for a specific template * - * @param Smarty $smarty Smarty object - * @param string $resource_name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param integer $exp_time expiration time (number of seconds, not timestamp) - * + * @param Smarty $smarty Smarty object + * @param string $resource_name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param integer $exp_time expiration time (number of seconds, not timestamp) * @return integer number of cache files deleted */ public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time) { $this->cache = array(); - $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); + return $this->delete($resource_name, $cache_id, $compile_id, $exp_time); } - + /** * Check is cache is locked for this template * - * @param Smarty $smarty Smarty object - * @param Smarty_Template_Cached $cached cached object - * - * @return boolean true or false if cache is locked + * @param Smarty $smarty Smarty object + * @param Smarty_Template_Cached $cached cached object + * @return booelan true or false if cache is locked */ public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached) { $id = $cached->filepath; $name = $cached->source->name . '.lock'; - + $mtime = $this->fetchTimestamp($id, $name, null, null); if ($mtime === null) { $this->fetch($id, $name, null, null, $content, $mtime); } - + return $mtime && time() - $mtime < $smarty->locking_timeout; } /** * Lock cache for this template * - * @param Smarty $smarty Smarty object + * @param Smarty $smarty Smarty object * @param Smarty_Template_Cached $cached cached object - * - * @return bool|void */ public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached) { $cached->is_locked = true; - + $id = $cached->filepath; $name = $cached->source->name . '.lock'; $this->save($id, $name, null, null, $smarty->locking_timeout, ''); @@ -269,16 +223,16 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource /** * Unlock cache for this template * - * @param Smarty $smarty Smarty object + * @param Smarty $smarty Smarty object * @param Smarty_Template_Cached $cached cached object - * - * @return bool|void */ public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached) { $cached->is_locked = false; - + + $id = $cached->filepath; $name = $cached->source->name . '.lock'; $this->delete($name, null, null, null); } } +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/Widgets/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php index a4b365a8..dff9b65a 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php +++ b/Widgets/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php @@ -2,43 +2,44 @@ /** * Smarty Internal Plugin * - * @package Smarty + * @package Smarty * @subpackage Cacher */ /** * Smarty Cache Handler Base for Key/Value Storage Implementations + * * 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 * wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which * is no problem to filesystem and RDBMS implementations. + * * 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 * 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 * 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. + * * 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 * »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 * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever« * consider using »a|b|c|$page-$items-$whatever« instead. * - * @package Smarty + * @package Smarty * @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 - * * @var array */ protected $contents = array(); /** * cache for timestamps - * * @var array */ protected $timestamps = array(); @@ -46,17 +47,16 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource /** * populate Cached Object with meta data from Resource * - * @param Smarty_Template_Cached $cached cached object - * @param Smarty_Internal_Template $_template template object - * + * @param Smarty_Template_Cached $cached cached object + * @param Smarty_Internal_Template $_template template object * @return void */ public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template) { $cached->filepath = $_template->source->uid - . '#' . $this->sanitize($cached->source->resource) - . '#' . $this->sanitize($cached->cache_id) - . '#' . $this->sanitize($cached->compile_id); + . '#' . $this->sanitize($cached->source->name) + . '#' . $this->sanitize($cached->cache_id) + . '#' . $this->sanitize($cached->compile_id); $this->populateTimestamp($cached); } @@ -64,8 +64,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource /** * 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 */ public function populateTimestamp(Smarty_Template_Cached $cached) @@ -81,12 +80,11 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource /** * Read the cached template and process the header * - * @param Smarty_Internal_Template $_template template object - * @param Smarty_Template_Cached $cached cached object - * - * @return boolean true or false if the cached content does not exist + * @param Smarty_Internal_Template $_template template object + * @param Smarty_Template_Cached $cached cached object + * @return booelan true or false if the cached content does not exist */ - public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null) + public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null) { if (!$cached) { $cached = $_template->cached; @@ -99,63 +97,55 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource } } if (isset($content)) { - /** @var Smarty_Internal_Template $_smarty_tpl - * used in evaluated code - */ $_smarty_tpl = $_template; eval("?>" . $content); - return true; } - return false; } /** * Write the rendered template output to cache * - * @param Smarty_Internal_Template $_template template object - * @param string $content content to cache - * - * @return boolean success + * @param Smarty_Internal_Template $_template template object + * @param string $content content to cache + * @return boolean success */ public function writeCachedContent(Smarty_Internal_Template $_template, $content) { $this->addMetaTimestamp($content); - return $this->write(array($_template->cached->filepath => $content), $_template->properties['cache_lifetime']); } /** * Empty cache - * {@internal the $exp_time argument is ignored altogether }} * - * @param Smarty $smarty Smarty object - * @param integer $exp_time expiration time [being ignored] + * {@internal the $exp_time argument is ignored altogether }} * + * @param Smarty $smarty Smarty object + * @param integer $exp_time expiration time [being ignored] * @return integer number of cache files deleted [always -1] * @uses purge() to clear the whole store * @uses invalidate() to mark everything outdated if purge() is inapplicable */ - public function clearAll(Smarty $smarty, $exp_time = null) + public function clearAll(Smarty $smarty, $exp_time=null) { if (!$this->purge()) { $this->invalidate(null); } - - return - 1; + return -1; } /** * Empty cache for a specific template - * {@internal the $exp_time argument is ignored altogether}} * - * @param Smarty $smarty Smarty object - * @param string $resource_name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param integer $exp_time expiration time [being ignored] + * {@internal the $exp_time argument is ignored altogether}} * + * @param Smarty $smarty Smarty object + * @param string $resource_name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param integer $exp_time expiration time [being ignored] * @return integer number of cache files deleted [always -1] * @uses buildCachedFilepath() to generate the CacheID * @uses invalidate() to mark CacheIDs parent chain as outdated @@ -167,18 +157,15 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' . $this->sanitize($compile_id); $this->delete(array($cid)); $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid); - - return - 1; + return -1; } - /** * Get template's unique ID * - * @param Smarty $smarty Smarty object - * @param string $resource_name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * + * @param Smarty $smarty Smarty object + * @param string $resource_name template name + * @param string $cache_id cache id + * @param string $compile_id compile id * @return string filepath of cache file */ protected function getTemplateUid(Smarty $smarty, $resource_name, $cache_id, $compile_id) @@ -189,7 +176,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource if ($tpl->source->exists) { $uid = $tpl->source->uid; } - + // remove from template cache if ($smarty->allow_ambiguous_resources) { $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id; @@ -201,15 +188,13 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource } unset($smarty->template_objects[$_templateId]); } - return $uid; } /** * Sanitize CacheID components * - * @param string $string CacheID component to sanitize - * + * @param string $string CacheID component to sanitize * @return string sanitized CacheID component */ protected function sanitize($string) @@ -219,21 +204,19 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource if (!$string) { return null; } - return preg_replace('#[^\w\|]+#S', '_', $string); } /** * Fetch and prepare a cache object. * - * @param string $cid CacheID to fetch - * @param string $resource_name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param string $content cached content - * @param integer &$timestamp cached timestamp (epoch) - * @param string $resource_uid resource's uid - * + * @param string $cid CacheID to fetch + * @param string $resource_name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param string $content cached content + * @param integer &$timestamp cached timestamp (epoch) + * @param string $resource_uid resource's uid * @return boolean success */ protected function fetch($cid, $resource_name = null, $cache_id = null, $compile_id = null, &$content = null, &$timestamp = null, $resource_uid = null) @@ -255,6 +238,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource /** * 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}} * * @param string &$content the content to be cached @@ -269,28 +253,25 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource /** * Extract the timestamp the $content was cached * - * @param string &$content the cached content - * - * @return float the microtime the content was cached + * @param string &$content the cached content + * @return float the microtime the content was cached */ protected function getMetaTimestamp(&$content) { $s = unpack("N", substr($content, 0, 4)); $m = unpack("N", substr($content, 4, 4)); $content = substr($content, 8); - return $s[1] + ($m[1] / 100000000); } /** * Invalidate CacheID * - * @param string $cid CacheID - * @param string $resource_name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param string $resource_uid source's uid - * + * @param string $cid CacheID + * @param string $resource_name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param string $resource_uid source's uid * @return void */ protected function invalidate($cid = null, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null) @@ -300,24 +281,22 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource // invalidate everything if (!$resource_name && !$cache_id && !$compile_id) { $key = 'IVK#ALL'; - } // invalidate all caches by template + } + // invalidate all caches by template + else if ($resource_name && !$cache_id && !$compile_id) { + $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name); + } + // invalidate all caches by cache group + else if (!$resource_name && $cache_id && !$compile_id) { + $key = 'IVK#CACHE#' . $this->sanitize($cache_id); + } + // invalidate all caches by compile id + else if (!$resource_name && !$cache_id && $compile_id) { + $key = 'IVK#COMPILE#' . $this->sanitize($compile_id); + } + // invalidate by combination else { - if ($resource_name && !$cache_id && !$compile_id) { - $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name); - } // invalidate all caches by cache group - else { - if (!$resource_name && $cache_id && !$compile_id) { - $key = 'IVK#CACHE#' . $this->sanitize($cache_id); - } // invalidate all caches by compile id - else { - if (!$resource_name && !$cache_id && $compile_id) { - $key = 'IVK#COMPILE#' . $this->sanitize($compile_id); - } // invalidate by combination - else { - $key = 'IVK#CID#' . $cid; - } - } - } + $key = 'IVK#CID#' . $cid; } $this->write(array($key => $now)); } @@ -325,13 +304,12 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource /** * Determine the latest timestamp known to the invalidation chain * - * @param string $cid CacheID to determine latest invalidation timestamp of - * @param string $resource_name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param string $resource_uid source's filepath - * - * @return float the microtime the CacheID was invalidated + * @param string $cid CacheID to determine latest invalidation timestamp of + * @param string $resource_name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param string $resource_uid source's filepath + * @return float the microtime the CacheID was invalidated */ protected function getLatestInvalidationTimestamp($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null) { @@ -343,28 +321,27 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) { return 0; } - + // there are no InValidationKeys if (!($values = $this->read($_cid))) { return 0; } // make sure we're dealing with floats $values = array_map('floatval', $values); - return max($values); } /** * Translate a CacheID into the list of applicable InvalidationKeys. - * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... ) * - * @param string $cid CacheID to translate - * @param string $resource_name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param string $resource_uid source's filepath + * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... ) * - * @return array list of InvalidationKeys + * @param string $cid CacheID to translate + * @param string $resource_name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param string $resource_uid source's filepath + * @return array list of InvalidationKeys * @uses $invalidationKeyPrefix to prepend to each InvalidationKey */ protected function listInvalidationKeys($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null) @@ -401,35 +378,30 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource $t[] = 'IVK#CACHE#' . $part; $t[] = 'IVK#CID' . $_name . $part . $_compile; // skip past delimiter position - $i ++; + $i++; } - return $t; } /** * Check is cache is locked for this template * - * @param Smarty $smarty Smarty object - * @param Smarty_Template_Cached $cached cached object - * - * @return boolean true or false if cache is locked + * @param Smarty $smarty Smarty object + * @param Smarty_Template_Cached $cached cached object + * @return booelan true or false if cache is locked */ public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached) { $key = 'LOCK#' . $cached->filepath; $data = $this->read(array($key)); - return $data && time() - $data[$key] < $smarty->locking_timeout; } /** * Lock cache for this template * - * @param Smarty $smarty Smarty object + * @param Smarty $smarty Smarty object * @param Smarty_Template_Cached $cached cached object - * - * @return bool|void */ public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached) { @@ -441,10 +413,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource /** * Unlock cache for this template * - * @param Smarty $smarty Smarty object + * @param Smarty $smarty Smarty object * @param Smarty_Template_Cached $cached cached object - * - * @return bool|void */ public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached) { @@ -456,30 +426,27 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource /** * 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 */ - abstract protected function read(array $keys); + protected abstract function read(array $keys); /** * Save values for a set of keys to cache * - * @param array $keys list of values to save - * @param int $expire expiration time - * + * @param array $keys list of values to save + * @param int $expire expiration time * @return boolean true on success, false on failure */ - abstract protected function write(array $keys, $expire = null); + protected abstract function write(array $keys, $expire=null); /** * 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 */ - abstract protected function delete(array $keys); + protected abstract function delete(array $keys); /** * Remove *all* values from cache @@ -490,4 +457,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource { return false; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_config_source.php b/Widgets/smarty/libs/sysplugins/smarty_config_source.php index fd37e61f..043ff13e 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_config_source.php +++ b/Widgets/smarty/libs/sysplugins/smarty_config_source.php @@ -2,32 +2,34 @@ /** * Smarty Internal Plugin * - * @package Smarty + * @package Smarty * @subpackage TemplateResources */ /** * Smarty Resource Data Object + * * Meta Data Container for Config Files * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Rodney Rehm + * @author Rodney Rehm + * * @property string $content * @property int $timestamp * @property bool $exists */ -class Smarty_Config_Source extends Smarty_Template_Source -{ +class Smarty_Config_Source extends Smarty_Template_Source { + /** * create Config Object container * - * @param Smarty_Resource $handler Resource Handler this source object communicates with - * @param Smarty $smarty Smarty instance this source object belongs to - * @param string $resource full config_resource - * @param string $type type of resource - * @param string $name resource name - * @param string $unique_resource unqiue resource name + * @param Smarty_Resource $handler Resource Handler this source object communicates with + * @param Smarty $smarty Smarty instance this source object belongs to + * @param string $resource full config_resource + * @param string $type type of resource + * @param string $name resource name + * @param string $unique_resource unqiue resource name */ public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource) { @@ -48,9 +50,8 @@ class Smarty_Config_Source extends Smarty_Template_Source /** * <<magic>> Generic setter. * - * @param string $property_name valid: content, timestamp, exists - * @param mixed $value newly assigned value (not check for correct type) - * + * @param string $property_name valid: content, timestamp, exists + * @param mixed $value newly assigned value (not check for correct type) * @throws SmartyException when the given property name is not valid */ public function __set($property_name, $value) @@ -70,9 +71,7 @@ class Smarty_Config_Source extends Smarty_Template_Source /** * <<magic>> Generic getter. * - * @param string $property_name valid: content, timestamp, exists - * - * @return mixed|void + * @param string $property_name valid: content, timestamp, exists * @throws SmartyException when the given property name is not valid */ public function __get($property_name) @@ -81,7 +80,6 @@ class Smarty_Config_Source extends Smarty_Template_Source case 'timestamp': case 'exists': $this->handler->populateTimestamp($this); - return $this->$property_name; case 'content': @@ -91,4 +89,7 @@ class Smarty_Config_Source extends Smarty_Template_Source throw new SmartyException("config property '$property_name' does not exist."); } } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php b/Widgets/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php index b8e99cc6..25195412 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php @@ -2,27 +2,27 @@ /** * Smarty Internal Plugin CacheResource File * - * @package Smarty + * @package Smarty * @subpackage Cacher - * @author Uwe Tews - * @author Rodney Rehm + * @author Uwe Tews + * @author Rodney Rehm */ /** * 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. * - * @package Smarty + * @package Smarty * @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 * * @param Smarty_Template_Cached $cached cached object * @param Smarty_Internal_Template $_template template object - * * @return void */ public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template) @@ -58,7 +58,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource } else { $_lock_dir = $_cache_dir; } - $cached->lock_id = $_lock_dir . sha1($_cache_id . $_compile_id . $_template->source->uid) . '.lock'; + $cached->lock_id = $_lock_dir.sha1($_cache_id.$_compile_id.$_template->source->uid).'.lock'; } $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php'; $cached->timestamp = @filemtime($cached->filepath); @@ -69,7 +69,6 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource * populate Cached Object with timestamp and exists from Resource * * @param Smarty_Template_Cached $cached cached object - * * @return void */ public function populateTimestamp(Smarty_Template_Cached $cached) @@ -82,17 +81,12 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource * Read the cached template and process its header * * @param Smarty_Internal_Template $_template template object - * @param Smarty_Template_Cached $cached cached object - * - * @return booleantrue or false if the cached content does not exist + * @param Smarty_Template_Cached $cached cached object + * @return booelan true or false if the cached content does not exist */ - public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null) + public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null) { - /** @var Smarty_Internal_Template $_smarty_tpl - * used in included file - */ $_smarty_tpl = $_template; - return @include $_template->cached->filepath; } @@ -101,28 +95,23 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource * * @param Smarty_Internal_Template $_template template object * @param string $content content to cache - * * @return boolean success */ public function writeCachedContent(Smarty_Internal_Template $_template, $content) { if (Smarty_Internal_Write_File::writeFile($_template->cached->filepath, $content, $_template->smarty) === true) { - $_template->cached->timestamp = @filemtime($_template->cached->filepath); + $_template->cached->timestamp = filemtime($_template->cached->filepath); $_template->cached->exists = !!$_template->cached->timestamp; - if ($_template->cached->exists) { - return true; - } + return true; } - return false; } /** * Empty cache * - * @param Smarty $smarty - * @param integer $exp_time expiration time (number of seconds, not timestamp) - * + * @param Smarty_Internal_Template $_template template object + * @param integer $exp_time expiration time (number of seconds, not timestamp) * @return integer number of cache files deleted */ public function clearAll(Smarty $smarty, $exp_time = null) @@ -133,24 +122,20 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource /** * Empty cache for a specific template * - * @param Smarty $smarty + * @param Smarty $_template template object * @param string $resource_name template name * @param string $cache_id cache id * @param string $compile_id compile id * @param integer $exp_time expiration time (number of seconds, not timestamp) - * * @return integer number of cache files deleted - */ + */ public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time) { $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null; $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null; $_dir_sep = $smarty->use_sub_dirs ? '/' : '^'; $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0; - if (($_dir = realpath($smarty->getCacheDir())) === false) { - return 0; - } - $_dir .= '/'; + $_dir = $smarty->getCacheDir(); $_dir_length = strlen($_dir); if (isset($_cache_id)) { $_cache_id_parts = explode('|', $_cache_id); @@ -191,9 +176,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource $_cacheDirs = new RecursiveDirectoryIterator($_dir); $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST); foreach ($_cache as $_file) { - if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) { - continue; - } + if (substr($_file->getBasename(),0,1) == '.' || strpos($_file, '.svn') !== false) continue; // directory ? if ($_file->isDir()) { if (!$_cache->isDot()) { @@ -201,16 +184,16 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource @rmdir($_file->getPathname()); } } else { - $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string) $_file, $_dir_length))); + $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string)$_file, $_dir_length))); $_parts_count = count($_parts); // check name if (isset($resource_name)) { - if ($_parts[$_parts_count - 1] != $_resourcename_parts) { + if ($_parts[$_parts_count-1] != $_resourcename_parts) { continue; } } // check compile id - if (isset($_compile_id) && (!isset($_parts[$_parts_count - 2 - $_compile_id_offset]) || $_parts[$_parts_count - 2 - $_compile_id_offset] != $_compile_id)) { + if (isset($_compile_id) && (!isset($_parts[$_parts_count-2 - $_compile_id_offset]) || $_parts[$_parts_count-2 - $_compile_id_offset] != $_compile_id)) { continue; } // check cache id @@ -220,40 +203,27 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource if ($_parts_count < $_cache_id_parts_count) { continue; } - for ($i = 0; $i < $_cache_id_parts_count; $i ++) { - if ($_parts[$i] != $_cache_id_parts[$i]) { - continue 2; - } + for ($i = 0; $i < $_cache_id_parts_count; $i++) { + if ($_parts[$i] != $_cache_id_parts[$i]) continue 2; } } // expired ? - 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; - } - } else { - if ($_time - @filemtime($_file) < $exp_time) { - continue; - } - } + if (isset($exp_time) && $_time - @filemtime($_file) < $exp_time) { + continue; } $_count += @unlink((string) $_file) ? 1 : 0; } } } - return $_count; } /** * Check is cache is locked for this template * - * @param Smarty $smarty Smarty object + * @param Smarty $smarty Smarty object * @param Smarty_Template_Cached $cached cached object - * - * @return boolean true or false if cache is locked + * @return booelan true or false if cache is locked */ public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached) { @@ -263,17 +233,14 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource clearstatcache(); } $t = @filemtime($cached->lock_id); - return $t && (time() - $t < $smarty->locking_timeout); } /** * Lock cache for this template * - * @param Smarty $smarty Smarty object + * @param Smarty $smarty Smarty object * @param Smarty_Template_Cached $cached cached object - * - * @return bool|void */ public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached) { @@ -284,10 +251,8 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource /** * Unlock cache for this template * - * @param Smarty $smarty Smarty object + * @param Smarty $smarty Smarty object * @param Smarty_Template_Cached $cached cached object - * - * @return bool|void */ public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached) { @@ -295,3 +260,5 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource @unlink($cached->lock_id); } } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_append.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_append.php index cbf65685..f6036e88 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_append.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_append.php @@ -1,28 +1,28 @@ <?php /** * Smarty Internal Plugin Compile Append + * * Compiles the {append} tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Append Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) @@ -47,4 +47,7 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign // call compile assign return parent::compile($_new_attr, $compiler, $_params); } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_assign.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_assign.php index caa34861..40e46862 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_assign.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_assign.php @@ -1,28 +1,28 @@ <?php /** * Smarty Internal Plugin Compile Assign + * * Compiles the {assign} tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Assign Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) @@ -39,11 +39,7 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase if ($compiler->tag_nocache || $compiler->nocache) { $_nocache = 'true'; // 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 if (isset($_attr['scope'])) { @@ -62,25 +58,20 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase if (isset($parameter['smarty_internal_index'])) { $output = "<?php \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];"; } else { - // implement Smarty2's behaviour of variables assigned by reference - if ($compiler->template->smarty instanceof SmartyBC) { - $output = "<?php if (isset(\$_smarty_tpl->tpl_vars[$_attr[var]])) {\$_smarty_tpl->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];"; - $output .= "\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value = $_attr[value]; \$_smarty_tpl->tpl_vars[$_attr[var]]->nocache = $_nocache; \$_smarty_tpl->tpl_vars[$_attr[var]]->scope = $_scope;"; - $output .= "\n} else \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);"; - } else { - $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);"; - } + $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);"; } if ($_scope == Smarty::SCOPE_PARENT) { $output .= "\nif (\$_smarty_tpl->parent != null) \$_smarty_tpl->parent->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];"; } elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) { $output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }"; } - if ($_scope == Smarty::SCOPE_GLOBAL) { + if ( $_scope == Smarty::SCOPE_GLOBAL) { $output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];"; } $output .= '?>'; - return $output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_block.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_block.php index 8c2fb975..b129eafd 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_block.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_block.php @@ -1,188 +1,195 @@ <?php - /** - * Smarty Internal Plugin Compile Block - * Compiles the {block}{/block} tags - * - * @package Smarty - * @subpackage Compiler - * @author Uwe Tews - */ +* Smarty Internal Plugin Compile Block +* +* Compiles the {block}{/block} tags +* +* @package Smarty +* @subpackage Compiler +* @author Uwe Tews +*/ /** - * Smarty Internal Plugin Compile Block Class - * - * @package Smarty - * @subpackage Compiler - */ -class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase -{ +* Smarty Internal Plugin Compile Block Class +* +* @package Smarty +* @subpackage Compiler +*/ +class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase { - const parent = '____SMARTY_BLOCK_PARENT____'; /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ public $required_attributes = array('name'); - - /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ - public $shorttag_order = array('name'); - /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ - 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(); - + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ + public $shorttag_order = array('name', 'hide'); /** - * child block source buffer - * - * @var array - */ - public static $block_data = array(); + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ + public $optional_attributes = array('hide'); /** - * Compiles code for the {block} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * - * @return boolean true - */ + * Compiles code for the {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); - $_name = trim($_attr['name'], "\"'"); - - // existing child must override parent settings - if (isset($compiler->template->block_data[$_name]) && $compiler->template->block_data[$_name]['mode'] == 'replace') { - $_attr['append'] = false; - $_attr['prepend'] = false; - } - - // check if we process an inheritance child template - 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 - $compiler->inheritance = true; - $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK); - $compiler->has_code = false; - return; - } - // must merge includes + $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); + $this->openTag($compiler, 'block', $save); if ($_attr['nocache'] == true) { - $compiler->tag_nocache = true; + $compiler->nocache = true; } - $save = array($_attr, $compiler->inheritance, $compiler->parser->current_buffer, $compiler->nocache); - $this->openTag($compiler, 'block', $save); + // set flag for {block} tag $compiler->inheritance = true; - $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; + // must merge includes + $compiler->smarty->merge_compiled_includes = true; $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser); $compiler->has_code = false; - return true; } /** - * Compile saved child block source - * - * @param object $compiler compiler object - * @param string $_name optional name of child block - * - * @return string compiled code of child block - */ - static function compileChildBlock($compiler, $_name = null) + * 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) { - 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; + $_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]*?{$_rdl})([\s\S]*?)({$_ldl}{$al}\\\$smarty\.block\.child{$_rdl})([\s\S]*?{$_ldl}{$al}/block{$_rdl})!", $block_content, $_match2)) { + foreach($_match2[3] as $name) { + // get it's replacement + $_name2 = trim($name, '\'"'); + 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���', $replacement); + $block_content = preg_replace($search, $replace , $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'; + } } - $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK); - $compiler->has_code = false; - return; } + } + + /** + * Compile saved child block source + * + * @param object $compiler compiler object + * @param string $_name optional name of child block + * @return string compiled code of schild block + */ + public static function compileChildBlock($compiler, $_name = null) + { + $_output = ''; // if called by {$smarty.block.child} 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'], "\"'"); + $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'] ,"'\""); break; } } + // flag that child is already compile by {$smarty.block.child} inclusion + $compiler->template->block_data[$_name]['compiled'] = true; } if ($_name == null) { - $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ', $compiler->lex->taglineno); + $compiler->trigger_template_error('{$smarty.block.child} used out of context', $compiler->lex->taglineno); } // undefined child? if (!isset($compiler->template->block_data[$_name]['source'])) { - $compiler->popTrace(); 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, - $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 = 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); $_tpl->variable_filters = $compiler->template->variable_filters; $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash']; + $_tpl->source->filepath = $compiler->template->block_data[$_name]['file']; $_tpl->allow_relative_path = true; - $_tpl->compiler->inheritance = true; + if ($compiler->nocache) { + $_tpl->compiler->forceNocache = 2; + } else { + $_tpl->compiler->forceNocache = 1; + } $_tpl->compiler->suppressHeader = true; - $_tpl->compiler->suppressFilter = true; $_tpl->compiler->suppressTemplatePropertyHeader = true; $_tpl->compiler->suppressMergedTemplates = true; - $nocache = $compiler->nocache || $compiler->tag_nocache; - 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)); + if (strpos($compiler->template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) { + $_output = str_replace('%%%%SMARTY_PARENT%%%%', $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl)); } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') { - $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache) . $compiler->parser->current_buffer->to_smarty_php(); + $_output = $_tpl->compiler->compileTemplate($_tpl) . $compiler->parser->current_buffer->to_smarty_php(); } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') { - $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl, $nocache); + $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl); } elseif (!empty($compiler->template->block_data[$_name])) { - $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache); + $_output = $_tpl->compiler->compileTemplate($_tpl); } $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']); @@ -191,84 +198,34 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase if ($_tpl->has_nocache_code) { $compiler->template->has_nocache_code = true; } - foreach ($_tpl->required_plugins as $key => $tmp1) { - if ($compiler->nocache && $compiler->template->caching) { - $code = 'nocache'; - } else { - $code = $key; - } - foreach ($tmp1 as $name => $tmp) { - foreach ($tmp as $type => $data) { + foreach($_tpl->required_plugins as $code => $tmp1) { + foreach($tmp1 as $name => $tmp) { + foreach($tmp as $type => $data) { $compiler->template->required_plugins[$code][$name][$type] = $data; } } } unset($_tpl); - $compiler->has_code = true; 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; - } } /** - * Smarty Internal Plugin Compile BlockClose Class - * - * @package Smarty - * @subpackage Compiler - */ -class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase -{ +* Smarty Internal Plugin Compile BlockClose Class +* +* @package Smarty +* @subpackage Compiler +*/ +class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase { + /** - * Compiles code for the {/block} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * - * @return string compiled code - */ + * Compiles code for the {/block} tag + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @return string compiled code + */ public function compile($args, $compiler) { $compiler->has_code = true; @@ -276,169 +233,32 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase $_attr = $this->getAttributes($compiler, $args); $saved_data = $this->closeTag($compiler, array('block')); $_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'])) { + // restore to status before {block} tag as new subtemplate code of parent {block} is not needed + $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); } else { - if ($saved_data[0]['hide'] && !isset($compiler->template->block_data[$_name]['source'])) { + if (isset($saved_data[0]['hide']) && !isset($compiler->template->block_data[$_name]['source'])) { $_output = ''; } else { $_output = $compiler->parser->current_buffer->to_smarty_php(); } + unset ($compiler->template->block_data[$_name]['compiled']); } - unset($compiler->template->block_data[$_name]['compiled']); // reset flags - $compiler->parser->current_buffer = $saved_data[2]; - if ($compiler->nocache) { - $compiler->tag_nocache = true; - } - $compiler->nocache = $saved_data[3]; + $compiler->parser->current_buffer = $saved_data[1]; + $compiler->nocache = $saved_data[2]; + $compiler->smarty->merge_compiled_includes = $saved_data[3]; + // reset flag for {block} tag + $compiler->inheritance = false; // $_output content has already nocache code processed $compiler->suppressNocacheProcessing = true; - 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 = 'file:' . 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; - } -} +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_break.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_break.php index b51e9e8f..b25bef6c 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_break.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_break.php @@ -1,21 +1,21 @@ <?php /** * Smarty Internal Plugin Compile Break + * * Compiles the {break} tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ - /** * Smarty Internal Plugin Compile Break Class * - * @package Smarty + * @package Smarty * @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. * @@ -34,10 +34,9 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase /** * Compiles code for the {break} tag * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) @@ -62,14 +61,17 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase $stack_count = count($compiler->_tag_stack) - 1; while ($level_count > 0 && $stack_count >= 0) { if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) { - $level_count --; + $level_count--; } - $stack_count --; + $stack_count--; } if ($level_count != 0) { $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno); } - - return "<?php break {$_levels};?>"; + $compiler->has_code = true; + return "<?php break {$_levels}?>"; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_call.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_call.php index bfbd1f54..af12a048 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_call.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_call.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Function_Call + * * Compiles the calls of user defined tags defined by {function} * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Function_Call Class * - * @package Smarty + * @package Smarty * @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. * @@ -41,9 +42,9 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase /** * Compiles the calls of user defined tags defined by {function} * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler) @@ -52,7 +53,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase $_attr = $this->getAttributes($compiler, $args); // save possible attributes 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 beind displayed $_assign = $_attr['assign']; } $_name = $_attr['name']; @@ -95,7 +96,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase } } } - //variable name? + //varibale name? if (!(strpos($_name, '$') === false)) { $call_cache = $_name; $call_function = '$tmp = "smarty_template_function_".' . $_name . '; $tmp'; @@ -121,7 +122,9 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n"; } } - return $_output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_capture.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_capture.php index 34728e47..9a5071eb 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_capture.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_capture.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Capture + * * Compiles the {capture} tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Capture Class * - * @package Smarty + * @package Smarty * @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. * @@ -34,9 +35,8 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase /** * Compiles code for the {capture} tag * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -55,22 +55,22 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase return $_output; } + } /** * Smarty Internal Plugin Compile Captureclose Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -90,7 +90,9 @@ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase $_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 .= "} else \$_smarty_tpl->capture_error();?>"; - return $_output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_config_load.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_config_load.php index 8813664d..deaa052c 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_config_load.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_config_load.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Config Load + * * Compiles the {config load} tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Config Load Class * - * @package Smarty + * @package Smarty * @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. * @@ -29,7 +30,7 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase * @var array * @see Smarty_Internal_CompileBase */ - public $shorttag_order = array('file', 'section'); + public $shorttag_order = array('file','section'); /** * Attribute definition: Overwrites base class. * @@ -41,14 +42,13 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase /** * Compiles code for the {config_load} tag * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) { - static $_is_legal_scope = array('local' => true, 'parent' => true, 'root' => true, 'global' => true); + static $_is_legal_scope = array('local' => true,'parent' => true,'root' => true,'global' => true); // check and get attributes $_attr = $this->getAttributes($compiler, $args); @@ -56,7 +56,8 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); } - // save possible attributes + + // save posible attributes $conf_file = $_attr['file']; if (isset($_attr['section'])) { $section = $_attr['section']; @@ -69,14 +70,16 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase $_attr['scope'] = trim($_attr['scope'], "'\""); if (isset($_is_legal_scope[$_attr['scope']])) { $scope = $_attr['scope']; - } else { + } else { $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno); - } + } } // create config object $_output = "<?php \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);"; $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>"; - return $_output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_continue.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_continue.php index af376512..72a5f865 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_continue.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_continue.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Continue + * * Compiles the {continue} tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Continue Class * - * @package Smarty + * @package Smarty * @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. * @@ -34,10 +35,9 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase /** * Compiles code for the {continue} tag * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) @@ -62,14 +62,17 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase $stack_count = count($compiler->_tag_stack) - 1; while ($level_count > 0 && $stack_count >= 0) { if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) { - $level_count --; + $level_count--; } - $stack_count --; + $stack_count--; } if ($level_count != 0) { $compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno); } - - return "<?php continue {$_levels};?>"; + $compiler->has_code = true; + return "<?php continue {$_levels}?>"; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_debug.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_debug.php index b184a746..f50c7aee 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_debug.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_debug.php @@ -1,28 +1,28 @@ <?php /** * Smarty Internal Plugin Compile Debug + * * Compiles the {debug} tag. * It opens a window the the Smarty Debugging Console. * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Debug Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -35,7 +35,9 @@ class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase // display debug template $_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>"; - return $_output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_eval.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_eval.php index 407482f0..6cf481b5 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_eval.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_eval.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Eval + * * Compiles the {eval} tag. * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Eval Class * - * @package Smarty + * @package Smarty * @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. * @@ -36,14 +37,13 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase * @var array * @see Smarty_Internal_CompileBase */ - public $shorttag_order = array('var', 'assign'); + public $shorttag_order = array('var','assign'); /** * Compiles code for the {eval} tag * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -53,19 +53,21 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase // check and get attributes $_attr = $this->getAttributes($compiler, $args); 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 beind displayed $_assign = $_attr['assign']; } // create template object - $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'." . $_attr['var'] . ", \$_smarty_tpl->smarty, \$_smarty_tpl);"; + $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'.".$_attr['var'].", \$_smarty_tpl->smarty, \$_smarty_tpl);"; //was there an assign attribute? if (isset($_assign)) { $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());"; } else { $_output .= "echo \$_template->fetch();"; } - return "<?php $_output ?>"; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_extends.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_extends.php index 2b541f2e..8a4deeed 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_extends.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_extends.php @@ -1,85 +1,121 @@ <?php /** - * Smarty Internal Plugin Compile extend - * Compiles the {extends} tag - * - * @package Smarty - * @subpackage Compiler - * @author Uwe Tews - */ +* Smarty Internal Plugin Compile extend +* +* Compiles the {extends} tag +* +* @package Smarty +* @subpackage Compiler +* @author Uwe Tews +*/ /** - * Smarty Internal Plugin Compile extend Class - * - * @package Smarty - * @subpackage Compiler - */ -class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase -{ +* Smarty Internal Plugin Compile extend Class +* +* @package Smarty +* @subpackage Compiler +*/ +class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase { + /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ public $required_attributes = array('file'); /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ public $shorttag_order = array('file'); /** - * Compiles code for the {extends} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * - * @return string compiled code - */ + * Compiles code for the {extends} tag + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @return string compiled code + */ 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; // check and get attributes $_attr = $this->getAttributes($compiler, $args); if ($_attr['nocache'] === true) { $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); } + + $_smarty_tpl = $compiler->template; + $include_file = null; if (strpos($_attr['file'], '$_tmp') !== false) { $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno); } - - $name = $_attr['file']; - /** @var Smarty_Internal_Template $_smarty_tpl - * used in evaluated code - */ - $_smarty_tpl = $compiler->template; - eval("\$tpl_name = $name;"); + eval('$include_file = ' . $_attr['file'] . ';'); // create template object - $_template = new $compiler->smarty->template_class($tpl_name, $compiler->smarty, $compiler->template); - // check for recursion - $uid = $_template->source->uid; - 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); + $_template = new $compiler->smarty->template_class($include_file, $compiler->smarty, $compiler->template); + // save file dependency + if (isset($_is_stringy[$_template->source->type])) { + $template_sha1 = sha1($include_file); } else { - 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); + $template_sha1 = sha1($_template->source->filepath); + } + if (isset($compiler->template->properties['file_dependency'][$template_sha1])) { + $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 = 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 (substr($_result[0][$_start][0],0,strlen($compiler->smarty->left_delimiter)+1) == $compiler->smarty->left_delimiter.'*') { + $_start++; + continue; + } + while ($_level != 0) { + $_end++; + if (substr($_result[0][$_start + $_end][0],0,strlen($compiler->smarty->left_delimiter)+1) == $compiler->smarty->left_delimiter.'*') { + continue; } - $compiler->extends_uid[$uid] = true; + 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%%%%', + substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))); + Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath); + $_start = $_start + $_end + 1; + } + if ($_template->source->type == 'extends') { + $_template->block_data = $compiler->template->block_data; + } + $compiler->template->source->content = $_template->source->content; + if ($_template->source->type == 'extends') { + $compiler->template->block_data = $_template->block_data; + foreach ($_template->source->components as $key => $component) { + $compiler->template->properties['file_dependency'][$key] = array($component->filepath, $component->timestamp, $component->type); } } - unset ($_template); - $compiler->inheritance_child = true; - $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY); + $compiler->template->source->filepath = $_template->source->filepath; + $compiler->abort_and_recompile = true; return ''; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_for.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_for.php index a624b922..057f4fb7 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_for.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_for.php @@ -1,35 +1,39 @@ <?php /** * Smarty Internal Plugin Compile For + * * Compiles the {for} {forelse} {/for} tags * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile For Class * - * @package Smarty + * @package Smarty * @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 - * Smarty 3 does implement two different syntax's: + * + * Smarty 3 does implement two different sytaxes: + * * - {for $var in $array} * For looping over arrays or iterators + * * - {for $x=0; $x<$y; $x++} * For general loops - * The parser is generating different sets of attribute by which this compiler can - * determine which syntax is used. * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter + * The parser is gereration different sets of attribute by which this compiler can + * determin which syntax is used. * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) @@ -50,7 +54,7 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;"; $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n"; } - $output .= " if ($_attr[ifexp]) { for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]) {\n"; + $output .= " if ($_attr[ifexp]){ for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]){\n"; } else { $_statement = $_attr['start']; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;"; @@ -60,12 +64,12 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;"; } if (isset($_attr['max'])) { - $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n"; + $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n"; } else { - $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n"; + $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n"; } - $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0) {\n"; - $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++) {\n"; + $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0){\n"; + $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++){\n"; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;"; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;"; } @@ -77,52 +81,51 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase // return compiled code return $output; } + } /** * Smarty Internal Plugin Compile Forelse Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) { // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->getAttributes($compiler, $args); list($openTag, $nocache) = $this->closeTag($compiler, array('for')); $this->openTag($compiler, 'forelse', array('forelse', $nocache)); - return "<?php }} else { ?>"; } + } /** * Smarty Internal Plugin Compile Forclose Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) @@ -142,4 +145,7 @@ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase return "<?php }} ?>"; } } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_foreach.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_foreach.php index fc77f574..1354c89d 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_foreach.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_foreach.php @@ -1,21 +1,21 @@ <?php /** * Smarty Internal Plugin Compile Foreach + * * Compiles the {foreach} {foreachelse} {/foreach} tags * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Foreach Class * - * @package Smarty + * @package Smarty * @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. * @@ -36,19 +36,19 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase * @var array * @see Smarty_Internal_CompileBase */ - public $shorttag_order = array('from', 'item', 'key', 'name'); + public $shorttag_order = array('from','item','key','name'); /** * Compiles code for the {foreach} tag * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) { + $tpl = $compiler->template; // check and get attributes $_attr = $this->getAttributes($compiler, $args); @@ -79,12 +79,12 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase $ItemVarName = '$' . trim($item, '\'"') . '@'; // evaluates which Smarty variables and properties have to be computed if ($has_name) { - $usesSmartyFirst = strpos($compiler->lex->data, $SmartyVarName . 'first') !== false; - $usesSmartyLast = strpos($compiler->lex->data, $SmartyVarName . 'last') !== false; - $usesSmartyIndex = strpos($compiler->lex->data, $SmartyVarName . 'index') !== false; - $usesSmartyIteration = strpos($compiler->lex->data, $SmartyVarName . 'iteration') !== false; - $usesSmartyShow = strpos($compiler->lex->data, $SmartyVarName . 'show') !== false; - $usesSmartyTotal = strpos($compiler->lex->data, $SmartyVarName . 'total') !== false; + $usesSmartyFirst = strpos($tpl->source->content, $SmartyVarName . 'first') !== false; + $usesSmartyLast = strpos($tpl->source->content, $SmartyVarName . 'last') !== false; + $usesSmartyIndex = strpos($tpl->source->content, $SmartyVarName . 'index') !== false; + $usesSmartyIteration = strpos($tpl->source->content, $SmartyVarName . 'iteration') !== false; + $usesSmartyShow = strpos($tpl->source->content, $SmartyVarName . 'show') !== false; + $usesSmartyTotal = strpos($tpl->source->content, $SmartyVarName . 'total') !== false; } else { $usesSmartyFirst = false; $usesSmartyLast = false; @@ -92,12 +92,12 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase $usesSmartyShow = false; } - $usesPropFirst = $usesSmartyFirst || strpos($compiler->lex->data, $ItemVarName . 'first') !== false; - $usesPropLast = $usesSmartyLast || strpos($compiler->lex->data, $ItemVarName . 'last') !== false; - $usesPropIndex = $usesPropFirst || strpos($compiler->lex->data, $ItemVarName . 'index') !== false; - $usesPropIteration = $usesPropLast || strpos($compiler->lex->data, $ItemVarName . 'iteration') !== false; - $usesPropShow = strpos($compiler->lex->data, $ItemVarName . 'show') !== false; - $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($compiler->lex->data, $ItemVarName . 'total') !== false; + $usesPropFirst = $usesSmartyFirst || strpos($tpl->source->content, $ItemVarName . 'first') !== false; + $usesPropLast = $usesSmartyLast || strpos($tpl->source->content, $ItemVarName . 'last') !== false; + $usesPropIndex = $usesPropFirst || strpos($tpl->source->content, $ItemVarName . 'index') !== false; + $usesPropIteration = $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'iteration') !== false; + $usesPropShow = strpos($tpl->source->content, $ItemVarName . 'show') !== false; + $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'total') !== false; // generate output code $output = "<?php "; $output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable; \$_smarty_tpl->tpl_vars[$item]->_loop = false;\n"; @@ -131,7 +131,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n"; } } - $output .= "foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value) {\n\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n"; + $output .= "foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value){\n\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n"; if ($key != null) { $output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n"; } @@ -170,18 +170,17 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase /** * Smarty Internal Plugin Compile Foreachelse Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) @@ -194,23 +193,23 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase return "<?php }\nif (!\$_smarty_tpl->tpl_vars[$item]->_loop) {\n?>"; } + } /** * Smarty Internal Plugin Compile Foreachclose Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) @@ -226,4 +225,7 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase return "<?php } ?>"; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_function.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_function.php index 298eb16f..876b13de 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_function.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_function.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Function + * * Compiles the {function} {/function} tags * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Function Class * - * @package Smarty + * @package Smarty * @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. * @@ -41,10 +42,9 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase /** * Compiles code for the {function} tag * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return boolean true */ public function compile($args, $compiler, $parameter) @@ -57,19 +57,16 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase } unset($_attr['nocache']); $save = array($_attr, $compiler->parser->current_buffer, - $compiler->template->has_nocache_code, $compiler->template->required_plugins); + $compiler->template->has_nocache_code, $compiler->template->required_plugins); $this->openTag($compiler, 'function', $save); $_name = trim($_attr['name'], "'\""); unset($_attr['name']); // set flag that we are compiling a template function $compiler->compiles_template_function = true; $compiler->template->properties['function'][$_name]['parameter'] = array(); - /** @var Smarty_Internal_Template $_smarty_tpl - * used in evaluated code - */ $_smarty_tpl = $compiler->template; foreach ($_attr as $_key => $_data) { - eval ('$tmp=' . $_data . ';'); + eval ('$tmp='.$_data.';'); $compiler->template->properties['function'][$_name]['parameter'][$_key] = $tmp; } $compiler->smarty->template_functions[$_name]['parameter'] = $compiler->template->properties['function'][$_name]['parameter']; @@ -82,7 +79,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 (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>"; } - // Init temporary context + // Init temporay context $compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array()); $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser); $compiler->parser->current_buffer->append_subtree(new _smarty_tag($compiler->parser, $output)); @@ -91,23 +88,23 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase $compiler->template->properties['function'][$_name]['compiled'] = ''; return true; } + } /** * Smarty Internal Plugin Compile Functionclose Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return boolean true */ public function compile($args, $compiler, $parameter) @@ -119,8 +116,8 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase $plugins_string = ''; if (!empty($compiler->template->required_plugins['compiled'])) { $plugins_string = '<?php '; - foreach ($compiler->template->required_plugins['compiled'] as $tmp) { - foreach ($tmp as $data) { + foreach($compiler->template->required_plugins['compiled'] as $tmp) { + foreach($tmp as $data) { $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n"; } } @@ -128,17 +125,22 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase } if (!empty($compiler->template->required_plugins['nocache'])) { $plugins_string .= "<?php echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php "; - foreach ($compiler->template->required_plugins['nocache'] as $tmp) { - foreach ($tmp as $data) { + foreach($compiler->template->required_plugins['nocache'] as $tmp) { + foreach($tmp as $data) { $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n"; } } $plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n"; } - // if caching save template function for possible nocache call + // remove last line break from function definition + $last = count($compiler->parser->current_buffer->subtrees) - 1; + if ($compiler->parser->current_buffer->subtrees[$last] instanceof _smarty_linebreak) { + unset($compiler->parser->current_buffer->subtrees[$last]); + } + // if caching save template function for possible nocache call if ($compiler->template->caching) { $compiler->template->properties['function'][$_name]['compiled'] .= $plugins_string - . $compiler->parser->current_buffer->to_smarty_php(); + . $compiler->parser->current_buffer->to_smarty_php(); $compiler->template->properties['function'][$_name]['nocache_hash'] = $compiler->template->properties['nocache_hash']; $compiler->template->properties['function'][$_name]['has_nocache_code'] = $compiler->template->has_nocache_code; $compiler->template->properties['function'][$_name]['called_functions'] = $compiler->called_functions; @@ -147,8 +149,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase $compiler->has_code = false; $output = true; } else { - $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"; + $output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}}?>\n"; } // reset flag that we are compiling a template function $compiler->compiles_template_function = false; @@ -156,7 +157,9 @@ foreach (Smarty::\$global_tpl_vars as \$key => \$value) if(!isset(\$_smarty_tpl- $compiler->parser->current_buffer = $saved_data[1]; $compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2]; $compiler->template->required_plugins = $saved_data[3]; - return $output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_if.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_if.php index d709fcfd..8794b014 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_if.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_if.php @@ -1,30 +1,30 @@ <?php /** - * Smarty Internal Plugin Compile If - * Compiles the {if} {else} {elseif} {/if} tags - * - * @package Smarty - * @subpackage Compiler - * @author Uwe Tews - */ +* Smarty Internal Plugin Compile If +* +* Compiles the {if} {else} {elseif} {/if} tags +* +* @package Smarty +* @subpackage Compiler +* @author Uwe Tews +*/ /** - * Smarty Internal Plugin Compile If Class - * - * @package Smarty - * @subpackage Compiler - */ -class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase -{ +* Smarty Internal Plugin Compile If Class +* +* @package Smarty +* @subpackage Compiler +*/ +class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase { + /** - * Compiles code for the {if} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * - * @return string compiled code - */ + * Compiles code for the {if} tag + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @return string compiled code + */ public function compile($args, $compiler, $parameter) { // check and get attributes @@ -33,7 +33,7 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase // must whole block be nocache ? $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; - if (!array_key_exists("if condition", $parameter)) { + if (!array_key_exists("if condition",$parameter)) { $compiler->trigger_template_error("missing if condition", $compiler->lex->taglineno); } @@ -50,63 +50,62 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase $_nocache = ''; } if (is_array($parameter['if condition']['var'])) { - $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; - $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>"; + $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n"; + $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>"; } else { - $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});"; - $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>"; + $_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']."){?>"; } - return $_output; } else { - return "<?php if ({$parameter['if condition']}) {?>"; + return "<?php if ({$parameter['if condition']}){?>"; } } + } /** - * Smarty Internal Plugin Compile Else Class - * - * @package Smarty - * @subpackage Compiler - */ -class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase -{ +* Smarty Internal Plugin Compile Else Class +* +* @package Smarty +* @subpackage Compiler +*/ +class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase { + /** - * Compiles code for the {else} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * - * @return string compiled code - */ + * Compiles code for the {else} tag + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @return string compiled code + */ public function compile($args, $compiler, $parameter) { list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif')); $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache)); - return "<?php } else { ?>"; + return "<?php }else{ ?>"; } + } /** - * Smarty Internal Plugin Compile ElseIf Class - * - * @package Smarty - * @subpackage Compiler - */ -class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase -{ +* Smarty Internal Plugin Compile ElseIf Class +* +* @package Smarty +* @subpackage Compiler +*/ +class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase { + /** - * Compiles code for the {elseif} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * - * @return string compiled code - */ + * Compiles code for the {elseif} tag + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @return string compiled code + */ public function compile($args, $compiler, $parameter) { // check and get attributes @@ -114,7 +113,7 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif')); - if (!array_key_exists("if condition", $parameter)) { + if (!array_key_exists("if condition",$parameter)) { $compiler->trigger_template_error("missing elseif condition", $compiler->lex->taglineno); } @@ -139,60 +138,56 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase if ($condition_by_assign) { $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache)); if (is_array($parameter['if condition']['var'])) { - $_output = "<?php } else { if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; - $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>"; + $_output = "<?php }else{ if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; + $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>"; } else { - $_output = "<?php } else { if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});"; - $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>"; + $_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'] . "){?>"; } - return $_output; } else { $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache)); - - return "<?php } elseif ({$parameter['if condition']}) {?>"; + return "<?php }elseif({$parameter['if condition']}){?>"; } } else { $tmp = ''; - foreach ($compiler->prefix_code as $code) { - $tmp .= $code; - } + foreach ($compiler->prefix_code as $code) + $tmp .= $code; $compiler->prefix_code = array(); $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache)); if ($condition_by_assign) { if (is_array($parameter['if condition']['var'])) { - $_output = "<?php } else {?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; - $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>"; + $_output = "<?php }else{?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; + $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>"; } else { - $_output = "<?php } else {?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});"; - $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>"; + $_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'] . "){?>"; } - return $_output; } else { - return "<?php } else {?>{$tmp}<?php if ({$parameter['if condition']}) {?>"; + return "<?php }else{?>{$tmp}<?php if ({$parameter['if condition']}){?>"; } } } + } /** - * Smarty Internal Plugin Compile Ifclose Class - * - * @package Smarty - * @subpackage Compiler - */ -class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase -{ +* Smarty Internal Plugin Compile Ifclose Class +* +* @package Smarty +* @subpackage Compiler +*/ +class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase { + /** - * Compiles code for the {/if} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * - * @return string compiled code - */ + * Compiles code for the {/if} tag + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @return string compiled code + */ public function compile($args, $compiler, $parameter) { // must endblock be nocache? @@ -201,10 +196,12 @@ class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase } list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif')); $tmp = ''; - for ($i = 0; $i < $nesting; $i ++) { + for ($i = 0; $i < $nesting; $i++) { $tmp .= '}'; } - return "<?php {$tmp}?>"; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_include.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_include.php index 4b7b09ce..bd050c3f 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_include.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_include.php @@ -1,72 +1,72 @@ <?php /** - * Smarty Internal Plugin Compile Include - * Compiles the {include} tag - * - * @package Smarty - * @subpackage Compiler - * @author Uwe Tews - */ +* Smarty Internal Plugin Compile Include +* +* Compiles the {include} tag +* +* @package Smarty +* @subpackage Compiler +* @author Uwe Tews +*/ /** - * Smarty Internal Plugin Compile Include Class - * - * @package Smarty - * @subpackage Compiler - */ -class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase -{ +* Smarty Internal Plugin Compile Include Class +* +* @package Smarty +* @subpackage Compiler +*/ +class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase { + /** - * caching mode to create nocache code but no cache file - */ + * caching mode to create nocache code but no cache file + */ const CACHING_NOCACHE_CODE = 9999; /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ public $required_attributes = array('file'); /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ public $shorttag_order = array('file'); /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ public $option_flags = array('nocache', 'inline', 'caching'); /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ public $optional_attributes = array('_any'); /** - * Compiles code for the {include} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * Compiles code for the {include} tag + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) { // check and get attributes $_attr = $this->getAttributes($compiler, $args); - // save possible attributes + // save posible attributes $include_file = $_attr['file']; 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 beind displayed $_assign = $_attr['assign']; } @@ -81,15 +81,12 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase $_parent_scope = Smarty::SCOPE_GLOBAL; } } - - $_caching = Smarty::CACHING_OFF; - - // flag if included template code should be merged into caller - $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 = 'null'; + if ($compiler->nocache || $compiler->tag_nocache) { + $_caching = Smarty::CACHING_OFF; + } + // default for included templates + if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) { $_caching = self::CACHING_NOCACHE_CODE; } /* @@ -121,93 +118,52 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase } if ($_attr['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; - if ($merge_compiled_includes && $_attr['inline'] !== true) { - // variable template name ? - if ($compiler->has_variable_string || !((substr_count($include_file, '"') == 2 || substr_count($include_file, "'") == 2)) - || substr_count($include_file, '(') != 0 || 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 (($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) && !$compiler->template->source->recompiled + && !($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache)) && $_caching != Smarty::CACHING_LIFETIME_CURRENT) { + // check if compiled code can be merged (contains no variable part) + if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2) + and substr_count($include_file, '(') == 0 and substr_count($include_file, '$_smarty_tpl->') == 0) { + $tpl_name = null; + eval("\$tpl_name = $include_file;"); + if (!isset($compiler->smarty->merged_templates_func[$tpl_name]) || $compiler->inheritance) { + $tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id); + // save unique function name + $compiler->smarty->merged_templates_func[$tpl_name]['func'] = $tpl->properties['unifunc'] = 'content_'.uniqid('', false); + // use current nocache hash for inlined code + $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash']; + if ($compiler->template->caching) { + // needs code for cached page but no cache file + $tpl->caching = self::CACHING_NOCACHE_CODE; } - } - } - } - 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; - $nocache = false; - /** @var Smarty_Internal_Template $_smarty_tpl - * used in evaluated code - */ - $_smarty_tpl = $compiler->template; - eval("\$tpl_name = $include_file;"); - 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); - // save unique function name - $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 - $compiler->smarty->merged_templates_func[$tpl_name][$uid]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash']; - if ($compiler->template->caching && $_caching == self::CACHING_NOCACHE_CODE) { - // all code must be nocache - $nocache = true; - } - if ($compiler->inheritance) { - $tpl->compiler->inheritance = true; - } - // make sure whole chain gets compiled - $tpl->mustCompile = true; - if (!($tpl->source->uncompiled) && $tpl->source->exists) { - - // get compiled code - $compiled_code = $tpl->compiler->compileTemplate($tpl, $nocache); - // release compiler object to free memory - unset($tpl->compiler); - // merge compiled code for {function} tags - $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']); - // merge filedependency - $tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp, $tpl->source->type); - $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']); - // remove header code - $compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code); - if ($tpl->has_nocache_code) { - // replace nocache_hash - $compiled_code = str_replace("{$tpl->properties['nocache_hash']}", $compiler->template->properties['nocache_hash'], $compiled_code); - $compiler->template->has_nocache_code = true; + // make sure whole chain gest compiled + $tpl->mustCompile = true; + if (!($tpl->source->uncompiled) && $tpl->source->exists) { + // get compiled code + $compiled_code = $tpl->compiler->compileTemplate($tpl); + // release compiler object to free memory + unset($tpl->compiler); + // merge compiled code for {function} tags + $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']); + // merge filedependency + $tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp,$tpl->source->type); + $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']); + // remove header code + $compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code); + if ($tpl->has_nocache_code) { + // replace nocache_hash + $compiled_code = preg_replace("/{$tpl->properties['nocache_hash']}/", $compiler->template->properties['nocache_hash'], $compiled_code); + $compiler->template->has_nocache_code = true; + } + $compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code; + $has_compiled_template = true; } - $compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code; + } else { $has_compiled_template = true; - unset ($tpl); } - } else { - $has_compiled_template = true; } } // delete {include} standard attributes @@ -216,40 +172,32 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase if (!empty($_attr)) { if ($_parent_scope == Smarty::SCOPE_LOCAL) { // create variables - $nccode = ''; foreach ($_attr as $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 { $compiler->trigger_template_error('variable passing not allowed in parent/global scope', $compiler->lex->taglineno); } } else { $_vars = 'array()'; + $_has_vars = false; } if ($has_compiled_template) { - // never call inline templates in nocache mode - $compiler->suppressNocacheProcessing = true; - $_hash = $compiler->smarty->merged_templates_func[$tpl_name][$uid]['nocache_hash']; + $_hash = $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash']; $_output = "<?php /* Call merged included template \"" . $tpl_name . "\" */\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"; if (isset($_assign)) { $_output .= 'ob_start(); '; } - $_output .= $compiler->smarty->merged_templates_func[$tpl_name][$uid]['func'] . "(\$_smarty_tpl);\n"; + $_output .= $compiler->smarty->merged_templates_func[$tpl_name]['func']. "(\$_smarty_tpl);\n"; $_output .= "\$_smarty_tpl = array_pop(\$_tpl_stack); "; if (isset($_assign)) { $_output .= " \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(ob_get_clean());"; } - $_output .= "\n/* End of included template \"" . $tpl_name . "\" */?>"; - + $_output .= "/* End of included template \"" . $tpl_name . "\" */?>"; return $_output; } @@ -259,7 +207,9 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase } else { $_output = "<?php echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n"; } - return $_output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_include_php.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_include_php.php index 76f506c5..d5271236 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_include_php.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_include_php.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Include PHP + * * Compiles the {include_php} tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Insert Class * - * @package Smarty + * @package Smarty * @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. * @@ -41,10 +42,8 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase /** * Compiles code for the {include_php} tag * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * - * @throws SmartyException + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -55,9 +54,8 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase // check and get attributes $_attr = $this->getAttributes($compiler, $args); - /** @var Smarty_Internal_Template $_smarty_tpl - * used in evaluated code - */ + $_output = '<?php '; + $_smarty_tpl = $compiler->template; $_filepath = false; eval('$_file = ' . $_attr['file'] . ';'); @@ -70,10 +68,10 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase $_dir = $compiler->smarty->trusted_dir; } if (!empty($_dir)) { - foreach ((array) $_dir as $_script_dir) { + foreach((array)$_dir as $_script_dir) { $_script_dir = rtrim($_script_dir, '/\\') . DS; if (file_exists($_script_dir . $_file)) { - $_filepath = $_script_dir . $_file; + $_filepath = $_script_dir . $_file; break; } } @@ -104,4 +102,7 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase return "<?php include{$_once} ('{$_filepath}');?>\n"; } } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_insert.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_insert.php index 4c658554..e4d3f935 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_insert.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_insert.php @@ -2,21 +2,22 @@ /** * Smarty Internal Plugin Compile Insert + * * Compiles the {insert} tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Insert Class * - * @package Smarty + * @package Smarty * @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. * @@ -42,9 +43,8 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase /** * Compiles code for the {insert} tag * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -59,12 +59,12 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase $_script = null; $_output = '<?php '; - // save possible attributes + // save posible attributes eval('$_name = ' . $_attr['name'] . ';'); if (isset($_attr['assign'])) { // output will be stored in a smarty variable instead of being displayed $_assign = $_attr['assign']; - // create variable to make sure that the compiler knows about its nocache status + // create variable to make shure that the compiler knows about its nocache status $compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true); } if (isset($_attr['script'])) { @@ -82,7 +82,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase $_dir = $compiler->smarty->trusted_dir; } if (!empty($_dir)) { - foreach ((array) $_dir as $_script_dir) { + foreach((array)$_dir as $_script_dir) { $_script_dir = rtrim($_script_dir, '/\\') . DS; if (file_exists($_script_dir . $_script)) { $_filepath = $_script_dir . $_script; @@ -134,7 +134,9 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>"; } } - return $_output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php index 91b44881..99063259 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php @@ -1,28 +1,28 @@ <?php /** * Smarty Internal Plugin Compile Ldelim + * * Compiles the {ldelim} tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Ldelim Class * - * @package Smarty + * @package Smarty * @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 - * This tag does output the left delimiter - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object * + * This tag does output the left delimiter + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -33,7 +33,9 @@ class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase } // this tag does not return compiled code $compiler->has_code = true; - return $compiler->smarty->left_delimiter; } + } + +?> diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_nocache.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_nocache.php index ba39717f..5fb71b71 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_nocache.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_nocache.php @@ -1,28 +1,29 @@ <?php /** * Smarty Internal Plugin Compile Nocache + * * Compiles the {nocache} {/nocache} tags. * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** - * Smarty Internal Plugin Compile Nocache Class + * Smarty Internal Plugin Compile Nocache Classv * - * @package Smarty + * @package Smarty * @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 - * This tag does not generate compiled output. It only sets a compiler flag. * - * @param array $args array with attributes from parser - * @param object $compiler compiler object + * This tag does not generate compiled output. It only sets a compiler flag. * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return bool */ public function compile($args, $compiler) @@ -35,26 +36,26 @@ class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase $compiler->nocache = true; // this tag does not return compiled code $compiler->has_code = false; - return true; } + } /** * Smarty Internal Plugin Compile Nocacheclose Class * - * @package Smarty + * @package Smarty * @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 - * This tag does not generate compiled output. It only sets a compiler flag. * - * @param array $args array with attributes from parser - * @param object $compiler compiler object + * This tag does not generate compiled output. It only sets a compiler flag. * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return bool */ public function compile($args, $compiler) @@ -64,7 +65,9 @@ class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase $compiler->nocache = false; // this tag does not return compiled code $compiler->has_code = false; - return true; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php index 3dff8538..5288f456 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Block Plugin + * * Compiles code for the execution of block plugin * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Block Plugin Class * - * @package Smarty + * @package Smarty * @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. * @@ -27,24 +28,23 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi /** * Compiles code for the execution of block plugin * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * @param string $tag name of block plugin - * @param string $function PHP function name - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @param string $tag name of block plugin + * @param string $function PHP function name * @return string compiled code */ public function compile($args, $compiler, $parameter, $tag, $function) { - if (!isset($tag[5]) || substr($tag, - 5) != 'close') { + if (!isset($tag[5]) || substr($tag, -5) != 'close') { // opening tag of block plugin // check and get attributes $_attr = $this->getAttributes($compiler, $args); if ($_attr['nocache'] === true) { $compiler->tag_nocache = true; } - unset($_attr['nocache']); + unset($_attr['nocache']); // convert attributes into parameter array string $_paramsArray = array(); foreach ($_attr as $_key => $_value) { @@ -67,19 +67,21 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi $compiler->tag_nocache = true; } // closing tag of block plugin, restore nocache - list($_params, $compiler->nocache) = $this->closeTag($compiler, substr($tag, 0, - 5)); + list($_params, $compiler->nocache) = $this->closeTag($compiler, substr($tag, 0, -5)); // This tag does create output $compiler->has_output = true; // compile code if (!isset($parameter['modifier_list'])) { - $mod_pre = $mod_post = ''; + $mod_pre = $mod_post =''; } else { $mod_pre = ' ob_start(); '; - $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';'; + $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';'; } - $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"; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php index 4fbd4dc1..70e76431 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Function Plugin + * * Compiles code for the execution of function plugin * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Function Plugin Class * - * @package Smarty + * @package Smarty * @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. * @@ -34,12 +35,11 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co /** * Compiles code for the execution of function plugin * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * @param string $tag name of function plugin - * @param string $function PHP function name - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @param string $tag name of function plugin + * @param string $function PHP function name * @return string compiled code */ public function compile($args, $compiler, $parameter, $tag, $function) @@ -65,7 +65,9 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co $_params = 'array(' . implode(",", $_paramsArray) . ')'; // compile code $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n"; - return $output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php index ba03bfcf..dc43cc5d 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php @@ -2,28 +2,28 @@ /** * Smarty Internal Plugin Compile Modifier + * * Compiles code for modifier execution * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Modifier Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) @@ -36,104 +36,46 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa $modifier = $single_modifier[0]; $single_modifier[0] = $output; $params = implode(',', $single_modifier); - // check if we know already the type of modifier - if (isset($compiler->known_modifier_type[$modifier])) { - $modifier_types = array($compiler->known_modifier_type[$modifier]); - } else { - $modifier_types = array(1, 2, 3, 4, 5, 6); - } - foreach ($modifier_types as $type) { - switch ($type) { - case 1: - // registered modifier - if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier])) { - $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0]; - if (!is_array($function)) { - $output = "{$function}({$params})"; - } else { - if (is_object($function[0])) { - $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')'; - } else { - $output = $function[0] . '::' . $function[1] . '(' . $params . ')'; - } - } - $compiler->known_modifier_type[$modifier] = $type; - break 2; - } - break; - case 2: - // registered modifier compiler - if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0])) { - $output = call_user_func($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0], $single_modifier, $compiler->smarty); - $compiler->known_modifier_type[$modifier] = $type; - break 2; - } - break; - case 3: - // modifiercompiler plugin - if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) { - // check if modifier allowed - if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) { - $plugin = 'smarty_modifiercompiler_' . $modifier; - $output = $plugin($single_modifier, $compiler); - } - $compiler->known_modifier_type[$modifier] = $type; - break 2; - } - break; - case 4: - // modifier plugin - if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) { - // check if modifier allowed - if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) { - $output = "{$function}({$params})"; - } - $compiler->known_modifier_type[$modifier] = $type; - break 2; - } - break; - case 5: - // PHP function - if (is_callable($modifier)) { - // check if modifier allowed - if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)) { - $output = "{$modifier}({$params})"; - } - $compiler->known_modifier_type[$modifier] = $type; - break 2; - } - break; - case 6: - // default plugin handler - if (isset($compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier]) || (is_callable($compiler->smarty->default_plugin_handler_func) && $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))) { - $function = $compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0]; - // check if modifier allowed - if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) { - if (!is_array($function)) { - $output = "{$function}({$params})"; - } else { - if (is_object($function[0])) { - $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')'; - } else { - $output = $function[0] . '::' . $function[1] . '(' . $params . ')'; - } - } - } - if (isset($compiler->template->required_plugins['nocache'][$modifier][Smarty::PLUGIN_MODIFIER]['file']) || isset($compiler->template->required_plugins['compiled'][$modifier][Smarty::PLUGIN_MODIFIER]['file'])) { - // was a plugin - $compiler->known_modifier_type[$modifier] = 4; - } else { - $compiler->known_modifier_type[$modifier] = $type; - } - break 2; - } + // check for registered modifier + if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier])) { + $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0]; + if (!is_array($function)) { + $output = "{$function}({$params})"; + } else { + if (is_object($function[0])) { + $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')'; + } else { + $output = $function[0] . '::' . $function[1] . '(' . $params . ')'; + } } - } - if (!isset($compiler->known_modifier_type[$modifier])) { + } else if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0])) { + $output = call_user_func($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0], $single_modifier, $compiler->smarty); + // check for plugin modifiercompiler + } else if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) { + // check if modifier allowed + if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) { + $plugin = 'smarty_modifiercompiler_' . $modifier; + $output = $plugin($single_modifier, $compiler); + } + // check for plugin modifier + } else if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) { + // check if modifier allowed + if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) { + $output = "{$function}({$params})"; + } + // check if trusted PHP function + } else if (is_callable($modifier)) { + // check if modifier allowed + if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)) { + $output = "{$modifier}({$params})"; + } + } else { $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", $compiler->lex->taglineno); } } - return $output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php index 5418feff..cca924d1 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Object Block Function + * * Compiles code for registered objects as block function * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Object Block Function Class * - * @package Smarty + * @package Smarty * @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. * @@ -27,17 +28,16 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter /** * Compiles code for the execution of block plugin * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * @param string $tag name of block object - * @param string $method name of method to call - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @param string $tag name of block object + * @param string $method name of method to call * @return string compiled code */ public function compile($args, $compiler, $parameter, $tag, $method) { - if (!isset($tag[5]) || substr($tag, - 5) != 'close') { + if (!isset($tag[5]) || substr($tag, -5) != 'close') { // opening tag of block plugin // check and get attributes $_attr = $this->getAttributes($compiler, $args); @@ -62,7 +62,7 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter // compile code $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; } else { - $base_tag = substr($tag, 0, - 5); + $base_tag = substr($tag, 0, -5); // must endblock be nocache? if ($compiler->nocache) { $compiler->tag_nocache = true; @@ -80,7 +80,9 @@ 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);?>"; } - return $output . "\n"; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php index d6eb47ab..f649084c 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php @@ -1,21 +1,22 @@ <?php /** - * Smarty Internal Plugin Compile Object Function + * Smarty Internal Plugin Compile Object Funtion + * * Compiles code for registered objects as function * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Object Function Class * - * @package Smarty + * @package Smarty * @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. * @@ -27,12 +28,11 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co /** * Compiles code for the execution of function plugin * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * @param string $tag name of function - * @param string $method name of method to call - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @param string $tag name of function + * @param string $method name of method to call * @return string compiled code */ public function compile($args, $compiler, $parameter, $tag, $method) @@ -48,29 +48,22 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co $_assign = $_attr['assign']; unset($_attr['assign']); } - // method or property ? - if (method_exists($compiler->smarty->registered_objects[$tag][0], $method)) { - // convert attributes into parameter array string - if ($compiler->smarty->registered_objects[$tag][2]) { - $_paramsArray = array(); - foreach ($_attr as $_key => $_value) { - if (is_int($_key)) { - $_paramsArray[] = "$_key=>$_value"; - } else { - $_paramsArray[] = "'$_key'=>$_value"; - } + // convert attributes into parameter array string + if ($compiler->smarty->registered_objects[$tag][2]) { + $_paramsArray = array(); + foreach ($_attr as $_key => $_value) { + if (is_int($_key)) { + $_paramsArray[] = "$_key=>$_value"; + } else { + $_paramsArray[] = "'$_key'=>$_value"; } - $_params = 'array(' . implode(",", $_paramsArray) . ')'; - $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)"; - } else { - $_params = implode(",", $_attr); - $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})"; } + $_params = 'array(' . implode(",", $_paramsArray) . ')'; + $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)"; } else { - // object property - $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}"; + $_params = implode(",", $_attr); + $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})"; } - if (empty($_assign)) { // This tag does create output $compiler->has_output = true; @@ -78,7 +71,9 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co } else { $output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n"; } - return $output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php index 188bbe77..a3711954 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php @@ -1,46 +1,45 @@ <?php /** - * Smarty Internal Plugin Compile Print Expression - * Compiles any tag which will output an expression or variable - * - * @package Smarty - * @subpackage Compiler - * @author Uwe Tews - */ +* Smarty Internal Plugin Compile Print Expression +* +* Compiles any tag which will output an expression or variable +* +* @package Smarty +* @subpackage Compiler +* @author Uwe Tews +*/ /** - * Smarty Internal Plugin Compile Print Expression Class - * - * @package Smarty - * @subpackage Compiler - */ -class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase -{ +* Smarty Internal Plugin Compile Print Expression Class +* +* @package Smarty +* @subpackage Compiler +*/ +class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase { + /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ public $optional_attributes = array('assign'); /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ + * Attribute definition: Overwrites base class. + * + * @var array + * @see Smarty_Internal_CompileBase + */ public $option_flags = array('nocache', 'nofilter'); /** - * Compiles code for generating output from any expression - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * - * @throws SmartyException - * @return string compiled code - */ + * Compiles code for gererting output from any expression + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @return string compiled code + */ public function compile($args, $compiler, $parameter) { // check and get attributes @@ -49,6 +48,12 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C if ($_attr['nocache'] === true) { $compiler->tag_nocache = true; } + // filter handling + if ($_attr['nofilter'] === true) { + $_filter = 'false'; + } else { + $_filter = 'true'; + } if (isset($_attr['assign'])) { // assign output to variable $output = "<?php \$_smarty_tpl->assign({$_attr['assign']},{$parameter['value']});?>"; @@ -66,13 +71,13 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C $modifierlist = array(); foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) { preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array); - for ($i = 0, $count = count($mod_array[0]); $i < $count; $i ++) { + for ($i = 0, $count = count($mod_array[0]);$i < $count;$i++) { if ($mod_array[0][$i] != ':') { $modifierlist[$key][] = $mod_array[0][$i]; } } } - $compiler->default_modifier_list = $modifierlist; + $compiler->default_modifier_list = $modifierlist; } $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list, 'value' => $output)); } @@ -80,13 +85,13 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C if ($compiler->template->smarty->escape_html) { $output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')"; } - // loop over registered filters + // loop over registerd filters if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) { foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) { if (!is_array($function)) { $output = "{$function}({$output},\$_smarty_tpl)"; - } elseif (is_object($function[0])) { - $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE]['{$key}'][0]->{$function[1]}({$output},\$_smarty_tpl)"; + } else if (is_object($function[0])) { + $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE][{$key}][0]->{$function[1]}({$output},\$_smarty_tpl)"; } else { $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)"; } @@ -94,7 +99,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C } // auto loaded filters if (isset($compiler->smarty->autoload_filters[Smarty::FILTER_VARIABLE])) { - foreach ((array) $compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) { + foreach ((array)$compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) { $result = $this->compile_output_filter($compiler, $name, $output); if ($result !== false) { $output = $result; @@ -118,17 +123,15 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C $compiler->has_output = true; $output = "<?php echo {$output};?>"; } - return $output; } /** - * @param object $compiler compiler object - * @param string $name name of variable filter - * @param string $output embedded output - * - * @return string - */ + * @param object $compiler compiler object + * @param string $name name of variable filter + * @param type $output embedded output + * @return string + */ private function compile_output_filter($compiler, $name, $output) { $plugin_name = "smarty_variablefilter_{$name}"; @@ -145,7 +148,9 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C // not found return false; } - return "{$plugin_name}({$output},\$_smarty_tpl)"; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php index 68ab644f..f104853a 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Registered Block + * * Compiles code for the execution of a registered block function * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Registered Block Class * - * @package Smarty + * @package Smarty * @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. * @@ -27,35 +28,34 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C /** * Compiles code for the execution of a block function * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * @param string $tag name of block function - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @param string $tag name of block function * @return string compiled code */ public function compile($args, $compiler, $parameter, $tag) { - if (!isset($tag[5]) || substr($tag, - 5) != 'close') { + if (!isset($tag[5]) || substr($tag,-5) != 'close') { // opening tag of block plugin // check and get attributes $_attr = $this->getAttributes($compiler, $args); if ($_attr['nocache']) { $compiler->tag_nocache = true; } - unset($_attr['nocache']); - if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag])) { - $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag]; - } else { - $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$tag]; - } + unset($_attr['nocache']); + if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag])) { + $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag]; + } else { + $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$tag]; + } // convert attributes into parameter array string $_paramsArray = array(); foreach ($_attr as $_key => $_value) { if (is_int($_key)) { $_paramsArray[] = "$_key=>$_value"; - } elseif ($compiler->template->caching && in_array($_key, $tag_info[2])) { - $_value = str_replace("'", "^#^", $_value); + } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) { + $_value = str_replace("'","^#^",$_value); $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^"; } else { $_paramsArray[] = "'$_key'=>$_value"; @@ -70,7 +70,7 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C // compile code if (!is_array($function)) { $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; - } elseif (is_object($function[0])) { + } else if (is_object($function[0])) { $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; } else { $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; @@ -80,32 +80,34 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C if ($compiler->nocache) { $compiler->tag_nocache = true; } - $base_tag = substr($tag, 0, - 5); + $base_tag = substr($tag, 0, -5); // closing tag of block plugin, restore nocache list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag); // This tag does create output $compiler->has_output = true; - if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) { - $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0]; - } else { - $function = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0]; - } + if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) { + $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0]; + } else { + $function = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0]; + } // compile code if (!isset($parameter['modifier_list'])) { - $mod_pre = $mod_post = ''; + $mod_pre = $mod_post =''; } else { $mod_pre = ' ob_start(); '; - $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';'; + $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';'; } if (!is_array($function)) { - $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);" . $mod_post . " } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; - } elseif (is_object($function[0])) { - $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; + $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; + } else if (is_object($function[0])) { + $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; } else { - $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; + $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; } } - return $output . "\n"; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php index dfb4572f..e68a0244 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Registered Function + * * Compiles code for the execution of a registered function * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Registered Function Class * - * @package Smarty + * @package Smarty * @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. * @@ -27,11 +28,10 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna /** * Compiles code for the execution of a registered function * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * @param string $tag name of function - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @param string $tag name of function * @return string compiled code */ public function compile($args, $compiler, $parameter, $tag) @@ -44,20 +44,20 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna $compiler->tag_nocache = true; } unset($_attr['nocache']); - if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) { - $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag]; - } else { - $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_FUNCTION][$tag]; - } + if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) { + $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag]; + } else { + $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_FUNCTION][$tag]; + } // not cachable? - $compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[1]; + $compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[1]; // convert attributes into parameter array string $_paramsArray = array(); foreach ($_attr as $_key => $_value) { if (is_int($_key)) { $_paramsArray[] = "$_key=>$_value"; - } elseif ($compiler->template->caching && in_array($_key, $tag_info[2])) { - $_value = str_replace("'", "^#^", $_value); + } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) { + $_value = str_replace("'","^#^",$_value); $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^"; } else { $_paramsArray[] = "'$_key'=>$_value"; @@ -68,12 +68,14 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna // compile code if (!is_array($function)) { $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n"; - } elseif (is_object($function[0])) { + } else if (is_object($function[0])) { $output = "<?php echo \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n"; } else { $output = "<?php echo {$function[0]}::{$function[1]}({$_params},\$_smarty_tpl);?>\n"; } - return $output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php index 23b17ae1..f9adcec8 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php @@ -1,33 +1,32 @@ <?php /** * Smarty Internal Plugin Compile Special Smarty Variable + * * Compiles the special $smarty variables * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile special Smarty Variable Class * - * @package Smarty + * @package Smarty * @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 special $smarty variables - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param $parameter + * Compiles code for the speical $smarty variables * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler, $parameter) { - $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2)); + $_index = preg_split("/\]\[/",substr($parameter, 1, strlen($parameter)-2)); $compiled_ref = ' '; $variable = trim($_index[0], "'"); switch ($variable) { @@ -57,21 +56,17 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C $compiler->trigger_template_error("(secure mode) super globals not permitted"); break; } - $compiled_ref = '$_' . strtoupper($variable); + $compiled_ref = '$_'.strtoupper($variable); break; case 'template': return 'basename($_smarty_tpl->source->filepath)'; - case 'template_object': - return '$_smarty_tpl'; - case 'current_dir': return 'dirname($_smarty_tpl->source->filepath)'; case 'version': $_version = Smarty::SMARTY_VERSION; - return "'$_version'"; case 'const': @@ -79,23 +74,16 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C $compiler->trigger_template_error("(secure mode) constants not permitted"); break; } - - return "@constant({$_index[1]})"; + return '@' . trim($_index[1], "'"); 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': $_ldelim = $compiler->smarty->left_delimiter; - return "'$_ldelim'"; case 'rdelim': $_rdelim = $compiler->smarty->right_delimiter; - return "'$_rdelim'"; default: @@ -108,7 +96,9 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C $compiled_ref = $compiled_ref . "[$_ind]"; } } - return $compiled_ref; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php index dcff2ae4..807c7e2b 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php @@ -1,28 +1,28 @@ <?php /** * Smarty Internal Plugin Compile Rdelim - * Compiles the {rdelim} tag * - * @package Smarty + * Compiles the {rdelim} tag + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Rdelim Class * - * @package Smarty + * @package Smarty * @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 - * This tag does output the right delimiter. * - * @param array $args array with attributes from parser - * @param object $compiler compiler object + * This tag does output the right delimiter. * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -33,7 +33,9 @@ class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase } // this tag does not return compiled code $compiler->has_code = true; - return $compiler->smarty->right_delimiter; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_section.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_section.php index 5ac3fb06..ccb7673d 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_section.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_section.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Compile Section + * * Compiles the {section} {sectionelse} {/section} tags * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Section Class - * - * @package Smarty + * + * @package Smarty * @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. * @@ -41,9 +42,8 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase /** * Compiles code for the {section} tag * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -65,15 +65,14 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase foreach ($_attr as $attr_name => $attr_value) { switch ($attr_name) { case 'loop': - $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop); unset(\$_loop);\n"; + $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n"; break; case 'show': - if (is_bool($attr_value)) { + if (is_bool($attr_value)) $show_attr_value = $attr_value ? 'true' : 'false'; - } else { - $show_attr_value = "(bool) $attr_value"; - } + else + $show_attr_value = "(bool)$attr_value"; $output .= "{$section_props}['show'] = $show_attr_value;\n"; break; @@ -83,36 +82,32 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase case 'max': case 'start': - $output .= "{$section_props}['$attr_name'] = (int) $attr_value;\n"; + $output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n"; break; case 'step': - $output .= "{$section_props}['$attr_name'] = ((int) $attr_value) == 0 ? 1 : (int) $attr_value;\n"; + $output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n"; break; } } - if (!isset($_attr['show'])) { + if (!isset($_attr['show'])) $output .= "{$section_props}['show'] = true;\n"; - } - if (!isset($_attr['loop'])) { + if (!isset($_attr['loop'])) $output .= "{$section_props}['loop'] = 1;\n"; - } - if (!isset($_attr['max'])) { + if (!isset($_attr['max'])) $output .= "{$section_props}['max'] = {$section_props}['loop'];\n"; - } else { + else $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"; - } - if (!isset($_attr['start'])) { + if (!isset($_attr['start'])) $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"; } @@ -136,25 +131,24 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase $output .= "{$section_props}['last'] = ({$section_props}['iteration'] == {$section_props}['total']);\n"; $output .= "?>"; - return $output; } + } /** * Smarty Internal Plugin Compile Sectionelse Class - * - * @package Smarty + * + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -167,22 +161,22 @@ class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase return "<?php endfor; else: ?>"; } + } /** * Smarty Internal Plugin Compile Sectionclose Class - * - * @package Smarty + * + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -203,4 +197,7 @@ class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase return "<?php endfor; endif; ?>"; } } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php index 8e91ba6d..50b4cab5 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php @@ -1,28 +1,28 @@ <?php /** * Smarty Internal Plugin Compile Setfilter + * * Compiles code for setfilter tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Setfilter Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) @@ -31,26 +31,26 @@ class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase $compiler->template->variable_filters = $parameter['modifier_list']; // this tag does not return compiled code $compiler->has_code = false; - return true; } + } /** * Smarty Internal Plugin Compile Setfilterclose Class * - * @package Smarty + * @package Smarty * @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 - * This tag does not generate compiled output. It resets variable filter. * - * @param array $args array with attributes from parser - * @param object $compiler compiler object + * This tag does not generate compiled output. It resets variable filter. * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -64,7 +64,9 @@ class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase } // this tag does not return compiled code $compiler->has_code = false; - return true; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_while.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_while.php index 36dc049d..d7d986c3 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compile_while.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compile_while.php @@ -1,28 +1,28 @@ <?php /** * Smarty Internal Plugin Compile While + * * Compiles the {while} tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile While Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) @@ -31,7 +31,7 @@ class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase $_attr = $this->getAttributes($compiler, $args); $this->openTag($compiler, 'while', $compiler->nocache); - if (!array_key_exists("if condition", $parameter)) { + if (!array_key_exists("if condition",$parameter)) { $compiler->trigger_template_error("missing while condition", $compiler->lex->taglineno); } @@ -51,33 +51,32 @@ class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase } if (is_array($parameter['if condition']['var'])) { $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; - $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>"; + $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>"; } else { $_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; } else { - return "<?php while ({$parameter['if condition']}) {?>"; + return "<?php while ({$parameter['if condition']}){?>"; } } + } /** * Smarty Internal Plugin Compile Whileclose Class * - * @package Smarty + * @package Smarty * @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 * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * + * @param array $args array with attributes from parser + * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) @@ -87,7 +86,9 @@ class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase $compiler->tag_nocache = true; } $compiler->nocache = $this->closeTag($compiler, array('while')); - return "<?php }?>"; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_compilebase.php b/Widgets/smarty/libs/sysplugins/smarty_internal_compilebase.php index f78f15f4..5fb56f37 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_compilebase.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_compilebase.php @@ -2,19 +2,19 @@ /** * Smarty Internal Plugin CompileBase * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * This class does extend all internal compile plugins * - * @package Smarty + * @package Smarty * @subpackage Compiler */ -abstract class Smarty_Internal_CompileBase -{ +abstract class Smarty_Internal_CompileBase { + /** * Array of names of required attribute required by tag * @@ -43,15 +43,15 @@ abstract class Smarty_Internal_CompileBase /** * This function checks if the attributes passed are valid + * * The attributes passed for the tag to compile are checked against the list of required and * optional attributes. Required attributes must be present. Optional attributes are check against * the corresponding list. The keyword '_any' specifies that any attribute will be accepted * as valid * - * @param object $compiler compiler object - * @param array $attributes attributes applied to the tag - * - * @return array of mapped attributes for further processing + * @param object $compiler compiler object + * @param array $attributes attributes applied to the tag + * @return array of mapped attributes for further processing */ public function getAttributes($compiler, $attributes) { @@ -64,7 +64,7 @@ abstract class Smarty_Internal_CompileBase if (in_array(trim($mixed, '\'"'), $this->option_flags)) { $_indexed_attr[trim($mixed, '\'"')] = true; // shorthand attribute ? - } elseif (isset($this->shorttag_order[$key])) { + } else if (isset($this->shorttag_order[$key])) { $_indexed_attr[$this->shorttag_order[$key]] = $mixed; } else { // too many shorthands @@ -77,13 +77,13 @@ abstract class Smarty_Internal_CompileBase if (in_array($kv['key'], $this->option_flags)) { if (is_bool($kv['value'])) { $_indexed_attr[$kv['key']] = $kv['value']; - } elseif (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) { + } else if (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) { if (trim($kv['value']) == 'true') { $_indexed_attr[$kv['key']] = true; } else { $_indexed_attr[$kv['key']] = false; } - } elseif (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) { + } else if (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) { if ($kv['value'] == 1) { $_indexed_attr[$kv['key']] = true; } else { @@ -105,7 +105,7 @@ abstract class Smarty_Internal_CompileBase $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $compiler->lex->taglineno); } } - // check for not allowed attributes + // check for unallowed attributes if ($this->optional_attributes != array('_any')) { $tmp_array = array_merge($this->required_attributes, $this->optional_attributes, $this->option_flags); foreach ($_indexed_attr as $key => $dummy) { @@ -126,11 +126,12 @@ abstract class Smarty_Internal_CompileBase /** * Push opening tag name on stack + * * Optionally additional data can be saved on stack * - * @param object $compiler compiler object - * @param string $openTag the opening tag's name - * @param mixed $data optional data saved + * @param object $compiler compiler object + * @param string $openTag the opening tag's name + * @param mixed $data optional data saved */ public function openTag($compiler, $openTag, $data = null) { @@ -139,12 +140,12 @@ abstract class Smarty_Internal_CompileBase /** * Pop closing tag - * Raise an error if this stack-top doesn't match with expected opening tags * - * @param object $compiler compiler object - * @param array|string $expectedTag the expected opening tag names + * Raise an error if this stack-top doesn't match with expected opening tags * - * @return mixed any type the opening tag's name or saved data + * @param object $compiler compiler object + * @param array|string $expectedTag the expected opening tag names + * @return mixed any type the opening tag's name or saved data */ public function closeTag($compiler, $expectedTag) { @@ -162,13 +163,14 @@ abstract class Smarty_Internal_CompileBase } } // wrong nesting of tags - $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag . "{$compiler->smarty->right_delimiter} tag"); - + $compiler->trigger_template_error("unclosed {" . $_openTag . "} tag"); return; } // wrong nesting of tags $compiler->trigger_template_error("unexpected closing tag", $compiler->lex->taglineno); - return; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_config.php b/Widgets/smarty/libs/sysplugins/smarty_internal_config.php index 25694d5a..a309ec9f 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_config.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_config.php @@ -2,23 +2,27 @@ /** * Smarty Internal Plugin Config * - * @package Smarty + * @package Smarty * @subpackage Config - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Config + * * Main class for config variables * - * @package Smarty + * @package Smarty * @subpackage Config + * + * @property Smarty_Config_Source $source + * @property Smarty_Config_Compiled $compiled * @ignore */ -class Smarty_Internal_Config -{ +class Smarty_Internal_Config { + /** - * Smarty instance + * Samrty instance * * @var Smarty object */ @@ -31,7 +35,6 @@ class Smarty_Internal_Config public $data = null; /** * Config resource - * * @var string */ public $config_resource = null; @@ -55,7 +58,6 @@ class Smarty_Internal_Config public $compiled_timestamp = null; /** * flag if compiled config file is invalid and must be (re)compiled - * * @var bool */ public $mustCompile = null; @@ -70,8 +72,8 @@ class Smarty_Internal_Config * Constructor of config file object * * @param string $config_resource config file resource name - * @param Smarty $smarty Smarty instance - * @param object $data object for config vars storage + * @param Smarty $smarty Smarty instance + * @param object $data object for config vars storage */ public function __construct($config_resource, $smarty, $data = null) { @@ -88,8 +90,8 @@ class Smarty_Internal_Config public function getCompiledFilepath() { return $this->compiled_filepath === null ? - ($this->compiled_filepath = $this->buildCompiledFilepath()) : - $this->compiled_filepath; + ($this->compiled_filepath = $this->buildCompiledFilepath()) : + $this->compiled_filepath; } /** @@ -101,26 +103,25 @@ class Smarty_Internal_Config { $_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null; $_flag = (int) $this->smarty->config_read_hidden + (int) $this->smarty->config_booleanize * 2 - + (int) $this->smarty->config_overwrite * 4; - $_filepath = sha1(realpath($this->source->filepath) . $_flag); + + (int) $this->smarty->config_overwrite * 4; + $_filepath = sha1($this->source->name . $_flag); // if use_sub_dirs, break file into directories if ($this->smarty->use_sub_dirs) { $_filepath = substr($_filepath, 0, 2) . DS - . substr($_filepath, 2, 2) . DS - . substr($_filepath, 4, 2) . DS - . $_filepath; + . substr($_filepath, 2, 2) . DS + . substr($_filepath, 4, 2) . DS + . $_filepath; } $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^'; if (isset($_compile_id)) { $_filepath = $_compile_id . $_compile_dir_sep . $_filepath; } $_compile_dir = $this->smarty->getCompileDir(); - return $_compile_dir . $_filepath . '.' . basename($this->source->name) . '.config' . '.php'; } /** - * Returns the timestamp of the compiled file + * Returns the timpestamp of the compiled file * * @return integer the file timestamp */ @@ -133,6 +134,7 @@ class Smarty_Internal_Config /** * Returns if the current config file must be compiled + * * It does compare the timestamps of config source and the compiled config and checks the force compile configuration * * @return boolean true if the file must be compiled @@ -140,12 +142,13 @@ class Smarty_Internal_Config public function mustCompile() { return $this->mustCompile === null ? - $this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp() === false || $this->smarty->compile_check && $this->getCompiledTimestamp() < $this->source->timestamp) : + $this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp () === false || $this->smarty->compile_check && $this->getCompiledTimestamp () < $this->source->timestamp): $this->mustCompile; } /** * Returns the compiled config file + * * It checks if the config file must be compiled or just read the compiled version * * @return string the compiled config file @@ -160,7 +163,6 @@ class Smarty_Internal_Config $this->compiled_config = file_get_contents($this->getCompiledFilepath()); } } - return $this->compiled_config; } @@ -185,15 +187,14 @@ class Smarty_Internal_Config // call compiler try { $this->compiler_object->compileSource($this); - } - catch (Exception $e) { + } catch (Exception $e) { // restore old timestamp in case of error if ($this->smarty->compile_locking && $saved_timestamp) { touch($this->getCompiledFilepath(), $saved_timestamp); } throw $e; } - // compiling succeeded + // compiling succeded // write compiled template Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->getCompiledConfig(), $this->smarty); } @@ -201,10 +202,8 @@ class Smarty_Internal_Config /** * load config variables * - * @param mixed $sections array of section names, single section or null - * @param string $scope global,parent or local - * - * @throws Exception + * @param mixed $sections array of section names, single section or null + * @param object $scope global,parent or local */ public function loadConfigVars($sections = null, $scope = 'local') { @@ -241,8 +240,9 @@ class Smarty_Internal_Config } // scan sections if (!empty($sections)) { - foreach ((array) $sections as $this_section) { - if (isset($_config_vars['sections'][$this_section])) { + $sections = array_flip((array) $sections); + foreach ($_config_vars['sections'] as $this_section => $dummy) { + if (isset($sections[$this_section])) { foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) { if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) { $scope_ptr->config_vars[$variable] = $value; @@ -258,9 +258,8 @@ class Smarty_Internal_Config /** * set Smarty property in template context * - * @param string $property_name property name - * @param mixed $value value - * + * @param string $property_name property name + * @param mixed $value value * @throws SmartyException if $property_name is not valid */ public function __set($property_name, $value) @@ -269,7 +268,6 @@ class Smarty_Internal_Config case 'source': case 'compiled': $this->$property_name = $value; - return; } @@ -279,9 +277,7 @@ class Smarty_Internal_Config /** * get Smarty property in template context * - * @param string $property_name property name - * - * @return \Smarty_Config_Source|\Smarty_Template_Compiled + * @param string $property_name property name * @throws SmartyException if $property_name is not valid */ public function __get($property_name) @@ -292,15 +288,16 @@ class Smarty_Internal_Config throw new SmartyException("Unable to parse resource name \"{$this->config_resource}\""); } $this->source = Smarty_Resource::config($this); - return $this->source; case 'compiled': $this->compiled = $this->source->getCompiled($this); - return $this->compiled; } throw new SmartyException("config attribute '$property_name' does not exist."); } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php b/Widgets/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php index 11731043..b16a6940 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php @@ -1,22 +1,23 @@ <?php /** * Smarty Internal Plugin Config File Compiler + * * This is the config file compiler class. It calls the lexer and parser to * perform the compiling. * - * @package Smarty + * @package Smarty * @subpackage Config - * @author Uwe Tews + * @author Uwe Tews */ /** * Main config file compiler class * - * @package Smarty + * @package Smarty * @subpackage Config */ -class Smarty_Internal_Config_File_Compiler -{ +class Smarty_Internal_Config_File_Compiler { + /** * Lexer object * @@ -68,8 +69,7 @@ class Smarty_Internal_Config_File_Compiler * Method to compile a Smarty template. * * @param Smarty_Internal_Config $config config object - * - * @return bool true if compiling succeeded, false if it failed + * @return bool true if compiling succeeded, false if it failed */ public function compileSource(Smarty_Internal_Config $config) { @@ -84,46 +84,28 @@ class Smarty_Internal_Config_File_Compiler return true; } // init the lexer/parser to compile the config file - $lex = new Smarty_Internal_Configfilelexer($_content, $this); + $lex = new Smarty_Internal_Configfilelexer($_content, $this->smarty); $parser = new Smarty_Internal_Configfileparser($lex, $this); - - if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) { - $mbEncoding = mb_internal_encoding(); - mb_internal_encoding('ASCII'); - } else { - $mbEncoding = null; - } - - - if ($this->smarty->_parserdebug) { - $parser->PrintTrace(); - } + if ($this->smarty->_parserdebug) $parser->PrintTrace(); // get tokens from lexer and parse them while ($lex->yylex()) { - if ($this->smarty->_parserdebug) { - echo "<br>Parsing {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n"; - } + if ($this->smarty->_parserdebug) echo "<br>Parsing {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n"; $parser->doParse($lex->token, $lex->value); } // finish parsing process $parser->doParse(0, 0); - - if ($mbEncoding) { - mb_internal_encoding($mbEncoding); - } - $config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>'; } /** * display compiler error messages without dying + * * If parameter $args is empty it is a parser detected syntax error. - * In this case the parser is called to obtain information about expected tokens. + * In this case the parser is called to obtain information about exspected tokens. + * * If parameter $args contains a string this is used as error message * * @param string $args individual error message or null - * - * @throws SmartyCompilerException */ public function trigger_config_file_error($args = null) { @@ -135,12 +117,12 @@ class Smarty_Internal_Config_File_Compiler // $line--; } $match = preg_split("/\n/", $this->lex->data); - $error_text = "Syntax error in config file '{$this->config->source->filepath}' on line {$line} '{$match[$line - 1]}' "; + $error_text = "Syntax error in config file '{$this->config->source->filepath}' on line {$line} '{$match[$line-1]}' "; if (isset($args)) { // individual error message $error_text .= $args; } else { - // expected token from parser + // exspected token from parser foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) { $exp_token = $this->parser->yyTokenName[$token]; if (isset($this->lex->smarty_token_names[$exp_token])) { @@ -156,4 +138,7 @@ class Smarty_Internal_Config_File_Compiler } throw new SmartyCompilerException($error_text); } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/Widgets/smarty/libs/sysplugins/smarty_internal_configfilelexer.php index f0292196..326d8f97 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_configfilelexer.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_configfilelexer.php @@ -1,16 +1,15 @@ <?php /** - * Smarty Internal Plugin Configfilelexer - * This is the lexer to break the config file source into tokens - * - * @package Smarty - * @subpackage Config - * @author Uwe Tews - */ - +* Smarty Internal Plugin Configfilelexer +* +* This is the lexer to break the config file source into tokens +* @package Smarty +* @subpackage Config +* @author Uwe Tews +*/ /** - * Smarty Internal Plugin Configfilelexer - */ +* Smarty Internal Plugin Configfilelexer +*/ class Smarty_Internal_Configfilelexer { @@ -21,112 +20,89 @@ class Smarty_Internal_Configfilelexer public $node; public $line; private $state = 1; - public $yyTraceFILE; - public $yyTracePrompt; - public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE'); - public $smarty_token_names = array( // Text for parser error messages - ); + public $smarty_token_names = array ( // Text for parser error messages + ); + - function __construct($data, $compiler) + function __construct($data, $smarty) { // set instance object self::instance($this); $this->data = $data . "\n"; //now all lines are \n-terminated $this->counter = 0; - if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) { - $this->counter += strlen($match[0]); - } $this->line = 1; - $this->compiler = $compiler; - $this->smarty = $compiler->smarty; + $this->smarty = $smarty; + $this->mbstring_overload = ini_get('mbstring.func_overload') & 2; } - public static function &instance($new_instance = null) { static $instance = null; - if (isset($new_instance) && is_object($new_instance)) { + if (isset($new_instance) && is_object($new_instance)) $instance = $new_instance; - } return $instance; } - public function PrintTrace() - { - $this->yyTraceFILE = fopen('php://output', 'w'); - $this->yyTracePrompt = '<br>'; - } + private $_yy_state = 1; private $_yy_stack = array(); - public function yylex() + function yylex() { return $this->{'yylex' . $this->_yy_state}(); } - public function yypushstate($state) + function yypushstate($state) { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); - } array_push($this->_yy_stack, $this->_yy_state); $this->_yy_state = $state; - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); - } } - public function yypopstate() + function yypopstate() { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); - } $this->_yy_state = array_pop($this->_yy_stack); - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); - } } - public function yybegin($state) + function yybegin($state) { $this->_yy_state = $state; - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); - } } - public function yylex1() + + + + function yylex1() { - $tokenMap = array( - 1 => 0, - 2 => 0, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - ); + $tokenMap = array ( + 1 => 0, + 2 => 0, + 3 => 0, + 4 => 0, + 5 => 0, + 6 => 0, + 7 => 0, + 8 => 0, + ); if ($this->counter >= strlen($this->data)) { return false; // end of input } $yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS"; do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state START'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state START'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -149,101 +125,96 @@ class Smarty_Internal_Configfilelexer } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const START = 1; + const START = 1; function yy_r1_1($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART; - $this->yypushstate(self::COMMENT); + $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART; + $this->yypushstate(self::COMMENT); } - function yy_r1_2($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_OPENB; - $this->yypushstate(self::SECTION); + $this->token = Smarty_Internal_Configfileparser::TPC_OPENB; + $this->yypushstate(self::SECTION); } - function yy_r1_3($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB; + $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB; } - function yy_r1_4($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL; - $this->yypushstate(self::VALUE); + $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL; + $this->yypushstate(self::VALUE); } - function yy_r1_5($yy_subpatterns) { - return false; + return false; } - function yy_r1_6($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; + $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; } - function yy_r1_7($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_ID; + $this->token = Smarty_Internal_Configfileparser::TPC_ID; } - function yy_r1_8($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_OTHER; + $this->token = Smarty_Internal_Configfileparser::TPC_OTHER; } - public function yylex2() + + + function yylex2() { - $tokenMap = array( - 1 => 0, - 2 => 0, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - 9 => 0, - ); + $tokenMap = array ( + 1 => 0, + 2 => 0, + 3 => 0, + 4 => 0, + 5 => 0, + 6 => 0, + 7 => 0, + 8 => 0, + 9 => 0, + ); if ($this->counter >= strlen($this->data)) { return false; // end of input } $yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS"; do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state VALUE'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state VALUE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -266,111 +237,105 @@ class Smarty_Internal_Configfilelexer } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const VALUE = 2; + const VALUE = 2; function yy_r2_1($yy_subpatterns) { - return false; + return false; } - function yy_r2_2($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT; + $this->yypopstate(); } - function yy_r2_3($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_INT; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_INT; + $this->yypopstate(); } - function yy_r2_4($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES; - $this->yypushstate(self::TRIPPLE); + $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES; + $this->yypushstate(self::TRIPPLE); } - function yy_r2_5($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING; + $this->yypopstate(); } - function yy_r2_6($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING; + $this->yypopstate(); } - function yy_r2_7($yy_subpatterns) { - if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no"))) { - $this->yypopstate(); - $this->yypushstate(self::NAKED_STRING_VALUE); - return true; //reprocess in new state - } else { - $this->token = Smarty_Internal_Configfileparser::TPC_BOOL; - $this->yypopstate(); - } + if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) { + $this->yypopstate(); + $this->yypushstate(self::NAKED_STRING_VALUE); + return true; //reprocess in new state + } else { + $this->token = Smarty_Internal_Configfileparser::TPC_BOOL; + $this->yypopstate(); + } } - function yy_r2_8($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; + $this->yypopstate(); } - function yy_r2_9($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; - $this->value = ""; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; + $this->value = ""; + $this->yypopstate(); } - public function yylex3() + + + function yylex3() { - $tokenMap = array( - 1 => 0, - ); + $tokenMap = array ( + 1 => 0, + ); if ($this->counter >= strlen($this->data)) { return false; // end of input } $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS"; do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state NAKED_STRING_VALUE'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state NAKED_STRING_VALUE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -393,51 +358,53 @@ class Smarty_Internal_Configfilelexer } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const NAKED_STRING_VALUE = 3; + const NAKED_STRING_VALUE = 3; function yy_r3_1($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; + $this->yypopstate(); } - public function yylex4() + + + function yylex4() { - $tokenMap = array( - 1 => 0, - 2 => 0, - 3 => 0, - ); + $tokenMap = array ( + 1 => 0, + 2 => 0, + 3 => 0, + ); if ($this->counter >= strlen($this->data)) { return false; // end of input } $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS"; do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state COMMENT'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state COMMENT'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -460,62 +427,62 @@ class Smarty_Internal_Configfilelexer } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const COMMENT = 4; + const COMMENT = 4; function yy_r4_1($yy_subpatterns) { - return false; + return false; } - function yy_r4_2($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; + $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING; } - function yy_r4_3($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE; + $this->yypopstate(); } - public function yylex5() + + + function yylex5() { - $tokenMap = array( - 1 => 0, - 2 => 0, - ); + $tokenMap = array ( + 1 => 0, + 2 => 0, + ); if ($this->counter >= strlen($this->data)) { return false; // end of input } $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS"; do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state SECTION'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state SECTION'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -538,56 +505,56 @@ class Smarty_Internal_Configfilelexer } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const SECTION = 5; + const SECTION = 5; function yy_r5_1($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_DOT; + $this->token = Smarty_Internal_Configfileparser::TPC_DOT; } - function yy_r5_2($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_SECTION; - $this->yypopstate(); + $this->token = Smarty_Internal_Configfileparser::TPC_SECTION; + $this->yypopstate(); } - public function yylex6() + + function yylex6() { - $tokenMap = array( - 1 => 0, - 2 => 0, - ); + $tokenMap = array ( + 1 => 0, + 2 => 0, + ); if ($this->counter >= strlen($this->data)) { return false; // end of input } $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS"; do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state TRIPPLE'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state TRIPPLE'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -610,37 +577,36 @@ class Smarty_Internal_Configfilelexer } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const TRIPPLE = 6; + const TRIPPLE = 6; function yy_r6_1($yy_subpatterns) { - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END; - $this->yypopstate(); - $this->yypushstate(self::START); + $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END; + $this->yypopstate(); + $this->yypushstate(self::START); } - function yy_r6_2($yy_subpatterns) { - $to = strlen($this->data); - preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); - if (isset($match[0][1])) { - $to = $match[0][1]; - } else { - $this->compiler->trigger_template_error("missing or misspelled literal closing tag"); - } - $this->value = substr($this->data, $this->counter, $to - $this->counter); - $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT; + $to = strlen($this->data); + preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter); + if (isset($match[0][1])) { + $to = $match[0][1]; + } + $this->value = substr($this->data,$this->counter,$to-$this->counter); + $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT; } -} + +} +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_configfileparser.php b/Widgets/smarty/libs/sysplugins/smarty_internal_configfileparser.php index fc476ce0..784bc684 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_configfileparser.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_configfileparser.php @@ -1,20 +1,20 @@ <?php - /** - * Smarty Internal Plugin Configfileparser - * This is the config file parser. - * It is generated from the internal.configfileparser.y file - * - * @package Smarty - * @subpackage Compiler - * @author Uwe Tews - */ +* Smarty Internal Plugin Configfileparser +* +* This is the config file parser. +* It is generated from the internal.configfileparser.y file +* @package Smarty +* @subpackage Compiler +* @author Uwe Tews +*/ + class TPC_yyToken implements ArrayAccess { public $string = ''; public $metadata = array(); - public function __construct($s, $m = array()) + function __construct($s, $m = array()) { if ($s instanceof TPC_yyToken) { $this->string = $s->string; @@ -29,29 +29,28 @@ class TPC_yyToken implements ArrayAccess } } - public function __toString() + function __toString() { return $this->_string; } - public function offsetExists($offset) + function offsetExists($offset) { return isset($this->metadata[$offset]); } - public function offsetGet($offset) + function offsetGet($offset) { return $this->metadata[$offset]; } - public function offsetSet($offset, $value) + function offsetSet($offset, $value) { if ($offset === null) { if (isset($value[0])) { $x = ($value instanceof TPC_yyToken) ? $value->metadata : $value; $this->metadata = array_merge($this->metadata, $x); - return; } $offset = count($this->metadata); @@ -68,7 +67,7 @@ class TPC_yyToken implements ArrayAccess } } - public function offsetUnset($offset) + function offsetUnset($offset) { unset($this->metadata[$offset]); } @@ -76,19 +75,18 @@ class TPC_yyToken implements ArrayAccess class TPC_yyStackEntry { - public $stateno; /* The state-number */ - public $major; /* The major token value. This is the code + public $stateno; /* The state-number */ + public $major; /* The major token value. This is the code ** number for the token at this stack level */ public $minor; /* The user-supplied minor token value. This ** is the value of the token */ -} +}; -; #line 12 "smarty_internal_configfileparser.y" -class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparser.php" +class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser.php" { - #line 14 "smarty_internal_configfileparser.y" +#line 14 "smarty_internal_configfileparser.y" // states whether the parse was successful or not public $successful = true; @@ -96,27 +94,23 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse private $lex; private $internalError = false; - function __construct($lex, $compiler) - { + function __construct($lex, $compiler) { // set instance object self::instance($this); $this->lex = $lex; $this->smarty = $compiler->smarty; $this->compiler = $compiler; } - public static function &instance($new_instance = null) { static $instance = null; - if (isset($new_instance) && is_object($new_instance)) { + if (isset($new_instance) && is_object($new_instance)) $instance = $new_instance; - } return $instance; } - private function parse_bool($str) - { - if (in_array(strtolower($str), array('on', 'yes', 'true'))) { + private function parse_bool($str) { + if (in_array(strtolower($str) ,array('on','yes','true'))) { $res = true; } else { $res = false; @@ -125,13 +119,11 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse } private static $escapes_single = Array('\\' => '\\', - '\'' => '\''); - - private static function parse_single_quoted_string($qstr) - { - $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes + '\'' => '\''); + private static function parse_single_quoted_string($qstr) { + $escaped_string = substr($qstr, 1, strlen($qstr)-2); //remove outer quotes - $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE); + $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE); $str = ""; foreach ($ss as $s) { @@ -139,27 +131,24 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse if (isset(self::$escapes_single[$s[1]])) { $s = self::$escapes_single[$s[1]]; } - } + } - $str .= $s; + $str .= $s; } return $str; } - private static function parse_double_quoted_string($qstr) - { - $inner_str = substr($qstr, 1, strlen($qstr) - 2); + private static function parse_double_quoted_string($qstr) { + $inner_str = substr($qstr, 1, strlen($qstr)-2); return stripcslashes($inner_str); } - private static function parse_tripple_double_quoted_string($qstr) - { + private static function parse_tripple_double_quoted_string($qstr) { return stripcslashes($qstr); } - private function set_var(Array $var, Array &$target_array) - { + private function set_var(Array $var, Array &$target_array) { $key = $var["key"]; $value = $var["value"]; @@ -171,18 +160,16 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse } } - private function add_global_vars(Array $vars) - { + private function add_global_vars(Array $vars) { if (!isset($this->compiler->config_data['vars'])) { - $this->compiler->config_data['vars'] = Array(); + $this->compiler->config_data['vars'] = Array(); } foreach ($vars as $var) { $this->set_var($var, $this->compiler->config_data); } } - private function add_section_vars($section_name, Array $vars) - { + private function add_section_vars($section_name, Array $vars) { if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) { $this->compiler->config_data['sections'][$section_name]['vars'] = Array(); } @@ -190,152 +177,99 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse $this->set_var($var, $this->compiler->config_data['sections'][$section_name]); } } - - #line 174 "smarty_internal_configfileparser.php" - - const TPC_OPENB = 1; - const TPC_SECTION = 2; - const TPC_CLOSEB = 3; - const TPC_DOT = 4; - const TPC_ID = 5; - const TPC_EQUAL = 6; - const TPC_FLOAT = 7; - const TPC_INT = 8; - const TPC_BOOL = 9; - const TPC_SINGLE_QUOTED_STRING = 10; - const TPC_DOUBLE_QUOTED_STRING = 11; - const TPC_TRIPPLE_QUOTES = 12; - const TPC_TRIPPLE_TEXT = 13; - const TPC_TRIPPLE_QUOTES_END = 14; - const TPC_NAKED_STRING = 15; - const TPC_OTHER = 16; - const TPC_NEWLINE = 17; - const TPC_COMMENTSTART = 18; +#line 173 "smarty_internal_configfileparser.php" + + const TPC_OPENB = 1; + const TPC_SECTION = 2; + const TPC_CLOSEB = 3; + const TPC_DOT = 4; + const TPC_ID = 5; + const TPC_EQUAL = 6; + const TPC_FLOAT = 7; + const TPC_INT = 8; + const TPC_BOOL = 9; + const TPC_SINGLE_QUOTED_STRING = 10; + const TPC_DOUBLE_QUOTED_STRING = 11; + const TPC_TRIPPLE_QUOTES = 12; + const TPC_TRIPPLE_TEXT = 13; + const TPC_TRIPPLE_QUOTES_END = 14; + const TPC_NAKED_STRING = 15; + const TPC_OTHER = 16; + const TPC_NEWLINE = 17; + const TPC_COMMENTSTART = 18; const YY_NO_ACTION = 60; const YY_ACCEPT_ACTION = 59; const YY_ERROR_ACTION = 58; const YY_SZ_ACTTAB = 38; - static public $yy_action = array( - /* 0 */ - 29, 30, 34, 33, 24, 13, 19, 25, 35, 21, - /* 10 */ - 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, - /* 20 */ - 15, 17, 23, 18, 27, 26, 4, 5, 6, 32, - /* 30 */ - 2, 11, 28, 22, 16, 9, 7, 10, +static public $yy_action = array( + /* 0 */ 29, 30, 34, 33, 24, 13, 19, 25, 35, 21, + /* 10 */ 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, + /* 20 */ 15, 17, 23, 18, 27, 26, 4, 5, 6, 32, + /* 30 */ 2, 11, 28, 22, 16, 9, 7, 10, ); static public $yy_lookahead = array( - /* 0 */ - 7, 8, 9, 10, 11, 12, 5, 27, 15, 16, - /* 10 */ - 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, - /* 20 */ - 15, 2, 17, 4, 25, 26, 6, 3, 3, 14, - /* 30 */ - 23, 1, 24, 17, 2, 25, 22, 25, - ); - const YY_SHIFT_USE_DFLT = - 8; + /* 0 */ 7, 8, 9, 10, 11, 12, 5, 27, 15, 16, + /* 10 */ 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, + /* 20 */ 15, 2, 17, 4, 25, 26, 6, 3, 3, 14, + /* 30 */ 23, 1, 24, 17, 2, 25, 22, 25, +); + const YY_SHIFT_USE_DFLT = -8; const YY_SHIFT_MAX = 19; static public $yy_shift_ofst = array( - /* 0 */ - - 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8, - /* 10 */ - - 8, 19, 5, 3, 15, 16, 24, 25, 32, 20, - ); - const YY_REDUCE_USE_DFLT = - 21; + /* 0 */ -8, 1, 1, 1, -7, -3, -3, 30, -8, -8, + /* 10 */ -8, 19, 5, 3, 15, 16, 24, 25, 32, 20, +); + const YY_REDUCE_USE_DFLT = -21; const YY_REDUCE_MAX = 10; static public $yy_reduce_ofst = array( - /* 0 */ - - 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7, - /* 10 */ - - 11, - ); + /* 0 */ -10, -1, -1, -1, -20, 10, 12, 8, 14, 7, + /* 10 */ -11, +); static public $yyExpectedTokens = array( - /* 0 */ - array(), - /* 1 */ - array(5, 17, 18,), - /* 2 */ - array(5, 17, 18,), - /* 3 */ - array(5, 17, 18,), - /* 4 */ - array(7, 8, 9, 10, 11, 12, 15, 16,), - /* 5 */ - array(17, 18,), - /* 6 */ - array(17, 18,), - /* 7 */ - array(1,), - /* 8 */ - array(), - /* 9 */ - array(), - /* 10 */ - array(), - /* 11 */ - array(2, 4,), - /* 12 */ - array(15, 17,), - /* 13 */ - array(13, 14,), - /* 14 */ - array(14,), - /* 15 */ - array(17,), - /* 16 */ - array(3,), - /* 17 */ - array(3,), - /* 18 */ - array(2,), - /* 19 */ - array(6,), - /* 20 */ - array(), - /* 21 */ - array(), - /* 22 */ - array(), - /* 23 */ - array(), - /* 24 */ - array(), - /* 25 */ - array(), - /* 26 */ - array(), - /* 27 */ - array(), - /* 28 */ - array(), - /* 29 */ - array(), - /* 30 */ - array(), - /* 31 */ - array(), - /* 32 */ - array(), - /* 33 */ - array(), - /* 34 */ - array(), - /* 35 */ - array(), - ); + /* 0 */ array(), + /* 1 */ array(5, 17, 18, ), + /* 2 */ array(5, 17, 18, ), + /* 3 */ array(5, 17, 18, ), + /* 4 */ array(7, 8, 9, 10, 11, 12, 15, 16, ), + /* 5 */ array(17, 18, ), + /* 6 */ array(17, 18, ), + /* 7 */ array(1, ), + /* 8 */ array(), + /* 9 */ array(), + /* 10 */ array(), + /* 11 */ array(2, 4, ), + /* 12 */ array(15, 17, ), + /* 13 */ array(13, 14, ), + /* 14 */ array(14, ), + /* 15 */ array(17, ), + /* 16 */ array(3, ), + /* 17 */ array(3, ), + /* 18 */ array(2, ), + /* 19 */ array(6, ), + /* 20 */ array(), + /* 21 */ array(), + /* 22 */ array(), + /* 23 */ array(), + /* 24 */ array(), + /* 25 */ array(), + /* 26 */ array(), + /* 27 */ array(), + /* 28 */ array(), + /* 29 */ array(), + /* 30 */ array(), + /* 31 */ array(), + /* 32 */ array(), + /* 33 */ array(), + /* 34 */ array(), + /* 35 */ array(), +); static public $yy_default = array( - /* 0 */ - 44, 37, 41, 40, 58, 58, 58, 36, 39, 44, - /* 10 */ - 44, 58, 58, 58, 58, 58, 58, 58, 58, 58, - /* 20 */ - 55, 54, 57, 56, 50, 45, 43, 42, 38, 46, - /* 30 */ - 47, 52, 51, 49, 48, 53, - ); + /* 0 */ 44, 37, 41, 40, 58, 58, 58, 36, 39, 44, + /* 10 */ 44, 58, 58, 58, 58, 58, 58, 58, 58, 58, + /* 20 */ 55, 54, 57, 56, 50, 45, 43, 42, 38, 46, + /* 30 */ 47, 52, 51, 49, 48, 53, +); const YYNOCODE = 29; const YYSTACKDEPTH = 100; const YYNSTATE = 36; @@ -343,89 +277,67 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse const YYERRORSYMBOL = 19; const YYERRSYMDT = 'yy0'; const YYFALLBACK = 0; - public static $yyFallback = array(); - - public function Trace($TraceFILE, $zTracePrompt) + static public $yyFallback = array( + ); + static function Trace($TraceFILE, $zTracePrompt) { if (!$TraceFILE) { $zTracePrompt = 0; } elseif (!$zTracePrompt) { $TraceFILE = 0; } - $this->yyTraceFILE = $TraceFILE; - $this->yyTracePrompt = $zTracePrompt; + self::$yyTraceFILE = $TraceFILE; + self::$yyTracePrompt = $zTracePrompt; } - public function PrintTrace() + static function PrintTrace() { - $this->yyTraceFILE = fopen('php://output', 'w'); - $this->yyTracePrompt = '<br>'; + self::$yyTraceFILE = fopen('php://output', 'w'); + self::$yyTracePrompt = '<br>'; } - public $yyTraceFILE; - public $yyTracePrompt; - public $yyidx; /* Index of top element in stack */ - public $yyerrcnt; /* Shifts left before out of the error */ - public $yystack = array(); /* The parser's stack */ + static public $yyTraceFILE; + static public $yyTracePrompt; + public $yyidx; /* Index of top element in stack */ + public $yyerrcnt; /* Shifts left before out of the error */ + public $yystack = array(); /* The parser's stack */ public $yyTokenName = array( - '$', 'OPENB', 'SECTION', 'CLOSEB', - 'DOT', 'ID', 'EQUAL', 'FLOAT', - 'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', - 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING', - 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', - 'start', 'global_vars', 'sections', 'var_list', - 'section', 'newline', 'var', 'value', + '$', 'OPENB', 'SECTION', 'CLOSEB', + 'DOT', 'ID', 'EQUAL', 'FLOAT', + 'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', + 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING', + 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', + 'start', 'global_vars', 'sections', 'var_list', + 'section', 'newline', 'var', 'value', ); - public static $yyRuleName = array( - /* 0 */ - "start ::= global_vars sections", - /* 1 */ - "global_vars ::= var_list", - /* 2 */ - "sections ::= sections section", - /* 3 */ - "sections ::=", - /* 4 */ - "section ::= OPENB SECTION CLOSEB newline var_list", - /* 5 */ - "section ::= OPENB DOT SECTION CLOSEB newline var_list", - /* 6 */ - "var_list ::= var_list newline", - /* 7 */ - "var_list ::= var_list var", - /* 8 */ - "var_list ::=", - /* 9 */ - "var ::= ID EQUAL value", - /* 10 */ - "value ::= FLOAT", - /* 11 */ - "value ::= INT", - /* 12 */ - "value ::= BOOL", - /* 13 */ - "value ::= SINGLE_QUOTED_STRING", - /* 14 */ - "value ::= DOUBLE_QUOTED_STRING", - /* 15 */ - "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END", - /* 16 */ - "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END", - /* 17 */ - "value ::= NAKED_STRING", - /* 18 */ - "value ::= OTHER", - /* 19 */ - "newline ::= NEWLINE", - /* 20 */ - "newline ::= COMMENTSTART NEWLINE", - /* 21 */ - "newline ::= COMMENTSTART NAKED_STRING NEWLINE", + static public $yyRuleName = array( + /* 0 */ "start ::= global_vars sections", + /* 1 */ "global_vars ::= var_list", + /* 2 */ "sections ::= sections section", + /* 3 */ "sections ::=", + /* 4 */ "section ::= OPENB SECTION CLOSEB newline var_list", + /* 5 */ "section ::= OPENB DOT SECTION CLOSEB newline var_list", + /* 6 */ "var_list ::= var_list newline", + /* 7 */ "var_list ::= var_list var", + /* 8 */ "var_list ::=", + /* 9 */ "var ::= ID EQUAL value", + /* 10 */ "value ::= FLOAT", + /* 11 */ "value ::= INT", + /* 12 */ "value ::= BOOL", + /* 13 */ "value ::= SINGLE_QUOTED_STRING", + /* 14 */ "value ::= DOUBLE_QUOTED_STRING", + /* 15 */ "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END", + /* 16 */ "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END", + /* 17 */ "value ::= NAKED_STRING", + /* 18 */ "value ::= OTHER", + /* 19 */ "newline ::= NEWLINE", + /* 20 */ "newline ::= COMMENTSTART NEWLINE", + /* 21 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE", ); - public function tokenName($tokenType) + function tokenName($tokenType) { if ($tokenType === 0) { return 'End of Input'; @@ -437,43 +349,41 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse } } - public static function yy_destructor($yymajor, $yypminor) + static function yy_destructor($yymajor, $yypminor) { switch ($yymajor) { - default: - break; /* If no destructor action specified: do nothing */ + default: break; /* If no destructor action specified: do nothing */ } } - public function yy_pop_parser_stack() + function yy_pop_parser_stack() { if (!count($this->yystack)) { return; } $yytos = array_pop($this->yystack); - if ($this->yyTraceFILE && $this->yyidx >= 0) { - fwrite($this->yyTraceFILE, - $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . - "\n"); + if (self::$yyTraceFILE && $this->yyidx >= 0) { + fwrite(self::$yyTraceFILE, + self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . + "\n"); } $yymajor = $yytos->major; self::yy_destructor($yymajor, $yytos->minor); - $this->yyidx --; - + $this->yyidx--; return $yymajor; } - public function __destruct() + function __destruct() { while ($this->yystack !== Array()) { $this->yy_pop_parser_stack(); } - if (is_resource($this->yyTraceFILE)) { - fclose($this->yyTraceFILE); + if (is_resource(self::$yyTraceFILE)) { + fclose(self::$yyTraceFILE); } } - public function yy_get_expected_tokens($token) + function yy_get_expected_tokens($token) { $state = $this->yystack[$this->yyidx]->stateno; $expected = self::$yyExpectedTokens[$state]; @@ -488,7 +398,7 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse // reduce action $done = 0; do { - if ($done ++ == 100) { + if ($done++ == 100) { $this->yyidx = $yyidx; $this->yystack = $stack; // too much recursion prevents proper detection @@ -501,18 +411,17 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse $this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno]['lhs']); if (isset(self::$yyExpectedTokens[$nextstate])) { - $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]); - if (in_array($token, - self::$yyExpectedTokens[$nextstate], true)) { + $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]); + if (in_array($token, + self::$yyExpectedTokens[$nextstate], true)) { $this->yyidx = $yyidx; $this->yystack = $stack; - return array_unique($expected); } } if ($nextstate < self::YYNSTATE) { // we need to shift a non-terminal - $this->yyidx ++; + $this->yyidx++; $x = new TPC_yyStackEntry; $x->stateno = $nextstate; $x->major = self::$yyRuleInfo[$yyruleno]['lhs']; @@ -537,13 +446,12 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse } break; } while (true); - $this->yyidx = $yyidx; - $this->yystack = $stack; - + $this->yyidx = $yyidx; + $this->yystack = $stack; return array_unique($expected); } - public function yy_is_expected_token($token) + function yy_is_expected_token($token) { if ($token === 0) { return true; // 0 is not part of this @@ -560,7 +468,7 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse // reduce action $done = 0; do { - if ($done ++ == 100) { + if ($done++ == 100) { $this->yyidx = $yyidx; $this->yystack = $stack; // too much recursion prevents proper detection @@ -573,16 +481,14 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse $this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno]['lhs']); if (isset(self::$yyExpectedTokens[$nextstate]) && - in_array($token, self::$yyExpectedTokens[$nextstate], true) - ) { + in_array($token, self::$yyExpectedTokens[$nextstate], true)) { $this->yyidx = $yyidx; $this->yystack = $stack; - return true; } if ($nextstate < self::YYNSTATE) { // we need to shift a non-terminal - $this->yyidx ++; + $this->yyidx++; $x = new TPC_yyStackEntry; $x->stateno = $nextstate; $x->major = self::$yyRuleInfo[$yyruleno]['lhs']; @@ -613,11 +519,10 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse } while (true); $this->yyidx = $yyidx; $this->yystack = $stack; - return true; } - public function yy_find_shift_action($iLookAhead) + function yy_find_shift_action($iLookAhead) { $stateno = $this->yystack[$this->yyidx]->stateno; @@ -635,27 +540,23 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse } $i += $iLookAhead; if ($i < 0 || $i >= self::YY_SZ_ACTTAB || - self::$yy_lookahead[$i] != $iLookAhead - ) { + self::$yy_lookahead[$i] != $iLookAhead) { if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) - && ($iFallback = self::$yyFallback[$iLookAhead]) != 0 - ) { - if ($this->yyTraceFILE) { - fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . + && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) { + if (self::$yyTraceFILE) { + fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iFallback] . "\n"); } - return $this->yy_find_shift_action($iFallback); } - return self::$yy_default[$stateno]; } else { return self::$yy_action[$i]; } } - public function yy_find_reduce_action($stateno, $iLookAhead) + function yy_find_reduce_action($stateno, $iLookAhead) { /* $stateno = $this->yystack[$this->yyidx]->stateno; */ @@ -671,31 +572,29 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse } $i += $iLookAhead; if ($i < 0 || $i >= self::YY_SZ_ACTTAB || - self::$yy_lookahead[$i] != $iLookAhead - ) { + self::$yy_lookahead[$i] != $iLookAhead) { return self::$yy_default[$stateno]; } else { return self::$yy_action[$i]; } } - public function yy_shift($yyNewState, $yyMajor, $yypMinor) + function yy_shift($yyNewState, $yyMajor, $yypMinor) { - $this->yyidx ++; + $this->yyidx++; if ($this->yyidx >= self::YYSTACKDEPTH) { - $this->yyidx --; - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt); + $this->yyidx--; + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt); } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } - #line 125 "smarty_internal_configfileparser.y" - - $this->internalError = true; - $this->compiler->trigger_config_file_error("Stack overflow in configfile parser"); - #line 601 "smarty_internal_configfileparser.php" +#line 125 "smarty_internal_configfileparser.y" + $this->internalError = true; + $this->compiler->trigger_config_file_error("Stack overflow in configfile parser"); +#line 593 "smarty_internal_configfileparser.php" return; } $yytos = new TPC_yyStackEntry; @@ -703,57 +602,57 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse $yytos->major = $yyMajor; $yytos->minor = $yypMinor; array_push($this->yystack, $yytos); - if ($this->yyTraceFILE && $this->yyidx > 0) { - fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, - $yyNewState); - fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt); - for ($i = 1; $i <= $this->yyidx; $i ++) { - fprintf($this->yyTraceFILE, " %s", - $this->yyTokenName[$this->yystack[$i]->major]); + if (self::$yyTraceFILE && $this->yyidx > 0) { + fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt, + $yyNewState); + fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt); + for($i = 1; $i <= $this->yyidx; $i++) { + fprintf(self::$yyTraceFILE, " %s", + $this->yyTokenName[$this->yystack[$i]->major]); } - fwrite($this->yyTraceFILE, "\n"); - } - } - - public static $yyRuleInfo = array( - array('lhs' => 20, 'rhs' => 2), - array('lhs' => 21, 'rhs' => 1), - array('lhs' => 22, 'rhs' => 2), - array('lhs' => 22, 'rhs' => 0), - array('lhs' => 24, 'rhs' => 5), - array('lhs' => 24, 'rhs' => 6), - array('lhs' => 23, 'rhs' => 2), - array('lhs' => 23, 'rhs' => 2), - array('lhs' => 23, 'rhs' => 0), - array('lhs' => 26, 'rhs' => 3), - array('lhs' => 27, 'rhs' => 1), - array('lhs' => 27, 'rhs' => 1), - array('lhs' => 27, 'rhs' => 1), - array('lhs' => 27, 'rhs' => 1), - array('lhs' => 27, 'rhs' => 1), - array('lhs' => 27, 'rhs' => 3), - array('lhs' => 27, 'rhs' => 2), - array('lhs' => 27, 'rhs' => 1), - array('lhs' => 27, 'rhs' => 1), - array('lhs' => 25, 'rhs' => 1), - array('lhs' => 25, 'rhs' => 2), - array('lhs' => 25, 'rhs' => 3), + fwrite(self::$yyTraceFILE,"\n"); + } + } + + static public $yyRuleInfo = array( + array( 'lhs' => 20, 'rhs' => 2 ), + array( 'lhs' => 21, 'rhs' => 1 ), + array( 'lhs' => 22, 'rhs' => 2 ), + array( 'lhs' => 22, 'rhs' => 0 ), + array( 'lhs' => 24, 'rhs' => 5 ), + array( 'lhs' => 24, 'rhs' => 6 ), + array( 'lhs' => 23, 'rhs' => 2 ), + array( 'lhs' => 23, 'rhs' => 2 ), + array( 'lhs' => 23, 'rhs' => 0 ), + array( 'lhs' => 26, 'rhs' => 3 ), + array( 'lhs' => 27, 'rhs' => 1 ), + array( 'lhs' => 27, 'rhs' => 1 ), + array( 'lhs' => 27, 'rhs' => 1 ), + array( 'lhs' => 27, 'rhs' => 1 ), + array( 'lhs' => 27, 'rhs' => 1 ), + array( 'lhs' => 27, 'rhs' => 3 ), + array( 'lhs' => 27, 'rhs' => 2 ), + array( 'lhs' => 27, 'rhs' => 1 ), + array( 'lhs' => 27, 'rhs' => 1 ), + array( 'lhs' => 25, 'rhs' => 1 ), + array( 'lhs' => 25, 'rhs' => 2 ), + array( 'lhs' => 25, 'rhs' => 3 ), ); - public static $yyReduceMap = array( - 0 => 0, - 2 => 0, - 3 => 0, + static public $yyReduceMap = array( + 0 => 0, + 2 => 0, + 3 => 0, 19 => 0, 20 => 0, 21 => 0, - 1 => 1, - 4 => 4, - 5 => 5, - 6 => 6, - 7 => 7, - 8 => 8, - 9 => 9, + 1 => 1, + 4 => 4, + 5 => 5, + 6 => 6, + 7 => 7, + 8 => 8, + 9 => 9, 10 => 10, 11 => 11, 12 => 12, @@ -764,121 +663,101 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse 17 => 17, 18 => 17, ); - - #line 131 "smarty_internal_configfileparser.y" - function yy_r0() - { - $this->_retvalue = null; - } - #line 675 "smarty_internal_configfileparser.php" - #line 136 "smarty_internal_configfileparser.y" - function yy_r1() - { - $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); - $this->_retvalue = null; - } - #line 680 "smarty_internal_configfileparser.php" - #line 149 "smarty_internal_configfileparser.y" - function yy_r4() - { - $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor); - $this->_retvalue = null; - } - #line 686 "smarty_internal_configfileparser.php" - #line 154 "smarty_internal_configfileparser.y" - function yy_r5() - { - if ($this->smarty->config_read_hidden) { - $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor); - } - $this->_retvalue = null; - } - #line 694 "smarty_internal_configfileparser.php" - #line 162 "smarty_internal_configfileparser.y" - function yy_r6() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor; - } - #line 699 "smarty_internal_configfileparser.php" - #line 166 "smarty_internal_configfileparser.y" - function yy_r7() - { - $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, Array($this->yystack[$this->yyidx + 0]->minor)); - } - #line 704 "smarty_internal_configfileparser.php" - #line 170 "smarty_internal_configfileparser.y" - function yy_r8() - { - $this->_retvalue = Array(); - } - #line 709 "smarty_internal_configfileparser.php" - #line 176 "smarty_internal_configfileparser.y" - function yy_r9() - { - $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + - 2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor); - } - #line 714 "smarty_internal_configfileparser.php" - #line 181 "smarty_internal_configfileparser.y" - function yy_r10() - { - $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor; - } - #line 719 "smarty_internal_configfileparser.php" - #line 185 "smarty_internal_configfileparser.y" - function yy_r11() - { - $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor; - } - #line 724 "smarty_internal_configfileparser.php" - #line 189 "smarty_internal_configfileparser.y" - function yy_r12() - { - $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor); - } - #line 729 "smarty_internal_configfileparser.php" - #line 193 "smarty_internal_configfileparser.y" - function yy_r13() - { - $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor); - } - #line 734 "smarty_internal_configfileparser.php" - #line 197 "smarty_internal_configfileparser.y" - function yy_r14() - { - $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); - } - #line 739 "smarty_internal_configfileparser.php" - #line 201 "smarty_internal_configfileparser.y" - function yy_r15() - { - $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + - 1]->minor); - } - #line 744 "smarty_internal_configfileparser.php" - #line 205 "smarty_internal_configfileparser.y" - function yy_r16() - { - $this->_retvalue = ''; - } - #line 749 "smarty_internal_configfileparser.php" - #line 209 "smarty_internal_configfileparser.y" - function yy_r17() - { - $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; - } - - #line 754 "smarty_internal_configfileparser.php" +#line 131 "smarty_internal_configfileparser.y" + function yy_r0(){ + $this->_retvalue = null; + } +#line 666 "smarty_internal_configfileparser.php" +#line 136 "smarty_internal_configfileparser.y" + function yy_r1(){ + $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null; + } +#line 671 "smarty_internal_configfileparser.php" +#line 149 "smarty_internal_configfileparser.y" + function yy_r4(){ + $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); + $this->_retvalue = null; + } +#line 677 "smarty_internal_configfileparser.php" +#line 154 "smarty_internal_configfileparser.y" + function yy_r5(){ + if ($this->smarty->config_read_hidden) { + $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); + } + $this->_retvalue = null; + } +#line 685 "smarty_internal_configfileparser.php" +#line 162 "smarty_internal_configfileparser.y" + function yy_r6(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; + } +#line 690 "smarty_internal_configfileparser.php" +#line 166 "smarty_internal_configfileparser.y" + function yy_r7(){ + $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor)); + } +#line 695 "smarty_internal_configfileparser.php" +#line 170 "smarty_internal_configfileparser.y" + function yy_r8(){ + $this->_retvalue = Array(); + } +#line 700 "smarty_internal_configfileparser.php" +#line 176 "smarty_internal_configfileparser.y" + function yy_r9(){ + $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor); + } +#line 705 "smarty_internal_configfileparser.php" +#line 181 "smarty_internal_configfileparser.y" + function yy_r10(){ + $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor; + } +#line 710 "smarty_internal_configfileparser.php" +#line 185 "smarty_internal_configfileparser.y" + function yy_r11(){ + $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor; + } +#line 715 "smarty_internal_configfileparser.php" +#line 189 "smarty_internal_configfileparser.y" + function yy_r12(){ + $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor); + } +#line 720 "smarty_internal_configfileparser.php" +#line 193 "smarty_internal_configfileparser.y" + function yy_r13(){ + $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor); + } +#line 725 "smarty_internal_configfileparser.php" +#line 197 "smarty_internal_configfileparser.y" + function yy_r14(){ + $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); + } +#line 730 "smarty_internal_configfileparser.php" +#line 201 "smarty_internal_configfileparser.y" + function yy_r15(){ + $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor); + } +#line 735 "smarty_internal_configfileparser.php" +#line 205 "smarty_internal_configfileparser.y" + function yy_r16(){ + $this->_retvalue = ''; + } +#line 740 "smarty_internal_configfileparser.php" +#line 209 "smarty_internal_configfileparser.y" + function yy_r17(){ + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; + } +#line 745 "smarty_internal_configfileparser.php" private $_retvalue; - public function yy_reduce($yyruleno) + function yy_reduce($yyruleno) { $yymsp = $this->yystack[$this->yyidx]; - if ($this->yyTraceFILE && $yyruleno >= 0 - && $yyruleno < count(self::$yyRuleName) - ) { - fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", - $this->yyTracePrompt, $yyruleno, - self::$yyRuleName[$yyruleno]); + if (self::$yyTraceFILE && $yyruleno >= 0 + && $yyruleno < count(self::$yyRuleName)) { + fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n", + self::$yyTracePrompt, $yyruleno, + self::$yyRuleName[$yyruleno]); } $this->_retvalue = $yy_lefthand_side = null; @@ -891,14 +770,14 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse $yygoto = self::$yyRuleInfo[$yyruleno]['lhs']; $yysize = self::$yyRuleInfo[$yyruleno]['rhs']; $this->yyidx -= $yysize; - for ($i = $yysize; $i; $i --) { + for($i = $yysize; $i; $i--) { // pop all of the right-hand side parameters array_pop($this->yystack); } $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto); if ($yyact < self::YYNSTATE) { - if (!$this->yyTraceFILE && $yysize) { - $this->yyidx ++; + if (!self::$yyTraceFILE && $yysize) { + $this->yyidx++; $x = new TPC_yyStackEntry; $x->stateno = $yyact; $x->major = $yygoto; @@ -912,74 +791,73 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse } } - public function yy_parse_failed() + function yy_parse_failed() { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt); + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt); } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } } - public function yy_syntax_error($yymajor, $TOKEN) + function yy_syntax_error($yymajor, $TOKEN) { - #line 118 "smarty_internal_configfileparser.y" +#line 118 "smarty_internal_configfileparser.y" - $this->internalError = true; - $this->yymajor = $yymajor; - $this->compiler->trigger_config_file_error(); - #line 816 "smarty_internal_configfileparser.php" + $this->internalError = true; + $this->yymajor = $yymajor; + $this->compiler->trigger_config_file_error(); +#line 808 "smarty_internal_configfileparser.php" } - public function yy_accept() + function yy_accept() { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt); + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt); } while ($this->yyidx >= 0) { $stack = $this->yy_pop_parser_stack(); } - #line 110 "smarty_internal_configfileparser.y" +#line 110 "smarty_internal_configfileparser.y" - $this->successful = !$this->internalError; - $this->internalError = false; - $this->retvalue = $this->_retvalue; - //echo $this->retvalue."\n\n"; - #line 833 "smarty_internal_configfileparser.php" + $this->successful = !$this->internalError; + $this->internalError = false; + $this->retvalue = $this->_retvalue; + //echo $this->retvalue."\n\n"; +#line 826 "smarty_internal_configfileparser.php" } - public function doParse($yymajor, $yytokenvalue) + function doParse($yymajor, $yytokenvalue) { - $yyerrorhit = 0; /* True if yymajor has invoked an error */ + $yyerrorhit = 0; /* True if yymajor has invoked an error */ if ($this->yyidx === null || $this->yyidx < 0) { $this->yyidx = 0; - $this->yyerrcnt = - 1; + $this->yyerrcnt = -1; $x = new TPC_yyStackEntry; $x->stateno = 0; $x->major = 0; $this->yystack = array(); array_push($this->yystack, $x); } - $yyendofinput = ($yymajor == 0); + $yyendofinput = ($yymajor==0); - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sInput %s\n", - $this->yyTracePrompt, $this->yyTokenName[$yymajor]); + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sInput %s\n", + self::$yyTracePrompt, $this->yyTokenName[$yymajor]); } do { $yyact = $this->yy_find_shift_action($yymajor); if ($yymajor < self::YYERRORSYMBOL && - !$this->yy_is_expected_token($yymajor) - ) { + !$this->yy_is_expected_token($yymajor)) { // force a syntax error $yyact = self::YY_ERROR_ACTION; } if ($yyact < self::YYNSTATE) { $this->yy_shift($yyact, $yymajor, $yytokenvalue); - $this->yyerrcnt --; + $this->yyerrcnt--; if ($yyendofinput && $this->yyidx >= 0) { $yymajor = 0; } else { @@ -988,30 +866,30 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse } elseif ($yyact < self::YYNSTATE + self::YYNRULE) { $this->yy_reduce($yyact - self::YYNSTATE); } elseif ($yyact == self::YY_ERROR_ACTION) { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sSyntax Error!\n", - $this->yyTracePrompt); + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sSyntax Error!\n", + self::$yyTracePrompt); } if (self::YYERRORSYMBOL) { if ($this->yyerrcnt < 0) { $this->yy_syntax_error($yymajor, $yytokenvalue); } $yymx = $this->yystack[$this->yyidx]->major; - if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", - $this->yyTracePrompt, $this->yyTokenName[$yymajor]); + if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){ + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n", + self::$yyTracePrompt, $this->yyTokenName[$yymajor]); } $this->yy_destructor($yymajor, $yytokenvalue); $yymajor = self::YYNOCODE; } else { while ($this->yyidx >= 0 && - $yymx != self::YYERRORSYMBOL && - ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE - ) { + $yymx != self::YYERRORSYMBOL && + ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE + ){ $this->yy_pop_parser_stack(); } - if ($this->yyidx < 0 || $yymajor == 0) { + if ($this->yyidx < 0 || $yymajor==0) { $this->yy_destructor($yymajor, $yytokenvalue); $this->yy_parse_failed(); $yymajor = self::YYNOCODE; @@ -1040,3 +918,4 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0); } } +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_data.php b/Widgets/smarty/libs/sysplugins/smarty_internal_data.php index 9e16f10c..5baf3b76 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_data.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_data.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Data - * This file contains the basic classes and methods for template and variable creation * - * @package Smarty + * This file contains the basic classes and methodes for template and variable creation + * + * @package Smarty * @subpackage Template - * @author Uwe Tews + * @author Uwe Tews */ /** - * Base class with template and variable methods + * Base class with template and variable methodes * - * @package Smarty + * @package Smarty * @subpackage Template */ -class Smarty_Internal_Data -{ +class Smarty_Internal_Data { + /** * name of class used for templates * @@ -44,10 +45,10 @@ class Smarty_Internal_Data /** * assigns a Smarty variable * - * @param array|string $tpl_var the template variable name(s) - * @param mixed $value the value to assign - * @param boolean $nocache if true any output of this variable will be not cached - * + * @param array|string $tpl_var the template variable name(s) + * @param mixed $value the value to assign + * @param boolean $nocache if true any output of this variable will be not cached + * @param boolean $scope the scope the variable will have (local,parent or root) * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function assign($tpl_var, $value = null, $nocache = false) @@ -70,40 +71,32 @@ class Smarty_Internal_Data /** * assigns a global Smarty variable * - * @param string $varname the global variable name - * @param mixed $value the value to assign - * @param boolean $nocache if true any output of this variable will be not cached - * + * @param string $varname the global variable name + * @param mixed $value the value to assign + * @param boolean $nocache if true any output of this variable will be not cached * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function assignGlobal($varname, $value = null, $nocache = false) { if ($varname != '') { Smarty::$global_tpl_vars[$varname] = new Smarty_variable($value, $nocache); - $ptr = $this; - while ($ptr instanceof Smarty_Internal_Template) { - $ptr->tpl_vars[$varname] = clone Smarty::$global_tpl_vars[$varname]; - $ptr = $ptr->parent; - } } return $this; } - /** * assigns values to template variables by reference * - * @param string $tpl_var the template variable name - * @param $value - * @param boolean $nocache if true any output of this variable will be not cached - * + * @param string $tpl_var the template variable name + * @param mixed $ &$value the referenced value to assign + * @param boolean $nocache if true any output of this variable will be not cached * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function assignByRef($tpl_var, &$value, $nocache = false) { if ($tpl_var != '') { $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache); - $this->tpl_vars[$tpl_var]->value = & $value; + $this->tpl_vars[$tpl_var]->value = &$value; } return $this; @@ -112,11 +105,10 @@ class Smarty_Internal_Data /** * appends values to template variables * - * @param array|string $tpl_var the template variable name(s) - * @param mixed $value the value to append - * @param boolean $merge flag if array elements shall be merged - * @param boolean $nocache if true any output of this variable will be not cached - * + * @param array|string $tpl_var the template variable name(s) + * @param mixed $value the value to append + * @param boolean $merge flag if array elements shall be merged + * @param boolean $nocache if true any output of this variable will be not cached * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function append($tpl_var, $value = null, $merge = false, $nocache = false) @@ -137,7 +129,7 @@ class Smarty_Internal_Data settype($this->tpl_vars[$_key]->value, 'array'); } if ($merge && is_array($_val)) { - foreach ($_val as $_mkey => $_mval) { + foreach($_val as $_mkey => $_mval) { $this->tpl_vars[$_key]->value[$_mkey] = $_mval; } } else { @@ -159,7 +151,7 @@ class Smarty_Internal_Data settype($this->tpl_vars[$tpl_var]->value, 'array'); } if ($merge && is_array($value)) { - foreach ($value as $_mkey => $_mval) { + foreach($value as $_mkey => $_mval) { $this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval; } } else { @@ -174,10 +166,9 @@ class Smarty_Internal_Data /** * appends values to template variables by reference * - * @param string $tpl_var the template variable name - * @param mixed &$value the referenced value to append - * @param boolean $merge flag if array elements shall be merged - * + * @param string $tpl_var the template variable name + * @param mixed &$value the referenced value to append + * @param boolean $merge flag if array elements shall be merged * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function appendByRef($tpl_var, &$value, $merge = false) @@ -190,11 +181,11 @@ class Smarty_Internal_Data settype($this->tpl_vars[$tpl_var]->value, 'array'); } if ($merge && is_array($value)) { - foreach ($value as $_key => $_val) { - $this->tpl_vars[$tpl_var]->value[$_key] = & $value[$_key]; + foreach($value as $_key => $_val) { + $this->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key]; } } else { - $this->tpl_vars[$tpl_var]->value[] = & $value; + $this->tpl_vars[$tpl_var]->value[] = &$value; } } @@ -204,11 +195,10 @@ class Smarty_Internal_Data /** * Returns a single or all template variables * - * @param string $varname variable name or null - * @param object $_ptr optional pointer to data object - * @param boolean $search_parents include parent templates? - * - * @return string variable value or or array of variables + * @param string $varname variable name or null + * @param string $_ptr optional pointer to data object + * @param boolean $search_parents include parent templates? + * @return string variable value or or array of variables */ public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true) { @@ -223,8 +213,7 @@ class Smarty_Internal_Data $_result = array(); if ($_ptr === null) { $_ptr = $this; - } - while ($_ptr !== null) { + } while ($_ptr !== null) { foreach ($_ptr->tpl_vars AS $key => $var) { if (!array_key_exists($key, $_result)) { $_result[$key] = $var->value; @@ -244,7 +233,6 @@ class Smarty_Internal_Data } } } - return $_result; } } @@ -252,8 +240,7 @@ class Smarty_Internal_Data /** * clear the given assigned template variable. * - * @param string|array $tpl_var the template variable(s) to clear - * + * @param string|array $tpl_var the template variable(s) to clear * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function clearAssign($tpl_var) @@ -271,22 +258,19 @@ class Smarty_Internal_Data /** * clear all the assigned template variables. - * * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function clearAllAssign() { $this->tpl_vars = array(); - return $this; } /** * load a config file, optionally load just selected sections * - * @param string $config_file filename - * @param mixed $sections array of section names, single section or null - * + * @param string $config_file filename + * @param mixed $sections array of section names, single section or null * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function configLoad($config_file, $sections = null) @@ -294,26 +278,22 @@ class Smarty_Internal_Data // load Config class $config = new Smarty_Internal_Config($config_file, $this->smarty, $this); $config->loadConfigVars($sections); - return $this; } /** * gets the object of a Smarty variable * - * @param string $variable the name of the Smarty variable - * @param object $_ptr optional pointer to data object - * @param boolean $search_parents search also in parent data - * @param bool $error_enable - * - * @return object the object of the variable + * @param string $variable the name of the Smarty variable + * @param object $_ptr optional pointer to data object + * @param boolean $search_parents search also in parent data + * @return object the object of the variable */ public function getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true) { if ($_ptr === null) { $_ptr = $this; - } - while ($_ptr !== null) { + } while ($_ptr !== null) { if (isset($_ptr->tpl_vars[$variable])) { // found it, return it return $_ptr->tpl_vars[$variable]; @@ -333,17 +313,14 @@ class Smarty_Internal_Data // force a notice $x = $$variable; } - return new Undefined_Smarty_Variable; } /** * gets a config variable * - * @param string $variable the name of the config variable - * @param bool $error_enable - * - * @return mixed the value of the config variable + * @param string $variable the name of the config variable + * @return mixed the value of the config variable */ public function getConfigVariable($variable, $error_enable = true) { @@ -360,28 +337,24 @@ class Smarty_Internal_Data // force a notice $x = $$variable; } - return null; } /** * gets a stream variable * - * @param string $variable the stream of the variable - * - * @throws SmartyException - * @return mixed the value of the stream variable + * @param string $variable the stream of the variable + * @return mixed the value of the stream variable */ public function getStreamVariable($variable) { $_result = ''; $fp = fopen($variable, 'r+'); if ($fp) { - while (!feof($fp) && ($current_line = fgets($fp)) !== false) { + while (!feof($fp) && ($current_line = fgets($fp)) !== false ) { $_result .= $current_line; } fclose($fp); - return $_result; } @@ -395,9 +368,7 @@ class Smarty_Internal_Data /** * Returns a single or all config variables * - * @param string $varname variable name or null - * @param bool $search_parents - * + * @param string $varname variable name or null * @return string variable value or or array of variables */ public function getConfigVars($varname = null, $search_parents = true) @@ -412,7 +383,7 @@ class Smarty_Internal_Data } else { $var_array = array_merge($_ptr->config_vars, $var_array); } - // not found, try at parent + // not found, try at parent if ($search_parents) { $_ptr = $_ptr->parent; } else { @@ -429,8 +400,7 @@ class Smarty_Internal_Data /** * Deassigns a single or all config variables * - * @param string $varname variable name or null - * + * @param string $varname variable name or null * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function clearConfig($varname = null) @@ -440,20 +410,21 @@ class Smarty_Internal_Data } else { $this->config_vars = array(); } - return $this; } + } /** * class for the Smarty data object + * * The Smarty data object will hold Smarty variables in the current scope * - * @package Smarty + * @package Smarty * @subpackage Template */ -class Smarty_Data extends Smarty_Internal_Data -{ +class Smarty_Data extends Smarty_Internal_Data { + /** * Smarty object * @@ -464,12 +435,10 @@ class Smarty_Data extends Smarty_Internal_Data /** * create Smarty data object * - * @param Smarty|array $_parent parent template - * @param Smarty|Smarty_Internal_Template $smarty global smarty instance - * - * @throws SmartyException + * @param Smarty|array $_parent parent template + * @param Smarty $smarty global smarty instance */ - public function __construct($_parent = null, $smarty = null) + public function __construct ($_parent = null, $smarty = null) { $this->smarty = $smarty; if (is_object($_parent)) { @@ -484,17 +453,19 @@ class Smarty_Data extends Smarty_Internal_Data throw new SmartyException("Wrong type for template variables"); } } + } /** * class for the Smarty variable object + * * This class defines the Smarty variable object * - * @package Smarty + * @package Smarty * @subpackage Template */ -class Smarty_Variable -{ +class Smarty_Variable { + /** * template variable * @@ -537,22 +508,23 @@ class Smarty_Variable { return (string) $this->value; } + } /** * class for undefined variable object + * * This class defines an object for undefined variable handling * - * @package Smarty + * @package Smarty * @subpackage Template */ -class Undefined_Smarty_Variable -{ +class Undefined_Smarty_Variable { + /** * Returns FALSE for 'nocache' and NULL otherwise. * - * @param string $name - * + * @param string $name * @return bool */ public function __get($name) @@ -573,4 +545,7 @@ class Undefined_Smarty_Variable { return ""; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_debug.php b/Widgets/smarty/libs/sysplugins/smarty_internal_debug.php index e5175d51..2aea13f3 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_debug.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_debug.php @@ -1,21 +1,22 @@ <?php /** * Smarty Internal Plugin Debug + * * Class to collect data for the Smarty Debugging Consol * - * @package Smarty + * @package Smarty * @subpackage Debug - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Debug Class * - * @package Smarty + * @package Smarty * @subpackage Debug */ -class Smarty_Internal_Debug extends Smarty_Internal_Data -{ +class Smarty_Internal_Debug extends Smarty_Internal_Data { + /** * template data * @@ -24,52 +25,13 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data public static $template_data = array(); /** - * List of uid's which shall be ignored - * - * @var array - */ - public static $ignore_uid = array(); - - /** - * Ignore template - * - * @param object $template - */ - public static function ignore($template) - { - // calculate Uid if not already done - if ($template->source->uid == '') { - $template->source->filepath; - } - self::$ignore_uid[$template->source->uid] = true; - } - - /** * Start logging of compile time * * @param object $template */ public static function start_compile($template) { - static $_is_stringy = array('string' => true, 'eval' => true); - if (!empty($template->compiler->trace_uid)) { - $key = $template->compiler->trace_uid; - if (!isset(self::$template_data[$key])) { - if (isset($_is_stringy[$template->source->type])) { - self::$template_data[$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\''; - } else { - self::$template_data[$key]['name'] = $template->source->filepath; - } - self::$template_data[$key]['compile_time'] = 0; - self::$template_data[$key]['render_time'] = 0; - self::$template_data[$key]['cache_time'] = 0; - } - } else { - if (isset(self::$ignore_uid[$template->source->uid])) { - return; - } - $key = self::get_key($template); - } + $key = self::get_key($template); self::$template_data[$key]['start_time'] = microtime(true); } @@ -80,15 +42,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data */ public static function end_compile($template) { - if (!empty($template->compiler->trace_uid)) { - $key = $template->compiler->trace_uid; - } else { - if (isset(self::$ignore_uid[$template->source->uid])) { - return; - } - - $key = self::get_key($template); - } + $key = self::get_key($template); self::$template_data[$key]['compile_time'] += microtime(true) - self::$template_data[$key]['start_time']; } @@ -161,7 +115,6 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data $smarty->left_delimiter = '{'; $smarty->right_delimiter = '}'; $smarty->debugging = false; - $smarty->debugging_ctrl = 'NONE'; $smarty->force_compile = false; $_template = new Smarty_Internal_Template($smarty->debug_tpl, $smarty); $_template->caching = false; @@ -185,8 +138,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data /** * Recursively gets variables from all template/data scopes * - * @param Smarty_Internal_Template|Smarty_Data $obj object to debug - * + * @param Smarty_Internal_Template|Smarty_Data $obj object to debug * @return StdClass */ public static function get_debug_vars($obj) @@ -217,16 +169,14 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data } } } - return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars); } /** * Return key into $template_data for template * - * @param object $template template object - * - * @return string key into $template_data + * @param object $template template object + * @return string key into $template_data */ private static function get_key($template) { @@ -240,15 +190,17 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data return $key; } else { if (isset($_is_stringy[$template->source->type])) { - self::$template_data[$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\''; + self::$template_data[$key]['name'] = '\''.substr($template->source->name,0,25).'...\''; } else { self::$template_data[$key]['name'] = $template->source->filepath; } self::$template_data[$key]['compile_time'] = 0; self::$template_data[$key]['render_time'] = 0; self::$template_data[$key]['cache_time'] = 0; - return $key; } } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_filter_handler.php b/Widgets/smarty/libs/sysplugins/smarty_internal_filter_handler.php index 4f0f3981..c9370e1a 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_filter_handler.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_filter_handler.php @@ -1,41 +1,41 @@ <?php /** * Smarty Internal Plugin Filter Handler + * * Smarty filter handler class * - * @package Smarty + * @package Smarty * @subpackage PluginsInternal - * @author Uwe Tews + * @author Uwe Tews */ /** * Class for filter processing * - * @package Smarty + * @package Smarty * @subpackage PluginsInternal */ -class Smarty_Internal_Filter_Handler -{ +class Smarty_Internal_Filter_Handler { + /** * Run filters over content + * * The filters will be lazy loaded if required * class name format: Smarty_FilterType_FilterName * plugin filename format: filtertype.filtername.php * Smarty2 filter plugins could be used * - * @param string $type the type of filter ('pre','post','output') which shall run - * @param string $content the content which shall be processed by the filters - * @param Smarty_Internal_Template $template template object - * - * @throws SmartyException - * @return string the filtered content + * @param string $type the type of filter ('pre','post','output') which shall run + * @param string $content the content which shall be processed by the filters + * @param Smarty_Internal_Template $template template object + * @return string the filtered content */ public static function runFilter($type, $content, Smarty_Internal_Template $template) { $output = $content; // loop over autoload filters of specified type if (!empty($template->smarty->autoload_filters[$type])) { - foreach ((array) $template->smarty->autoload_filters[$type] as $name) { + foreach ((array)$template->smarty->autoload_filters[$type] as $name) { $plugin_name = "Smarty_{$type}filter_{$name}"; if ($template->smarty->loadPlugin($plugin_name)) { if (function_exists($plugin_name)) { @@ -64,4 +64,7 @@ class Smarty_Internal_Filter_Handler // return filtered output return $output; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_function_call_handler.php b/Widgets/smarty/libs/sysplugins/smarty_internal_function_call_handler.php index a81ff728..fa4b43b2 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_function_call_handler.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_function_call_handler.php @@ -2,28 +2,28 @@ /** * Smarty Internal Plugin Function Call Handler * - * @package Smarty + * @package Smarty * @subpackage PluginsInternal - * @author Uwe Tews + * @author Uwe Tews */ /** * This class does call function defined with the {function} tag * - * @package Smarty + * @package Smarty * @subpackage PluginsInternal */ -class Smarty_Internal_Function_Call_Handler -{ +class Smarty_Internal_Function_Call_Handler { + /** * This function handles calls to template functions defined by {function} * It does create a PHP function at the first call * - * @param string $_name template function name - * @param Smarty_Internal_Template $_template template object - * @param array $_params Smarty variables passed as call parameter - * @param string $_hash nocache hash value - * @param bool $_nocache nocache flag + * @param string $_name template function name + * @param Smarty_Internal_Template $_template template object + * @param array $_params Smarty variables passed as call parameter + * @param string $_hash nocache hash value + * @param bool $_nocache nocache flag */ public static function call($_name, Smarty_Internal_Template $_template, $_params, $_hash, $_nocache) { @@ -39,7 +39,7 @@ class Smarty_Internal_Function_Call_Handler foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>"; if ($_nocache) { $_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!", - "!\\\'!"), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']); + "!\\\'!"), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']); $_template->smarty->template_functions[$_name]['called_nocache'] = true; } else { $_code .= preg_replace("/{$_template->smarty->template_functions[$_name]['nocache_hash']}/", $_template->properties['nocache_hash'], $_template->smarty->template_functions[$_name]['compiled']); @@ -49,4 +49,7 @@ class Smarty_Internal_Function_Call_Handler } $_function($_template, $_params); } + } + +?> diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_get_include_path.php b/Widgets/smarty/libs/sysplugins/smarty_internal_get_include_path.php index d46ca702..0f572ec6 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_get_include_path.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_get_include_path.php @@ -2,36 +2,30 @@ /** * Smarty read include path plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsInternal - * @author Monte Ohrt + * @author Monte Ohrt */ /** * Smarty Internal Read Include Path Class * - * @package Smarty + * @package Smarty * @subpackage PluginsInternal */ -class Smarty_Internal_Get_Include_Path -{ +class Smarty_Internal_Get_Include_Path { + /** * Return full file path from PHP include_path * - * @param string $filepath filepath - * + * @param string $filepath filepath * @return string|boolean full filepath or false */ public static function getIncludePath($filepath) { static $_include_path = null; - if (function_exists('stream_resolve_include_path')) { - // available since PHP 5.3.2 - return stream_resolve_include_path($filepath); - } - - if ($_include_path === null) { + if ($_path_array === null) { $_include_path = explode(PATH_SEPARATOR, get_include_path()); } @@ -40,7 +34,10 @@ class Smarty_Internal_Get_Include_Path return $_path . DS . $filepath; } } - + return false; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_nocache_insert.php b/Widgets/smarty/libs/sysplugins/smarty_internal_nocache_insert.php index 0d2facfe..64a2b1e1 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_nocache_insert.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_nocache_insert.php @@ -1,31 +1,31 @@ <?php /** * Smarty Internal Plugin Nocache Insert + * * Compiles the {insert} tag into the cache file * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Insert Class * - * @package Smarty + * @package Smarty * @subpackage Compiler */ -class Smarty_Internal_Nocache_Insert -{ +class Smarty_Internal_Nocache_Insert { + /** * Compiles code for the {insert} tag into cache file * - * @param string $_function insert function name - * @param array $_attr array with parameter - * @param Smarty_Internal_Template $_template template object - * @param string $_script script name to load or 'null' - * @param string $_assign optional variable name - * - * @return string compiled code + * @param string $_function insert function name + * @param array $_attr array with parameter + * @param Smarty_Internal_Template $_template template object + * @param string $_script script name to load or 'null' + * @param string $_assign optional variable name + * @return string compiled code */ public static function compile($_function, $_attr, $_template, $_script, $_assign = null) { @@ -45,7 +45,9 @@ class Smarty_Internal_Nocache_Insert while ($_tpl->parent instanceof Smarty_Internal_Template) { $_tpl = $_tpl->parent; } - return "/*%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/"; } + } + +?> diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_parsetree.php b/Widgets/smarty/libs/sysplugins/smarty_internal_parsetree.php index 18667102..99f4c656 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_parsetree.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_parsetree.php @@ -1,61 +1,53 @@ <?php /** * Smarty Internal Plugin Templateparser Parsetrees + * * These are classes to build parsetrees in the template parser * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Thue Kristensen - * @author Uwe Tews + * @author Thue Kristensen + * @author Uwe Tews */ /** - * @package Smarty + * @package Smarty * @subpackage Compiler * @ignore */ -abstract class _smarty_parsetree -{ +abstract class _smarty_parsetree { + /** * Parser object - * * @var object */ public $parser; /** * Buffer content - * * @var mixed */ public $data; /** - * Subtree array - * - * @var array - */ - public $subtrees = array(); - - /** * Return buffer * - * @return string buffer content + * @return string buffer content */ abstract public function to_smarty_php(); + } /** * A complete smarty tag. * - * @package Smarty + * @package Smarty * @subpackage Compiler * @ignore */ -class _smarty_tag extends _smarty_parsetree -{ +class _smarty_tag extends _smarty_parsetree { + /** * Saved block nesting level - * * @var int */ public $saved_block_nesting; @@ -63,8 +55,8 @@ class _smarty_tag extends _smarty_parsetree /** * Create parse tree buffer for Smarty tag * - * @param object $parser parser object - * @param string $data content + * @param object $parser parser object + * @param string $data content */ public function __construct($parser, $data) { @@ -76,7 +68,7 @@ class _smarty_tag extends _smarty_parsetree /** * Return buffer content * - * @return string content + * @return string content */ public function to_smarty_php() { @@ -84,33 +76,34 @@ class _smarty_tag extends _smarty_parsetree } /** - * Return complied code that loads the evaluated output of buffer content into a temporary variable + * Return complied code that loads the evaluated outout of buffer content into a temporary variable * * @return string template code */ public function assign_to_var() { - $var = sprintf('$_tmp%d', ++Smarty_Internal_Templateparser::$prefix_number); - $this->parser->compiler->prefix_code[] = sprintf("<?php ob_start();\n%s\n%s=ob_get_clean();?>", preg_replace(array('/^\s*<\?php\s+/','/\s*\?>\s*$/'), '', $this->data), $var); - + $var = sprintf('$_tmp%d', ++$this->parser->prefix_number); + $this->parser->compiler->prefix_code[] = sprintf('<?php ob_start();?>%s<?php %s=ob_get_clean();?>', $this->data, $var); return $var; } + } /** * Code fragment inside a tag. * - * @package Smarty + * @package Smarty * @subpackage Compiler * @ignore */ -class _smarty_code extends _smarty_parsetree -{ +class _smarty_code extends _smarty_parsetree { + + /** * Create parse tree buffer for code fragment * - * @param object $parser parser object - * @param string $data content + * @param object $parser parser object + * @param string $data content */ public function __construct($parser, $data) { @@ -121,28 +114,29 @@ class _smarty_code extends _smarty_parsetree /** * Return buffer content in parentheses * - * @return string content + * @return string content */ public function to_smarty_php() { return sprintf("(%s)", $this->data); } + } /** * Double quoted string inside a tag. * - * @package Smarty + * @package Smarty * @subpackage Compiler * @ignore */ -class _smarty_doublequoted extends _smarty_parsetree -{ +class _smarty_doublequoted extends _smarty_parsetree { + /** * Create parse tree buffer for double quoted string subtrees * - * @param object $parser parser object - * @param _smarty_parsetree $subtree parsetree buffer + * @param object $parser parser object + * @param _smarty_parsetree $subtree parsetree buffer */ public function __construct($parser, _smarty_parsetree $subtree) { @@ -156,7 +150,7 @@ class _smarty_doublequoted extends _smarty_parsetree /** * Append buffer to subtree * - * @param _smarty_parsetree $subtree parsetree buffer + * @param _smarty_parsetree $subtree parsetree buffer */ public function append_subtree(_smarty_parsetree $subtree) { @@ -180,7 +174,7 @@ class _smarty_doublequoted extends _smarty_parsetree /** * Merge subtree buffer content together * - * @return string compiled template code + * @return string compiled template code */ public function to_smarty_php() { @@ -201,25 +195,26 @@ class _smarty_doublequoted extends _smarty_parsetree $this->parser->compiler->has_variable_string = true; } } - return $code; } + } /** * Raw chars as part of a double quoted string. * - * @package Smarty + * @package Smarty * @subpackage Compiler * @ignore */ -class _smarty_dq_content extends _smarty_parsetree -{ +class _smarty_dq_content extends _smarty_parsetree { + + /** * Create parse tree buffer with string content * - * @param object $parser parser object - * @param string $data string section + * @param object $parser parser object + * @param string $data string section */ public function __construct($parser, $data) { @@ -236,17 +231,18 @@ class _smarty_dq_content extends _smarty_parsetree { return '"' . $this->data . '"'; } + } /** * Template element * - * @package Smarty + * @package Smarty * @subpackage Compiler * @ignore */ -class _smarty_template_buffer extends _smarty_parsetree -{ +class _smarty_template_buffer extends _smarty_parsetree { + /** * Array of template elements * @@ -257,7 +253,7 @@ class _smarty_template_buffer extends _smarty_parsetree /** * Create root of parse tree for template elements * - * @param object $parser parse object + * @param object $parser parse object */ public function __construct($parser) { @@ -271,9 +267,7 @@ class _smarty_template_buffer extends _smarty_parsetree */ public function append_subtree(_smarty_parsetree $subtree) { - if ($subtree->data !== '') { - $this->subtrees[] = $subtree; - } + $this->subtrees[] = $subtree; } /** @@ -284,41 +278,44 @@ class _smarty_template_buffer extends _smarty_parsetree public function to_smarty_php() { $code = ''; - for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key ++) { - if ($this->subtrees[$key] instanceof _smarty_text) { - $subtree = $this->subtrees[$key]->to_smarty_php(); - while ($key + 1 < $cnt && ($this->subtrees[$key+1] instanceof _smarty_text || $this->subtrees[$key +1]->data == '')) { - $key++; - if ($this->subtrees[$key]->data == '') { - continue; - } - $subtree .= $this->subtrees[$key]->to_smarty_php(); + for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) { + if ($key + 2 < $cnt) { + if ($this->subtrees[$key] instanceof _smarty_linebreak && $this->subtrees[$key + 1] instanceof _smarty_tag && $this->subtrees[$key + 1]->data == '' && $this->subtrees[$key + 2] instanceof _smarty_linebreak) { + $key = $key + 1; + continue; } - if ($subtree == '') { + if (substr($this->subtrees[$key]->data, -1) == '<' && $this->subtrees[$key + 1]->data == '' && substr($this->subtrees[$key + 2]->data, -1) == '?') { + $key = $key + 2; continue; } - $code .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<\/?script)/', "<?php echo '\$1'; ?>\n", $subtree); + } + if (substr($code, -1) == '<') { + $subtree = $this->subtrees[$key]->to_smarty_php(); + if (substr($subtree, 0, 1) == '?') { + $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>?' . substr($subtree, 1); + } elseif ($this->parser->asp_tags && substr($subtree, 0, 1) == '%') { + $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>%' . substr($subtree, 1); + } else { + $code .= $subtree; + } continue; } - if ($this->subtrees[$key] instanceof _smarty_tag) { + if ($this->parser->asp_tags && substr($code, -1) == '%') { $subtree = $this->subtrees[$key]->to_smarty_php(); - while ($key + 1 < $cnt && ($this->subtrees[$key+1] instanceof _smarty_tag || $this->subtrees[$key +1]->data == '')) { - $key++; - if ($this->subtrees[$key]->data == '') { - continue; - } - $newCode = $this->subtrees[$key]->to_smarty_php(); - if ((preg_match('/^\s*<\?php\s+/', $newCode) && preg_match('/\s*\?>\s*$/', $subtree))) { - $subtree = preg_replace('/\s*\?>\s*$/', "\n", $subtree); - $subtree .= preg_replace('/^\s*<\?php\s+/', '', $newCode); - } else { - $subtree .= $newCode; - } + if (substr($subtree, 0, 1) == '>') { + $code = substr($code, 0, strlen($code) - 1) . '%<?php ?>>' . substr($subtree, 1); + } else { + $code .= $subtree; } - if ($subtree == '') { - continue; + continue; + } + if (substr($code, -1) == '?') { + $subtree = $this->subtrees[$key]->to_smarty_php(); + if (substr($subtree, 0, 1) == '>') { + $code = substr($code, 0, strlen($code) - 1) . '?<?php ?>>' . substr($subtree, 1); + } else { + $code .= $subtree; } - $code .= $subtree; continue; } $code .= $this->subtrees[$key]->to_smarty_php(); @@ -331,17 +328,18 @@ class _smarty_template_buffer extends _smarty_parsetree /** * template text * - * @package Smarty + * @package Smarty * @subpackage Compiler * @ignore */ -class _smarty_text extends _smarty_parsetree -{ +class _smarty_text extends _smarty_parsetree { + + /** * Create template text buffer * - * @param object $parser parser object - * @param string $data text + * @param object $parser parser object + * @param string $data text */ public function __construct($parser, $data) { @@ -358,4 +356,40 @@ class _smarty_text extends _smarty_parsetree { return $this->data; } + +} + +/** + * template linebreaks + * + * @package Smarty + * @subpackage Compiler + * @ignore + */ +class _smarty_linebreak extends _smarty_parsetree { + + /** + * Create buffer with linebreak content + * + * @param object $parser parser object + * @param string $data linebreak string + */ + public function __construct($parser, $data) + { + $this->parser = $parser; + $this->data = $data; + } + + /** + * Return linebrak + * + * @return string linebreak + */ + public function to_smarty_php() + { + return $this->data; + } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_eval.php b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_eval.php index 1c64b7cf..c025dc26 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_eval.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_eval.php @@ -2,31 +2,32 @@ /** * Smarty Internal Plugin Resource Eval * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Uwe Tews - * @author Rodney Rehm + * @author Uwe Tews + * @author Rodney Rehm */ /** * Smarty Internal Plugin Resource Eval + * * Implements the strings as resource for Smarty template + * * {@internal unlike string-resources the compiled state of eval-resources is NOT saved for subsequent access}} * - * @package Smarty + * @package Smarty * @subpackage TemplateResources */ -class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled -{ +class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled { + /** * populate Source Object with meta data from Resource * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * + * @param Smarty_Template_Source $source source object + * @param Smarty_Internal_Template $_template template object * @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) { $source->uid = $source->filepath = sha1($source->name); $source->timestamp = false; @@ -37,21 +38,18 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled * Load template's source from $resource_name into current template object * * @uses decode() to decode base64 and urlencoded template_resources - * - * @param Smarty_Template_Source $source source object - * - * @return string template source + * @param Smarty_Template_Source $source source object + * @return string template source */ public function getContent(Smarty_Template_Source $source) { return $this->decode($source->name); } - + /** * decode base64 and urlencode * - * @param string $string template_resource to decode - * + * @param string $string template_resource to decode * @return string decoded template_resource */ protected function decode($string) @@ -64,33 +62,33 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled return urldecode(substr($string, 10)); } } - + return $string; } - + /** * modify resource_name according to resource handlers specifications * - * @param Smarty $smarty Smarty instance - * @param string $resource_name resource_name to make unique - * @param boolean $is_config flag for config resource - * + * @param Smarty $smarty Smarty instance + * @param string $resource_name resource_name to make unique * @return string unique resource name */ - protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false) + protected function buildUniqueResourceName(Smarty $smarty, $resource_name) { - return get_class($this) . '#' . $this->decode($resource_name); + return get_class($this) . '#' .$this->decode($resource_name); } /** * Determine basename for compiled filename * - * @param Smarty_Template_Source $source source object - * - * @return string resource's basename + * @param Smarty_Template_Source $source source object + * @return string resource's basename */ protected function getBasename(Smarty_Template_Source $source) { return ''; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_extends.php b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_extends.php index c78dba51..53ea3ebc 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_extends.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_extends.php @@ -1,38 +1,30 @@ <?php /** - * Smarty Internal Plugin Resource Extends - * - * @package Smarty - * @subpackage TemplateResources - * @author Uwe Tews - * @author Rodney Rehm - */ +* Smarty Internal Plugin Resource Extends +* +* @package Smarty +* @subpackage TemplateResources +* @author Uwe Tews +* @author Rodney Rehm +*/ /** - * Smarty Internal Plugin Resource Extends - * Implements the file system as resource for Smarty which {extend}s a chain of template files templates - * - * @package Smarty - * @subpackage TemplateResources - */ -class Smarty_Internal_Resource_Extends extends Smarty_Resource -{ - /** - * mbstring.overload flag - * - * @var int - */ - public $mbstring_overload = 0; +* Smarty Internal Plugin Resource Extends +* +* Implements the file system as resource for Smarty which {extend}s a chain of template files templates +* +* @package Smarty +* @subpackage TemplateResources +*/ +class Smarty_Internal_Resource_Extends extends Smarty_Resource { /** - * populate Source Object with meta data from Resource - * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * - * @throws SmartyException - */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) + * populate Source Object with meta data from Resource + * + * @param Smarty_Template_Source $source source object + * @param Smarty_Internal_Template $_template template object + */ + public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) { $uid = ''; $sources = array(); @@ -44,9 +36,9 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type"); } $sources[$s->uid] = $s; - $uid .= realpath($s->filepath); + $uid .= $s->filepath; if ($_template && $_template->smarty->compile_check) { - $exists = $exists && $s->exists; + $exists == $exists && $s->exists; } } $source->components = $sources; @@ -61,52 +53,96 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource } /** - * populate Source Object with timestamp and exists from Resource - * - * @param Smarty_Template_Source $source source object - */ + * populate Source Object with timestamp and exists from Resource + * + * @param Smarty_Template_Source $source source object + */ public function populateTimestamp(Smarty_Template_Source $source) { $source->exists = true; foreach ($source->components as $s) { - $source->exists = $source->exists && $s->exists; + $source->exists == $source->exists && $s->exists; } $source->timestamp = $s->timestamp; } /** - * Load template's source from files into current template object - * - * @param Smarty_Template_Source $source source object - * - * @return string template source - * @throws SmartyException if source cannot be loaded - */ + * Load template's source from files into current template object + * + * @param Smarty_Template_Source $source source object + * @return string template source + * @throws SmartyException if source cannot be loaded + */ public function getContent(Smarty_Template_Source $source) { if (!$source->exists) { throw new SmartyException("Unable to read template {$source->type} '{$source->name}'"); } + $_rdl = preg_quote($source->smarty->right_delimiter); + $_ldl = preg_quote($source->smarty->left_delimiter); $_components = array_reverse($source->components); + $_first = reset($_components); + $_last = end($_components); - $_content = ''; foreach ($_components as $_component) { + // register dependency + if ($_component != $_first) { + $source->template->properties['file_dependency'][$_component->uid] = array($_component->filepath, $_component->timestamp, $_component->type); + } + // read content - $_content .= $_component->content; + $source->filepath = $_component->filepath; + $_content = $_component->content; + + // extend sources + if ($_component != $_last) { + if (preg_match_all("!({$_ldl}block\s(.+?){$_rdl})!", $_content, $_open) != + preg_match_all("!({$_ldl}/block{$_rdl})!", $_content, $_close)) { + throw new SmartyException("unmatched {block} {/block} pairs in template {$_component->type} '{$_component->name}'"); + } + preg_match_all("!{$_ldl}block\s(.+?){$_rdl}|{$_ldl}/block{$_rdl}|{$_ldl}\*([\S\s]*?)\*{$_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE); + $_result_count = count($_result[0]); + $_start = 0; + while ($_start+1 < $_result_count) { + $_end = 0; + $_level = 1; + if (substr($_result[0][$_start][0],0,strlen($source->smarty->left_delimiter)+1) == $source->smarty->left_delimiter.'*') { + $_start++; + continue; + } + while ($_level != 0) { + $_end++; + if (substr($_result[0][$_start + $_end][0],0,strlen($source->smarty->left_delimiter)+1) == $source->smarty->left_delimiter.'*') { + continue; + } + if (!strpos($_result[0][$_start + $_end][0], '/')) { + $_level++; + } else { + $_level--; + } + } + $_block_content = str_replace($source->smarty->left_delimiter . '$smarty.block.parent' . $source->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%', substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))); + Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $source->template, $_component->filepath); + $_start = $_start + $_end + 1; + } + } else { + return $_content; + } } - return $_content; } /** - * Determine basename for compiled filename - * - * @param Smarty_Template_Source $source source object - * - * @return string resource's basename - */ + * Determine basename for compiled filename + * + * @param Smarty_Template_Source $source source object + * @return string resource's basename + */ public function getBasename(Smarty_Template_Source $source) { return str_replace(':', '.', basename($source->filepath)); } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_file.php b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_file.php index 0abdc449..48b391d2 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_file.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_file.php @@ -2,28 +2,29 @@ /** * Smarty Internal Plugin Resource File * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Uwe Tews - * @author Rodney Rehm + * @author Uwe Tews + * @author Rodney Rehm */ /** * Smarty Internal Plugin Resource File + * * Implements the file system as resource for Smarty templates * - * @package Smarty + * @package Smarty * @subpackage TemplateResources */ -class Smarty_Internal_Resource_File extends Smarty_Resource -{ +class Smarty_Internal_Resource_File extends Smarty_Resource { + /** * populate Source Object with meta data from Resource * * @param Smarty_Template_Source $source source object * @param Smarty_Internal_Template $_template template object */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) + public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) { $source->filepath = $this->buildFilepath($source, $_template); @@ -32,7 +33,7 @@ class Smarty_Internal_Resource_File extends Smarty_Resource $source->smarty->security_policy->isTrustedResourceDir($source->filepath); } - $source->uid = sha1(realpath($source->filepath)); + $source->uid = sha1($source->filepath); if ($source->smarty->compile_check && !isset($source->timestamp)) { $source->timestamp = @filemtime($source->filepath); $source->exists = !!$source->timestamp; @@ -54,10 +55,9 @@ class Smarty_Internal_Resource_File extends Smarty_Resource /** * Load template's source from file into current template object * - * @param Smarty_Template_Source $source source object - * - * @return string template source - * @throws SmartyException if source cannot be loaded + * @param Smarty_Template_Source $source source object + * @return string template source + * @throws SmartyException if source cannot be loaded */ public function getContent(Smarty_Template_Source $source) { @@ -73,9 +73,8 @@ class Smarty_Internal_Resource_File extends Smarty_Resource /** * Determine basename for compiled filename * - * @param Smarty_Template_Source $source source object - * - * @return string resource's basename + * @param Smarty_Template_Source $source source object + * @return string resource's basename */ public function getBasename(Smarty_Template_Source $source) { @@ -83,7 +82,9 @@ class Smarty_Internal_Resource_File extends Smarty_Resource if (($_pos = strpos($_file, ']')) !== false) { $_file = substr($_file, $_pos + 1); } - return basename($_file); } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_php.php b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_php.php index 7463c296..7cd8baee 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_php.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_php.php @@ -2,40 +2,38 @@ /** * Smarty Internal Plugin Resource PHP + * * Implements the file system as resource for PHP templates * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Uwe Tews - * @author Rodney Rehm + * @author Uwe Tews + * @author Rodney Rehm */ -class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled -{ +class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled { /** * container for short_open_tag directive's value before executing PHP templates - * * @var string */ protected $short_open_tag; /** * Create a new PHP Resource - + * */ public function __construct() { - $this->short_open_tag = ini_get('short_open_tag'); + $this->short_open_tag = ini_get( 'short_open_tag' ); } /** * populate Source Object with meta data from Resource * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * + * @param Smarty_Template_Source $source source object + * @param Smarty_Internal_Template $_template template object * @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) { $source->filepath = $this->buildFilepath($source, $_template); @@ -55,8 +53,7 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled /** * populate Source Object with timestamp and exists from Resource * - * @param Smarty_Template_Source $source source object - * + * @param Smarty_Template_Source $source source object * @return void */ public function populateTimestamp(Smarty_Template_Source $source) @@ -68,10 +65,9 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled /** * Load template's source from file into current template object * - * @param Smarty_Template_Source $source source object - * - * @return string template source - * @throws SmartyException if source cannot be loaded + * @param Smarty_Template_Source $source source object + * @return string template source + * @throws SmartyException if source cannot be loaded */ public function getContent(Smarty_Template_Source $source) { @@ -84,14 +80,15 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled /** * Render and output the template (without using the compiler) * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * + * @param Smarty_Template_Source $source source object + * @param Smarty_Internal_Template $_template template object * @return void - * @throws SmartyException if template cannot be loaded or allow_php_templates is disabled + * @throws SmartyException if template cannot be loaded or allow_php_templates is disabled */ public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template) { + $_smarty_template = $_template; + if (!$source->smarty->allow_php_templates) { throw new SmartyException("PHP templates are disabled"); } @@ -108,12 +105,10 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled extract($_template->getTemplateVars()); // include PHP template with short open tags enabled - ini_set('short_open_tag', '1'); - /** @var Smarty_Internal_Template $_smarty_template - * used in included file - */ - $_smarty_template = $_template; + ini_set( 'short_open_tag', '1' ); include($source->filepath); - ini_set('short_open_tag', $this->short_open_tag); + ini_set( 'short_open_tag', $this->short_open_tag ); } } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_registered.php b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_registered.php index f12d843e..44497b92 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_registered.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_registered.php @@ -2,31 +2,31 @@ /** * Smarty Internal Plugin Resource Registered * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Uwe Tews - * @author Rodney Rehm + * @author Uwe Tews + * @author Rodney Rehm */ /** * Smarty Internal Plugin Resource Registered + * * Implements the registered resource for Smarty template * - * @package Smarty + * @package Smarty * @subpackage TemplateResources * @deprecated */ -class Smarty_Internal_Resource_Registered extends Smarty_Resource -{ +class Smarty_Internal_Resource_Registered extends Smarty_Resource { + /** * populate Source Object with meta data from Resource * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * + * @param Smarty_Template_Source $source source object + * @param Smarty_Internal_Template $_template template object * @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) { $source->filepath = $source->type . ':' . $source->name; $source->uid = sha1($source->filepath); @@ -39,8 +39,7 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource /** * populate Source Object with timestamp and exists from Resource * - * @param Smarty_Template_Source $source source object - * + * @param Smarty_Template_Source $source source object * @return void */ public function populateTimestamp(Smarty_Template_Source $source) @@ -52,26 +51,23 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource /** * Get timestamp (epoch) the template source was modified * - * @param Smarty_Template_Source $source source object - * - * @return integer|boolean timestamp (epoch) the template was modified, false if resources has no timestamp + * @param Smarty_Template_Source $source source object + * @return integer|boolean timestamp (epoch) the template was modified, false if resources has no timestamp */ public function getTemplateTimestamp(Smarty_Template_Source $source) { // return timestamp $time_stamp = false; call_user_func_array($source->smarty->registered_resources[$source->type][0][1], array($source->name, &$time_stamp, $source->smarty)); - return is_numeric($time_stamp) ? (int) $time_stamp : $time_stamp; } /** * Load template's source by invoking the registered callback into current template object * - * @param Smarty_Template_Source $source source object - * - * @return string template source - * @throws SmartyException if source cannot be loaded + * @param Smarty_Template_Source $source source object + * @return string template source + * @throws SmartyException if source cannot be loaded */ public function getContent(Smarty_Template_Source $source) { @@ -80,19 +76,20 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource if (is_bool($t) && !$t) { throw new SmartyException("Unable to read template {$source->type} '{$source->name}'"); } - return $source->content; } /** * Determine basename for compiled filename * - * @param Smarty_Template_Source $source source object - * - * @return string resource's basename + * @param Smarty_Template_Source $source source object + * @return string resource's basename */ protected function getBasename(Smarty_Template_Source $source) { return basename($source->name); } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_stream.php b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_stream.php index f7d1aac3..85698c23 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_stream.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_stream.php @@ -1,39 +1,36 @@ <?php /** * Smarty Internal Plugin Resource Stream + * * Implements the streams as resource for Smarty template * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Uwe Tews - * @author Rodney Rehm + * @author Uwe Tews + * @author Rodney Rehm */ /** * Smarty Internal Plugin Resource Stream + * * Implements the streams as resource for Smarty template * - * @link http://php.net/streams - * @package Smarty + * @link http://php.net/streams + * @package Smarty * @subpackage TemplateResources */ -class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled -{ +class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled { + /** * populate Source Object with meta data from Resource * * @param Smarty_Template_Source $source source object * @param Smarty_Internal_Template $_template template object - * * @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) { - if (strpos($source->resource, '://') !== false) { - $source->filepath = $source->resource; - } else { - $source->filepath = str_replace(':', '://', $source->resource); - } + $source->filepath = str_replace(':', '://', $source->resource); $source->uid = false; $source->content = $this->getContent($source); $source->timestamp = false; @@ -44,7 +41,6 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled * Load template's source from stream into current template object * * @param Smarty_Template_Source $source source object - * * @return string template source * @throws SmartyException if source cannot be loaded */ @@ -58,24 +54,23 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled $t .= $current_line; } fclose($fp); - return $t; } else { return false; } } - + /** * modify resource_name according to resource handlers specifications * - * @param Smarty $smarty Smarty instance - * @param string $resource_name resource_name to make unique - * @param boolean $is_config flag for config resource - * + * @param Smarty $smarty Smarty instance + * @param string $resource_name resource_name to make unique * @return string unique resource name */ - protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false) + protected function buildUniqueResourceName(Smarty $smarty, $resource_name) { return get_class($this) . '#' . $resource_name; } } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_string.php b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_string.php index bfa06997..9571337b 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_resource_string.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_resource_string.php @@ -2,31 +2,32 @@ /** * Smarty Internal Plugin Resource String * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Uwe Tews - * @author Rodney Rehm + * @author Uwe Tews + * @author Rodney Rehm */ /** * Smarty Internal Plugin Resource String + * * Implements the strings as resource for Smarty template + * * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}} * - * @package Smarty + * @package Smarty * @subpackage TemplateResources */ -class Smarty_Internal_Resource_String extends Smarty_Resource -{ +class Smarty_Internal_Resource_String extends Smarty_Resource { + /** * populate Source Object with meta data from Resource * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * + * @param Smarty_Template_Source $source source object + * @param Smarty_Internal_Template $_template template object * @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) { $source->uid = $source->filepath = sha1($source->name); $source->timestamp = 0; @@ -37,21 +38,18 @@ class Smarty_Internal_Resource_String extends Smarty_Resource * Load template's source from $resource_name into current template object * * @uses decode() to decode base64 and urlencoded template_resources - * - * @param Smarty_Template_Source $source source object - * - * @return string template source + * @param Smarty_Template_Source $source source object + * @return string template source */ public function getContent(Smarty_Template_Source $source) { return $this->decode($source->name); } - + /** * decode base64 and urlencode * - * @param string $string template_resource to decode - * + * @param string $string template_resource to decode * @return string decoded template_resource */ protected function decode($string) @@ -64,34 +62,35 @@ class Smarty_Internal_Resource_String extends Smarty_Resource return urldecode(substr($string, 10)); } } - + return $string; } - + /** * modify resource_name according to resource handlers specifications * - * @param Smarty $smarty Smarty instance - * @param string $resource_name resource_name to make unique - * @param boolean $is_config flag for config resource - * + * @param Smarty $smarty Smarty instance + * @param string $resource_name resource_name to make unique * @return string unique resource name */ - protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false) + protected function buildUniqueResourceName(Smarty $smarty, $resource_name) { - return get_class($this) . '#' . $this->decode($resource_name); + return get_class($this) . '#' .$this->decode($resource_name); } /** * Determine basename for compiled filename - * Always returns an empty string. * - * @param Smarty_Template_Source $source source object + * Always returns an empty string. * - * @return string resource's basename + * @param Smarty_Template_Source $source source object + * @return string resource's basename */ protected function getBasename(Smarty_Template_Source $source) { return ''; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/Widgets/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php index 50bd16ef..1ec1aa43 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php @@ -1,26 +1,27 @@ <?php /** * Smarty Internal Plugin Smarty Template Compiler Base - * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser * - * @package Smarty + * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser + * + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * @ignore */ -include 'smarty_internal_parsetree.php'; +include ("smarty_internal_parsetree.php"); /** * Class SmartyTemplateCompiler * - * @package Smarty + * @package Smarty * @subpackage Compiler */ -class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase -{ +class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase { + /** * Lexer class name * @@ -80,11 +81,10 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom } /** - * method to compile a Smarty template + * Methode to compile a Smarty template * * @param mixed $_content template source - * - * @return bool true if compiling succeeded, false if it failed + * @return bool true if compiling succeeded, false if it failed */ protected function doCompile($_content) { @@ -94,21 +94,8 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom // init the lexer/parser to compile the template $this->lex = new $this->lexer_class($_content, $this); $this->parser = new $this->parser_class($this->lex, $this); - if ($this->inheritance_child) { - // start state on child templates - $this->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY); - } - if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) { - $mbEncoding = mb_internal_encoding(); - mb_internal_encoding('ASCII'); - } else { - $mbEncoding = null; - } - - if ($this->smarty->_parserdebug) { + if ($this->smarty->_parserdebug) $this->parser->PrintTrace(); - $this->lex->PrintTrace(); - } // get tokens from lexer and parse them while ($this->lex->yylex() && !$this->abort_and_recompile) { if ($this->smarty->_parserdebug) { @@ -124,17 +111,17 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom } // finish parsing process $this->parser->doParse(0, 0); - if ($mbEncoding) { - mb_internal_encoding($mbEncoding); - } // check for unclosed tags if (count($this->_tag_stack) > 0) { // get stacked info list($openTag, $_data) = array_pop($this->_tag_stack); - $this->trigger_template_error("unclosed {$this->smarty->left_delimiter}" . $openTag . "{$this->smarty->right_delimiter} tag"); + $this->trigger_template_error("unclosed {" . $openTag . "} tag"); } // return compiled code // return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue); return $this->parser->retvalue; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_template.php b/Widgets/smarty/libs/sysplugins/smarty_internal_template.php index f1a73a4a..94b27b9c 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_template.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_template.php @@ -1,27 +1,28 @@ <?php /** * Smarty Internal Plugin Template + * * This file contains the Smarty template engine * - * @package Smarty + * @package Smarty * @subpackage Template - * @author Uwe Tews + * @author Uwe Tews */ /** * Main class with template data structures and methods * - * @package Smarty + * @package Smarty * @subpackage Template + * * @property Smarty_Template_Source $source * @property Smarty_Template_Compiled $compiled * @property Smarty_Template_Cached $cached */ -class Smarty_Internal_Template extends Smarty_Internal_TemplateBase -{ +class Smarty_Internal_Template extends Smarty_Internal_TemplateBase { + /** * cache_id - * * @var string */ public $cache_id = null; @@ -32,108 +33,95 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase public $compile_id = null; /** * caching enabled - * * @var boolean */ public $caching = null; /** * cache lifetime in seconds - * * @var integer */ public $cache_lifetime = null; /** * Template resource - * * @var string */ public $template_resource = null; /** * flag if compiled template is invalid and must be (re)compiled - * * @var bool */ public $mustCompile = null; /** * flag if template does contain nocache code sections - * * @var bool */ public $has_nocache_code = false; /** * special compiled and cached template properties - * * @var array */ public $properties = array('file_dependency' => array(), - 'nocache_hash' => '', - 'function' => array()); + 'nocache_hash' => '', + 'function' => array()); /** * required plugins - * * @var array */ public $required_plugins = array('compiled' => array(), 'nocache' => array()); /** * Global smarty instance - * * @var Smarty */ public $smarty = null; /** * blocks for template inheritance - * * @var array */ public $block_data = array(); /** * variable filters - * * @var array */ public $variable_filters = array(); /** * optional log of tag/attributes - * * @var array */ public $used_tags = array(); /** * internal flag to allow relative path in child template blocks - * * @var bool */ public $allow_relative_path = false; /** * internal capture runtime stack - * * @var array */ public $_capture_stack = array(0 => array()); /** * Create template data object + * * Some of the global Smarty settings copied to template scope * It load the required template resources and cacher plugins * * @param string $template_resource template resource string * @param Smarty $smarty Smarty instance * @param Smarty_Internal_Template $_parent back pointer to parent object with variables or null - * @param mixed $_cache_id cache id or null + * @param mixed $_cache_id cache id or null * @param mixed $_compile_id compile id or null * @param bool $_caching use caching? * @param int $_cache_lifetime cache life-time in seconds */ public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null) { - $this->smarty = & $smarty; + $this->smarty = &$smarty; // Smarty parameter $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id; $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id; $this->caching = $_caching === null ? $this->smarty->caching : $_caching; - if ($this->caching === true) { + if ($this->caching === true) $this->caching = Smarty::CACHING_LIFETIME_CURRENT; - } $this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime; $this->parent = $_parent; // Template resource @@ -146,9 +134,9 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase /** * Returns if the current template must be compiled by the Smarty compiler + * * It does compare the timestamps of template source and the compiled templates and checks the force compile configuration * - * @throws SmartyException * @return boolean true if the template must be compiled */ public function mustCompile() @@ -165,12 +153,12 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase $this->mustCompile = (!$this->source->uncompiled && ($this->smarty->force_compile || $this->source->recompiled || $this->compiled->timestamp === false || ($this->smarty->compile_check && $this->compiled->timestamp < $this->source->timestamp))); } - return $this->mustCompile; } /** * Compiles the template + * * If the template is not evaluated the compiled template is saved on disk */ public function compileTemplateSource() @@ -178,14 +166,16 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase if (!$this->source->recompiled) { $this->properties['file_dependency'] = array(); if ($this->source->components) { - // for the extends resource the compiler will fill it // uses real resource for file dependency - // $source = end($this->source->components); - // $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $source->type); + $source = end($this->source->components); + $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $source->type); } else { $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $this->source->type); } } + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_compile($this); + } // compile locking if ($this->smarty->compile_locking && !$this->source->recompiled) { if ($saved_timestamp = $this->compiled->timestamp) { @@ -195,8 +185,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase // call compiler try { $code = $this->compiler->compileTemplate($this); - } - catch (Exception $e) { + } catch (Exception $e) { // restore old timestamp in case of error if ($this->smarty->compile_locking && !$this->source->recompiled && $saved_timestamp) { touch($this->compiled->filepath, $saved_timestamp); @@ -207,13 +196,15 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase if (!$this->source->recompiled && $this->compiler->write_compiled_code) { // write compiled template $_filepath = $this->compiled->filepath; - if ($_filepath === false) { + if ($_filepath === false) throw new SmartyException('getCompiledFilepath() did not return a destination to save the compiled template to'); - } Smarty_Internal_Write_File::writeFile($_filepath, $code, $this->smarty); $this->compiled->exists = true; $this->compiled->isCompiled = true; } + if ($this->smarty->debugging) { + Smarty_Internal_Debug::end_compile($this); + } // release compiler object to free memory unset($this->compiler); } @@ -221,8 +212,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase /** * Writes the cached template output * - * @param string $content - * * @return bool */ public function writeCachedContent($content) @@ -231,18 +220,13 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase // don't write cache file return false; } - $this->cached->timestamp = time(); $this->properties['cache_lifetime'] = $this->cache_lifetime; - $this->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true)); + $this->properties['unifunc'] = 'content_' . uniqid('', false); $content = $this->createTemplateCodeFrame($content, true); - /** @var Smarty_Internal_Template $_smarty_tpl - * used in evaluated code - */ $_smarty_tpl = $this; eval("?>" . $content); $this->cached->valid = true; $this->cached->processed = true; - return $this->cached->write($this, $content); } @@ -254,16 +238,15 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase * @param mixed $compile_id compile id to be used with this template * @param integer $caching cache mode * @param integer $cache_lifetime life time of cache data - * @param $data + * @param array $vars optional variables to assign * @param int $parent_scope scope in which {include} should execute - * * @returns string template content */ public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope) { // already in template cache? if ($this->smarty->allow_ambiguous_resources) { - $_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id; + $_templateId = Smarty_Resource::getUniqueTemplateName($this->smarty, $template) . $cache_id . $compile_id; } else { $_templateId = $this->smarty->joined_template_dir . '#' . $template . $cache_id . $compile_id; } @@ -283,15 +266,14 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase // get variables from calling scope if ($parent_scope == Smarty::SCOPE_LOCAL) { $tpl->tpl_vars = $this->tpl_vars; - $tpl->tpl_vars['smarty'] = clone $this->tpl_vars['smarty']; } elseif ($parent_scope == Smarty::SCOPE_PARENT) { - $tpl->tpl_vars = & $this->tpl_vars; + $tpl->tpl_vars = &$this->tpl_vars; } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) { - $tpl->tpl_vars = & Smarty::$global_tpl_vars; + $tpl->tpl_vars = &Smarty::$global_tpl_vars; } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) { - $tpl->tpl_vars = & $this->tpl_vars; + $tpl->tpl_vars = &$this->tpl_vars; } else { - $tpl->tpl_vars = & $scope_ptr->tpl_vars; + $tpl->tpl_vars = &$scope_ptr->tpl_vars; } $tpl->config_vars = $this->config_vars; if (!empty($data)) { @@ -300,7 +282,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase $tpl->tpl_vars[$_key] = new Smarty_variable($_val); } } - return $tpl->fetch(null, null, null, null, false, false, true); } @@ -312,28 +293,26 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase * @param mixed $compile_id compile id to be used with this template * @param integer $caching cache mode * @param integer $cache_lifetime life time of cache data - * @param $data + * @param array $vars optional variables to assign * @param int $parent_scope scope in which {include} should execute * @param string $hash nocache hash code - * * @returns string template content */ public function setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash) { $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime); - $tpl->properties['nocache_hash'] = $hash; + $tpl->properties['nocache_hash'] = $hash; // get variables from calling scope - if ($parent_scope == Smarty::SCOPE_LOCAL) { + if ($parent_scope == Smarty::SCOPE_LOCAL ) { $tpl->tpl_vars = $this->tpl_vars; - $tpl->tpl_vars['smarty'] = clone $this->tpl_vars['smarty']; } elseif ($parent_scope == Smarty::SCOPE_PARENT) { - $tpl->tpl_vars = & $this->tpl_vars; + $tpl->tpl_vars = &$this->tpl_vars; } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) { - $tpl->tpl_vars = & Smarty::$global_tpl_vars; + $tpl->tpl_vars = &Smarty::$global_tpl_vars; } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) { - $tpl->tpl_vars = & $this->tpl_vars; + $tpl->tpl_vars = &$this->tpl_vars; } else { - $tpl->tpl_vars = & $scope_ptr->tpl_vars; + $tpl->tpl_vars = &$scope_ptr->tpl_vars; } $tpl->config_vars = $this->config_vars; if (!empty($data)) { @@ -342,16 +321,15 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase $tpl->tpl_vars[$_key] = new Smarty_variable($_val); } } - return $tpl; } + /** * Create code frame for compiled and cached templates * - * @param string $content optional template content - * @param bool $cache flag for cache file - * + * @param string $content optional template content + * @param bool $cache flag for cache file * @return string */ public function createTemplateCodeFrame($content = '', $cache = false) @@ -364,11 +342,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase foreach ($this->required_plugins['compiled'] as $tmp) { foreach ($tmp as $data) { $file = addslashes($data['file']); - if (is_Array($data['function'])) { - $plugins_string .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) include '{$file}';\n"; - } else { - $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$file}';\n"; - } + $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$file}';\n"; } } $plugins_string .= '?>'; @@ -379,11 +353,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase foreach ($this->required_plugins['nocache'] as $tmp) { foreach ($tmp as $data) { $file = addslashes($data['file']); - if (is_Array($data['function'])) { - $plugins_string .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) include '{$file}';\n"); - } else { - $plugins_string .= addslashes("if (!is_callable('{$data['function']}')) include '{$file}';\n"); - } + $plugins_string .= addslashes("if (!is_callable('{$data['function']}')) include '{$file}';\n"); } } $plugins_string .= "?>/*/%%SmartyNocache:{$this->properties['nocache_hash']}%%*/';?>\n"; @@ -410,7 +380,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase } } } - foreach ($this->smarty->template_functions as $name => $function_data) { + foreach ($this->smarty->template_functions as $name => $function_data) { if (isset($function_data['called_nocache'])) { unset($function_data['called_nocache'], $function_data['called_functions'], $this->smarty->template_functions[$name]['called_nocache']); $this->properties['function'][$name] = $function_data; @@ -420,30 +390,31 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase } $this->properties['version'] = Smarty::SMARTY_VERSION; if (!isset($this->properties['unifunc'])) { - $this->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true)); + $this->properties['unifunc'] = 'content_' . uniqid('', false); } if (!$this->source->recompiled) { $output .= "\$_valid = \$_smarty_tpl->decodeProperties(" . var_export($this->properties, true) . ',' . ($cache ? 'true' : 'false') . "); /*/%%SmartyHeaderCode%%*/?>\n"; + } + if (!$this->source->recompiled) { $output .= '<?php if ($_valid && !is_callable(\'' . $this->properties['unifunc'] . '\')) {function ' . $this->properties['unifunc'] . '($_smarty_tpl) {?>'; } $output .= $plugins_string; $output .= $content; if (!$this->source->recompiled) { - $output .= "<?php }} ?>\n"; + $output .= '<?php }} ?>'; } - return $output; } /** * This function is executed automatically when a compiled or cached template file is included + * * - Decode saved properties from compiled template and cache files * - Check if compiled or cache file is valid * - * @param array $properties special template properties - * @param bool $cache flag if called from cache file - * - * @return bool flag if compiled or cache file is valid + * @param array $properties special template properties + * @param bool $cache flag if called from cache file + * @return bool flag if compiled or cache file is valid */ public function decodeProperties($properties, $cache = false) { @@ -465,7 +436,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase $is_valid = true; if ($this->properties['version'] != Smarty::SMARTY_VERSION) { $is_valid = false; - } elseif (((!$cache && $this->smarty->compile_check && empty($this->compiled->_properties) && !$this->compiled->isCompiled) || $cache && ($this->smarty->compile_check === true || $this->smarty->compile_check === Smarty::COMPILECHECK_ON)) && !empty($this->properties['file_dependency'])) { + } else if (((!$cache && $this->smarty->compile_check && empty($this->compiled->_properties) && !$this->compiled->isCompiled) || $cache && ($this->smarty->compile_check === true || $this->smarty->compile_check === Smarty::COMPILECHECK_ON)) && !empty($this->properties['file_dependency'])) { foreach ($this->properties['file_dependency'] as $_file_to_check) { if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'php') { if ($this->source->filepath == $_file_to_check[0] && isset($this->source->timestamp)) { @@ -473,7 +444,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase $mtime = $this->source->timestamp; } else { // file and php types can be checked without loading the respective resource handlers - $mtime = @filemtime($_file_to_check[0]); + $mtime = filemtime($_file_to_check[0]); } } elseif ($_file_to_check[2] == 'string') { continue; @@ -481,20 +452,13 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase $source = Smarty_Resource::source(null, $this->smarty, $_file_to_check[0]); $mtime = $source->timestamp; } - if (!$mtime || $mtime > $_file_to_check[1]) { + if ($mtime > $_file_to_check[1]) { $is_valid = false; break; } } } if ($cache) { - // CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc - if ($this->caching === Smarty::CACHING_LIFETIME_SAVED && - $this->properties['cache_lifetime'] >= 0 && - (time() > ($this->cached->timestamp + $this->properties['cache_lifetime'])) - ) { - $is_valid = false; - } $this->cached->valid = $is_valid; } else { $this->mustCompile = !$is_valid; @@ -503,16 +467,15 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase if (!$cache) { $this->compiled->_properties = $properties; } - return $is_valid; } /** * Template code runtime function to create a local Smarty variable for array assignments * - * @param string $tpl_var tempate variable name - * @param bool $nocache cache mode of variable - * @param int $scope scope of variable + * @param string $tpl_var tempate variable name + * @param bool $nocache cache mode of variable + * @param int $scope scope of variable */ public function createLocalArrayVariable($tpl_var, $nocache = false, $scope = Smarty::SCOPE_LOCAL) { @@ -532,9 +495,8 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase /** * Template code runtime function to get pointer to template variable array of requested scope * - * @param int $scope requested variable scope - * - * @return array array of template variables + * @param int $scope requested variable scope + * @return array array of template variables */ public function &getScope($scope) { @@ -545,21 +507,18 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase while (!empty($ptr->parent)) { $ptr = $ptr->parent; } - return $ptr->tpl_vars; } elseif ($scope == Smarty::SCOPE_GLOBAL) { return Smarty::$global_tpl_vars; } $null = null; - return $null; } /** * Get parent or root of template parent chain * - * @param int $scope pqrent or root scope - * + * @param int $scope pqrent or root scope * @return mixed object */ public function getScopePointer($scope) @@ -571,19 +530,16 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase while (!empty($ptr->parent)) { $ptr = $ptr->parent; } - return $ptr; } - return null; } /** * [util function] counts an array, arrayaccess/traversable or PDOStatement object * - * @param mixed $value - * - * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 for empty elements + * @param mixed $value + * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 for empty elements */ public function _count($value) { @@ -606,13 +562,12 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase } elseif (is_object($value)) { return count($value); } - return 0; } /** * runtime error not matching capture tags - + * */ public function capture_error() { @@ -620,26 +575,22 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase } /** - * Empty cache for this template - * - * @param integer $exp_time expiration time - * - * @return integer number of cache files deleted - */ - public function clearCache($exp_time = null) + * Empty cache for this template + * + * @param integer $exp_time expiration time + * @return integer number of cache files deleted + */ + public function clearCache($exp_time=null) { Smarty_CacheResource::invalidLoadedCache($this->smarty); - return $this->cached->handler->clear($this->smarty, $this->template_name, $this->cache_id, $this->compile_id, $exp_time); } - /** + /** * set Smarty property in template context * * @param string $property_name property name * @param mixed $value value - * - * @throws SmartyException */ public function __set($property_name, $value) { @@ -649,14 +600,12 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase case 'cached': case 'compiler': $this->$property_name = $value; - return; // FIXME: routing of template -> smarty attributes default: if (property_exists($this->smarty, $property_name)) { $this->smarty->$property_name = $value; - return; } } @@ -668,15 +617,13 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase * get Smarty property in template context * * @param string $property_name property name - * - * @throws SmartyException */ public function __get($property_name) { switch ($property_name) { case 'source': - if (strlen($this->template_resource) == 0) { - throw new SmartyException('Missing template name'); + if (empty($this->template_resource)) { + throw new SmartyException("Unable to parse resource name \"{$this->template_resource}\""); } $this->source = Smarty_Resource::source($this); // cache template object under a unique ID @@ -693,12 +640,10 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase } $this->smarty->template_objects[$_templateId] = $this; } - return $this->source; case 'compiled': $this->compiled = $this->source->getCompiled($this); - return $this->compiled; case 'cached': @@ -706,13 +651,11 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php'; } $this->cached = new Smarty_Template_Cached($this); - return $this->cached; case 'compiler': $this->smarty->loadPlugin($this->source->compiler_class); $this->compiler = new $this->source->compiler_class($this->source->template_lexer_class, $this->source->template_parser_class, $this->smarty); - return $this->compiler; // FIXME: routing of template -> smarty attributes @@ -726,8 +669,8 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase } /** - * Template data object destructor - + * Template data object destrutor + * */ public function __destruct() { @@ -735,4 +678,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase $this->cached->handler->releaseLock($this->smarty, $this->cached); } } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_templatebase.php b/Widgets/smarty/libs/sysplugins/smarty_internal_templatebase.php index f8f1c9e1..039bb015 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_templatebase.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_templatebase.php @@ -1,860 +1,811 @@ -<?php
-/**
- * Smarty Internal Plugin Smarty Template Base
- * This file contains the basic shared methods for template handling
- *
- * @package Smarty
- * @subpackage Template
- * @author Uwe Tews
- */
-
-/**
- * Class with shared template methods
- *
- * @package Smarty
- * @subpackage Template
- */
-abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
-{
- /**
- * fetches a rendered Smarty template
- *
- * @param string $template the resource handle of the template file or template object
- * @param mixed $cache_id cache id to be used with this template
- * @param mixed $compile_id compile id to be used with this template
- * @param object $parent next higher level of Smarty variables
- * @param bool $display true: display, false: fetch
- * @param bool $merge_tpl_vars if true parent template variables merged in to local scope
- * @param bool $no_output_filter if true do not run output filter
- *
- * @throws Exception
- * @throws SmartyException
- * @return string rendered template output
- */
- public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false)
- {
- if ($template === null && $this instanceof $this->template_class) {
- $template = $this;
- }
- if ($cache_id !== null && is_object($cache_id)) {
- $parent = $cache_id;
- $cache_id = null;
- }
- if ($parent === null && ($this instanceof Smarty || is_string($template))) {
- $parent = $this;
- }
- // create template object if necessary
- $_template = ($template instanceof $this->template_class)
- ? $template
- : $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
- // if called by Smarty object make sure we use current caching status
- if ($this instanceof Smarty) {
- $_template->caching = $this->caching;
- }
- // merge all variable scopes into template
- if ($merge_tpl_vars) {
- // save local variables
- $save_tpl_vars = $_template->tpl_vars;
- $save_config_vars = $_template->config_vars;
- $ptr_array = array($_template);
- $ptr = $_template;
- while (isset($ptr->parent)) {
- $ptr_array[] = $ptr = $ptr->parent;
- }
- $ptr_array = array_reverse($ptr_array);
- $parent_ptr = reset($ptr_array);
- $tpl_vars = $parent_ptr->tpl_vars;
- $config_vars = $parent_ptr->config_vars;
- while ($parent_ptr = next($ptr_array)) {
- if (!empty($parent_ptr->tpl_vars)) {
- $tpl_vars = array_merge($tpl_vars, $parent_ptr->tpl_vars);
- }
- if (!empty($parent_ptr->config_vars)) {
- $config_vars = array_merge($config_vars, $parent_ptr->config_vars);
- }
- }
- if (!empty(Smarty::$global_tpl_vars)) {
- $tpl_vars = array_merge(Smarty::$global_tpl_vars, $tpl_vars);
- }
- $_template->tpl_vars = $tpl_vars;
- $_template->config_vars = $config_vars;
- }
- // dummy local smarty variable
- if (!isset($_template->tpl_vars['smarty'])) {
- $_template->tpl_vars['smarty'] = new Smarty_Variable;
- }
- if (isset($this->smarty->error_reporting)) {
- $_smarty_old_error_level = error_reporting($this->smarty->error_reporting);
- }
- // check URL debugging control
- if (!$this->smarty->debugging && $this->smarty->debugging_ctrl == 'URL') {
- if (isset($_SERVER['QUERY_STRING'])) {
- $_query_string = $_SERVER['QUERY_STRING'];
- } else {
- $_query_string = '';
- }
- if (false !== strpos($_query_string, $this->smarty->smarty_debug_id)) {
- if (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=on')) {
- // enable debugging for this browser session
- setcookie('SMARTY_DEBUG', true);
- $this->smarty->debugging = true;
- } elseif (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=off')) {
- // disable debugging for this browser session
- setcookie('SMARTY_DEBUG', false);
- $this->smarty->debugging = false;
- } else {
- // enable debugging for this page
- $this->smarty->debugging = true;
- }
- } else {
- if (isset($_COOKIE['SMARTY_DEBUG'])) {
- $this->smarty->debugging = true;
- }
- }
- }
- // must reset merge template date
- $_template->smarty->merged_templates_func = array();
- // get rendered template
- // disable caching for evaluated code
- if ($_template->source->recompiled) {
- $_template->caching = false;
- }
- // checks if template exists
- if (!$_template->source->exists) {
- if ($_template->parent instanceof Smarty_Internal_Template) {
- $parent_resource = " in '{$_template->parent->template_resource}'";
- } else {
- $parent_resource = '';
- }
- throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
- }
- // read from cache or render
- if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || !$_template->cached->valid) {
- // render template (not loaded and not in cache)
- if (!$_template->source->uncompiled) {
- /** @var Smarty_Internal_Template $_smarty_tpl
- * used in evaluated code
- */
- $_smarty_tpl = $_template;
- if ($_template->source->recompiled) {
- $code = $_template->compiler->compileTemplate($_template);
- if ($this->smarty->debugging) {
- Smarty_Internal_Debug::start_render($_template);
- }
- try {
- ob_start();
- eval("?>" . $code);
- unset($code);
- }
- catch (Exception $e) {
- ob_get_clean();
- throw $e;
- }
- } else {
- if (!$_template->compiled->exists || ($_template->smarty->force_compile && !$_template->compiled->isCompiled)) {
- $_template->compileTemplateSource();
- $code = file_get_contents($_template->compiled->filepath);
- eval("?>" . $code);
- unset($code);
- $_template->compiled->loaded = true;
- $_template->compiled->isCompiled = true;
- }
- if ($this->smarty->debugging) {
- Smarty_Internal_Debug::start_render($_template);
- }
- if (!$_template->compiled->loaded) {
- include($_template->compiled->filepath);
- if ($_template->mustCompile) {
- // recompile and load again
- $_template->compileTemplateSource();
- $code = file_get_contents($_template->compiled->filepath);
- eval("?>" . $code);
- unset($code);
- $_template->compiled->isCompiled = true;
- }
- $_template->compiled->loaded = true;
- } else {
- $_template->decodeProperties($_template->compiled->_properties, false);
- }
- try {
- ob_start();
- if (empty($_template->properties['unifunc']) || !is_callable($_template->properties['unifunc'])) {
- throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
- }
- array_unshift($_template->_capture_stack, array());
- //
- // render compiled template
- //
- $_template->properties['unifunc']($_template);
- // any unclosed {capture} tags ?
- if (isset($_template->_capture_stack[0][0])) {
- $_template->capture_error();
- }
- array_shift($_template->_capture_stack);
- }
- catch (Exception $e) {
- ob_get_clean();
- throw $e;
- }
- }
- } else {
- if ($_template->source->uncompiled) {
- if ($this->smarty->debugging) {
- Smarty_Internal_Debug::start_render($_template);
- }
- try {
- ob_start();
- $_template->source->renderUncompiled($_template);
- }
- catch (Exception $e) {
- ob_get_clean();
- throw $e;
- }
- } else {
- throw new SmartyException("Resource '$_template->source->type' must have 'renderUncompiled' method");
- }
- }
- $_output = ob_get_clean();
- if (!$_template->source->recompiled && empty($_template->properties['file_dependency'][$_template->source->uid])) {
- $_template->properties['file_dependency'][$_template->source->uid] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);
- }
- if ($_template->parent instanceof Smarty_Internal_Template) {
- $_template->parent->properties['file_dependency'] = array_merge($_template->parent->properties['file_dependency'], $_template->properties['file_dependency']);
- foreach ($_template->required_plugins as $code => $tmp1) {
- foreach ($tmp1 as $name => $tmp) {
- foreach ($tmp as $type => $data) {
- $_template->parent->required_plugins[$code][$name][$type] = $data;
- }
- }
- }
- }
- if ($this->smarty->debugging) {
- Smarty_Internal_Debug::end_render($_template);
- }
- // write to cache when nessecary
- if (!$_template->source->recompiled && ($_template->caching == Smarty::CACHING_LIFETIME_SAVED || $_template->caching == Smarty::CACHING_LIFETIME_CURRENT)) {
- if ($this->smarty->debugging) {
- Smarty_Internal_Debug::start_cache($_template);
- }
- $_template->properties['has_nocache_code'] = false;
- // get text between non-cached items
- $cache_split = preg_split("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output);
- // get non-cached items
- preg_match_all("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output, $cache_parts);
- $output = '';
- // loop over items, stitch back together
- foreach ($cache_split as $curr_idx => $curr_split) {
- // escape PHP tags in template content
- $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/', "<?php echo '\$1'; ?>\n", $curr_split);
- if (isset($cache_parts[0][$curr_idx])) {
- $_template->properties['has_nocache_code'] = true;
- // remove nocache tags from cache output
- $output .= preg_replace("!/\*/?%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]);
- }
- }
- if (!$no_output_filter && !$_template->has_nocache_code && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
- $output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $_template);
- }
- // rendering (must be done before writing cache file because of {function} nocache handling)
- /** @var Smarty_Internal_Template $_smarty_tpl
- * used in evaluated code
- */
- $_smarty_tpl = $_template;
- try {
- ob_start();
- eval("?>" . $output);
- $_output = ob_get_clean();
- }
- catch (Exception $e) {
- ob_get_clean();
- throw $e;
- }
- // write cache file content
- $_template->writeCachedContent($output);
- if ($this->smarty->debugging) {
- Smarty_Internal_Debug::end_cache($_template);
- }
- } else {
- // var_dump('renderTemplate', $_template->has_nocache_code, $_template->template_resource, $_template->properties['nocache_hash'], $_template->parent->properties['nocache_hash'], $_output);
- if (!empty($_template->properties['nocache_hash']) && !empty($_template->parent->properties['nocache_hash'])) {
- // replace nocache_hash
- $_output = str_replace("{$_template->properties['nocache_hash']}", $_template->parent->properties['nocache_hash'], $_output);
- $_template->parent->has_nocache_code = $_template->parent->has_nocache_code || $_template->has_nocache_code;
- }
- }
- } else {
- if ($this->smarty->debugging) {
- Smarty_Internal_Debug::start_cache($_template);
- }
- try {
- ob_start();
- array_unshift($_template->_capture_stack, array());
- //
- // render cached template
- //
- $_template->properties['unifunc']($_template);
- // any unclosed {capture} tags ?
- if (isset($_template->_capture_stack[0][0])) {
- $_template->capture_error();
- }
- array_shift($_template->_capture_stack);
- $_output = ob_get_clean();
- }
- catch (Exception $e) {
- ob_get_clean();
- throw $e;
- }
- if ($this->smarty->debugging) {
- Smarty_Internal_Debug::end_cache($_template);
- }
- }
- if ((!$this->caching || $_template->has_nocache_code || $_template->source->recompiled) && !$no_output_filter && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
- $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_output, $_template);
- }
- if (isset($this->error_reporting)) {
- error_reporting($_smarty_old_error_level);
- }
- // display or fetch
- if ($display) {
- if ($this->caching && $this->cache_modified_check) {
- $_isCached = $_template->isCached() && !$_template->has_nocache_code;
- $_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
- if ($_isCached && $_template->cached->timestamp <= strtotime($_last_modified_date)) {
- switch (PHP_SAPI) {
- case 'cgi': // php-cgi < 5.3
- case 'cgi-fcgi': // php-cgi >= 5.3
- case 'fpm-fcgi': // php-fpm >= 5.3.3
- header('Status: 304 Not Modified');
- break;
-
- case 'cli':
- if ( /* ^phpunit */
- !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
- ) {
- $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
- }
- break;
-
- default:
- header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
- break;
- }
- } else {
- switch (PHP_SAPI) {
- case 'cli':
- if ( /* ^phpunit */
- !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
- ) {
- $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT';
- }
- break;
-
- default:
- header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT');
- break;
- }
- echo $_output;
- }
- } else {
- echo $_output;
- }
- // debug output
- if ($this->smarty->debugging) {
- Smarty_Internal_Debug::display_debug($_template);
- }
- if ($merge_tpl_vars) {
- // restore local variables
- $_template->tpl_vars = $save_tpl_vars;
- $_template->config_vars = $save_config_vars;
- }
-
- return;
- } else {
- if ($merge_tpl_vars) {
- // restore local variables
- $_template->tpl_vars = $save_tpl_vars;
- $_template->config_vars = $save_config_vars;
- }
- // return fetched content
- return $_output;
- }
- }
-
- /**
- * displays a Smarty template
- *
- * @param string $template the resource handle of the template file or template object
- * @param mixed $cache_id cache id to be used with this template
- * @param mixed $compile_id compile id to be used with this template
- * @param object $parent next higher level of Smarty variables
- */
- public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
- {
- // display template
- $this->fetch($template, $cache_id, $compile_id, $parent, true);
- }
-
- /**
- * test if cache is valid
- *
- * @param string|object $template the resource handle of the template file or template object
- * @param mixed $cache_id cache id to be used with this template
- * @param mixed $compile_id compile id to be used with this template
- * @param object $parent next higher level of Smarty variables
- *
- * @return boolean cache status
- */
- public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
- {
- if ($template === null && $this instanceof $this->template_class) {
- return $this->cached->valid;
- }
- if (!($template instanceof $this->template_class)) {
- if ($parent === null) {
- $parent = $this;
- }
- $template = $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
- }
- // return cache status of template
- return $template->cached->valid;
- }
-
- /**
- * creates a data object
- *
- * @param object $parent next higher level of Smarty variables
- *
- * @returns Smarty_Data data object
- */
- public function createData($parent = null)
- {
- return new Smarty_Data($parent, $this);
- }
-
- /**
- * Registers plugin to be used in templates
- *
- * @param string $type plugin type
- * @param string $tag name of template tag
- * @param callback $callback PHP callback to register
- * @param boolean $cacheable if true (default) this fuction is cachable
- * @param array $cache_attr caching attributes if any
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- * @throws SmartyException when the plugin tag is invalid
- */
- public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null)
- {
- if (isset($this->smarty->registered_plugins[$type][$tag])) {
- throw new SmartyException("Plugin tag \"{$tag}\" already registered");
- } elseif (!is_callable($callback)) {
- throw new SmartyException("Plugin \"{$tag}\" not callable");
- } else {
- $this->smarty->registered_plugins[$type][$tag] = array($callback, (bool) $cacheable, (array) $cache_attr);
- }
-
- return $this;
- }
-
- /**
- * Unregister Plugin
- *
- * @param string $type of plugin
- * @param string $tag name of plugin
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- */
- public function unregisterPlugin($type, $tag)
- {
- if (isset($this->smarty->registered_plugins[$type][$tag])) {
- unset($this->smarty->registered_plugins[$type][$tag]);
- }
-
- return $this;
- }
-
- /**
- * Registers a resource to fetch a template
- *
- * @param string $type name of resource type
- * @param Smarty_Resource|array $callback or instance of Smarty_Resource, or array of callbacks to handle resource (deprecated)
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- */
- public function registerResource($type, $callback)
- {
- $this->smarty->registered_resources[$type] = $callback instanceof Smarty_Resource ? $callback : array($callback, false);
-
- return $this;
- }
-
- /**
- * Unregisters a resource
- *
- * @param string $type name of resource type
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- */
- public function unregisterResource($type)
- {
- if (isset($this->smarty->registered_resources[$type])) {
- unset($this->smarty->registered_resources[$type]);
- }
-
- return $this;
- }
-
- /**
- * Registers a cache resource to cache a template's output
- *
- * @param string $type name of cache resource type
- * @param Smarty_CacheResource $callback instance of Smarty_CacheResource to handle output caching
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- */
- public function registerCacheResource($type, Smarty_CacheResource $callback)
- {
- $this->smarty->registered_cache_resources[$type] = $callback;
-
- return $this;
- }
-
- /**
- * Unregisters a cache resource
- *
- * @param string $type name of cache resource type
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- */
- public function unregisterCacheResource($type)
- {
- if (isset($this->smarty->registered_cache_resources[$type])) {
- unset($this->smarty->registered_cache_resources[$type]);
- }
-
- return $this;
- }
-
- /**
- * Registers object to be used in templates
- *
- * @param $object_name
- * @param object $object_impl the referenced PHP object to register
- * @param array $allowed list of allowed methods (empty = all)
- * @param boolean $smarty_args smarty argument format, else traditional
- * @param array $block_methods list of block-methods
- *
- * @throws SmartyException
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- */
- public function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
- {
- // test if allowed methods callable
- if (!empty($allowed)) {
- foreach ((array) $allowed as $method) {
- if (!is_callable(array($object_impl, $method)) && !property_exists($object_impl, $method)) {
- throw new SmartyException("Undefined method or property '$method' in registered object");
- }
- }
- }
- // test if block methods callable
- if (!empty($block_methods)) {
- foreach ((array) $block_methods as $method) {
- if (!is_callable(array($object_impl, $method))) {
- throw new SmartyException("Undefined method '$method' in registered object");
- }
- }
- }
- // register the object
- $this->smarty->registered_objects[$object_name] =
- array($object_impl, (array) $allowed, (boolean) $smarty_args, (array) $block_methods);
-
- return $this;
- }
-
- /**
- * return a reference to a registered object
- *
- * @param string $name object name
- *
- * @return object
- * @throws SmartyException if no such object is found
- */
- public function getRegisteredObject($name)
- {
- if (!isset($this->smarty->registered_objects[$name])) {
- throw new SmartyException("'$name' is not a registered object");
- }
- if (!is_object($this->smarty->registered_objects[$name][0])) {
- throw new SmartyException("registered '$name' is not an object");
- }
-
- return $this->smarty->registered_objects[$name][0];
- }
-
- /**
- * unregister an object
- *
- * @param string $name object name
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- */
- public function unregisterObject($name)
- {
- if (isset($this->smarty->registered_objects[$name])) {
- unset($this->smarty->registered_objects[$name]);
- }
-
- return $this;
- }
-
- /**
- * Registers static classes to be used in templates
- *
- * @param $class_name
- * @param string $class_impl the referenced PHP class to register
- *
- * @throws SmartyException
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- */
- public function registerClass($class_name, $class_impl)
- {
- // test if exists
- if (!class_exists($class_impl)) {
- throw new SmartyException("Undefined class '$class_impl' in register template class");
- }
- // register the class
- $this->smarty->registered_classes[$class_name] = $class_impl;
-
- return $this;
- }
-
- /**
- * Registers a default plugin handler
- *
- * @param callable $callback class/method name
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- * @throws SmartyException if $callback is not callable
- */
- public function registerDefaultPluginHandler($callback)
- {
- if (is_callable($callback)) {
- $this->smarty->default_plugin_handler_func = $callback;
- } else {
- throw new SmartyException("Default plugin handler '$callback' not callable");
- }
-
- return $this;
- }
-
- /**
- * Registers a default template handler
- *
- * @param callable $callback class/method name
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- * @throws SmartyException if $callback is not callable
- */
- public function registerDefaultTemplateHandler($callback)
- {
- if (is_callable($callback)) {
- $this->smarty->default_template_handler_func = $callback;
- } else {
- throw new SmartyException("Default template handler '$callback' not callable");
- }
-
- return $this;
- }
-
- /**
- * Registers a default template handler
- *
- * @param callable $callback class/method name
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- * @throws SmartyException if $callback is not callable
- */
- public function registerDefaultConfigHandler($callback)
- {
- if (is_callable($callback)) {
- $this->smarty->default_config_handler_func = $callback;
- } else {
- throw new SmartyException("Default config handler '$callback' not callable");
- }
-
- return $this;
- }
-
- /**
- * Registers a filter function
- *
- * @param string $type filter type
- * @param callback $callback
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- */
- public function registerFilter($type, $callback)
- {
- $this->smarty->registered_filters[$type][$this->_get_filter_name($callback)] = $callback;
-
- return $this;
- }
-
- /**
- * Unregisters a filter function
- *
- * @param string $type filter type
- * @param callback $callback
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- */
- public function unregisterFilter($type, $callback)
- {
- $name = $this->_get_filter_name($callback);
- if (isset($this->smarty->registered_filters[$type][$name])) {
- unset($this->smarty->registered_filters[$type][$name]);
- }
-
- return $this;
- }
-
- /**
- * Return internal filter name
- *
- * @param callback $function_name
- *
- * @return string internal filter name
- */
- public function _get_filter_name($function_name)
- {
- if (is_array($function_name)) {
- $_class_name = (is_object($function_name[0]) ?
- get_class($function_name[0]) : $function_name[0]);
-
- return $_class_name . '_' . $function_name[1];
- } else {
- return $function_name;
- }
- }
-
- /**
- * load a filter of specified type and name
- *
- * @param string $type filter type
- * @param string $name filter name
- *
- * @throws SmartyException if filter could not be loaded
- */
- public function loadFilter($type, $name)
- {
- $_plugin = "smarty_{$type}filter_{$name}";
- $_filter_name = $_plugin;
- if ($this->smarty->loadPlugin($_plugin)) {
- if (class_exists($_plugin, false)) {
- $_plugin = array($_plugin, 'execute');
- }
- if (is_callable($_plugin)) {
- $this->smarty->registered_filters[$type][$_filter_name] = $_plugin;
-
- return true;
- }
- }
- throw new SmartyException("{$type}filter \"{$name}\" not callable");
- }
-
- /**
- * unload a filter of specified type and name
- *
- * @param string $type filter type
- * @param string $name filter name
- *
- * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
- */
- public function unloadFilter($type, $name)
- {
- $_filter_name = "smarty_{$type}filter_{$name}";
- if (isset($this->smarty->registered_filters[$type][$_filter_name])) {
- unset ($this->smarty->registered_filters[$type][$_filter_name]);
- }
-
- return $this;
- }
-
- /**
- * preg_replace callback to convert camelcase getter/setter to underscore property names
- *
- * @param string $match match string
- *
- * @return string replacemant
- */
- private function replaceCamelcase($match)
- {
- return "_" . strtolower($match[1]);
- }
-
- /**
- * Handle unknown class methods
- *
- * @param string $name unknown method-name
- * @param array $args argument array
- *
- * @throws SmartyException
- */
- public function __call($name, $args)
- {
- static $_prefixes = array('set' => true, 'get' => true);
- static $_resolved_property_name = array();
- static $_resolved_property_source = array();
-
- // method of Smarty object?
- if (method_exists($this->smarty, $name)) {
- return call_user_func_array(array($this->smarty, $name), $args);
- }
- // see if this is a set/get for a property
- $first3 = strtolower(substr($name, 0, 3));
- if (isset($_prefixes[$first3]) && isset($name[3]) && $name[3] !== '_') {
- if (isset($_resolved_property_name[$name])) {
- $property_name = $_resolved_property_name[$name];
- } else {
- // try to keep case correct for future PHP 6.0 case-sensitive class methods
- // lcfirst() not available < PHP 5.3.0, so improvise
- $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4);
- // convert camel case to underscored name
- $property_name = preg_replace_callback('/([A-Z])/', array($this, 'replaceCamelcase'), $property_name);
- $_resolved_property_name[$name] = $property_name;
- }
- if (isset($_resolved_property_source[$property_name])) {
- $_is_this = $_resolved_property_source[$property_name];
- } else {
- $_is_this = null;
- if (property_exists($this, $property_name)) {
- $_is_this = true;
- } elseif (property_exists($this->smarty, $property_name)) {
- $_is_this = false;
- }
- $_resolved_property_source[$property_name] = $_is_this;
- }
- if ($_is_this) {
- if ($first3 == 'get') {
- return $this->$property_name;
- } else {
- return $this->$property_name = $args[0];
- }
- } elseif ($_is_this === false) {
- if ($first3 == 'get') {
- return $this->smarty->$property_name;
- } else {
- return $this->smarty->$property_name = $args[0];
- }
- } else {
- throw new SmartyException("property '$property_name' does not exist.");
- }
- }
- if ($name == 'Smarty') {
- throw new SmartyException("PHP5 requires you to call __construct() instead of Smarty()");
- }
- // must be unknown
- throw new SmartyException("Call of unknown method '$name'.");
- }
-}
+<?php +/** + * Smarty Internal Plugin Smarty Template Base + * + * This file contains the basic shared methodes for template handling + * + * @package Smarty + * @subpackage Template + * @author Uwe Tews + */ + +/** + * Class with shared template methodes + * + * @package Smarty + * @subpackage Template + */ +abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data { + + /** + * fetches a rendered Smarty template + * + * @param string $template the resource handle of the template file or template object + * @param mixed $cache_id cache id to be used with this template + * @param mixed $compile_id compile id to be used with this template + * @param object $parent next higher level of Smarty variables + * @param bool $display true: display, false: fetch + * @param bool $merge_tpl_vars if true parent template variables merged in to local scope + * @param bool $no_output_filter if true do not run output filter + * @return string rendered template output + */ + public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false) + { + if ($template === null && $this instanceof $this->template_class) { + $template = $this; + } + if (!empty($cache_id) && is_object($cache_id)) { + $parent = $cache_id; + $cache_id = null; + } + if ($parent === null && ($this instanceof Smarty || is_string($template))) { + $parent = $this; + } + // create template object if necessary + $_template = ($template instanceof $this->template_class) + ? $template + : $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false); + // if called by Smarty object make sure we use current caching status + if ($this instanceof Smarty) { + $_template->caching = $this->caching; + } + // merge all variable scopes into template + if ($merge_tpl_vars) { + // save local variables + $save_tpl_vars = $_template->tpl_vars; + $save_config_vars = $_template->config_vars; + $ptr_array = array($_template); + $ptr = $_template; + while (isset($ptr->parent)) { + $ptr_array[] = $ptr = $ptr->parent; + } + $ptr_array = array_reverse($ptr_array); + $parent_ptr = reset($ptr_array); + $tpl_vars = $parent_ptr->tpl_vars; + $config_vars = $parent_ptr->config_vars; + while ($parent_ptr = next($ptr_array)) { + if (!empty($parent_ptr->tpl_vars)) { + $tpl_vars = array_merge($tpl_vars, $parent_ptr->tpl_vars); + } + if (!empty($parent_ptr->config_vars)) { + $config_vars = array_merge($config_vars, $parent_ptr->config_vars); + } + } + if (!empty(Smarty::$global_tpl_vars)) { + $tpl_vars = array_merge(Smarty::$global_tpl_vars, $tpl_vars); + } + $_template->tpl_vars = $tpl_vars; + $_template->config_vars = $config_vars; + } + // dummy local smarty variable + if (!isset($_template->tpl_vars['smarty'])) { + $_template->tpl_vars['smarty'] = new Smarty_Variable; + } + if (isset($this->smarty->error_reporting)) { + $_smarty_old_error_level = error_reporting($this->smarty->error_reporting); + } + // check URL debugging control + if (!$this->smarty->debugging && $this->smarty->debugging_ctrl == 'URL') { + if (isset($_SERVER['QUERY_STRING'])) { + $_query_string = $_SERVER['QUERY_STRING']; + } else { + $_query_string = ''; + } + if (false !== strpos($_query_string, $this->smarty->smarty_debug_id)) { + if (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=on')) { + // enable debugging for this browser session + setcookie('SMARTY_DEBUG', true); + $this->smarty->debugging = true; + } elseif (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=off')) { + // disable debugging for this browser session + setcookie('SMARTY_DEBUG', false); + $this->smarty->debugging = false; + } else { + // enable debugging for this page + $this->smarty->debugging = true; + } + } else { + if (isset($_COOKIE['SMARTY_DEBUG'])) { + $this->smarty->debugging = true; + } + } + } + // must reset merge template date + $_template->smarty->merged_templates_func = array(); + // get rendered template + // disable caching for evaluated code + if ($_template->source->recompiled) { + $_template->caching = false; + } + // checks if template exists + if (!$_template->source->exists) { + if ($_template->parent instanceof Smarty_Internal_Template) { + $parent_resource = " in '{$_template->parent->template_resource}'"; + } else { + $parent_resource = ''; + } + throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}"); + } + // read from cache or render + if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || !$_template->cached->valid) { + // render template (not loaded and not in cache) + if (!$_template->source->uncompiled) { + $_smarty_tpl = $_template; + if ($_template->source->recompiled) { + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_compile($_template); + } + $code = $_template->compiler->compileTemplate($_template); + if ($this->smarty->debugging) { + Smarty_Internal_Debug::end_compile($_template); + } + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_render($_template); + } + try { + ob_start(); + eval("?>" . $code); + unset($code); + } catch (Exception $e) { + ob_get_clean(); + throw $e; + } + } else { + if (!$_template->compiled->exists || ($_template->smarty->force_compile && !$_template->compiled->isCompiled)) { + $_template->compileTemplateSource(); + } + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_render($_template); + } + if (!$_template->compiled->loaded) { + include($_template->compiled->filepath); + if ($_template->mustCompile) { + // recompile and load again + $_template->compileTemplateSource(); + include($_template->compiled->filepath); + } + $_template->compiled->loaded = true; + } else { + $_template->decodeProperties($_template->compiled->_properties, false); + } + try { + ob_start(); + if (empty($_template->properties['unifunc']) || !is_callable($_template->properties['unifunc'])) { + throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'"); + } + array_unshift($_template->_capture_stack,array()); + // + // render compiled template + // + $_template->properties['unifunc']($_template); + // any unclosed {capture} tags ? + if (isset($_template->_capture_stack[0][0])) { + $_template->capture_error(); + } + array_shift($_template->_capture_stack); + } catch (Exception $e) { + ob_get_clean(); + throw $e; + } + } + } else { + if ($_template->source->uncompiled) { + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_render($_template); + } + try { + ob_start(); + $_template->source->renderUncompiled($_template); + } catch (Exception $e) { + ob_get_clean(); + throw $e; + } + } else { + throw new SmartyException("Resource '$_template->source->type' must have 'renderUncompiled' method"); + } + } + $_output = ob_get_clean(); + if (!$_template->source->recompiled && empty($_template->properties['file_dependency'][$_template->source->uid])) { + $_template->properties['file_dependency'][$_template->source->uid] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type); + } + if ($_template->parent instanceof Smarty_Internal_Template) { + $_template->parent->properties['file_dependency'] = array_merge($_template->parent->properties['file_dependency'], $_template->properties['file_dependency']); + foreach ($_template->required_plugins as $code => $tmp1) { + foreach ($tmp1 as $name => $tmp) { + foreach ($tmp as $type => $data) { + $_template->parent->required_plugins[$code][$name][$type] = $data; + } + } + } + } + if ($this->smarty->debugging) { + Smarty_Internal_Debug::end_render($_template); + } + // write to cache when nessecary + if (!$_template->source->recompiled && ($_template->caching == Smarty::CACHING_LIFETIME_SAVED || $_template->caching == Smarty::CACHING_LIFETIME_CURRENT)) { + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_cache($_template); + } + $_template->properties['has_nocache_code'] = false; + // get text between non-cached items + $cache_split = preg_split("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output); + // get non-cached items + preg_match_all("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output, $cache_parts); + $output = ''; + // loop over items, stitch back together + foreach ($cache_split as $curr_idx => $curr_split) { + // escape PHP tags in template content + $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php echo \'$1\'; ?>', $curr_split); + if (isset($cache_parts[0][$curr_idx])) { + $_template->properties['has_nocache_code'] = true; + // remove nocache tags from cache output + $output .= preg_replace("!/\*/?%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]); + } + } + if (!$no_output_filter && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) { + $output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $_template); + } + // rendering (must be done before writing cache file because of {function} nocache handling) + $_smarty_tpl = $_template; + try { + ob_start(); + eval("?>" . $output); + $_output = ob_get_clean(); + } catch (Exception $e) { + ob_get_clean(); + throw $e; + } + // write cache file content + $_template->writeCachedContent($output); + if ($this->smarty->debugging) { + Smarty_Internal_Debug::end_cache($_template); + } + } else { + // var_dump('renderTemplate', $_template->has_nocache_code, $_template->template_resource, $_template->properties['nocache_hash'], $_template->parent->properties['nocache_hash'], $_output); + if (!empty($_template->properties['nocache_hash']) && !empty($_template->parent->properties['nocache_hash'])) { + // replace nocache_hash + $_output = preg_replace("/{$_template->properties['nocache_hash']}/", $_template->parent->properties['nocache_hash'], $_output); + $_template->parent->has_nocache_code = $_template->parent->has_nocache_code || $_template->has_nocache_code; + } + } + } else { + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_cache($_template); + } + try { + ob_start(); + array_unshift($_template->_capture_stack,array()); + // + // render cached template + // + $_template->properties['unifunc']($_template); + // any unclosed {capture} tags ? + if (isset($_template->_capture_stack[0][0])) { + $_template->capture_error(); + } + array_shift($_template->_capture_stack); + $_output = ob_get_clean(); + } catch (Exception $e) { + ob_get_clean(); + throw $e; + } + if ($this->smarty->debugging) { + Smarty_Internal_Debug::end_cache($_template); + } + } + if ((!$this->caching || $_template->source->recompiled) && !$no_output_filter && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) { + $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_output, $_template); + } + if (isset($this->error_reporting)) { + error_reporting($_smarty_old_error_level); + } + // display or fetch + if ($display) { + if ($this->caching && $this->cache_modified_check) { + $_isCached = $_template->isCached() && !$_template->has_nocache_code; + $_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3); + if ($_isCached && $_template->cached->timestamp <= strtotime($_last_modified_date)) { + switch (PHP_SAPI) { + case 'cgi': // php-cgi < 5.3 + case 'cgi-fcgi': // php-cgi >= 5.3 + case 'fpm-fcgi': // php-fpm >= 5.3.3 + header('Status: 304 Not Modified'); + break; + + case 'cli': + if (/* ^phpunit */!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS'])/* phpunit$ */) { + $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified'; + } + break; + + default: + header('HTTP/1.1 304 Not Modified'); + break; + } + } else { + switch (PHP_SAPI) { + case 'cli': + if (/* ^phpunit */!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS'])/* phpunit$ */) { + $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT'; + } + break; + + default: + header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT'); + break; + } + echo $_output; + } + } else { + echo $_output; + } + // debug output + if ($this->smarty->debugging) { + Smarty_Internal_Debug::display_debug($this); + } + if ($merge_tpl_vars) { + // restore local variables + $_template->tpl_vars = $save_tpl_vars; + $_template->config_vars = $save_config_vars; + } + return; + } else { + if ($merge_tpl_vars) { + // restore local variables + $_template->tpl_vars = $save_tpl_vars; + $_template->config_vars = $save_config_vars; + } + // return fetched content + return $_output; + } + } + + /** + * displays a Smarty template + * + * @param string $template the resource handle of the template file or template object + * @param mixed $cache_id cache id to be used with this template + * @param mixed $compile_id compile id to be used with this template + * @param object $parent next higher level of Smarty variables + */ + public function display($template = null, $cache_id = null, $compile_id = null, $parent = null) + { + // display template + $this->fetch($template, $cache_id, $compile_id, $parent, true); + } + + /** + * test if cache is valid + * + * @param string|object $template the resource handle of the template file or template object + * @param mixed $cache_id cache id to be used with this template + * @param mixed $compile_id compile id to be used with this template + * @param object $parent next higher level of Smarty variables + * @return boolean cache status + */ + public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null) + { + if ($template === null && $this instanceof $this->template_class) { + return $this->cached->valid; + } + if (!($template instanceof $this->template_class)) { + if ($parent === null) { + $parent = $this; + } + $template = $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false); + } + // return cache status of template + return $template->cached->valid; + } + + /** + * creates a data object + * + * @param object $parent next higher level of Smarty variables + * @returns Smarty_Data data object + */ + public function createData($parent = null) + { + return new Smarty_Data($parent, $this); + } + + /** + * Registers plugin to be used in templates + * + * @param string $type plugin type + * @param string $tag name of template tag + * @param callback $callback PHP callback to register + * @param boolean $cacheable if true (default) this fuction is cachable + * @param array $cache_attr caching attributes if any + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + * @throws SmartyException when the plugin tag is invalid + */ + public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null) + { + if (isset($this->smarty->registered_plugins[$type][$tag])) { + throw new SmartyException("Plugin tag \"{$tag}\" already registered"); + } elseif (!is_callable($callback)) { + throw new SmartyException("Plugin \"{$tag}\" not callable"); + } else { + $this->smarty->registered_plugins[$type][$tag] = array($callback, (bool) $cacheable, (array) $cache_attr); + } + + return $this; + } + + /** + * Unregister Plugin + * + * @param string $type of plugin + * @param string $tag name of plugin + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + */ + public function unregisterPlugin($type, $tag) + { + if (isset($this->smarty->registered_plugins[$type][$tag])) { + unset($this->smarty->registered_plugins[$type][$tag]); + } + + return $this; + } + + /** + * Registers a resource to fetch a template + * + * @param string $type name of resource type + * @param Smarty_Resource|array $callback or instance of Smarty_Resource, or array of callbacks to handle resource (deprecated) + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + */ + public function registerResource($type, $callback) + { + $this->smarty->registered_resources[$type] = $callback instanceof Smarty_Resource ? $callback : array($callback, false); + return $this; + } + + /** + * Unregisters a resource + * + * @param string $type name of resource type + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + */ + public function unregisterResource($type) + { + if (isset($this->smarty->registered_resources[$type])) { + unset($this->smarty->registered_resources[$type]); + } + + return $this; + } + + /** + * Registers a cache resource to cache a template's output + * + * @param string $type name of cache resource type + * @param Smarty_CacheResource $callback instance of Smarty_CacheResource to handle output caching + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + */ + public function registerCacheResource($type, Smarty_CacheResource $callback) + { + $this->smarty->registered_cache_resources[$type] = $callback; + return $this; + } + + /** + * Unregisters a cache resource + * + * @param string $type name of cache resource type + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + */ + public function unregisterCacheResource($type) + { + if (isset($this->smarty->registered_cache_resources[$type])) { + unset($this->smarty->registered_cache_resources[$type]); + } + + return $this; + } + + /** + * Registers object to be used in templates + * + * @param string $object name of template object + * @param object $object_impl the referenced PHP object to register + * @param array $allowed list of allowed methods (empty = all) + * @param boolean $smarty_args smarty argument format, else traditional + * @param array $block_methods list of block-methods + * @param array $block_functs list of methods that are block format + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + * @throws SmartyException if any of the methods in $allowed or $block_methods are invalid + */ + public function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array()) + { + // test if allowed methodes callable + if (!empty($allowed)) { + foreach ((array) $allowed as $method) { + if (!is_callable(array($object_impl, $method))) { + throw new SmartyException("Undefined method '$method' in registered object"); + } + } + } + // test if block methodes callable + if (!empty($block_methods)) { + foreach ((array) $block_methods as $method) { + if (!is_callable(array($object_impl, $method))) { + throw new SmartyException("Undefined method '$method' in registered object"); + } + } + } + // register the object + $this->smarty->registered_objects[$object_name] = + array($object_impl, (array) $allowed, (boolean) $smarty_args, (array) $block_methods); + return $this; + } + + /** + * return a reference to a registered object + * + * @param string $name object name + * @return object + * @throws SmartyException if no such object is found + */ + public function getRegisteredObject($name) + { + if (!isset($this->smarty->registered_objects[$name])) { + throw new SmartyException("'$name' is not a registered object"); + } + if (!is_object($this->smarty->registered_objects[$name][0])) { + throw new SmartyException("registered '$name' is not an object"); + } + return $this->smarty->registered_objects[$name][0]; + } + + /** + * unregister an object + * + * @param string $name object name + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + */ + public function unregisterObject($name) + { + if (isset($this->smarty->registered_objects[$name])) { + unset($this->smarty->registered_objects[$name]); + } + + return $this; + } + + /** + * Registers static classes to be used in templates + * + * @param string $class name of template class + * @param string $class_impl the referenced PHP class to register + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + * @throws SmartyException if $class_impl does not refer to an existing class + */ + public function registerClass($class_name, $class_impl) + { + // test if exists + if (!class_exists($class_impl)) { + throw new SmartyException("Undefined class '$class_impl' in register template class"); + } + // register the class + $this->smarty->registered_classes[$class_name] = $class_impl; + return $this; + } + + /** + * Registers a default plugin handler + * + * @param callable $callback class/method name + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + * @throws SmartyException if $callback is not callable + */ + public function registerDefaultPluginHandler($callback) + { + if (is_callable($callback)) { + $this->smarty->default_plugin_handler_func = $callback; + } else { + throw new SmartyException("Default plugin handler '$callback' not callable"); + } + + return $this; + } + + /** + * Registers a default template handler + * + * @param callable $callback class/method name + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + * @throws SmartyException if $callback is not callable + */ + public function registerDefaultTemplateHandler($callback) + { + if (is_callable($callback)) { + $this->smarty->default_template_handler_func = $callback; + } else { + throw new SmartyException("Default template handler '$callback' not callable"); + } + + return $this; + } + + /** + * Registers a default template handler + * + * @param callable $callback class/method name + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + * @throws SmartyException if $callback is not callable + */ + public function registerDefaultConfigHandler($callback) + { + if (is_callable($callback)) { + $this->smarty->default_config_handler_func = $callback; + } else { + throw new SmartyException("Default config handler '$callback' not callable"); + } + + return $this; + } + + /** + * Registers a filter function + * + * @param string $type filter type + * @param callback $callback + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + */ + public function registerFilter($type, $callback) + { + $this->smarty->registered_filters[$type][$this->_get_filter_name($callback)] = $callback; + return $this; + } + + /** + * Unregisters a filter function + * + * @param string $type filter type + * @param callback $callback + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + */ + public function unregisterFilter($type, $callback) + { + $name = $this->_get_filter_name($callback); + if (isset($this->smarty->registered_filters[$type][$name])) { + unset($this->smarty->registered_filters[$type][$name]); + } + + return $this; + } + + /** + * Return internal filter name + * + * @param callback $function_name + * @return string internal filter name + */ + public function _get_filter_name($function_name) + { + if (is_array($function_name)) { + $_class_name = (is_object($function_name[0]) ? + get_class($function_name[0]) : $function_name[0]); + return $_class_name . '_' . $function_name[1]; + } else { + return $function_name; + } + } + + /** + * load a filter of specified type and name + * + * @param string $type filter type + * @param string $name filter name + * @throws SmartyException if filter could not be loaded + */ + public function loadFilter($type, $name) + { + $_plugin = "smarty_{$type}filter_{$name}"; + $_filter_name = $_plugin; + if ($this->smarty->loadPlugin($_plugin)) { + if (class_exists($_plugin, false)) { + $_plugin = array($_plugin, 'execute'); + } + if (is_callable($_plugin)) { + $this->smarty->registered_filters[$type][$_filter_name] = $_plugin; + return true; + } + } + throw new SmartyException("{$type}filter \"{$name}\" not callable"); + } + + /** + * unload a filter of specified type and name + * + * @param string $type filter type + * @param string $name filter name + * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining + */ + public function unloadFilter($type, $name) + { + $_filter_name = "smarty_{$type}filter_{$name}"; + if (isset($this->smarty->registered_filters[$type][$_filter_name])) { + unset ($this->smarty->registered_filters[$type][$_filter_name]); + } + + return $this; + } + + /** + * preg_replace callback to convert camelcase getter/setter to underscore property names + * + * @param string $match match string + * @return string replacemant + */ + private function replaceCamelcase($match) { + return "_" . strtolower($match[1]); + } + + /** + * Handle unknown class methods + * + * @param string $name unknown method-name + * @param array $args argument array + */ + public function __call($name, $args) + { + static $_prefixes = array('set' => true, 'get' => true); + static $_resolved_property_name = array(); + static $_resolved_property_source = array(); + + // method of Smarty object? + if (method_exists($this->smarty, $name)) { + return call_user_func_array(array($this->smarty, $name), $args); + } + // see if this is a set/get for a property + $first3 = strtolower(substr($name, 0, 3)); + if (isset($_prefixes[$first3]) && isset($name[3]) && $name[3] !== '_') { + if (isset($_resolved_property_name[$name])) { + $property_name = $_resolved_property_name[$name]; + } else { + // try to keep case correct for future PHP 6.0 case-sensitive class methods + // lcfirst() not available < PHP 5.3.0, so improvise + $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4); + // convert camel case to underscored name + $property_name = preg_replace_callback('/([A-Z])/', array($this,'replaceCamelcase'), $property_name); + $_resolved_property_name[$name] = $property_name; + } + if (isset($_resolved_property_source[$property_name])) { + $_is_this = $_resolved_property_source[$property_name]; + } else { + $_is_this = null; + if (property_exists($this, $property_name)) { + $_is_this = true; + } else if (property_exists($this->smarty, $property_name)) { + $_is_this = false; + } + $_resolved_property_source[$property_name] = $_is_this; + } + if ($_is_this) { + if ($first3 == 'get') + return $this->$property_name; + else + return $this->$property_name = $args[0]; + } else if ($_is_this === false) { + if ($first3 == 'get') + return $this->smarty->$property_name; + else + return $this->smarty->$property_name = $args[0]; + } else { + throw new SmartyException("property '$property_name' does not exist."); + return false; + } + } + if ($name == 'Smarty') { + throw new SmartyException("PHP5 requires you to call __construct() instead of Smarty()"); + } + // must be unknown + throw new SmartyException("Call of unknown method '$name'."); + } + +} + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/Widgets/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php index d00bfb8f..9511f2ef 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php @@ -1,229 +1,133 @@ <?php - /** * Smarty Internal Plugin Smarty Template Compiler Base - * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser * - * @package Smarty + * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser + * + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Main abstract compiler class * - * @package Smarty + * @package Smarty * @subpackage Compiler */ -abstract class Smarty_Internal_TemplateCompilerBase -{ +abstract class Smarty_Internal_TemplateCompilerBase { + /** * hash for nocache sections * * @var mixed */ private $nocache_hash = null; - /** * suppress generation of nocache code * * @var bool */ public $suppressNocacheProcessing = false; - /** * suppress generation of merged template code * * @var bool */ public $suppressMergedTemplates = false; - /** * compile tag objects * * @var array */ public static $_tag_objects = array(); - /** * tag stack * * @var array */ public $_tag_stack = array(); - /** * current template * * @var Smarty_Internal_Template */ public $template = null; - /** * merged templates * * @var array */ public $merged_templates = array(); - - /** - * sources which must be compiled - * - * @var array - */ - public $sources = array(); - /** - * flag that we are inside {block} + * flag when compiling {block} * * @var bool */ public $inheritance = false; - - /** - * flag when compiling inheritance child template - * - * @var bool - */ - public $inheritance_child = false; - - /** - * uid of templates called by {extends} for recursion check - * - * @var array - */ - public $extends_uid = array(); - - /** - * source line offset for error messages - * - * @var int - */ - public $trace_line_offset = 0; - - /** - * trace uid - * - * @var string - */ - public $trace_uid = ''; - - /** - * trace file path - * - * @var string - */ - public $trace_filepath = ''; - /** - * stack for tracing file and line of nested {block} tags - * - * @var array - */ - public $trace_stack = array(); - /** * plugins loaded by default plugin handler * * @var array */ public $default_handler_plugins = array(); - /** * saved preprocessed modifier list * * @var mixed */ public $default_modifier_list = null; - /** * force compilation of complete template as nocache - * * @var boolean */ public $forceNocache = false; - /** * suppress Smarty header code in compiled template - * * @var bool */ public $suppressHeader = false; - /** * suppress template property header code in compiled template - * * @var bool */ public $suppressTemplatePropertyHeader = false; - - /** - * suppress pre and post filter - * - * @var bool - */ - public $suppressFilter = false; - /** * flag if compiled template file shall we written - * * @var bool */ public $write_compiled_code = true; - /** * flag if currently a template function is compiled - * * @var bool */ public $compiles_template_function = false; - /** * called subfuntions from template function - * * @var array */ public $called_functions = array(); - /** * flags for used modifier plugins - * * @var array */ public $modifier_plugins = array(); /** - * type of already compiled modifier - * - * @var array - */ - public $known_modifier_type = array(); - - /** - * method to compile a Smarty template - * - * @param mixed $_content template source - * - * @return bool true if compiling succeeded, false if it failed - */ - abstract protected function doCompile($_content); - - /** * Initialize compiler */ public function __construct() { - $this->nocache_hash = str_replace(array('.', ','), '-', uniqid(rand(), true)); + $this->nocache_hash = str_replace('.', '-', uniqid(rand(), true)); } /** * Method to compile a Smarty template * * @param Smarty_Internal_Template $template template object to compile - * @param bool $nocache true is shall be compiled in nocache mode - * - * @return bool true if compiling succeeded, false if it failed + * @return bool true if compiling succeeded, false if it failed */ - public function compileTemplate(Smarty_Internal_Template $template, $nocache = false) + public function compileTemplate(Smarty_Internal_Template $template) { if (empty($template->properties['nocache_hash'])) { $template->properties['nocache_hash'] = $this->nocache_hash; @@ -231,13 +135,13 @@ abstract class Smarty_Internal_TemplateCompilerBase $this->nocache_hash = $template->properties['nocache_hash']; } // flag for nochache sections - $this->nocache = $nocache; + $this->nocache = false; $this->tag_nocache = false; // save template object in compiler class $this->template = $template; - // reset has nocache code flag + // reset has noche code flag $this->template->has_nocache_code = false; - $save_source = $this->template->source; + $this->smarty->_current_file = $saved_filepath = $this->template->source->filepath; // template header code $template_header = ''; if (!$this->suppressHeader) { @@ -245,88 +149,59 @@ abstract class Smarty_Internal_TemplateCompilerBase $template_header .= " compiled from \"" . $this->template->source->filepath . "\" */ ?>\n"; } - if (empty($this->template->source->components)) { - $this->sources = array($template->source); - } else { - // we have array of inheritance templates by extends: resource - $this->sources = array_reverse($template->source->components); - } - $loop = 0; - // the $this->sources array can get additional elements while compiling by the {extends} tag - while ($this->template->source = array_shift($this->sources)) { - $this->smarty->_current_file = $this->template->source->filepath; - if ($this->smarty->debugging) { - Smarty_Internal_Debug::start_compile($this->template); - } - $no_sources = count($this->sources); - if ($loop || $no_sources) { - $this->template->properties['file_dependency'][$this->template->source->uid] = array($this->template->source->filepath, $this->template->source->timestamp, $this->template->source->type); + do { + // flag for aborting current and start recompile + $this->abort_and_recompile = false; + // get template source + $_content = $template->source->content; + // run prefilter if required + if (isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) { + $template->source->content = $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template); } - $loop ++; - if ($no_sources) { - $this->inheritance_child = true; - } else { - $this->inheritance_child = false; - } - do { - $_compiled_code = ''; - // flag for aborting current and start recompile - $this->abort_and_recompile = false; - // get template source - $_content = $this->template->source->content; - if ($_content != '') { - // run prefilter if required - if ((isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) && !$this->suppressFilter) { - $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template); - } - // call compiler - $_compiled_code = $this->doCompile($_content); + // on empty template just return header + if ($_content == '') { + if ($this->suppressTemplatePropertyHeader) { + $code = ''; + } else { + $code = $template_header . $template->createTemplateCodeFrame(); } - } while ($this->abort_and_recompile); - if ($this->smarty->debugging) { - Smarty_Internal_Debug::end_compile($this->template); + return $code; } - } - // restore source - $this->template->source = $save_source; - unset($save_source); - $this->smarty->_current_file = $this->template->source->filepath; + // call compiler + $_compiled_code = $this->doCompile($_content); + } while ($this->abort_and_recompile); + $this->template->source->filepath = $saved_filepath; // free memory unset($this->parser->root_buffer, $this->parser->current_buffer, $this->parser, $this->lex, $this->template); self::$_tag_objects = array(); // return compiled code to template object $merged_code = ''; - if (!$this->suppressMergedTemplates && !empty($this->merged_templates)) { + if (!$this->suppressMergedTemplates) { foreach ($this->merged_templates as $code) { $merged_code .= $code; } } - // run postfilter if required on compiled template code - if ((isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) && !$this->suppressFilter && $_compiled_code != '') { - $_compiled_code = Smarty_Internal_Filter_Handler::runFilter('post', $_compiled_code, $template); - } if ($this->suppressTemplatePropertyHeader) { $code = $_compiled_code . $merged_code; } else { $code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code; } - // unset content because template inheritance could have replace source with parent code - unset ($template->source->content); - + // run postfilter if required + if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) { + $code = Smarty_Internal_Filter_Handler::runFilter('post', $code, $template); + } return $code; } /** * Compile Tag + * * This is a call back from the lexer/parser * It executes the required compile plugin for the Smarty tag * - * @param string $tag tag name - * @param array $args array with tag attributes - * @param array $parameter array with compilation parameter - * - * @throws SmartyCompilerException - * @throws SmartyException + * @param string $tag tag name + * @param array $args array with tag attributes + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compileTag($tag, $args, $parameter = array()) @@ -340,9 +215,8 @@ abstract class Smarty_Internal_TemplateCompilerBase $this->template->used_tags[] = array($tag, $args); } // check nocache option flag - if (in_array("'nocache'", $args) || in_array(array('nocache' => 'true'), $args) - || in_array(array('nocache' => '"true"'), $args) || in_array(array('nocache' => "'true'"), $args) - ) { + if (in_array("'nocache'",$args) || in_array(array('nocache'=>'true'),$args) + || in_array(array('nocache'=>'"true"'),$args) || in_array(array('nocache'=>"'true'"),$args)) { $this->tag_nocache = true; } // compile the smarty tag (required compile classes to compile the tag are autoloaded) @@ -366,7 +240,7 @@ abstract class Smarty_Internal_TemplateCompilerBase } } // tag did not produce compiled code - return null; + return ''; } else { // map_named attributes if (isset($args['_attr'])) { @@ -377,19 +251,17 @@ abstract class Smarty_Internal_TemplateCompilerBase } } // not an internal compiler tag - if (strlen($tag) < 6 || substr($tag, - 5) != 'close') { + if (strlen($tag) < 6 || substr($tag, -5) != 'close') { // check if tag is a registered object - if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_method'])) { - $method = $parameter['object_method']; - if (!in_array($method, $this->smarty->registered_objects[$tag][3]) && - (empty($this->smarty->registered_objects[$tag][1]) || in_array($method, $this->smarty->registered_objects[$tag][1])) - ) { - return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method); - } elseif (in_array($method, $this->smarty->registered_objects[$tag][3])) { - return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $method); + if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_methode'])) { + $methode = $parameter['object_methode']; + if (!in_array($methode, $this->smarty->registered_objects[$tag][3]) && + (empty($this->smarty->registered_objects[$tag][1]) || in_array($methode, $this->smarty->registered_objects[$tag][1]))) { + return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $methode); + } elseif (in_array($methode, $this->smarty->registered_objects[$tag][3])) { + return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode); } else { - // throw exception - $this->trigger_template_error('not allowed method "' . $method . '" in registered object "' . $tag . '"', $this->lex->taglineno); + return $this->trigger_template_error ('unallowed methode "' . $methode . '" in registered object "' . $tag . '"', $this->lex->taglineno); } } // check if tag is registered @@ -399,10 +271,10 @@ abstract class Smarty_Internal_TemplateCompilerBase if ($plugin_type == Smarty::PLUGIN_COMPILER) { $new_args = array(); foreach ($args as $key => $mixed) { - if (is_array($mixed)) { - $new_args = array_merge($new_args, $mixed); + if (is_array($mixed)) { + $new_args = array_merge($new_args, $mixed); } else { - $new_args[$key] = $mixed; + $new_args[$key] = $mixed; } } if (!$this->smarty->registered_plugins[$plugin_type][$tag][1]) { @@ -411,7 +283,7 @@ abstract class Smarty_Internal_TemplateCompilerBase $function = $this->smarty->registered_plugins[$plugin_type][$tag][0]; if (!is_array($function)) { return $function($new_args, $this); - } elseif (is_object($function[0])) { + } else if (is_object($function[0])) { return $this->smarty->registered_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this); } else { return call_user_func_array($function, array($new_args, $this)); @@ -421,23 +293,23 @@ abstract class Smarty_Internal_TemplateCompilerBase if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) { return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag); } + } } // check plugins from plugins folder foreach ($this->smarty->plugin_search_order as $plugin_type) { - if ($plugin_type == Smarty::PLUGIN_COMPILER && $this->smarty->loadPlugin('smarty_compiler_' . $tag) && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))) { + if ($plugin_type == Smarty::PLUGIN_BLOCK && $this->smarty->loadPlugin('smarty_compiler_' . $tag) && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))) { $plugin = 'smarty_compiler_' . $tag; if (is_callable($plugin)) { // convert arguments format for old compiler plugins $new_args = array(); foreach ($args as $key => $mixed) { - if (is_array($mixed)) { - $new_args = array_merge($new_args, $mixed); + if (is_array($mixed)) { + $new_args = array_merge($new_args, $mixed); } else { - $new_args[$key] = $mixed; + $new_args[$key] = $mixed; } } - return $plugin($new_args, $this->smarty); } if (class_exists($plugin, false)) { @@ -449,7 +321,7 @@ abstract class Smarty_Internal_TemplateCompilerBase throw new SmartyException("Plugin \"{$tag}\" not callable"); } else { if ($function = $this->getPlugin($tag, $plugin_type)) { - if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) { + if(!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) { return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function); } } @@ -483,7 +355,7 @@ abstract class Smarty_Internal_TemplateCompilerBase $function = $this->default_handler_plugins[$plugin_type][$tag][0]; if (!is_array($function)) { return $function($new_args, $this); - } elseif (is_object($function[0])) { + } else if (is_object($function[0])) { return $this->default_handler_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this); } else { return call_user_func_array($function, array($new_args, $this)); @@ -495,15 +367,14 @@ abstract class Smarty_Internal_TemplateCompilerBase } } else { // compile closing tag of block function - $base_tag = substr($tag, 0, - 5); + $base_tag = substr($tag, 0, -5); // check if closing tag is a registered object - if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_method'])) { - $method = $parameter['object_method']; - if (in_array($method, $this->smarty->registered_objects[$base_tag][3])) { - return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $method); + if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_methode'])) { + $methode = $parameter['object_methode']; + if (in_array($methode, $this->smarty->registered_objects[$base_tag][3])) { + return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode); } else { - // throw exception - $this->trigger_template_error('not allowed closing tag method "' . $method . '" in registered object "' . $base_tag . '"', $this->lex->taglineno); + return $this->trigger_template_error ('unallowed closing tag methode "' . $methode . '" in registered object "' . $base_tag . '"', $this->lex->taglineno); } } // registered block tag ? @@ -514,22 +385,6 @@ abstract class Smarty_Internal_TemplateCompilerBase if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) { return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function); } - // registered compiler plugin ? - if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag])) { - // if compiler function plugin call it now - $args = array(); - if (!$this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][1]) { - $this->tag_nocache = true; - } - $function = $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0]; - if (!is_array($function)) { - return $function($args, $this); - } elseif (is_object($function[0])) { - return $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0][0]->$function[1]($args, $this); - } else { - return call_user_func_array($function, array($args, $this)); - } - } if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) { $plugin = 'smarty_compiler_' . $tag; if (is_callable($plugin)) { @@ -544,22 +399,22 @@ abstract class Smarty_Internal_TemplateCompilerBase throw new SmartyException("Plugin \"{$tag}\" not callable"); } } - $this->trigger_template_error("unknown tag \"" . $tag . "\"", $this->lex->taglineno); + $this->trigger_template_error ("unknown tag \"" . $tag . "\"", $this->lex->taglineno); } } /** - * lazy loads internal compile plugin for tag and calls the compile method + * lazy loads internal compile plugin for tag and calls the compile methode + * * compile objects cached for reuse. * class name format: Smarty_Internal_Compile_TagName * plugin filename format: Smarty_Internal_Tagname.php * - * @param string $tag tag name - * @param array $args list of tag attributes - * @param mixed $param1 optional parameter - * @param mixed $param2 optional parameter - * @param mixed $param3 optional parameter - * + * @param string $tag tag name + * @param array $args list of tag attributes + * @param mixed $param1 optional parameter + * @param mixed $param2 optional parameter + * @param mixed $param3 optional parameter * @return string compiled code */ public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null) @@ -574,10 +429,10 @@ abstract class Smarty_Internal_TemplateCompilerBase if ($this->smarty->loadPlugin($class_name)) { // check if tag allowed by security if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) { - // use plugin if found - self::$_tag_objects[$tag] = new $class_name; - // compile this tag - return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3); + // use plugin if found + self::$_tag_objects[$tag] = new $class_name; + // compile this tag + return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3); } } // no internal compile plugin for this tag @@ -587,9 +442,8 @@ abstract class Smarty_Internal_TemplateCompilerBase /** * Check for plugins and return function name * - * @param $plugin_name - * @param string $plugin_type type of plugin - * + * @param string $pugin_name name of plugin or function + * @param string $plugin_type type of plugin * @return string call name of function */ public function getPlugin($plugin_name, $plugin_type) @@ -598,14 +452,14 @@ abstract class Smarty_Internal_TemplateCompilerBase if ($this->template->caching && ($this->nocache || $this->tag_nocache)) { if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) { $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function']; - } elseif (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) { + } else if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) { $this->template->required_plugins['nocache'][$plugin_name][$plugin_type] = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]; $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function']; } } else { if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) { $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function']; - } elseif (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) { + } else if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) { $this->template->required_plugins['compiled'][$plugin_name][$plugin_type] = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]; $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function']; } @@ -614,7 +468,6 @@ abstract class Smarty_Internal_TemplateCompilerBase if ($plugin_type == 'modifier') { $this->modifier_plugins[$plugin_name] = true; } - return $function; } // loop through plugin dirs and find the plugin @@ -632,35 +485,31 @@ abstract class Smarty_Internal_TemplateCompilerBase if ($plugin_type == 'modifier') { $this->modifier_plugins[$plugin_name] = true; } - return $function; } if (is_callable($function)) { // plugin function is defined in the script return $function; } - return false; } /** * Check for plugins by default plugin handler * - * @param string $tag name of tag - * @param string $plugin_type type of plugin - * + * @param string $tag name of tag + * @param string $plugin_type type of plugin * @return boolean true if found */ public function getPluginFromDefaultHandler($tag, $plugin_type) { $callback = null; $script = null; - $cacheable = true; $result = call_user_func_array( - $this->smarty->default_plugin_handler_func, array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable) + $this->smarty->default_plugin_handler_func, + array($tag, $plugin_type, $this->template, &$callback, &$script) ); if ($result) { - $this->tag_nocache = $this->tag_nocache || !$cacheable; if ($script !== null) { if (is_file($script)) { if ($this->template->caching && ($this->nocache || $this->tag_nocache)) { @@ -671,7 +520,7 @@ abstract class Smarty_Internal_TemplateCompilerBase $this->template->required_plugins['compiled'][$tag][$plugin_type]['function'] = $callback; } include_once $script; - } else { + } else { $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found"); } } @@ -680,26 +529,24 @@ abstract class Smarty_Internal_TemplateCompilerBase } if (is_callable($callback)) { $this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array()); - return true; } else { $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable"); } } - return false; } /** * Inject inline code for nocache template sections + * * This method gets the content of each template element from the parser. * If the content is compiled code and it should be not cached the code is injected * into the rendered output. * - * @param string $content content of template element - * @param boolean $is_code true if content is compiled code - * - * @return string content + * @param string $content content of template element + * @param boolean $is_code true if content is compiled code + * @return string content */ public function processNocacheCode($content, $is_code) { @@ -707,13 +554,13 @@ abstract class Smarty_Internal_TemplateCompilerBase if ($is_code && !empty($content)) { // generate replacement code if ((!($this->template->source->recompiled) || $this->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing && - ($this->nocache || $this->tag_nocache) - ) { + ($this->nocache || $this->tag_nocache || $this->forceNocache == 2)) { $this->template->has_nocache_code = true; - $_output = addcslashes($content, '\'\\'); + $_output = str_replace("'", "\'", $content); + $_output = str_replace('\\\\', '\\\\\\\\', $_output); $_output = str_replace("^#^", "'", $_output); $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n"; - // make sure we include modifier plugins for nocache code + // make sure we include modifer plugins for nocache code foreach ($this->modifier_plugins as $plugin_name => $dummy) { if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) { $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier']; @@ -728,60 +575,19 @@ abstract class Smarty_Internal_TemplateCompilerBase $this->modifier_plugins = array(); $this->suppressNocacheProcessing = false; $this->tag_nocache = false; - return $_output; } /** - * push current file and line offset on stack for tracing {block} source lines - * - * @param string $file new filename - * @param string $uid uid of file - * @param int $line line offset to source - * @param bool $debug false debug end_compile shall not be called - */ - public function pushTrace($file, $uid, $line, $debug = true) - { - if ($this->smarty->debugging && $debug) { - Smarty_Internal_Debug::end_compile($this->template); - } - array_push($this->trace_stack, array($this->smarty->_current_file, $this->trace_filepath, $this->trace_uid, $this->trace_line_offset)); - $this->trace_filepath = $this->smarty->_current_file = $file; - $this->trace_uid = $uid; - $this->trace_line_offset = $line; - if ($this->smarty->debugging) { - Smarty_Internal_Debug::start_compile($this->template); - } - } - - /** - * restore file and line offset - - */ - public function popTrace() - { - if ($this->smarty->debugging) { - Smarty_Internal_Debug::end_compile($this->template); - } - $r = array_pop($this->trace_stack); - $this->smarty->_current_file = $r[0]; - $this->trace_filepath = $r[1]; - $this->trace_uid = $r[2]; - $this->trace_line_offset = $r[3]; - if ($this->smarty->debugging) { - Smarty_Internal_Debug::start_compile($this->template); - } - } - - /** * display compiler error messages without dying + * * If parameter $args is empty it is a parser detected syntax error. * In this case the parser is called to obtain information about expected tokens. - * If parameter $args contains a string this is used as error message * - * @param string $args individual error message or null - * @param string $line line-number + * If parameter $args contains a string this is used as error message * + * @param string $args individual error message or null + * @param string $line line-number * @throws SmartyCompilerException when an unexpected token is found */ public function trigger_template_error($args = null, $line = null) @@ -790,16 +596,15 @@ abstract class Smarty_Internal_TemplateCompilerBase if (!isset($line)) { $line = $this->lex->line; } - // $line += $this->trace_line_offset; $match = preg_split("/\n/", $this->lex->data); - $error_text = 'Syntax error in template "' . (empty($this->trace_filepath) ? $this->template->source->filepath : $this->trace_filepath) . '" on line ' . ($line + $this->trace_line_offset) . ' "' . trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1])) . '" '; + $error_text = 'Syntax Error in template "' . $this->template->source->filepath . '" on line ' . $line . ' "' . htmlspecialchars(trim(preg_replace('![\t\r\n]+!',' ',$match[$line-1]))) . '" '; if (isset($args)) { // individual error message $error_text .= $args; } else { // expected token from parser - $error_text .= ' - Unexpected "' . $this->lex->value . '"'; - if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) { + $error_text .= ' - Unexpected "' . $this->lex->value.'"'; + if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4 ) { foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) { $exp_token = $this->parser->yyTokenName[$token]; if (isset($this->lex->smarty_token_names[$exp_token])) { @@ -813,11 +618,9 @@ abstract class Smarty_Internal_TemplateCompilerBase $error_text .= ', expected one of: ' . implode(' , ', $expect); } } - $e = new SmartyCompilerException($error_text); - $e->line = $line; - $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1])); - $e->desc = $args; - $e->template = $this->template->source->filepath; - throw $e; + throw new SmartyCompilerException($error_text); } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_templatelexer.php b/Widgets/smarty/libs/sysplugins/smarty_internal_templatelexer.php index 4de8a9c0..fde9b7d1 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_templatelexer.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_templatelexer.php @@ -1,16 +1,15 @@ <?php /** - * Smarty Internal Plugin Templatelexer - * This is the lexer to break the template source into tokens - * - * @package Smarty - * @subpackage Compiler - * @author Uwe Tews - */ - +* Smarty Internal Plugin Templatelexer +* +* This is the lexer to break the template source into tokens +* @package Smarty +* @subpackage Compiler +* @author Uwe Tews +*/ /** - * Smarty Internal Plugin Templatelexer - */ +* Smarty Internal Plugin Templatelexer +*/ class Smarty_Internal_Templatelexer { public $data; @@ -20,172 +19,149 @@ class Smarty_Internal_Templatelexer public $node; public $line; public $taglineno; - public $is_phpScript = false; public $state = 1; - public $smarty; - public $literal_cnt = 0; private $heredoc_id_stack = Array(); - public $yyTraceFILE; - public $yyTracePrompt; - public $state_name = array(1 => 'TEXT', 2 => 'SMARTY', 3 => 'LITERAL', 4 => 'DOUBLEQUOTEDSTRING', 5 => 'CHILDBODY'); - public $smarty_token_names = array( // Text for parser error messages - 'IDENTITY' => '===', - 'NONEIDENTITY' => '!==', - 'EQUALS' => '==', - 'NOTEQUALS' => '!=', - 'GREATEREQUAL' => '(>=,ge)', - 'LESSEQUAL' => '(<=,le)', - 'GREATERTHAN' => '(>,gt)', - 'LESSTHAN' => '(<,lt)', - 'MOD' => '(%,mod)', - 'NOT' => '(!,not)', - 'LAND' => '(&&,and)', - 'LOR' => '(||,or)', - 'LXOR' => 'xor', - 'OPENP' => '(', - 'CLOSEP' => ')', - 'OPENB' => '[', - 'CLOSEB' => ']', - 'PTR' => '->', - 'APTR' => '=>', - 'EQUAL' => '=', - 'NUMBER' => 'number', - 'UNIMATH' => '+" , "-', - 'MATH' => '*" , "/" , "%', - 'INCDEC' => '++" , "--', - 'SPACE' => ' ', - 'DOLLAR' => '$', - 'SEMICOLON' => ';', - 'COLON' => ':', - 'DOUBLECOLON' => '::', - 'AT' => '@', - 'HATCH' => '#', - 'QUOTE' => '"', - 'BACKTICK' => '`', - 'VERT' => '|', - 'DOT' => '.', - 'COMMA' => '","', - 'ANDSYM' => '"&"', - 'QMARK' => '"?"', - 'ID' => 'identifier', - 'TEXT' => 'text', - 'FAKEPHPSTARTTAG' => 'Fake PHP start tag', - 'PHPSTARTTAG' => 'PHP start tag', - 'PHPENDTAG' => 'PHP end tag', - 'LITERALSTART' => 'Literal start', - 'LITERALEND' => 'Literal end', - 'LDELSLASH' => 'closing tag', - 'COMMENT' => 'comment', - 'AS' => 'as', - 'TO' => 'to', - ); - - function __construct($data, $compiler) - { - // $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data); + public $smarty_token_names = array ( // Text for parser error messages + 'IDENTITY' => '===', + 'NONEIDENTITY' => '!==', + 'EQUALS' => '==', + 'NOTEQUALS' => '!=', + 'GREATEREQUAL' => '(>=,ge)', + 'LESSEQUAL' => '(<=,le)', + 'GREATERTHAN' => '(>,gt)', + 'LESSTHAN' => '(<,lt)', + 'MOD' => '(%,mod)', + 'NOT' => '(!,not)', + 'LAND' => '(&&,and)', + 'LOR' => '(||,or)', + 'LXOR' => 'xor', + 'OPENP' => '(', + 'CLOSEP' => ')', + 'OPENB' => '[', + 'CLOSEB' => ']', + 'PTR' => '->', + 'APTR' => '=>', + 'EQUAL' => '=', + 'NUMBER' => 'number', + 'UNIMATH' => '+" , "-', + 'MATH' => '*" , "/" , "%', + 'INCDEC' => '++" , "--', + 'SPACE' => ' ', + 'DOLLAR' => '$', + 'SEMICOLON' => ';', + 'COLON' => ':', + 'DOUBLECOLON' => '::', + 'AT' => '@', + 'HATCH' => '#', + 'QUOTE' => '"', + 'BACKTICK' => '`', + 'VERT' => '|', + 'DOT' => '.', + 'COMMA' => '","', + 'ANDSYM' => '"&"', + 'QMARK' => '"?"', + 'ID' => 'identifier', + 'TEXT' => 'text', + 'FAKEPHPSTARTTAG' => 'Fake PHP start tag', + 'PHPSTARTTAG' => 'PHP start tag', + 'PHPENDTAG' => 'PHP end tag', + 'LITERALSTART' => 'Literal start', + 'LITERALEND' => 'Literal end', + 'LDELSLASH' => 'closing tag', + 'COMMENT' => 'comment', + 'AS' => 'as', + 'TO' => 'to', + ); + + + function __construct($data,$compiler) + { +// $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data); $this->data = $data; $this->counter = 0; - if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) { - $this->counter += strlen($match[0]); - } $this->line = 1; $this->smarty = $compiler->smarty; $this->compiler = $compiler; - $this->ldel = preg_quote($this->smarty->left_delimiter, '/'); + $this->ldel = preg_quote($this->smarty->left_delimiter,'/'); $this->ldel_length = strlen($this->smarty->left_delimiter); - $this->rdel = preg_quote($this->smarty->right_delimiter, '/'); - $this->rdel_length = strlen($this->smarty->right_delimiter); - $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter; - $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter; - } + $this->rdel = preg_quote($this->smarty->right_delimiter,'/'); + $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter; + $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter; + $this->mbstring_overload = ini_get('mbstring.func_overload') & 2; + } - public function PrintTrace() - { - $this->yyTraceFILE = fopen('php://output', 'w'); - $this->yyTracePrompt = '<br>'; - } private $_yy_state = 1; private $_yy_stack = array(); - public function yylex() + function yylex() { return $this->{'yylex' . $this->_yy_state}(); } - public function yypushstate($state) + function yypushstate($state) { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); - } array_push($this->_yy_stack, $this->_yy_state); $this->_yy_state = $state; - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); - } } - public function yypopstate() + function yypopstate() { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); - } $this->_yy_state = array_pop($this->_yy_stack); - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); - } } - public function yybegin($state) + function yybegin($state) { $this->_yy_state = $state; - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state); - } } - public function yylex1() - { - $tokenMap = array( - 1 => 0, - 2 => 1, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 1, - 9 => 0, - 10 => 0, - 11 => 0, - 12 => 0, - 13 => 0, - 14 => 2, - 17 => 0, - 18 => 0, - 19 => 0, - 20 => 0, - 21 => 0, - 22 => 0, - ); + + + function yylex1() + { + $tokenMap = array ( + 1 => 0, + 2 => 0, + 3 => 1, + 5 => 0, + 6 => 0, + 7 => 0, + 8 => 0, + 9 => 0, + 10 => 0, + 11 => 1, + 13 => 0, + 14 => 0, + 15 => 0, + 16 => 0, + 17 => 0, + 18 => 0, + 19 => 0, + 20 => 0, + 21 => 0, + 22 => 0, + 23 => 0, + ); if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G((<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|(<\\?(?:php\\w+|=|[a-zA-Z]+)?))|\G(\\?>)|\G(<\/script>)|\G(\\s*" . $this->rdel . ")|\G(<%)|\G(%>)|\G([\S\s])/iS"; + $yy_global_pattern = "/\G(".$this->ldel."[$]smarty\\.block\\.child".$this->rdel.")|\G(\\{\\})|\G(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|\G(".$this->ldel."strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s*setfilter\\s+)|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS"; do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state TEXT'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state TEXT'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -208,281 +184,277 @@ class Smarty_Internal_Templatelexer } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const TEXT = 1; + const TEXT = 1; function yy_r1_1($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILD; } - function yy_r1_2($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_COMMENT; + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - - function yy_r1_4($yy_subpatterns) + function yy_r1_3($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_STRIPON; - } + $this->token = Smarty_Internal_Templateparser::TP_COMMENT; } - function yy_r1_5($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF; - } + $this->token = Smarty_Internal_Templateparser::TP_STRIPON; } - function yy_r1_6($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; - $this->yypushstate(self::LITERAL); - } + if ($this->smarty->auto_literal) { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_STRIPON; + } } - function yy_r1_7($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELIF; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF; } + function yy_r1_8($yy_subpatterns) + { + if ($this->smarty->auto_literal) { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF; + } + } function yy_r1_9($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; + $this->yypushstate(self::LITERAL); } - function yy_r1_10($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + if ($this->smarty->auto_literal) { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - function yy_r1_11($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELIF; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - - function yy_r1_12($yy_subpatterns) + function yy_r1_13($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - - function yy_r1_13($yy_subpatterns) + function yy_r1_14($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - - function yy_r1_14($yy_subpatterns) + function yy_r1_15($yy_subpatterns) { - if (($script = strpos($this->value, '<s') === 0) || in_array($this->value, Array('<?', '<?=', '<?php'))) { - if ($script) { - $this->is_phpScript = true; - } - $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG; - } elseif ($this->value == '<?xml') { - $this->token = Smarty_Internal_Templateparser::TP_XMLTAG; - } else { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - //$this->value = substr($this->value, 0, 2); - } + if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } + function yy_r1_16($yy_subpatterns) + { + if ($this->smarty->auto_literal) { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } + } function yy_r1_17($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG; + $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; } - function yy_r1_18($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_PHPENDSCRIPT; + $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; } - function yy_r1_19($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } - + if (in_array($this->value, Array('<?', '<?=', '<?php'))) { + $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG; + } elseif ($this->value == '<?xml') { + $this->token = Smarty_Internal_Templateparser::TP_XMLTAG; + } else { + $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG; + $this->value = substr($this->value, 0, 2); + } + } function yy_r1_20($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG; + $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG; } - function yy_r1_21($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG; + $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG; } - function yy_r1_22($yy_subpatterns) { - $phpEndScript = $this->is_phpScript ? '|<\\/script>' : ''; - $to = strlen($this->data); - preg_match("/{$this->ldel}|<\?|<%|\?>|%>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>{$phpEndScript}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); - if (isset($match[0][1])) { - $to = $match[0][1]; - } - $this->value = substr($this->data, $this->counter, $to - $this->counter); - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } - - public function yylex2() - { - $tokenMap = array( - 1 => 0, - 2 => 0, - 3 => 1, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - 9 => 0, - 10 => 0, - 11 => 0, - 12 => 0, - 13 => 0, - 14 => 0, - 15 => 1, - 17 => 1, - 19 => 1, - 21 => 0, - 22 => 0, - 23 => 0, - 24 => 0, - 25 => 0, - 26 => 0, - 27 => 0, - 28 => 0, - 29 => 0, - 30 => 0, - 31 => 0, - 32 => 0, - 33 => 0, - 34 => 0, - 35 => 0, - 36 => 0, - 37 => 0, - 38 => 3, - 42 => 0, - 43 => 0, - 44 => 0, - 45 => 0, - 46 => 0, - 47 => 0, - 48 => 0, - 49 => 0, - 50 => 1, - 52 => 1, - 54 => 0, - 55 => 0, - 56 => 0, - 57 => 0, - 58 => 0, - 59 => 0, - 60 => 0, - 61 => 0, - 62 => 0, - 63 => 0, - 64 => 0, - 65 => 0, - 66 => 0, - 67 => 0, - 68 => 0, - 69 => 0, - 70 => 1, - 72 => 0, - 73 => 0, - 74 => 0, - 75 => 0, - 76 => 0, - ); + $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG; + } + function yy_r1_23($yy_subpatterns) + { + + $to = strlen($this->data); + preg_match("/{$this->ldel}|<\?|\?>|<%|%>/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter); + if (isset($match[0][1])) { + $to = $match[0][1]; + } + $this->value = substr($this->data,$this->counter,$to-$this->counter); + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } + + + function yylex2() + { + $tokenMap = array ( + 1 => 0, + 2 => 0, + 3 => 1, + 5 => 0, + 6 => 0, + 7 => 0, + 8 => 0, + 9 => 0, + 10 => 0, + 11 => 0, + 12 => 0, + 13 => 0, + 14 => 0, + 15 => 0, + 16 => 0, + 17 => 0, + 18 => 0, + 19 => 0, + 20 => 1, + 22 => 1, + 24 => 1, + 26 => 0, + 27 => 0, + 28 => 0, + 29 => 0, + 30 => 0, + 31 => 0, + 32 => 0, + 33 => 0, + 34 => 0, + 35 => 0, + 36 => 0, + 37 => 0, + 38 => 0, + 39 => 0, + 40 => 0, + 41 => 0, + 42 => 0, + 43 => 3, + 47 => 0, + 48 => 0, + 49 => 0, + 50 => 0, + 51 => 0, + 52 => 0, + 53 => 0, + 54 => 0, + 55 => 1, + 57 => 1, + 59 => 0, + 60 => 0, + 61 => 0, + 62 => 0, + 63 => 0, + 64 => 0, + 65 => 0, + 66 => 0, + 67 => 0, + 68 => 0, + 69 => 0, + 70 => 0, + 71 => 0, + 72 => 0, + 73 => 0, + 74 => 0, + 75 => 0, + 76 => 0, + ); if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G(\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G(\\$)|\G(\\s*" . $this->rdel . ")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(@)|\G(#)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/iS"; + $yy_global_pattern = "/\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(".$this->rdel.")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(\\$)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(@)|\G(#)|\G(\")|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(\\s+)|\G([\S\s])/iS"; do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state SMARTY'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state SMARTY'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -505,481 +477,424 @@ class Smarty_Internal_Templatelexer } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const SMARTY = 2; + const SMARTY = 2; function yy_r2_1($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_QUOTE; - $this->yypushstate(self::DOUBLEQUOTEDSTRING); + $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING; } - function yy_r2_2($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING; + if ($this->smarty->auto_literal) { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - function yy_r2_3($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT; - $this->taglineno = $this->line; + if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELIF; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - function yy_r2_5($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_DOLLAR; + if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - function yy_r2_6($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_RDEL; - $this->yypopstate(); + if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - function yy_r2_7($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISIN; + if ($this->smarty->auto_literal) { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - function yy_r2_8($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_AS; + $this->token = Smarty_Internal_Templateparser::TP_RDEL; + $this->yypopstate(); } - function yy_r2_9($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TO; + $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; } - function yy_r2_10($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_STEP; + $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; } - function yy_r2_11($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF; + $this->token = Smarty_Internal_Templateparser::TP_RDEL; + $this->yypopstate(); } - function yy_r2_12($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_IDENTITY; + $this->token = Smarty_Internal_Templateparser::TP_ISIN; } - function yy_r2_13($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY; + $this->token = Smarty_Internal_Templateparser::TP_AS; } - function yy_r2_14($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_EQUALS; + $this->token = Smarty_Internal_Templateparser::TP_TO; } - function yy_r2_15($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS; + $this->token = Smarty_Internal_Templateparser::TP_STEP; } - - function yy_r2_17($yy_subpatterns) + function yy_r2_16($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL; + $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF; } - - function yy_r2_19($yy_subpatterns) + function yy_r2_17($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL; + $this->token = Smarty_Internal_Templateparser::TP_IDENTITY; } - - function yy_r2_21($yy_subpatterns) + function yy_r2_18($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN; + $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY; } - - function yy_r2_22($yy_subpatterns) + function yy_r2_19($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN; + $this->token = Smarty_Internal_Templateparser::TP_EQUALS; } - - function yy_r2_23($yy_subpatterns) + function yy_r2_20($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_MOD; + $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS; } - - function yy_r2_24($yy_subpatterns) + function yy_r2_22($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_NOT; + $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL; } - - function yy_r2_25($yy_subpatterns) + function yy_r2_24($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_LAND; + $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL; } - function yy_r2_26($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_LOR; + $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN; } - function yy_r2_27($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_LXOR; + $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN; } - function yy_r2_28($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISODDBY; + $this->token = Smarty_Internal_Templateparser::TP_MOD; } - function yy_r2_29($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY; + $this->token = Smarty_Internal_Templateparser::TP_NOT; } - function yy_r2_30($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISODD; + $this->token = Smarty_Internal_Templateparser::TP_LAND; } - function yy_r2_31($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD; + $this->token = Smarty_Internal_Templateparser::TP_LOR; } - function yy_r2_32($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY; + $this->token = Smarty_Internal_Templateparser::TP_LXOR; } - function yy_r2_33($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY; + $this->token = Smarty_Internal_Templateparser::TP_ISODDBY; } - function yy_r2_34($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISEVEN; + $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY; } - function yy_r2_35($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN; + $this->token = Smarty_Internal_Templateparser::TP_ISODD; } - function yy_r2_36($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY; + $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD; } - function yy_r2_37($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY; + $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY; } - function yy_r2_38($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TYPECAST; + $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY; } - - function yy_r2_42($yy_subpatterns) + function yy_r2_39($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_OPENP; + $this->token = Smarty_Internal_Templateparser::TP_ISEVEN; } - - function yy_r2_43($yy_subpatterns) + function yy_r2_40($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_CLOSEP; + $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN; } - - function yy_r2_44($yy_subpatterns) + function yy_r2_41($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_OPENB; + $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY; } - - function yy_r2_45($yy_subpatterns) + function yy_r2_42($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_CLOSEB; + $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY; } - - function yy_r2_46($yy_subpatterns) + function yy_r2_43($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_PTR; + $this->token = Smarty_Internal_Templateparser::TP_TYPECAST; } - function yy_r2_47($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_APTR; + $this->token = Smarty_Internal_Templateparser::TP_OPENP; } - function yy_r2_48($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_EQUAL; + $this->token = Smarty_Internal_Templateparser::TP_CLOSEP; } - function yy_r2_49($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_INCDEC; + $this->token = Smarty_Internal_Templateparser::TP_OPENB; } - function yy_r2_50($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_UNIMATH; + $this->token = Smarty_Internal_Templateparser::TP_CLOSEB; } - - function yy_r2_52($yy_subpatterns) + function yy_r2_51($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_MATH; + $this->token = Smarty_Internal_Templateparser::TP_PTR; } - - function yy_r2_54($yy_subpatterns) + function yy_r2_52($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_AT; + $this->token = Smarty_Internal_Templateparser::TP_APTR; } - - function yy_r2_55($yy_subpatterns) + function yy_r2_53($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_HATCH; + $this->token = Smarty_Internal_Templateparser::TP_EQUAL; } - - function yy_r2_56($yy_subpatterns) + function yy_r2_54($yy_subpatterns) { - // resolve conflicts with shorttag and right_delimiter starting with '=' - if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == $this->smarty->right_delimiter) { - preg_match("/\s+/", $this->value, $match); - $this->value = $match[0]; - $this->token = Smarty_Internal_Templateparser::TP_SPACE; - } else { - $this->token = Smarty_Internal_Templateparser::TP_ATTR; - } + $this->token = Smarty_Internal_Templateparser::TP_INCDEC; } - - function yy_r2_57($yy_subpatterns) + function yy_r2_55($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ID; + $this->token = Smarty_Internal_Templateparser::TP_UNIMATH; } - - function yy_r2_58($yy_subpatterns) + function yy_r2_57($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_INTEGER; + $this->token = Smarty_Internal_Templateparser::TP_MATH; } - function yy_r2_59($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; - $this->yypopstate(); + $this->token = Smarty_Internal_Templateparser::TP_DOLLAR; } - function yy_r2_60($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_VERT; + $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON; } - function yy_r2_61($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_DOT; + $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON; } - function yy_r2_62($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_COMMA; + $this->token = Smarty_Internal_Templateparser::TP_COLON; } - function yy_r2_63($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON; + $this->token = Smarty_Internal_Templateparser::TP_AT; } - function yy_r2_64($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON; + $this->token = Smarty_Internal_Templateparser::TP_HATCH; } - function yy_r2_65($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_COLON; + $this->token = Smarty_Internal_Templateparser::TP_QUOTE; + $this->yypushstate(self::DOUBLEQUOTEDSTRING); } - function yy_r2_66($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_ANDSYM; + $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; + $this->yypopstate(); } - function yy_r2_67($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_QMARK; + $this->token = Smarty_Internal_Templateparser::TP_VERT; } - function yy_r2_68($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_HEX; + $this->token = Smarty_Internal_Templateparser::TP_DOT; } - function yy_r2_69($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_SPACE; + $this->token = Smarty_Internal_Templateparser::TP_COMMA; } - function yy_r2_70($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELIF; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + $this->token = Smarty_Internal_Templateparser::TP_ANDSYM; } + function yy_r2_71($yy_subpatterns) + { + $this->token = Smarty_Internal_Templateparser::TP_QMARK; + } function yy_r2_72($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + $this->token = Smarty_Internal_Templateparser::TP_HEX; } - function yy_r2_73($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + $this->token = Smarty_Internal_Templateparser::TP_ID; } - function yy_r2_74($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + $this->token = Smarty_Internal_Templateparser::TP_INTEGER; } - function yy_r2_75($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + $this->token = Smarty_Internal_Templateparser::TP_SPACE; } - function yy_r2_76($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - public function yylex3() + + + function yylex3() { - $tokenMap = array( - 1 => 0, - 2 => 0, - 3 => 0, - ); + $tokenMap = array ( + 1 => 0, + 2 => 0, + 3 => 0, + 4 => 0, + 5 => 0, + 6 => 0, + 7 => 0, + ); if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS"; + $yy_global_pattern = "/\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*\/literal\\s*".$this->rdel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS"; do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state LITERAL'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state LITERAL'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } @@ -1002,267 +917,112 @@ class Smarty_Internal_Templatelexer } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const LITERAL = 3; + const LITERAL = 3; function yy_r3_1($yy_subpatterns) { - $this->literal_cnt ++; - $this->token = Smarty_Internal_Templateparser::TP_LITERAL; + $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART; + $this->yypushstate(self::LITERAL); } - function yy_r3_2($yy_subpatterns) { - if ($this->literal_cnt) { - $this->literal_cnt --; - $this->token = Smarty_Internal_Templateparser::TP_LITERAL; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LITERALEND; - $this->yypopstate(); - } + $this->token = Smarty_Internal_Templateparser::TP_LITERALEND; + $this->yypopstate(); } - function yy_r3_3($yy_subpatterns) { - $to = strlen($this->data); - preg_match("/{$this->ldel}\/?literal{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); - if (isset($match[0][1])) { - $to = $match[0][1]; - } else { - $this->compiler->trigger_template_error("missing or misspelled literal closing tag"); - } - $this->value = substr($this->data, $this->counter, $to - $this->counter); - $this->token = Smarty_Internal_Templateparser::TP_LITERAL; - } - - public function yylex4() - { - $tokenMap = array( - 1 => 1, - 3 => 0, - 4 => 0, - 5 => 0, - 6 => 0, - 7 => 0, - 8 => 0, - 9 => 0, - 10 => 0, - 11 => 0, - 12 => 0, - 13 => 3, - 17 => 0, - ); - if ($this->counter >= strlen($this->data)) { - return false; // end of input - } - $yy_global_pattern = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS"; - - do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { - $yysubmatches = $yymatches; - $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns - if (!count($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state DOUBLEQUOTEDSTRING'); - } - next($yymatches); // skip global match - $this->token = key($yymatches); // token number - if ($tokenMap[$this->token]) { - // extract sub-patterns for passing to lex function - $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); - } else { - $yysubmatches = array(); - } - $this->value = current($yymatches); // token value - $r = $this->{'yy_r4_' . $this->token}($yysubmatches); - if ($r === null) { - $this->counter += strlen($this->value); - $this->line += substr_count($this->value, "\n"); - // accept this token - return true; - } elseif ($r === true) { - // we have changed state - // process this token in the new state - return $this->yylex(); - } elseif ($r === false) { - $this->counter += strlen($this->value); - $this->line += substr_count($this->value, "\n"); - if ($this->counter >= strlen($this->data)) { - return false; // end of input - } - // skip this token - continue; - } - } else { - throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); - } - break; - } while (true); - } // end function - - const DOUBLEQUOTEDSTRING = 4; - - function yy_r4_1($yy_subpatterns) - { - - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELIF; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + if (in_array($this->value, Array('<?', '<?=', '<?php'))) { + $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG; + } else { + $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG; + $this->value = substr($this->value, 0, 2); + } } - - function yy_r4_3($yy_subpatterns) + function yy_r3_4($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG; } - - function yy_r4_4($yy_subpatterns) + function yy_r3_5($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } + $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG; } - - function yy_r4_5($yy_subpatterns) + function yy_r3_6($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; + $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG; } - - function yy_r4_6($yy_subpatterns) + function yy_r3_7($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } + $to = strlen($this->data); + preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter); + if (isset($match[0][1])) { + $to = $match[0][1]; + } else { + $this->compiler->trigger_template_error ("missing or misspelled literal closing tag"); + } - function yy_r4_7($yy_subpatterns) - { - - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } - } - - function yy_r4_8($yy_subpatterns) - { - - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDEL; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } - } - - function yy_r4_9($yy_subpatterns) - { - - $this->token = Smarty_Internal_Templateparser::TP_QUOTE; - $this->yypopstate(); - } - - function yy_r4_10($yy_subpatterns) - { - - $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; - $this->value = substr($this->value, 0, - 1); - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; + $this->value = substr($this->data,$this->counter,$to-$this->counter); + $this->token = Smarty_Internal_Templateparser::TP_LITERAL; } - function yy_r4_11($yy_subpatterns) - { - - $this->token = Smarty_Internal_Templateparser::TP_DOLLARID; - } - function yy_r4_12($yy_subpatterns) + function yylex4() { - - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } - - function yy_r4_13($yy_subpatterns) - { - - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } - - function yy_r4_17($yy_subpatterns) - { - - $to = strlen($this->data); - $this->value = substr($this->data, $this->counter, $to - $this->counter); - $this->token = Smarty_Internal_Templateparser::TP_TEXT; - } - - public function yylex5() - { - $tokenMap = array( - 1 => 0, - 2 => 0, - 3 => 0, - 4 => 0, - ); + $tokenMap = array ( + 1 => 0, + 2 => 1, + 4 => 0, + 5 => 0, + 6 => 0, + 7 => 0, + 8 => 0, + 9 => 0, + 10 => 0, + 11 => 0, + 12 => 0, + 13 => 3, + 17 => 0, + ); if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/iS"; + $yy_global_pattern = "/\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|\G([\S\s])/iS"; do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { + if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state CHILDBODY'); + ' an empty string. Input "' . substr($this->data, + $this->counter, 5) . '... state DOUBLEQUOTEDSTRING'); } next($yymatches); // skip global match $this->token = key($yymatches); // token number if ($tokenMap[$this->token]) { // extract sub-patterns for passing to lex function $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); + $tokenMap[$this->token]); } else { $yysubmatches = array(); } $this->value = current($yymatches); // token value - $r = $this->{'yy_r5_' . $this->token}($yysubmatches); + $r = $this->{'yy_r4_' . $this->token}($yysubmatches); if ($r === null) { $this->counter += strlen($this->value); $this->line += substr_count($this->value, "\n"); @@ -1280,273 +1040,122 @@ class Smarty_Internal_Templatelexer } // skip this token continue; - } - } else { + } } else { throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); + ': ' . $this->data[$this->counter]); } break; } while (true); + } // end function - const CHILDBODY = 5; - function yy_r5_1($yy_subpatterns) + const DOUBLEQUOTEDSTRING = 4; + function yy_r4_1($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - return false; - } else { - $this->token = Smarty_Internal_Templateparser::TP_STRIPON; - } + if ($this->smarty->auto_literal) { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - - function yy_r5_2($yy_subpatterns) + function yy_r4_2($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - return false; - } else { - $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF; - } + if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELIF; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - - function yy_r5_3($yy_subpatterns) + function yy_r4_4($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - return false; - } else { - $this->yypopstate(); - return true; - } + if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELFOR; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - - function yy_r5_4($yy_subpatterns) + function yy_r4_5($yy_subpatterns) { - $to = strlen($this->data); - preg_match("/" . $this->ldel . "\s*((\/)?strip\s*" . $this->rdel . "|block\s+)/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); - if (isset($match[0][1])) { - $to = $match[0][1]; - } - $this->value = substr($this->data, $this->counter, $to - $this->counter); - return false; + if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - - public function yylex6() - { - $tokenMap = array( - 1 => 0, - 2 => 0, - 3 => 0, - 4 => 1, - 6 => 0, - ); - if ($this->counter >= strlen($this->data)) { - return false; // end of input - } - $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*\/block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/iS"; - - do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { - $yysubmatches = $yymatches; - $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns - if (!count($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state CHILDBLOCK'); - } - next($yymatches); // skip global match - $this->token = key($yymatches); // token number - if ($tokenMap[$this->token]) { - // extract sub-patterns for passing to lex function - $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); - } else { - $yysubmatches = array(); - } - $this->value = current($yymatches); // token value - $r = $this->{'yy_r6_' . $this->token}($yysubmatches); - if ($r === null) { - $this->counter += strlen($this->value); - $this->line += substr_count($this->value, "\n"); - // accept this token - return true; - } elseif ($r === true) { - // we have changed state - // process this token in the new state - return $this->yylex(); - } elseif ($r === false) { - $this->counter += strlen($this->value); - $this->line += substr_count($this->value, "\n"); - if ($this->counter >= strlen($this->data)) { - return false; // end of input - } - // skip this token - continue; - } - } else { - throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); - } - break; - } while (true); - } // end function - - const CHILDBLOCK = 6; - - function yy_r6_1($yy_subpatterns) + function yy_r4_6($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - } else { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - $this->yypushstate(self::CHILDLITERAL); - } + if ($this->smarty->auto_literal) { + $this->token = Smarty_Internal_Templateparser::TP_TEXT; + } else { + $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; + } } - - function yy_r6_2($yy_subpatterns) + function yy_r4_7($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - } else { - $this->yypopstate(); - return true; - } + $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; } - - function yy_r6_3($yy_subpatterns) + function yy_r4_8($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - } else { - $this->yypopstate(); - return true; - } + $this->token = Smarty_Internal_Templateparser::TP_LDEL; + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; } - - function yy_r6_4($yy_subpatterns) + function yy_r4_9($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - } else { - $this->yypopstate(); - return true; - } + $this->token = Smarty_Internal_Templateparser::TP_QUOTE; + $this->yypopstate(); } - - function yy_r6_6($yy_subpatterns) + function yy_r4_10($yy_subpatterns) { - $to = strlen($this->data); - preg_match("/" . $this->ldel . "\s*(literal\s*" . $this->rdel . "|(\/)?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent))/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); - if (isset($match[0][1])) { - $to = $match[0][1]; - } - $this->value = substr($this->data, $this->counter, $to - $this->counter); - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; + $this->token = Smarty_Internal_Templateparser::TP_BACKTICK; + $this->value = substr($this->value,0,-1); + $this->yypushstate(self::SMARTY); + $this->taglineno = $this->line; } - - public function yylex7() + function yy_r4_11($yy_subpatterns) { - $tokenMap = array( - 1 => 0, - 2 => 0, - 3 => 0, - ); - if ($this->counter >= strlen($this->data)) { - return false; // end of input - } - $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS"; - - do { - if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) { - $yysubmatches = $yymatches; - $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns - if (!count($yymatches)) { - throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, - $this->counter, 5) . '... state CHILDLITERAL'); - } - next($yymatches); // skip global match - $this->token = key($yymatches); // token number - if ($tokenMap[$this->token]) { - // extract sub-patterns for passing to lex function - $yysubmatches = array_slice($yysubmatches, $this->token + 1, - $tokenMap[$this->token]); - } else { - $yysubmatches = array(); - } - $this->value = current($yymatches); // token value - $r = $this->{'yy_r7_' . $this->token}($yysubmatches); - if ($r === null) { - $this->counter += strlen($this->value); - $this->line += substr_count($this->value, "\n"); - // accept this token - return true; - } elseif ($r === true) { - // we have changed state - // process this token in the new state - return $this->yylex(); - } elseif ($r === false) { - $this->counter += strlen($this->value); - $this->line += substr_count($this->value, "\n"); - if ($this->counter >= strlen($this->data)) { - return false; // end of input - } - // skip this token - continue; - } - } else { - throw new Exception('Unexpected input at line' . $this->line . - ': ' . $this->data[$this->counter]); - } - break; - } while (true); - } // end function - const CHILDLITERAL = 7; - - function yy_r7_1($yy_subpatterns) + $this->token = Smarty_Internal_Templateparser::TP_DOLLARID; + } + function yy_r4_12($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - } else { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - $this->yypushstate(self::CHILDLITERAL); - } + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - - function yy_r7_2($yy_subpatterns) + function yy_r4_13($yy_subpatterns) { - if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - } else { - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; - $this->yypopstate(); - } + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } - - function yy_r7_3($yy_subpatterns) + function yy_r4_17($yy_subpatterns) { - $to = strlen($this->data); - preg_match("/{$this->ldel}\/?literal\s*{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter); - if (isset($match[0][1])) { - $to = $match[0][1]; - } else { - $this->compiler->trigger_template_error("missing or misspelled literal closing tag"); - } - $this->value = substr($this->data, $this->counter, $to - $this->counter); - $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE; + $to = strlen($this->data); + $this->value = substr($this->data,$this->counter,$to-$this->counter); + $this->token = Smarty_Internal_Templateparser::TP_TEXT; } -} -
\ No newline at end of file +} +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_templateparser.php b/Widgets/smarty/libs/sysplugins/smarty_internal_templateparser.php index 98b9fc7f..e32461b8 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_templateparser.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_templateparser.php @@ -1,20 +1,20 @@ <?php - /** - * Smarty Internal Plugin Templateparser - * This is the template parser. - * It is generated from the internal.templateparser.y file - * - * @package Smarty - * @subpackage Compiler - * @author Uwe Tews - */ +* Smarty Internal Plugin Templateparser +* +* This is the template parser. +* It is generated from the internal.templateparser.y file +* @package Smarty +* @subpackage Compiler +* @author Uwe Tews +*/ + class TP_yyToken implements ArrayAccess { public $string = ''; public $metadata = array(); - public function __construct($s, $m = array()) + function __construct($s, $m = array()) { if ($s instanceof TP_yyToken) { $this->string = $s->string; @@ -29,29 +29,28 @@ class TP_yyToken implements ArrayAccess } } - public function __toString() + function __toString() { return $this->_string; } - public function offsetExists($offset) + function offsetExists($offset) { return isset($this->metadata[$offset]); } - public function offsetGet($offset) + function offsetGet($offset) { return $this->metadata[$offset]; } - public function offsetSet($offset, $value) + function offsetSet($offset, $value) { if ($offset === null) { if (isset($value[0])) { $x = ($value instanceof TP_yyToken) ? $value->metadata : $value; $this->metadata = array_merge($this->metadata, $x); - return; } $offset = count($this->metadata); @@ -68,7 +67,7 @@ class TP_yyToken implements ArrayAccess } } - public function offsetUnset($offset) + function offsetUnset($offset) { unset($this->metadata[$offset]); } @@ -81,14 +80,13 @@ class TP_yyStackEntry ** number for the token at this stack level */ public $minor; /* The user-supplied minor token value. This ** is the value of the token */ -} +}; -; -#line 13 "smarty_internal_templateparser.y" -class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php" +#line 12 "smarty_internal_templateparser.y" +class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php" { - #line 15 "smarty_internal_templateparser.y" +#line 14 "smarty_internal_templateparser.y" const Err1 = "Security error: Call to private object member not allowed"; const Err2 = "Security error: Call to dynamic object member not allowed"; @@ -96,25 +94,18 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php // states whether the parse was successful or not public $successful = true; public $retvalue = 0; - public static $prefix_number = 0; - private $_string; - public $yymajor; - public $last_index; - public $last_variable; - public $root_buffer; - public $current_buffer; private $lex; private $internalError = false; private $strip = false; - function __construct($lex, $compiler) - { + function __construct($lex, $compiler) { $this->lex = $lex; $this->compiler = $compiler; $this->smarty = $this->compiler->smarty; $this->template = $this->compiler->template; $this->compiler->has_variable_string = false; $this->compiler->prefix_code = array(); + $this->prefix_number = 0; $this->block_nesting_level = 0; if ($this->security = isset($this->smarty->security_policy)) { $this->php_handling = $this->smarty->security_policy->php_handling; @@ -126,2494 +117,1387 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php $this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this); } - public function compileVariable($variable) - { - if (strpos($variable, '(') == 0) { + public static function escape_start_tag($tag_text) { + $tag = preg_replace('/\A<\?(.*)\z/', '<<?php ?>?\1', $tag_text, -1 , $count); //Escape tag + return $tag; + } + + public static function escape_end_tag($tag_text) { + return '?<?php ?>>'; + } + + public function compileVariable($variable) { + if (strpos($variable,'(') == 0) { // not a variable variable - $var = trim($variable, '\''); - $this->compiler->tag_nocache = $this->compiler->tag_nocache | $this->template->getVariable($var, null, true, false)->nocache; - $this->template->properties['variables'][$var] = $this->compiler->tag_nocache | $this->compiler->nocache; + $var = trim($variable,'\''); + $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable($var, null, true, false)->nocache; + $this->template->properties['variables'][$var] = $this->compiler->tag_nocache|$this->compiler->nocache; } - // return '(isset($_smarty_tpl->tpl_vars['. $variable .'])?$_smarty_tpl->tpl_vars['. $variable .']->value:$_smarty_tpl->getVariable('. $variable .')->value)'; - return '$_smarty_tpl->tpl_vars[' . $variable . ']->value'; +// return '(isset($_smarty_tpl->tpl_vars['. $variable .'])?$_smarty_tpl->tpl_vars['. $variable .']->value:$_smarty_tpl->getVariable('. $variable .')->value)'; + return '$_smarty_tpl->tpl_vars['. $variable .']->value'; } +#line 132 "smarty_internal_templateparser.php" - #line 130 "smarty_internal_templateparser.php" - - const TP_VERT = 1; - const TP_COLON = 2; - const TP_RDEL = 3; - const TP_COMMENT = 4; - const TP_PHPSTARTTAG = 5; - const TP_PHPENDTAG = 6; - const TP_PHPENDSCRIPT = 7; - const TP_ASPSTARTTAG = 8; - const TP_ASPENDTAG = 9; - const TP_XMLTAG = 10; - const TP_TEXT = 11; - const TP_STRIPON = 12; - const TP_STRIPOFF = 13; - const TP_BLOCKSOURCE = 14; - const TP_LITERALSTART = 15; - const TP_LITERALEND = 16; - const TP_LITERAL = 17; - const TP_LDEL = 18; - const TP_DOLLAR = 19; - const TP_ID = 20; - const TP_EQUAL = 21; - const TP_PTR = 22; - const TP_LDELIF = 23; - const TP_LDELFOR = 24; - const TP_SEMICOLON = 25; - const TP_INCDEC = 26; - const TP_TO = 27; - const TP_STEP = 28; - const TP_LDELFOREACH = 29; - const TP_SPACE = 30; - const TP_AS = 31; - const TP_APTR = 32; - const TP_LDELSETFILTER = 33; - const TP_SMARTYBLOCKCHILDPARENT = 34; - const TP_LDELSLASH = 35; - const TP_ATTR = 36; - const TP_INTEGER = 37; - const TP_COMMA = 38; - const TP_OPENP = 39; - const TP_CLOSEP = 40; - const TP_MATH = 41; - const TP_UNIMATH = 42; - const TP_ANDSYM = 43; - const TP_ISIN = 44; - const TP_ISDIVBY = 45; - const TP_ISNOTDIVBY = 46; - const TP_ISEVEN = 47; - const TP_ISNOTEVEN = 48; - const TP_ISEVENBY = 49; - const TP_ISNOTEVENBY = 50; - const TP_ISODD = 51; - const TP_ISNOTODD = 52; - const TP_ISODDBY = 53; - const TP_ISNOTODDBY = 54; - const TP_INSTANCEOF = 55; - const TP_QMARK = 56; - const TP_NOT = 57; - const TP_TYPECAST = 58; - const TP_HEX = 59; - const TP_DOT = 60; - const TP_SINGLEQUOTESTRING = 61; - const TP_DOUBLECOLON = 62; - const TP_AT = 63; - const TP_HATCH = 64; - const TP_OPENB = 65; - const TP_CLOSEB = 66; - const TP_EQUALS = 67; - const TP_NOTEQUALS = 68; - const TP_GREATERTHAN = 69; - const TP_LESSTHAN = 70; - const TP_GREATEREQUAL = 71; - const TP_LESSEQUAL = 72; - const TP_IDENTITY = 73; - const TP_NONEIDENTITY = 74; - const TP_MOD = 75; - const TP_LAND = 76; - const TP_LOR = 77; - const TP_LXOR = 78; - const TP_QUOTE = 79; - const TP_BACKTICK = 80; - const TP_DOLLARID = 81; - const YY_NO_ACTION = 560; - const YY_ACCEPT_ACTION = 559; - const YY_ERROR_ACTION = 558; + const TP_VERT = 1; + const TP_COLON = 2; + const TP_COMMENT = 3; + const TP_PHPSTARTTAG = 4; + const TP_PHPENDTAG = 5; + const TP_ASPSTARTTAG = 6; + const TP_ASPENDTAG = 7; + const TP_FAKEPHPSTARTTAG = 8; + const TP_XMLTAG = 9; + const TP_TEXT = 10; + const TP_STRIPON = 11; + const TP_STRIPOFF = 12; + const TP_LITERALSTART = 13; + const TP_LITERALEND = 14; + const TP_LITERAL = 15; + const TP_LDEL = 16; + const TP_RDEL = 17; + const TP_DOLLAR = 18; + const TP_ID = 19; + const TP_EQUAL = 20; + const TP_PTR = 21; + const TP_LDELIF = 22; + const TP_LDELFOR = 23; + const TP_SEMICOLON = 24; + const TP_INCDEC = 25; + const TP_TO = 26; + const TP_STEP = 27; + const TP_LDELFOREACH = 28; + const TP_SPACE = 29; + const TP_AS = 30; + const TP_APTR = 31; + const TP_LDELSETFILTER = 32; + const TP_SMARTYBLOCKCHILD = 33; + const TP_LDELSLASH = 34; + const TP_INTEGER = 35; + const TP_COMMA = 36; + const TP_OPENP = 37; + const TP_CLOSEP = 38; + const TP_MATH = 39; + const TP_UNIMATH = 40; + const TP_ANDSYM = 41; + const TP_ISIN = 42; + const TP_ISDIVBY = 43; + const TP_ISNOTDIVBY = 44; + const TP_ISEVEN = 45; + const TP_ISNOTEVEN = 46; + const TP_ISEVENBY = 47; + const TP_ISNOTEVENBY = 48; + const TP_ISODD = 49; + const TP_ISNOTODD = 50; + const TP_ISODDBY = 51; + const TP_ISNOTODDBY = 52; + const TP_INSTANCEOF = 53; + const TP_QMARK = 54; + const TP_NOT = 55; + const TP_TYPECAST = 56; + const TP_HEX = 57; + const TP_DOT = 58; + const TP_SINGLEQUOTESTRING = 59; + const TP_DOUBLECOLON = 60; + const TP_AT = 61; + const TP_HATCH = 62; + const TP_OPENB = 63; + const TP_CLOSEB = 64; + const TP_EQUALS = 65; + const TP_NOTEQUALS = 66; + const TP_GREATERTHAN = 67; + const TP_LESSTHAN = 68; + const TP_GREATEREQUAL = 69; + const TP_LESSEQUAL = 70; + const TP_IDENTITY = 71; + const TP_NONEIDENTITY = 72; + const TP_MOD = 73; + const TP_LAND = 74; + const TP_LOR = 75; + const TP_LXOR = 76; + const TP_QUOTE = 77; + const TP_BACKTICK = 78; + const TP_DOLLARID = 79; + const YY_NO_ACTION = 592; + const YY_ACCEPT_ACTION = 591; + const YY_ERROR_ACTION = 590; - const YY_SZ_ACTTAB = 2541; - static public $yy_action = array( - /* 0 */ - 225, 35, 312, 333, 198, 272, 273, 275, 283, 292, - /* 10 */ - 293, 294, 295, 287, 288, 267, 190, 43, 19, 8, - /* 20 */ - 204, 14, 212, 299, 2, 108, 225, 9, 424, 41, - /* 30 */ - 139, 208, 225, 41, 250, 32, 228, 13, 159, 32, - /* 40 */ - 51, 52, 50, 44, 11, 12, 298, 300, 21, 23, - /* 50 */ - 303, 302, 25, 17, 225, 424, 234, 225, 225, 381, - /* 60 */ - 421, 424, 45, 38, 145, 357, 313, 323, 322, 324, - /* 70 */ - 325, 326, 320, 315, 314, 316, 317, 319, 127, 41, - /* 80 */ - 46, 42, 338, 41, 168, 32, 41, 421, 14, 32, - /* 90 */ - 299, 34, 32, 421, 51, 52, 50, 44, 11, 12, - /* 100 */ - 298, 300, 21, 23, 303, 302, 25, 17, 225, 104, - /* 110 */ - 185, 46, 46, 559, 95, 279, 242, 271, 3, 321, - /* 120 */ - 313, 323, 322, 324, 325, 326, 320, 315, 314, 316, - /* 130 */ - 317, 319, 14, 241, 299, 34, 208, 41, 225, 14, - /* 140 */ - 418, 299, 28, 32, 179, 7, 356, 285, 51, 52, - /* 150 */ - 50, 44, 11, 12, 298, 300, 21, 23, 303, 302, - /* 160 */ - 25, 17, 225, 225, 274, 424, 240, 41, 134, 190, - /* 170 */ - 332, 343, 340, 32, 313, 323, 322, 324, 325, 326, - /* 180 */ - 320, 315, 314, 316, 317, 319, 37, 122, 182, 31, - /* 190 */ - 202, 225, 424, 352, 225, 14, 7, 299, 424, 225, - /* 200 */ - 150, 386, 51, 52, 50, 44, 11, 12, 298, 300, - /* 210 */ - 21, 23, 303, 302, 25, 17, 225, 46, 349, 134, - /* 220 */ - 41, 278, 242, 271, 7, 29, 32, 341, 313, 323, - /* 230 */ - 322, 324, 325, 326, 320, 315, 314, 316, 317, 319, - /* 240 */ - 226, 227, 197, 304, 103, 184, 232, 134, 46, 14, - /* 250 */ - 35, 299, 265, 46, 321, 18, 51, 52, 50, 44, - /* 260 */ - 11, 12, 298, 300, 21, 23, 303, 302, 25, 17, - /* 270 */ - 225, 208, 264, 259, 258, 218, 6, 109, 345, 35, - /* 280 */ - 193, 263, 313, 323, 322, 324, 325, 326, 320, 315, - /* 290 */ - 314, 316, 317, 319, 241, 192, 304, 107, 102, 175, - /* 300 */ - 269, 201, 191, 304, 203, 142, 253, 208, 321, 335, - /* 310 */ - 51, 52, 50, 44, 11, 12, 298, 300, 21, 23, - /* 320 */ - 303, 302, 25, 17, 225, 208, 268, 196, 208, 305, - /* 330 */ - 485, 208, 230, 200, 308, 485, 313, 323, 322, 324, - /* 340 */ - 325, 326, 320, 315, 314, 316, 317, 319, 30, 159, - /* 350 */ - 105, 20, 233, 161, 186, 305, 301, 274, 256, 247, - /* 360 */ - 208, 225, 321, 36, 51, 52, 50, 44, 11, 12, - /* 370 */ - 298, 300, 21, 23, 303, 302, 25, 17, 225, 204, - /* 380 */ - 207, 14, 254, 299, 131, 259, 249, 225, 158, 127, - /* 390 */ - 313, 323, 322, 324, 325, 326, 320, 315, 314, 316, - /* 400 */ - 317, 319, 237, 262, 130, 225, 45, 183, 187, 14, - /* 410 */ - 169, 223, 301, 342, 274, 334, 321, 321, 51, 52, - /* 420 */ - 50, 44, 11, 12, 298, 300, 21, 23, 303, 302, - /* 430 */ - 25, 17, 225, 204, 204, 14, 6, 244, 141, 259, - /* 440 */ - 291, 46, 98, 194, 313, 323, 322, 324, 325, 326, - /* 450 */ - 320, 315, 314, 316, 317, 319, 132, 262, 227, 166, - /* 460 */ - 163, 189, 14, 284, 231, 26, 237, 27, 321, 321, - /* 470 */ - 321, 32, 51, 52, 50, 44, 11, 12, 298, 300, - /* 480 */ - 21, 23, 303, 302, 25, 17, 225, 204, 14, 276, - /* 490 */ - 245, 206, 22, 4, 144, 328, 150, 120, 313, 323, - /* 500 */ - 322, 324, 325, 326, 320, 315, 314, 316, 317, 319, - /* 510 */ - 195, 348, 262, 176, 171, 39, 30, 199, 143, 180, - /* 520 */ - 148, 281, 321, 260, 159, 230, 51, 52, 50, 44, - /* 530 */ - 11, 12, 298, 300, 21, 23, 303, 302, 25, 17, - /* 540 */ - 225, 296, 205, 129, 346, 289, 124, 329, 125, 339, - /* 550 */ - 97, 119, 313, 323, 322, 324, 325, 326, 320, 315, - /* 560 */ - 314, 316, 317, 319, 127, 262, 262, 239, 277, 282, - /* 570 */ - 307, 94, 266, 351, 269, 170, 159, 181, 172, 106, - /* 580 */ - 51, 52, 50, 44, 11, 12, 298, 300, 21, 23, - /* 590 */ - 303, 302, 25, 17, 225, 330, 270, 301, 15, 115, - /* 600 */ - 331, 310, 326, 255, 140, 126, 313, 323, 322, 324, - /* 610 */ - 325, 326, 320, 315, 314, 316, 317, 319, 301, 326, - /* 620 */ - 262, 326, 326, 326, 326, 326, 326, 326, 326, 326, - /* 630 */ - 326, 326, 326, 243, 51, 52, 50, 44, 11, 12, - /* 640 */ - 298, 300, 21, 23, 303, 302, 25, 17, 225, 40, - /* 650 */ - 326, 326, 326, 326, 326, 326, 326, 113, 99, 100, - /* 660 */ - 313, 323, 322, 324, 325, 326, 320, 315, 314, 316, - /* 670 */ - 317, 319, 262, 262, 262, 326, 326, 326, 326, 326, - /* 680 */ - 326, 326, 326, 326, 326, 326, 326, 326, 51, 52, - /* 690 */ - 50, 44, 11, 12, 298, 300, 21, 23, 303, 302, - /* 700 */ - 25, 17, 225, 326, 326, 326, 326, 326, 326, 326, - /* 710 */ - 326, 114, 326, 326, 313, 323, 322, 324, 325, 326, - /* 720 */ - 320, 315, 314, 316, 317, 319, 262, 326, 326, 326, - /* 730 */ - 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, - /* 740 */ - 326, 286, 51, 52, 50, 44, 11, 12, 298, 300, - /* 750 */ - 21, 23, 303, 302, 25, 17, 225, 326, 326, 326, - /* 760 */ - 326, 326, 326, 326, 326, 326, 326, 326, 313, 323, - /* 770 */ - 322, 324, 325, 326, 320, 315, 314, 316, 317, 319, - /* 780 */ - 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, - /* 790 */ - 326, 326, 326, 326, 326, 326, 51, 52, 50, 44, - /* 800 */ - 11, 12, 298, 300, 21, 23, 303, 302, 25, 17, - /* 810 */ - 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, - /* 820 */ - 159, 326, 313, 323, 322, 324, 325, 326, 320, 315, - /* 830 */ - 314, 316, 317, 319, 326, 326, 326, 326, 51, 52, - /* 840 */ - 50, 44, 11, 12, 298, 300, 21, 23, 303, 302, - /* 850 */ - 25, 17, 326, 326, 326, 326, 326, 326, 212, 326, - /* 860 */ - 326, 326, 326, 9, 313, 323, 322, 324, 325, 326, - /* 870 */ - 320, 315, 314, 316, 317, 319, 326, 326, 326, 326, - /* 880 */ - 326, 326, 326, 8, 138, 211, 326, 326, 2, 108, - /* 890 */ - 326, 235, 326, 326, 139, 157, 165, 326, 250, 128, - /* 900 */ - 228, 326, 246, 326, 24, 321, 326, 48, 261, 326, - /* 910 */ - 326, 251, 336, 353, 326, 311, 326, 301, 174, 173, - /* 920 */ - 326, 326, 49, 47, 280, 238, 297, 321, 321, 105, - /* 930 */ - 1, 337, 326, 147, 326, 326, 326, 326, 326, 301, - /* 940 */ - 301, 8, 123, 92, 96, 257, 2, 108, 326, 311, - /* 950 */ - 326, 326, 139, 326, 326, 235, 250, 309, 228, 146, - /* 960 */ - 246, 326, 24, 128, 162, 48, 326, 326, 326, 326, - /* 970 */ - 235, 326, 350, 321, 155, 251, 336, 353, 128, 311, - /* 980 */ - 49, 47, 280, 238, 297, 301, 326, 105, 1, 326, - /* 990 */ - 251, 336, 353, 326, 311, 14, 326, 299, 326, 8, - /* 1000 */ - 138, 224, 96, 326, 2, 108, 326, 41, 326, 252, - /* 1010 */ - 139, 235, 326, 32, 250, 153, 228, 326, 246, 128, - /* 1020 */ - 24, 326, 326, 48, 326, 326, 326, 326, 326, 326, - /* 1030 */ - 326, 251, 336, 353, 326, 311, 326, 326, 49, 47, - /* 1040 */ - 280, 238, 297, 326, 326, 105, 1, 326, 326, 326, - /* 1050 */ - 326, 326, 14, 326, 299, 326, 326, 8, 142, 224, - /* 1060 */ - 96, 326, 2, 108, 41, 235, 248, 326, 139, 154, - /* 1070 */ - 32, 235, 250, 128, 228, 156, 246, 326, 33, 128, - /* 1080 */ - 326, 48, 326, 326, 326, 251, 336, 353, 326, 311, - /* 1090 */ - 326, 251, 336, 353, 326, 311, 49, 47, 280, 238, - /* 1100 */ - 297, 326, 326, 105, 1, 326, 326, 326, 326, 326, - /* 1110 */ - 326, 326, 326, 326, 326, 8, 138, 213, 96, 326, - /* 1120 */ - 2, 108, 326, 326, 326, 326, 139, 235, 326, 326, - /* 1130 */ - 250, 149, 228, 326, 246, 128, 24, 326, 326, 48, - /* 1140 */ - 326, 326, 326, 326, 326, 326, 326, 251, 336, 353, - /* 1150 */ - 326, 311, 326, 326, 49, 47, 280, 238, 297, 326, - /* 1160 */ - 326, 105, 1, 326, 326, 326, 326, 326, 326, 326, - /* 1170 */ - 326, 326, 326, 8, 138, 210, 96, 326, 2, 108, - /* 1180 */ - 326, 326, 326, 326, 139, 235, 326, 326, 250, 151, - /* 1190 */ - 228, 326, 219, 128, 24, 326, 326, 48, 326, 326, - /* 1200 */ - 326, 326, 326, 326, 326, 251, 336, 353, 326, 311, - /* 1210 */ - 326, 326, 49, 47, 280, 238, 297, 326, 326, 105, - /* 1220 */ - 1, 326, 326, 326, 326, 326, 326, 326, 326, 326, - /* 1230 */ - 326, 8, 136, 224, 96, 326, 2, 108, 326, 326, - /* 1240 */ - 326, 326, 139, 235, 326, 326, 250, 152, 228, 326, - /* 1250 */ - 246, 128, 24, 326, 326, 48, 326, 326, 326, 326, - /* 1260 */ - 326, 326, 326, 251, 336, 353, 326, 311, 326, 326, - /* 1270 */ - 49, 47, 280, 238, 297, 326, 326, 105, 1, 326, - /* 1280 */ - 225, 326, 391, 326, 422, 326, 326, 326, 326, 8, - /* 1290 */ - 135, 224, 96, 326, 2, 108, 326, 326, 326, 326, - /* 1300 */ - 139, 236, 229, 326, 250, 326, 228, 326, 246, 41, - /* 1310 */ - 5, 422, 326, 48, 326, 32, 326, 422, 7, 326, - /* 1320 */ - 7, 326, 326, 326, 198, 178, 326, 326, 49, 47, - /* 1330 */ - 280, 238, 297, 326, 321, 105, 1, 43, 19, 326, - /* 1340 */ - 326, 134, 326, 134, 326, 326, 326, 8, 138, 209, - /* 1350 */ - 96, 208, 2, 108, 326, 326, 326, 326, 139, 326, - /* 1360 */ - 326, 326, 250, 326, 228, 326, 246, 326, 24, 198, - /* 1370 */ - 164, 48, 326, 326, 326, 326, 326, 326, 326, 321, - /* 1380 */ - 326, 326, 43, 19, 326, 326, 49, 47, 280, 238, - /* 1390 */ - 297, 326, 326, 105, 1, 326, 208, 326, 326, 326, - /* 1400 */ - 326, 326, 326, 326, 326, 8, 142, 224, 96, 326, - /* 1410 */ - 2, 108, 326, 326, 326, 326, 139, 326, 326, 326, - /* 1420 */ - 250, 326, 228, 326, 246, 326, 33, 198, 177, 48, - /* 1430 */ - 326, 326, 326, 326, 326, 326, 326, 321, 326, 326, - /* 1440 */ - 43, 19, 326, 326, 49, 47, 280, 238, 297, 326, - /* 1450 */ - 326, 105, 326, 326, 208, 326, 326, 326, 326, 326, - /* 1460 */ - 326, 326, 326, 8, 142, 222, 96, 326, 2, 108, - /* 1470 */ - 326, 326, 326, 326, 139, 326, 326, 326, 250, 326, - /* 1480 */ - 228, 326, 246, 326, 33, 326, 467, 48, 326, 326, - /* 1490 */ - 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, - /* 1500 */ - 326, 326, 49, 47, 280, 238, 297, 326, 467, 105, - /* 1510 */ - 467, 467, 326, 467, 467, 326, 326, 326, 326, 467, - /* 1520 */ - 326, 467, 7, 467, 96, 326, 326, 326, 326, 326, - /* 1530 */ - 326, 326, 326, 326, 326, 235, 326, 326, 467, 121, - /* 1540 */ - 326, 326, 86, 128, 326, 134, 326, 326, 326, 467, - /* 1550 */ - 326, 290, 318, 326, 326, 251, 336, 353, 326, 311, - /* 1560 */ - 326, 326, 326, 467, 326, 326, 326, 235, 326, 216, - /* 1570 */ - 354, 133, 326, 326, 68, 117, 249, 326, 326, 326, - /* 1580 */ - 326, 326, 326, 290, 318, 326, 326, 251, 336, 353, - /* 1590 */ - 235, 311, 326, 326, 133, 326, 326, 76, 128, 326, - /* 1600 */ - 326, 326, 326, 326, 326, 326, 290, 318, 326, 235, - /* 1610 */ - 251, 336, 353, 133, 311, 326, 76, 128, 326, 326, - /* 1620 */ - 326, 221, 326, 326, 326, 290, 318, 326, 326, 251, - /* 1630 */ - 336, 353, 326, 311, 326, 326, 326, 326, 235, 326, - /* 1640 */ - 215, 326, 121, 326, 326, 86, 128, 326, 326, 326, - /* 1650 */ - 326, 326, 326, 326, 290, 318, 326, 326, 251, 336, - /* 1660 */ - 353, 235, 311, 326, 326, 133, 326, 326, 59, 117, - /* 1670 */ - 137, 326, 326, 355, 326, 326, 326, 290, 318, 326, - /* 1680 */ - 326, 251, 336, 353, 235, 311, 326, 326, 133, 326, - /* 1690 */ - 326, 76, 128, 326, 326, 326, 326, 326, 326, 326, - /* 1700 */ - 290, 318, 326, 235, 251, 336, 353, 110, 311, 326, - /* 1710 */ - 69, 128, 326, 326, 326, 217, 326, 326, 326, 290, - /* 1720 */ - 318, 326, 326, 251, 336, 353, 326, 311, 326, 235, - /* 1730 */ - 101, 160, 326, 133, 326, 326, 57, 128, 326, 326, - /* 1740 */ - 321, 326, 326, 43, 19, 290, 318, 326, 235, 251, - /* 1750 */ - 336, 353, 133, 311, 326, 73, 128, 208, 326, 326, - /* 1760 */ - 326, 326, 326, 326, 290, 318, 326, 326, 251, 336, - /* 1770 */ - 353, 235, 311, 326, 326, 133, 326, 326, 78, 128, - /* 1780 */ - 326, 326, 326, 326, 326, 326, 326, 290, 318, 326, - /* 1790 */ - 235, 251, 336, 353, 133, 311, 326, 70, 128, 326, - /* 1800 */ - 326, 326, 326, 326, 326, 326, 290, 318, 326, 326, - /* 1810 */ - 251, 336, 353, 326, 311, 326, 235, 198, 167, 326, - /* 1820 */ - 133, 326, 326, 64, 128, 326, 326, 321, 326, 326, - /* 1830 */ - 43, 19, 290, 318, 326, 235, 251, 336, 353, 133, - /* 1840 */ - 311, 326, 67, 128, 208, 326, 326, 326, 326, 326, - /* 1850 */ - 326, 290, 318, 326, 326, 251, 336, 353, 235, 311, - /* 1860 */ - 326, 326, 133, 326, 326, 88, 128, 326, 326, 326, - /* 1870 */ - 326, 326, 326, 326, 290, 318, 326, 235, 251, 336, - /* 1880 */ - 353, 133, 311, 326, 82, 128, 326, 326, 326, 326, - /* 1890 */ - 326, 326, 326, 290, 318, 326, 326, 251, 336, 353, - /* 1900 */ - 326, 311, 326, 235, 198, 188, 326, 133, 326, 326, - /* 1910 */ - 72, 128, 326, 326, 321, 326, 326, 43, 19, 290, - /* 1920 */ - 318, 326, 235, 251, 336, 353, 93, 311, 326, 55, - /* 1930 */ - 116, 208, 326, 326, 326, 326, 326, 326, 290, 318, - /* 1940 */ - 326, 326, 251, 336, 353, 235, 311, 326, 326, 112, - /* 1950 */ - 326, 326, 87, 128, 326, 326, 326, 326, 326, 326, - /* 1960 */ - 326, 290, 318, 326, 235, 251, 336, 353, 133, 311, - /* 1970 */ - 326, 77, 128, 326, 326, 326, 326, 326, 326, 326, - /* 1980 */ - 290, 318, 326, 326, 251, 336, 353, 326, 311, 326, - /* 1990 */ - 235, 326, 326, 326, 133, 326, 326, 89, 128, 326, - /* 2000 */ - 326, 326, 326, 326, 326, 326, 290, 318, 326, 235, - /* 2010 */ - 251, 336, 353, 133, 311, 326, 75, 128, 326, 326, - /* 2020 */ - 326, 326, 326, 326, 326, 290, 318, 326, 326, 251, - /* 2030 */ - 336, 353, 235, 311, 326, 326, 133, 326, 326, 91, - /* 2040 */ - 128, 326, 326, 326, 326, 326, 326, 326, 290, 318, - /* 2050 */ - 326, 235, 251, 336, 353, 133, 311, 326, 62, 128, - /* 2060 */ - 326, 326, 326, 326, 326, 326, 326, 290, 318, 326, - /* 2070 */ - 326, 251, 336, 353, 326, 311, 326, 235, 326, 326, - /* 2080 */ - 326, 93, 326, 326, 53, 116, 326, 326, 326, 326, - /* 2090 */ - 326, 326, 326, 290, 318, 326, 235, 220, 336, 353, - /* 2100 */ - 133, 311, 326, 63, 128, 326, 326, 326, 326, 326, - /* 2110 */ - 326, 326, 290, 318, 326, 326, 251, 336, 353, 235, - /* 2120 */ - 311, 326, 326, 133, 326, 326, 61, 128, 326, 326, - /* 2130 */ - 326, 326, 326, 326, 326, 290, 318, 326, 235, 214, - /* 2140 */ - 336, 353, 133, 311, 326, 71, 128, 326, 326, 326, - /* 2150 */ - 326, 326, 326, 326, 290, 318, 326, 326, 251, 336, - /* 2160 */ - 353, 326, 311, 326, 235, 326, 326, 326, 133, 326, - /* 2170 */ - 326, 85, 128, 326, 326, 326, 326, 326, 326, 326, - /* 2180 */ - 290, 318, 326, 235, 251, 336, 353, 133, 311, 326, - /* 2190 */ - 65, 128, 326, 326, 326, 326, 326, 326, 326, 290, - /* 2200 */ - 318, 326, 326, 251, 336, 353, 235, 311, 326, 326, - /* 2210 */ - 111, 326, 326, 74, 128, 326, 326, 326, 326, 326, - /* 2220 */ - 326, 326, 290, 318, 326, 235, 251, 336, 353, 118, - /* 2230 */ - 311, 326, 58, 128, 326, 326, 326, 326, 326, 326, - /* 2240 */ - 326, 290, 318, 326, 326, 251, 336, 353, 326, 311, - /* 2250 */ - 326, 235, 326, 326, 326, 133, 326, 326, 56, 128, - /* 2260 */ - 326, 326, 326, 326, 326, 326, 326, 290, 318, 326, - /* 2270 */ - 235, 251, 336, 353, 133, 311, 326, 79, 128, 326, - /* 2280 */ - 326, 326, 326, 326, 326, 326, 290, 318, 326, 326, - /* 2290 */ - 251, 336, 353, 235, 311, 326, 326, 133, 326, 326, - /* 2300 */ - 80, 128, 326, 326, 326, 326, 326, 326, 326, 290, - /* 2310 */ - 318, 326, 235, 251, 336, 353, 133, 311, 326, 84, - /* 2320 */ - 128, 326, 326, 326, 326, 326, 326, 326, 290, 318, - /* 2330 */ - 326, 326, 251, 336, 353, 326, 311, 326, 235, 326, - /* 2340 */ - 326, 326, 133, 326, 326, 66, 128, 326, 326, 326, - /* 2350 */ - 326, 326, 326, 326, 290, 318, 326, 344, 251, 336, - /* 2360 */ - 353, 326, 311, 326, 10, 326, 326, 326, 326, 2, - /* 2370 */ - 108, 344, 326, 326, 326, 139, 326, 326, 10, 250, - /* 2380 */ - 326, 228, 326, 2, 108, 326, 326, 326, 326, 139, - /* 2390 */ - 326, 326, 326, 250, 326, 228, 235, 326, 326, 326, - /* 2400 */ - 133, 326, 326, 60, 128, 326, 326, 326, 326, 326, - /* 2410 */ - 326, 326, 290, 318, 326, 326, 251, 336, 353, 326, - /* 2420 */ - 311, 326, 326, 326, 326, 306, 16, 347, 326, 235, - /* 2430 */ - 326, 326, 326, 133, 326, 326, 81, 128, 326, 327, - /* 2440 */ - 16, 347, 326, 326, 326, 290, 318, 326, 326, 251, - /* 2450 */ - 336, 353, 326, 311, 326, 326, 235, 326, 326, 326, - /* 2460 */ - 133, 326, 326, 68, 128, 326, 326, 326, 326, 326, - /* 2470 */ - 326, 326, 290, 318, 326, 326, 251, 336, 353, 326, - /* 2480 */ - 311, 326, 235, 326, 326, 326, 133, 326, 326, 54, - /* 2490 */ - 128, 326, 326, 326, 326, 326, 326, 326, 290, 318, - /* 2500 */ - 326, 326, 251, 336, 353, 235, 311, 326, 326, 133, - /* 2510 */ - 326, 326, 83, 128, 326, 326, 235, 326, 326, 326, - /* 2520 */ - 133, 290, 318, 90, 128, 251, 336, 353, 326, 311, - /* 2530 */ - 326, 326, 290, 318, 326, 326, 251, 336, 353, 326, - /* 2540 */ - 311, + const YY_SZ_ACTTAB = 2562; +static public $yy_action = array( + /* 0 */ 218, 317, 318, 320, 319, 316, 315, 311, 310, 312, + /* 10 */ 313, 314, 321, 322, 197, 193, 187, 43, 591, 95, + /* 20 */ 255, 318, 320, 6, 107, 292, 38, 11, 42, 154, + /* 30 */ 283, 13, 181, 245, 295, 241, 262, 284, 51, 50, + /* 40 */ 52, 44, 23, 28, 367, 374, 33, 32, 375, 383, + /* 50 */ 21, 31, 328, 323, 325, 326, 324, 9, 36, 353, + /* 60 */ 265, 197, 331, 329, 384, 385, 386, 382, 381, 377, + /* 70 */ 376, 378, 379, 282, 380, 362, 218, 344, 4, 106, + /* 80 */ 175, 120, 7, 11, 82, 129, 283, 12, 456, 292, + /* 90 */ 453, 27, 291, 301, 361, 109, 387, 236, 368, 365, + /* 100 */ 456, 343, 453, 243, 42, 136, 200, 37, 7, 267, + /* 110 */ 7, 219, 256, 7, 51, 50, 52, 44, 23, 28, + /* 120 */ 367, 374, 33, 32, 375, 383, 21, 31, 239, 99, + /* 130 */ 171, 136, 36, 136, 261, 26, 136, 123, 373, 292, + /* 140 */ 384, 385, 386, 382, 381, 377, 376, 378, 379, 282, + /* 150 */ 380, 362, 218, 344, 369, 218, 200, 132, 158, 184, + /* 160 */ 68, 119, 235, 11, 11, 153, 283, 283, 337, 301, + /* 170 */ 361, 458, 306, 236, 368, 365, 42, 343, 252, 284, + /* 180 */ 42, 191, 218, 458, 250, 11, 200, 287, 283, 12, + /* 190 */ 51, 50, 52, 44, 23, 28, 367, 374, 33, 32, + /* 200 */ 375, 383, 21, 31, 302, 108, 168, 49, 200, 232, + /* 210 */ 11, 218, 35, 283, 240, 292, 384, 385, 386, 382, + /* 220 */ 381, 377, 376, 378, 379, 282, 380, 362, 218, 344, + /* 230 */ 207, 218, 200, 132, 49, 8, 54, 119, 142, 11, + /* 240 */ 14, 158, 283, 110, 342, 301, 361, 455, 152, 236, + /* 250 */ 368, 365, 42, 343, 231, 239, 42, 350, 103, 455, + /* 260 */ 248, 199, 339, 49, 343, 345, 51, 50, 52, 44, + /* 270 */ 23, 28, 367, 374, 33, 32, 375, 383, 21, 31, + /* 280 */ 128, 183, 174, 49, 370, 163, 198, 339, 15, 158, + /* 290 */ 292, 292, 384, 385, 386, 382, 381, 377, 376, 378, + /* 300 */ 379, 282, 380, 362, 218, 344, 192, 218, 201, 120, + /* 310 */ 344, 272, 82, 129, 156, 164, 270, 218, 129, 158, + /* 320 */ 273, 301, 361, 458, 292, 236, 368, 365, 128, 343, + /* 330 */ 236, 368, 365, 296, 343, 458, 284, 244, 130, 227, + /* 340 */ 260, 330, 51, 50, 52, 44, 23, 28, 367, 374, + /* 350 */ 33, 32, 375, 383, 21, 31, 207, 196, 339, 49, + /* 360 */ 41, 8, 127, 162, 251, 229, 212, 242, 384, 385, + /* 370 */ 386, 382, 381, 377, 376, 378, 379, 282, 380, 362, + /* 380 */ 218, 344, 101, 218, 176, 132, 344, 140, 78, 129, + /* 390 */ 148, 166, 249, 292, 129, 186, 278, 301, 361, 327, + /* 400 */ 292, 236, 368, 365, 292, 343, 236, 368, 365, 5, + /* 410 */ 343, 42, 211, 36, 121, 281, 284, 201, 51, 50, + /* 420 */ 52, 44, 23, 28, 367, 374, 33, 32, 375, 383, + /* 430 */ 21, 31, 218, 178, 7, 49, 179, 275, 225, 185, + /* 440 */ 11, 284, 292, 283, 384, 385, 386, 382, 381, 377, + /* 450 */ 376, 378, 379, 282, 380, 362, 17, 136, 11, 201, + /* 460 */ 170, 226, 173, 200, 284, 141, 247, 223, 335, 292, + /* 470 */ 51, 50, 52, 44, 23, 28, 367, 374, 33, 32, + /* 480 */ 375, 383, 21, 31, 135, 218, 201, 359, 11, 11, + /* 490 */ 11, 238, 213, 234, 188, 302, 384, 385, 386, 382, + /* 500 */ 381, 377, 376, 378, 379, 282, 380, 362, 195, 351, + /* 510 */ 189, 366, 251, 235, 218, 251, 264, 333, 146, 332, + /* 520 */ 305, 200, 143, 51, 50, 52, 44, 23, 28, 367, + /* 530 */ 374, 33, 32, 375, 383, 21, 31, 218, 203, 137, + /* 540 */ 15, 297, 42, 271, 194, 19, 98, 116, 102, 384, + /* 550 */ 385, 386, 382, 381, 377, 376, 378, 379, 282, 380, + /* 560 */ 362, 372, 372, 372, 300, 34, 224, 138, 39, 139, + /* 570 */ 225, 146, 131, 133, 159, 51, 50, 52, 44, 23, + /* 580 */ 28, 367, 374, 33, 32, 375, 383, 21, 31, 372, + /* 590 */ 172, 334, 94, 299, 276, 302, 2, 371, 4, 292, + /* 600 */ 125, 384, 385, 386, 382, 381, 377, 376, 378, 379, + /* 610 */ 282, 380, 362, 218, 344, 372, 218, 308, 132, 344, + /* 620 */ 287, 78, 129, 150, 370, 201, 161, 129, 160, 204, + /* 630 */ 301, 361, 341, 29, 236, 368, 365, 292, 343, 236, + /* 640 */ 368, 365, 218, 343, 284, 216, 42, 20, 277, 284, + /* 650 */ 263, 51, 50, 52, 44, 23, 28, 367, 374, 33, + /* 660 */ 32, 375, 383, 21, 31, 218, 228, 45, 49, 16, + /* 670 */ 326, 249, 104, 326, 326, 118, 105, 384, 385, 386, + /* 680 */ 382, 381, 377, 376, 378, 379, 282, 380, 362, 340, + /* 690 */ 372, 372, 326, 326, 326, 326, 326, 326, 326, 326, + /* 700 */ 326, 42, 237, 51, 50, 52, 44, 23, 28, 367, + /* 710 */ 374, 33, 32, 375, 383, 21, 31, 218, 326, 326, + /* 720 */ 326, 326, 326, 326, 326, 326, 114, 326, 218, 384, + /* 730 */ 385, 386, 382, 381, 377, 376, 378, 379, 282, 380, + /* 740 */ 362, 372, 353, 326, 307, 326, 326, 326, 326, 326, + /* 750 */ 326, 326, 326, 326, 268, 51, 50, 52, 44, 23, + /* 760 */ 28, 367, 374, 33, 32, 375, 383, 21, 31, 218, + /* 770 */ 326, 326, 326, 326, 326, 326, 326, 326, 97, 355, + /* 780 */ 112, 384, 385, 386, 382, 381, 377, 376, 378, 379, + /* 790 */ 282, 380, 362, 372, 326, 372, 326, 42, 326, 326, + /* 800 */ 326, 326, 326, 326, 326, 326, 158, 51, 50, 52, + /* 810 */ 44, 23, 28, 367, 374, 33, 32, 375, 383, 21, + /* 820 */ 31, 218, 326, 326, 326, 326, 326, 326, 326, 326, + /* 830 */ 326, 326, 326, 384, 385, 386, 382, 381, 377, 376, + /* 840 */ 378, 379, 282, 380, 362, 128, 326, 326, 326, 326, + /* 850 */ 326, 326, 326, 326, 326, 326, 326, 326, 326, 51, + /* 860 */ 50, 52, 44, 23, 28, 367, 374, 33, 32, 375, + /* 870 */ 383, 21, 31, 326, 326, 326, 326, 326, 326, 326, + /* 880 */ 326, 326, 326, 326, 266, 384, 385, 386, 382, 381, + /* 890 */ 377, 376, 378, 379, 282, 380, 362, 218, 326, 326, + /* 900 */ 326, 326, 190, 344, 326, 326, 11, 145, 354, 283, + /* 910 */ 288, 129, 218, 202, 18, 24, 22, 218, 45, 42, + /* 920 */ 6, 107, 42, 236, 368, 365, 154, 343, 286, 200, + /* 930 */ 245, 295, 241, 285, 326, 51, 50, 52, 44, 23, + /* 940 */ 28, 367, 374, 33, 32, 375, 383, 21, 31, 218, + /* 950 */ 10, 326, 326, 326, 326, 326, 326, 326, 326, 326, + /* 960 */ 326, 384, 385, 386, 382, 381, 377, 376, 378, 379, + /* 970 */ 282, 380, 362, 326, 326, 356, 40, 352, 326, 326, + /* 980 */ 326, 326, 326, 326, 326, 326, 326, 51, 50, 52, + /* 990 */ 44, 23, 28, 367, 374, 33, 32, 375, 383, 21, + /* 1000 */ 31, 218, 326, 326, 326, 326, 326, 326, 326, 326, + /* 1010 */ 326, 326, 326, 384, 385, 386, 382, 381, 377, 376, + /* 1020 */ 378, 379, 282, 380, 362, 326, 326, 326, 326, 326, + /* 1030 */ 326, 326, 326, 326, 326, 326, 326, 326, 326, 51, + /* 1040 */ 50, 52, 44, 23, 28, 367, 374, 33, 32, 375, + /* 1050 */ 383, 21, 31, 326, 326, 326, 326, 326, 326, 326, + /* 1060 */ 326, 326, 326, 326, 326, 384, 385, 386, 382, 381, + /* 1070 */ 377, 376, 378, 379, 282, 380, 362, 218, 218, 51, + /* 1080 */ 50, 52, 44, 23, 28, 367, 374, 33, 32, 375, + /* 1090 */ 383, 21, 31, 303, 304, 326, 326, 326, 326, 326, + /* 1100 */ 326, 326, 326, 326, 326, 384, 385, 386, 382, 381, + /* 1110 */ 377, 376, 378, 379, 282, 380, 362, 218, 326, 218, + /* 1120 */ 326, 326, 43, 326, 134, 208, 326, 326, 6, 107, + /* 1130 */ 326, 326, 253, 348, 154, 452, 354, 230, 245, 295, + /* 1140 */ 241, 246, 18, 30, 42, 42, 48, 42, 6, 107, + /* 1150 */ 326, 326, 326, 7, 154, 326, 326, 326, 245, 295, + /* 1160 */ 241, 47, 46, 298, 233, 363, 326, 344, 101, 1, + /* 1170 */ 269, 155, 326, 326, 326, 129, 136, 326, 43, 326, + /* 1180 */ 134, 220, 326, 96, 6, 107, 358, 236, 368, 365, + /* 1190 */ 154, 343, 326, 326, 245, 295, 241, 246, 42, 30, + /* 1200 */ 326, 254, 48, 360, 40, 352, 326, 344, 326, 326, + /* 1210 */ 326, 151, 326, 42, 349, 129, 326, 47, 46, 298, + /* 1220 */ 233, 363, 326, 274, 101, 1, 42, 236, 368, 365, + /* 1230 */ 326, 343, 336, 357, 43, 42, 144, 220, 326, 96, + /* 1240 */ 6, 107, 289, 326, 42, 42, 154, 258, 326, 294, + /* 1250 */ 245, 295, 241, 246, 42, 3, 326, 338, 48, 42, + /* 1260 */ 259, 42, 326, 344, 326, 326, 326, 149, 326, 42, + /* 1270 */ 279, 129, 42, 47, 46, 298, 233, 363, 326, 293, + /* 1280 */ 101, 1, 42, 236, 368, 365, 326, 343, 309, 347, + /* 1290 */ 43, 42, 126, 220, 326, 96, 6, 107, 290, 326, + /* 1300 */ 42, 42, 154, 346, 326, 257, 245, 295, 241, 246, + /* 1310 */ 42, 30, 326, 326, 48, 42, 326, 42, 326, 326, + /* 1320 */ 326, 326, 326, 326, 326, 326, 326, 326, 326, 47, + /* 1330 */ 46, 298, 233, 363, 326, 326, 101, 1, 326, 326, + /* 1340 */ 326, 326, 326, 326, 326, 326, 43, 326, 130, 220, + /* 1350 */ 326, 96, 6, 107, 326, 326, 326, 326, 154, 326, + /* 1360 */ 326, 326, 245, 295, 241, 246, 326, 25, 326, 326, + /* 1370 */ 48, 326, 326, 326, 326, 326, 326, 326, 326, 326, + /* 1380 */ 326, 326, 326, 326, 326, 47, 46, 298, 233, 363, + /* 1390 */ 326, 326, 101, 1, 326, 326, 326, 326, 326, 326, + /* 1400 */ 326, 326, 43, 326, 134, 210, 326, 96, 6, 107, + /* 1410 */ 326, 326, 326, 326, 154, 326, 326, 326, 245, 295, + /* 1420 */ 241, 246, 326, 30, 326, 326, 48, 326, 326, 326, + /* 1430 */ 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, + /* 1440 */ 326, 47, 46, 298, 233, 363, 326, 326, 101, 1, + /* 1450 */ 326, 326, 326, 326, 326, 326, 326, 326, 43, 326, + /* 1460 */ 124, 92, 326, 96, 6, 107, 326, 326, 326, 326, + /* 1470 */ 154, 326, 326, 326, 245, 295, 241, 246, 326, 30, + /* 1480 */ 326, 326, 48, 326, 326, 326, 326, 326, 326, 326, + /* 1490 */ 326, 326, 326, 326, 326, 326, 326, 47, 46, 298, + /* 1500 */ 233, 363, 326, 326, 101, 1, 326, 326, 326, 326, + /* 1510 */ 326, 326, 326, 326, 43, 326, 134, 206, 326, 96, + /* 1520 */ 6, 107, 326, 326, 326, 326, 154, 326, 326, 326, + /* 1530 */ 245, 295, 241, 222, 326, 30, 326, 326, 48, 326, + /* 1540 */ 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, + /* 1550 */ 326, 326, 326, 47, 46, 298, 233, 363, 326, 326, + /* 1560 */ 101, 1, 326, 326, 326, 326, 326, 326, 326, 326, + /* 1570 */ 43, 326, 134, 205, 326, 96, 6, 107, 326, 326, + /* 1580 */ 326, 326, 154, 326, 326, 326, 245, 295, 241, 246, + /* 1590 */ 326, 30, 326, 326, 48, 326, 326, 326, 326, 326, + /* 1600 */ 326, 326, 326, 326, 326, 326, 326, 326, 326, 47, + /* 1610 */ 46, 298, 233, 363, 326, 326, 101, 1, 326, 326, + /* 1620 */ 326, 326, 326, 326, 326, 326, 43, 326, 134, 209, + /* 1630 */ 326, 96, 6, 107, 326, 326, 326, 326, 154, 326, + /* 1640 */ 326, 326, 245, 295, 241, 246, 326, 30, 326, 326, + /* 1650 */ 48, 326, 326, 326, 326, 326, 326, 326, 326, 326, + /* 1660 */ 326, 326, 326, 326, 326, 47, 46, 298, 233, 363, + /* 1670 */ 326, 326, 101, 1, 326, 326, 326, 326, 326, 326, + /* 1680 */ 326, 326, 43, 326, 130, 220, 326, 96, 6, 107, + /* 1690 */ 326, 326, 326, 326, 154, 326, 326, 326, 245, 295, + /* 1700 */ 241, 246, 326, 25, 326, 326, 48, 326, 326, 326, + /* 1710 */ 326, 326, 326, 326, 326, 326, 326, 326, 326, 190, + /* 1720 */ 165, 47, 46, 298, 233, 363, 326, 326, 101, 292, + /* 1730 */ 326, 326, 24, 22, 326, 326, 326, 326, 43, 326, + /* 1740 */ 130, 221, 326, 96, 6, 107, 200, 326, 326, 326, + /* 1750 */ 154, 326, 326, 326, 245, 295, 241, 246, 326, 25, + /* 1760 */ 326, 326, 48, 326, 326, 326, 326, 326, 326, 326, + /* 1770 */ 326, 326, 326, 326, 326, 326, 326, 47, 46, 298, + /* 1780 */ 233, 363, 326, 326, 101, 326, 326, 326, 326, 326, + /* 1790 */ 326, 326, 326, 326, 326, 501, 190, 180, 326, 96, + /* 1800 */ 326, 326, 501, 326, 501, 501, 292, 501, 501, 24, + /* 1810 */ 22, 326, 326, 344, 501, 7, 501, 132, 326, 326, + /* 1820 */ 78, 129, 326, 200, 326, 326, 326, 326, 326, 301, + /* 1830 */ 361, 501, 326, 236, 368, 365, 326, 343, 136, 326, + /* 1840 */ 326, 344, 501, 326, 217, 93, 326, 326, 59, 117, + /* 1850 */ 326, 326, 326, 326, 326, 326, 501, 301, 361, 326, + /* 1860 */ 326, 236, 368, 365, 344, 343, 326, 326, 132, 326, + /* 1870 */ 326, 77, 129, 326, 326, 326, 326, 326, 326, 326, + /* 1880 */ 301, 361, 326, 326, 236, 368, 365, 344, 343, 326, + /* 1890 */ 326, 132, 326, 326, 84, 129, 326, 326, 344, 326, + /* 1900 */ 326, 326, 115, 301, 361, 72, 129, 236, 368, 365, + /* 1910 */ 326, 343, 326, 326, 301, 361, 326, 326, 236, 368, + /* 1920 */ 365, 326, 343, 344, 326, 326, 326, 132, 326, 326, + /* 1930 */ 64, 129, 326, 326, 344, 326, 326, 326, 132, 301, + /* 1940 */ 361, 66, 129, 236, 368, 365, 326, 343, 326, 326, + /* 1950 */ 301, 361, 326, 344, 236, 368, 365, 132, 343, 326, + /* 1960 */ 68, 129, 326, 326, 326, 326, 326, 326, 326, 301, + /* 1970 */ 361, 326, 344, 236, 368, 365, 132, 343, 326, 76, + /* 1980 */ 129, 326, 326, 344, 326, 326, 326, 132, 301, 361, + /* 1990 */ 80, 129, 236, 368, 365, 326, 343, 326, 326, 301, + /* 2000 */ 361, 326, 326, 236, 368, 365, 326, 343, 344, 326, + /* 2010 */ 326, 326, 132, 326, 326, 60, 129, 326, 326, 344, + /* 2020 */ 326, 326, 326, 132, 301, 361, 73, 129, 236, 368, + /* 2030 */ 365, 326, 343, 326, 326, 301, 361, 326, 344, 236, + /* 2040 */ 368, 365, 132, 343, 326, 74, 129, 326, 326, 326, + /* 2050 */ 326, 326, 326, 326, 301, 361, 326, 344, 236, 368, + /* 2060 */ 365, 132, 343, 326, 90, 129, 326, 326, 344, 326, + /* 2070 */ 326, 326, 132, 301, 361, 65, 129, 236, 368, 365, + /* 2080 */ 326, 343, 326, 326, 301, 361, 326, 326, 236, 368, + /* 2090 */ 365, 326, 343, 344, 326, 326, 326, 132, 326, 326, + /* 2100 */ 83, 129, 326, 326, 344, 326, 326, 326, 93, 301, + /* 2110 */ 361, 53, 117, 236, 368, 365, 326, 343, 326, 326, + /* 2120 */ 301, 361, 326, 344, 215, 368, 365, 132, 343, 326, + /* 2130 */ 87, 129, 326, 326, 326, 326, 326, 326, 326, 301, + /* 2140 */ 361, 326, 344, 236, 368, 365, 132, 343, 326, 58, + /* 2150 */ 129, 326, 326, 344, 326, 326, 326, 122, 301, 361, + /* 2160 */ 55, 129, 236, 368, 365, 326, 343, 326, 326, 301, + /* 2170 */ 361, 326, 326, 236, 368, 365, 326, 343, 344, 326, + /* 2180 */ 326, 326, 132, 326, 326, 70, 129, 326, 326, 344, + /* 2190 */ 326, 326, 326, 132, 301, 361, 91, 129, 236, 368, + /* 2200 */ 365, 326, 343, 326, 326, 301, 361, 326, 344, 236, + /* 2210 */ 368, 365, 111, 343, 326, 63, 129, 326, 326, 326, + /* 2220 */ 326, 326, 326, 326, 301, 361, 326, 344, 236, 368, + /* 2230 */ 365, 132, 343, 326, 86, 129, 326, 326, 344, 326, + /* 2240 */ 326, 326, 132, 301, 361, 79, 129, 236, 368, 365, + /* 2250 */ 326, 343, 326, 326, 301, 361, 326, 326, 236, 368, + /* 2260 */ 365, 326, 343, 344, 326, 326, 326, 132, 326, 326, + /* 2270 */ 75, 129, 326, 326, 344, 326, 326, 326, 132, 301, + /* 2280 */ 361, 88, 129, 236, 368, 365, 326, 343, 326, 326, + /* 2290 */ 301, 361, 326, 344, 236, 368, 365, 132, 343, 326, + /* 2300 */ 62, 129, 326, 326, 326, 326, 326, 326, 326, 301, + /* 2310 */ 361, 326, 344, 236, 368, 365, 132, 343, 326, 61, + /* 2320 */ 129, 326, 326, 344, 326, 326, 326, 132, 301, 361, + /* 2330 */ 69, 129, 236, 368, 365, 326, 343, 326, 326, 301, + /* 2340 */ 361, 326, 326, 236, 368, 365, 326, 343, 344, 326, + /* 2350 */ 326, 326, 132, 326, 326, 57, 129, 326, 326, 344, + /* 2360 */ 326, 326, 326, 132, 301, 361, 89, 129, 236, 368, + /* 2370 */ 365, 326, 343, 326, 326, 301, 361, 326, 344, 236, + /* 2380 */ 368, 365, 132, 343, 326, 81, 129, 326, 326, 326, + /* 2390 */ 326, 326, 326, 326, 301, 361, 326, 344, 236, 368, + /* 2400 */ 365, 113, 343, 326, 85, 129, 326, 326, 344, 326, + /* 2410 */ 326, 326, 132, 301, 361, 71, 129, 236, 368, 365, + /* 2420 */ 326, 343, 326, 326, 301, 361, 326, 326, 236, 368, + /* 2430 */ 365, 326, 343, 344, 326, 326, 326, 132, 326, 326, + /* 2440 */ 67, 129, 326, 326, 344, 326, 326, 326, 132, 301, + /* 2450 */ 361, 56, 129, 214, 368, 365, 326, 343, 326, 326, + /* 2460 */ 301, 361, 326, 344, 236, 368, 365, 147, 343, 326, + /* 2470 */ 326, 129, 326, 326, 326, 326, 326, 326, 326, 326, + /* 2480 */ 364, 326, 344, 236, 368, 365, 157, 343, 326, 326, + /* 2490 */ 129, 326, 326, 326, 326, 100, 177, 326, 326, 280, + /* 2500 */ 326, 326, 236, 368, 365, 292, 343, 326, 24, 22, + /* 2510 */ 326, 190, 167, 326, 326, 326, 326, 326, 190, 182, + /* 2520 */ 326, 292, 200, 326, 24, 22, 326, 326, 292, 326, + /* 2530 */ 326, 24, 22, 326, 190, 169, 326, 326, 200, 326, + /* 2540 */ 326, 326, 326, 326, 292, 200, 326, 24, 22, 326, + /* 2550 */ 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, + /* 2560 */ 326, 200, ); static public $yy_lookahead = array( - /* 0 */ - 1, 38, 3, 40, 91, 4, 5, 6, 7, 8, - /* 10 */ - 9, 10, 11, 12, 13, 14, 15, 104, 105, 18, - /* 20 */ - 118, 18, 60, 20, 23, 24, 1, 65, 3, 30, - /* 30 */ - 29, 118, 1, 30, 33, 36, 35, 21, 22, 36, - /* 40 */ - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - /* 50 */ - 51, 52, 53, 54, 1, 30, 31, 1, 1, 3, - /* 60 */ - 3, 36, 2, 18, 19, 20, 67, 68, 69, 70, - /* 70 */ - 71, 72, 73, 74, 75, 76, 77, 78, 62, 30, - /* 80 */ - 55, 28, 37, 30, 111, 36, 30, 30, 18, 36, - /* 90 */ - 20, 21, 36, 36, 41, 42, 43, 44, 45, 46, - /* 100 */ - 47, 48, 49, 50, 51, 52, 53, 54, 1, 91, - /* 110 */ - 92, 55, 55, 83, 84, 85, 86, 87, 38, 101, - /* 120 */ - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - /* 130 */ - 77, 78, 18, 63, 20, 21, 118, 30, 1, 18, - /* 140 */ - 3, 20, 21, 36, 111, 39, 66, 26, 41, 42, - /* 150 */ - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - /* 160 */ - 53, 54, 1, 1, 26, 3, 60, 30, 62, 15, - /* 170 */ - 16, 17, 66, 36, 67, 68, 69, 70, 71, 72, - /* 180 */ - 73, 74, 75, 76, 77, 78, 18, 19, 20, 32, - /* 190 */ - 100, 1, 30, 109, 1, 18, 39, 20, 36, 1, - /* 200 */ - 116, 3, 41, 42, 43, 44, 45, 46, 47, 48, - /* 210 */ - 49, 50, 51, 52, 53, 54, 1, 55, 80, 62, - /* 220 */ - 30, 85, 86, 87, 39, 32, 36, 66, 67, 68, - /* 230 */ - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - /* 240 */ - 63, 86, 114, 115, 91, 92, 31, 62, 55, 18, - /* 250 */ - 38, 20, 40, 55, 101, 18, 41, 42, 43, 44, - /* 260 */ - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - /* 270 */ - 1, 118, 3, 94, 95, 96, 39, 122, 123, 38, - /* 280 */ - 91, 40, 67, 68, 69, 70, 71, 72, 73, 74, - /* 290 */ - 75, 76, 77, 78, 63, 114, 115, 100, 91, 92, - /* 300 */ - 112, 91, 114, 115, 91, 19, 20, 118, 101, 20, - /* 310 */ - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - /* 320 */ - 51, 52, 53, 54, 1, 118, 3, 100, 118, 119, - /* 330 */ - 60, 118, 2, 91, 3, 65, 67, 68, 69, 70, - /* 340 */ - 71, 72, 73, 74, 75, 76, 77, 78, 21, 22, - /* 350 */ - 64, 21, 63, 92, 111, 119, 113, 26, 19, 20, - /* 360 */ - 118, 1, 101, 21, 41, 42, 43, 44, 45, 46, - /* 370 */ - 47, 48, 49, 50, 51, 52, 53, 54, 1, 118, - /* 380 */ - 3, 18, 22, 20, 19, 94, 95, 1, 98, 62, - /* 390 */ - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - /* 400 */ - 77, 78, 60, 113, 39, 1, 2, 92, 92, 18, - /* 410 */ - 111, 20, 113, 87, 26, 89, 101, 101, 41, 42, - /* 420 */ - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - /* 430 */ - 53, 54, 1, 118, 118, 18, 39, 20, 19, 94, - /* 440 */ - 95, 55, 98, 25, 67, 68, 69, 70, 71, 72, - /* 450 */ - 73, 74, 75, 76, 77, 78, 38, 113, 86, 92, - /* 460 */ - 92, 92, 18, 40, 20, 30, 60, 2, 101, 101, - /* 470 */ - 101, 36, 41, 42, 43, 44, 45, 46, 47, 48, - /* 480 */ - 49, 50, 51, 52, 53, 54, 1, 118, 18, 109, - /* 490 */ - 20, 20, 56, 39, 19, 123, 116, 98, 67, 68, - /* 500 */ - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - /* 510 */ - 25, 80, 113, 92, 64, 27, 21, 20, 19, 64, - /* 520 */ - 20, 3, 101, 20, 22, 2, 41, 42, 43, 44, - /* 530 */ - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - /* 540 */ - 1, 20, 3, 19, 3, 20, 20, 20, 19, 66, - /* 550 */ - 98, 98, 67, 68, 69, 70, 71, 72, 73, 74, - /* 560 */ - 75, 76, 77, 78, 62, 113, 113, 20, 37, 37, - /* 570 */ - 3, 20, 20, 101, 112, 111, 22, 111, 111, 111, - /* 580 */ - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - /* 590 */ - 51, 52, 53, 54, 1, 116, 30, 113, 97, 88, - /* 600 */ - 16, 115, 124, 97, 99, 98, 67, 68, 69, 70, - /* 610 */ - 71, 72, 73, 74, 75, 76, 77, 78, 113, 124, - /* 620 */ - 113, 124, 124, 124, 124, 124, 124, 124, 124, 124, - /* 630 */ - 124, 124, 124, 40, 41, 42, 43, 44, 45, 46, - /* 640 */ - 47, 48, 49, 50, 51, 52, 53, 54, 1, 2, - /* 650 */ - 124, 124, 124, 124, 124, 124, 124, 98, 98, 98, - /* 660 */ - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - /* 670 */ - 77, 78, 113, 113, 113, 124, 124, 124, 124, 124, - /* 680 */ - 124, 124, 124, 124, 124, 124, 124, 124, 41, 42, - /* 690 */ - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - /* 700 */ - 53, 54, 1, 124, 124, 124, 124, 124, 124, 124, - /* 710 */ - 124, 98, 124, 124, 67, 68, 69, 70, 71, 72, - /* 720 */ - 73, 74, 75, 76, 77, 78, 113, 124, 124, 124, - /* 730 */ - 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, - /* 740 */ - 124, 40, 41, 42, 43, 44, 45, 46, 47, 48, - /* 750 */ - 49, 50, 51, 52, 53, 54, 1, 124, 124, 124, - /* 760 */ - 124, 124, 124, 124, 124, 124, 124, 124, 67, 68, - /* 770 */ - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - /* 780 */ - 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, - /* 790 */ - 124, 124, 124, 124, 124, 124, 41, 42, 43, 44, - /* 800 */ - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - /* 810 */ - 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, - /* 820 */ - 22, 124, 67, 68, 69, 70, 71, 72, 73, 74, - /* 830 */ - 75, 76, 77, 78, 124, 124, 124, 124, 41, 42, - /* 840 */ - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - /* 850 */ - 53, 54, 124, 124, 124, 124, 124, 124, 60, 124, - /* 860 */ - 124, 124, 124, 65, 67, 68, 69, 70, 71, 72, - /* 870 */ - 73, 74, 75, 76, 77, 78, 124, 124, 124, 124, - /* 880 */ - 124, 124, 124, 18, 19, 20, 124, 124, 23, 24, - /* 890 */ - 124, 86, 124, 124, 29, 90, 92, 124, 33, 94, - /* 900 */ - 35, 124, 37, 124, 39, 101, 124, 42, 103, 124, - /* 910 */ - 124, 106, 107, 108, 124, 110, 124, 113, 92, 92, - /* 920 */ - 124, 124, 57, 58, 59, 60, 61, 101, 101, 64, - /* 930 */ - 65, 66, 124, 94, 124, 124, 124, 124, 124, 113, - /* 940 */ - 113, 18, 19, 20, 79, 106, 23, 24, 124, 110, - /* 950 */ - 124, 124, 29, 124, 124, 86, 33, 34, 35, 90, - /* 960 */ - 37, 124, 39, 94, 92, 42, 124, 124, 124, 124, - /* 970 */ - 86, 124, 103, 101, 90, 106, 107, 108, 94, 110, - /* 980 */ - 57, 58, 59, 60, 61, 113, 124, 64, 65, 124, - /* 990 */ - 106, 107, 108, 124, 110, 18, 124, 20, 124, 18, - /* 1000 */ - 19, 20, 79, 124, 23, 24, 124, 30, 124, 32, - /* 1010 */ - 29, 86, 124, 36, 33, 90, 35, 124, 37, 94, - /* 1020 */ - 39, 124, 124, 42, 124, 124, 124, 124, 124, 124, - /* 1030 */ - 124, 106, 107, 108, 124, 110, 124, 124, 57, 58, - /* 1040 */ - 59, 60, 61, 124, 124, 64, 65, 124, 124, 124, - /* 1050 */ - 124, 124, 18, 124, 20, 124, 124, 18, 19, 20, - /* 1060 */ - 79, 124, 23, 24, 30, 86, 32, 124, 29, 90, - /* 1070 */ - 36, 86, 33, 94, 35, 90, 37, 124, 39, 94, - /* 1080 */ - 124, 42, 124, 124, 124, 106, 107, 108, 124, 110, - /* 1090 */ - 124, 106, 107, 108, 124, 110, 57, 58, 59, 60, - /* 1100 */ - 61, 124, 124, 64, 65, 124, 124, 124, 124, 124, - /* 1110 */ - 124, 124, 124, 124, 124, 18, 19, 20, 79, 124, - /* 1120 */ - 23, 24, 124, 124, 124, 124, 29, 86, 124, 124, - /* 1130 */ - 33, 90, 35, 124, 37, 94, 39, 124, 124, 42, - /* 1140 */ - 124, 124, 124, 124, 124, 124, 124, 106, 107, 108, - /* 1150 */ - 124, 110, 124, 124, 57, 58, 59, 60, 61, 124, - /* 1160 */ - 124, 64, 65, 124, 124, 124, 124, 124, 124, 124, - /* 1170 */ - 124, 124, 124, 18, 19, 20, 79, 124, 23, 24, - /* 1180 */ - 124, 124, 124, 124, 29, 86, 124, 124, 33, 90, - /* 1190 */ - 35, 124, 37, 94, 39, 124, 124, 42, 124, 124, - /* 1200 */ - 124, 124, 124, 124, 124, 106, 107, 108, 124, 110, - /* 1210 */ - 124, 124, 57, 58, 59, 60, 61, 124, 124, 64, - /* 1220 */ - 65, 124, 124, 124, 124, 124, 124, 124, 124, 124, - /* 1230 */ - 124, 18, 19, 20, 79, 124, 23, 24, 124, 124, - /* 1240 */ - 124, 124, 29, 86, 124, 124, 33, 90, 35, 124, - /* 1250 */ - 37, 94, 39, 124, 124, 42, 124, 124, 124, 124, - /* 1260 */ - 124, 124, 124, 106, 107, 108, 124, 110, 124, 124, - /* 1270 */ - 57, 58, 59, 60, 61, 124, 124, 64, 65, 124, - /* 1280 */ - 1, 124, 3, 124, 3, 124, 124, 124, 124, 18, - /* 1290 */ - 19, 20, 79, 124, 23, 24, 124, 124, 124, 124, - /* 1300 */ - 29, 22, 21, 124, 33, 124, 35, 124, 37, 30, - /* 1310 */ - 39, 30, 124, 42, 124, 36, 124, 36, 39, 124, - /* 1320 */ - 39, 124, 124, 124, 91, 92, 124, 124, 57, 58, - /* 1330 */ - 59, 60, 61, 124, 101, 64, 65, 104, 105, 124, - /* 1340 */ - 124, 62, 124, 62, 124, 124, 124, 18, 19, 20, - /* 1350 */ - 79, 118, 23, 24, 124, 124, 124, 124, 29, 124, - /* 1360 */ - 124, 124, 33, 124, 35, 124, 37, 124, 39, 91, - /* 1370 */ - 92, 42, 124, 124, 124, 124, 124, 124, 124, 101, - /* 1380 */ - 124, 124, 104, 105, 124, 124, 57, 58, 59, 60, - /* 1390 */ - 61, 124, 124, 64, 65, 124, 118, 124, 124, 124, - /* 1400 */ - 124, 124, 124, 124, 124, 18, 19, 20, 79, 124, - /* 1410 */ - 23, 24, 124, 124, 124, 124, 29, 124, 124, 124, - /* 1420 */ - 33, 124, 35, 124, 37, 124, 39, 91, 92, 42, - /* 1430 */ - 124, 124, 124, 124, 124, 124, 124, 101, 124, 124, - /* 1440 */ - 104, 105, 124, 124, 57, 58, 59, 60, 61, 124, - /* 1450 */ - 124, 64, 124, 124, 118, 124, 124, 124, 124, 124, - /* 1460 */ - 124, 124, 124, 18, 19, 20, 79, 124, 23, 24, - /* 1470 */ - 124, 124, 124, 124, 29, 124, 124, 124, 33, 124, - /* 1480 */ - 35, 124, 37, 124, 39, 124, 3, 42, 124, 124, - /* 1490 */ - 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, - /* 1500 */ - 124, 124, 57, 58, 59, 60, 61, 124, 25, 64, - /* 1510 */ - 27, 28, 124, 30, 31, 124, 124, 124, 124, 36, - /* 1520 */ - 124, 38, 39, 40, 79, 124, 124, 124, 124, 124, - /* 1530 */ - 124, 124, 124, 124, 124, 86, 124, 124, 55, 90, - /* 1540 */ - 124, 124, 93, 94, 124, 62, 124, 124, 124, 66, - /* 1550 */ - 124, 102, 103, 124, 124, 106, 107, 108, 124, 110, - /* 1560 */ - 124, 124, 124, 80, 124, 124, 124, 86, 124, 120, - /* 1570 */ - 121, 90, 124, 124, 93, 94, 95, 124, 124, 124, - /* 1580 */ - 124, 124, 124, 102, 103, 124, 124, 106, 107, 108, - /* 1590 */ - 86, 110, 124, 124, 90, 124, 124, 93, 94, 124, - /* 1600 */ - 124, 124, 124, 124, 124, 124, 102, 103, 124, 86, - /* 1610 */ - 106, 107, 108, 90, 110, 124, 93, 94, 124, 124, - /* 1620 */ - 124, 117, 124, 124, 124, 102, 103, 124, 124, 106, - /* 1630 */ - 107, 108, 124, 110, 124, 124, 124, 124, 86, 124, - /* 1640 */ - 117, 124, 90, 124, 124, 93, 94, 124, 124, 124, - /* 1650 */ - 124, 124, 124, 124, 102, 103, 124, 124, 106, 107, - /* 1660 */ - 108, 86, 110, 124, 124, 90, 124, 124, 93, 94, - /* 1670 */ - 95, 124, 124, 121, 124, 124, 124, 102, 103, 124, - /* 1680 */ - 124, 106, 107, 108, 86, 110, 124, 124, 90, 124, - /* 1690 */ - 124, 93, 94, 124, 124, 124, 124, 124, 124, 124, - /* 1700 */ - 102, 103, 124, 86, 106, 107, 108, 90, 110, 124, - /* 1710 */ - 93, 94, 124, 124, 124, 117, 124, 124, 124, 102, - /* 1720 */ - 103, 124, 124, 106, 107, 108, 124, 110, 124, 86, - /* 1730 */ - 91, 92, 124, 90, 124, 124, 93, 94, 124, 124, - /* 1740 */ - 101, 124, 124, 104, 105, 102, 103, 124, 86, 106, - /* 1750 */ - 107, 108, 90, 110, 124, 93, 94, 118, 124, 124, - /* 1760 */ - 124, 124, 124, 124, 102, 103, 124, 124, 106, 107, - /* 1770 */ - 108, 86, 110, 124, 124, 90, 124, 124, 93, 94, - /* 1780 */ - 124, 124, 124, 124, 124, 124, 124, 102, 103, 124, - /* 1790 */ - 86, 106, 107, 108, 90, 110, 124, 93, 94, 124, - /* 1800 */ - 124, 124, 124, 124, 124, 124, 102, 103, 124, 124, - /* 1810 */ - 106, 107, 108, 124, 110, 124, 86, 91, 92, 124, - /* 1820 */ - 90, 124, 124, 93, 94, 124, 124, 101, 124, 124, - /* 1830 */ - 104, 105, 102, 103, 124, 86, 106, 107, 108, 90, - /* 1840 */ - 110, 124, 93, 94, 118, 124, 124, 124, 124, 124, - /* 1850 */ - 124, 102, 103, 124, 124, 106, 107, 108, 86, 110, - /* 1860 */ - 124, 124, 90, 124, 124, 93, 94, 124, 124, 124, - /* 1870 */ - 124, 124, 124, 124, 102, 103, 124, 86, 106, 107, - /* 1880 */ - 108, 90, 110, 124, 93, 94, 124, 124, 124, 124, - /* 1890 */ - 124, 124, 124, 102, 103, 124, 124, 106, 107, 108, - /* 1900 */ - 124, 110, 124, 86, 91, 92, 124, 90, 124, 124, - /* 1910 */ - 93, 94, 124, 124, 101, 124, 124, 104, 105, 102, - /* 1920 */ - 103, 124, 86, 106, 107, 108, 90, 110, 124, 93, - /* 1930 */ - 94, 118, 124, 124, 124, 124, 124, 124, 102, 103, - /* 1940 */ - 124, 124, 106, 107, 108, 86, 110, 124, 124, 90, - /* 1950 */ - 124, 124, 93, 94, 124, 124, 124, 124, 124, 124, - /* 1960 */ - 124, 102, 103, 124, 86, 106, 107, 108, 90, 110, - /* 1970 */ - 124, 93, 94, 124, 124, 124, 124, 124, 124, 124, - /* 1980 */ - 102, 103, 124, 124, 106, 107, 108, 124, 110, 124, - /* 1990 */ - 86, 124, 124, 124, 90, 124, 124, 93, 94, 124, - /* 2000 */ - 124, 124, 124, 124, 124, 124, 102, 103, 124, 86, - /* 2010 */ - 106, 107, 108, 90, 110, 124, 93, 94, 124, 124, - /* 2020 */ - 124, 124, 124, 124, 124, 102, 103, 124, 124, 106, - /* 2030 */ - 107, 108, 86, 110, 124, 124, 90, 124, 124, 93, - /* 2040 */ - 94, 124, 124, 124, 124, 124, 124, 124, 102, 103, - /* 2050 */ - 124, 86, 106, 107, 108, 90, 110, 124, 93, 94, - /* 2060 */ - 124, 124, 124, 124, 124, 124, 124, 102, 103, 124, - /* 2070 */ - 124, 106, 107, 108, 124, 110, 124, 86, 124, 124, - /* 2080 */ - 124, 90, 124, 124, 93, 94, 124, 124, 124, 124, - /* 2090 */ - 124, 124, 124, 102, 103, 124, 86, 106, 107, 108, - /* 2100 */ - 90, 110, 124, 93, 94, 124, 124, 124, 124, 124, - /* 2110 */ - 124, 124, 102, 103, 124, 124, 106, 107, 108, 86, - /* 2120 */ - 110, 124, 124, 90, 124, 124, 93, 94, 124, 124, - /* 2130 */ - 124, 124, 124, 124, 124, 102, 103, 124, 86, 106, - /* 2140 */ - 107, 108, 90, 110, 124, 93, 94, 124, 124, 124, - /* 2150 */ - 124, 124, 124, 124, 102, 103, 124, 124, 106, 107, - /* 2160 */ - 108, 124, 110, 124, 86, 124, 124, 124, 90, 124, - /* 2170 */ - 124, 93, 94, 124, 124, 124, 124, 124, 124, 124, - /* 2180 */ - 102, 103, 124, 86, 106, 107, 108, 90, 110, 124, - /* 2190 */ - 93, 94, 124, 124, 124, 124, 124, 124, 124, 102, - /* 2200 */ - 103, 124, 124, 106, 107, 108, 86, 110, 124, 124, - /* 2210 */ - 90, 124, 124, 93, 94, 124, 124, 124, 124, 124, - /* 2220 */ - 124, 124, 102, 103, 124, 86, 106, 107, 108, 90, - /* 2230 */ - 110, 124, 93, 94, 124, 124, 124, 124, 124, 124, - /* 2240 */ - 124, 102, 103, 124, 124, 106, 107, 108, 124, 110, - /* 2250 */ - 124, 86, 124, 124, 124, 90, 124, 124, 93, 94, - /* 2260 */ - 124, 124, 124, 124, 124, 124, 124, 102, 103, 124, - /* 2270 */ - 86, 106, 107, 108, 90, 110, 124, 93, 94, 124, - /* 2280 */ - 124, 124, 124, 124, 124, 124, 102, 103, 124, 124, - /* 2290 */ - 106, 107, 108, 86, 110, 124, 124, 90, 124, 124, - /* 2300 */ - 93, 94, 124, 124, 124, 124, 124, 124, 124, 102, - /* 2310 */ - 103, 124, 86, 106, 107, 108, 90, 110, 124, 93, - /* 2320 */ - 94, 124, 124, 124, 124, 124, 124, 124, 102, 103, - /* 2330 */ - 124, 124, 106, 107, 108, 124, 110, 124, 86, 124, - /* 2340 */ - 124, 124, 90, 124, 124, 93, 94, 124, 124, 124, - /* 2350 */ - 124, 124, 124, 124, 102, 103, 124, 11, 106, 107, - /* 2360 */ - 108, 124, 110, 124, 18, 124, 124, 124, 124, 23, - /* 2370 */ - 24, 11, 124, 124, 124, 29, 124, 124, 18, 33, - /* 2380 */ - 124, 35, 124, 23, 24, 124, 124, 124, 124, 29, - /* 2390 */ - 124, 124, 124, 33, 124, 35, 86, 124, 124, 124, - /* 2400 */ - 90, 124, 124, 93, 94, 124, 124, 124, 124, 124, - /* 2410 */ - 124, 124, 102, 103, 124, 124, 106, 107, 108, 124, - /* 2420 */ - 110, 124, 124, 124, 124, 79, 80, 81, 124, 86, - /* 2430 */ - 124, 124, 124, 90, 124, 124, 93, 94, 124, 79, - /* 2440 */ - 80, 81, 124, 124, 124, 102, 103, 124, 124, 106, - /* 2450 */ - 107, 108, 124, 110, 124, 124, 86, 124, 124, 124, - /* 2460 */ - 90, 124, 124, 93, 94, 124, 124, 124, 124, 124, - /* 2470 */ - 124, 124, 102, 103, 124, 124, 106, 107, 108, 124, - /* 2480 */ - 110, 124, 86, 124, 124, 124, 90, 124, 124, 93, - /* 2490 */ - 94, 124, 124, 124, 124, 124, 124, 124, 102, 103, - /* 2500 */ - 124, 124, 106, 107, 108, 86, 110, 124, 124, 90, - /* 2510 */ - 124, 124, 93, 94, 124, 124, 86, 124, 124, 124, - /* 2520 */ - 90, 102, 103, 93, 94, 106, 107, 108, 124, 110, - /* 2530 */ - 124, 124, 102, 103, 124, 124, 106, 107, 108, 124, - /* 2540 */ - 110, - ); - const YY_SHIFT_USE_DFLT = - 39; - const YY_SHIFT_MAX = 259; + /* 0 */ 1, 83, 84, 85, 3, 4, 5, 6, 7, 8, + /* 10 */ 9, 10, 11, 12, 13, 98, 90, 16, 81, 82, + /* 20 */ 83, 84, 85, 22, 23, 99, 27, 16, 29, 28, + /* 30 */ 19, 20, 109, 32, 33, 34, 25, 111, 39, 40, + /* 40 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + /* 50 */ 51, 52, 4, 5, 6, 7, 8, 16, 36, 84, + /* 60 */ 38, 13, 14, 15, 65, 66, 67, 68, 69, 70, + /* 70 */ 71, 72, 73, 74, 75, 76, 1, 84, 37, 89, + /* 80 */ 90, 88, 37, 16, 91, 92, 19, 20, 17, 99, + /* 90 */ 17, 20, 17, 100, 101, 120, 121, 104, 105, 106, + /* 100 */ 29, 108, 29, 58, 29, 60, 116, 31, 37, 64, + /* 110 */ 37, 118, 119, 37, 39, 40, 41, 42, 43, 44, + /* 120 */ 45, 46, 47, 48, 49, 50, 51, 52, 61, 89, + /* 130 */ 90, 60, 36, 60, 38, 16, 60, 18, 19, 99, + /* 140 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + /* 150 */ 75, 76, 1, 84, 35, 1, 116, 88, 21, 89, + /* 160 */ 91, 92, 93, 16, 16, 97, 19, 19, 17, 100, + /* 170 */ 101, 17, 19, 104, 105, 106, 29, 108, 31, 111, + /* 180 */ 29, 89, 1, 29, 30, 16, 116, 117, 19, 20, + /* 190 */ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + /* 200 */ 49, 50, 51, 52, 25, 89, 90, 53, 116, 61, + /* 210 */ 16, 1, 31, 19, 61, 99, 65, 66, 67, 68, + /* 220 */ 69, 70, 71, 72, 73, 74, 75, 76, 1, 84, + /* 230 */ 58, 1, 116, 88, 53, 63, 91, 92, 93, 16, + /* 240 */ 20, 21, 19, 86, 17, 100, 101, 17, 92, 104, + /* 250 */ 105, 106, 29, 108, 31, 61, 29, 78, 98, 29, + /* 260 */ 104, 112, 113, 53, 108, 113, 39, 40, 41, 42, + /* 270 */ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + /* 280 */ 60, 90, 90, 53, 110, 109, 112, 113, 20, 21, + /* 290 */ 99, 99, 65, 66, 67, 68, 69, 70, 71, 72, + /* 300 */ 73, 74, 75, 76, 1, 84, 98, 1, 116, 88, + /* 310 */ 84, 62, 91, 92, 88, 90, 64, 1, 92, 21, + /* 320 */ 17, 100, 101, 17, 99, 104, 105, 106, 60, 108, + /* 330 */ 104, 105, 106, 17, 108, 29, 111, 21, 18, 19, + /* 340 */ 119, 14, 39, 40, 41, 42, 43, 44, 45, 46, + /* 350 */ 47, 48, 49, 50, 51, 52, 58, 112, 113, 53, + /* 360 */ 16, 63, 18, 19, 92, 93, 94, 19, 65, 66, + /* 370 */ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + /* 380 */ 1, 84, 62, 1, 90, 88, 84, 19, 91, 92, + /* 390 */ 88, 90, 58, 99, 92, 90, 17, 100, 101, 17, + /* 400 */ 99, 104, 105, 106, 99, 108, 104, 105, 106, 36, + /* 410 */ 108, 29, 115, 36, 19, 38, 111, 116, 39, 40, + /* 420 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + /* 430 */ 51, 52, 1, 90, 37, 53, 89, 64, 2, 109, + /* 440 */ 16, 111, 99, 19, 65, 66, 67, 68, 69, 70, + /* 450 */ 71, 72, 73, 74, 75, 76, 20, 60, 16, 116, + /* 460 */ 90, 19, 109, 116, 111, 18, 18, 19, 19, 99, + /* 470 */ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + /* 480 */ 49, 50, 51, 52, 37, 1, 116, 17, 16, 16, + /* 490 */ 16, 19, 19, 19, 89, 25, 65, 66, 67, 68, + /* 500 */ 69, 70, 71, 72, 73, 74, 75, 76, 24, 78, + /* 510 */ 24, 107, 92, 93, 1, 92, 93, 85, 114, 87, + /* 520 */ 19, 116, 36, 39, 40, 41, 42, 43, 44, 45, + /* 530 */ 46, 47, 48, 49, 50, 51, 52, 1, 19, 18, + /* 540 */ 20, 35, 29, 62, 19, 2, 96, 96, 96, 65, + /* 550 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + /* 560 */ 76, 111, 111, 111, 107, 54, 30, 18, 26, 18, + /* 570 */ 2, 114, 18, 18, 96, 39, 40, 41, 42, 43, + /* 580 */ 44, 45, 46, 47, 48, 49, 50, 51, 52, 111, + /* 590 */ 90, 19, 19, 35, 38, 25, 37, 19, 37, 99, + /* 600 */ 96, 65, 66, 67, 68, 69, 70, 71, 72, 73, + /* 610 */ 74, 75, 76, 1, 84, 111, 1, 99, 88, 84, + /* 620 */ 117, 91, 92, 88, 110, 116, 109, 92, 90, 17, + /* 630 */ 100, 101, 17, 20, 104, 105, 106, 99, 108, 104, + /* 640 */ 105, 106, 1, 108, 111, 115, 29, 29, 114, 111, + /* 650 */ 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, + /* 660 */ 48, 49, 50, 51, 52, 1, 95, 2, 53, 95, + /* 670 */ 122, 58, 109, 122, 122, 96, 96, 65, 66, 67, + /* 680 */ 68, 69, 70, 71, 72, 73, 74, 75, 76, 17, + /* 690 */ 111, 111, 122, 122, 122, 122, 122, 122, 122, 122, + /* 700 */ 122, 29, 38, 39, 40, 41, 42, 43, 44, 45, + /* 710 */ 46, 47, 48, 49, 50, 51, 52, 1, 122, 122, + /* 720 */ 122, 122, 122, 122, 122, 122, 96, 122, 1, 65, + /* 730 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + /* 740 */ 76, 111, 84, 122, 17, 122, 122, 122, 122, 122, + /* 750 */ 122, 122, 122, 122, 38, 39, 40, 41, 42, 43, + /* 760 */ 44, 45, 46, 47, 48, 49, 50, 51, 52, 1, + /* 770 */ 122, 122, 122, 122, 122, 122, 122, 122, 96, 121, + /* 780 */ 96, 65, 66, 67, 68, 69, 70, 71, 72, 73, + /* 790 */ 74, 75, 76, 111, 122, 111, 122, 29, 122, 122, + /* 800 */ 122, 122, 122, 122, 122, 122, 21, 39, 40, 41, + /* 810 */ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + /* 820 */ 52, 1, 122, 122, 122, 122, 122, 122, 122, 122, + /* 830 */ 122, 122, 122, 65, 66, 67, 68, 69, 70, 71, + /* 840 */ 72, 73, 74, 75, 76, 60, 122, 122, 122, 122, + /* 850 */ 122, 122, 122, 122, 122, 122, 122, 122, 122, 39, + /* 860 */ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + /* 870 */ 50, 51, 52, 122, 122, 122, 122, 122, 122, 122, + /* 880 */ 122, 122, 122, 122, 64, 65, 66, 67, 68, 69, + /* 890 */ 70, 71, 72, 73, 74, 75, 76, 1, 122, 122, + /* 900 */ 122, 122, 89, 84, 122, 122, 16, 88, 10, 19, + /* 910 */ 17, 92, 1, 17, 16, 102, 103, 1, 2, 29, + /* 920 */ 22, 23, 29, 104, 105, 106, 28, 108, 17, 116, + /* 930 */ 32, 33, 34, 17, 122, 39, 40, 41, 42, 43, + /* 940 */ 44, 45, 46, 47, 48, 49, 50, 51, 52, 1, + /* 950 */ 2, 122, 122, 122, 122, 122, 122, 122, 122, 122, + /* 960 */ 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, + /* 970 */ 74, 75, 76, 122, 122, 77, 78, 79, 122, 122, + /* 980 */ 122, 122, 122, 122, 122, 122, 122, 39, 40, 41, + /* 990 */ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + /* 1000 */ 52, 1, 122, 122, 122, 122, 122, 122, 122, 122, + /* 1010 */ 122, 122, 122, 65, 66, 67, 68, 69, 70, 71, + /* 1020 */ 72, 73, 74, 75, 76, 122, 122, 122, 122, 122, + /* 1030 */ 122, 122, 122, 122, 122, 122, 122, 122, 122, 39, + /* 1040 */ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + /* 1050 */ 50, 51, 52, 122, 122, 122, 122, 122, 122, 122, + /* 1060 */ 122, 122, 122, 122, 122, 65, 66, 67, 68, 69, + /* 1070 */ 70, 71, 72, 73, 74, 75, 76, 1, 1, 39, + /* 1080 */ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + /* 1090 */ 50, 51, 52, 17, 17, 122, 122, 122, 122, 122, + /* 1100 */ 122, 122, 122, 122, 122, 65, 66, 67, 68, 69, + /* 1110 */ 70, 71, 72, 73, 74, 75, 76, 1, 122, 1, + /* 1120 */ 122, 122, 16, 122, 18, 19, 122, 122, 22, 23, + /* 1130 */ 122, 122, 17, 17, 28, 17, 10, 21, 32, 33, + /* 1140 */ 34, 35, 16, 37, 29, 29, 40, 29, 22, 23, + /* 1150 */ 122, 122, 122, 37, 28, 122, 122, 122, 32, 33, + /* 1160 */ 34, 55, 56, 57, 58, 59, 122, 84, 62, 63, + /* 1170 */ 64, 88, 122, 122, 122, 92, 60, 122, 16, 122, + /* 1180 */ 18, 19, 122, 77, 22, 23, 17, 104, 105, 106, + /* 1190 */ 28, 108, 122, 122, 32, 33, 34, 35, 29, 37, + /* 1200 */ 122, 17, 40, 77, 78, 79, 122, 84, 122, 122, + /* 1210 */ 122, 88, 122, 29, 17, 92, 122, 55, 56, 57, + /* 1220 */ 58, 59, 122, 17, 62, 63, 29, 104, 105, 106, + /* 1230 */ 122, 108, 17, 17, 16, 29, 18, 19, 122, 77, + /* 1240 */ 22, 23, 17, 122, 29, 29, 28, 17, 122, 17, + /* 1250 */ 32, 33, 34, 35, 29, 37, 122, 17, 40, 29, + /* 1260 */ 17, 29, 122, 84, 122, 122, 122, 88, 122, 29, + /* 1270 */ 17, 92, 29, 55, 56, 57, 58, 59, 122, 17, + /* 1280 */ 62, 63, 29, 104, 105, 106, 122, 108, 17, 17, + /* 1290 */ 16, 29, 18, 19, 122, 77, 22, 23, 17, 122, + /* 1300 */ 29, 29, 28, 17, 122, 17, 32, 33, 34, 35, + /* 1310 */ 29, 37, 122, 122, 40, 29, 122, 29, 122, 122, + /* 1320 */ 122, 122, 122, 122, 122, 122, 122, 122, 122, 55, + /* 1330 */ 56, 57, 58, 59, 122, 122, 62, 63, 122, 122, + /* 1340 */ 122, 122, 122, 122, 122, 122, 16, 122, 18, 19, + /* 1350 */ 122, 77, 22, 23, 122, 122, 122, 122, 28, 122, + /* 1360 */ 122, 122, 32, 33, 34, 35, 122, 37, 122, 122, + /* 1370 */ 40, 122, 122, 122, 122, 122, 122, 122, 122, 122, + /* 1380 */ 122, 122, 122, 122, 122, 55, 56, 57, 58, 59, + /* 1390 */ 122, 122, 62, 63, 122, 122, 122, 122, 122, 122, + /* 1400 */ 122, 122, 16, 122, 18, 19, 122, 77, 22, 23, + /* 1410 */ 122, 122, 122, 122, 28, 122, 122, 122, 32, 33, + /* 1420 */ 34, 35, 122, 37, 122, 122, 40, 122, 122, 122, + /* 1430 */ 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, + /* 1440 */ 122, 55, 56, 57, 58, 59, 122, 122, 62, 63, + /* 1450 */ 122, 122, 122, 122, 122, 122, 122, 122, 16, 122, + /* 1460 */ 18, 19, 122, 77, 22, 23, 122, 122, 122, 122, + /* 1470 */ 28, 122, 122, 122, 32, 33, 34, 35, 122, 37, + /* 1480 */ 122, 122, 40, 122, 122, 122, 122, 122, 122, 122, + /* 1490 */ 122, 122, 122, 122, 122, 122, 122, 55, 56, 57, + /* 1500 */ 58, 59, 122, 122, 62, 63, 122, 122, 122, 122, + /* 1510 */ 122, 122, 122, 122, 16, 122, 18, 19, 122, 77, + /* 1520 */ 22, 23, 122, 122, 122, 122, 28, 122, 122, 122, + /* 1530 */ 32, 33, 34, 35, 122, 37, 122, 122, 40, 122, + /* 1540 */ 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, + /* 1550 */ 122, 122, 122, 55, 56, 57, 58, 59, 122, 122, + /* 1560 */ 62, 63, 122, 122, 122, 122, 122, 122, 122, 122, + /* 1570 */ 16, 122, 18, 19, 122, 77, 22, 23, 122, 122, + /* 1580 */ 122, 122, 28, 122, 122, 122, 32, 33, 34, 35, + /* 1590 */ 122, 37, 122, 122, 40, 122, 122, 122, 122, 122, + /* 1600 */ 122, 122, 122, 122, 122, 122, 122, 122, 122, 55, + /* 1610 */ 56, 57, 58, 59, 122, 122, 62, 63, 122, 122, + /* 1620 */ 122, 122, 122, 122, 122, 122, 16, 122, 18, 19, + /* 1630 */ 122, 77, 22, 23, 122, 122, 122, 122, 28, 122, + /* 1640 */ 122, 122, 32, 33, 34, 35, 122, 37, 122, 122, + /* 1650 */ 40, 122, 122, 122, 122, 122, 122, 122, 122, 122, + /* 1660 */ 122, 122, 122, 122, 122, 55, 56, 57, 58, 59, + /* 1670 */ 122, 122, 62, 63, 122, 122, 122, 122, 122, 122, + /* 1680 */ 122, 122, 16, 122, 18, 19, 122, 77, 22, 23, + /* 1690 */ 122, 122, 122, 122, 28, 122, 122, 122, 32, 33, + /* 1700 */ 34, 35, 122, 37, 122, 122, 40, 122, 122, 122, + /* 1710 */ 122, 122, 122, 122, 122, 122, 122, 122, 122, 89, + /* 1720 */ 90, 55, 56, 57, 58, 59, 122, 122, 62, 99, + /* 1730 */ 122, 122, 102, 103, 122, 122, 122, 122, 16, 122, + /* 1740 */ 18, 19, 122, 77, 22, 23, 116, 122, 122, 122, + /* 1750 */ 28, 122, 122, 122, 32, 33, 34, 35, 122, 37, + /* 1760 */ 122, 122, 40, 122, 122, 122, 122, 122, 122, 122, + /* 1770 */ 122, 122, 122, 122, 122, 122, 122, 55, 56, 57, + /* 1780 */ 58, 59, 122, 122, 62, 122, 122, 122, 122, 122, + /* 1790 */ 122, 122, 122, 122, 122, 17, 89, 90, 122, 77, + /* 1800 */ 122, 122, 24, 122, 26, 27, 99, 29, 30, 102, + /* 1810 */ 103, 122, 122, 84, 36, 37, 38, 88, 122, 122, + /* 1820 */ 91, 92, 122, 116, 122, 122, 122, 122, 122, 100, + /* 1830 */ 101, 53, 122, 104, 105, 106, 122, 108, 60, 122, + /* 1840 */ 122, 84, 64, 122, 115, 88, 122, 122, 91, 92, + /* 1850 */ 122, 122, 122, 122, 122, 122, 78, 100, 101, 122, + /* 1860 */ 122, 104, 105, 106, 84, 108, 122, 122, 88, 122, + /* 1870 */ 122, 91, 92, 122, 122, 122, 122, 122, 122, 122, + /* 1880 */ 100, 101, 122, 122, 104, 105, 106, 84, 108, 122, + /* 1890 */ 122, 88, 122, 122, 91, 92, 122, 122, 84, 122, + /* 1900 */ 122, 122, 88, 100, 101, 91, 92, 104, 105, 106, + /* 1910 */ 122, 108, 122, 122, 100, 101, 122, 122, 104, 105, + /* 1920 */ 106, 122, 108, 84, 122, 122, 122, 88, 122, 122, + /* 1930 */ 91, 92, 122, 122, 84, 122, 122, 122, 88, 100, + /* 1940 */ 101, 91, 92, 104, 105, 106, 122, 108, 122, 122, + /* 1950 */ 100, 101, 122, 84, 104, 105, 106, 88, 108, 122, + /* 1960 */ 91, 92, 122, 122, 122, 122, 122, 122, 122, 100, + /* 1970 */ 101, 122, 84, 104, 105, 106, 88, 108, 122, 91, + /* 1980 */ 92, 122, 122, 84, 122, 122, 122, 88, 100, 101, + /* 1990 */ 91, 92, 104, 105, 106, 122, 108, 122, 122, 100, + /* 2000 */ 101, 122, 122, 104, 105, 106, 122, 108, 84, 122, + /* 2010 */ 122, 122, 88, 122, 122, 91, 92, 122, 122, 84, + /* 2020 */ 122, 122, 122, 88, 100, 101, 91, 92, 104, 105, + /* 2030 */ 106, 122, 108, 122, 122, 100, 101, 122, 84, 104, + /* 2040 */ 105, 106, 88, 108, 122, 91, 92, 122, 122, 122, + /* 2050 */ 122, 122, 122, 122, 100, 101, 122, 84, 104, 105, + /* 2060 */ 106, 88, 108, 122, 91, 92, 122, 122, 84, 122, + /* 2070 */ 122, 122, 88, 100, 101, 91, 92, 104, 105, 106, + /* 2080 */ 122, 108, 122, 122, 100, 101, 122, 122, 104, 105, + /* 2090 */ 106, 122, 108, 84, 122, 122, 122, 88, 122, 122, + /* 2100 */ 91, 92, 122, 122, 84, 122, 122, 122, 88, 100, + /* 2110 */ 101, 91, 92, 104, 105, 106, 122, 108, 122, 122, + /* 2120 */ 100, 101, 122, 84, 104, 105, 106, 88, 108, 122, + /* 2130 */ 91, 92, 122, 122, 122, 122, 122, 122, 122, 100, + /* 2140 */ 101, 122, 84, 104, 105, 106, 88, 108, 122, 91, + /* 2150 */ 92, 122, 122, 84, 122, 122, 122, 88, 100, 101, + /* 2160 */ 91, 92, 104, 105, 106, 122, 108, 122, 122, 100, + /* 2170 */ 101, 122, 122, 104, 105, 106, 122, 108, 84, 122, + /* 2180 */ 122, 122, 88, 122, 122, 91, 92, 122, 122, 84, + /* 2190 */ 122, 122, 122, 88, 100, 101, 91, 92, 104, 105, + /* 2200 */ 106, 122, 108, 122, 122, 100, 101, 122, 84, 104, + /* 2210 */ 105, 106, 88, 108, 122, 91, 92, 122, 122, 122, + /* 2220 */ 122, 122, 122, 122, 100, 101, 122, 84, 104, 105, + /* 2230 */ 106, 88, 108, 122, 91, 92, 122, 122, 84, 122, + /* 2240 */ 122, 122, 88, 100, 101, 91, 92, 104, 105, 106, + /* 2250 */ 122, 108, 122, 122, 100, 101, 122, 122, 104, 105, + /* 2260 */ 106, 122, 108, 84, 122, 122, 122, 88, 122, 122, + /* 2270 */ 91, 92, 122, 122, 84, 122, 122, 122, 88, 100, + /* 2280 */ 101, 91, 92, 104, 105, 106, 122, 108, 122, 122, + /* 2290 */ 100, 101, 122, 84, 104, 105, 106, 88, 108, 122, + /* 2300 */ 91, 92, 122, 122, 122, 122, 122, 122, 122, 100, + /* 2310 */ 101, 122, 84, 104, 105, 106, 88, 108, 122, 91, + /* 2320 */ 92, 122, 122, 84, 122, 122, 122, 88, 100, 101, + /* 2330 */ 91, 92, 104, 105, 106, 122, 108, 122, 122, 100, + /* 2340 */ 101, 122, 122, 104, 105, 106, 122, 108, 84, 122, + /* 2350 */ 122, 122, 88, 122, 122, 91, 92, 122, 122, 84, + /* 2360 */ 122, 122, 122, 88, 100, 101, 91, 92, 104, 105, + /* 2370 */ 106, 122, 108, 122, 122, 100, 101, 122, 84, 104, + /* 2380 */ 105, 106, 88, 108, 122, 91, 92, 122, 122, 122, + /* 2390 */ 122, 122, 122, 122, 100, 101, 122, 84, 104, 105, + /* 2400 */ 106, 88, 108, 122, 91, 92, 122, 122, 84, 122, + /* 2410 */ 122, 122, 88, 100, 101, 91, 92, 104, 105, 106, + /* 2420 */ 122, 108, 122, 122, 100, 101, 122, 122, 104, 105, + /* 2430 */ 106, 122, 108, 84, 122, 122, 122, 88, 122, 122, + /* 2440 */ 91, 92, 122, 122, 84, 122, 122, 122, 88, 100, + /* 2450 */ 101, 91, 92, 104, 105, 106, 122, 108, 122, 122, + /* 2460 */ 100, 101, 122, 84, 104, 105, 106, 88, 108, 122, + /* 2470 */ 122, 92, 122, 122, 122, 122, 122, 122, 122, 122, + /* 2480 */ 101, 122, 84, 104, 105, 106, 88, 108, 122, 122, + /* 2490 */ 92, 122, 122, 122, 122, 89, 90, 122, 122, 101, + /* 2500 */ 122, 122, 104, 105, 106, 99, 108, 122, 102, 103, + /* 2510 */ 122, 89, 90, 122, 122, 122, 122, 122, 89, 90, + /* 2520 */ 122, 99, 116, 122, 102, 103, 122, 122, 99, 122, + /* 2530 */ 122, 102, 103, 122, 89, 90, 122, 122, 116, 122, + /* 2540 */ 122, 122, 122, 122, 99, 116, 122, 102, 103, 122, + /* 2550 */ 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, + /* 2560 */ 122, 116, +); + const YY_SHIFT_USE_DFLT = -2; + const YY_SHIFT_MAX = 252; static public $yy_shift_ofst = array( - /* 0 */ - 1, 1097, 1271, 1097, 981, 1271, 981, 981, 923, 865, - /* 10 */ - 923, 981, 981, 981, 981, 981, 981, 981, 981, 981, - /* 20 */ - 981, 981, 1213, 981, 981, 981, 1155, 1329, 981, 981, - /* 30 */ - 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, - /* 40 */ - 981, 1155, 981, 981, 1039, 1039, 1445, 1387, 1387, 1387, - /* 50 */ - 1387, 1387, 1387, - 1, 53, 107, 107, 107, 107, 107, - /* 60 */ - 539, 431, 701, 161, 377, 269, 647, 485, 593, 215, - /* 70 */ - 323, 755, 755, 755, 755, 755, 755, 755, 755, 755, - /* 80 */ - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - /* 90 */ - 797, 797, 1279, 56, 190, 1, 2346, 977, 1034, 3, - /* 100 */ - 3, 137, 137, 190, 190, 286, 798, 404, 365, 2360, - /* 110 */ - 25, 162, 57, 121, 70, 154, 16, 327, 198, 231, - /* 120 */ - 114, 193, 417, 391, 360, 363, 363, 339, 502, 363, - /* 130 */ - 365, 363, 365, 386, 339, 444, 470, 49, 444, 435, - /* 140 */ - 49, 363, 363, 363, 363, 363, 31, 554, 31, 31, - /* 150 */ - 554, 31, 31, 31, 31, 31, 31, - 39, 177, 168, - /* 160 */ - 49, 49, 49, 49, 49, 49, 49, 49, - 38, - 38, - /* 170 */ - - 38, 270, - 38, 49, 49, 49, 49, 49, 49, - 38, - /* 180 */ - 270, - 38, 237, 49, 49, 49, - 38, 49, 49, 49, - /* 190 */ - 584, 554, 554, 31, 566, 566, 60, 554, 31, 454, - /* 200 */ - 31, 31, 60, 31, - 39, - 39, - 39, - 39, - 39, 1483, - /* 210 */ - 1281, 106, 45, 157, 138, - 37, 80, 241, 418, 342, - /* 220 */ - 331, 212, 185, 330, 185, 289, 552, 541, 526, 525, - /* 230 */ - 521, 523, 524, 527, 529, 567, 551, 532, 531, 483, - /* 240 */ - 547, 503, 518, 436, 454, 465, 406, 397, 419, 423, - /* 250 */ - 471, 388, 475, 455, 500, 499, 497, 450, 488, 495, - ); - const YY_REDUCE_USE_DFLT = - 99; - const YY_REDUCE_MAX = 208; + /* 0 */ 1, 1386, 1162, 1218, 1162, 1386, 1218, 1162, 1106, 1162, + /* 10 */ 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1442, 1554, + /* 20 */ 1498, 1162, 1162, 1162, 1162, 1162, 1162, 1610, 1162, 1162, + /* 30 */ 1162, 1162, 1162, 1162, 1274, 1162, 1162, 1162, 1162, 1162, + /* 40 */ 1162, 1162, 1498, 1442, 1330, 1330, 1666, 1666, 1666, 1722, + /* 50 */ 1666, 1666, 1666, 227, 75, 151, -1, 768, 768, 768, + /* 60 */ 948, 896, 820, 536, 379, 716, 303, 431, 664, 612, + /* 70 */ 484, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, + /* 80 */ 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, + /* 90 */ 1040, 1040, 1116, 382, 513, 1, 1126, 147, 223, 1118, + /* 100 */ 1118, 320, 890, 916, 298, 890, 513, 447, 513, 898, + /* 110 */ 48, 154, 11, 306, 67, 230, 194, 220, 169, 268, + /* 120 */ 181, 316, 615, 424, 473, 424, 472, 474, 448, 785, + /* 130 */ 424, 424, 210, 424, 442, 447, 448, 424, 424, 424, + /* 140 */ 727, 424, 1288, 447, 442, 641, 137, 641, 641, 641, + /* 150 */ 641, 641, 137, 617, 618, 641, 641, -2, 344, 148, + /* 160 */ 893, 172, 41, 172, 1225, 1215, 1216, 1206, 1197, 1115, + /* 170 */ 1169, 1184, 1230, 172, 1271, 672, 1262, 1272, 1286, 1077, + /* 180 */ 1281, 172, 1240, 1232, 911, 172, 1253, 1243, 1076, 621, + /* 190 */ 641, 641, 665, 665, 559, 621, 137, 327, 137, 137, + /* 200 */ -2, -2, -2, -2, -2, 1778, 71, 119, 45, 73, + /* 210 */ 76, 96, 486, 436, 179, 470, 22, 377, 153, 373, + /* 220 */ 397, 397, 613, 561, 554, 572, 568, 249, 549, 542, + /* 230 */ 573, 555, 578, 558, 559, 556, 570, 511, 543, 449, + /* 240 */ 501, 395, 252, 348, 368, 519, 334, 525, 481, 506, + /* 250 */ 521, 520, 551, +); + const YY_REDUCE_USE_DFLT = -84; + const YY_REDUCE_MAX = 204; static public $yy_reduce_ofst = array( - /* 0 */ - 30, 1449, 1575, 1552, 1523, 1481, 1504, 1598, 1836, 2010, - /* 10 */ - 1991, 1791, 1685, 1643, 1704, 1749, 2033, 2078, 2310, 2419, - /* 20 */ - 2139, 2207, 2252, 2343, 2370, 1772, 1617, 1946, 1904, 2184, - /* 30 */ - 1923, 1878, 1859, 1965, 2052, 1662, 1817, 1730, 2097, 2396, - /* 40 */ - 2430, 2120, 2165, 2226, 869, 805, 985, 925, 884, 979, - /* 50 */ - 1099, 1041, 1157, 1639, 1233, 1639, 1336, 1278, 1726, 1813, - /* 60 */ - - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - /* 70 */ - - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - /* 80 */ - - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - /* 90 */ - - 87, - 87, 18, 207, 153, 136, 155, 827, 872, 804, - /* 100 */ - 826, 261, 316, 369, 315, 839, 188, 210, 179, 372, - /* 110 */ - 189, 189, 189, 505, 299, 326, 128, 128, 189, 299, - /* 120 */ - 299, 189, 507, 453, 242, 344, 243, 84, 128, 452, - /* 130 */ - 291, 399, 345, 189, 380, 613, 453, 421, 453, 368, - /* 140 */ - 367, 560, 453, 559, 561, 290, 189, 128, 213, 189, - /* 150 */ - 181, 189, 189, 189, 189, 189, 189, 189, 484, 479, - /* 160 */ - 472, 472, 472, 472, 472, 472, 472, 472, 462, 462, - /* 170 */ - 462, 464, 462, 472, 472, 472, 472, 472, 472, 462, - /* 180 */ - 467, 462, 466, 472, 472, 472, 462, 472, 472, 472, - /* 190 */ - 511, 486, 486, - 98, 501, 506, 236, 486, - 98, 468, - /* 200 */ - - 98, - 98, 236, - 98, 227, - 27, 197, 33, 90, - ); + /* 0 */ -63, -7, 1729, 69, 297, 221, 145, 530, 2209, 2228, + /* 10 */ 1973, 1850, 2190, 2039, 2058, 1899, 2094, 2069, 2020, 2105, + /* 20 */ 2124, 2179, 2154, 2143, 2009, 1984, 1839, 1814, 1780, 1803, + /* 30 */ 1869, 1888, 1954, 1935, 1924, 2275, 2324, 2294, 2264, 2360, + /* 40 */ 2349, 2239, 2313, 1757, 2379, 2398, 226, 819, 302, 535, + /* 50 */ 1179, 1123, 1083, 2406, 1707, 1630, 2422, 2445, 2429, 2406, + /* 60 */ 813, 813, 813, 813, 813, 813, 813, 813, 813, 813, + /* 70 */ 813, 813, 813, 813, 813, 813, 813, 813, 813, 813, + /* 80 */ 813, 813, 813, 813, 813, 813, 813, 813, 813, 813, + /* 90 */ 813, 813, -10, 40, 116, -82, -25, 225, -74, 192, + /* 100 */ 343, 156, 305, 70, 174, 538, 370, 272, 301, 658, + /* 110 */ 432, 92, 68, 92, 330, 92, 330, 245, 330, 245, + /* 120 */ 92, 347, 92, 478, 451, 353, 451, 504, 404, 245, + /* 130 */ 451, 450, 92, 452, 451, 420, 457, 682, 684, 580, + /* 140 */ 405, 579, 500, 423, 630, 92, 149, 92, 92, 92, + /* 150 */ 92, 92, 245, 294, 191, 92, 92, 92, 534, 533, + /* 160 */ 518, 514, 517, 514, 518, 518, 518, 518, 518, 518, + /* 170 */ 518, 518, 518, 514, 518, 518, 518, 518, 518, 509, + /* 180 */ 518, 514, 518, 518, 509, 514, 518, 518, 509, 574, + /* 190 */ 509, 509, 503, 503, 563, 571, 152, 157, 152, 152, + /* 200 */ -83, 208, 176, 160, -77, +); static public $yyExpectedTokens = array( - /* 0 */ - array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 23, 24, 29, 33, 35,), - /* 1 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 2 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 3 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 4 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 5 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 6 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 7 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 8 */ - array(18, 19, 20, 23, 24, 29, 33, 34, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 9 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 66, 79,), - /* 10 */ - array(18, 19, 20, 23, 24, 29, 33, 34, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 11 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 12 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 13 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 14 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 15 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 16 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 17 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 18 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 19 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 20 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 21 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 22 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 23 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 24 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 25 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 26 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 27 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 28 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 29 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 30 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 31 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 32 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 33 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 34 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 35 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 36 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 37 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 38 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 39 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 40 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 41 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 42 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 43 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 44 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 45 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,), - /* 46 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,), - /* 47 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,), - /* 48 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,), - /* 49 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,), - /* 50 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,), - /* 51 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,), - /* 52 */ - array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,), - /* 53 */ - array(1, 3, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 54 */ - array(1, 28, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 55 */ - array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 56 */ - array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 57 */ - array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 58 */ - array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 59 */ - array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 60 */ - array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 61 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 80,), - /* 62 */ - array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 63 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 64 */ - array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 65 */ - array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 66 */ - array(1, 2, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 67 */ - array(1, 25, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 68 */ - array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 69 */ - array(1, 31, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 70 */ - array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 71 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 72 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 73 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 74 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 75 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 76 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 77 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 78 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 79 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 80 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 81 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 82 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 83 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 84 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 85 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 86 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 87 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 88 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 89 */ - array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 90 */ - array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 91 */ - array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,), - /* 92 */ - array(1, 3, 22, 30, 36, 39, 62,), - /* 93 */ - array(1, 3, 30, 36, 55,), - /* 94 */ - array(1, 30, 36,), - /* 95 */ - array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 23, 24, 29, 33, 35,), - /* 96 */ - array(11, 18, 23, 24, 29, 33, 35, 79, 80, 81,), - /* 97 */ - array(18, 20, 30, 32, 36,), - /* 98 */ - array(18, 20, 30, 32, 36,), - /* 99 */ - array(18, 20, 30, 36,), - /* 100 */ - array(18, 20, 30, 36,), - /* 101 */ - array(1, 3, 30, 36,), - /* 102 */ - array(1, 3, 30, 36,), - /* 103 */ - array(1, 30, 36,), - /* 104 */ - array(1, 30, 36,), - /* 105 */ - array(19, 20, 64,), - /* 106 */ - array(22, 60, 65,), - /* 107 */ - array(1, 2,), - /* 108 */ - array(19, 39,), - /* 109 */ - array(11, 18, 23, 24, 29, 33, 35, 79, 80, 81,), - /* 110 */ - array(1, 3, 30, 31, 36, 55,), - /* 111 */ - array(1, 3, 30, 36, 55,), - /* 112 */ - array(1, 3, 30, 36, 55,), - /* 113 */ - array(18, 20, 21, 26,), - /* 114 */ - array(18, 20, 21, 63,), - /* 115 */ - array(15, 16, 17,), - /* 116 */ - array(21, 22, 62,), - /* 117 */ - array(21, 22, 62,), - /* 118 */ - array(1, 3, 55,), - /* 119 */ - array(18, 20, 63,), - /* 120 */ - array(18, 20, 21,), - /* 121 */ - array(1, 32, 55,), - /* 122 */ - array(18, 20,), - /* 123 */ - array(18, 20,), - /* 124 */ - array(1, 22,), - /* 125 */ - array(18, 20,), - /* 126 */ - array(18, 20,), - /* 127 */ - array(19, 20,), - /* 128 */ - array(22, 62,), - /* 129 */ - array(18, 20,), - /* 130 */ - array(19, 39,), - /* 131 */ - array(18, 20,), - /* 132 */ - array(19, 39,), - /* 133 */ - array(1, 55,), - /* 134 */ - array(19, 20,), - /* 135 */ - array(18, 20,), - /* 136 */ - array(18, 20,), - /* 137 */ - array(30, 36,), - /* 138 */ - array(18, 20,), - /* 139 */ - array(30, 36,), - /* 140 */ - array(30, 36,), - /* 141 */ - array(18, 20,), - /* 142 */ - array(18, 20,), - /* 143 */ - array(18, 20,), - /* 144 */ - array(18, 20,), - /* 145 */ - array(18, 20,), - /* 146 */ - array(1,), - /* 147 */ - array(22,), - /* 148 */ - array(1,), - /* 149 */ - array(1,), - /* 150 */ - array(22,), - /* 151 */ - array(1,), - /* 152 */ - array(1,), - /* 153 */ - array(1,), - /* 154 */ - array(1,), - /* 155 */ - array(1,), - /* 156 */ - array(1,), - /* 157 */ - array(), - /* 158 */ - array(18, 20, 63,), - /* 159 */ - array(18, 19, 20,), - /* 160 */ - array(30, 36,), - /* 161 */ - array(30, 36,), - /* 162 */ - array(30, 36,), - /* 163 */ - array(30, 36,), - /* 164 */ - array(30, 36,), - /* 165 */ - array(30, 36,), - /* 166 */ - array(30, 36,), - /* 167 */ - array(30, 36,), - /* 168 */ - array(60, 65,), - /* 169 */ - array(60, 65,), - /* 170 */ - array(60, 65,), - /* 171 */ - array(60, 65,), - /* 172 */ - array(60, 65,), - /* 173 */ - array(30, 36,), - /* 174 */ - array(30, 36,), - /* 175 */ - array(30, 36,), - /* 176 */ - array(30, 36,), - /* 177 */ - array(30, 36,), - /* 178 */ - array(30, 36,), - /* 179 */ - array(60, 65,), - /* 180 */ - array(60, 65,), - /* 181 */ - array(60, 65,), - /* 182 */ - array(18, 39,), - /* 183 */ - array(30, 36,), - /* 184 */ - array(30, 36,), - /* 185 */ - array(30, 36,), - /* 186 */ - array(60, 65,), - /* 187 */ - array(30, 36,), - /* 188 */ - array(30, 36,), - /* 189 */ - array(30, 36,), - /* 190 */ - array(16,), - /* 191 */ - array(22,), - /* 192 */ - array(22,), - /* 193 */ - array(1,), - /* 194 */ - array(30,), - /* 195 */ - array(30,), - /* 196 */ - array(2,), - /* 197 */ - array(22,), - /* 198 */ - array(1,), - /* 199 */ - array(39,), - /* 200 */ - array(1,), - /* 201 */ - array(1,), - /* 202 */ - array(2,), - /* 203 */ - array(1,), - /* 204 */ - array(), - /* 205 */ - array(), - /* 206 */ - array(), - /* 207 */ - array(), - /* 208 */ - array(), - /* 209 */ - array(3, 25, 27, 28, 30, 31, 36, 38, 39, 40, 55, 62, 66, 80,), - /* 210 */ - array(3, 21, 30, 36, 39, 62,), - /* 211 */ - array(39, 60, 62, 66,), - /* 212 */ - array(18, 19, 20, 37,), - /* 213 */ - array(32, 39, 62,), - /* 214 */ - array(26, 80,), - /* 215 */ - array(38, 40,), - /* 216 */ - array(38, 66,), - /* 217 */ - array(38, 40,), - /* 218 */ - array(25, 38,), - /* 219 */ - array(21, 60,), - /* 220 */ - array(3, 26,), - /* 221 */ - array(38, 40,), - /* 222 */ - array(39, 62,), - /* 223 */ - array(2, 21,), - /* 224 */ - array(39, 62,), - /* 225 */ - array(20, 63,), - /* 226 */ - array(20,), - /* 227 */ - array(3,), - /* 228 */ - array(20,), - /* 229 */ - array(20,), - /* 230 */ - array(20,), - /* 231 */ - array(2,), - /* 232 */ - array(19,), - /* 233 */ - array(20,), - /* 234 */ - array(19,), - /* 235 */ - array(3,), - /* 236 */ - array(20,), - /* 237 */ - array(37,), - /* 238 */ - array(37,), - /* 239 */ - array(66,), - /* 240 */ - array(20,), - /* 241 */ - array(20,), - /* 242 */ - array(3,), - /* 243 */ - array(56,), - /* 244 */ - array(39,), - /* 245 */ - array(2,), - /* 246 */ - array(60,), - /* 247 */ - array(39,), - /* 248 */ - array(19,), - /* 249 */ - array(40,), - /* 250 */ - array(20,), - /* 251 */ - array(26,), - /* 252 */ - array(19,), - /* 253 */ - array(64,), - /* 254 */ - array(20,), - /* 255 */ - array(19,), - /* 256 */ - array(20,), - /* 257 */ - array(64,), - /* 258 */ - array(27,), - /* 259 */ - array(21,), - /* 260 */ - array(), - /* 261 */ - array(), - /* 262 */ - array(), - /* 263 */ - array(), - /* 264 */ - array(), - /* 265 */ - array(), - /* 266 */ - array(), - /* 267 */ - array(), - /* 268 */ - array(), - /* 269 */ - array(), - /* 270 */ - array(), - /* 271 */ - array(), - /* 272 */ - array(), - /* 273 */ - array(), - /* 274 */ - array(), - /* 275 */ - array(), - /* 276 */ - array(), - /* 277 */ - array(), - /* 278 */ - array(), - /* 279 */ - array(), - /* 280 */ - array(), - /* 281 */ - array(), - /* 282 */ - array(), - /* 283 */ - array(), - /* 284 */ - array(), - /* 285 */ - array(), - /* 286 */ - array(), - /* 287 */ - array(), - /* 288 */ - array(), - /* 289 */ - array(), - /* 290 */ - array(), - /* 291 */ - array(), - /* 292 */ - array(), - /* 293 */ - array(), - /* 294 */ - array(), - /* 295 */ - array(), - /* 296 */ - array(), - /* 297 */ - array(), - /* 298 */ - array(), - /* 299 */ - array(), - /* 300 */ - array(), - /* 301 */ - array(), - /* 302 */ - array(), - /* 303 */ - array(), - /* 304 */ - array(), - /* 305 */ - array(), - /* 306 */ - array(), - /* 307 */ - array(), - /* 308 */ - array(), - /* 309 */ - array(), - /* 310 */ - array(), - /* 311 */ - array(), - /* 312 */ - array(), - /* 313 */ - array(), - /* 314 */ - array(), - /* 315 */ - array(), - /* 316 */ - array(), - /* 317 */ - array(), - /* 318 */ - array(), - /* 319 */ - array(), - /* 320 */ - array(), - /* 321 */ - array(), - /* 322 */ - array(), - /* 323 */ - array(), - /* 324 */ - array(), - /* 325 */ - array(), - /* 326 */ - array(), - /* 327 */ - array(), - /* 328 */ - array(), - /* 329 */ - array(), - /* 330 */ - array(), - /* 331 */ - array(), - /* 332 */ - array(), - /* 333 */ - array(), - /* 334 */ - array(), - /* 335 */ - array(), - /* 336 */ - array(), - /* 337 */ - array(), - /* 338 */ - array(), - /* 339 */ - array(), - /* 340 */ - array(), - /* 341 */ - array(), - /* 342 */ - array(), - /* 343 */ - array(), - /* 344 */ - array(), - /* 345 */ - array(), - /* 346 */ - array(), - /* 347 */ - array(), - /* 348 */ - array(), - /* 349 */ - array(), - /* 350 */ - array(), - /* 351 */ - array(), - /* 352 */ - array(), - /* 353 */ - array(), - /* 354 */ - array(), - /* 355 */ - array(), - /* 356 */ - array(), - /* 357 */ - array(), - ); + /* 0 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16, 22, 23, 28, 32, 33, 34, ), + /* 1 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 2 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 3 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 4 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 5 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 6 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 7 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 8 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 64, 77, ), + /* 9 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 10 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 11 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 12 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 13 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 14 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 15 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 16 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 17 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 18 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 19 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 20 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 21 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 22 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 23 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 24 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 25 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 26 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 27 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 28 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 29 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 30 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 31 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 32 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 33 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 34 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 35 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 36 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 37 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 38 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 39 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 40 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 41 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 42 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 43 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 44 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 45 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ), + /* 46 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ), + /* 47 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ), + /* 48 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ), + /* 49 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ), + /* 50 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ), + /* 51 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ), + /* 52 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ), + /* 53 */ array(1, 17, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 54 */ array(1, 17, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 55 */ array(1, 17, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 56 */ array(1, 27, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 57 */ array(1, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 58 */ array(1, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 59 */ array(1, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 60 */ array(1, 2, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 61 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 62 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 63 */ array(1, 30, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 64 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 65 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 66 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 67 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 78, ), + /* 68 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 69 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 70 */ array(1, 24, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 71 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 72 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 73 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 74 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 75 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 76 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 77 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 78 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 79 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 80 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 81 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 82 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 83 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 84 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 85 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 86 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 87 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 88 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 89 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 90 */ array(39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 91 */ array(39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ), + /* 92 */ array(1, 17, 21, 29, 37, 60, ), + /* 93 */ array(1, 17, 29, 53, ), + /* 94 */ array(1, 29, ), + /* 95 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16, 22, 23, 28, 32, 33, 34, ), + /* 96 */ array(10, 16, 22, 23, 28, 32, 33, 34, 77, 78, 79, ), + /* 97 */ array(16, 19, 29, 31, ), + /* 98 */ array(16, 19, 29, 31, ), + /* 99 */ array(1, 17, 29, ), + /* 100 */ array(1, 17, 29, ), + /* 101 */ array(18, 19, 62, ), + /* 102 */ array(16, 19, 29, ), + /* 103 */ array(1, 2, 17, ), + /* 104 */ array(21, 58, 63, ), + /* 105 */ array(16, 19, 29, ), + /* 106 */ array(1, 29, ), + /* 107 */ array(18, 37, ), + /* 108 */ array(1, 29, ), + /* 109 */ array(10, 16, 22, 23, 28, 32, 33, 34, 77, 78, 79, ), + /* 110 */ array(4, 5, 6, 7, 8, 13, 14, 15, ), + /* 111 */ array(1, 17, 29, 30, 53, ), + /* 112 */ array(16, 19, 20, 25, ), + /* 113 */ array(1, 17, 29, 53, ), + /* 114 */ array(16, 19, 20, 61, ), + /* 115 */ array(1, 17, 29, 53, ), + /* 116 */ array(16, 19, 61, ), + /* 117 */ array(20, 21, 60, ), + /* 118 */ array(16, 19, 20, ), + /* 119 */ array(20, 21, 60, ), + /* 120 */ array(1, 31, 53, ), + /* 121 */ array(1, 17, 21, ), + /* 122 */ array(1, 17, 53, ), + /* 123 */ array(16, 19, ), + /* 124 */ array(16, 19, ), + /* 125 */ array(16, 19, ), + /* 126 */ array(16, 19, ), + /* 127 */ array(16, 19, ), + /* 128 */ array(18, 19, ), + /* 129 */ array(21, 60, ), + /* 130 */ array(16, 19, ), + /* 131 */ array(16, 19, ), + /* 132 */ array(1, 53, ), + /* 133 */ array(16, 19, ), + /* 134 */ array(16, 19, ), + /* 135 */ array(18, 37, ), + /* 136 */ array(18, 19, ), + /* 137 */ array(16, 19, ), + /* 138 */ array(16, 19, ), + /* 139 */ array(16, 19, ), + /* 140 */ array(1, 17, ), + /* 141 */ array(16, 19, ), + /* 142 */ array(17, 29, ), + /* 143 */ array(18, 37, ), + /* 144 */ array(16, 19, ), + /* 145 */ array(1, ), + /* 146 */ array(21, ), + /* 147 */ array(1, ), + /* 148 */ array(1, ), + /* 149 */ array(1, ), + /* 150 */ array(1, ), + /* 151 */ array(1, ), + /* 152 */ array(21, ), + /* 153 */ array(29, ), + /* 154 */ array(29, ), + /* 155 */ array(1, ), + /* 156 */ array(1, ), + /* 157 */ array(), + /* 158 */ array(16, 18, 19, ), + /* 159 */ array(16, 19, 61, ), + /* 160 */ array(17, 29, ), + /* 161 */ array(58, 63, ), + /* 162 */ array(16, 37, ), + /* 163 */ array(58, 63, ), + /* 164 */ array(17, 29, ), + /* 165 */ array(17, 29, ), + /* 166 */ array(17, 29, ), + /* 167 */ array(17, 29, ), + /* 168 */ array(17, 29, ), + /* 169 */ array(17, 29, ), + /* 170 */ array(17, 29, ), + /* 171 */ array(17, 29, ), + /* 172 */ array(17, 29, ), + /* 173 */ array(58, 63, ), + /* 174 */ array(17, 29, ), + /* 175 */ array(17, 29, ), + /* 176 */ array(17, 29, ), + /* 177 */ array(17, 29, ), + /* 178 */ array(17, 29, ), + /* 179 */ array(1, 17, ), + /* 180 */ array(17, 29, ), + /* 181 */ array(58, 63, ), + /* 182 */ array(17, 29, ), + /* 183 */ array(17, 29, ), + /* 184 */ array(1, 17, ), + /* 185 */ array(58, 63, ), + /* 186 */ array(17, 29, ), + /* 187 */ array(17, 29, ), + /* 188 */ array(1, 17, ), + /* 189 */ array(29, ), + /* 190 */ array(1, ), + /* 191 */ array(1, ), + /* 192 */ array(2, ), + /* 193 */ array(2, ), + /* 194 */ array(37, ), + /* 195 */ array(29, ), + /* 196 */ array(21, ), + /* 197 */ array(14, ), + /* 198 */ array(21, ), + /* 199 */ array(21, ), + /* 200 */ array(), + /* 201 */ array(), + /* 202 */ array(), + /* 203 */ array(), + /* 204 */ array(), + /* 205 */ array(17, 24, 26, 27, 29, 30, 36, 37, 38, 53, 60, 64, 78, ), + /* 206 */ array(17, 20, 29, 37, 60, ), + /* 207 */ array(16, 18, 19, 35, ), + /* 208 */ array(37, 58, 60, 64, ), + /* 209 */ array(17, 29, 37, 60, ), + /* 210 */ array(31, 37, 60, ), + /* 211 */ array(36, 38, ), + /* 212 */ array(24, 36, ), + /* 213 */ array(2, 20, ), + /* 214 */ array(25, 78, ), + /* 215 */ array(17, 25, ), + /* 216 */ array(36, 38, ), + /* 217 */ array(36, 38, ), + /* 218 */ array(19, 61, ), + /* 219 */ array(36, 64, ), + /* 220 */ array(37, 60, ), + /* 221 */ array(37, 60, ), + /* 222 */ array(20, 58, ), + /* 223 */ array(37, ), + /* 224 */ array(18, ), + /* 225 */ array(19, ), + /* 226 */ array(2, ), + /* 227 */ array(62, ), + /* 228 */ array(18, ), + /* 229 */ array(26, ), + /* 230 */ array(19, ), + /* 231 */ array(18, ), + /* 232 */ array(19, ), + /* 233 */ array(35, ), + /* 234 */ array(37, ), + /* 235 */ array(38, ), + /* 236 */ array(25, ), + /* 237 */ array(54, ), + /* 238 */ array(2, ), + /* 239 */ array(19, ), + /* 240 */ array(19, ), + /* 241 */ array(19, ), + /* 242 */ array(64, ), + /* 243 */ array(19, ), + /* 244 */ array(19, ), + /* 245 */ array(19, ), + /* 246 */ array(58, ), + /* 247 */ array(19, ), + /* 248 */ array(62, ), + /* 249 */ array(35, ), + /* 250 */ array(18, ), + /* 251 */ array(20, ), + /* 252 */ array(18, ), + /* 253 */ array(), + /* 254 */ array(), + /* 255 */ array(), + /* 256 */ array(), + /* 257 */ array(), + /* 258 */ array(), + /* 259 */ array(), + /* 260 */ array(), + /* 261 */ array(), + /* 262 */ array(), + /* 263 */ array(), + /* 264 */ array(), + /* 265 */ array(), + /* 266 */ array(), + /* 267 */ array(), + /* 268 */ array(), + /* 269 */ array(), + /* 270 */ array(), + /* 271 */ array(), + /* 272 */ array(), + /* 273 */ array(), + /* 274 */ array(), + /* 275 */ array(), + /* 276 */ array(), + /* 277 */ array(), + /* 278 */ array(), + /* 279 */ array(), + /* 280 */ array(), + /* 281 */ array(), + /* 282 */ array(), + /* 283 */ array(), + /* 284 */ array(), + /* 285 */ array(), + /* 286 */ array(), + /* 287 */ array(), + /* 288 */ array(), + /* 289 */ array(), + /* 290 */ array(), + /* 291 */ array(), + /* 292 */ array(), + /* 293 */ array(), + /* 294 */ array(), + /* 295 */ array(), + /* 296 */ array(), + /* 297 */ array(), + /* 298 */ array(), + /* 299 */ array(), + /* 300 */ array(), + /* 301 */ array(), + /* 302 */ array(), + /* 303 */ array(), + /* 304 */ array(), + /* 305 */ array(), + /* 306 */ array(), + /* 307 */ array(), + /* 308 */ array(), + /* 309 */ array(), + /* 310 */ array(), + /* 311 */ array(), + /* 312 */ array(), + /* 313 */ array(), + /* 314 */ array(), + /* 315 */ array(), + /* 316 */ array(), + /* 317 */ array(), + /* 318 */ array(), + /* 319 */ array(), + /* 320 */ array(), + /* 321 */ array(), + /* 322 */ array(), + /* 323 */ array(), + /* 324 */ array(), + /* 325 */ array(), + /* 326 */ array(), + /* 327 */ array(), + /* 328 */ array(), + /* 329 */ array(), + /* 330 */ array(), + /* 331 */ array(), + /* 332 */ array(), + /* 333 */ array(), + /* 334 */ array(), + /* 335 */ array(), + /* 336 */ array(), + /* 337 */ array(), + /* 338 */ array(), + /* 339 */ array(), + /* 340 */ array(), + /* 341 */ array(), + /* 342 */ array(), + /* 343 */ array(), + /* 344 */ array(), + /* 345 */ array(), + /* 346 */ array(), + /* 347 */ array(), + /* 348 */ array(), + /* 349 */ array(), + /* 350 */ array(), + /* 351 */ array(), + /* 352 */ array(), + /* 353 */ array(), + /* 354 */ array(), + /* 355 */ array(), + /* 356 */ array(), + /* 357 */ array(), + /* 358 */ array(), + /* 359 */ array(), + /* 360 */ array(), + /* 361 */ array(), + /* 362 */ array(), + /* 363 */ array(), + /* 364 */ array(), + /* 365 */ array(), + /* 366 */ array(), + /* 367 */ array(), + /* 368 */ array(), + /* 369 */ array(), + /* 370 */ array(), + /* 371 */ array(), + /* 372 */ array(), + /* 373 */ array(), + /* 374 */ array(), + /* 375 */ array(), + /* 376 */ array(), + /* 377 */ array(), + /* 378 */ array(), + /* 379 */ array(), + /* 380 */ array(), + /* 381 */ array(), + /* 382 */ array(), + /* 383 */ array(), + /* 384 */ array(), + /* 385 */ array(), + /* 386 */ array(), + /* 387 */ array(), +); static public $yy_default = array( - /* 0 */ - 361, 541, 558, 558, 512, 558, 512, 512, 558, 558, - /* 10 */ - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - /* 20 */ - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - /* 30 */ - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - /* 40 */ - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - /* 50 */ - 558, 558, 558, 558, 418, 418, 418, 418, 387, 395, - /* 60 */ - 558, 558, 558, 558, 558, 558, 558, 558, 558, 423, - /* 70 */ - 558, 428, 425, 510, 423, 429, 511, 543, 444, 542, - /* 80 */ - 447, 448, 443, 442, 439, 452, 544, 420, 451, 400, - /* 90 */ - 456, 455, 467, 431, 418, 358, 558, 418, 418, 418, - /* 100 */ - 418, 438, 475, 418, 418, 558, 524, 409, 558, 558, - /* 110 */ - 431, 431, 431, 558, 485, 558, 476, 476, 431, 485, - /* 120 */ - 485, 431, 558, 558, 412, 558, 485, 558, 476, 558, - /* 130 */ - 558, 558, 558, 431, 558, 558, 558, 397, 558, 418, - /* 140 */ - 418, 558, 558, 558, 558, 558, 441, 476, 414, 434, - /* 150 */ - 521, 436, 435, 460, 459, 458, 454, 519, 486, 558, - /* 160 */ - 385, 384, 405, 404, 389, 406, 399, 388, 505, 483, - /* 170 */ - 482, 481, 480, 407, 408, 383, 398, 403, 402, 504, - /* 180 */ - 479, 502, 485, 393, 392, 390, 503, 382, 396, 394, - /* 190 */ - 378, 525, 522, 475, 557, 557, 513, 499, 438, 485, - /* 200 */ - 413, 410, 514, 415, 518, 485, 518, 485, 518, 433, - /* 210 */ - 467, 467, 558, 467, 457, 558, 558, 558, 558, 463, - /* 220 */ - 457, 558, 453, 497, 467, 558, 558, 558, 558, 558, - /* 230 */ - 558, 497, 558, 558, 558, 558, 558, 465, 558, 558, - /* 240 */ - 558, 558, 558, 469, 497, 497, 463, 523, 558, 558, - /* 250 */ - 558, 457, 558, 558, 558, 558, 558, 558, 426, 558, - /* 260 */ - 477, 520, 495, 507, 490, 508, 487, 374, 498, 484, - /* 270 */ - 556, 364, 363, 365, 461, 366, 472, 466, 360, 359, - /* 280 */ - 462, 362, 464, 367, 430, 401, 469, 372, 373, 419, - /* 290 */ - 432, 427, 368, 369, 370, 371, 433, 470, 445, 497, - /* 300 */ - 446, 496, 450, 449, 500, 517, 545, 474, 552, 411, - /* 310 */ - 501, 478, 553, 526, 534, 533, 535, 536, 437, 537, - /* 320 */ - 532, 417, 528, 527, 529, 530, 531, 546, 547, 515, - /* 330 */ - 506, 375, 376, 509, 377, 516, 468, 494, 489, 492, - /* 340 */ - 491, 493, 379, 380, 555, 548, 554, 551, 550, 549, - /* 350 */ - 440, 416, 473, 471, 539, 540, 538, 488, - ); - const YYNOCODE = 125; - const YYSTACKDEPTH = 500; - const YYNSTATE = 358; - const YYNRULE = 200; - const YYERRORSYMBOL = 82; + /* 0 */ 391, 573, 544, 590, 544, 590, 590, 544, 590, 590, + /* 10 */ 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, + /* 20 */ 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, + /* 30 */ 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, + /* 40 */ 590, 590, 590, 590, 590, 590, 590, 590, 590, 590, + /* 50 */ 590, 590, 590, 590, 590, 590, 452, 452, 452, 452, + /* 60 */ 590, 590, 590, 457, 590, 590, 590, 590, 590, 590, + /* 70 */ 590, 542, 454, 481, 482, 485, 486, 478, 543, 476, + /* 80 */ 463, 575, 576, 473, 459, 457, 477, 434, 462, 574, + /* 90 */ 490, 489, 501, 465, 452, 388, 590, 452, 452, 509, + /* 100 */ 472, 590, 452, 590, 556, 452, 452, 590, 452, 590, + /* 110 */ 590, 465, 590, 465, 517, 465, 517, 510, 517, 510, + /* 120 */ 465, 590, 465, 590, 590, 517, 590, 590, 590, 510, + /* 130 */ 590, 590, 465, 590, 590, 590, 590, 590, 590, 590, + /* 140 */ 590, 590, 590, 590, 590, 493, 553, 475, 492, 469, + /* 150 */ 488, 468, 510, 452, 452, 470, 494, 551, 590, 518, + /* 160 */ 590, 534, 517, 537, 590, 590, 590, 590, 590, 590, + /* 170 */ 590, 590, 590, 535, 590, 590, 590, 590, 590, 590, + /* 180 */ 590, 536, 590, 590, 590, 515, 590, 590, 590, 589, + /* 190 */ 472, 509, 545, 546, 517, 589, 531, 407, 557, 554, + /* 200 */ 550, 550, 517, 550, 517, 467, 501, 590, 501, 501, + /* 210 */ 501, 590, 590, 529, 491, 491, 590, 590, 590, 590, + /* 220 */ 501, 487, 497, 555, 590, 590, 529, 590, 590, 460, + /* 230 */ 590, 590, 590, 590, 529, 590, 491, 503, 529, 590, + /* 240 */ 590, 590, 590, 590, 590, 590, 497, 590, 590, 499, + /* 250 */ 590, 590, 590, 437, 417, 389, 571, 431, 432, 441, + /* 260 */ 572, 540, 435, 588, 461, 539, 525, 523, 503, 526, + /* 270 */ 524, 514, 513, 530, 436, 570, 464, 538, 522, 442, + /* 280 */ 552, 541, 567, 529, 528, 443, 444, 549, 440, 439, + /* 290 */ 430, 429, 451, 433, 438, 445, 446, 498, 496, 500, + /* 300 */ 506, 466, 495, 449, 447, 547, 548, 448, 450, 416, + /* 310 */ 398, 397, 399, 400, 401, 396, 395, 390, 392, 393, + /* 320 */ 394, 402, 403, 412, 411, 413, 414, 415, 410, 409, + /* 330 */ 404, 405, 406, 408, 467, 511, 422, 421, 423, 532, + /* 340 */ 424, 420, 585, 512, 508, 533, 418, 419, 425, 426, + /* 350 */ 581, 582, 583, 586, 587, 579, 578, 428, 427, 584, + /* 360 */ 577, 471, 569, 504, 474, 505, 507, 479, 502, 521, + /* 370 */ 516, 519, 527, 520, 480, 483, 564, 563, 565, 566, + /* 380 */ 568, 562, 561, 484, 558, 559, 560, 580, +); + const YYNOCODE = 123; + const YYSTACKDEPTH = 100; + const YYNSTATE = 388; + const YYNRULE = 202; + const YYERRORSYMBOL = 80; const YYERRSYMDT = 'yy0'; const YYFALLBACK = 0; - public static $yyFallback = array(); - - public function Trace($TraceFILE, $zTracePrompt) + static public $yyFallback = array( + ); + static function Trace($TraceFILE, $zTracePrompt) { if (!$TraceFILE) { $zTracePrompt = 0; } elseif (!$zTracePrompt) { $TraceFILE = 0; } - $this->yyTraceFILE = $TraceFILE; - $this->yyTracePrompt = $zTracePrompt; + self::$yyTraceFILE = $TraceFILE; + self::$yyTracePrompt = $zTracePrompt; } - public function PrintTrace() + static function PrintTrace() { - $this->yyTraceFILE = fopen('php://output', 'w'); - $this->yyTracePrompt = '<br>'; + self::$yyTraceFILE = fopen('php://output', 'w'); + self::$yyTracePrompt = '<br>'; } - public $yyTraceFILE; - public $yyTracePrompt; + static public $yyTraceFILE; + static public $yyTracePrompt; public $yyidx; /* Index of top element in stack */ public $yyerrcnt; /* Shifts left before out of the error */ public $yystack = array(); /* The parser's stack */ public $yyTokenName = array( - '$', 'VERT', 'COLON', 'RDEL', - 'COMMENT', 'PHPSTARTTAG', 'PHPENDTAG', 'PHPENDSCRIPT', - 'ASPSTARTTAG', 'ASPENDTAG', 'XMLTAG', 'TEXT', - 'STRIPON', 'STRIPOFF', 'BLOCKSOURCE', 'LITERALSTART', - 'LITERALEND', 'LITERAL', 'LDEL', 'DOLLAR', - 'ID', 'EQUAL', 'PTR', 'LDELIF', - 'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO', - 'STEP', 'LDELFOREACH', 'SPACE', 'AS', - 'APTR', 'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT', 'LDELSLASH', - 'ATTR', 'INTEGER', 'COMMA', 'OPENP', - 'CLOSEP', 'MATH', 'UNIMATH', 'ANDSYM', - 'ISIN', 'ISDIVBY', 'ISNOTDIVBY', 'ISEVEN', - 'ISNOTEVEN', 'ISEVENBY', 'ISNOTEVENBY', 'ISODD', - 'ISNOTODD', 'ISODDBY', 'ISNOTODDBY', 'INSTANCEOF', - 'QMARK', 'NOT', 'TYPECAST', 'HEX', - 'DOT', 'SINGLEQUOTESTRING', 'DOUBLECOLON', 'AT', - 'HATCH', 'OPENB', 'CLOSEB', 'EQUALS', - 'NOTEQUALS', 'GREATERTHAN', 'LESSTHAN', 'GREATEREQUAL', - 'LESSEQUAL', 'IDENTITY', 'NONEIDENTITY', 'MOD', - 'LAND', 'LOR', 'LXOR', 'QUOTE', - 'BACKTICK', 'DOLLARID', 'error', 'start', - 'template', 'template_element', 'smartytag', 'literal', - 'literal_elements', 'literal_element', 'value', 'modifierlist', - 'attributes', 'expr', 'varindexed', 'statement', - 'statements', 'optspace', 'varvar', 'foraction', - 'modparameters', 'attribute', 'ternary', 'array', - 'ifcond', 'lop', 'variable', 'function', - 'doublequoted_with_quotes', 'static_class_access', 'object', 'arrayindex', - 'indexdef', 'varvarele', 'objectchain', 'objectelement', - 'method', 'params', 'modifier', 'modparameter', - 'arrayelements', 'arrayelement', 'doublequoted', 'doublequotedcontent', + '$', 'VERT', 'COLON', 'COMMENT', + 'PHPSTARTTAG', 'PHPENDTAG', 'ASPSTARTTAG', 'ASPENDTAG', + 'FAKEPHPSTARTTAG', 'XMLTAG', 'TEXT', 'STRIPON', + 'STRIPOFF', 'LITERALSTART', 'LITERALEND', 'LITERAL', + 'LDEL', 'RDEL', 'DOLLAR', 'ID', + 'EQUAL', 'PTR', 'LDELIF', 'LDELFOR', + 'SEMICOLON', 'INCDEC', 'TO', 'STEP', + 'LDELFOREACH', 'SPACE', 'AS', 'APTR', + 'LDELSETFILTER', 'SMARTYBLOCKCHILD', 'LDELSLASH', 'INTEGER', + 'COMMA', 'OPENP', 'CLOSEP', 'MATH', + 'UNIMATH', 'ANDSYM', 'ISIN', 'ISDIVBY', + 'ISNOTDIVBY', 'ISEVEN', 'ISNOTEVEN', 'ISEVENBY', + 'ISNOTEVENBY', 'ISODD', 'ISNOTODD', 'ISODDBY', + 'ISNOTODDBY', 'INSTANCEOF', 'QMARK', 'NOT', + 'TYPECAST', 'HEX', 'DOT', 'SINGLEQUOTESTRING', + 'DOUBLECOLON', 'AT', 'HATCH', 'OPENB', + 'CLOSEB', 'EQUALS', 'NOTEQUALS', 'GREATERTHAN', + 'LESSTHAN', 'GREATEREQUAL', 'LESSEQUAL', 'IDENTITY', + 'NONEIDENTITY', 'MOD', 'LAND', 'LOR', + 'LXOR', 'QUOTE', 'BACKTICK', 'DOLLARID', + 'error', 'start', 'template', 'template_element', + 'smartytag', 'literal', 'literal_elements', 'literal_element', + 'value', 'modifierlist', 'attributes', 'expr', + 'varindexed', 'statement', 'statements', 'optspace', + 'varvar', 'foraction', 'modparameters', 'attribute', + 'ternary', 'array', 'ifcond', 'lop', + 'variable', 'function', 'doublequoted_with_quotes', 'static_class_access', + 'object', 'arrayindex', 'indexdef', 'varvarele', + 'objectchain', 'objectelement', 'method', 'params', + 'modifier', 'modparameter', 'arrayelements', 'arrayelement', + 'doublequoted', 'doublequotedcontent', ); - public static $yyRuleName = array( - /* 0 */ - "start ::= template", - /* 1 */ - "template ::= template_element", - /* 2 */ - "template ::= template template_element", - /* 3 */ - "template ::=", - /* 4 */ - "template_element ::= smartytag RDEL", - /* 5 */ - "template_element ::= COMMENT", - /* 6 */ - "template_element ::= literal", - /* 7 */ - "template_element ::= PHPSTARTTAG", - /* 8 */ - "template_element ::= PHPENDTAG", - /* 9 */ - "template_element ::= PHPENDSCRIPT", - /* 10 */ - "template_element ::= ASPSTARTTAG", - /* 11 */ - "template_element ::= ASPENDTAG", - /* 12 */ - "template_element ::= XMLTAG", - /* 13 */ - "template_element ::= TEXT", - /* 14 */ - "template_element ::= STRIPON", - /* 15 */ - "template_element ::= STRIPOFF", - /* 16 */ - "template_element ::= BLOCKSOURCE", - /* 17 */ - "literal ::= LITERALSTART LITERALEND", - /* 18 */ - "literal ::= LITERALSTART literal_elements LITERALEND", - /* 19 */ - "literal_elements ::= literal_elements literal_element", - /* 20 */ - "literal_elements ::=", - /* 21 */ - "literal_element ::= literal", - /* 22 */ - "literal_element ::= LITERAL", - /* 23 */ - "smartytag ::= LDEL value", - /* 24 */ - "smartytag ::= LDEL value modifierlist attributes", - /* 25 */ - "smartytag ::= LDEL value attributes", - /* 26 */ - "smartytag ::= LDEL expr modifierlist attributes", - /* 27 */ - "smartytag ::= LDEL expr attributes", - /* 28 */ - "smartytag ::= LDEL DOLLAR ID EQUAL value", - /* 29 */ - "smartytag ::= LDEL DOLLAR ID EQUAL expr", - /* 30 */ - "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes", - /* 31 */ - "smartytag ::= LDEL varindexed EQUAL expr attributes", - /* 32 */ - "smartytag ::= LDEL ID attributes", - /* 33 */ - "smartytag ::= LDEL ID", - /* 34 */ - "smartytag ::= LDEL ID PTR ID attributes", - /* 35 */ - "smartytag ::= LDEL ID modifierlist attributes", - /* 36 */ - "smartytag ::= LDEL ID PTR ID modifierlist attributes", - /* 37 */ - "smartytag ::= LDELIF expr", - /* 38 */ - "smartytag ::= LDELIF expr attributes", - /* 39 */ - "smartytag ::= LDELIF statement", - /* 40 */ - "smartytag ::= LDELIF statement attributes", - /* 41 */ - "smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes", - /* 42 */ - "foraction ::= EQUAL expr", - /* 43 */ - "foraction ::= INCDEC", - /* 44 */ - "smartytag ::= LDELFOR statement TO expr attributes", - /* 45 */ - "smartytag ::= LDELFOR statement TO expr STEP expr attributes", - /* 46 */ - "smartytag ::= LDELFOREACH attributes", - /* 47 */ - "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes", - /* 48 */ - "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes", - /* 49 */ - "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes", - /* 50 */ - "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes", - /* 51 */ - "smartytag ::= LDELSETFILTER ID modparameters", - /* 52 */ - "smartytag ::= LDELSETFILTER ID modparameters modifierlist", - /* 53 */ - "smartytag ::= LDEL SMARTYBLOCKCHILDPARENT", - /* 54 */ - "smartytag ::= LDELSLASH ID", - /* 55 */ - "smartytag ::= LDELSLASH ID modifierlist", - /* 56 */ - "smartytag ::= LDELSLASH ID PTR ID", - /* 57 */ - "smartytag ::= LDELSLASH ID PTR ID modifierlist", - /* 58 */ - "attributes ::= attributes attribute", - /* 59 */ - "attributes ::= attribute", - /* 60 */ - "attributes ::=", - /* 61 */ - "attribute ::= SPACE ID EQUAL ID", - /* 62 */ - "attribute ::= ATTR expr", - /* 63 */ - "attribute ::= ATTR value", - /* 64 */ - "attribute ::= SPACE ID", - /* 65 */ - "attribute ::= SPACE expr", - /* 66 */ - "attribute ::= SPACE value", - /* 67 */ - "attribute ::= SPACE INTEGER EQUAL expr", - /* 68 */ - "statements ::= statement", - /* 69 */ - "statements ::= statements COMMA statement", - /* 70 */ - "statement ::= DOLLAR varvar EQUAL expr", - /* 71 */ - "statement ::= varindexed EQUAL expr", - /* 72 */ - "statement ::= OPENP statement CLOSEP", - /* 73 */ - "expr ::= value", - /* 74 */ - "expr ::= ternary", - /* 75 */ - "expr ::= DOLLAR ID COLON ID", - /* 76 */ - "expr ::= expr MATH value", - /* 77 */ - "expr ::= expr UNIMATH value", - /* 78 */ - "expr ::= expr ANDSYM value", - /* 79 */ - "expr ::= array", - /* 80 */ - "expr ::= expr modifierlist", - /* 81 */ - "expr ::= expr ifcond expr", - /* 82 */ - "expr ::= expr ISIN array", - /* 83 */ - "expr ::= expr ISIN value", - /* 84 */ - "expr ::= expr lop expr", - /* 85 */ - "expr ::= expr ISDIVBY expr", - /* 86 */ - "expr ::= expr ISNOTDIVBY expr", - /* 87 */ - "expr ::= expr ISEVEN", - /* 88 */ - "expr ::= expr ISNOTEVEN", - /* 89 */ - "expr ::= expr ISEVENBY expr", - /* 90 */ - "expr ::= expr ISNOTEVENBY expr", - /* 91 */ - "expr ::= expr ISODD", - /* 92 */ - "expr ::= expr ISNOTODD", - /* 93 */ - "expr ::= expr ISODDBY expr", - /* 94 */ - "expr ::= expr ISNOTODDBY expr", - /* 95 */ - "expr ::= value INSTANCEOF ID", - /* 96 */ - "expr ::= value INSTANCEOF value", - /* 97 */ - "ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr", - /* 98 */ - "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr", - /* 99 */ - "value ::= variable", - /* 100 */ - "value ::= UNIMATH value", - /* 101 */ - "value ::= NOT value", - /* 102 */ - "value ::= TYPECAST value", - /* 103 */ - "value ::= variable INCDEC", - /* 104 */ - "value ::= HEX", - /* 105 */ - "value ::= INTEGER", - /* 106 */ - "value ::= INTEGER DOT INTEGER", - /* 107 */ - "value ::= INTEGER DOT", - /* 108 */ - "value ::= DOT INTEGER", - /* 109 */ - "value ::= ID", - /* 110 */ - "value ::= function", - /* 111 */ - "value ::= OPENP expr CLOSEP", - /* 112 */ - "value ::= SINGLEQUOTESTRING", - /* 113 */ - "value ::= doublequoted_with_quotes", - /* 114 */ - "value ::= ID DOUBLECOLON static_class_access", - /* 115 */ - "value ::= varindexed DOUBLECOLON static_class_access", - /* 116 */ - "value ::= smartytag RDEL", - /* 117 */ - "value ::= value modifierlist", - /* 118 */ - "variable ::= varindexed", - /* 119 */ - "variable ::= DOLLAR varvar AT ID", - /* 120 */ - "variable ::= object", - /* 121 */ - "variable ::= HATCH ID HATCH", - /* 122 */ - "variable ::= HATCH ID HATCH arrayindex", - /* 123 */ - "variable ::= HATCH variable HATCH", - /* 124 */ - "variable ::= HATCH variable HATCH arrayindex", - /* 125 */ - "varindexed ::= DOLLAR varvar arrayindex", - /* 126 */ - "arrayindex ::= arrayindex indexdef", - /* 127 */ - "arrayindex ::=", - /* 128 */ - "indexdef ::= DOT DOLLAR varvar", - /* 129 */ - "indexdef ::= DOT DOLLAR varvar AT ID", - /* 130 */ - "indexdef ::= DOT ID", - /* 131 */ - "indexdef ::= DOT INTEGER", - /* 132 */ - "indexdef ::= DOT LDEL expr RDEL", - /* 133 */ - "indexdef ::= OPENB ID CLOSEB", - /* 134 */ - "indexdef ::= OPENB ID DOT ID CLOSEB", - /* 135 */ - "indexdef ::= OPENB expr CLOSEB", - /* 136 */ - "indexdef ::= OPENB CLOSEB", - /* 137 */ - "varvar ::= varvarele", - /* 138 */ - "varvar ::= varvar varvarele", - /* 139 */ - "varvarele ::= ID", - /* 140 */ - "varvarele ::= LDEL expr RDEL", - /* 141 */ - "object ::= varindexed objectchain", - /* 142 */ - "objectchain ::= objectelement", - /* 143 */ - "objectchain ::= objectchain objectelement", - /* 144 */ - "objectelement ::= PTR ID arrayindex", - /* 145 */ - "objectelement ::= PTR DOLLAR varvar arrayindex", - /* 146 */ - "objectelement ::= PTR LDEL expr RDEL arrayindex", - /* 147 */ - "objectelement ::= PTR ID LDEL expr RDEL arrayindex", - /* 148 */ - "objectelement ::= PTR method", - /* 149 */ - "function ::= ID OPENP params CLOSEP", - /* 150 */ - "method ::= ID OPENP params CLOSEP", - /* 151 */ - "method ::= DOLLAR ID OPENP params CLOSEP", - /* 152 */ - "params ::= params COMMA expr", - /* 153 */ - "params ::= expr", - /* 154 */ - "params ::=", - /* 155 */ - "modifierlist ::= modifierlist modifier modparameters", - /* 156 */ - "modifierlist ::= modifier modparameters", - /* 157 */ - "modifier ::= VERT AT ID", - /* 158 */ - "modifier ::= VERT ID", - /* 159 */ - "modparameters ::= modparameters modparameter", - /* 160 */ - "modparameters ::=", - /* 161 */ - "modparameter ::= COLON value", - /* 162 */ - "modparameter ::= COLON array", - /* 163 */ - "static_class_access ::= method", - /* 164 */ - "static_class_access ::= method objectchain", - /* 165 */ - "static_class_access ::= ID", - /* 166 */ - "static_class_access ::= DOLLAR ID arrayindex", - /* 167 */ - "static_class_access ::= DOLLAR ID arrayindex objectchain", - /* 168 */ - "ifcond ::= EQUALS", - /* 169 */ - "ifcond ::= NOTEQUALS", - /* 170 */ - "ifcond ::= GREATERTHAN", - /* 171 */ - "ifcond ::= LESSTHAN", - /* 172 */ - "ifcond ::= GREATEREQUAL", - /* 173 */ - "ifcond ::= LESSEQUAL", - /* 174 */ - "ifcond ::= IDENTITY", - /* 175 */ - "ifcond ::= NONEIDENTITY", - /* 176 */ - "ifcond ::= MOD", - /* 177 */ - "lop ::= LAND", - /* 178 */ - "lop ::= LOR", - /* 179 */ - "lop ::= LXOR", - /* 180 */ - "array ::= OPENB arrayelements CLOSEB", - /* 181 */ - "arrayelements ::= arrayelement", - /* 182 */ - "arrayelements ::= arrayelements COMMA arrayelement", - /* 183 */ - "arrayelements ::=", - /* 184 */ - "arrayelement ::= value APTR expr", - /* 185 */ - "arrayelement ::= ID APTR expr", - /* 186 */ - "arrayelement ::= expr", - /* 187 */ - "doublequoted_with_quotes ::= QUOTE QUOTE", - /* 188 */ - "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE", - /* 189 */ - "doublequoted ::= doublequoted doublequotedcontent", - /* 190 */ - "doublequoted ::= doublequotedcontent", - /* 191 */ - "doublequotedcontent ::= BACKTICK variable BACKTICK", - /* 192 */ - "doublequotedcontent ::= BACKTICK expr BACKTICK", - /* 193 */ - "doublequotedcontent ::= DOLLARID", - /* 194 */ - "doublequotedcontent ::= LDEL variable RDEL", - /* 195 */ - "doublequotedcontent ::= LDEL expr RDEL", - /* 196 */ - "doublequotedcontent ::= smartytag RDEL", - /* 197 */ - "doublequotedcontent ::= TEXT", - /* 198 */ - "optspace ::= SPACE", - /* 199 */ - "optspace ::=", + static public $yyRuleName = array( + /* 0 */ "start ::= template", + /* 1 */ "template ::= template_element", + /* 2 */ "template ::= template template_element", + /* 3 */ "template ::=", + /* 4 */ "template_element ::= smartytag", + /* 5 */ "template_element ::= COMMENT", + /* 6 */ "template_element ::= literal", + /* 7 */ "template_element ::= PHPSTARTTAG", + /* 8 */ "template_element ::= PHPENDTAG", + /* 9 */ "template_element ::= ASPSTARTTAG", + /* 10 */ "template_element ::= ASPENDTAG", + /* 11 */ "template_element ::= FAKEPHPSTARTTAG", + /* 12 */ "template_element ::= XMLTAG", + /* 13 */ "template_element ::= TEXT", + /* 14 */ "template_element ::= STRIPON", + /* 15 */ "template_element ::= STRIPOFF", + /* 16 */ "literal ::= LITERALSTART LITERALEND", + /* 17 */ "literal ::= LITERALSTART literal_elements LITERALEND", + /* 18 */ "literal_elements ::= literal_elements literal_element", + /* 19 */ "literal_elements ::=", + /* 20 */ "literal_element ::= literal", + /* 21 */ "literal_element ::= LITERAL", + /* 22 */ "literal_element ::= PHPSTARTTAG", + /* 23 */ "literal_element ::= FAKEPHPSTARTTAG", + /* 24 */ "literal_element ::= PHPENDTAG", + /* 25 */ "literal_element ::= ASPSTARTTAG", + /* 26 */ "literal_element ::= ASPENDTAG", + /* 27 */ "smartytag ::= LDEL value RDEL", + /* 28 */ "smartytag ::= LDEL value modifierlist attributes RDEL", + /* 29 */ "smartytag ::= LDEL value attributes RDEL", + /* 30 */ "smartytag ::= LDEL expr modifierlist attributes RDEL", + /* 31 */ "smartytag ::= LDEL expr attributes RDEL", + /* 32 */ "smartytag ::= LDEL DOLLAR ID EQUAL value RDEL", + /* 33 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr RDEL", + /* 34 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes RDEL", + /* 35 */ "smartytag ::= LDEL varindexed EQUAL expr attributes RDEL", + /* 36 */ "smartytag ::= LDEL ID attributes RDEL", + /* 37 */ "smartytag ::= LDEL ID RDEL", + /* 38 */ "smartytag ::= LDEL ID PTR ID attributes RDEL", + /* 39 */ "smartytag ::= LDEL ID modifierlist attributes RDEL", + /* 40 */ "smartytag ::= LDEL ID PTR ID modifierlist attributes RDEL", + /* 41 */ "smartytag ::= LDELIF expr RDEL", + /* 42 */ "smartytag ::= LDELIF expr attributes RDEL", + /* 43 */ "smartytag ::= LDELIF statement RDEL", + /* 44 */ "smartytag ::= LDELIF statement attributes RDEL", + /* 45 */ "smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes RDEL", + /* 46 */ "foraction ::= EQUAL expr", + /* 47 */ "foraction ::= INCDEC", + /* 48 */ "smartytag ::= LDELFOR statement TO expr attributes RDEL", + /* 49 */ "smartytag ::= LDELFOR statement TO expr STEP expr attributes RDEL", + /* 50 */ "smartytag ::= LDELFOREACH attributes RDEL", + /* 51 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes RDEL", + /* 52 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL", + /* 53 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes RDEL", + /* 54 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL", + /* 55 */ "smartytag ::= LDELSETFILTER ID modparameters RDEL", + /* 56 */ "smartytag ::= LDELSETFILTER ID modparameters modifierlist RDEL", + /* 57 */ "smartytag ::= SMARTYBLOCKCHILD", + /* 58 */ "smartytag ::= LDELSLASH ID RDEL", + /* 59 */ "smartytag ::= LDELSLASH ID modifierlist RDEL", + /* 60 */ "smartytag ::= LDELSLASH ID PTR ID RDEL", + /* 61 */ "smartytag ::= LDELSLASH ID PTR ID modifierlist RDEL", + /* 62 */ "attributes ::= attributes attribute", + /* 63 */ "attributes ::= attribute", + /* 64 */ "attributes ::=", + /* 65 */ "attribute ::= SPACE ID EQUAL ID", + /* 66 */ "attribute ::= SPACE ID EQUAL expr", + /* 67 */ "attribute ::= SPACE ID EQUAL value", + /* 68 */ "attribute ::= SPACE ID", + /* 69 */ "attribute ::= SPACE expr", + /* 70 */ "attribute ::= SPACE value", + /* 71 */ "attribute ::= SPACE INTEGER EQUAL expr", + /* 72 */ "statements ::= statement", + /* 73 */ "statements ::= statements COMMA statement", + /* 74 */ "statement ::= DOLLAR varvar EQUAL expr", + /* 75 */ "statement ::= varindexed EQUAL expr", + /* 76 */ "statement ::= OPENP statement CLOSEP", + /* 77 */ "expr ::= value", + /* 78 */ "expr ::= ternary", + /* 79 */ "expr ::= DOLLAR ID COLON ID", + /* 80 */ "expr ::= expr MATH value", + /* 81 */ "expr ::= expr UNIMATH value", + /* 82 */ "expr ::= expr ANDSYM value", + /* 83 */ "expr ::= array", + /* 84 */ "expr ::= expr modifierlist", + /* 85 */ "expr ::= expr ifcond expr", + /* 86 */ "expr ::= expr ISIN array", + /* 87 */ "expr ::= expr ISIN value", + /* 88 */ "expr ::= expr lop expr", + /* 89 */ "expr ::= expr ISDIVBY expr", + /* 90 */ "expr ::= expr ISNOTDIVBY expr", + /* 91 */ "expr ::= expr ISEVEN", + /* 92 */ "expr ::= expr ISNOTEVEN", + /* 93 */ "expr ::= expr ISEVENBY expr", + /* 94 */ "expr ::= expr ISNOTEVENBY expr", + /* 95 */ "expr ::= expr ISODD", + /* 96 */ "expr ::= expr ISNOTODD", + /* 97 */ "expr ::= expr ISODDBY expr", + /* 98 */ "expr ::= expr ISNOTODDBY expr", + /* 99 */ "expr ::= value INSTANCEOF ID", + /* 100 */ "expr ::= value INSTANCEOF value", + /* 101 */ "ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr", + /* 102 */ "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr", + /* 103 */ "value ::= variable", + /* 104 */ "value ::= UNIMATH value", + /* 105 */ "value ::= NOT value", + /* 106 */ "value ::= TYPECAST value", + /* 107 */ "value ::= variable INCDEC", + /* 108 */ "value ::= HEX", + /* 109 */ "value ::= INTEGER", + /* 110 */ "value ::= INTEGER DOT INTEGER", + /* 111 */ "value ::= INTEGER DOT", + /* 112 */ "value ::= DOT INTEGER", + /* 113 */ "value ::= ID", + /* 114 */ "value ::= function", + /* 115 */ "value ::= OPENP expr CLOSEP", + /* 116 */ "value ::= SINGLEQUOTESTRING", + /* 117 */ "value ::= doublequoted_with_quotes", + /* 118 */ "value ::= ID DOUBLECOLON static_class_access", + /* 119 */ "value ::= varindexed DOUBLECOLON static_class_access", + /* 120 */ "value ::= smartytag", + /* 121 */ "value ::= value modifierlist", + /* 122 */ "variable ::= varindexed", + /* 123 */ "variable ::= DOLLAR varvar AT ID", + /* 124 */ "variable ::= object", + /* 125 */ "variable ::= HATCH ID HATCH", + /* 126 */ "variable ::= HATCH variable HATCH", + /* 127 */ "varindexed ::= DOLLAR varvar arrayindex", + /* 128 */ "arrayindex ::= arrayindex indexdef", + /* 129 */ "arrayindex ::=", + /* 130 */ "indexdef ::= DOT DOLLAR varvar", + /* 131 */ "indexdef ::= DOT DOLLAR varvar AT ID", + /* 132 */ "indexdef ::= DOT ID", + /* 133 */ "indexdef ::= DOT INTEGER", + /* 134 */ "indexdef ::= DOT LDEL expr RDEL", + /* 135 */ "indexdef ::= OPENB ID CLOSEB", + /* 136 */ "indexdef ::= OPENB ID DOT ID CLOSEB", + /* 137 */ "indexdef ::= OPENB expr CLOSEB", + /* 138 */ "indexdef ::= OPENB CLOSEB", + /* 139 */ "varvar ::= varvarele", + /* 140 */ "varvar ::= varvar varvarele", + /* 141 */ "varvarele ::= ID", + /* 142 */ "varvarele ::= LDEL expr RDEL", + /* 143 */ "object ::= varindexed objectchain", + /* 144 */ "objectchain ::= objectelement", + /* 145 */ "objectchain ::= objectchain objectelement", + /* 146 */ "objectelement ::= PTR ID arrayindex", + /* 147 */ "objectelement ::= PTR DOLLAR varvar arrayindex", + /* 148 */ "objectelement ::= PTR LDEL expr RDEL arrayindex", + /* 149 */ "objectelement ::= PTR ID LDEL expr RDEL arrayindex", + /* 150 */ "objectelement ::= PTR method", + /* 151 */ "function ::= ID OPENP params CLOSEP", + /* 152 */ "method ::= ID OPENP params CLOSEP", + /* 153 */ "method ::= DOLLAR ID OPENP params CLOSEP", + /* 154 */ "params ::= params COMMA expr", + /* 155 */ "params ::= expr", + /* 156 */ "params ::=", + /* 157 */ "modifierlist ::= modifierlist modifier modparameters", + /* 158 */ "modifierlist ::= modifier modparameters", + /* 159 */ "modifier ::= VERT AT ID", + /* 160 */ "modifier ::= VERT ID", + /* 161 */ "modparameters ::= modparameters modparameter", + /* 162 */ "modparameters ::=", + /* 163 */ "modparameter ::= COLON value", + /* 164 */ "modparameter ::= COLON array", + /* 165 */ "static_class_access ::= method", + /* 166 */ "static_class_access ::= method objectchain", + /* 167 */ "static_class_access ::= ID", + /* 168 */ "static_class_access ::= DOLLAR ID arrayindex", + /* 169 */ "static_class_access ::= DOLLAR ID arrayindex objectchain", + /* 170 */ "ifcond ::= EQUALS", + /* 171 */ "ifcond ::= NOTEQUALS", + /* 172 */ "ifcond ::= GREATERTHAN", + /* 173 */ "ifcond ::= LESSTHAN", + /* 174 */ "ifcond ::= GREATEREQUAL", + /* 175 */ "ifcond ::= LESSEQUAL", + /* 176 */ "ifcond ::= IDENTITY", + /* 177 */ "ifcond ::= NONEIDENTITY", + /* 178 */ "ifcond ::= MOD", + /* 179 */ "lop ::= LAND", + /* 180 */ "lop ::= LOR", + /* 181 */ "lop ::= LXOR", + /* 182 */ "array ::= OPENB arrayelements CLOSEB", + /* 183 */ "arrayelements ::= arrayelement", + /* 184 */ "arrayelements ::= arrayelements COMMA arrayelement", + /* 185 */ "arrayelements ::=", + /* 186 */ "arrayelement ::= value APTR expr", + /* 187 */ "arrayelement ::= ID APTR expr", + /* 188 */ "arrayelement ::= expr", + /* 189 */ "doublequoted_with_quotes ::= QUOTE QUOTE", + /* 190 */ "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE", + /* 191 */ "doublequoted ::= doublequoted doublequotedcontent", + /* 192 */ "doublequoted ::= doublequotedcontent", + /* 193 */ "doublequotedcontent ::= BACKTICK variable BACKTICK", + /* 194 */ "doublequotedcontent ::= BACKTICK expr BACKTICK", + /* 195 */ "doublequotedcontent ::= DOLLARID", + /* 196 */ "doublequotedcontent ::= LDEL variable RDEL", + /* 197 */ "doublequotedcontent ::= LDEL expr RDEL", + /* 198 */ "doublequotedcontent ::= smartytag", + /* 199 */ "doublequotedcontent ::= TEXT", + /* 200 */ "optspace ::= SPACE", + /* 201 */ "optspace ::=", ); - public function tokenName($tokenType) + function tokenName($tokenType) { if ($tokenType === 0) { return 'End of Input'; @@ -2625,43 +1509,41 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php } } - public static function yy_destructor($yymajor, $yypminor) + static function yy_destructor($yymajor, $yypminor) { switch ($yymajor) { - default: - break; /* If no destructor action specified: do nothing */ + default: break; /* If no destructor action specified: do nothing */ } } - public function yy_pop_parser_stack() + function yy_pop_parser_stack() { if (!count($this->yystack)) { return; } $yytos = array_pop($this->yystack); - if ($this->yyTraceFILE && $this->yyidx >= 0) { - fwrite($this->yyTraceFILE, - $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . - "\n"); + if (self::$yyTraceFILE && $this->yyidx >= 0) { + fwrite(self::$yyTraceFILE, + self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . + "\n"); } $yymajor = $yytos->major; self::yy_destructor($yymajor, $yytos->minor); - $this->yyidx --; - + $this->yyidx--; return $yymajor; } - public function __destruct() + function __destruct() { while ($this->yystack !== Array()) { $this->yy_pop_parser_stack(); } - if (is_resource($this->yyTraceFILE)) { - fclose($this->yyTraceFILE); + if (is_resource(self::$yyTraceFILE)) { + fclose(self::$yyTraceFILE); } } - public function yy_get_expected_tokens($token) + function yy_get_expected_tokens($token) { $state = $this->yystack[$this->yyidx]->stateno; $expected = self::$yyExpectedTokens[$state]; @@ -2676,7 +1558,7 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php // reduce action $done = 0; do { - if ($done ++ == 100) { + if ($done++ == 100) { $this->yyidx = $yyidx; $this->yystack = $stack; // too much recursion prevents proper detection @@ -2689,18 +1571,17 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php $this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno]['lhs']); if (isset(self::$yyExpectedTokens[$nextstate])) { - $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]); - if (in_array($token, - self::$yyExpectedTokens[$nextstate], true)) { + $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]); + if (in_array($token, + self::$yyExpectedTokens[$nextstate], true)) { $this->yyidx = $yyidx; $this->yystack = $stack; - return array_unique($expected); } } if ($nextstate < self::YYNSTATE) { // we need to shift a non-terminal - $this->yyidx ++; + $this->yyidx++; $x = new TP_yyStackEntry; $x->stateno = $nextstate; $x->major = self::$yyRuleInfo[$yyruleno]['lhs']; @@ -2725,13 +1606,12 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php } break; } while (true); - $this->yyidx = $yyidx; - $this->yystack = $stack; - + $this->yyidx = $yyidx; + $this->yystack = $stack; return array_unique($expected); } - public function yy_is_expected_token($token) + function yy_is_expected_token($token) { if ($token === 0) { return true; // 0 is not part of this @@ -2748,7 +1628,7 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php // reduce action $done = 0; do { - if ($done ++ == 100) { + if ($done++ == 100) { $this->yyidx = $yyidx; $this->yystack = $stack; // too much recursion prevents proper detection @@ -2761,16 +1641,14 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php $this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno]['lhs']); if (isset(self::$yyExpectedTokens[$nextstate]) && - in_array($token, self::$yyExpectedTokens[$nextstate], true) - ) { + in_array($token, self::$yyExpectedTokens[$nextstate], true)) { $this->yyidx = $yyidx; $this->yystack = $stack; - return true; } if ($nextstate < self::YYNSTATE) { // we need to shift a non-terminal - $this->yyidx ++; + $this->yyidx++; $x = new TP_yyStackEntry; $x->stateno = $nextstate; $x->major = self::$yyRuleInfo[$yyruleno]['lhs']; @@ -2801,11 +1679,10 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php } while (true); $this->yyidx = $yyidx; $this->yystack = $stack; - return true; } - public function yy_find_shift_action($iLookAhead) + function yy_find_shift_action($iLookAhead) { $stateno = $this->yystack[$this->yyidx]->stateno; @@ -2823,27 +1700,23 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php } $i += $iLookAhead; if ($i < 0 || $i >= self::YY_SZ_ACTTAB || - self::$yy_lookahead[$i] != $iLookAhead - ) { + self::$yy_lookahead[$i] != $iLookAhead) { if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) - && ($iFallback = self::$yyFallback[$iLookAhead]) != 0 - ) { - if ($this->yyTraceFILE) { - fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . + && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) { + if (self::$yyTraceFILE) { + fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iFallback] . "\n"); } - return $this->yy_find_shift_action($iFallback); } - return self::$yy_default[$stateno]; } else { return self::$yy_action[$i]; } } - public function yy_find_reduce_action($stateno, $iLookAhead) + function yy_find_reduce_action($stateno, $iLookAhead) { /* $stateno = $this->yystack[$this->yyidx]->stateno; */ @@ -2859,31 +1732,29 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php } $i += $iLookAhead; if ($i < 0 || $i >= self::YY_SZ_ACTTAB || - self::$yy_lookahead[$i] != $iLookAhead - ) { + self::$yy_lookahead[$i] != $iLookAhead) { return self::$yy_default[$stateno]; } else { return self::$yy_action[$i]; } } - public function yy_shift($yyNewState, $yyMajor, $yypMinor) + function yy_shift($yyNewState, $yyMajor, $yypMinor) { - $this->yyidx ++; + $this->yyidx++; if ($this->yyidx >= self::YYSTACKDEPTH) { - $this->yyidx --; - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt); + $this->yyidx--; + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt); } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } - #line 82 "smarty_internal_templateparser.y" - - $this->internalError = true; - $this->compiler->trigger_template_error("Stack overflow in template parser"); - #line 1721 "smarty_internal_templateparser.php" +#line 84 "smarty_internal_templateparser.y" + $this->internalError = true; + $this->compiler->trigger_template_error("Stack overflow in template parser"); +#line 1753 "smarty_internal_templateparser.php" return; } $yytos = new TP_yyStackEntry; @@ -2891,375 +1762,377 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php $yytos->major = $yyMajor; $yytos->minor = $yypMinor; array_push($this->yystack, $yytos); - if ($this->yyTraceFILE && $this->yyidx > 0) { - fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, - $yyNewState); - fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt); - for ($i = 1; $i <= $this->yyidx; $i ++) { - fprintf($this->yyTraceFILE, " %s", - $this->yyTokenName[$this->yystack[$i]->major]); + if (self::$yyTraceFILE && $this->yyidx > 0) { + fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt, + $yyNewState); + fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt); + for($i = 1; $i <= $this->yyidx; $i++) { + fprintf(self::$yyTraceFILE, " %s", + $this->yyTokenName[$this->yystack[$i]->major]); } - fwrite($this->yyTraceFILE, "\n"); + fwrite(self::$yyTraceFILE,"\n"); } } - public static $yyRuleInfo = array( - array('lhs' => 83, 'rhs' => 1), - array('lhs' => 84, 'rhs' => 1), - array('lhs' => 84, 'rhs' => 2), - array('lhs' => 84, 'rhs' => 0), - array('lhs' => 85, 'rhs' => 2), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 85, 'rhs' => 1), - array('lhs' => 87, 'rhs' => 2), - array('lhs' => 87, 'rhs' => 3), - array('lhs' => 88, 'rhs' => 2), - array('lhs' => 88, 'rhs' => 0), - array('lhs' => 89, 'rhs' => 1), - array('lhs' => 89, 'rhs' => 1), - array('lhs' => 86, 'rhs' => 2), - array('lhs' => 86, 'rhs' => 4), - array('lhs' => 86, 'rhs' => 3), - array('lhs' => 86, 'rhs' => 4), - array('lhs' => 86, 'rhs' => 3), - array('lhs' => 86, 'rhs' => 5), - array('lhs' => 86, 'rhs' => 5), - array('lhs' => 86, 'rhs' => 6), - array('lhs' => 86, 'rhs' => 5), - array('lhs' => 86, 'rhs' => 3), - array('lhs' => 86, 'rhs' => 2), - array('lhs' => 86, 'rhs' => 5), - array('lhs' => 86, 'rhs' => 4), - array('lhs' => 86, 'rhs' => 6), - array('lhs' => 86, 'rhs' => 2), - array('lhs' => 86, 'rhs' => 3), - array('lhs' => 86, 'rhs' => 2), - array('lhs' => 86, 'rhs' => 3), - array('lhs' => 86, 'rhs' => 11), - array('lhs' => 99, 'rhs' => 2), - array('lhs' => 99, 'rhs' => 1), - array('lhs' => 86, 'rhs' => 5), - array('lhs' => 86, 'rhs' => 7), - array('lhs' => 86, 'rhs' => 2), - array('lhs' => 86, 'rhs' => 7), - array('lhs' => 86, 'rhs' => 10), - array('lhs' => 86, 'rhs' => 7), - array('lhs' => 86, 'rhs' => 10), - array('lhs' => 86, 'rhs' => 3), - array('lhs' => 86, 'rhs' => 4), - array('lhs' => 86, 'rhs' => 2), - array('lhs' => 86, 'rhs' => 2), - array('lhs' => 86, 'rhs' => 3), - array('lhs' => 86, 'rhs' => 4), - array('lhs' => 86, 'rhs' => 5), - array('lhs' => 92, 'rhs' => 2), - array('lhs' => 92, 'rhs' => 1), - array('lhs' => 92, 'rhs' => 0), - array('lhs' => 101, 'rhs' => 4), - array('lhs' => 101, 'rhs' => 2), - array('lhs' => 101, 'rhs' => 2), - array('lhs' => 101, 'rhs' => 2), - array('lhs' => 101, 'rhs' => 2), - array('lhs' => 101, 'rhs' => 2), - array('lhs' => 101, 'rhs' => 4), - array('lhs' => 96, 'rhs' => 1), - array('lhs' => 96, 'rhs' => 3), - array('lhs' => 95, 'rhs' => 4), - array('lhs' => 95, 'rhs' => 3), - array('lhs' => 95, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 1), - array('lhs' => 93, 'rhs' => 1), - array('lhs' => 93, 'rhs' => 4), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 1), - array('lhs' => 93, 'rhs' => 2), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 2), - array('lhs' => 93, 'rhs' => 2), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 2), - array('lhs' => 93, 'rhs' => 2), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 93, 'rhs' => 3), - array('lhs' => 102, 'rhs' => 8), - array('lhs' => 102, 'rhs' => 7), - array('lhs' => 90, 'rhs' => 1), - array('lhs' => 90, 'rhs' => 2), - array('lhs' => 90, 'rhs' => 2), - array('lhs' => 90, 'rhs' => 2), - array('lhs' => 90, 'rhs' => 2), - array('lhs' => 90, 'rhs' => 1), - array('lhs' => 90, 'rhs' => 1), - array('lhs' => 90, 'rhs' => 3), - array('lhs' => 90, 'rhs' => 2), - array('lhs' => 90, 'rhs' => 2), - array('lhs' => 90, 'rhs' => 1), - array('lhs' => 90, 'rhs' => 1), - array('lhs' => 90, 'rhs' => 3), - array('lhs' => 90, 'rhs' => 1), - array('lhs' => 90, 'rhs' => 1), - array('lhs' => 90, 'rhs' => 3), - array('lhs' => 90, 'rhs' => 3), - array('lhs' => 90, 'rhs' => 2), - array('lhs' => 90, 'rhs' => 2), - array('lhs' => 106, 'rhs' => 1), - array('lhs' => 106, 'rhs' => 4), - array('lhs' => 106, 'rhs' => 1), - array('lhs' => 106, 'rhs' => 3), - array('lhs' => 106, 'rhs' => 4), - array('lhs' => 106, 'rhs' => 3), - array('lhs' => 106, 'rhs' => 4), - array('lhs' => 94, 'rhs' => 3), - array('lhs' => 111, 'rhs' => 2), - array('lhs' => 111, 'rhs' => 0), - array('lhs' => 112, 'rhs' => 3), - array('lhs' => 112, 'rhs' => 5), - array('lhs' => 112, 'rhs' => 2), - array('lhs' => 112, 'rhs' => 2), - array('lhs' => 112, 'rhs' => 4), - array('lhs' => 112, 'rhs' => 3), - array('lhs' => 112, 'rhs' => 5), - array('lhs' => 112, 'rhs' => 3), - array('lhs' => 112, 'rhs' => 2), - array('lhs' => 98, 'rhs' => 1), - array('lhs' => 98, 'rhs' => 2), - array('lhs' => 113, 'rhs' => 1), - array('lhs' => 113, 'rhs' => 3), - array('lhs' => 110, 'rhs' => 2), - array('lhs' => 114, 'rhs' => 1), - array('lhs' => 114, 'rhs' => 2), - array('lhs' => 115, 'rhs' => 3), - array('lhs' => 115, 'rhs' => 4), - array('lhs' => 115, 'rhs' => 5), - array('lhs' => 115, 'rhs' => 6), - array('lhs' => 115, 'rhs' => 2), - array('lhs' => 107, 'rhs' => 4), - array('lhs' => 116, 'rhs' => 4), - array('lhs' => 116, 'rhs' => 5), - array('lhs' => 117, 'rhs' => 3), - array('lhs' => 117, 'rhs' => 1), - array('lhs' => 117, 'rhs' => 0), - array('lhs' => 91, 'rhs' => 3), - array('lhs' => 91, 'rhs' => 2), - array('lhs' => 118, 'rhs' => 3), - array('lhs' => 118, 'rhs' => 2), - array('lhs' => 100, 'rhs' => 2), - array('lhs' => 100, 'rhs' => 0), - array('lhs' => 119, 'rhs' => 2), - array('lhs' => 119, 'rhs' => 2), - array('lhs' => 109, 'rhs' => 1), - array('lhs' => 109, 'rhs' => 2), - array('lhs' => 109, 'rhs' => 1), - array('lhs' => 109, 'rhs' => 3), - array('lhs' => 109, 'rhs' => 4), - array('lhs' => 104, 'rhs' => 1), - array('lhs' => 104, 'rhs' => 1), - array('lhs' => 104, 'rhs' => 1), - array('lhs' => 104, 'rhs' => 1), - array('lhs' => 104, 'rhs' => 1), - array('lhs' => 104, 'rhs' => 1), - array('lhs' => 104, 'rhs' => 1), - array('lhs' => 104, 'rhs' => 1), - array('lhs' => 104, 'rhs' => 1), - array('lhs' => 105, 'rhs' => 1), - array('lhs' => 105, 'rhs' => 1), - array('lhs' => 105, 'rhs' => 1), - array('lhs' => 103, 'rhs' => 3), - array('lhs' => 120, 'rhs' => 1), - array('lhs' => 120, 'rhs' => 3), - array('lhs' => 120, 'rhs' => 0), - array('lhs' => 121, 'rhs' => 3), - array('lhs' => 121, 'rhs' => 3), - array('lhs' => 121, 'rhs' => 1), - array('lhs' => 108, 'rhs' => 2), - array('lhs' => 108, 'rhs' => 3), - array('lhs' => 122, 'rhs' => 2), - array('lhs' => 122, 'rhs' => 1), - array('lhs' => 123, 'rhs' => 3), - array('lhs' => 123, 'rhs' => 3), - array('lhs' => 123, 'rhs' => 1), - array('lhs' => 123, 'rhs' => 3), - array('lhs' => 123, 'rhs' => 3), - array('lhs' => 123, 'rhs' => 2), - array('lhs' => 123, 'rhs' => 1), - array('lhs' => 97, 'rhs' => 1), - array('lhs' => 97, 'rhs' => 0), + static public $yyRuleInfo = array( + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 82, 'rhs' => 1 ), + array( 'lhs' => 82, 'rhs' => 2 ), + array( 'lhs' => 82, 'rhs' => 0 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 1 ), + array( 'lhs' => 85, 'rhs' => 2 ), + array( 'lhs' => 85, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 2 ), + array( 'lhs' => 86, 'rhs' => 0 ), + array( 'lhs' => 87, 'rhs' => 1 ), + array( 'lhs' => 87, 'rhs' => 1 ), + array( 'lhs' => 87, 'rhs' => 1 ), + array( 'lhs' => 87, 'rhs' => 1 ), + array( 'lhs' => 87, 'rhs' => 1 ), + array( 'lhs' => 87, 'rhs' => 1 ), + array( 'lhs' => 87, 'rhs' => 1 ), + array( 'lhs' => 84, 'rhs' => 3 ), + array( 'lhs' => 84, 'rhs' => 5 ), + array( 'lhs' => 84, 'rhs' => 4 ), + array( 'lhs' => 84, 'rhs' => 5 ), + array( 'lhs' => 84, 'rhs' => 4 ), + array( 'lhs' => 84, 'rhs' => 6 ), + array( 'lhs' => 84, 'rhs' => 6 ), + array( 'lhs' => 84, 'rhs' => 7 ), + array( 'lhs' => 84, 'rhs' => 6 ), + array( 'lhs' => 84, 'rhs' => 4 ), + array( 'lhs' => 84, 'rhs' => 3 ), + array( 'lhs' => 84, 'rhs' => 6 ), + array( 'lhs' => 84, 'rhs' => 5 ), + array( 'lhs' => 84, 'rhs' => 7 ), + array( 'lhs' => 84, 'rhs' => 3 ), + array( 'lhs' => 84, 'rhs' => 4 ), + array( 'lhs' => 84, 'rhs' => 3 ), + array( 'lhs' => 84, 'rhs' => 4 ), + array( 'lhs' => 84, 'rhs' => 12 ), + array( 'lhs' => 97, 'rhs' => 2 ), + array( 'lhs' => 97, 'rhs' => 1 ), + array( 'lhs' => 84, 'rhs' => 6 ), + array( 'lhs' => 84, 'rhs' => 8 ), + array( 'lhs' => 84, 'rhs' => 3 ), + array( 'lhs' => 84, 'rhs' => 8 ), + array( 'lhs' => 84, 'rhs' => 11 ), + array( 'lhs' => 84, 'rhs' => 8 ), + array( 'lhs' => 84, 'rhs' => 11 ), + array( 'lhs' => 84, 'rhs' => 4 ), + array( 'lhs' => 84, 'rhs' => 5 ), + array( 'lhs' => 84, 'rhs' => 1 ), + array( 'lhs' => 84, 'rhs' => 3 ), + array( 'lhs' => 84, 'rhs' => 4 ), + array( 'lhs' => 84, 'rhs' => 5 ), + array( 'lhs' => 84, 'rhs' => 6 ), + array( 'lhs' => 90, 'rhs' => 2 ), + array( 'lhs' => 90, 'rhs' => 1 ), + array( 'lhs' => 90, 'rhs' => 0 ), + array( 'lhs' => 99, 'rhs' => 4 ), + array( 'lhs' => 99, 'rhs' => 4 ), + array( 'lhs' => 99, 'rhs' => 4 ), + array( 'lhs' => 99, 'rhs' => 2 ), + array( 'lhs' => 99, 'rhs' => 2 ), + array( 'lhs' => 99, 'rhs' => 2 ), + array( 'lhs' => 99, 'rhs' => 4 ), + array( 'lhs' => 94, 'rhs' => 1 ), + array( 'lhs' => 94, 'rhs' => 3 ), + array( 'lhs' => 93, 'rhs' => 4 ), + array( 'lhs' => 93, 'rhs' => 3 ), + array( 'lhs' => 93, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 1 ), + array( 'lhs' => 91, 'rhs' => 1 ), + array( 'lhs' => 91, 'rhs' => 4 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 1 ), + array( 'lhs' => 91, 'rhs' => 2 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 2 ), + array( 'lhs' => 91, 'rhs' => 2 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 2 ), + array( 'lhs' => 91, 'rhs' => 2 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 91, 'rhs' => 3 ), + array( 'lhs' => 100, 'rhs' => 8 ), + array( 'lhs' => 100, 'rhs' => 7 ), + array( 'lhs' => 88, 'rhs' => 1 ), + array( 'lhs' => 88, 'rhs' => 2 ), + array( 'lhs' => 88, 'rhs' => 2 ), + array( 'lhs' => 88, 'rhs' => 2 ), + array( 'lhs' => 88, 'rhs' => 2 ), + array( 'lhs' => 88, 'rhs' => 1 ), + array( 'lhs' => 88, 'rhs' => 1 ), + array( 'lhs' => 88, 'rhs' => 3 ), + array( 'lhs' => 88, 'rhs' => 2 ), + array( 'lhs' => 88, 'rhs' => 2 ), + array( 'lhs' => 88, 'rhs' => 1 ), + array( 'lhs' => 88, 'rhs' => 1 ), + array( 'lhs' => 88, 'rhs' => 3 ), + array( 'lhs' => 88, 'rhs' => 1 ), + array( 'lhs' => 88, 'rhs' => 1 ), + array( 'lhs' => 88, 'rhs' => 3 ), + array( 'lhs' => 88, 'rhs' => 3 ), + array( 'lhs' => 88, 'rhs' => 1 ), + array( 'lhs' => 88, 'rhs' => 2 ), + array( 'lhs' => 104, 'rhs' => 1 ), + array( 'lhs' => 104, 'rhs' => 4 ), + array( 'lhs' => 104, 'rhs' => 1 ), + array( 'lhs' => 104, 'rhs' => 3 ), + array( 'lhs' => 104, 'rhs' => 3 ), + array( 'lhs' => 92, 'rhs' => 3 ), + array( 'lhs' => 109, 'rhs' => 2 ), + array( 'lhs' => 109, 'rhs' => 0 ), + array( 'lhs' => 110, 'rhs' => 3 ), + array( 'lhs' => 110, 'rhs' => 5 ), + array( 'lhs' => 110, 'rhs' => 2 ), + array( 'lhs' => 110, 'rhs' => 2 ), + array( 'lhs' => 110, 'rhs' => 4 ), + array( 'lhs' => 110, 'rhs' => 3 ), + array( 'lhs' => 110, 'rhs' => 5 ), + array( 'lhs' => 110, 'rhs' => 3 ), + array( 'lhs' => 110, 'rhs' => 2 ), + array( 'lhs' => 96, 'rhs' => 1 ), + array( 'lhs' => 96, 'rhs' => 2 ), + array( 'lhs' => 111, 'rhs' => 1 ), + array( 'lhs' => 111, 'rhs' => 3 ), + array( 'lhs' => 108, 'rhs' => 2 ), + array( 'lhs' => 112, 'rhs' => 1 ), + array( 'lhs' => 112, 'rhs' => 2 ), + array( 'lhs' => 113, 'rhs' => 3 ), + array( 'lhs' => 113, 'rhs' => 4 ), + array( 'lhs' => 113, 'rhs' => 5 ), + array( 'lhs' => 113, 'rhs' => 6 ), + array( 'lhs' => 113, 'rhs' => 2 ), + array( 'lhs' => 105, 'rhs' => 4 ), + array( 'lhs' => 114, 'rhs' => 4 ), + array( 'lhs' => 114, 'rhs' => 5 ), + array( 'lhs' => 115, 'rhs' => 3 ), + array( 'lhs' => 115, 'rhs' => 1 ), + array( 'lhs' => 115, 'rhs' => 0 ), + array( 'lhs' => 89, 'rhs' => 3 ), + array( 'lhs' => 89, 'rhs' => 2 ), + array( 'lhs' => 116, 'rhs' => 3 ), + array( 'lhs' => 116, 'rhs' => 2 ), + array( 'lhs' => 98, 'rhs' => 2 ), + array( 'lhs' => 98, 'rhs' => 0 ), + array( 'lhs' => 117, 'rhs' => 2 ), + array( 'lhs' => 117, 'rhs' => 2 ), + array( 'lhs' => 107, 'rhs' => 1 ), + array( 'lhs' => 107, 'rhs' => 2 ), + array( 'lhs' => 107, 'rhs' => 1 ), + array( 'lhs' => 107, 'rhs' => 3 ), + array( 'lhs' => 107, 'rhs' => 4 ), + array( 'lhs' => 102, 'rhs' => 1 ), + array( 'lhs' => 102, 'rhs' => 1 ), + array( 'lhs' => 102, 'rhs' => 1 ), + array( 'lhs' => 102, 'rhs' => 1 ), + array( 'lhs' => 102, 'rhs' => 1 ), + array( 'lhs' => 102, 'rhs' => 1 ), + array( 'lhs' => 102, 'rhs' => 1 ), + array( 'lhs' => 102, 'rhs' => 1 ), + array( 'lhs' => 102, 'rhs' => 1 ), + array( 'lhs' => 103, 'rhs' => 1 ), + array( 'lhs' => 103, 'rhs' => 1 ), + array( 'lhs' => 103, 'rhs' => 1 ), + array( 'lhs' => 101, 'rhs' => 3 ), + array( 'lhs' => 118, 'rhs' => 1 ), + array( 'lhs' => 118, 'rhs' => 3 ), + array( 'lhs' => 118, 'rhs' => 0 ), + array( 'lhs' => 119, 'rhs' => 3 ), + array( 'lhs' => 119, 'rhs' => 3 ), + array( 'lhs' => 119, 'rhs' => 1 ), + array( 'lhs' => 106, 'rhs' => 2 ), + array( 'lhs' => 106, 'rhs' => 3 ), + array( 'lhs' => 120, 'rhs' => 2 ), + array( 'lhs' => 120, 'rhs' => 1 ), + array( 'lhs' => 121, 'rhs' => 3 ), + array( 'lhs' => 121, 'rhs' => 3 ), + array( 'lhs' => 121, 'rhs' => 1 ), + array( 'lhs' => 121, 'rhs' => 3 ), + array( 'lhs' => 121, 'rhs' => 3 ), + array( 'lhs' => 121, 'rhs' => 1 ), + array( 'lhs' => 121, 'rhs' => 1 ), + array( 'lhs' => 95, 'rhs' => 1 ), + array( 'lhs' => 95, 'rhs' => 0 ), ); - public static $yyReduceMap = array( - 0 => 0, - 1 => 1, - 2 => 2, - 4 => 4, - 5 => 5, - 6 => 6, - 7 => 7, - 8 => 8, - 9 => 9, - 10 => 10, - 11 => 11, - 12 => 12, - 13 => 13, - 14 => 14, - 15 => 15, - 16 => 16, - 17 => 17, - 20 => 17, - 199 => 17, - 18 => 18, - 72 => 18, - 19 => 19, - 100 => 19, - 102 => 19, - 103 => 19, - 126 => 19, - 164 => 19, - 21 => 21, - 22 => 21, - 43 => 21, - 65 => 21, - 66 => 21, - 73 => 21, - 74 => 21, - 79 => 21, - 99 => 21, - 104 => 21, - 105 => 21, - 110 => 21, - 112 => 21, - 113 => 21, - 120 => 21, - 137 => 21, - 163 => 21, - 165 => 21, - 181 => 21, - 186 => 21, - 198 => 21, - 23 => 23, - 24 => 24, - 25 => 25, - 27 => 25, - 26 => 26, - 28 => 28, - 29 => 28, - 30 => 30, - 31 => 31, - 32 => 32, - 33 => 33, - 34 => 34, - 35 => 35, - 36 => 36, - 37 => 37, - 38 => 38, - 40 => 38, - 39 => 39, - 41 => 41, - 42 => 42, - 44 => 44, - 45 => 45, - 46 => 46, - 47 => 47, - 49 => 47, - 48 => 48, - 50 => 48, - 51 => 51, - 52 => 52, - 53 => 53, - 54 => 54, - 55 => 55, - 56 => 56, - 57 => 57, - 58 => 58, - 59 => 59, - 68 => 59, - 153 => 59, - 157 => 59, - 161 => 59, - 162 => 59, - 60 => 60, - 154 => 60, - 160 => 60, - 61 => 61, - 62 => 62, - 63 => 62, - 64 => 64, - 67 => 67, - 69 => 69, - 70 => 70, - 71 => 70, - 75 => 75, - 76 => 76, - 77 => 76, - 78 => 76, - 80 => 80, - 117 => 80, - 81 => 81, - 84 => 81, - 95 => 81, - 82 => 82, - 83 => 83, - 85 => 85, - 86 => 86, - 87 => 87, - 92 => 87, - 88 => 88, - 91 => 88, - 89 => 89, - 94 => 89, - 90 => 90, - 93 => 90, - 96 => 96, - 97 => 97, - 98 => 98, + static public $yyReduceMap = array( + 0 => 0, + 1 => 1, + 2 => 1, + 4 => 4, + 5 => 5, + 6 => 6, + 7 => 7, + 8 => 8, + 9 => 9, + 10 => 10, + 11 => 11, + 12 => 12, + 13 => 13, + 14 => 14, + 15 => 15, + 16 => 16, + 19 => 16, + 201 => 16, + 17 => 17, + 76 => 17, + 18 => 18, + 104 => 18, + 106 => 18, + 107 => 18, + 128 => 18, + 166 => 18, + 20 => 20, + 21 => 20, + 47 => 20, + 69 => 20, + 70 => 20, + 77 => 20, + 78 => 20, + 83 => 20, + 103 => 20, + 108 => 20, + 109 => 20, + 114 => 20, + 116 => 20, + 117 => 20, + 124 => 20, + 139 => 20, + 165 => 20, + 167 => 20, + 183 => 20, + 188 => 20, + 200 => 20, + 22 => 22, + 23 => 22, + 24 => 24, + 25 => 25, + 26 => 26, + 27 => 27, + 28 => 28, + 29 => 29, + 31 => 29, + 30 => 30, + 32 => 32, + 33 => 32, + 34 => 34, + 35 => 35, + 36 => 36, + 37 => 37, + 38 => 38, + 39 => 39, + 40 => 40, + 41 => 41, + 42 => 42, + 44 => 42, + 43 => 43, + 45 => 45, + 46 => 46, + 48 => 48, + 49 => 49, + 50 => 50, + 51 => 51, + 52 => 52, + 53 => 53, + 54 => 54, + 55 => 55, + 56 => 56, + 57 => 57, + 58 => 58, + 59 => 59, + 60 => 60, + 61 => 61, + 62 => 62, + 63 => 63, + 72 => 63, + 155 => 63, + 159 => 63, + 163 => 63, + 164 => 63, + 64 => 64, + 156 => 64, + 162 => 64, + 65 => 65, + 66 => 66, + 67 => 66, + 71 => 66, + 68 => 68, + 73 => 73, + 74 => 74, + 75 => 74, + 79 => 79, + 80 => 80, + 81 => 80, + 82 => 80, + 84 => 84, + 121 => 84, + 85 => 85, + 88 => 85, + 99 => 85, + 86 => 86, + 87 => 87, + 89 => 89, + 90 => 90, + 91 => 91, + 96 => 91, + 92 => 92, + 95 => 92, + 93 => 93, + 98 => 93, + 94 => 94, + 97 => 94, + 100 => 100, 101 => 101, - 106 => 106, - 107 => 107, - 108 => 108, - 109 => 109, + 102 => 102, + 105 => 105, + 110 => 110, 111 => 111, - 114 => 114, + 112 => 112, + 113 => 113, 115 => 115, - 116 => 116, 118 => 118, 119 => 119, - 121 => 121, + 120 => 120, 122 => 122, 123 => 123, - 124 => 124, 125 => 125, + 126 => 126, 127 => 127, - 183 => 127, - 128 => 128, 129 => 129, + 185 => 129, 130 => 130, 131 => 131, 132 => 132, - 135 => 132, 133 => 133, 134 => 134, + 137 => 134, + 135 => 135, 136 => 136, 138 => 138, - 139 => 139, 140 => 140, 141 => 141, 142 => 142, @@ -3273,12 +2146,12 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php 150 => 150, 151 => 151, 152 => 152, - 155 => 155, - 156 => 156, + 153 => 153, + 154 => 154, + 157 => 157, 158 => 158, - 159 => 159, - 166 => 166, - 167 => 167, + 160 => 160, + 161 => 161, 168 => 168, 169 => 169, 170 => 170, @@ -3292,1118 +2165,943 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php 178 => 178, 179 => 179, 180 => 180, + 181 => 181, 182 => 182, 184 => 184, - 185 => 185, + 186 => 186, 187 => 187, - 188 => 188, 189 => 189, 190 => 190, 191 => 191, - 192 => 191, - 194 => 191, + 192 => 192, 193 => 193, + 194 => 193, + 196 => 193, 195 => 195, - 196 => 196, 197 => 197, + 198 => 198, + 199 => 199, ); - - #line 93 "smarty_internal_templateparser.y" - function yy_r0() - { - $this->_retvalue = $this->root_buffer->to_smarty_php(); - } - #line 2150 "smarty_internal_templateparser.php" - #line 101 "smarty_internal_templateparser.y" - function yy_r1() - { - if ($this->yystack[$this->yyidx + 0]->minor != null) { - $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor); +#line 95 "smarty_internal_templateparser.y" + function yy_r0(){ + $this->_retvalue = $this->root_buffer->to_smarty_php(); + } +#line 2185 "smarty_internal_templateparser.php" +#line 103 "smarty_internal_templateparser.y" + function yy_r1(){ + $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor); + } +#line 2190 "smarty_internal_templateparser.php" +#line 119 "smarty_internal_templateparser.y" + function yy_r4(){ + if ($this->compiler->has_code) { + $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array(); + $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode($tmp.$this->yystack[$this->yyidx + 0]->minor,true)); + } else { + $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor); + } + $this->compiler->has_variable_string = false; + $this->block_nesting_level = count($this->compiler->_tag_stack); + } +#line 2202 "smarty_internal_templateparser.php" +#line 131 "smarty_internal_templateparser.y" + function yy_r5(){ + $this->_retvalue = new _smarty_tag($this, ''); + } +#line 2207 "smarty_internal_templateparser.php" +#line 136 "smarty_internal_templateparser.y" + function yy_r6(){ + $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); + } +#line 2212 "smarty_internal_templateparser.php" +#line 141 "smarty_internal_templateparser.y" + function yy_r7(){ + if ($this->php_handling == Smarty::PHP_PASSTHRU) { + $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)); + } elseif ($this->php_handling == Smarty::PHP_QUOTE) { + $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES)); + } elseif ($this->php_handling == Smarty::PHP_ALLOW) { + if (!($this->smarty instanceof SmartyBC)) { + $this->compiler->trigger_template_error (self::Err3); } + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<?php', true)); + } elseif ($this->php_handling == Smarty::PHP_REMOVE) { + $this->_retvalue = new _smarty_text($this, ''); } - #line 2157 "smarty_internal_templateparser.php" - #line 108 "smarty_internal_templateparser.y" - function yy_r2() - { - if ($this->yystack[$this->yyidx + 0]->minor != null) { - // because of possible code injection - $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor); - } } - #line 2165 "smarty_internal_templateparser.php" - #line 122 "smarty_internal_templateparser.y" - function yy_r4() - { - if ($this->compiler->has_code) { - $tmp = ''; - foreach ($this->compiler->prefix_code as $code) { - $tmp .= $code; - } - $this->compiler->prefix_code = array(); - $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode($tmp . $this->yystack[$this->yyidx + - 1]->minor, true)); - } else { - $this->_retvalue = null; - } - $this->compiler->has_variable_string = false; - $this->block_nesting_level = count($this->compiler->_tag_stack); - } - #line 2177 "smarty_internal_templateparser.php" - #line 134 "smarty_internal_templateparser.y" - function yy_r5() - { - $this->_retvalue = null; - } - #line 2182 "smarty_internal_templateparser.php" - #line 139 "smarty_internal_templateparser.y" - function yy_r6() - { - $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); - } - #line 2187 "smarty_internal_templateparser.php" - #line 144 "smarty_internal_templateparser.y" - function yy_r7() - { - if (strpos($this->yystack[$this->yyidx + 0]->minor, '<s') === 0) { - $this->lex->is_phpScript = true; - } - if ($this->php_handling == Smarty::PHP_PASSTHRU) { - if ($this->lex->is_phpScript) { - $s = addcslashes($this->yystack[$this->yyidx + 0]->minor, "'"); - $this->_retvalue = new _smarty_text($this, $s); - } else { - $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); - } - } elseif ($this->php_handling == Smarty::PHP_QUOTE) { - $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES)); - } elseif ($this->php_handling == Smarty::PHP_ALLOW) { - if (!($this->smarty instanceof SmartyBC)) { - $this->compiler->trigger_template_error(self::Err3); - } - $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('<?php ', true)); - } elseif ($this->php_handling == Smarty::PHP_REMOVE) { - $this->_retvalue = null; - } - } - #line 2211 "smarty_internal_templateparser.php" - #line 168 "smarty_internal_templateparser.y" - function yy_r8() - { - if ($this->is_xml) { - $this->compiler->tag_nocache = true; - $this->is_xml = false; - $save = $this->template->has_nocache_code; - $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode("<?php echo '?>';?>\n", $this->compiler, true)); - $this->template->has_nocache_code = $save; - } elseif ($this->php_handling == Smarty::PHP_PASSTHRU) { - $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); - } elseif ($this->php_handling == Smarty::PHP_QUOTE) { - $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES)); - } elseif ($this->php_handling == Smarty::PHP_ALLOW) { - $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('?>', true)); - } elseif ($this->php_handling == Smarty::PHP_REMOVE) { - $this->_retvalue = null; - } - } - #line 2230 "smarty_internal_templateparser.php" - #line 186 "smarty_internal_templateparser.y" - function yy_r9() - { - if (!$this->lex->is_phpScript) { - $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); - } else { - $this->lex->is_phpScript = false; - if ($this->php_handling == Smarty::PHP_PASSTHRU) { - $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); - } elseif ($this->php_handling == Smarty::PHP_QUOTE) { - $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES)); - } elseif ($this->php_handling == Smarty::PHP_ALLOW) { - $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('?>', true)); - } elseif ($this->php_handling == Smarty::PHP_REMOVE) { - $this->_retvalue = null; - } - } - } - #line 2248 "smarty_internal_templateparser.php" - #line 204 "smarty_internal_templateparser.y" - function yy_r10() - { - if ($this->php_handling == Smarty::PHP_PASSTHRU) { - $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); - } elseif ($this->php_handling == Smarty::PHP_QUOTE) { - $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES)); - } elseif ($this->php_handling == Smarty::PHP_ALLOW) { - if ($this->asp_tags) { - if (!($this->smarty instanceof SmartyBC)) { - $this->compiler->trigger_template_error(self::Err3); - } - $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('<%', true)); - } else { - $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); - } - } elseif ($this->php_handling == Smarty::PHP_REMOVE) { - if ($this->asp_tags) { - $this->_retvalue = null; - } else { - $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); - } - } - } - #line 2272 "smarty_internal_templateparser.php" - #line 228 "smarty_internal_templateparser.y" - function yy_r11() - { - if ($this->php_handling == Smarty::PHP_PASSTHRU) { - $this->_retvalue = new _smarty_text($this, st); - } elseif ($this->php_handling == Smarty::PHP_QUOTE) { - $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES)); - } elseif ($this->php_handling == Smarty::PHP_ALLOW) { - if ($this->asp_tags) { - $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('%>', true)); - } else { - $this->_retvalue = new _smarty_text($this, st); - } - } elseif ($this->php_handling == Smarty::PHP_REMOVE) { - if ($this->asp_tags) { - $this->_retvalue = null; - } else { - $this->_retvalue = new _smarty_text($this, st); - } - } - } - #line 2293 "smarty_internal_templateparser.php" - #line 250 "smarty_internal_templateparser.y" - function yy_r12() - { +#line 2228 "smarty_internal_templateparser.php" +#line 157 "smarty_internal_templateparser.y" + function yy_r8(){ + if ($this->is_xml) { $this->compiler->tag_nocache = true; - $this->is_xml = true; + $this->is_xml = false; $save = $this->template->has_nocache_code; - $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true)); + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '?>';?>", $this->compiler, true)); $this->template->has_nocache_code = $save; - } - #line 2302 "smarty_internal_templateparser.php" - #line 259 "smarty_internal_templateparser.y" - function yy_r13() - { - if ($this->strip) { - $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor)); - } else { - $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); - } - } - #line 2311 "smarty_internal_templateparser.php" - #line 268 "smarty_internal_templateparser.y" - function yy_r14() - { - $this->strip = true; - } - #line 2316 "smarty_internal_templateparser.php" - #line 272 "smarty_internal_templateparser.y" - function yy_r15() - { - $this->strip = false; - } - #line 2321 "smarty_internal_templateparser.php" - #line 276 "smarty_internal_templateparser.y" - function yy_r16() - { - if ($this->strip) { - SMARTY_INTERNAL_COMPILE_BLOCK::blockSource($this->compiler, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor)); - } else { - SMARTY_INTERNAL_COMPILE_BLOCK::blockSource($this->compiler, $this->yystack[$this->yyidx + 0]->minor); - } - } - #line 2330 "smarty_internal_templateparser.php" - #line 285 "smarty_internal_templateparser.y" - function yy_r17() - { - $this->_retvalue = ''; - } - #line 2335 "smarty_internal_templateparser.php" - #line 289 "smarty_internal_templateparser.y" - function yy_r18() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor; - } - #line 2340 "smarty_internal_templateparser.php" - #line 293 "smarty_internal_templateparser.y" - function yy_r19() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2345 "smarty_internal_templateparser.php" - #line 301 "smarty_internal_templateparser.y" - function yy_r21() - { - $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; - } - #line 2350 "smarty_internal_templateparser.php" - #line 314 "smarty_internal_templateparser.y" - function yy_r23() - { - $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->yystack[$this->yyidx + 0]->minor)); - } - #line 2355 "smarty_internal_templateparser.php" - #line 318 "smarty_internal_templateparser.y" - function yy_r24() - { - $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor)); - } - #line 2360 "smarty_internal_templateparser.php" - #line 322 "smarty_internal_templateparser.y" - function yy_r25() - { - $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 1]->minor)); - } - #line 2365 "smarty_internal_templateparser.php" - #line 326 "smarty_internal_templateparser.y" - function yy_r26() - { - $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor)); - } - #line 2370 "smarty_internal_templateparser.php" - #line 339 "smarty_internal_templateparser.y" - function yy_r28() - { - $this->_retvalue = $this->compiler->compileTag('assign', array(array('value' => $this->yystack[$this->yyidx + 0]->minor), array('var' => "'" . $this->yystack[$this->yyidx + - 2]->minor . "'"))); - } - #line 2375 "smarty_internal_templateparser.php" - #line 347 "smarty_internal_templateparser.y" - function yy_r30() - { - $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor), array('var' => "'" . $this->yystack[$this->yyidx + - 3]->minor . "'")), $this->yystack[$this->yyidx + 0]->minor)); - } - #line 2380 "smarty_internal_templateparser.php" - #line 351 "smarty_internal_templateparser.y" - function yy_r31() - { - $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor), array('var' => $this->yystack[$this->yyidx + - 3]->minor['var'])), $this->yystack[$this->yyidx + 0]->minor), array('smarty_internal_index' => $this->yystack[$this->yyidx + - 3]->minor['smarty_internal_index'])); - } - #line 2385 "smarty_internal_templateparser.php" - #line 356 "smarty_internal_templateparser.y" - function yy_r32() - { - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor); - } - #line 2390 "smarty_internal_templateparser.php" - #line 360 "smarty_internal_templateparser.y" - function yy_r33() - { - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor, array()); - } - #line 2395 "smarty_internal_templateparser.php" - #line 365 "smarty_internal_templateparser.y" - function yy_r34() - { - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 1]->minor)); - } - #line 2400 "smarty_internal_templateparser.php" - #line 370 "smarty_internal_templateparser.y" - function yy_r35() - { - $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + 0]->minor) . '<?php echo '; - $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . '?>'; - } - #line 2406 "smarty_internal_templateparser.php" - #line 376 "smarty_internal_templateparser.y" - function yy_r36() - { - $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 4]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 2]->minor)) . '<?php echo '; - $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . '?>'; - } - #line 2412 "smarty_internal_templateparser.php" - #line 382 "smarty_internal_templateparser.y" - function yy_r37() - { - $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length)); - $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor)); - } - #line 2418 "smarty_internal_templateparser.php" - #line 387 "smarty_internal_templateparser.y" - function yy_r38() - { - $tag = trim(substr($this->yystack[$this->yyidx + - 2]->minor, $this->lex->ldel_length)); - $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, $this->yystack[$this->yyidx + 0]->minor, array('if condition' => $this->yystack[$this->yyidx + - 1]->minor)); - } - #line 2424 "smarty_internal_templateparser.php" - #line 392 "smarty_internal_templateparser.y" - function yy_r39() - { - $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length)); - $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor)); - } - #line 2430 "smarty_internal_templateparser.php" - #line 403 "smarty_internal_templateparser.y" - function yy_r41() - { - $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 9]->minor), array('ifexp' => $this->yystack[$this->yyidx + - 6]->minor), array('var' => $this->yystack[$this->yyidx + - 2]->minor), array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 1); - } - #line 2435 "smarty_internal_templateparser.php" - #line 407 "smarty_internal_templateparser.y" - function yy_r42() - { - $this->_retvalue = '=' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2440 "smarty_internal_templateparser.php" - #line 415 "smarty_internal_templateparser.y" - function yy_r44() - { - $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 3]->minor), array('to' => $this->yystack[$this->yyidx + - 1]->minor))), 0); - } - #line 2445 "smarty_internal_templateparser.php" - #line 419 "smarty_internal_templateparser.y" - function yy_r45() - { - $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 5]->minor), array('to' => $this->yystack[$this->yyidx + - 3]->minor), array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 0); - } - #line 2450 "smarty_internal_templateparser.php" - #line 424 "smarty_internal_templateparser.y" - function yy_r46() - { - $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[$this->yyidx + 0]->minor); - } - #line 2455 "smarty_internal_templateparser.php" - #line 429 "smarty_internal_templateparser.y" - function yy_r47() - { - $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 4]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor)))); - } - #line 2460 "smarty_internal_templateparser.php" - #line 433 "smarty_internal_templateparser.y" - function yy_r48() - { - $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 7]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor), array('key' => $this->yystack[$this->yyidx + - 4]->minor)))); - } - #line 2465 "smarty_internal_templateparser.php" - #line 446 "smarty_internal_templateparser.y" - function yy_r51() - { - $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array(array_merge(array($this->yystack[$this->yyidx + - 1]->minor), $this->yystack[$this->yyidx + 0]->minor)))); - } - #line 2470 "smarty_internal_templateparser.php" - #line 450 "smarty_internal_templateparser.y" - function yy_r52() - { - $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array_merge(array(array_merge(array($this->yystack[$this->yyidx + - 2]->minor), $this->yystack[$this->yyidx + - 1]->minor)), $this->yystack[$this->yyidx + 0]->minor))); - } - #line 2475 "smarty_internal_templateparser.php" - #line 455 "smarty_internal_templateparser.y" - function yy_r53() - { - $j = strrpos($this->yystack[$this->yyidx + 0]->minor, '.'); - if ($this->yystack[$this->yyidx + 0]->minor[$j + 1] == 'c') { - // {$smarty.block.child} - $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler); - } else { - // {$smarty.block.parent} - $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileParentBlock($this->compiler); - } - } - #line 2487 "smarty_internal_templateparser.php" - #line 468 "smarty_internal_templateparser.y" - function yy_r54() - { - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor . 'close', array()); - } - #line 2492 "smarty_internal_templateparser.php" - #line 472 "smarty_internal_templateparser.y" - function yy_r55() - { - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor . 'close', array(), array('modifier_list' => $this->yystack[$this->yyidx + 0]->minor)); - } - #line 2497 "smarty_internal_templateparser.php" - #line 477 "smarty_internal_templateparser.y" - function yy_r56() - { - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + 0]->minor)); - } - #line 2502 "smarty_internal_templateparser.php" - #line 481 "smarty_internal_templateparser.y" - function yy_r57() - { - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + - 1]->minor, 'modifier_list' => $this->yystack[$this->yyidx + 0]->minor)); - } - #line 2507 "smarty_internal_templateparser.php" - #line 489 "smarty_internal_templateparser.y" - function yy_r58() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor; - $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor; - } - #line 2513 "smarty_internal_templateparser.php" - #line 495 "smarty_internal_templateparser.y" - function yy_r59() - { - $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); - } - #line 2518 "smarty_internal_templateparser.php" - #line 500 "smarty_internal_templateparser.y" - function yy_r60() - { - $this->_retvalue = array(); - } - #line 2523 "smarty_internal_templateparser.php" - #line 505 "smarty_internal_templateparser.y" - function yy_r61() - { - if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => 'true'); - } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => 'false'); - } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => 'null'); - } else { - $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => "'" . $this->yystack[$this->yyidx + 0]->minor . "'"); - } - } - #line 2536 "smarty_internal_templateparser.php" - #line 517 "smarty_internal_templateparser.y" - function yy_r62() - { - $this->_retvalue = array(trim($this->yystack[$this->yyidx + - 1]->minor, " =\n\r\t") => $this->yystack[$this->yyidx + 0]->minor); - } - #line 2541 "smarty_internal_templateparser.php" - #line 525 "smarty_internal_templateparser.y" - function yy_r64() - { - $this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'"; - } - #line 2546 "smarty_internal_templateparser.php" - #line 537 "smarty_internal_templateparser.y" - function yy_r67() - { - $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => $this->yystack[$this->yyidx + 0]->minor); - } - #line 2551 "smarty_internal_templateparser.php" - #line 550 "smarty_internal_templateparser.y" - function yy_r69() - { - $this->yystack[$this->yyidx + - 2]->minor[] = $this->yystack[$this->yyidx + 0]->minor; - $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor; - } - #line 2557 "smarty_internal_templateparser.php" - #line 555 "smarty_internal_templateparser.y" - function yy_r70() - { - $this->_retvalue = array('var' => $this->yystack[$this->yyidx + - 2]->minor, 'value' => $this->yystack[$this->yyidx + 0]->minor); - } - #line 2562 "smarty_internal_templateparser.php" - #line 583 "smarty_internal_templateparser.y" - function yy_r75() - { - $this->_retvalue = '$_smarty_tpl->getStreamVariable(\'' . $this->yystack[$this->yyidx + - 2]->minor . '://' . $this->yystack[$this->yyidx + 0]->minor . '\')'; - } - #line 2567 "smarty_internal_templateparser.php" - #line 588 "smarty_internal_templateparser.y" - function yy_r76() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . trim($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2572 "smarty_internal_templateparser.php" - #line 607 "smarty_internal_templateparser.y" - function yy_r80() - { - $this->_retvalue = $this->compiler->compileTag('private_modifier', array(), array('value' => $this->yystack[$this->yyidx + - 1]->minor, 'modifierlist' => $this->yystack[$this->yyidx + 0]->minor)); - } - #line 2577 "smarty_internal_templateparser.php" - #line 613 "smarty_internal_templateparser.y" - function yy_r81() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2582 "smarty_internal_templateparser.php" - #line 617 "smarty_internal_templateparser.y" - function yy_r82() - { - $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor . ')'; - } - #line 2587 "smarty_internal_templateparser.php" - #line 621 "smarty_internal_templateparser.y" - function yy_r83() - { - $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',(array)' . $this->yystack[$this->yyidx + 0]->minor . ')'; - } - #line 2592 "smarty_internal_templateparser.php" - #line 629 "smarty_internal_templateparser.y" - function yy_r85() - { - $this->_retvalue = '!(' . $this->yystack[$this->yyidx + - 2]->minor . ' % ' . $this->yystack[$this->yyidx + 0]->minor . ')'; - } - #line 2597 "smarty_internal_templateparser.php" - #line 633 "smarty_internal_templateparser.y" - function yy_r86() - { - $this->_retvalue = '(' . $this->yystack[$this->yyidx + - 2]->minor . ' % ' . $this->yystack[$this->yyidx + 0]->minor . ')'; - } - #line 2602 "smarty_internal_templateparser.php" - #line 637 "smarty_internal_templateparser.y" - function yy_r87() - { - $this->_retvalue = '!(1 & ' . $this->yystack[$this->yyidx + - 1]->minor . ')'; - } - #line 2607 "smarty_internal_templateparser.php" - #line 641 "smarty_internal_templateparser.y" - function yy_r88() - { - $this->_retvalue = '(1 & ' . $this->yystack[$this->yyidx + - 1]->minor . ')'; - } - #line 2612 "smarty_internal_templateparser.php" - #line 645 "smarty_internal_templateparser.y" - function yy_r89() - { - $this->_retvalue = '!(1 & ' . $this->yystack[$this->yyidx + - 2]->minor . ' / ' . $this->yystack[$this->yyidx + 0]->minor . ')'; - } - #line 2617 "smarty_internal_templateparser.php" - #line 649 "smarty_internal_templateparser.y" - function yy_r90() - { - $this->_retvalue = '(1 & ' . $this->yystack[$this->yyidx + - 2]->minor . ' / ' . $this->yystack[$this->yyidx + 0]->minor . ')'; - } - #line 2622 "smarty_internal_templateparser.php" - #line 673 "smarty_internal_templateparser.y" - function yy_r96() - { - self::$prefix_number ++; - $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->yystack[$this->yyidx + 0]->minor . ';?>'; - $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . '$_tmp' . self::$prefix_number; - } - #line 2629 "smarty_internal_templateparser.php" - #line 682 "smarty_internal_templateparser.y" - function yy_r97() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 6]->minor . ' ? ' . $this->compileVariable("'" . $this->yystack[$this->yyidx + - 2]->minor . "'") . ' : ' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2634 "smarty_internal_templateparser.php" - #line 686 "smarty_internal_templateparser.y" - function yy_r98() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 5]->minor . ' ? ' . $this->yystack[$this->yyidx + - 2]->minor . ' : ' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2639 "smarty_internal_templateparser.php" - #line 701 "smarty_internal_templateparser.y" - function yy_r101() - { - $this->_retvalue = '!' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2644 "smarty_internal_templateparser.php" - #line 722 "smarty_internal_templateparser.y" - function yy_r106() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2649 "smarty_internal_templateparser.php" - #line 726 "smarty_internal_templateparser.y" - function yy_r107() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.'; - } - #line 2654 "smarty_internal_templateparser.php" - #line 730 "smarty_internal_templateparser.y" - function yy_r108() - { - $this->_retvalue = '.' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2659 "smarty_internal_templateparser.php" - #line 735 "smarty_internal_templateparser.y" - function yy_r109() - { - if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = 'true'; - } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = 'false'; - } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = 'null'; - } else { - $this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'"; - } - } - #line 2672 "smarty_internal_templateparser.php" - #line 753 "smarty_internal_templateparser.y" - function yy_r111() - { - $this->_retvalue = "(" . $this->yystack[$this->yyidx + - 1]->minor . ")"; - } - #line 2677 "smarty_internal_templateparser.php" - #line 768 "smarty_internal_templateparser.y" - function yy_r114() - { - if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + - 2]->minor, $this->compiler)) { - if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor])) { - $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor] . '::' . $this->yystack[$this->yyidx + 0]->minor; - } else { - $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '::' . $this->yystack[$this->yyidx + 0]->minor; + } elseif ($this->php_handling == Smarty::PHP_PASSTHRU) { + $this->_retvalue = new _smarty_text($this, '?<?php ?>>'); + } elseif ($this->php_handling == Smarty::PHP_QUOTE) { + $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES)); + } elseif ($this->php_handling == Smarty::PHP_ALLOW) { + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true)); + } elseif ($this->php_handling == Smarty::PHP_REMOVE) { + $this->_retvalue = new _smarty_text($this, ''); + } + } +#line 2247 "smarty_internal_templateparser.php" +#line 176 "smarty_internal_templateparser.y" + function yy_r9(){ + if ($this->php_handling == Smarty::PHP_PASSTHRU) { + $this->_retvalue = new _smarty_text($this, '<<?php ?>%'); + } elseif ($this->php_handling == Smarty::PHP_QUOTE) { + $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES)); + } elseif ($this->php_handling == Smarty::PHP_ALLOW) { + if ($this->asp_tags) { + if (!($this->smarty instanceof SmartyBC)) { + $this->compiler->trigger_template_error (self::Err3); } + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<%', true)); } else { - $this->compiler->trigger_template_error("static class '" . $this->yystack[$this->yyidx + - 2]->minor . "' is undefined or not allowed by security setting"); + $this->_retvalue = new _smarty_text($this, '<<?php ?>%'); } - } - #line 2690 "smarty_internal_templateparser.php" - #line 780 "smarty_internal_templateparser.y" - function yy_r115() - { - if ($this->yystack[$this->yyidx + - 2]->minor['var'] == '\'smarty\'') { - $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index']) . '::' . $this->yystack[$this->yyidx + 0]->minor; + } elseif ($this->php_handling == Smarty::PHP_REMOVE) { + if ($this->asp_tags) { + $this->_retvalue = new _smarty_text($this, ''); } else { - $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + - 2]->minor['var']) . $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index'] . '::' . $this->yystack[$this->yyidx + 0]->minor; + $this->_retvalue = new _smarty_text($this, '<<?php ?>%'); } } - #line 2699 "smarty_internal_templateparser.php" - #line 789 "smarty_internal_templateparser.y" - function yy_r116() - { - self::$prefix_number ++; - $this->compiler->prefix_code[] = '<?php ob_start();?>' . $this->yystack[$this->yyidx + - 1]->minor . '<?php $_tmp' . self::$prefix_number . '=ob_get_clean();?>'; - $this->_retvalue = '$_tmp' . self::$prefix_number; } - #line 2706 "smarty_internal_templateparser.php" - #line 804 "smarty_internal_templateparser.y" - function yy_r118() - { - if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') { - $smarty_var = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']); - $this->_retvalue = $smarty_var; +#line 2271 "smarty_internal_templateparser.php" +#line 200 "smarty_internal_templateparser.y" + function yy_r10(){ + if ($this->php_handling == Smarty::PHP_PASSTHRU) { + $this->_retvalue = new _smarty_text($this, '%<?php ?>>'); + } elseif ($this->php_handling == Smarty::PHP_QUOTE) { + $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES)); + } elseif ($this->php_handling == Smarty::PHP_ALLOW) { + if ($this->asp_tags) { + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('%>', true)); } else { - // used for array reset,next,prev,end,current - $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var']; - $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']; - $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']) . $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']; + $this->_retvalue = new _smarty_text($this, '%<?php ?>>'); } - } - #line 2719 "smarty_internal_templateparser.php" - #line 817 "smarty_internal_templateparser.y" - function yy_r119() - { - $this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[$this->yyidx + - 2]->minor . ']->' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2724 "smarty_internal_templateparser.php" - #line 827 "smarty_internal_templateparser.y" - function yy_r121() - { - $this->_retvalue = '$_smarty_tpl->getConfigVariable(\'' . $this->yystack[$this->yyidx + - 1]->minor . '\')'; - } - #line 2729 "smarty_internal_templateparser.php" - #line 831 "smarty_internal_templateparser.y" - function yy_r122() - { - $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable(\'' . $this->yystack[$this->yyidx + - 2]->minor . '\')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' :null)'; - } - #line 2734 "smarty_internal_templateparser.php" - #line 835 "smarty_internal_templateparser.y" - function yy_r123() - { - $this->_retvalue = '$_smarty_tpl->getConfigVariable(' . $this->yystack[$this->yyidx + - 1]->minor . ')'; - } - #line 2739 "smarty_internal_templateparser.php" - #line 839 "smarty_internal_templateparser.y" - function yy_r124() - { - $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable(' . $this->yystack[$this->yyidx + - 2]->minor . ')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' : null)'; - } - #line 2744 "smarty_internal_templateparser.php" - #line 843 "smarty_internal_templateparser.y" - function yy_r125() - { - $this->_retvalue = array('var' => $this->yystack[$this->yyidx + - 1]->minor, 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor); - } - #line 2749 "smarty_internal_templateparser.php" - #line 856 "smarty_internal_templateparser.y" - function yy_r127() - { - return; - } - #line 2754 "smarty_internal_templateparser.php" - #line 862 "smarty_internal_templateparser.y" - function yy_r128() - { - $this->_retvalue = '[' . $this->compileVariable($this->yystack[$this->yyidx + 0]->minor) . ']'; - } - #line 2759 "smarty_internal_templateparser.php" - #line 866 "smarty_internal_templateparser.y" - function yy_r129() - { - $this->_retvalue = '[' . $this->compileVariable($this->yystack[$this->yyidx + - 2]->minor) . '->' . $this->yystack[$this->yyidx + 0]->minor . ']'; - } - #line 2764 "smarty_internal_templateparser.php" - #line 870 "smarty_internal_templateparser.y" - function yy_r130() - { - $this->_retvalue = "['" . $this->yystack[$this->yyidx + 0]->minor . "']"; - } - #line 2769 "smarty_internal_templateparser.php" - #line 874 "smarty_internal_templateparser.y" - function yy_r131() - { - $this->_retvalue = "[" . $this->yystack[$this->yyidx + 0]->minor . "]"; - } - #line 2774 "smarty_internal_templateparser.php" - #line 878 "smarty_internal_templateparser.y" - function yy_r132() - { - $this->_retvalue = "[" . $this->yystack[$this->yyidx + - 1]->minor . "]"; - } - #line 2779 "smarty_internal_templateparser.php" - #line 883 "smarty_internal_templateparser.y" - function yy_r133() - { - $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\'][\'index\']') . ']'; - } - #line 2784 "smarty_internal_templateparser.php" - #line 887 "smarty_internal_templateparser.y" - function yy_r134() - { - $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 3]->minor . '\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\']') . ']'; - } - #line 2789 "smarty_internal_templateparser.php" - #line 897 "smarty_internal_templateparser.y" - function yy_r136() - { - $this->_retvalue = '[]'; - } - #line 2794 "smarty_internal_templateparser.php" - #line 910 "smarty_internal_templateparser.y" - function yy_r138() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2799 "smarty_internal_templateparser.php" - #line 915 "smarty_internal_templateparser.y" - function yy_r139() - { - $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\''; - } - #line 2804 "smarty_internal_templateparser.php" - #line 920 "smarty_internal_templateparser.y" - function yy_r140() - { - $this->_retvalue = '(' . $this->yystack[$this->yyidx + - 1]->minor . ')'; - } - #line 2809 "smarty_internal_templateparser.php" - #line 927 "smarty_internal_templateparser.y" - function yy_r141() - { - if ($this->yystack[$this->yyidx + - 1]->minor['var'] == '\'smarty\'') { - $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + - 1]->minor['smarty_internal_index']) . $this->yystack[$this->yyidx + 0]->minor; + } elseif ($this->php_handling == Smarty::PHP_REMOVE) { + if ($this->asp_tags) { + $this->_retvalue = new _smarty_text($this, ''); } else { - $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + - 1]->minor['var']) . $this->yystack[$this->yyidx + - 1]->minor['smarty_internal_index'] . $this->yystack[$this->yyidx + 0]->minor; + $this->_retvalue = new _smarty_text($this, '%<?php ?>>'); } } - #line 2818 "smarty_internal_templateparser.php" - #line 936 "smarty_internal_templateparser.y" - function yy_r142() - { - $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } - #line 2823 "smarty_internal_templateparser.php" - #line 941 "smarty_internal_templateparser.y" - function yy_r143() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2828 "smarty_internal_templateparser.php" - #line 946 "smarty_internal_templateparser.y" - function yy_r144() - { - if ($this->security && substr($this->yystack[$this->yyidx + - 1]->minor, 0, 1) == '_') { - $this->compiler->trigger_template_error(self::Err1); - } - $this->_retvalue = '->' . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2836 "smarty_internal_templateparser.php" - #line 953 "smarty_internal_templateparser.y" - function yy_r145() - { - if ($this->security) { - $this->compiler->trigger_template_error(self::Err2); - } - $this->_retvalue = '->{' . $this->compileVariable($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor . '}'; +#line 2292 "smarty_internal_templateparser.php" +#line 220 "smarty_internal_templateparser.y" + function yy_r11(){ + if ($this->strip) { + $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor))); + } else { + $this->_retvalue = new _smarty_text($this, self::escape_start_tag(�)); + } + } +#line 2301 "smarty_internal_templateparser.php" +#line 229 "smarty_internal_templateparser.y" + function yy_r12(){ + $this->compiler->tag_nocache = true; + $this->is_xml = true; + $save = $this->template->has_nocache_code; + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true)); + $this->template->has_nocache_code = $save; + } +#line 2310 "smarty_internal_templateparser.php" +#line 238 "smarty_internal_templateparser.y" + function yy_r13(){ + if ($this->strip) { + $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor)); + } else { + $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); } - #line 2844 "smarty_internal_templateparser.php" - #line 960 "smarty_internal_templateparser.y" - function yy_r146() - { - if ($this->security) { - $this->compiler->trigger_template_error(self::Err2); - } - $this->_retvalue = '->{' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}'; } - #line 2852 "smarty_internal_templateparser.php" - #line 967 "smarty_internal_templateparser.y" - function yy_r147() - { - if ($this->security) { - $this->compiler->trigger_template_error(self::Err2); +#line 2319 "smarty_internal_templateparser.php" +#line 247 "smarty_internal_templateparser.y" + function yy_r14(){ + $this->strip = true; + $this->_retvalue = new _smarty_text($this, ''); + } +#line 2325 "smarty_internal_templateparser.php" +#line 252 "smarty_internal_templateparser.y" + function yy_r15(){ + $this->strip = false; + $this->_retvalue = new _smarty_text($this, ''); + } +#line 2331 "smarty_internal_templateparser.php" +#line 258 "smarty_internal_templateparser.y" + function yy_r16(){ + $this->_retvalue = ''; + } +#line 2336 "smarty_internal_templateparser.php" +#line 262 "smarty_internal_templateparser.y" + function yy_r17(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; + } +#line 2341 "smarty_internal_templateparser.php" +#line 266 "smarty_internal_templateparser.y" + function yy_r18(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2346 "smarty_internal_templateparser.php" +#line 274 "smarty_internal_templateparser.y" + function yy_r20(){ + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; + } +#line 2351 "smarty_internal_templateparser.php" +#line 282 "smarty_internal_templateparser.y" + function yy_r22(){ + $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor); + } +#line 2356 "smarty_internal_templateparser.php" +#line 290 "smarty_internal_templateparser.y" + function yy_r24(){ + $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor); + } +#line 2361 "smarty_internal_templateparser.php" +#line 294 "smarty_internal_templateparser.y" + function yy_r25(){ + $this->_retvalue = '<<?php ?>%'; + } +#line 2366 "smarty_internal_templateparser.php" +#line 298 "smarty_internal_templateparser.y" + function yy_r26(){ + $this->_retvalue = '%<?php ?>>'; + } +#line 2371 "smarty_internal_templateparser.php" +#line 307 "smarty_internal_templateparser.y" + function yy_r27(){ + $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor)); + } +#line 2376 "smarty_internal_templateparser.php" +#line 311 "smarty_internal_templateparser.y" + function yy_r28(){ + $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor)); + } +#line 2381 "smarty_internal_templateparser.php" +#line 315 "smarty_internal_templateparser.y" + function yy_r29(){ + $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor)); + } +#line 2386 "smarty_internal_templateparser.php" +#line 319 "smarty_internal_templateparser.y" + function yy_r30(){ + $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor,'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor)); + } +#line 2391 "smarty_internal_templateparser.php" +#line 332 "smarty_internal_templateparser.y" + function yy_r32(){ + $this->_retvalue = $this->compiler->compileTag('assign',array(array('value'=>$this->yystack[$this->yyidx + -1]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -3]->minor."'"))); + } +#line 2396 "smarty_internal_templateparser.php" +#line 340 "smarty_internal_templateparser.y" + function yy_r34(){ + $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -4]->minor."'")),$this->yystack[$this->yyidx + -1]->minor)); + } +#line 2401 "smarty_internal_templateparser.php" +#line 344 "smarty_internal_templateparser.y" + function yy_r35(){ + $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>$this->yystack[$this->yyidx + -4]->minor['var'])),$this->yystack[$this->yyidx + -1]->minor),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -4]->minor['smarty_internal_index'])); + } +#line 2406 "smarty_internal_templateparser.php" +#line 349 "smarty_internal_templateparser.y" + function yy_r36(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + -1]->minor); + } +#line 2411 "smarty_internal_templateparser.php" +#line 353 "smarty_internal_templateparser.y" + function yy_r37(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,array()); + } +#line 2416 "smarty_internal_templateparser.php" +#line 358 "smarty_internal_templateparser.y" + function yy_r38(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor)); + } +#line 2421 "smarty_internal_templateparser.php" +#line 363 "smarty_internal_templateparser.y" + function yy_r39(){ + $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + -1]->minor).'<?php echo '; + $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>'; + } +#line 2427 "smarty_internal_templateparser.php" +#line 369 "smarty_internal_templateparser.y" + function yy_r40(){ + $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -5]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -3]->minor)).'<?php echo '; + $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>'; + } +#line 2433 "smarty_internal_templateparser.php" +#line 375 "smarty_internal_templateparser.y" + function yy_r41(){ + $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length)); + $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor)); + } +#line 2439 "smarty_internal_templateparser.php" +#line 380 "smarty_internal_templateparser.y" + function yy_r42(){ + $tag = trim(substr($this->yystack[$this->yyidx + -3]->minor,$this->lex->ldel_length)); + $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + -1]->minor,array('if condition'=>$this->yystack[$this->yyidx + -2]->minor)); + } +#line 2445 "smarty_internal_templateparser.php" +#line 385 "smarty_internal_templateparser.y" + function yy_r43(){ + $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length)); + $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor)); + } +#line 2451 "smarty_internal_templateparser.php" +#line 396 "smarty_internal_templateparser.y" + function yy_r45(){ + $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -10]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -7]->minor),array('var'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),1); + } +#line 2456 "smarty_internal_templateparser.php" +#line 400 "smarty_internal_templateparser.y" + function yy_r46(){ + $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2461 "smarty_internal_templateparser.php" +#line 408 "smarty_internal_templateparser.y" + function yy_r48(){ + $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -4]->minor),array('to'=>$this->yystack[$this->yyidx + -2]->minor))),0); + } +#line 2466 "smarty_internal_templateparser.php" +#line 412 "smarty_internal_templateparser.y" + function yy_r49(){ + $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('to'=>$this->yystack[$this->yyidx + -4]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),0); + } +#line 2471 "smarty_internal_templateparser.php" +#line 417 "smarty_internal_templateparser.y" + function yy_r50(){ + $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + -1]->minor); + } +#line 2476 "smarty_internal_templateparser.php" +#line 422 "smarty_internal_templateparser.y" + function yy_r51(){ + $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor)))); + } +#line 2481 "smarty_internal_templateparser.php" +#line 426 "smarty_internal_templateparser.y" + function yy_r52(){ + $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor)))); + } +#line 2486 "smarty_internal_templateparser.php" +#line 430 "smarty_internal_templateparser.y" + function yy_r53(){ + $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor)))); + } +#line 2491 "smarty_internal_templateparser.php" +#line 434 "smarty_internal_templateparser.y" + function yy_r54(){ + $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor)))); + } +#line 2496 "smarty_internal_templateparser.php" +#line 439 "smarty_internal_templateparser.y" + function yy_r55(){ + $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor)))); + } +#line 2501 "smarty_internal_templateparser.php" +#line 443 "smarty_internal_templateparser.y" + function yy_r56(){ + $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -3]->minor),$this->yystack[$this->yyidx + -2]->minor)),$this->yystack[$this->yyidx + -1]->minor))); + } +#line 2506 "smarty_internal_templateparser.php" +#line 448 "smarty_internal_templateparser.y" + function yy_r57(){ + $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler); + } +#line 2511 "smarty_internal_templateparser.php" +#line 454 "smarty_internal_templateparser.y" + function yy_r58(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array()); + } +#line 2516 "smarty_internal_templateparser.php" +#line 458 "smarty_internal_templateparser.y" + function yy_r59(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + -1]->minor)); + } +#line 2521 "smarty_internal_templateparser.php" +#line 463 "smarty_internal_templateparser.y" + function yy_r60(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor)); + } +#line 2526 "smarty_internal_templateparser.php" +#line 467 "smarty_internal_templateparser.y" + function yy_r61(){ + $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + -1]->minor)); + } +#line 2531 "smarty_internal_templateparser.php" +#line 475 "smarty_internal_templateparser.y" + function yy_r62(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; + $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor; + } +#line 2537 "smarty_internal_templateparser.php" +#line 481 "smarty_internal_templateparser.y" + function yy_r63(){ + $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); + } +#line 2542 "smarty_internal_templateparser.php" +#line 486 "smarty_internal_templateparser.y" + function yy_r64(){ + $this->_retvalue = array(); + } +#line 2547 "smarty_internal_templateparser.php" +#line 491 "smarty_internal_templateparser.y" + function yy_r65(){ + if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'true'); + } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'false'); + } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'null'); + } else { + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>"'".$this->yystack[$this->yyidx + 0]->minor."'"); + } + } +#line 2560 "smarty_internal_templateparser.php" +#line 503 "smarty_internal_templateparser.y" + function yy_r66(){ + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor); + } +#line 2565 "smarty_internal_templateparser.php" +#line 511 "smarty_internal_templateparser.y" + function yy_r68(){ + $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'"; + } +#line 2570 "smarty_internal_templateparser.php" +#line 536 "smarty_internal_templateparser.y" + function yy_r73(){ + $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor; + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor; + } +#line 2576 "smarty_internal_templateparser.php" +#line 541 "smarty_internal_templateparser.y" + function yy_r74(){ + $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor); + } +#line 2581 "smarty_internal_templateparser.php" +#line 569 "smarty_internal_templateparser.y" + function yy_r79(){ + $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')'; + } +#line 2586 "smarty_internal_templateparser.php" +#line 574 "smarty_internal_templateparser.y" + function yy_r80(){ + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor; + } +#line 2591 "smarty_internal_templateparser.php" +#line 593 "smarty_internal_templateparser.y" + function yy_r84(){ + $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor)); + } +#line 2596 "smarty_internal_templateparser.php" +#line 599 "smarty_internal_templateparser.y" + function yy_r85(){ + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2601 "smarty_internal_templateparser.php" +#line 603 "smarty_internal_templateparser.y" + function yy_r86(){ + $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')'; + } +#line 2606 "smarty_internal_templateparser.php" +#line 607 "smarty_internal_templateparser.y" + function yy_r87(){ + $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')'; + } +#line 2611 "smarty_internal_templateparser.php" +#line 615 "smarty_internal_templateparser.y" + function yy_r89(){ + $this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')'; + } +#line 2616 "smarty_internal_templateparser.php" +#line 619 "smarty_internal_templateparser.y" + function yy_r90(){ + $this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')'; + } +#line 2621 "smarty_internal_templateparser.php" +#line 623 "smarty_internal_templateparser.y" + function yy_r91(){ + $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')'; + } +#line 2626 "smarty_internal_templateparser.php" +#line 627 "smarty_internal_templateparser.y" + function yy_r92(){ + $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')'; + } +#line 2631 "smarty_internal_templateparser.php" +#line 631 "smarty_internal_templateparser.y" + function yy_r93(){ + $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')'; + } +#line 2636 "smarty_internal_templateparser.php" +#line 635 "smarty_internal_templateparser.y" + function yy_r94(){ + $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')'; + } +#line 2641 "smarty_internal_templateparser.php" +#line 659 "smarty_internal_templateparser.y" + function yy_r100(){ + $this->prefix_number++; + $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>'; + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number; + } +#line 2648 "smarty_internal_templateparser.php" +#line 668 "smarty_internal_templateparser.y" + function yy_r101(){ + $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.' ? '. $this->compileVariable("'".$this->yystack[$this->yyidx + -2]->minor."'") . ' : '.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2653 "smarty_internal_templateparser.php" +#line 672 "smarty_internal_templateparser.y" + function yy_r102(){ + $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2658 "smarty_internal_templateparser.php" +#line 687 "smarty_internal_templateparser.y" + function yy_r105(){ + $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2663 "smarty_internal_templateparser.php" +#line 708 "smarty_internal_templateparser.y" + function yy_r110(){ + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2668 "smarty_internal_templateparser.php" +#line 712 "smarty_internal_templateparser.y" + function yy_r111(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'; + } +#line 2673 "smarty_internal_templateparser.php" +#line 716 "smarty_internal_templateparser.y" + function yy_r112(){ + $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2678 "smarty_internal_templateparser.php" +#line 721 "smarty_internal_templateparser.y" + function yy_r113(){ + if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = 'true'; + } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = 'false'; + } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = 'null'; + } else { + $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'"; + } + } +#line 2691 "smarty_internal_templateparser.php" +#line 739 "smarty_internal_templateparser.y" + function yy_r115(){ + $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")"; + } +#line 2696 "smarty_internal_templateparser.php" +#line 754 "smarty_internal_templateparser.y" + function yy_r118(){ + if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->minor, $this->compiler)) { + if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) { + $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor; + } else { + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor; } - $this->_retvalue = '->{\'' . $this->yystack[$this->yyidx + - 4]->minor . '\'.' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}'; - } - #line 2860 "smarty_internal_templateparser.php" - #line 975 "smarty_internal_templateparser.y" - function yy_r148() - { - $this->_retvalue = '->' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2865 "smarty_internal_templateparser.php" - #line 983 "smarty_internal_templateparser.y" - function yy_r149() - { - if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + - 3]->minor, $this->compiler)) { - if (strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'array') === 0 || is_callable($this->yystack[$this->yyidx + - 3]->minor)) { - $func_name = strtolower($this->yystack[$this->yyidx + - 3]->minor); - if ($func_name == 'isset') { - if (count($this->yystack[$this->yyidx + - 1]->minor) == 0) { - $this->compiler->trigger_template_error('Illegal number of paramer in "isset()"'); - } - $par = implode(',', $this->yystack[$this->yyidx + - 1]->minor); - if (strncasecmp($par, '$_smarty_tpl->getConfigVariable', strlen('$_smarty_tpl->getConfigVariable')) === 0) { - self::$prefix_number ++; - $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . str_replace(')', ', false)', $par) . ';?>'; - $isset_par = '$_tmp' . self::$prefix_number; - } else { - $isset_par = str_replace("')->value", "',null,true,false)->value", $par); - } - $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . $isset_par . ")"; - } elseif (in_array($func_name, array('empty', 'reset', 'current', 'end', 'prev', 'next'))) { - if (count($this->yystack[$this->yyidx + - 1]->minor) != 1) { - $this->compiler->trigger_template_error('Illegal number of paramer in "empty()"'); - } - if ($func_name == 'empty') { - $this->_retvalue = $func_name . '(' . str_replace("')->value", "',null,true,false)->value", $this->yystack[$this->yyidx + - 1]->minor[0]) . ')'; - } else { - $this->_retvalue = $func_name . '(' . $this->yystack[$this->yyidx + - 1]->minor[0] . ')'; - } + } else { + $this->compiler->trigger_template_error ("static class '".$this->yystack[$this->yyidx + -2]->minor."' is undefined or not allowed by security setting"); + } + } +#line 2709 "smarty_internal_templateparser.php" +#line 766 "smarty_internal_templateparser.y" + function yy_r119(){ + if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') { + $this->_retvalue = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).'::'.$this->yystack[$this->yyidx + 0]->minor; + } else { + $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].'::'.$this->yystack[$this->yyidx + 0]->minor; + } + } +#line 2718 "smarty_internal_templateparser.php" +#line 775 "smarty_internal_templateparser.y" + function yy_r120(){ + $this->prefix_number++; + $this->compiler->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + 0]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>'; + $this->_retvalue = '$_tmp'.$this->prefix_number; + } +#line 2725 "smarty_internal_templateparser.php" +#line 790 "smarty_internal_templateparser.y" + function yy_r122(){ + if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') { + $smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']); + $this->_retvalue = $smarty_var; + } else { + // used for array reset,next,prev,end,current + $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var']; + $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']; + $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']; + } + } +#line 2738 "smarty_internal_templateparser.php" +#line 803 "smarty_internal_templateparser.y" + function yy_r123(){ + $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2743 "smarty_internal_templateparser.php" +#line 813 "smarty_internal_templateparser.y" + function yy_r125(){ + $this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')'; + } +#line 2748 "smarty_internal_templateparser.php" +#line 817 "smarty_internal_templateparser.y" + function yy_r126(){ + $this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')'; + } +#line 2753 "smarty_internal_templateparser.php" +#line 821 "smarty_internal_templateparser.y" + function yy_r127(){ + $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor); + } +#line 2758 "smarty_internal_templateparser.php" +#line 834 "smarty_internal_templateparser.y" + function yy_r129(){ + return; + } +#line 2763 "smarty_internal_templateparser.php" +#line 840 "smarty_internal_templateparser.y" + function yy_r130(){ + $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + 0]->minor).']'; + } +#line 2768 "smarty_internal_templateparser.php" +#line 844 "smarty_internal_templateparser.y" + function yy_r131(){ + $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']'; + } +#line 2773 "smarty_internal_templateparser.php" +#line 848 "smarty_internal_templateparser.y" + function yy_r132(){ + $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']"; + } +#line 2778 "smarty_internal_templateparser.php" +#line 852 "smarty_internal_templateparser.y" + function yy_r133(){ + $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]"; + } +#line 2783 "smarty_internal_templateparser.php" +#line 856 "smarty_internal_templateparser.y" + function yy_r134(){ + $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]"; + } +#line 2788 "smarty_internal_templateparser.php" +#line 861 "smarty_internal_templateparser.y" + function yy_r135(){ + $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']'; + } +#line 2793 "smarty_internal_templateparser.php" +#line 865 "smarty_internal_templateparser.y" + function yy_r136(){ + $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']'; + } +#line 2798 "smarty_internal_templateparser.php" +#line 875 "smarty_internal_templateparser.y" + function yy_r138(){ + $this->_retvalue = '[]'; + } +#line 2803 "smarty_internal_templateparser.php" +#line 888 "smarty_internal_templateparser.y" + function yy_r140(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2808 "smarty_internal_templateparser.php" +#line 893 "smarty_internal_templateparser.y" + function yy_r141(){ + $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\''; + } +#line 2813 "smarty_internal_templateparser.php" +#line 898 "smarty_internal_templateparser.y" + function yy_r142(){ + $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')'; + } +#line 2818 "smarty_internal_templateparser.php" +#line 905 "smarty_internal_templateparser.y" + function yy_r143(){ + if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') { + $this->_retvalue = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor; + } else { + $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor; + } + } +#line 2827 "smarty_internal_templateparser.php" +#line 914 "smarty_internal_templateparser.y" + function yy_r144(){ + $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; + } +#line 2832 "smarty_internal_templateparser.php" +#line 919 "smarty_internal_templateparser.y" + function yy_r145(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2837 "smarty_internal_templateparser.php" +#line 924 "smarty_internal_templateparser.y" + function yy_r146(){ + if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) == '_') { + $this->compiler->trigger_template_error (self::Err1); + } + $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2845 "smarty_internal_templateparser.php" +#line 931 "smarty_internal_templateparser.y" + function yy_r147(){ + if ($this->security) { + $this->compiler->trigger_template_error (self::Err2); + } + $this->_retvalue = '->{'.$this->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}'; + } +#line 2853 "smarty_internal_templateparser.php" +#line 938 "smarty_internal_templateparser.y" + function yy_r148(){ + if ($this->security) { + $this->compiler->trigger_template_error (self::Err2); + } + $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}'; + } +#line 2861 "smarty_internal_templateparser.php" +#line 945 "smarty_internal_templateparser.y" + function yy_r149(){ + if ($this->security) { + $this->compiler->trigger_template_error (self::Err2); + } + $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}'; + } +#line 2869 "smarty_internal_templateparser.php" +#line 953 "smarty_internal_templateparser.y" + function yy_r150(){ + $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2874 "smarty_internal_templateparser.php" +#line 961 "smarty_internal_templateparser.y" + function yy_r151(){ + if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) { + if (strcasecmp($this->yystack[$this->yyidx + -3]->minor,'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'array') === 0 || is_callable($this->yystack[$this->yyidx + -3]->minor)) { + $func_name = strtolower($this->yystack[$this->yyidx + -3]->minor); + if ($func_name == 'isset') { + if (count($this->yystack[$this->yyidx + -1]->minor) == 0) { + $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"'); + } + $par = implode(',',$this->yystack[$this->yyidx + -1]->minor); + if (strncasecmp($par,'$_smarty_tpl->getConfigVariable',strlen('$_smarty_tpl->getConfigVariable')) === 0) { + $this->prefix_number++; + $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.str_replace(')',', false)',$par).';?>'; + $isset_par = '$_tmp'.$this->prefix_number; } else { - $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ")"; + $isset_par=str_replace("')->value","',null,true,false)->value",$par); + } + $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $isset_par .")"; + } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){ + if (count($this->yystack[$this->yyidx + -1]->minor) != 1) { + $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"'); + } + if ($func_name == 'empty') { + $this->_retvalue = $func_name.'('.str_replace("')->value","',null,true,false)->value",$this->yystack[$this->yyidx + -1]->minor[0]).')'; + } else { + $this->_retvalue = $func_name.'('.$this->yystack[$this->yyidx + -1]->minor[0].')'; } } else { - $this->compiler->trigger_template_error("unknown function \"" . $this->yystack[$this->yyidx + - 3]->minor . "\""); + $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")"; } + } else { + $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\""); } } - #line 2901 "smarty_internal_templateparser.php" - #line 1021 "smarty_internal_templateparser.y" - function yy_r150() - { - if ($this->security && substr($this->yystack[$this->yyidx + - 3]->minor, 0, 1) == '_') { - $this->compiler->trigger_template_error(self::Err1); - } - $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ")"; - } - #line 2909 "smarty_internal_templateparser.php" - #line 1028 "smarty_internal_templateparser.y" - function yy_r151() - { - if ($this->security) { - $this->compiler->trigger_template_error(self::Err2); - } - self::$prefix_number ++; - $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->compileVariable("'" . $this->yystack[$this->yyidx + - 3]->minor . "'") . ';?>'; - $this->_retvalue = '$_tmp' . self::$prefix_number . '(' . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ')'; - } - #line 2919 "smarty_internal_templateparser.php" - #line 1039 "smarty_internal_templateparser.y" - function yy_r152() - { - $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array($this->yystack[$this->yyidx + 0]->minor)); - } - #line 2924 "smarty_internal_templateparser.php" - #line 1056 "smarty_internal_templateparser.y" - function yy_r155() - { - $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor))); - } - #line 2929 "smarty_internal_templateparser.php" - #line 1060 "smarty_internal_templateparser.y" - function yy_r156() - { - $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor)); - } - #line 2934 "smarty_internal_templateparser.php" - #line 1068 "smarty_internal_templateparser.y" - function yy_r158() - { - $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); - } - #line 2939 "smarty_internal_templateparser.php" - #line 1076 "smarty_internal_templateparser.y" - function yy_r159() - { - $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor); - } - #line 2944 "smarty_internal_templateparser.php" - #line 1110 "smarty_internal_templateparser.y" - function yy_r166() - { - $this->_retvalue = '$' . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2949 "smarty_internal_templateparser.php" - #line 1115 "smarty_internal_templateparser.y" - function yy_r167() - { - $this->_retvalue = '$' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor; - } - #line 2954 "smarty_internal_templateparser.php" - #line 1121 "smarty_internal_templateparser.y" - function yy_r168() - { - $this->_retvalue = '=='; - } - #line 2959 "smarty_internal_templateparser.php" - #line 1125 "smarty_internal_templateparser.y" - function yy_r169() - { - $this->_retvalue = '!='; - } - #line 2964 "smarty_internal_templateparser.php" - #line 1129 "smarty_internal_templateparser.y" - function yy_r170() - { - $this->_retvalue = '>'; - } - #line 2969 "smarty_internal_templateparser.php" - #line 1133 "smarty_internal_templateparser.y" - function yy_r171() - { - $this->_retvalue = '<'; - } - #line 2974 "smarty_internal_templateparser.php" - #line 1137 "smarty_internal_templateparser.y" - function yy_r172() - { - $this->_retvalue = '>='; - } - #line 2979 "smarty_internal_templateparser.php" - #line 1141 "smarty_internal_templateparser.y" - function yy_r173() - { - $this->_retvalue = '<='; - } - #line 2984 "smarty_internal_templateparser.php" - #line 1145 "smarty_internal_templateparser.y" - function yy_r174() - { - $this->_retvalue = '==='; - } - #line 2989 "smarty_internal_templateparser.php" - #line 1149 "smarty_internal_templateparser.y" - function yy_r175() - { - $this->_retvalue = '!=='; - } - #line 2994 "smarty_internal_templateparser.php" - #line 1153 "smarty_internal_templateparser.y" - function yy_r176() - { - $this->_retvalue = '%'; - } - #line 2999 "smarty_internal_templateparser.php" - #line 1157 "smarty_internal_templateparser.y" - function yy_r177() - { - $this->_retvalue = '&&'; - } - #line 3004 "smarty_internal_templateparser.php" - #line 1161 "smarty_internal_templateparser.y" - function yy_r178() - { - $this->_retvalue = '||'; - } - #line 3009 "smarty_internal_templateparser.php" - #line 1165 "smarty_internal_templateparser.y" - function yy_r179() - { - $this->_retvalue = ' XOR '; - } - #line 3014 "smarty_internal_templateparser.php" - #line 1172 "smarty_internal_templateparser.y" - function yy_r180() - { - $this->_retvalue = 'array(' . $this->yystack[$this->yyidx + - 1]->minor . ')'; - } - #line 3019 "smarty_internal_templateparser.php" - #line 1180 "smarty_internal_templateparser.y" - function yy_r182() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 3024 "smarty_internal_templateparser.php" - #line 1188 "smarty_internal_templateparser.y" - function yy_r184() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '=>' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 3029 "smarty_internal_templateparser.php" - #line 1192 "smarty_internal_templateparser.y" - function yy_r185() - { - $this->_retvalue = '\'' . $this->yystack[$this->yyidx + - 2]->minor . '\'=>' . $this->yystack[$this->yyidx + 0]->minor; - } - #line 3034 "smarty_internal_templateparser.php" - #line 1204 "smarty_internal_templateparser.y" - function yy_r187() - { - $this->_retvalue = "''"; - } - #line 3039 "smarty_internal_templateparser.php" - #line 1208 "smarty_internal_templateparser.y" - function yy_r188() - { - $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor->to_smarty_php(); - } - #line 3044 "smarty_internal_templateparser.php" - #line 1213 "smarty_internal_templateparser.y" - function yy_r189() - { - $this->yystack[$this->yyidx + - 1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor); - $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor; - } - #line 3050 "smarty_internal_templateparser.php" - #line 1218 "smarty_internal_templateparser.y" - function yy_r190() - { - $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor); - } - #line 3055 "smarty_internal_templateparser.php" - #line 1222 "smarty_internal_templateparser.y" - function yy_r191() - { - $this->_retvalue = new _smarty_code($this, '(string)' . $this->yystack[$this->yyidx + - 1]->minor); - } - #line 3060 "smarty_internal_templateparser.php" - #line 1230 "smarty_internal_templateparser.y" - function yy_r193() - { - $this->_retvalue = new _smarty_code($this, '(string)$_smarty_tpl->tpl_vars[\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\']->value'); - } - #line 3065 "smarty_internal_templateparser.php" - #line 1238 "smarty_internal_templateparser.y" - function yy_r195() - { - $this->_retvalue = new _smarty_code($this, '(string)(' . $this->yystack[$this->yyidx + - 1]->minor . ')'); - } - #line 3070 "smarty_internal_templateparser.php" - #line 1242 "smarty_internal_templateparser.y" - function yy_r196() - { - $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + - 1]->minor); - } - #line 3075 "smarty_internal_templateparser.php" - #line 1246 "smarty_internal_templateparser.y" - function yy_r197() - { - $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor); } - - #line 3080 "smarty_internal_templateparser.php" +#line 2910 "smarty_internal_templateparser.php" +#line 999 "smarty_internal_templateparser.y" + function yy_r152(){ + if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) == '_') { + $this->compiler->trigger_template_error (self::Err1); + } + $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")"; + } +#line 2918 "smarty_internal_templateparser.php" +#line 1006 "smarty_internal_templateparser.y" + function yy_r153(){ + if ($this->security) { + $this->compiler->trigger_template_error (self::Err2); + } + $this->prefix_number++; + $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->compileVariable("'".$this->yystack[$this->yyidx + -3]->minor."'").';?>'; + $this->_retvalue = '$_tmp'.$this->prefix_number.'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')'; + } +#line 2928 "smarty_internal_templateparser.php" +#line 1017 "smarty_internal_templateparser.y" + function yy_r154(){ + $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor)); + } +#line 2933 "smarty_internal_templateparser.php" +#line 1034 "smarty_internal_templateparser.y" + function yy_r157(){ + $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor))); + } +#line 2938 "smarty_internal_templateparser.php" +#line 1038 "smarty_internal_templateparser.y" + function yy_r158(){ + $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)); + } +#line 2943 "smarty_internal_templateparser.php" +#line 1046 "smarty_internal_templateparser.y" + function yy_r160(){ + $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); + } +#line 2948 "smarty_internal_templateparser.php" +#line 1054 "smarty_internal_templateparser.y" + function yy_r161(){ + $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor); + } +#line 2953 "smarty_internal_templateparser.php" +#line 1088 "smarty_internal_templateparser.y" + function yy_r168(){ + $this->_retvalue = '$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2958 "smarty_internal_templateparser.php" +#line 1093 "smarty_internal_templateparser.y" + function yy_r169(){ + $this->_retvalue = '$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2963 "smarty_internal_templateparser.php" +#line 1099 "smarty_internal_templateparser.y" + function yy_r170(){ + $this->_retvalue = '=='; + } +#line 2968 "smarty_internal_templateparser.php" +#line 1103 "smarty_internal_templateparser.y" + function yy_r171(){ + $this->_retvalue = '!='; + } +#line 2973 "smarty_internal_templateparser.php" +#line 1107 "smarty_internal_templateparser.y" + function yy_r172(){ + $this->_retvalue = '>'; + } +#line 2978 "smarty_internal_templateparser.php" +#line 1111 "smarty_internal_templateparser.y" + function yy_r173(){ + $this->_retvalue = '<'; + } +#line 2983 "smarty_internal_templateparser.php" +#line 1115 "smarty_internal_templateparser.y" + function yy_r174(){ + $this->_retvalue = '>='; + } +#line 2988 "smarty_internal_templateparser.php" +#line 1119 "smarty_internal_templateparser.y" + function yy_r175(){ + $this->_retvalue = '<='; + } +#line 2993 "smarty_internal_templateparser.php" +#line 1123 "smarty_internal_templateparser.y" + function yy_r176(){ + $this->_retvalue = '==='; + } +#line 2998 "smarty_internal_templateparser.php" +#line 1127 "smarty_internal_templateparser.y" + function yy_r177(){ + $this->_retvalue = '!=='; + } +#line 3003 "smarty_internal_templateparser.php" +#line 1131 "smarty_internal_templateparser.y" + function yy_r178(){ + $this->_retvalue = '%'; + } +#line 3008 "smarty_internal_templateparser.php" +#line 1135 "smarty_internal_templateparser.y" + function yy_r179(){ + $this->_retvalue = '&&'; + } +#line 3013 "smarty_internal_templateparser.php" +#line 1139 "smarty_internal_templateparser.y" + function yy_r180(){ + $this->_retvalue = '||'; + } +#line 3018 "smarty_internal_templateparser.php" +#line 1143 "smarty_internal_templateparser.y" + function yy_r181(){ + $this->_retvalue = ' XOR '; + } +#line 3023 "smarty_internal_templateparser.php" +#line 1150 "smarty_internal_templateparser.y" + function yy_r182(){ + $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')'; + } +#line 3028 "smarty_internal_templateparser.php" +#line 1158 "smarty_internal_templateparser.y" + function yy_r184(){ + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor; + } +#line 3033 "smarty_internal_templateparser.php" +#line 1166 "smarty_internal_templateparser.y" + function yy_r186(){ + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor; + } +#line 3038 "smarty_internal_templateparser.php" +#line 1170 "smarty_internal_templateparser.y" + function yy_r187(){ + $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor; + } +#line 3043 "smarty_internal_templateparser.php" +#line 1182 "smarty_internal_templateparser.y" + function yy_r189(){ + $this->_retvalue = "''"; + } +#line 3048 "smarty_internal_templateparser.php" +#line 1186 "smarty_internal_templateparser.y" + function yy_r190(){ + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php(); + } +#line 3053 "smarty_internal_templateparser.php" +#line 1191 "smarty_internal_templateparser.y" + function yy_r191(){ + $this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor); + $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; + } +#line 3059 "smarty_internal_templateparser.php" +#line 1196 "smarty_internal_templateparser.y" + function yy_r192(){ + $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor); + } +#line 3064 "smarty_internal_templateparser.php" +#line 1200 "smarty_internal_templateparser.y" + function yy_r193(){ + $this->_retvalue = new _smarty_code($this, $this->yystack[$this->yyidx + -1]->minor); + } +#line 3069 "smarty_internal_templateparser.php" +#line 1208 "smarty_internal_templateparser.y" + function yy_r195(){ + $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value'); + } +#line 3074 "smarty_internal_templateparser.php" +#line 1216 "smarty_internal_templateparser.y" + function yy_r197(){ + $this->_retvalue = new _smarty_code($this, '('.$this->yystack[$this->yyidx + -1]->minor.')'); + } +#line 3079 "smarty_internal_templateparser.php" +#line 1220 "smarty_internal_templateparser.y" + function yy_r198(){ + $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor); + } +#line 3084 "smarty_internal_templateparser.php" +#line 1224 "smarty_internal_templateparser.y" + function yy_r199(){ + $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor); + } +#line 3089 "smarty_internal_templateparser.php" private $_retvalue; - public function yy_reduce($yyruleno) + function yy_reduce($yyruleno) { $yymsp = $this->yystack[$this->yyidx]; - if ($this->yyTraceFILE && $yyruleno >= 0 - && $yyruleno < count(self::$yyRuleName) - ) { - fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", - $this->yyTracePrompt, $yyruleno, - self::$yyRuleName[$yyruleno]); + if (self::$yyTraceFILE && $yyruleno >= 0 + && $yyruleno < count(self::$yyRuleName)) { + fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n", + self::$yyTracePrompt, $yyruleno, + self::$yyRuleName[$yyruleno]); } $this->_retvalue = $yy_lefthand_side = null; @@ -4416,14 +3114,14 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php $yygoto = self::$yyRuleInfo[$yyruleno]['lhs']; $yysize = self::$yyRuleInfo[$yyruleno]['rhs']; $this->yyidx -= $yysize; - for ($i = $yysize; $i; $i --) { + for($i = $yysize; $i; $i--) { // pop all of the right-hand side parameters array_pop($this->yystack); } $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto); if ($yyact < self::YYNSTATE) { - if (!$this->yyTraceFILE && $yysize) { - $this->yyidx ++; + if (!self::$yyTraceFILE && $yysize) { + $this->yyidx++; $x = new TP_yyStackEntry; $x->stateno = $yyact; $x->major = $yygoto; @@ -4437,75 +3135,73 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php } } - public function yy_parse_failed() + function yy_parse_failed() { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt); + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt); } while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } } - public function yy_syntax_error($yymajor, $TOKEN) + function yy_syntax_error($yymajor, $TOKEN) { - #line 75 "smarty_internal_templateparser.y" +#line 77 "smarty_internal_templateparser.y" - $this->internalError = true; - $this->yymajor = $yymajor; - $this->compiler->trigger_template_error(); - #line 3142 "smarty_internal_templateparser.php" + $this->internalError = true; + $this->yymajor = $yymajor; + $this->compiler->trigger_template_error(); +#line 3152 "smarty_internal_templateparser.php" } - public function yy_accept() + function yy_accept() { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt); + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt); } while ($this->yyidx >= 0) { $stack = $this->yy_pop_parser_stack(); } - #line 66 "smarty_internal_templateparser.y" - - $this->successful = !$this->internalError; - $this->internalError = false; - $this->retvalue = $this->_retvalue; - //echo $this->retvalue."\n\n"; +#line 69 "smarty_internal_templateparser.y" - #line 3160 "smarty_internal_templateparser.php" + $this->successful = !$this->internalError; + $this->internalError = false; + $this->retvalue = $this->_retvalue; + //echo $this->retvalue."\n\n"; +#line 3170 "smarty_internal_templateparser.php" } - public function doParse($yymajor, $yytokenvalue) + function doParse($yymajor, $yytokenvalue) { $yyerrorhit = 0; /* True if yymajor has invoked an error */ if ($this->yyidx === null || $this->yyidx < 0) { $this->yyidx = 0; - $this->yyerrcnt = - 1; + $this->yyerrcnt = -1; $x = new TP_yyStackEntry; $x->stateno = 0; $x->major = 0; $this->yystack = array(); array_push($this->yystack, $x); } - $yyendofinput = ($yymajor == 0); + $yyendofinput = ($yymajor==0); - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sInput %s\n", - $this->yyTracePrompt, $this->yyTokenName[$yymajor]); + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sInput %s\n", + self::$yyTracePrompt, $this->yyTokenName[$yymajor]); } do { $yyact = $this->yy_find_shift_action($yymajor); if ($yymajor < self::YYERRORSYMBOL && - !$this->yy_is_expected_token($yymajor) - ) { + !$this->yy_is_expected_token($yymajor)) { // force a syntax error $yyact = self::YY_ERROR_ACTION; } if ($yyact < self::YYNSTATE) { $this->yy_shift($yyact, $yymajor, $yytokenvalue); - $this->yyerrcnt --; + $this->yyerrcnt--; if ($yyendofinput && $this->yyidx >= 0) { $yymajor = 0; } else { @@ -4514,30 +3210,30 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php } elseif ($yyact < self::YYNSTATE + self::YYNRULE) { $this->yy_reduce($yyact - self::YYNSTATE); } elseif ($yyact == self::YY_ERROR_ACTION) { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sSyntax Error!\n", - $this->yyTracePrompt); + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sSyntax Error!\n", + self::$yyTracePrompt); } if (self::YYERRORSYMBOL) { if ($this->yyerrcnt < 0) { $this->yy_syntax_error($yymajor, $yytokenvalue); } $yymx = $this->yystack[$this->yyidx]->major; - if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) { - if ($this->yyTraceFILE) { - fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", - $this->yyTracePrompt, $this->yyTokenName[$yymajor]); + if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){ + if (self::$yyTraceFILE) { + fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n", + self::$yyTracePrompt, $this->yyTokenName[$yymajor]); } $this->yy_destructor($yymajor, $yytokenvalue); $yymajor = self::YYNOCODE; } else { while ($this->yyidx >= 0 && - $yymx != self::YYERRORSYMBOL && - ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE - ) { + $yymx != self::YYERRORSYMBOL && + ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE + ){ $this->yy_pop_parser_stack(); } - if ($this->yyidx < 0 || $yymajor == 0) { + if ($this->yyidx < 0 || $yymajor==0) { $this->yy_destructor($yymajor, $yytokenvalue); $this->yy_parse_failed(); $yymajor = self::YYNOCODE; @@ -4566,3 +3262,4 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0); } } +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_utility.php b/Widgets/smarty/libs/sysplugins/smarty_internal_utility.php index 0a5975bb..3e3e85f6 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_utility.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_utility.php @@ -3,42 +3,47 @@ * Project: Smarty: the PHP compiling template engine * File: smarty_internal_utility.php * SVN: $Id: $ + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * 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, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * * For questions, help, comments, discussion, etc., please join the * Smarty mailing list. Send a blank e-mail to * smarty-discussion-subscribe@googlegroups.com * - * @link http://www.smarty.net/ - * @copyright 2008 New Digital Group, Inc. - * @author Monte Ohrt <monte at ohrt dot com> - * @author Uwe Tews - * @package Smarty + * @link http://www.smarty.net/ + * @copyright 2008 New Digital Group, Inc. + * @author Monte Ohrt <monte at ohrt dot com> + * @author Uwe Tews + * @package Smarty * @subpackage PluginsInternal - * @version 3-SVN$Rev: 3286 $ + * @version 3-SVN$Rev: 3286 $ */ + /** * Utility class * - * @package Smarty + * @package Smarty * @subpackage Security */ -class Smarty_Internal_Utility -{ +class Smarty_Internal_Utility { + /** * private constructor to prevent calls creation of new instances */ - final private function __construct() + private final function __construct() { // intentionally left blank } @@ -46,15 +51,14 @@ class Smarty_Internal_Utility /** * Compile all template files * - * @param string $extension template file name extension - * @param bool $force_compile force all to recompile - * @param int $time_limit set maximum execution time - * @param int $max_errors set maximum allowed errors - * @param Smarty $smarty Smarty instance - * + * @param string $extension template file name extension + * @param bool $force_compile force all to recompile + * @param int $time_limit set maximum execution time + * @param int $max_errors set maximum allowed errors + * @param Smarty $smarty Smarty instance * @return integer number of template files compiled */ - public static function compileAllTemplates($extension, $force_compile, $time_limit, $max_errors, Smarty $smarty) + public static function compileAllTemplates($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty) { // switch off time limit if (function_exists('set_time_limit')) { @@ -64,30 +68,25 @@ class Smarty_Internal_Utility $_count = 0; $_error_count = 0; // loop over array of template directories - foreach ($smarty->getTemplateDir() as $_dir) { + foreach($smarty->getTemplateDir() as $_dir) { $_compileDirs = new RecursiveDirectoryIterator($_dir); $_compile = new RecursiveIteratorIterator($_compileDirs); foreach ($_compile as $_fileinfo) { + if (substr($_fileinfo->getBasename(),0,1) == '.' || strpos($_fileinfo, '.svn') !== false) continue; $_file = $_fileinfo->getFilename(); - if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) { - continue; - } - if (!substr_compare($_file, $extension, - strlen($extension)) == 0) { - continue; - } - if ($_fileinfo->getPath() == substr($_dir, 0, - 1)) { - $_template_file = $_file; + if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue; + if ($_fileinfo->getPath() == substr($_dir, 0, -1)) { + $_template_file = $_file; } else { - $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file; + $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file; } echo '<br>', $_dir, '---', $_template_file; flush(); $_start_time = microtime(true); try { - $_tpl = $smarty->createTemplate($_template_file, null, null, null, false); + $_tpl = $smarty->createTemplate($_template_file,null,null,null,false); if ($_tpl->mustCompile()) { $_tpl->compileTemplateSource(); - $_count ++; echo ' compiled in ', microtime(true) - $_start_time, ' seconds'; flush(); } else { @@ -97,7 +96,7 @@ class Smarty_Internal_Utility } catch (Exception $e) { echo 'Error: ', $e->getMessage(), "<br><br>"; - $_error_count ++; + $_error_count++; } // free memory $smarty->template_objects = array(); @@ -109,22 +108,20 @@ class Smarty_Internal_Utility } } } - return $_count; } /** * Compile all config files * - * @param string $extension config file name extension - * @param bool $force_compile force all to recompile - * @param int $time_limit set maximum execution time - * @param int $max_errors set maximum allowed errors - * @param Smarty $smarty Smarty instance - * + * @param string $extension config file name extension + * @param bool $force_compile force all to recompile + * @param int $time_limit set maximum execution time + * @param int $max_errors set maximum allowed errors + * @param Smarty $smarty Smarty instance * @return integer number of config files compiled */ - public static function compileAllConfig($extension, $force_compile, $time_limit, $max_errors, Smarty $smarty) + public static function compileAllConfig($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty) { // switch off time limit if (function_exists('set_time_limit')) { @@ -134,18 +131,14 @@ class Smarty_Internal_Utility $_count = 0; $_error_count = 0; // loop over array of template directories - foreach ($smarty->getConfigDir() as $_dir) { + foreach($smarty->getConfigDir() as $_dir) { $_compileDirs = new RecursiveDirectoryIterator($_dir); $_compile = new RecursiveIteratorIterator($_compileDirs); foreach ($_compile as $_fileinfo) { + if (substr($_fileinfo->getBasename(),0,1) == '.' || strpos($_fileinfo, '.svn') !== false) continue; $_file = $_fileinfo->getFilename(); - if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) { - continue; - } - if (!substr_compare($_file, $extension, - strlen($extension)) == 0) { - continue; - } - if ($_fileinfo->getPath() == substr($_dir, 0, - 1)) { + if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue; + if ($_fileinfo->getPath() == substr($_dir, 0, -1)) { $_config_file = $_file; } else { $_config_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file; @@ -157,7 +150,6 @@ class Smarty_Internal_Utility $_config = new Smarty_Internal_Config($_config_file, $smarty); if ($_config->mustCompile()) { $_config->compileConfigSource(); - $_count ++; echo ' compiled in ', microtime(true) - $_start_time, ' seconds'; flush(); } else { @@ -167,7 +159,7 @@ class Smarty_Internal_Utility } catch (Exception $e) { echo 'Error: ', $e->getMessage(), "<br><br>"; - $_error_count ++; + $_error_count++; } if ($max_errors !== null && $_error_count == $max_errors) { echo '<br><br>too many errors'; @@ -175,25 +167,23 @@ class Smarty_Internal_Utility } } } - return $_count; } /** * Delete compiled template file * - * @param string $resource_name template name - * @param string $compile_id compile id - * @param integer $exp_time expiration time - * @param Smarty $smarty Smarty instance - * + * @param string $resource_name template name + * @param string $compile_id compile id + * @param integer $exp_time expiration time + * @param Smarty $smarty Smarty instance * @return integer number of template files deleted */ public static function clearCompiledTemplate($resource_name, $compile_id, $exp_time, Smarty $smarty) { - $_compile_dir = realpath($smarty->getCompileDir()) . '/'; + $_compile_dir = $smarty->getCompileDir(); $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null; - $_dir_sep = $smarty->use_sub_dirs ? '/' : '^'; + $_dir_sep = $smarty->use_sub_dirs ? DS : '^'; if (isset($resource_name)) { $_save_stat = $smarty->caching; $smarty->caching = false; @@ -213,38 +203,38 @@ class Smarty_Internal_Utility unset($smarty->template_objects[$_templateId]); if ($tpl->source->exists) { - $_resource_part_1 = basename(str_replace('^', '/', $tpl->compiled->filepath)); - $_resource_part_1_length = strlen($_resource_part_1); + $_resource_part_1 = basename(str_replace('^', '/', $tpl->compiled->filepath)); + $_resource_part_1_length = strlen($_resource_part_1); } else { return 0; } - $_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1); + $_resource_part_2 = str_replace('.php','.cache.php',$_resource_part_1); $_resource_part_2_length = strlen($_resource_part_2); + } else { + $_resource_part = ''; } $_dir = $_compile_dir; if ($smarty->use_sub_dirs && isset($_compile_id)) { $_dir .= $_compile_id . $_dir_sep; } if (isset($_compile_id)) { - $_compile_id_part = str_replace('\\', '/', $_compile_dir . $_compile_id . $_dir_sep); + $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep; $_compile_id_part_length = strlen($_compile_id_part); } $_count = 0; try { $_compileDirs = new RecursiveDirectoryIterator($_dir); - // NOTE: UnexpectedValueException thrown for PHP >= 5.3 - } - catch (Exception $e) { + // NOTE: UnexpectedValueException thrown for PHP >= 5.3 + } catch (Exception $e) { return 0; } $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST); foreach ($_compile as $_file) { - if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) { + if (substr($_file->getBasename(), 0, 1) == '.' || strpos($_file, '.svn') !== false) continue; - } - $_filepath = str_replace('\\', '/', (string) $_file); + $_filepath = (string) $_file; if ($_file->isDir()) { if (!$_compile->isDot()) { @@ -253,13 +243,12 @@ class Smarty_Internal_Utility } } else { $unlink = false; - if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) && $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) + if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) && !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) && (!isset($resource_name) || (isset($_filepath[$_resource_part_1_length]) - && substr_compare($_filepath, $_resource_part_1, - $_resource_part_1_length, $_resource_part_1_length) == 0) + && substr_compare($_filepath, $_resource_part_1, -$_resource_part_1_length, $_resource_part_1_length) == 0) || (isset($_filepath[$_resource_part_2_length]) - && substr_compare($_filepath, $_resource_part_2, - $_resource_part_2_length, $_resource_part_2_length) == 0)) - ) { + && substr_compare($_filepath, $_resource_part_2, -$_resource_part_2_length, $_resource_part_2_length) == 0))) { if (isset($exp_time)) { if (time() - @filemtime($_filepath) >= $exp_time) { $unlink = true; @@ -270,44 +259,40 @@ class Smarty_Internal_Utility } if ($unlink && @unlink($_filepath)) { - $_count ++; + $_count++; } } } // clear compiled cache Smarty_Resource::$sources = array(); Smarty_Resource::$compileds = array(); - return $_count; } /** * Return array of tag/attributes of all tags used by an template * - * @param Smarty_Internal_Template $template - * - * @throws Exception - * @throws SmartyException - * @return array of tag/attributes + * @param Smarty_Internal_Template $templae template object + * @return array of tag/attributes */ public static function getTags(Smarty_Internal_Template $template) { $template->smarty->get_used_tags = true; $template->compileTemplateSource(); - return $template->used_tags; } + /** * diagnose Smarty setup - * If $errors is secified, the diagnostic report will be appended to the array, rather than being output. * - * @param Smarty $smarty Smarty instance to test - * @param array $errors array to push results into rather than outputting them + * If $errors is secified, the diagnostic report will be appended to the array, rather than being output. * - * @return bool status, true if everything is fine, false else + * @param Smarty $smarty Smarty instance to test + * @param array $errors array to push results into rather than outputting them + * @return bool status, true if everything is fine, false else */ - public static function testInstall(Smarty $smarty, &$errors = null) + public static function testInstall(Smarty $smarty, &$errors=null) { $status = true; @@ -317,23 +302,15 @@ class Smarty_Internal_Utility echo "Testing template directory...\n"; } - $_stream_resolve_include_path = function_exists('stream_resolve_include_path'); - // test if all registered template_dir are accessible - foreach ($smarty->getTemplateDir() as $template_dir) { + foreach($smarty->getTemplateDir() as $template_dir) { $_template_dir = $template_dir; $template_dir = realpath($template_dir); - // resolve include_path or fail existence + // resolve include_path or fail existance if (!$template_dir) { if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) { // try PHP include_path - if ($_stream_resolve_include_path) { - $template_dir = stream_resolve_include_path($_template_dir); - } else { - $template_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_template_dir); - } - - if ($template_dir !== false) { + if (($template_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_template_dir)) !== false) { if ($errors === null) { echo "$template_dir is OK.\n"; } @@ -386,6 +363,7 @@ class Smarty_Internal_Utility } } + if ($errors === null) { echo "Testing compile directory...\n"; } @@ -431,28 +409,23 @@ class Smarty_Internal_Utility } } + if ($errors === null) { echo "Testing plugins directory...\n"; } // test if all registered plugins_dir are accessible // and if core plugins directory is still registered - $_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins'); + $_core_plugins_dir = realpath(dirname(__FILE__) .'/../plugins'); $_core_plugins_available = false; - foreach ($smarty->getPluginsDir() as $plugin_dir) { + foreach($smarty->getPluginsDir() as $plugin_dir) { $_plugin_dir = $plugin_dir; $plugin_dir = realpath($plugin_dir); - // resolve include_path or fail existence + // resolve include_path or fail existance if (!$plugin_dir) { if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) { // try PHP include_path - if ($_stream_resolve_include_path) { - $plugin_dir = stream_resolve_include_path($_plugin_dir); - } else { - $plugin_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_plugin_dir); - } - - if ($plugin_dir !== false) { + if (($plugin_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_plugin_dir)) !== false) { if ($errors === null) { echo "$plugin_dir is OK.\n"; } @@ -523,6 +496,7 @@ class Smarty_Internal_Utility echo "Testing cache directory...\n"; } + // test if all registered cache_dir is accessible $__cache_dir = $smarty->getCacheDir(); $_cache_dir = realpath($__cache_dir); @@ -564,25 +538,20 @@ class Smarty_Internal_Utility } } + if ($errors === null) { echo "Testing configs directory...\n"; } // test if all registered config_dir are accessible - foreach ($smarty->getConfigDir() as $config_dir) { + foreach($smarty->getConfigDir() as $config_dir) { $_config_dir = $config_dir; $config_dir = realpath($config_dir); - // resolve include_path or fail existence + // resolve include_path or fail existance if (!$config_dir) { if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) { // try PHP include_path - if ($_stream_resolve_include_path) { - $config_dir = stream_resolve_include_path($_config_dir); - } else { - $config_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_config_dir); - } - - if ($config_dir !== false) { + if (($config_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_config_dir)) !== false) { if ($errors === null) { echo "$config_dir is OK.\n"; } @@ -635,6 +604,7 @@ class Smarty_Internal_Utility } } + if ($errors === null) { echo "Testing sysplugin files...\n"; } @@ -642,75 +612,75 @@ class Smarty_Internal_Utility $source = SMARTY_SYSPLUGINS_DIR; if (is_dir($source)) { $expected = array( - "smarty_cacheresource.php" => true, - "smarty_cacheresource_custom.php" => true, - "smarty_cacheresource_keyvaluestore.php" => true, - "smarty_config_source.php" => true, - "smarty_internal_cacheresource_file.php" => true, - "smarty_internal_compile_append.php" => true, - "smarty_internal_compile_assign.php" => true, - "smarty_internal_compile_block.php" => true, - "smarty_internal_compile_break.php" => true, - "smarty_internal_compile_call.php" => true, - "smarty_internal_compile_capture.php" => true, - "smarty_internal_compile_config_load.php" => true, - "smarty_internal_compile_continue.php" => true, - "smarty_internal_compile_debug.php" => true, - "smarty_internal_compile_eval.php" => true, - "smarty_internal_compile_extends.php" => true, - "smarty_internal_compile_for.php" => true, - "smarty_internal_compile_foreach.php" => true, - "smarty_internal_compile_function.php" => true, - "smarty_internal_compile_if.php" => true, - "smarty_internal_compile_include.php" => true, - "smarty_internal_compile_include_php.php" => true, - "smarty_internal_compile_insert.php" => true, - "smarty_internal_compile_ldelim.php" => true, - "smarty_internal_compile_nocache.php" => true, - "smarty_internal_compile_private_block_plugin.php" => true, - "smarty_internal_compile_private_function_plugin.php" => true, - "smarty_internal_compile_private_modifier.php" => true, + "smarty_cacheresource.php" => true, + "smarty_cacheresource_custom.php" => true, + "smarty_cacheresource_keyvaluestore.php" => true, + "smarty_config_source.php" => true, + "smarty_internal_cacheresource_file.php" => true, + "smarty_internal_compile_append.php" => true, + "smarty_internal_compile_assign.php" => true, + "smarty_internal_compile_block.php" => true, + "smarty_internal_compile_break.php" => true, + "smarty_internal_compile_call.php" => true, + "smarty_internal_compile_capture.php" => true, + "smarty_internal_compile_config_load.php" => true, + "smarty_internal_compile_continue.php" => true, + "smarty_internal_compile_debug.php" => true, + "smarty_internal_compile_eval.php" => true, + "smarty_internal_compile_extends.php" => true, + "smarty_internal_compile_for.php" => true, + "smarty_internal_compile_foreach.php" => true, + "smarty_internal_compile_function.php" => true, + "smarty_internal_compile_if.php" => true, + "smarty_internal_compile_include.php" => true, + "smarty_internal_compile_include_php.php" => true, + "smarty_internal_compile_insert.php" => true, + "smarty_internal_compile_ldelim.php" => true, + "smarty_internal_compile_nocache.php" => true, + "smarty_internal_compile_private_block_plugin.php" => true, + "smarty_internal_compile_private_function_plugin.php" => true, + "smarty_internal_compile_private_modifier.php" => true, "smarty_internal_compile_private_object_block_function.php" => true, - "smarty_internal_compile_private_object_function.php" => true, - "smarty_internal_compile_private_print_expression.php" => true, - "smarty_internal_compile_private_registered_block.php" => true, - "smarty_internal_compile_private_registered_function.php" => true, - "smarty_internal_compile_private_special_variable.php" => true, - "smarty_internal_compile_rdelim.php" => true, - "smarty_internal_compile_section.php" => true, - "smarty_internal_compile_setfilter.php" => true, - "smarty_internal_compile_while.php" => true, - "smarty_internal_compilebase.php" => true, - "smarty_internal_config.php" => true, - "smarty_internal_config_file_compiler.php" => true, - "smarty_internal_configfilelexer.php" => true, - "smarty_internal_configfileparser.php" => true, - "smarty_internal_data.php" => true, - "smarty_internal_debug.php" => true, - "smarty_internal_filter_handler.php" => true, - "smarty_internal_function_call_handler.php" => true, - "smarty_internal_get_include_path.php" => true, - "smarty_internal_nocache_insert.php" => true, - "smarty_internal_parsetree.php" => true, - "smarty_internal_resource_eval.php" => true, - "smarty_internal_resource_extends.php" => true, - "smarty_internal_resource_file.php" => true, - "smarty_internal_resource_registered.php" => true, - "smarty_internal_resource_stream.php" => true, - "smarty_internal_resource_string.php" => true, - "smarty_internal_smartytemplatecompiler.php" => true, - "smarty_internal_template.php" => true, - "smarty_internal_templatebase.php" => true, - "smarty_internal_templatecompilerbase.php" => true, - "smarty_internal_templatelexer.php" => true, - "smarty_internal_templateparser.php" => true, - "smarty_internal_utility.php" => true, - "smarty_internal_write_file.php" => true, - "smarty_resource.php" => true, - "smarty_resource_custom.php" => true, - "smarty_resource_recompiled.php" => true, - "smarty_resource_uncompiled.php" => true, - "smarty_security.php" => true, + "smarty_internal_compile_private_object_function.php" => true, + "smarty_internal_compile_private_print_expression.php" => true, + "smarty_internal_compile_private_registered_block.php" => true, + "smarty_internal_compile_private_registered_function.php" => true, + "smarty_internal_compile_private_special_variable.php" => true, + "smarty_internal_compile_rdelim.php" => true, + "smarty_internal_compile_section.php" => true, + "smarty_internal_compile_setfilter.php" => true, + "smarty_internal_compile_while.php" => true, + "smarty_internal_compilebase.php" => true, + "smarty_internal_config.php" => true, + "smarty_internal_config_file_compiler.php" => true, + "smarty_internal_configfilelexer.php" => true, + "smarty_internal_configfileparser.php" => true, + "smarty_internal_data.php" => true, + "smarty_internal_debug.php" => true, + "smarty_internal_filter_handler.php" => true, + "smarty_internal_function_call_handler.php" => true, + "smarty_internal_get_include_path.php" => true, + "smarty_internal_nocache_insert.php" => true, + "smarty_internal_parsetree.php" => true, + "smarty_internal_resource_eval.php" => true, + "smarty_internal_resource_extends.php" => true, + "smarty_internal_resource_file.php" => true, + "smarty_internal_resource_registered.php" => true, + "smarty_internal_resource_stream.php" => true, + "smarty_internal_resource_string.php" => true, + "smarty_internal_smartytemplatecompiler.php" => true, + "smarty_internal_template.php" => true, + "smarty_internal_templatebase.php" => true, + "smarty_internal_templatecompilerbase.php" => true, + "smarty_internal_templatelexer.php" => true, + "smarty_internal_templateparser.php" => true, + "smarty_internal_utility.php" => true, + "smarty_internal_write_file.php" => true, + "smarty_resource.php" => true, + "smarty_resource_custom.php" => true, + "smarty_resource_recompiled.php" => true, + "smarty_resource_uncompiled.php" => true, + "smarty_security.php" => true, ); $iterator = new DirectoryIterator($source); foreach ($iterator as $file) { @@ -723,7 +693,7 @@ class Smarty_Internal_Utility } if ($expected) { $status = false; - $message = "FAILED: files missing from libs/sysplugins: " . join(', ', array_keys($expected)); + $message = "FAILED: files missing from libs/sysplugins: ". join(', ', array_keys($expected)); if ($errors === null) { echo $message . ".\n"; } else { @@ -734,7 +704,7 @@ class Smarty_Internal_Utility } } else { $status = false; - $message = "FAILED: " . SMARTY_SYSPLUGINS_DIR . ' is not a directory'; + $message = "FAILED: ". SMARTY_SYSPLUGINS_DIR .' is not a directory'; if ($errors === null) { echo $message . ".\n"; } else { @@ -749,53 +719,53 @@ class Smarty_Internal_Utility $source = SMARTY_PLUGINS_DIR; if (is_dir($source)) { $expected = array( - "block.textformat.php" => true, - "function.counter.php" => true, - "function.cycle.php" => true, - "function.fetch.php" => true, - "function.html_checkboxes.php" => true, - "function.html_image.php" => true, - "function.html_options.php" => true, - "function.html_radios.php" => true, - "function.html_select_date.php" => true, - "function.html_select_time.php" => true, - "function.html_table.php" => true, - "function.mailto.php" => true, - "function.math.php" => true, - "modifier.capitalize.php" => true, - "modifier.date_format.php" => true, - "modifier.debug_print_var.php" => true, - "modifier.escape.php" => true, - "modifier.regex_replace.php" => true, - "modifier.replace.php" => true, - "modifier.spacify.php" => true, - "modifier.truncate.php" => true, - "modifiercompiler.cat.php" => true, + "block.textformat.php" => true, + "function.counter.php" => true, + "function.cycle.php" => true, + "function.fetch.php" => true, + "function.html_checkboxes.php" => true, + "function.html_image.php" => true, + "function.html_options.php" => true, + "function.html_radios.php" => true, + "function.html_select_date.php" => true, + "function.html_select_time.php" => true, + "function.html_table.php" => true, + "function.mailto.php" => true, + "function.math.php" => true, + "modifier.capitalize.php" => true, + "modifier.date_format.php" => true, + "modifier.debug_print_var.php" => true, + "modifier.escape.php" => true, + "modifier.regex_replace.php" => true, + "modifier.replace.php" => true, + "modifier.spacify.php" => true, + "modifier.truncate.php" => true, + "modifiercompiler.cat.php" => true, "modifiercompiler.count_characters.php" => true, "modifiercompiler.count_paragraphs.php" => true, - "modifiercompiler.count_sentences.php" => true, - "modifiercompiler.count_words.php" => true, - "modifiercompiler.default.php" => true, - "modifiercompiler.escape.php" => true, - "modifiercompiler.from_charset.php" => true, - "modifiercompiler.indent.php" => true, - "modifiercompiler.lower.php" => true, - "modifiercompiler.noprint.php" => true, - "modifiercompiler.string_format.php" => true, - "modifiercompiler.strip.php" => true, - "modifiercompiler.strip_tags.php" => true, - "modifiercompiler.to_charset.php" => true, - "modifiercompiler.unescape.php" => true, - "modifiercompiler.upper.php" => true, - "modifiercompiler.wordwrap.php" => true, - "outputfilter.trimwhitespace.php" => true, - "shared.escape_special_chars.php" => true, - "shared.literal_compiler_param.php" => true, - "shared.make_timestamp.php" => true, - "shared.mb_str_replace.php" => true, - "shared.mb_unicode.php" => true, - "shared.mb_wordwrap.php" => true, - "variablefilter.htmlspecialchars.php" => true, + "modifiercompiler.count_sentences.php" => true, + "modifiercompiler.count_words.php" => true, + "modifiercompiler.default.php" => true, + "modifiercompiler.escape.php" => true, + "modifiercompiler.from_charset.php" => true, + "modifiercompiler.indent.php" => true, + "modifiercompiler.lower.php" => true, + "modifiercompiler.noprint.php" => true, + "modifiercompiler.string_format.php" => true, + "modifiercompiler.strip.php" => true, + "modifiercompiler.strip_tags.php" => true, + "modifiercompiler.to_charset.php" => true, + "modifiercompiler.unescape.php" => true, + "modifiercompiler.upper.php" => true, + "modifiercompiler.wordwrap.php" => true, + "outputfilter.trimwhitespace.php" => true, + "shared.escape_special_chars.php" => true, + "shared.literal_compiler_param.php" => true, + "shared.make_timestamp.php" => true, + "shared.mb_str_replace.php" => true, + "shared.mb_unicode.php" => true, + "shared.mb_wordwrap.php" => true, + "variablefilter.htmlspecialchars.php" => true, ); $iterator = new DirectoryIterator($source); foreach ($iterator as $file) { @@ -808,7 +778,7 @@ class Smarty_Internal_Utility } if ($expected) { $status = false; - $message = "FAILED: files missing from libs/plugins: " . join(', ', array_keys($expected)); + $message = "FAILED: files missing from libs/plugins: ". join(', ', array_keys($expected)); if ($errors === null) { echo $message . ".\n"; } else { @@ -819,7 +789,7 @@ class Smarty_Internal_Utility } } else { $status = false; - $message = "FAILED: " . SMARTY_PLUGINS_DIR . ' is not a directory'; + $message = "FAILED: ". SMARTY_PLUGINS_DIR .' is not a directory'; if ($errors === null) { echo $message . ".\n"; } else { @@ -834,4 +804,7 @@ class Smarty_Internal_Utility return $status; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_internal_write_file.php b/Widgets/smarty/libs/sysplugins/smarty_internal_write_file.php index f46fe2b6..743503b0 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_internal_write_file.php +++ b/Widgets/smarty/libs/sysplugins/smarty_internal_write_file.php @@ -2,27 +2,25 @@ /** * Smarty write file plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsInternal - * @author Monte Ohrt + * @author Monte Ohrt */ /** * Smarty Internal Write File Class * - * @package Smarty + * @package Smarty * @subpackage PluginsInternal */ -class Smarty_Internal_Write_File -{ +class Smarty_Internal_Write_File { + /** * Writes file in a safe way to disk * - * @param string $_filepath complete filepath - * @param string $_contents file content - * @param Smarty $smarty smarty instance - * - * @throws SmartyException + * @param string $_filepath complete filepath + * @param string $_contents file content + * @param Smarty $smarty smarty instance * @return boolean true */ public static function writeFile($_filepath, $_contents, Smarty $smarty) @@ -40,38 +38,22 @@ class Smarty_Internal_Write_File } // write to tmp file, then move to overt file lock race condition - $_tmp_file = $_dirpath . DS . str_replace(array('.', ','), '_', uniqid('wrt', true)); + $_tmp_file = $_dirpath . DS . uniqid('wrt'); if (!file_put_contents($_tmp_file, $_contents)) { error_reporting($_error_reporting); throw new SmartyException("unable to write file {$_tmp_file}"); - } - - /* - * Windows' rename() fails if the destination exists, - * Linux' rename() properly handles the overwrite. - * Simply unlink()ing a file might cause other processes - * currently reading that file to fail, but linux' rename() - * seems to be smart enough to handle that for us. - */ - if (Smarty::$_IS_WINDOWS) { - // remove original file - @unlink($_filepath); - // rename tmp file - $success = @rename($_tmp_file, $_filepath); - } else { - // rename tmp file - $success = @rename($_tmp_file, $_filepath); - if (!$success) { - // remove original file - @unlink($_filepath); - // rename tmp file - $success = @rename($_tmp_file, $_filepath); - } + return false; } + // remove original file + @unlink($_filepath); + + // rename tmp file + $success = rename($_tmp_file, $_filepath); if (!$success) { error_reporting($_error_reporting); throw new SmartyException("unable to write file {$_filepath}"); + return false; } if ($smarty->_file_perms !== null) { @@ -80,7 +62,9 @@ class Smarty_Internal_Write_File umask($old_umask); } error_reporting($_error_reporting); - return true; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_resource.php b/Widgets/smarty/libs/sysplugins/smarty_resource.php index f478a533..f8285e62 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_resource.php +++ b/Widgets/smarty/libs/sysplugins/smarty_resource.php @@ -2,91 +2,84 @@ /** * Smarty Resource Plugin * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Rodney Rehm + * @author Rodney Rehm */ /** * Smarty Resource Plugin + * * Base implementation for resource plugins * - * @package Smarty + * @package Smarty * @subpackage TemplateResources */ -abstract class Smarty_Resource -{ +abstract class Smarty_Resource { /** * cache for Smarty_Template_Source instances - * * @var array */ public static $sources = array(); /** * cache for Smarty_Template_Compiled instances - * * @var array */ public static $compileds = array(); /** * cache for Smarty_Resource instances - * * @var array */ public static $resources = array(); /** * resource types provided by the core - * * @var array */ protected static $sysplugins = array( - 'file' => true, - 'string' => true, + 'file' => true, + 'string' => true, 'extends' => true, - 'stream' => true, - 'eval' => true, - 'php' => true + 'stream' => true, + 'eval' => true, + 'php' => true ); /** * Name of the Class to compile this resource's contents with - * * @var string */ public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler'; /** * Name of the Class to tokenize this resource's contents with - * * @var string */ public $template_lexer_class = 'Smarty_Internal_Templatelexer'; /** * Name of the Class to parse this resource's contents with - * * @var string */ public $template_parser_class = 'Smarty_Internal_Templateparser'; /** * Load template's source into current template object - * {@internal The loaded source is assigned to $_template->source->content directly.}} * - * @param Smarty_Template_Source $source source object + * {@internal The loaded source is assigned to $_template->source->content directly.}} * - * @return string template source - * @throws SmartyException if source cannot be loaded + * @param Smarty_Template_Source $source source object + * @return string template source + * @throws SmartyException if source cannot be loaded */ - abstract public function getContent(Smarty_Template_Source $source); + public abstract function getContent(Smarty_Template_Source $source); /** * populate Source Object with meta data from Resource * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object + * @param Smarty_Template_Source $source source object + * @param Smarty_Internal_Template $_template template object */ - abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null); + public abstract function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null); /** * populate Source Object with timestamp and exists from Resource @@ -98,22 +91,17 @@ abstract class Smarty_Resource // intentionally left blank } + /** * modify resource_name according to resource handlers specifications * - * @param Smarty $smarty Smarty instance - * @param string $resource_name resource_name to make unique - * @param boolean $is_config flag for config resource - * + * @param Smarty $smarty Smarty instance + * @param string $resource_name resource_name to make unique * @return string unique resource name */ - protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false) + protected function buildUniqueResourceName(Smarty $smarty, $resource_name) { - if ($is_config) { - return get_class($this) . '#' . $smarty->joined_config_dir . '#' . $resource_name; - } else { - return get_class($this) . '#' . $smarty->joined_template_dir . '#' . $resource_name; - } + return get_class($this) . '#' . $smarty->joined_template_dir . '#' . $resource_name; } /** @@ -129,9 +117,9 @@ abstract class Smarty_Resource // if use_sub_dirs, break file into directories if ($_template->smarty->use_sub_dirs) { $_filepath = substr($_filepath, 0, 2) . DS - . substr($_filepath, 2, 2) . DS - . substr($_filepath, 4, 2) . DS - . $_filepath; + . substr($_filepath, 2, 2) . DS + . substr($_filepath, 4, 2) . DS + . $_filepath; } $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^'; if (isset($_compile_id)) { @@ -147,7 +135,7 @@ abstract class Smarty_Resource // set basename if not specified $_basename = $this->getBasename($compiled->source); if ($_basename === null) { - $_basename = basename(preg_replace('![^\w\/]+!', '_', $compiled->source->name)); + $_basename = basename( preg_replace('![^\w\/]+!', '_', $compiled->source->name) ); } // separate (optional) basename by dot if ($_basename) { @@ -158,61 +146,14 @@ abstract class Smarty_Resource } /** - * Normalize Paths "foo/../bar" to "bar" - * - * @param string $_path path to normalize - * @param boolean $ds respect windows directory separator - * - * @return string normalized path - */ - protected function normalizePath($_path, $ds = true) - { - if ($ds) { - // don't we all just love windows? - $_path = str_replace('\\', '/', $_path); - } - - $offset = 0; - - // resolve simples - $_path = preg_replace('#/\./(\./)*#', '/', $_path); - // resolve parents - while (true) { - $_parent = strpos($_path, '/../', $offset); - if (!$_parent) { - break; - } elseif ($_path[$_parent - 1] === '.') { - $offset = $_parent + 3; - continue; - } - - $_pos = strrpos($_path, '/', $_parent - strlen($_path) - 1); - if ($_pos === false) { - // don't we all just love windows? - $_pos = $_parent; - } - - $_path = substr_replace($_path, '', $_pos, $_parent + 3 - $_pos); - } - - if ($ds && DS != '/') { - // don't we all just love windows? - $_path = str_replace('/', '\\', $_path); - } - - return $_path; - } - - /** * build template filepath by traversing the template_dir array * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * - * @return string fully qualified filepath - * @throws SmartyException if default template handler is registered but not callable + * @param Smarty_Template_Source $source source object + * @param Smarty_Internal_Template $_template template object + * @return string fully qualified filepath + * @throws SmartyException if default template handler is registered but not callable */ - protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) + protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) { $file = $source->name; if ($source instanceof Smarty_Config_Source) { @@ -240,21 +181,43 @@ abstract class Smarty_Resource // resolve relative path if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) { - // don't we all just love windows? - $_path = DS . trim($file, '/'); + $_was_relative_prefix = $file[0] == '.' ? substr($file, 0, strpos($file, '|')) : null; + $_path = DS . trim($file, '/\\'); $_was_relative = true; } else { - // don't we all just love windows? - $_path = str_replace('\\', '/', $file); + $_path = $file; + } + // don't we all just love windows? + $_path = str_replace('\\', '/', $_path); + // resolve simples + $_path = preg_replace('#(/\./(\./)*)|/{2,}#', '/', $_path); + // resolve parents + while (true) { + $_parent = strpos($_path, '/../'); + if ($_parent === false) { + break; + } else if ($_parent === 0) { + $_path = substr($_path, 3); + break; + } + $_pos = strrpos($_path, '/', $_parent - strlen($_path) - 1); + if ($_pos === false) { + // don't we all just love windows? + $_pos = $_parent; + } + $_path = substr_replace($_path, '', $_pos, $_parent + 3 - $_pos); } - $_path = $this->normalizePath($_path, false); if (DS != '/') { // don't we all just love windows? $_path = str_replace('/', '\\', $_path); } // revert to relative if (isset($_was_relative)) { - $_path = substr($_path, 1); + if (isset($_was_relative_prefix)){ + $_path = $_was_relative_prefix . $_path; + } else { + $_path = substr($_path, 1); + } } // this is only required for directories @@ -271,7 +234,7 @@ abstract class Smarty_Resource // try string indexes if (isset($_directories[$match['key']])) { $_directory = $_directories[$match['key']]; - } elseif (is_numeric($match['key'])) { + } else if (is_numeric($match['key'])) { // try numeric index $match['key'] = (int) $match['key']; if (isset($_directories[$match['key']])) { @@ -292,26 +255,18 @@ abstract class Smarty_Resource } } - $_stream_resolve_include_path = function_exists('stream_resolve_include_path'); - // relative file name? if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) { foreach ($_directories as $_directory) { $_filepath = $_directory . $file; if ($this->fileExists($source, $_filepath)) { - return $this->normalizePath($_filepath); + return $_filepath; } if ($source->smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_directory)) { // try PHP include_path - if ($_stream_resolve_include_path) { - $_filepath = stream_resolve_include_path($_filepath); - } else { - $_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath); - } - - if ($_filepath !== false) { + if (($_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath)) !== false) { if ($this->fileExists($source, $_filepath)) { - return $this->normalizePath($_filepath); + return $_filepath; } } } @@ -333,17 +288,15 @@ abstract class Smarty_Resource } } $_return = call_user_func_array($_default_handler, - array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty)); + array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty)); if (is_string($_return)) { $source->timestamp = @filemtime($_return); $source->exists = !!$source->timestamp; - return $_return; } elseif ($_return === true) { $source->content = $_content; $source->timestamp = $_timestamp; $source->exists = true; - return $_filepath; } } @@ -355,24 +308,22 @@ abstract class Smarty_Resource /** * test is file exists and save timestamp * - * @param Smarty_Template_Source $source source object - * @param string $file file name - * - * @return bool true if file exists + * @param Smarty_Template_Source $source source object + * @param string $file file name + * @return bool true if file exists */ protected function fileExists(Smarty_Template_Source $source, $file) { - $source->timestamp = is_file($file) ? @filemtime($file) : false; - + $source->timestamp = @filemtime($file); return $source->exists = !!$source->timestamp; + } /** * Determine basename for compiled filename * - * @param Smarty_Template_Source $source source object - * - * @return string resource's basename + * @param Smarty_Template_Source $source source object + * @return string resource's basename */ protected function getBasename(Smarty_Template_Source $source) { @@ -382,10 +333,8 @@ abstract class Smarty_Resource /** * Load Resource Handler * - * @param Smarty $smarty smarty object - * @param string $type name of the resource - * - * @throws SmartyException + * @param Smarty $smarty smarty object + * @param string $type name of the resource * @return Smarty_Resource Resource Handler */ public static function load(Smarty $smarty, $type) @@ -419,7 +368,6 @@ abstract class Smarty_Resource $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type); self::$resources[$type] = new $_resource_class(); } - return $smarty->_resource_handlers[$type] = self::$resources[$type]; } @@ -432,7 +380,6 @@ abstract class Smarty_Resource if (class_exists($_resource_class, false)) { self::$resources[$type] = new $_resource_class(); - return $smarty->_resource_handlers[$type] = self::$resources[$type]; } else { $smarty->registerResource($type, array( @@ -457,25 +404,23 @@ abstract class Smarty_Resource if (!isset(self::$resources['stream'])) { self::$resources['stream'] = new Smarty_Internal_Resource_Stream(); } - return $smarty->_resource_handlers[$type] = self::$resources['stream']; } // TODO: try default_(template|config)_handler // give up - throw new SmartyException("Unknown resource type '{$type}'"); + throw new SmartyException("Unkown resource type '{$type}'"); } /** * extract resource_type and resource_name from template_resource and config_resource - * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including). - * - * @param string $resource_name template_resource or config_resource to parse - * @param string $default_resource the default resource_type defined in $smarty - * @param string &$name the parsed resource name - * @param string &$type the parsed resource type * + * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including). + * @param string $resource_name template_resource or config_resource to parse + * @param string $default_resource the default resource_type defined in $smarty + * @param string &$name the parsed resource name + * @param string &$type the parsed resource type * @return void */ protected static function parseResourceName($resource_name, $default_resource, &$name, &$type) @@ -492,47 +437,41 @@ abstract class Smarty_Resource } } + /** * modify resource_name according to resource handlers specifications * - * @param Smarty $smarty Smarty instance - * @param string $resource_name resource_name to make unique - * + * @param Smarty $smarty Smarty instance + * @param string $resource_name resource_name to make unique * @return string unique resource name */ /** * modify template_resource according to resource handlers specifications * - * @param Smarty_Internal_template $template Smarty instance - * @param string $template_resource template_resource to extract resource handler and name of - * + * @param string $smarty Smarty instance + * @param string $template_resource template_resource to extracate resource handler and name of * @return string unique resource name */ - public static function getUniqueTemplateName($template, $template_resource) + public static function getUniqueTemplateName($smarty, $template_resource) { - self::parseResourceName($template_resource, $template->smarty->default_resource_type, $name, $type); + self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type); // TODO: optimize for Smarty's internal resource types - $resource = Smarty_Resource::load($template->smarty, $type); - // go relative to a given template? - $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\"); - if ($template instanceof Smarty_Internal_Template && $_file_is_dotted && ($template->source->type == 'file' || $template->parent->source->type == 'extends')) { - $name = dirname($template->source->filepath) . DS . $name; - } - return $resource->buildUniqueResourceName($template->smarty, $name); + $resource = Smarty_Resource::load($smarty, $type); + return $resource->buildUniqueResourceName($smarty, $name); } /** * initialize Source Object for given resource - * Either [$_template] or [$smarty, $template_resource] must be specified * - * @param Smarty_Internal_Template $_template template object - * @param Smarty $smarty smarty object - * @param string $template_resource resource identifier + * Either [$_template] or [$smarty, $template_resource] must be specified * - * @return Smarty_Template_Source Source Object + * @param Smarty_Internal_Template $_template template object + * @param Smarty $smarty smarty object + * @param string $template_resource resource identifier + * @return Smarty_Template_Source Source Object */ - public static function source(Smarty_Internal_Template $_template = null, Smarty $smarty = null, $template_resource = null) + public static function source(Smarty_Internal_Template $_template=null, Smarty $smarty=null, $template_resource=null) { if ($_template) { $smarty = $_template->smarty; @@ -542,20 +481,10 @@ abstract class Smarty_Resource // parse resource_name, load resource handler, identify unique resource name self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type); $resource = Smarty_Resource::load($smarty, $type); - // go relative to a given template? - $_file_is_dotted = isset($name[0]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\"); - if ($_file_is_dotted && isset($_template) && $_template->parent instanceof Smarty_Internal_Template && ($_template->parent->source->type == 'file' || $_template->parent->source->type == 'extends')) { - $name2 = dirname($_template->parent->source->filepath) . DS . $name; - } else { - $name2 = $name; - } - $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name2); + $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name); // check runtime cache $_cache_key = 'template|' . $unique_resource_name; - if ($smarty->compile_id) { - $_cache_key .= '|' . $smarty->compile_id; - } if (isset(self::$sources[$_cache_key])) { return self::$sources[$_cache_key]; } @@ -566,17 +495,14 @@ abstract class Smarty_Resource // runtime cache self::$sources[$_cache_key] = $source; - return $source; } /** * initialize Config Source Object for given resource * - * @param Smarty_Internal_Config $_config config object - * - * @throws SmartyException - * @return Smarty_Config_Source Source Object + * @param Smarty_Internal_Config $_config config object + * @return Smarty_Config_Source Source Object */ public static function config(Smarty_Internal_Config $_config) { @@ -594,7 +520,7 @@ abstract class Smarty_Resource // load resource handler, identify unique resource name $resource = Smarty_Resource::load($smarty, $type); - $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name, true); + $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name); // check runtime cache $_cache_key = 'config|' . $unique_resource_name; @@ -608,119 +534,107 @@ abstract class Smarty_Resource // runtime cache self::$sources[$_cache_key] = $source; - return $source; } + } /** * Smarty Resource Data Object + * * Meta Data Container for Template Files * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Rodney Rehm + * @author Rodney Rehm + * * @property integer $timestamp Source Timestamp - * @property boolean $exists Source Existence + * @property boolean $exists Source Existance * @property boolean $template Extended Template reference * @property string $content Source Content */ -class Smarty_Template_Source -{ +class Smarty_Template_Source { + /** * Name of the Class to compile this resource's contents with - * * @var string */ public $compiler_class = null; /** * Name of the Class to tokenize this resource's contents with - * * @var string */ public $template_lexer_class = null; /** * Name of the Class to parse this resource's contents with - * * @var string */ public $template_parser_class = null; /** * Unique Template ID - * * @var string */ public $uid = null; /** * Template Resource (Smarty_Internal_Template::$template_resource) - * * @var string */ public $resource = null; /** * Resource Type - * * @var string */ public $type = null; /** * Resource Name - * * @var string */ public $name = null; /** * Unique Resource Name - * * @var string */ public $unique_resource = null; /** * Source Filepath - * * @var string */ public $filepath = null; /** * Source is bypassing compiler - * * @var boolean */ public $uncompiled = null; /** * Source must be recompiled on every occasion - * * @var boolean */ public $recompiled = null; /** * The Components an extended template is made of - * * @var array */ public $components = null; /** * Resource Handler - * * @var Smarty_Resource */ public $handler = null; /** * Smarty instance - * * @var Smarty */ public $smarty = null; @@ -728,12 +642,12 @@ class Smarty_Template_Source /** * create Source Object container * - * @param Smarty_Resource $handler Resource Handler this source object communicates with - * @param Smarty $smarty Smarty instance this source object belongs to - * @param string $resource full template_resource - * @param string $type type of resource - * @param string $name resource name - * @param string $unique_resource unique resource name + * @param Smarty_Resource $handler Resource Handler this source object communicates with + * @param Smarty $smarty Smarty instance this source object belongs to + * @param string $resource full template_resource + * @param string $type type of resource + * @param string $name resource name + * @param string $unique_resource unqiue resource name */ public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource) { @@ -755,11 +669,10 @@ class Smarty_Template_Source /** * get a Compiled Object of this source * - * @param Smarty_Internal_Template|Smarty_Internal_Config $_template template object - * + * @param Smarty_Internal_Template $_template template objet * @return Smarty_Template_Compiled compiled object */ - public function getCompiled($_template) + public function getCompiled(Smarty_Internal_Template $_template) { // check runtime cache $_cache_key = $this->unique_resource . '#' . $_template->compile_id; @@ -791,9 +704,8 @@ class Smarty_Template_Source /** * <<magic>> Generic Setter. * - * @param string $property_name valid: timestamp, exists, content, template - * @param mixed $value new value (is not checked) - * + * @param string $property_name valid: timestamp, exists, content, template + * @param mixed $value new value (is not checked) * @throws SmartyException if $property_name is not valid */ public function __set($property_name, $value) @@ -803,7 +715,7 @@ class Smarty_Template_Source case 'timestamp': case 'exists': case 'content': - // required for extends: only + // required for extends: only case 'template': $this->$property_name = $value; break; @@ -816,8 +728,7 @@ class Smarty_Template_Source /** * <<magic>> Generic getter. * - * @param string $property_name valid: timestamp, exists, content - * + * @param string $property_name valid: timestamp, exists, content * @return mixed * @throws SmartyException if $property_name is not valid */ @@ -827,7 +738,6 @@ class Smarty_Template_Source case 'timestamp': case 'exists': $this->handler->populateTimestamp($this); - return $this->$property_name; case 'content': @@ -837,65 +747,62 @@ class Smarty_Template_Source throw new SmartyException("source property '$property_name' does not exist."); } } + } /** * Smarty Resource Data Object + * * Meta Data Container for Template Files * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Rodney Rehm + * @author Rodney Rehm + * * @property string $content compiled content */ -class Smarty_Template_Compiled -{ +class Smarty_Template_Compiled { + /** * Compiled Filepath - * * @var string */ public $filepath = null; /** * Compiled Timestamp - * * @var integer */ public $timestamp = null; /** - * Compiled Existence - * + * Compiled Existance * @var boolean */ public $exists = false; /** * Compiled Content Loaded - * * @var boolean */ public $loaded = false; /** * Template was compiled - * * @var boolean */ public $isCompiled = false; /** * Source Object - * * @var Smarty_Template_Source */ public $source = null; /** * Metadata properties - * populated by Smarty_Internal_Template::decodeProperties() * + * populated by Smarty_Internal_Template::decodeProperties() * @var array */ public $_properties = null; @@ -909,4 +816,7 @@ class Smarty_Template_Compiled { $this->source = $source; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_resource_custom.php b/Widgets/smarty/libs/sysplugins/smarty_resource_custom.php index 7c11bd8c..9ec1f356 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_resource_custom.php +++ b/Widgets/smarty/libs/sysplugins/smarty_resource_custom.php @@ -2,20 +2,21 @@ /** * Smarty Resource Plugin * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Rodney Rehm + * @author Rodney Rehm */ /** * Smarty Resource Plugin + * * Wrapper Implementation for custom resource plugins * - * @package Smarty + * @package Smarty * @subpackage TemplateResources */ -abstract class Smarty_Resource_Custom extends Smarty_Resource -{ +abstract class Smarty_Resource_Custom extends Smarty_Resource { + /** * fetch template and its modification time from data source * @@ -23,15 +24,15 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource * @param string &$source template source * @param integer &$mtime template modification timestamp (epoch) */ - abstract protected function fetch($name, &$source, &$mtime); + protected abstract function fetch($name, &$source, &$mtime); /** * Fetch template's modification timestamp from data source + * * {@internal implementing this method is optional. * Only implement it if modification times can be accessed faster than loading the complete template source.}} * - * @param string $name template name - * + * @param string $name template name * @return integer|boolean timestamp (epoch) the template was modified, or false if not found */ protected function fetchTimestamp($name) @@ -45,9 +46,9 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource * @param Smarty_Template_Source $source source object * @param Smarty_Internal_Template $_template template object */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) + public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) { - $source->filepath = $source->type . ':' . $source->name; + $source->filepath = strtolower($source->type . ':' . $source->name); $source->uid = sha1($source->type . ':' . $source->name); $mtime = $this->fetchTimestamp($source->name); @@ -56,9 +57,8 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource } else { $this->fetch($source->name, $content, $timestamp); $source->timestamp = isset($timestamp) ? $timestamp : false; - if (isset($content)) { + if( isset($content) ) $source->content = $content; - } } $source->exists = !!$source->timestamp; } @@ -66,10 +66,9 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource /** * Load template's source into current template object * - * @param Smarty_Template_Source $source source object - * - * @return string template source - * @throws SmartyException if source cannot be loaded + * @param Smarty_Template_Source $source source object + * @return string template source + * @throws SmartyException if source cannot be loaded */ public function getContent(Smarty_Template_Source $source) { @@ -84,12 +83,14 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource /** * Determine basename for compiled filename * - * @param Smarty_Template_Source $source source object - * - * @return string resource's basename + * @param Smarty_Template_Source $source source object + * @return string resource's basename */ protected function getBasename(Smarty_Template_Source $source) { return basename($source->name); } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_resource_recompiled.php b/Widgets/smarty/libs/sysplugins/smarty_resource_recompiled.php index 66b36e17..ab55b93a 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_resource_recompiled.php +++ b/Widgets/smarty/libs/sysplugins/smarty_resource_recompiled.php @@ -2,26 +2,26 @@ /** * Smarty Resource Plugin * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Rodney Rehm + * @author Rodney Rehm */ /** * Smarty Resource Plugin + * * Base implementation for resource plugins that don't compile cache * - * @package Smarty + * @package Smarty * @subpackage TemplateResources */ -abstract class Smarty_Resource_Recompiled extends Smarty_Resource -{ +abstract class Smarty_Resource_Recompiled extends Smarty_Resource { + /** * populate Compiled Object with compiled filepath * - * @param Smarty_Template_Compiled $compiled compiled object - * @param Smarty_Internal_Template $_template template object - * + * @param Smarty_Template_Compiled $compiled compiled object + * @param Smarty_Internal_Template $_template template object * @return void */ public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template) @@ -30,4 +30,7 @@ abstract class Smarty_Resource_Recompiled extends Smarty_Resource $compiled->timestamp = false; $compiled->exists = false; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_resource_uncompiled.php b/Widgets/smarty/libs/sysplugins/smarty_resource_uncompiled.php index 4ee5d790..ea802350 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_resource_uncompiled.php +++ b/Widgets/smarty/libs/sysplugins/smarty_resource_uncompiled.php @@ -2,29 +2,29 @@ /** * Smarty Resource Plugin * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Rodney Rehm + * @author Rodney Rehm */ /** * Smarty Resource Plugin + * * Base implementation for resource plugins that don't use the compiler * - * @package Smarty + * @package Smarty * @subpackage TemplateResources */ -abstract class Smarty_Resource_Uncompiled extends Smarty_Resource -{ +abstract class Smarty_Resource_Uncompiled extends Smarty_Resource { + /** * Render and output the template (without using the compiler) * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * - * @throws SmartyException on failure + * @param Smarty_Template_Source $source source object + * @param Smarty_Internal_Template $_template template object + * @throws SmartyException on failure */ - abstract public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template); + public abstract function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template); /** * populate compiled object with compiled filepath @@ -38,4 +38,7 @@ abstract class Smarty_Resource_Uncompiled extends Smarty_Resource $compiled->timestamp = false; $compiled->exists = false; } + } + +?>
\ No newline at end of file diff --git a/Widgets/smarty/libs/sysplugins/smarty_security.php b/Widgets/smarty/libs/sysplugins/smarty_security.php index 9f7183bd..90b0e3e2 100644 --- a/Widgets/smarty/libs/sysplugins/smarty_security.php +++ b/Widgets/smarty/libs/sysplugins/smarty_security.php @@ -2,25 +2,25 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage Security - * @author Uwe Tews + * @author Uwe Tews */ - + /* * FIXME: Smarty_Security API * - getter and setter instead of public properties would allow cultivating an internal cache properly * - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir are immutable * the cache is killed every time either of the variables change. That means that two distinct Smarty objects with differing - * $template_dir or $config_dir should NOT share the same Smarty_Security instance, - * as this would lead to (severe) performance penalty! how should this be handled? + * $template_dir or $config_dir should NOT share the same Smarty_Security instance, + * as this would lead to (severe) performance penalty! how should this be handled? */ /** * This class does contain the security settings */ -class Smarty_Security -{ +class Smarty_Security { + /** * This determines how Smarty handles "<?php ... ?>" tags in templates. * possible values: @@ -56,17 +56,17 @@ class Smarty_Security public $trusted_uri = array(); /** * This is an array of trusted static classes. + * * If empty access to all static classes is allowed. * If set to 'none' none is allowed. - * * @var array */ public $static_classes = array(); /** * This is an array of trusted PHP functions. + * * If empty all functions are allowed. * To disable all PHP functions set $php_functions = null. - * * @var array */ public $php_functions = array( @@ -77,10 +77,10 @@ class Smarty_Security 'nl2br', ); /** - * This is an array of trusted PHP modifiers. - * If empty all modifiers are allowed. - * To disable all modifier set $php_modifiers = null. + * This is an array of trusted PHP modifers. * + * If empty all modifiers are allowed. + * To disable all modifier set $modifiers = null. * @var array */ public $php_modifiers = array( @@ -89,90 +89,83 @@ class Smarty_Security ); /** * This is an array of allowed tags. - * If empty no restriction by allowed_tags. * + * If empty no restriction by allowed_tags. * @var array */ public $allowed_tags = array(); /** * This is an array of disabled tags. - * If empty no restriction by disabled_tags. * + * If empty no restriction by disabled_tags. * @var array */ public $disabled_tags = array(); /** * This is an array of allowed modifier plugins. - * If empty no restriction by allowed_modifiers. * + * If empty no restriction by allowed_modifiers. * @var array */ public $allowed_modifiers = array(); /** * This is an array of disabled modifier plugins. - * If empty no restriction by disabled_modifiers. * + * If empty no restriction by disabled_modifiers. * @var array */ public $disabled_modifiers = array(); /** * This is an array of trusted streams. + * * If empty all streams are allowed. * To disable all streams set $streams = null. - * * @var array */ public $streams = array('file'); /** * + flag if constants can be accessed from template - * * @var boolean */ public $allow_constants = true; /** * + flag if super globals can be accessed from template - * * @var boolean */ public $allow_super_globals = true; /** - * Cache for $resource_dir lookup - * + * Cache for $resource_dir lookups * @var array */ protected $_resource_dir = null; /** - * Cache for $template_dir lookup - * + * Cache for $template_dir lookups * @var array */ protected $_template_dir = null; /** - * Cache for $config_dir lookup - * + * Cache for $config_dir lookups * @var array */ protected $_config_dir = null; /** - * Cache for $secure_dir lookup - * + * Cache for $secure_dir lookups * @var array */ protected $_secure_dir = null; /** - * Cache for $php_resource_dir lookup - * + * Cache for $php_resource_dir lookups * @var array */ protected $_php_resource_dir = null; /** - * Cache for $trusted_dir lookup - * + * Cache for $trusted_dir lookups * @var array */ protected $_trusted_dir = null; - + + /** * @param Smarty $smarty */ @@ -180,14 +173,13 @@ class Smarty_Security { $this->smarty = $smarty; } - + /** * Check if PHP function is trusted. * - * @param string $function_name - * @param object $compiler compiler object - * - * @return boolean true if function is trusted + * @param string $function_name + * @param object $compiler compiler object + * @return boolean true if function is trusted * @throws SmartyCompilerException if php function is not trusted */ public function isTrustedPhpFunction($function_name, $compiler) @@ -197,17 +189,15 @@ class Smarty_Security } $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting"); - return false; // should not, but who knows what happens to the compiler in the future? } /** * Check if static class is trusted. * - * @param string $class_name - * @param object $compiler compiler object - * - * @return boolean true if class is trusted + * @param string $class_name + * @param object $compiler compiler object + * @return boolean true if class is trusted * @throws SmartyCompilerException if static class is not trusted */ public function isTrustedStaticClass($class_name, $compiler) @@ -217,17 +207,15 @@ class Smarty_Security } $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting"); - return false; // should not, but who knows what happens to the compiler in the future? } /** * Check if PHP modifier is trusted. * - * @param string $modifier_name - * @param object $compiler compiler object - * - * @return boolean true if modifier is trusted + * @param string $modifier_name + * @param object $compiler compiler object + * @return boolean true if modifier is trusted * @throws SmartyCompilerException if modifier is not trusted */ public function isTrustedPhpModifier($modifier_name, $compiler) @@ -237,25 +225,22 @@ class Smarty_Security } $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting"); - return false; // should not, but who knows what happens to the compiler in the future? } /** * Check if tag is trusted. * - * @param string $tag_name - * @param object $compiler compiler object - * - * @return boolean true if tag is trusted + * @param string $tag_name + * @param object $compiler compiler object + * @return boolean true if tag is trusted * @throws SmartyCompilerException if modifier is not trusted */ public function isTrustedTag($tag_name, $compiler) { // check for internal always required tags if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin', 'private_object_block_function', - 'private_object_function', 'private_registered_function', 'private_registered_block', 'private_special_variable', 'private_print_expression', 'private_modifier')) - ) { + 'private_object_function', 'private_registered_function', 'private_registered_block', 'private_special_variable', 'private_print_expression', 'private_modifier'))) { return true; } // check security settings @@ -265,22 +250,20 @@ class Smarty_Security } else { $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", $compiler->lex->taglineno); } - } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) { + } else if (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) { return true; } else { $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", $compiler->lex->taglineno); } - return false; // should not, but who knows what happens to the compiler in the future? } /** * Check if modifier plugin is trusted. * - * @param string $modifier_name - * @param object $compiler compiler object - * - * @return boolean true if tag is trusted + * @param string $modifier_name + * @param object $compiler compiler object + * @return boolean true if tag is trusted * @throws SmartyCompilerException if modifier is not trusted */ public function isTrustedModifier($modifier_name, $compiler) @@ -296,21 +279,19 @@ class Smarty_Security } else { $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", $compiler->lex->taglineno); } - } elseif (in_array($modifier_name, $this->allowed_modifiers) && !in_array($modifier_name, $this->disabled_modifiers)) { + } else if (in_array($modifier_name, $this->allowed_modifiers) && !in_array($modifier_name, $this->disabled_modifiers)) { return true; } else { $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", $compiler->lex->taglineno); } - return false; // should not, but who knows what happens to the compiler in the future? } /** * Check if stream is trusted. * - * @param string $stream_name - * - * @return boolean true if stream is trusted + * @param string $stream_name + * @return boolean true if stream is trusted * @throws SmartyException if stream is not trusted */ public function isTrustedStream($stream_name) @@ -325,9 +306,8 @@ class Smarty_Security /** * Check if directory of file resource is trusted. * - * @param string $filepath - * - * @return boolean true if directory is trusted + * @param string $filepath + * @return boolean true if directory is trusted * @throws SmartyException if directory is not trusted */ public function isTrustedResourceDir($filepath) @@ -341,8 +321,8 @@ class Smarty_Security // check if index is outdated if ((!$this->_template_dir || $this->_template_dir !== $_template_dir) - || (!$this->_config_dir || $this->_config_dir !== $_config_dir) - || (!empty($this->secure_dir) && (!$this->_secure_dir || $this->_secure_dir !== $this->secure_dir)) + || (!$this->_config_dir || $this->_config_dir !== $_config_dir) + || (!empty($this->secure_dir) && (!$this->_secure_dir || $this->_secure_dir !== $this->secure_dir)) ) { $this->_resource_dir = array(); $_template = true; @@ -382,12 +362,11 @@ class Smarty_Security $_directory = array(); while (true) { // remember the directory to add it to _resource_dir in case we're successful - $_directory[$directory] = true; + $_directory[] = $directory; // test if the directory is trusted if (isset($this->_resource_dir[$directory])) { - // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup + // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups $this->_resource_dir = array_merge($this->_resource_dir, $_directory); - return true; } // abort if we've reached root @@ -401,16 +380,15 @@ class Smarty_Security // give up throw new SmartyException("directory '{$_filepath}' not allowed by security setting"); } - + /** * Check if URI (e.g. {fetch} or {html_image}) is trusted + * * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}". * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string" * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}. - * - * @param string $uri - * - * @return boolean true if URI is trusted + * @param string $uri + * @return boolean true if URI is trusted * @throws SmartyException if URI is not trusted * @uses $trusted_uri for list of patterns to match against $uri */ @@ -425,16 +403,15 @@ class Smarty_Security } } } - + throw new SmartyException("URI '{$uri}' not allowed by security setting"); } - + /** * Check if directory of file resource is trusted. * - * @param string $filepath - * - * @return boolean true if directory is trusted + * @param string $filepath + * @return boolean true if directory is trusted * @throws SmartyException if PHP directory is not trusted */ public function isTrustedPHPDir($filepath) @@ -462,9 +439,8 @@ class Smarty_Security $_directory[] = $directory; // test if the directory is trusted if (isset($this->_php_resource_dir[$directory])) { - // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup + // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups $this->_php_resource_dir = array_merge($this->_php_resource_dir, $_directory); - return true; } // abort if we've reached root @@ -477,4 +453,7 @@ class Smarty_Security throw new SmartyException("directory '{$_filepath}' not allowed by security setting"); } + } + +?>
\ No newline at end of file diff --git a/Widgets/version b/Widgets/version new file mode 100644 index 00000000..8a1ce94d --- /dev/null +++ b/Widgets/version @@ -0,0 +1,4 @@ +Widgets: REL1_25 +2015-06-16T21:31:15 + +24de39e |