Merge branch 'master' of git://github.com/Froxlor/Froxlor

actions/admin/settings/225.logrotate.php

@@ -1,67 +0,0 @@
-<?php
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Settings
- *
- */
-
-return array(
-'groups' => array(
-		'logrotate' => array(
-			'title' => $lng['logrotate'],
-			'fields' => array(
-				'logrotate_enabled' => array(
-					'label' => $lng['logrotate_enabled'],
-					'settinggroup' => 'system',
-					'varname' => 'logrotate_enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
-				),
-				'logrotate_binary' => array(
-					'label' => $lng['logrotate_binary'],
-					'settinggroup' => 'system',
-					'varname' => 'logrotate_binary',
-					'type' => 'string',
-					'default' => '/usr/sbin/logrotate',
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),
-				'logrotate_interval' => array(
-					'label' => $lng['logrotate_interval'],
-					'settinggroup' => 'system',
-					'varname' => 'logrotate_interval',
-					'type' => 'option',
-					'default' => 'weekly',
-					'option_mode' => 'one',
-				        'option_options' => array('daily' => 'Daily', 'weekly' => 'Weekly', 'monthly' => 'Monthly'),
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),
-				'logrotate_keep' => array(
-					'label' => $lng['logrotate_keep'],
-					'settinggroup' => 'system',
-					'varname' => 'logrotate_keep',
-					'type' => 'string',
-					'default' => '4',
-					'save_method' => 'storeSettingField',
-					'overview_option' => false
-				),				
-				),
-			),
-		),
-	);
-
-?>

admin_configfiles.php

@@ -98,7 +98,9 @@ if($userinfo['change_serversettings'] == '1')
 			'<SSLPROTOCOLS>' => ($settings['system']['use_ssl'] == '1') ? 'imaps pop3s' : '',
 			'<CUSTOMER_TMP>' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? makeCorrectDir($settings['system']['mod_fcgid_tmpdir']) : '/tmp/',
 			'<BASE_PATH>' => makeCorrectDir(dirname(__FILE__)),
-			'<BIND_CONFIG_PATH>' => makeCorrectDir($settings['system']['bindconf_directory'])
+			'<BIND_CONFIG_PATH>' => makeCorrectDir($settings['system']['bindconf_directory']),
+			'<WEBSERVER_RELOAD_CMD>' => $settings['system']['apachereload_command'],
+			'<CUSTOMER_LOGS>' => makeCorrectDir($settings['system']['logfiles_directory'])
 		);
 		$files = '';
 		$configpage = '';

admin_ipsandports.php

@@ -83,7 +83,7 @@ if($page == 'ipsandports'
 		if(isset($result['id'])
 		   && $result['id'] == $id)
 		{
-			$result_checkdomain = $db->query_first("SELECT `id_domain` as `id` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandport`='" . (int)$id . "'");
+			$result_checkdomain = $db->query_first("SELECT `id_domain` as `id` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandports`='" . (int)$id . "'");
 
 			if($result_checkdomain['id'] == '')
 			{
@@ -104,7 +104,7 @@ if($page == 'ipsandports'
 								$db->query("DELETE FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id`='" . (int)$id . "'");
 
 								// also, remove connections to domains (multi-stack)
-								$db->query("DELETE FROM `".TABLE_DOMAINTOIP."` WHERE `id`='".(int)$id."'");
+								$db->query("DELETE FROM `".TABLE_DOMAINTOIP."` WHERE `id_ipandports`='".(int)$id."'");
 
 								$log->logAction(ADM_ACTION, LOG_WARNING, "deleted IP/port '" . $result['ip'] . ":" . $result['port'] . "'");
 								inserttask('1');

install/updates/froxlor/0.9/update_0.9.inc.php

@@ -2219,3 +2219,17 @@ if (isFroxlorVersion('0.9.29.1-dev1')) {
 
 	updateToVersion('0.9.29.1-dev2');
 }
+
+if (isFroxlorVersion('0.9.29.1-dev2')) {
+	showUpdateStep("Updating from 0.9.29.1-dev2 to 0.9.29.1-dev3", true);
+	lastStepStatus(0);
+
+	showUpdateStep("Removing old logrotate settings");
+	$db->query("DELETE FROM `panel_settings` WHERE `varname` = 'logrotate_enabled';");
+	$db->query("DELETE FROM `panel_settings` WHERE `varname` = 'logrotate_binary';");
+	$db->query("DELETE FROM `panel_settings` WHERE `varname` = 'logrotate_interval';");
+	$db->query("DELETE FROM `panel_settings` WHERE `varname` = 'logrotate_keep';");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.29.1-dev3');
+}

install/updates/preconfig/0.9/preconfig_0.9.inc.php

@@ -541,4 +541,11 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 		$question.= '<input type="text" class="text" name="system_customersslpath" value="/etc/apache2/ssl/" />';
 		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
 	}
+
+	if (versionInUpdate($current_version, '0.9.29.1-dev3')) {
+		$has_preconfig = true;
+		$description  = 'The build in logrotation-feature has been removed. Please follow the configuration-instructions for your system to enable logrotating again.';
+		$question = '';
+		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+	}
 }

js/html5shiv.js

@@ -1,8 +1,8 @@
 /*
- HTML5 Shiv v3.6.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+ HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
 */
 (function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
-a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}</style>";
+a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}</style>";
 c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
-"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video",version:"3.6.2",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment();
+"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);
-for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
+if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);

lib/classes/Smarty

@@ -1 +1 @@
-Smarty-3.1.14/libs/
+Smarty-3.1.15/libs/

lib/classes/Smarty-3.1.14/libs/sysplugins/smarty_internal_compile_block.php

@@ -1,283 +0,0 @@
-<?php
-
-/**
- * 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 {
-
-    /**
-     * 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', 'hide');
-
-    /**
-     * 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
-     */
-    public function compile($args, $compiler) {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $save = array($_attr, $compiler->parser->current_buffer, $compiler->nocache, $compiler->smarty->merge_compiled_includes, $compiler->merged_templates, $compiler->smarty->merged_templates_func, $compiler->template->properties, $compiler->template->has_nocache_code);
-        $this->openTag($compiler, 'block', $save);
-        if ($_attr['nocache'] == true) {
-            $compiler->nocache = true;
-        }
-        // set flag for {block} tag
-        $compiler->inheritance = true;
-        // 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;
-    }
-
-    /**
-     * Save or replace child block source by block name during parsing
-     *
-     * @param string $block_content     block source content
-     * @param string $block_tag         opening block tag
-     * @param object $template          template object
-     * @param string $filepath          filepath of template source
-     */
-    public static function saveBlockData($block_content, $block_tag, $template, $filepath) {
-        $_rdl = preg_quote($template->smarty->right_delimiter);
-        $_ldl = preg_quote($template->smarty->left_delimiter);
-        if (!$template->smarty->auto_literal) {
-            $al = '\s*';
-        } else {
-            $al = '';
-        }
-        if (0 == preg_match("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")(\s*?)?((append|prepend|nocache)?(\s*)?(hide)?)?(\s*{$_rdl})!", $block_tag, $_match)) {
-            $error_text = 'Syntax Error in template "' . $template->source->filepath . '"   "' . $block_tag . '" illegal options';
-            throw new SmartyCompilerException($error_text);
-        } else {
-            $_name = trim($_match[3], '\'"');
-            if ($_match[8] != 'hide' || isset($template->block_data[$_name])) {        // replace {$smarty.block.child}
-                // get nested block tags
-                if (0 != preg_match_all("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")([\s\S]*?)(hide)?(\s*{$_rdl})([\s\S]*?)(.*)?({$_ldl}{$al}/block\s*{$_rdl})!", $block_content, $_match2)) {
-                    foreach ($_match2[3] as $key => $name) {
-                        // get it's replacement
-                        $_name2 = trim($name, '\'"');
-                        if ($_match2[5][$key] != 'hide' || isset($template->block_data[$_name2])) {
-                            if (isset($template->block_data[$_name2])) {
-                                $replacement = $template->block_data[$_name2]['source'];
-                            } else {
-                                $replacement = '';
-                            }
-                            // replace {$smarty.block.child} tag
-                            if (preg_match("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!",$_match2[7][$key])) {
-                                 $replacement =  preg_replace("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $replacement, $_match2[7][$key]);
-                                 $block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl}[\s\S]*?{$_ldl}{$al}/block\s*{$_rdl}))!", $replacement, $block_content);
-                           }
-                             if (preg_match("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!",$_match2[8][$key])) {
-                                 $replacement =  preg_replace("!{$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl}!", $replacement, $_match2[8][$key]);
-                                 $block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl})(.*)?({$_ldl}{$al}/block\s*{$_rdl}))!", $replacement, $block_content);
-                             }
-                        } else {
-                            // remove hidden blocks
-                            $block_content = preg_replace("!(({$_ldl}{$al}block)(.*)?{$name}(.*)?({$_rdl}[\s\S]*?{$_ldl}{$al}/block\s*{$_rdl}))!", '', $block_content);
-                        }
-                    }
-                }
-                // do we have not nested {$smart.block.child}
-                if (0 != preg_match("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $block_content, $_match2)) {
-                    // get child replacement for this block
-                    if (isset($template->block_data[$_name])) {
-                        $replacement = $template->block_data[$_name]['source'];
-                        unset($template->block_data[$_name]);
-                    } else {
-                        $replacement = '';
-                    }
-                    $block_content = preg_replace("!({$_ldl}{$al}\\\$smarty\.block\.child\s*{$_rdl})!", $replacement, $block_content);
-                }
-                if (isset($template->block_data[$_name])) {
-                    if (strpos($template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
-                        $template->block_data[$_name]['source'] =
-                                str_replace('%%%%SMARTY_PARENT%%%%', $block_content, $template->block_data[$_name]['source']);
-                    } elseif ($template->block_data[$_name]['mode'] == 'prepend') {
-                        $template->block_data[$_name]['source'] .= $block_content;
-                    } elseif ($template->block_data[$_name]['mode'] == 'append') {
-                        $template->block_data[$_name]['source'] = $block_content . $template->block_data[$_name]['source'];
-                    }
-                } else {
-                    $template->block_data[$_name]['source'] = $block_content;
-                    $template->block_data[$_name]['file'] = $filepath;
-                }
-                if ($_match[6] == 'append') {
-                    $template->block_data[$_name]['mode'] = 'append';
-                } elseif ($_match[6] == 'prepend') {
-                    $template->block_data[$_name]['mode'] = 'prepend';
-                } else {
-                    $template->block_data[$_name]['mode'] = 'replace';
-                }
-            }
-        }
-    }
-
-    /**
-     * Compile saved child block source
-     *
-     * @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'], "'\"");
-                    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('{$smarty.block.child} used out of context', $compiler->lex->taglineno);
-        }
-        // undefined child?
-        if (!isset($compiler->template->block_data[$_name]['source'])) {
-            return '';
-        }
-        $_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);
-        $_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;
-        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;
-        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) . $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);
-        } elseif (!empty($compiler->template->block_data[$_name])) {
-            $_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']);
-        $compiler->merged_templates = array_merge($compiler->merged_templates, $_tpl->compiler->merged_templates);
-        $compiler->template->variable_filters = $_tpl->variable_filters;
-        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) {
-                    $compiler->template->required_plugins[$code][$name][$type] = $data;
-                }
-            }
-        }
-        unset($_tpl);
-        return $_output;
-    }
-
-}
-
-/**
- * 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
-     */
-    public function compile($args, $compiler) {
-        $compiler->has_code = true;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $saved_data = $this->closeTag($compiler, array('block'));
-        $_name = trim($saved_data[0]['name'], "\"'");
-        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
-            // restore to status before {block} tag as new subtemplate code of parent {block} is not needed
-            // TODO: Below code was disabled in 3.1.8 because of problems with {include} in nested {block} tags in child templates
-            //       combined with append/prepend or $smarty.block.parent
-            //       For later versions it should be checked under which conditions it could run for optimisation
-            //
-            //$compiler->merged_templates = $saved_data[4];
-            //$compiler->smarty->merged_templates_func = $saved_data[5];
-            //$compiler->template->properties = $saved_data[6];
-            //$compiler->template->has_nocache_code = $saved_data[7];
-            $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
-        } else {
-            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']);
-        }
-        // reset flags
-        $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;
-    }
-
-}
-
-?>

lib/classes/Smarty-3.1.14/libs/sysplugins/smarty_internal_compile_extends.php

@@ -1,133 +0,0 @@
-<?php
-
-/**
-* 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 {
-
-    /**
-    * 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
-    */
-    public $shorttag_order = array('file');
-    /**
-    * mbstring.overload flag
-    *
-    * @var int
-    */
-    public $mbstring_overload = 0;
-
-    /**
-    * 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);
-        if (!$compiler->smarty->auto_literal) {
-            $al = '\s*';
-        } else {
-            $al = '';
-        }
-        $filepath = $compiler->template->source->filepath;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
-        // check and get attributes
-        $_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);
-        }
-        eval('$include_file = ' . $_attr['file'] . ';');
-        // create template object
-        $_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 {
-            $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 = ($this->mbstring_overload ? mb_substr($compiler->lex->data, $compiler->lex->counter - 1, 20000000, 'latin1') : substr($compiler->lex->data, $compiler->lex->counter - 1));
-        if (preg_match_all("!({$this->_ldl}{$al}block\s(.+?)\s*{$this->_rdl})!", $_content, $s) !=
-        preg_match_all("!({$this->_ldl}{$al}/block\s*{$this->_rdl})!", $_content, $c)) {
-            $compiler->trigger_template_error('unmatched {block} {/block} pairs');
-        }
-        preg_match_all("!{$this->_ldl}{$al}block\s(.+?)\s*{$this->_rdl}|{$this->_ldl}{$al}/block\s*{$this->_rdl}|{$this->_ldl}\*([\S\s]*?)\*{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
-        $_result_count = count($_result[0]);
-        $_start = 0;
-        while ($_start+1 < $_result_count) {
-            $_end = 0;
-            $_level = 1;
-            if (($this->mbstring_overload ? mb_substr($_result[0][$_start][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') {
-                $_start++;
-                continue;
-            }
-            while ($_level != 0) {
-                $_end++;
-                if (($this->mbstring_overload ? mb_substr($_result[0][$_start + $_end][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start + $_end][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') {
-                    continue;
-                }
-                if (!strpos($_result[0][$_start + $_end][0], '/')) {
-                    $_level++;
-                } else {
-                    $_level--;
-                }
-            }
-            $_block_content = str_replace($compiler->smarty->left_delimiter . '$smarty.block.parent' . $compiler->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
-            ($this->mbstring_overload ? mb_substr($_content, $_result[0][$_start][1] + mb_strlen($_result[0][$_start][0], 'latin1'), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + mb_strlen($_result[0][$_start][0], 'latin1'), 'latin1') : substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))));
-            Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath);
-            $_start = $_start + $_end + 1;
-        }
-        if ($_template->source->type == 'extends') {
-            $_template->block_data = $compiler->template->block_data;
-        }
-        $compiler->template->source->content = $_template->source->content;
-        if ($_template->source->type == 'extends') {
-            $compiler->template->block_data = $_template->block_data;
-            foreach ($_template->source->components as $key => $component) {
-                $compiler->template->properties['file_dependency'][$key] = array($component->filepath, $component->timestamp, $component->type);
-            }
-        }
-        $compiler->template->source->filepath = $_template->source->filepath;
-        $compiler->abort_and_recompile = true;
-        return '';
-    }
-
-}
-
-?>

lib/classes/Smarty-3.1.14/libs/sysplugins/smarty_internal_compile_include.php

@@ -1,215 +0,0 @@
-<?php
-/**
-* 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 {
-
-    /**
-    * 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
-    */
-    public $required_attributes = array('file');
-    /**
-    * 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
-    */
-    public $option_flags = array('nocache', 'inline', 'caching');
-    /**
-    * 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
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // save posible attributes
-        $include_file = $_attr['file'];
-
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of beind displayed
-            $_assign = $_attr['assign'];
-        }
-
-        $_parent_scope = Smarty::SCOPE_LOCAL;
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_parent_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_parent_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_parent_scope = Smarty::SCOPE_GLOBAL;
-            }
-        }
-        $_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;
-        }
-        /*
-        * if the {include} tag provides individual parameter for caching
-        * it will not be included into the common cache file and treated like
-        * a nocache section
-        */
-        if (isset($_attr['cache_lifetime'])) {
-            $_cache_lifetime = $_attr['cache_lifetime'];
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        } else {
-            $_cache_lifetime = 'null';
-        }
-        if (isset($_attr['cache_id'])) {
-            $_cache_id = $_attr['cache_id'];
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        } else {
-            $_cache_id = '$_smarty_tpl->cache_id';
-        }
-        if (isset($_attr['compile_id'])) {
-            $_compile_id = $_attr['compile_id'];
-        } else {
-            $_compile_id = '$_smarty_tpl->compile_id';
-        }
-        if ($_attr['caching'] === true) {
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        }
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_OFF;
-        }
-
-        $has_compiled_template = false;
-        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_'. str_replace('.', '_', uniqid('', true));
-                    // use current nocache hash for inlined code
-                    $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-                    if ($compiler->template->caching) {
-                        // needs code for cached page but no cache file
-                        $tpl->caching = self::CACHING_NOCACHE_CODE;
-                    }
-                    // make sure whole chain gest compiled
-                    $tpl->mustCompile = true;
-                    if (!($tpl->source->uncompiled) && $tpl->source->exists) {
-                        // get compiled code
-                        $compiled_code = $tpl->compiler->compileTemplate($tpl);
-                        // release compiler object to free memory
-                        unset($tpl->compiler);
-                        // merge compiled code for {function} tags
-                        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']);
-                        // merge filedependency
-                        $tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp,$tpl->source->type);
-                        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']);
-                        // remove header code
-                        $compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code);
-                        if ($tpl->has_nocache_code) {
-                            // replace nocache_hash
-                            $compiled_code = str_replace("{$tpl->properties['nocache_hash']}", $compiler->template->properties['nocache_hash'], $compiled_code);
-                            $compiler->template->has_nocache_code = true;
-                        }
-                        $compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
-                        $has_compiled_template = true;
-                    }
-                } else {
-                    $has_compiled_template = true;
-                }
-            }
-        }
-        // delete {include} standard attributes
-        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
-        // remaining attributes must be assigned as smarty variable
-        if (!empty($_attr)) {
-            if ($_parent_scope == Smarty::SCOPE_LOCAL) {
-                // create variables
-                foreach ($_attr as $key => $value) {
-                    $_pairs[] = "'$key'=>$value";
-                }
-                $_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) {
-            $_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";
-            $_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]['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 .= "/*  End of included template \"" . $tpl_name . "\" */?>";
-            return $_output;
-        }
-
-        // was there an assign attribute
-        if (isset($_assign)) {
-            $_output = "<?php \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(\$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope));?>\n";;
-        } else {
-            $_output = "<?php echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n";
-        }
-        return $_output;
-    }
-
-}
-
-?>

lib/classes/Smarty-3.1.14/libs/sysplugins/smarty_internal_resource_extends.php

@@ -1,162 +0,0 @@
-<?php
-/**
-* 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;
-
-    /**
-    * 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();
-        $components = explode('|', $source->name);
-        $exists = true;
-        foreach ($components as $component) {
-            $s = Smarty_Resource::source(null, $source->smarty, $component);
-            if ($s->type == 'php') {
-                throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type");
-            }
-            $sources[$s->uid] = $s;
-            $uid .= $s->filepath;
-            if ($_template && $_template->smarty->compile_check) {
-                $exists = $exists && $s->exists;
-            }
-        }
-        $source->components = $sources;
-        $source->filepath = $s->filepath;
-        $source->uid = sha1($uid);
-        if ($_template && $_template->smarty->compile_check) {
-            $source->timestamp = $s->timestamp;
-            $source->exists = $exists;
-        }
-        // need the template at getContent()
-        $source->template = $_template;
-    }
-
-    /**
-    * 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->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
-    */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        if (!$source->exists) {
-            throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-        }
-
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
-        $_rdl = preg_quote($source->smarty->right_delimiter);
-        $_ldl = preg_quote($source->smarty->left_delimiter);
-        if (!$source->smarty->auto_literal) {
-            $al = '\s*';
-        } else {
-            $al = '';
-        }
-        $_components = array_reverse($source->components);
-        $_first = reset($_components);
-        $_last = end($_components);
-
-        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
-            $source->filepath = $_component->filepath;
-            $_content = $_component->content;
-
-            // extend sources
-            if ($_component != $_last) {
-                if (preg_match_all("!({$_ldl}{$al}block\s(.+?)\s*{$_rdl})!", $_content, $_open) !=
-                preg_match_all("!({$_ldl}{$al}/block\s*{$_rdl})!", $_content, $_close)) {
-                    throw new SmartyException("unmatched {block} {/block} pairs in template {$_component->type} '{$_component->name}'");
-                }
-                preg_match_all("!{$_ldl}{$al}block\s(.+?)\s*{$_rdl}|{$_ldl}{$al}/block\s*{$_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 (($this->mbstring_overload ? mb_substr($_result[0][$_start][0],0,mb_strlen($source->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start][0],0,strlen($source->smarty->left_delimiter)+1)) == $source->smarty->left_delimiter.'*') {
-                        $_start++;
-                        continue;
-                    }
-                    while ($_level != 0) {
-                        $_end++;
-                        if (($this->mbstring_overload ? mb_substr($_result[0][$_start + $_end][0],0,mb_strlen($source->smarty->left_delimiter,'latin1')+1, 'latin1') : 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%%%%',
-                    ($this->mbstring_overload ? mb_substr($_content, $_result[0][$_start][1] + mb_strlen($_result[0][$_start][0], 'latin1'), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + mb_strlen($_result[0][$_start][0], 'latin1'), 'latin1') : substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))));
-                    Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $source->template, $_component->filepath);
-                    $_start = $_start + $_end + 1;
-                }
-            } else {
-                return $_content;
-            }
-        }
-    }
-
-    /**
-    * 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));
-    }
-
-}
-
-?>

lib/classes/Smarty-3.1.15/README

@@ -1,4 +1,4 @@
-Smarty 3.1.14
+Smarty 3.1.15
 
 Author: Monte Ohrt <monte at ohrt dot com >
 Author: Uwe Tews

lib/classes/Smarty-3.1.15/change_log.txt

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

lib/classes/Smarty-3.1.15/demo/index.php

@@ -5,12 +5,10 @@
  * @package Example-application
  */
 
-require('../libs/Smarty.class.php');
+require '../libs/Smarty.class.php';
 
 $smarty = new Smarty;
 
-
-
 //$smarty->force_compile = true;
 $smarty->debugging = true;
 $smarty->caching = true;
@@ -20,14 +18,13 @@ $smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill",true);
 $smarty->assign("FirstName",array("John","Mary","James","Henry"));
 $smarty->assign("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")));
+      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")));
+      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');
-?>

lib/classes/Smarty-3.1.15/demo/plugins/cacheresource.apc.php

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

lib/classes/Smarty-3.1.15/demo/plugins/cacheresource.memcache.php

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

lib/classes/Smarty-3.1.15/demo/plugins/cacheresource.mysql.php

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

lib/classes/Smarty-3.1.15/demo/plugins/resource.extendsall.php

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

lib/classes/Smarty-3.1.15/demo/plugins/resource.mysql.php

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

lib/classes/Smarty-3.1.15/demo/plugins/resource.mysqls.php

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

lib/classes/Smarty-3.1.15/libs/Smarty.class.php

@@ -2,7 +2,7 @@
 /**
  * Project:     Smarty: the PHP compiling template engine
  * File:        Smarty.class.php
- * SVN:         $Id: Smarty.class.php 4742 2013-06-17 13:30:49Z Uwe.Tews@googlemail.com $
+ * SVN:         $Id: Smarty.class.php 4778 2013-09-17 20:44:41Z Uwe.Tews@googlemail.com $
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
  * @author Uwe Tews
  * @author Rodney Rehm
  * @package Smarty
- * @version 3.1-DEV
+ * @version 3.1.15
  */
 
 /**
@@ -104,8 +104,8 @@ 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
      */
@@ -113,7 +113,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * smarty version
      */
-    const SMARTY_VERSION = 'Smarty-3.1.14';
+    const SMARTY_VERSION = 'Smarty-3.1.15';
 
     /**
      * define variable scopes
@@ -633,7 +633,6 @@ class Smarty extends Smarty_Internal_TemplateBase {
         }
     }
 
-
     /**
      * Class destructor
      */
@@ -650,14 +649,13 @@ 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)
@@ -706,7 +704,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)
@@ -717,14 +715,15 @@ 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 object $smarty
+     * @param  object $smarty
-     * @param string $varname variable name or null
+     * @param  string $varname variable name or null
      * @return string variable value or or array of variables
      */
     public function getGlobal($varname = null)
@@ -740,6 +739,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
             foreach (self::$global_tpl_vars AS $key => $var) {
                 $_result[$key] = $var->value;
             }
+
             return $_result;
         }
     }
@@ -747,26 +747,27 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Empty cache folder
      *
-     * @param integer $exp_time expiration time
+     * @param  integer $exp_time expiration time
-     * @param string  $type     resource type
+     * @param  string  $type     resource type
      * @return integer number of cache files deleted
      */
-    function clearAllCache($exp_time = null, $type = null)
+    public 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  $template_name template name
-     * @param string  $cache_id      cache id
+     * @param  string  $cache_id      cache id
-     * @param string  $compile_id    compile id
+     * @param  string  $compile_id    compile id
-     * @param integer $exp_time      expiration time
+     * @param  integer $exp_time      expiration time
-     * @param string  $type          resource type
+     * @param  string  $type          resource type
      * @return integer number of cache files deleted
      */
     public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
@@ -774,20 +775,22 @@ class Smarty extends Smarty_Internal_TemplateBase {
         // load cache resource and call clear
         $_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
+     * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
-     * @return Smarty current Smarty instance for chaining
+     * @return Smarty                 current Smarty instance for chaining
-     * @throws SmartyException when an invalid class name is provided
+     * @throws SmartyException        when an invalid class name is provided
      */
     public function enableSecurity($security_class = null)
     {
         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.");
@@ -820,8 +823,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Set template directory
      *
-     * @param string|array $template_dir directory(s) of template sources
+     * @param  string|array $template_dir directory(s) of template sources
-     * @return Smarty current Smarty instance for chaining
+     * @return Smarty       current Smarty instance for chaining
      */
     public function setTemplateDir($template_dir)
     {
@@ -831,15 +834,16 @@ class Smarty extends Smarty_Internal_TemplateBase {
         }
 
         $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|array    $template_dir directory(s) of template sources
-     * @param string       $key          of the array element to assign the template dir to
+     * @param  string          $key          of the array element to assign the template dir to
-     * @return Smarty current Smarty instance for chaining
+     * @return Smarty          current Smarty instance for chaining
      * @throws SmartyException when the given template directory is not valid
      */
     public function addTemplateDir($template_dir, $key=null)
@@ -865,6 +869,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
             $this->template_dir[] = rtrim($template_dir, '/\\') . DS;
         }
         $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
+
         return $this;
     }
 
@@ -880,14 +885,14 @@ class Smarty extends Smarty_Internal_TemplateBase {
             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 string|array $template_dir directory(s) of configuration sources
+     * @param  string|array $template_dir directory(s) of configuration sources
-     * @return Smarty current Smarty instance for chaining
+     * @return Smarty       current Smarty instance for chaining
      */
     public function setConfigDir($config_dir)
     {
@@ -897,6 +902,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
         }
 
         $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
+
         return $this;
     }
 
@@ -922,7 +928,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
                     $this->config_dir[$k] = rtrim($v, '/\\') . DS;
                 }
             }
-        } elseif( $key !== null ) {
+        } elseif ($key !== null) {
             // override directory at specified index
             $this->config_dir[$key] = rtrim($config_dir, '/\\') . DS;
         } else {
@@ -931,6 +937,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
         }
 
         $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
+
         return $this;
     }
 
@@ -946,19 +953,19 @@ class Smarty extends Smarty_Internal_TemplateBase {
             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
+     * @param  string|array $plugins_dir directory(s) of plugins
-     * @return Smarty current Smarty instance for chaining
+     * @return Smarty       current Smarty instance for chaining
      */
     public function setPluginsDir($plugins_dir)
     {
         $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;
         }
 
@@ -993,6 +1000,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
         }
 
         $this->plugins_dir = array_unique($this->plugins_dir);
+
         return $this;
     }
 
@@ -1003,13 +1011,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)
@@ -1018,6 +1026,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
         if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
             Smarty::$_muted_directories[$this->compile_dir] = null;
         }
+
         return $this;
     }
 
@@ -1034,7 +1043,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)
@@ -1043,6 +1052,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
         if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
             Smarty::$_muted_directories[$this->cache_dir] = null;
         }
+
         return $this;
     }
 
@@ -1059,20 +1069,21 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Set default modifiers
      *
-     * @param array|string $modifiers modifier or list of modifiers to set
+     * @param  array|string $modifiers modifier or list of modifiers to set
-     * @return Smarty current Smarty instance for chaining
+     * @return Smarty       current Smarty instance for chaining
      */
     public function setDefaultModifiers($modifiers)
     {
         $this->default_modifiers = (array) $modifiers;
+
         return $this;
     }
 
     /**
      * Add default modifiers
      *
-     * @param array|string $modifiers modifier or list of modifiers to add
+     * @param  array|string $modifiers modifier or list of modifiers to add
-     * @return Smarty current Smarty instance for chaining
+     * @return Smarty       current Smarty instance for chaining
      */
     public function addDefaultModifiers($modifiers)
     {
@@ -1099,8 +1110,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Set autoload filters
      *
-     * @param array $filters filters to load automatically
+     * @param  array  $filters filters to load automatically
-     * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
+     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
      * @return Smarty current Smarty instance for chaining
      */
     public function setAutoloadFilters($filters, $type=null)
@@ -1117,8 +1128,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Add autoload filters
      *
-     * @param array $filters filters to load automatically
+     * @param  array  $filters filters to load automatically
-     * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
+     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
      * @return Smarty current Smarty instance for chaining
      */
     public function addAutoloadFilters($filters, $type=null)
@@ -1145,8 +1156,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Get autoload filters
      *
-     * @param string $type type of filter to get autoloads for. Defaults to all autoload filters
+     * @param  string $type type of filter to get autoloads for. Defaults to all autoload filters
-     * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified
+     * @return array  array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified
      */
     public function getAutoloadFilters($type=null)
     {
@@ -1170,8 +1181,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * set the debug template
      *
-     * @param string $tpl_name
+     * @param  string          $tpl_name
-     * @return Smarty current Smarty instance for chaining
+     * @return Smarty          current Smarty instance for chaining
      * @throws SmartyException if file is not readable
      */
     public function setDebugTemplate($tpl_name)
@@ -1187,12 +1198,12 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * creates a template object
      *
-     * @param string $template the resource handle of the template file
+     * @param  string  $template   the resource handle of the template file
-     * @param mixed $cache_id cache id to be used with this template
+     * @param  mixed   $cache_id   cache id to be used with this template
-     * @param mixed $compile_id compile id to be used with this template
+     * @param  mixed   $compile_id compile id to be used with this template
-     * @param object $parent next higher level of Smarty variables
+     * @param  object  $parent     next higher level of Smarty variables
-     * @param boolean $do_clone flag is Smarty object shall be cloned
+     * @param  boolean $do_clone   flag is Smarty object shall be cloned
-     * @return object template object
+     * @return object  template object
      */
     public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
     {
@@ -1247,6 +1258,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
                 $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
             }
         }
+
         return $tpl;
     }
 
@@ -1256,8 +1268,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
      * class name format: Smarty_PluginType_PluginName
      * plugin filename format: plugintype.pluginname.php
      *
-     * @param string $plugin_name    class plugin name to load
+     * @param  string $plugin_name class plugin name to load
-     * @param bool   $check          check if already loaded
+     * @param  bool   $check       check if already loaded
      * @return string |boolean filepath of loaded file or false
      */
     public function loadPlugin($plugin_name, $check = true)
@@ -1272,6 +1284,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
         // count($_name_parts) < 3 === !isset($_name_parts[2])
         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
@@ -1279,6 +1292,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
             $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
             if (file_exists($file)) {
                 require_once($file);
+
                 return $file;
             } else {
                 return false;
@@ -1290,7 +1304,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
         $_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),
@@ -1298,6 +1312,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
             foreach ($names as $file) {
                 if (file_exists($file)) {
                     require_once($file);
+
                     return $file;
                 }
                 if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
@@ -1310,6 +1325,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
 
                     if ($file !== false) {
                         require_once($file);
+
                         return $file;
                     }
                 }
@@ -1322,10 +1338,10 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Compile all template files
      *
-     * @param string $extension file extension
+     * @param  string  $extension     file extension
-     * @param bool $force_compile force all to recompile
+     * @param  bool    $force_compile force all to recompile
-     * @param int $time_limit
+     * @param  int     $time_limit
-     * @param int $max_errors
+     * @param  int     $max_errors
      * @return integer number of template files recompiled
      */
     public function compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
@@ -1336,10 +1352,10 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Compile all config files
      *
-     * @param string $extension file extension
+     * @param  string  $extension     file extension
-     * @param bool $force_compile force all to recompile
+     * @param  bool    $force_compile force all to recompile
-     * @param int $time_limit
+     * @param  int     $time_limit
-     * @param int $max_errors
+     * @param  int     $max_errors
      * @return integer number of template files recompiled
      */
     public function compileAllConfig($extension = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
@@ -1350,9 +1366,9 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Delete compiled template file
      *
-     * @param string $resource_name template name
+     * @param  string  $resource_name template name
-     * @param string $compile_id compile id
+     * @param  string  $compile_id    compile id
-     * @param integer $exp_time expiration time
+     * @param  integer $exp_time      expiration time
      * @return integer number of template files deleted
      */
     public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
@@ -1364,8 +1380,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
     /**
      * Return array of tag/attributes of all tags used by an template
      *
-     * @param object $templae template object
+     * @param  object $templae template object
-     * @return array of tag/attributes
+     * @return array  of tag/attributes
      */
     public function getTags(Smarty_Internal_Template $template)
     {
@@ -1375,7 +1391,7 @@ 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)
@@ -1387,7 +1403,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  integer $errno Error level
      * @return boolean
      */
     public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
@@ -1492,10 +1508,13 @@ if (Smarty::$_CHARSET !== 'UTF-8') {
  * Smarty exception class
  * @package Smarty
  */
-class SmartyException extends Exception {
+class SmartyException extends Exception
-    public static $escape = true;
+{
-    public function __construct($message) {
+    public static $escape = false;
-        $this->message = self::$escape ? htmlentities($message) : $message;
+
+    public function __toString()
+    {
+        return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message)  . ' <-- ';
     }
 }
 
@@ -1503,7 +1522,32 @@ class SmartyException extends Exception {
  * Smarty compiler exception class
  * @package Smarty
  */
-class SmartyCompilerException extends SmartyException  {
+class SmartyCompilerException extends SmartyException
+{
+    public function __toString()
+    {
+        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
+    }
+    /**
+     * The line number of the template error
+     * @type int|null
+     */
+    public $line = null;
+    /**
+     * The template source snippet relating to the error
+     * @type string|null
+     */
+    public $source = null;
+    /**
+     * The raw text of the error message
+     * @type string|null
+     */
+    public $desc = null;
+    /**
+     * The resource identifier or template name
+     * @type string|null
+     */
+    public $template = null;
 }
 
 /**
@@ -1512,7 +1556,7 @@ class SmartyCompilerException extends SmartyException  {
 function smartyAutoload($class)
 {
     $_class = strtolower($class);
-    $_classes = array(
+    static $_classes = array(
         'smarty_config_source' => true,
         'smarty_config_compiled' => true,
         'smarty_security' => true,
@@ -1529,5 +1573,3 @@ function smartyAutoload($class)
         include SMARTY_SYSPLUGINS_DIR . $_class . '.php';
     }
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/SmartyBC.class.php

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

lib/classes/Smarty-3.1.15/libs/plugins/block.textformat.php

@@ -53,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:
@@ -78,7 +78,6 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
     $_paragraphs = preg_split('![\r\n]{2}!', $content);
     $_output = '';
 
-
     foreach ($_paragraphs as &$_paragraph) {
         if (!$_paragraph) {
             continue;
@@ -109,5 +108,3 @@ function smarty_block_textformat($params, $content, $template, &$repeat)
         return $_output;
     }
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/function.counter.php

@@ -35,7 +35,7 @@ function smarty_function_counter($params, $template)
     $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,7 +47,7 @@ function smarty_function_counter($params, $template)
     }
 
     if (isset($params['print'])) {
-        $print = (bool)$params['print'];
+        $print = (bool) $params['print'];
     } else {
         $print = empty($counter['assign']);
     }
@@ -74,5 +74,3 @@ function smarty_function_counter($params, $template)
     return $retval;
 
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/function.cycle.php

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

lib/classes/Smarty-3.1.15/libs/plugins/function.fetch.php

@@ -24,6 +24,7 @@ function smarty_function_fetch($params, $template)
 {
     if (empty($params['file'])) {
         trigger_error("[plugin] fetch parameter 'file' cannot be empty",E_USER_NOTICE);
+
         return;
     }
 
@@ -40,12 +41,12 @@ function smarty_function_fetch($params, $template)
     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;
             }
         }
@@ -54,7 +55,7 @@ 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;
@@ -64,43 +65,44 @@ function smarty_function_fetch($params, $template)
             $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) {
+            foreach ($params as $param_key => $param_value) {
-                switch($param_key) {
+                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 (!empty($param_value)) {
-                            if(!preg_match('![\w\d-]+: .+!',$param_value)) {
+                            if (!preg_match('![\w\d-]+: .+!',$param_value)) {
                                 trigger_error("[plugin] invalid header format '".$param_value."'",E_USER_NOTICE);
+
                                 return;
                             } else {
                                 $extra_headers[] = $param_value;
@@ -108,80 +110,84 @@ 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);
+
                             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);
+
                             return;
                         }
                         break;
                     default:
                         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);
             } else {
                 $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
             }
 
-            if(!$fp) {
+            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)) {
+                if (isset($extra_headers) && is_array($extra_headers)) {
-                    foreach($extra_headers as $curr_header) {
+                    foreach ($extra_headers as $curr_header) {
                         fputs($fp, $curr_header."\r\n");
                     }
                 }
-                if(!empty($user) && !empty($pass)) {
+                if (!empty($user) && !empty($pass)) {
                     fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n");
                 }
 
                 fputs($fp, "\r\n");
-                while(!feof($fp)) {
+                while (!feof($fp)) {
                     $content .= fgets($fp,4096);
                 }
                 fclose($fp);
@@ -189,12 +195,13 @@ function smarty_function_fetch($params, $template)
 
                 $content = $csplit[1];
 
-                if(!empty($params['assign_headers'])) {
+                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);
+
             return;
         }
     } else {
@@ -210,5 +217,3 @@ function smarty_function_fetch($params, $template)
         return $content;
     }
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/function.html_checkboxes.php

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

lib/classes/Smarty-3.1.15/libs/plugins/function.html_image.php

@@ -47,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':
@@ -84,6 +84,7 @@ function smarty_function_html_image($params, $template)
 
     if (empty($file)) {
         trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
+
         return;
     }
 
@@ -106,12 +107,12 @@ function smarty_function_html_image($params, $template)
     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;
             }
         }
@@ -122,12 +123,15 @@ 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;
-            } else if (!is_readable($_image_path)) {
+            } elseif (!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;
             }
         }
@@ -155,5 +159,3 @@ function smarty_function_html_image($params, $template)
 
     return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix;
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/function.html_options.php

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

lib/classes/Smarty-3.1.15/libs/plugins/function.html_radios.php

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

lib/classes/Smarty-3.1.15/libs/plugins/function.html_select_date.php

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

lib/classes/Smarty-3.1.15/libs/plugins/function.html_select_time.php

@@ -117,7 +117,7 @@ function smarty_function_html_select_time($params, $template)
             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, $template)
             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, $template)
             case 'minute_size':
             case 'second_size':
             case 'meridian_size':
-                $$_key = (int)$_value;
+                $$_key = (int) $_value;
                 break;
 
             default:
@@ -345,7 +345,7 @@ function smarty_function_html_select_time($params, $template)
             $_html_meridian .= '<option value="">' . ( isset($meridian_empty) ? $meridian_empty : $all_empty ) . '</option>' . $option_separator;
         }
 
-        $_html_meridian .= '<option value="am"'. ($_hour < 12 ? ' selected="selected"' : '') .'>AM</option>' . $option_separator
+        $_html_meridian .= '<option value="am"'. ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .'>AM</option>' . $option_separator
             . '<option value="pm"'. ($_hour < 12 ? '' : ' selected="selected"') .'>PM</option>' . $option_separator
             . '</select>';
     }
@@ -362,5 +362,3 @@ function smarty_function_html_select_time($params, $template)
 
     return $_html;
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/function.html_table.php

@@ -64,13 +64,14 @@ function smarty_function_html_table($params, $template)
 
     if (!isset($params['loop'])) {
         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':
@@ -81,14 +82,14 @@ function smarty_function_html_table($params, $template)
                     $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':
@@ -97,7 +98,7 @@ function smarty_function_html_table($params, $template)
             case 'vdir':
             case 'inner':
             case 'caption':
-                $$_key = (string)$_value;
+                $$_key = (string) $_value;
                 break;
 
             case 'tr_attr':
@@ -173,5 +174,3 @@ function smarty_function_html_table_cycle($name, $var, $no)
 
     return ($ret) ? ' ' . $ret : '';
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/function.mailto.php

@@ -55,6 +55,7 @@ function smarty_function_mailto($params, $template)
 
     if (empty($params['address'])) {
         trigger_error("mailto: missing 'address' parameter",E_USER_WARNING);
+
         return;
     } else {
         $address = $params['address'];
@@ -95,6 +96,7 @@ function smarty_function_mailto($params, $template)
     $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!
@@ -110,7 +112,7 @@ function smarty_function_mailto($params, $template)
     } 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]);
         }
 
@@ -126,6 +128,7 @@ function smarty_function_mailto($params, $template)
         preg_match('!^(.*)(\?.*)$!', $address, $match);
         if (!empty($match[2])) {
             trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.",E_USER_WARNING);
+
             return;
         }
         $address_encode = '';
@@ -142,11 +145,10 @@ function smarty_function_mailto($params, $template)
         }
 
         $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
+
         return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
     } else {
         // no encoding
         return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
     }
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/function.math.php

@@ -31,6 +31,7 @@ function smarty_function_math($params, $template)
     // be sure equation parameter is present
     if (empty($params['equation'])) {
         trigger_error("math: missing equation parameter",E_USER_WARNING);
+
         return;
     }
 
@@ -39,28 +40,32 @@ function smarty_function_math($params, $template)
     // make sure parenthesis are balanced
     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);
 
-    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);
+
             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);
+
                 return;
             }
             if (!is_numeric($val)) {
                 trigger_error("math: parameter $key: is not numeric",E_USER_WARNING);
+
                 return;
             }
             $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
@@ -76,12 +81,10 @@ function smarty_function_math($params, $template)
             $template->assign($params['assign'],$smarty_math_result);
         }
     } else {
-        if (empty($params['assign'])){
+        if (empty($params['assign'])) {
             printf($params['format'],$smarty_math_result);
         } else {
             $template->assign($params['assign'],sprintf($params['format'],$smarty_math_result));
         }
     }
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/modifier.capitalize.php

@@ -35,12 +35,13 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
         // 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, create_function ('$matches', 'return stripslashes($matches[1]).mb_convert_case(stripslashes($matches[3]),MB_CASE_UPPER, "' . addslashes(Smarty::$_CHARSET) . '");'), $upper_string);
+
         return $upper_string;
     }
 
@@ -53,13 +54,12 @@ function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = fals
     // 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, create_function ('$matches', 'return stripslashes($matches[1]).ucfirst(stripslashes($matches[3]));'), $upper_string);
+
     return $upper_string;
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/modifier.date_format.php

@@ -42,7 +42,7 @@ function smarty_modifier_date_format($string, $format=null, $default_date='', $f
     } 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');
@@ -56,10 +56,9 @@ function smarty_modifier_date_format($string, $format=null, $default_date='', $f
             }
             $format = str_replace($_win_from, $_win_to, $format);
         }
+
         return strftime($format, $timestamp);
     } else {
         return date($format, $timestamp);
     }
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/modifier.debug_print_var.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifier.escape.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifier.regex_replace.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifier.replace.php

@@ -24,10 +24,9 @@ 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);
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/modifier.spacify.php

@@ -23,5 +23,3 @@ 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));
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/modifier.truncate.php

@@ -24,7 +24,8 @@
  * @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) {
+function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
+{
     if ($length == 0)
         return '';
 
@@ -37,8 +38,10 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_wo
             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;
     }
 
@@ -51,9 +54,9 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_wo
         if (!$middle) {
             return substr($string, 0, $length) . $etc;
         }
+
         return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
     }
+
     return $string;
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.cat.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.count_characters.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.count_paragraphs.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.count_sentences.php

@@ -24,5 +24,3 @@ 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)';
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.count_words.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.default.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.escape.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.from_charset.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.indent.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.lower.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.noprint.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.string_format.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.strip.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.to_charset.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.unescape.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.upper.php

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

lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.wordwrap.php

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

lib/classes/Smarty-3.1.15/libs/plugins/outputfilter.trimwhitespace.php

@@ -74,13 +74,11 @@ function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $s
     // 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 = array_shift($store);
+            $replace = $store[$match[1][0]];
             $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length);
 
             $_offset += strlen($replace) - $_length;
@@ -90,5 +88,3 @@ function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $s
 
     return $source;
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/shared.escape_special_chars.php

@@ -15,7 +15,7 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
      *           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)
@@ -23,6 +23,7 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
         if (!is_array($string)) {
             $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
         }
+
         return $string;
     }
 } else {
@@ -34,7 +35,7 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
      *           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)
@@ -44,8 +45,7 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
             $string = htmlspecialchars($string);
             $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
         }
+
         return $string;
     }
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/shared.literal_compiler_param.php

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

lib/classes/Smarty-3.1.15/libs/plugins/shared.make_timestamp.php

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

lib/classes/Smarty-3.1.15/libs/plugins/shared.mb_str_replace.php

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

lib/classes/Smarty-3.1.15/libs/plugins/shared.mb_unicode.php

@@ -15,12 +15,14 @@
  * @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);
 }
 
@@ -33,16 +35,16 @@ function smarty_mb_to_unicode($string, $encoding=null) {
  * @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;
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/plugins/shared.mb_wordwrap.php

@@ -6,17 +6,17 @@
  * @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  string  $str   the string to wrap
-     * @param int     $width the width of the output
+     * @param  int     $width the width of the output
-     * @param string  $break the character used to break the line
+     * @param  string  $break the character used to break the line
-     * @param boolean $cut   ignored parameter, just for the sake of
+     * @param  boolean $cut   ignored parameter, just for the sake of
-     * @return string wrapped string
+     * @return string  wrapped string
      * @author Rodney Rehm
      */
     function smarty_mb_wordwrap($str, $width=75, $break="\n", $cut=false)
@@ -63,7 +63,7 @@ if(!function_exists('smarty_mb_wordwrap')) {
                         $length = 0;
                         continue;
                     }
-                } else if ($token == "\n") {
+                } elseif ($token == "\n") {
                     // hard break must reset counters
                     $_previous = 0;
                     $length = 0;
@@ -80,4 +80,3 @@ if(!function_exists('smarty_mb_wordwrap')) {
     }
 
 }
-?>

lib/classes/Smarty-3.1.15/libs/plugins/variablefilter.htmlspecialchars.php

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

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_cacheresource.php

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

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_cacheresource_custom.php

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

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_cacheresource_keyvaluestore.php

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

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_config_source.php

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

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_cacheresource_file.php

@@ -16,8 +16,8 @@
     * @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
         *
@@ -87,6 +87,7 @@
         public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
         {
             $_smarty_tpl = $_template;
+
             return @include $_template->cached->filepath;
         }
 
@@ -106,6 +107,7 @@
                     return true;
                 }
             }
+
             return false;
         }
 
@@ -186,7 +188,7 @@
                             @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)) {
@@ -210,7 +212,7 @@
                             }
                         }
                         // expired ?
-                        if  (isset($exp_time)) {
+                        if (isset($exp_time)) {
                             if ($exp_time < 0) {
                                 preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match);
                                 if ($_time < (@filemtime($_file) + $match[1])) {
@@ -226,6 +228,7 @@
                     }
                 }
             }
+
             return $_count;
         }
 
@@ -244,6 +247,7 @@
                 clearstatcache();
             }
             $t = @filemtime($cached->lock_id);
+
             return $t && (time() - $t < $smarty->locking_timeout);
         }
 
@@ -271,5 +275,3 @@
             @unlink($cached->lock_id);
         }
     }
-
-?>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_append.php

@@ -15,14 +15,14 @@
  * @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  array  $args      array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  object $compiler  compiler object
-     * @param array $parameter array with compilation parameter
+     * @param  array  $parameter array with compilation parameter
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
@@ -49,5 +49,3 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
     }
 
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_assign.php

@@ -15,14 +15,14 @@
  * @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  array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
+     * @param  object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array  $parameter array with compilation parameter
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
@@ -76,13 +76,12 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
         } elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) {
             $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;
     }
 
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_block.php

@@ -0,0 +1,428 @@
+<?php
+
+/**
+ * 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
+{
+
+    const parent = '____SMARTY_BLOCK_PARENT____';
+    /**
+     * 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();
+
+    /**
+     * child block source buffer
+     *
+     * @var array
+     */
+    public static $block_data = array();
+
+    /**
+     * 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'], "\"'");
+
+        // check if we process an inheritance child template
+        if ($compiler->inheritance_child) {
+            array_unshift(self::$nested_block_names, $_name);
+            $this->template->block_data[$_name]['source'] = '';
+            // build {block} for child block
+            self::$block_data[$_name]['source'] =
+                "{$compiler->smarty->left_delimiter}private_child_block name={$_attr['name']} file='{$compiler->template->source->filepath}'" .
+                " uid='{$compiler->template->source->uid}' line={$compiler->lex->line}";
+            if ($_attr['nocache']) {
+                self::$block_data[$_name]['source'] .= ' nocache';
+            }
+            self::$block_data[$_name]['source'] .= $compiler->smarty->right_delimiter;
+
+            $save = array($_attr, $compiler->inheritance);
+            $this->openTag($compiler, 'block', $save);
+            // set flag for {block} tag
+            $compiler->inheritance = true;
+            $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
+            $compiler->has_code = false;
+            return;
+        }
+        // must merge includes
+        if ($_attr['nocache'] == true) {
+            $compiler->tag_nocache = true;
+        }
+        $save = array($_attr, $compiler->inheritance, $compiler->parser->current_buffer, $compiler->nocache);
+        $this->openTag($compiler, 'block', $save);
+        $compiler->inheritance = true;
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+
+        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
+        $compiler->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)
+    {
+        if ($compiler->inheritance_child) {
+            $name1 = Smarty_Internal_Compile_Block::$nested_block_names[0];
+            if (isset($compiler->template->block_data[$name1])) {
+                //  replace inner block name with generic
+                Smarty_Internal_Compile_Block::$block_data[$name1]['source'] .= $compiler->template->block_data[$name1]['source'];
+                Smarty_Internal_Compile_Block::$block_data[$name1]['child'] = true;
+            }
+            $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
+            $compiler->has_code = false;
+            return;
+        }
+        // if called by {$smarty.block.child} we must search the name of enclosing {block}
+        if ($_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.child} used outside {block} tags ', $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->variable_filters = $compiler->template->variable_filters;
+        $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
+        $_tpl->allow_relative_path = true;
+        $_tpl->compiler->inheritance = true;
+        $_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));
+        } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
+            $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache) . $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);
+        } elseif (!empty($compiler->template->block_data[$_name])) {
+            $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache);
+        }
+        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
+        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
+        $compiler->merged_templates = array_merge($compiler->merged_templates, $_tpl->compiler->merged_templates);
+        $compiler->template->variable_filters = $_tpl->variable_filters;
+        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) {
+                    $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 schild block
+     */
+    static function compileParentBlock($compiler, $_name = null)
+    {
+        // if called by {$smarty.block.parent} we must search the name of enclosing {block}
+        if ($_name == null) {
+            $stack_count = count($compiler->_tag_stack);
+            while (--$stack_count >= 0) {
+                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
+                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "\"'");
+                    break;
+                }
+            }
+        }
+        if ($_name == null) {
+            $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ', $compiler->lex->taglineno);
+        }
+        if (empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
+            $compiler->trigger_template_error(' illegal {$smarty.block.parent} in parent template ', $compiler->lex->taglineno);
+        }
+        Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= Smarty_Internal_Compile_Block::parent;
+        $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
+        $compiler->has_code = false;
+        return;
+    }
+
+    /**
+     * Process block source
+     *
+     * @param string $source    source text
+     * @return ''
+     */
+    static function blockSource($compiler, $source)
+    {
+        Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= $source;
+    }
+
+}
+
+
+/**
+ * Smarty Internal Plugin Compile BlockClose Class
+ *
+ * @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
+     */
+    public function compile($args, $compiler)
+    {
+        $compiler->has_code = true;
+        // check and get attributes
+        $_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}";
+            $level = count(Smarty_Internal_Compile_Block::$nested_block_names);
+            array_shift(Smarty_Internal_Compile_Block::$nested_block_names);
+            if (!empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
+                $name2 = Smarty_Internal_Compile_Block::$nested_block_names[0];
+                if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
+                    if (isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child']) || !isset($compiler->template->block_data[$name1])) {
+                        Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
+                    } else {
+                        if ($compiler->template->block_data[$name1]['mode'] == 'append') {
+                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
+                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
+                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'] . Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
+                        } else {
+                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'];
+                        }
+                    }
+                }
+                unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
+                $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
+            } else {
+                if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
+                    if (isset($compiler->template->block_data[$name1]) && !isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child'])) {
+                        if (strpos($compiler->template->block_data[$name1]['source'], Smarty_Internal_Compile_Block::parent) !== false) {
+                            $compiler->template->block_data[$name1]['source'] =
+                                str_replace(Smarty_Internal_Compile_Block::parent, Smarty_Internal_Compile_Block::$block_data[$name1]['source'], $compiler->template->block_data[$name1]['source']);
+                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
+                            $compiler->template->block_data[$name1]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
+                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'append') {
+                            $compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
+                        }
+                    } else {
+                        $compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
+                    }
+                    $compiler->template->block_data[$name1]['mode'] = 'replace';
+                    if ($saved_data[0]['append']) {
+                        $compiler->template->block_data[$name1]['mode'] = 'append';
+                    }
+                    if ($saved_data[0]['prepend']) {
+                        $compiler->template->block_data[$name1]['mode'] = 'prepend';
+                    }
+                }
+                unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
+                $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
+            }
+            $compiler->has_code = false;
+            return;
+        }
+        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
+            $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
+        } else {
+            if ($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']);
+        }
+        // reset flags
+        $compiler->parser->current_buffer = $saved_data[2];
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        $compiler->nocache = $saved_data[3];
+        // $_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');
+
+
+    /**
+     * Compiles code for the {private_child_block} tag
+     *
+     * @param array $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return boolean true
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        // must merge includes
+        if ($_attr['nocache'] == true) {
+            $compiler->tag_nocache = true;
+        }
+        $save = array($_attr, $compiler->nocache);
+
+        // set trace back to child block
+        $compiler->pushTrace(trim($_attr['file'], "\"'"), trim($_attr['uid'], "\"'"), $_attr['line'] - $compiler->lex->line);
+
+        $this->openTag($compiler, 'private_child_block', $save);
+
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        $compiler->has_code = false;
+
+        return true;
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Child Block Close Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Child_Blockclose extends Smarty_Internal_CompileBase
+{
+
+
+    /**
+     * Compiles code for the {/private_child_block} tag
+     *
+     * @param array $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return boolean true
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        $saved_data = $this->closeTag($compiler, array('private_child_block'));
+
+        // end of child block
+        $compiler->popTrace();
+
+        $compiler->nocache = $saved_data[1];
+        $compiler->has_code = false;
+
+        return true;
+    }
+}

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_break.php

@@ -14,8 +14,8 @@
  * @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,9 +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  array  $args      array with attributes from parser
-     * @param object $compiler   compiler object
+     * @param  object $compiler  compiler object
-     * @param array  $parameter  array with compilation parameter
+     * @param  array  $parameter array with compilation parameter
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
@@ -68,10 +68,8 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
         if ($level_count != 0) {
             $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);
         }
-        $compiler->has_code = true;
+
         return "<?php break {$_levels}?>";
     }
 
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_call.php

@@ -15,8 +15,8 @@
  * @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.
      *
@@ -42,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  array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
+     * @param  object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array  $parameter array with compilation parameter
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -122,9 +122,8 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
                 $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n";
             }
         }
+
         return $_output;
     }
 
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_capture.php

@@ -15,8 +15,8 @@
  * @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.
      *
@@ -35,8 +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  array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  object $compiler compiler object
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -64,13 +64,13 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
  * @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  array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  object $compiler compiler object
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -90,9 +90,8 @@ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase {
         $_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n";
         $_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n";
         $_output .= "} else \$_smarty_tpl->capture_error();?>";
+
         return $_output;
     }
 
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_config_load.php

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

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_continue.php

@@ -15,8 +15,8 @@
  * @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.
      *
@@ -35,9 +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  array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
+     * @param  object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array  $parameter array with compilation parameter
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
@@ -69,10 +69,8 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
         if ($level_count != 0) {
             $compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno);
         }
-        $compiler->has_code = true;
+
         return "<?php continue {$_levels}?>";
     }
 
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_debug.php

@@ -16,13 +16,13 @@
  * @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  array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  object $compiler compiler object
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -35,9 +35,8 @@ 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;
     }
 
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_eval.php

@@ -15,8 +15,8 @@
  * @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.
      *
@@ -42,8 +42,8 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {eval} tag
      *
-     * @param array  $args     array with attributes from parser
+     * @param  array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  object $compiler compiler object
      * @return string compiled code
      */
     public function compile($args, $compiler)
@@ -65,9 +65,8 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
         } else {
             $_output .= "echo \$_template->fetch();";
         }
+
         return "<?php $_output ?>";
     }
 
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_extends.php

@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * 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
+{
+    /**
+     * 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
+     */
+    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
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr['nocache'] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+        }
+        if (strpos($_attr['file'], '$_tmp') !== false) {
+            $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno);
+        }
+        // add tag to call parent template at the end of source
+
+        if ($compiler->has_variable_string || !((substr_count($_attr['file'], '"') == 2 || substr_count($_attr['file'], "'") == 2))
+            || substr_count($_attr['file'], '(') != 0 || substr_count($_attr['file'], '$_smarty_tpl->') != 0
+        ) {
+            $compiler->trigger_template_error('variable template file name not allowed', $compiler->lex->taglineno);
+        }
+
+        $name = trim($_attr['file'],"\"'");
+        // create template object
+        $_template = new $compiler->smarty->template_class($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\"", $this->lex->line - 1);
+        }
+        $compiler->extends_uid[$uid] = true;
+        if (empty($_template->source->components)) {
+            array_unshift($compiler->sources, $_template->source);
+        } 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 \"{$sorce->filepath}\"", $this->lex->line - 1);
+                }
+                $compiler->extends_uid[$uid] = true;
+            }
+        }
+        unset ($_template);
+        $compiler->inheritance_child = true;
+        $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
+        return '';
+    }
+}

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_for.php

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

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_foreach.php

@@ -15,7 +15,8 @@
  * @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.
      *
@@ -41,9 +42,9 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
     /**
      * Compiles code for the {foreach} tag
      *
-     * @param array  $args      array with attributes from parser
+     * @param  array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
+     * @param  object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array  $parameter array with compilation parameter
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
@@ -131,7 +132,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
                 $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
             }
         }
-        $output .= "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";
         }
@@ -173,14 +174,14 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
  * @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  array  $args      array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array  $parameter array with compilation parameter
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
@@ -202,14 +203,14 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase {
  * @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  array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
+     * @param  object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param  array  $parameter array with compilation parameter
      * @return string compiled code
      */
     public function compile($args, $compiler, $parameter)
@@ -227,5 +228,3 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase {
     }
 
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_function.php

@@ -15,8 +15,8 @@
  * @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.
      *
@@ -42,9 +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  array   $args      array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  object  $compiler  compiler object
-     * @param array $parameter array with compilation parameter
+     * @param  array   $parameter array with compilation parameter
      * @return boolean true
      */
     public function compile($args, $compiler, $parameter)
@@ -97,14 +97,14 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
  * @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  array   $args      array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  object  $compiler  compiler object
-     * @param array $parameter array with compilation parameter
+     * @param  array   $parameter array with compilation parameter
      * @return boolean true
      */
     public function compile($args, $compiler, $parameter)
@@ -116,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 ($compiler->template->required_plugins['compiled'] as $tmp) {
-                foreach($tmp as $data) {
+                foreach ($tmp as $data) {
                     $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
                 }
             }
@@ -125,8 +125,8 @@ 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 ($compiler->template->required_plugins['nocache'] as $tmp) {
-                foreach($tmp as $data) {
+                foreach ($tmp as $data) {
                     $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
                 }
             }
@@ -158,9 +158,8 @@ 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;
     }
 
 }
-
-?>

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_if.php

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

lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_include.php

@@ -0,0 +1,255 @@
+<?php
+/**
+ * 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
+{
+    /**
+     * 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
+     */
+    public $required_attributes = array('file');
+    /**
+     * 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
+     */
+    public $option_flags = array('nocache', 'inline', 'caching');
+    /**
+     * 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
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // save posible attributes
+        $include_file = $_attr['file'];
+
+        if (isset($_attr['assign'])) {
+            // output will be stored in a smarty variable instead of beind displayed
+            $_assign = $_attr['assign'];
+        }
+
+        $_parent_scope = Smarty::SCOPE_LOCAL;
+        if (isset($_attr['scope'])) {
+            $_attr['scope'] = trim($_attr['scope'], "'\"");
+            if ($_attr['scope'] == 'parent') {
+                $_parent_scope = Smarty::SCOPE_PARENT;
+            } elseif ($_attr['scope'] == 'root') {
+                $_parent_scope = Smarty::SCOPE_ROOT;
+            } elseif ($_attr['scope'] == 'global') {
+                $_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 || $_attr['inline'] === true) && !$compiler->template->source->recompiled;
+
+        // set default when in nocache mode
+//       if ($compiler->template->caching && ($compiler->nocache || $compiler->tag_nocache || $compiler->forceNocache == 2)) {
+        if ($compiler->template->caching && ((!$compiler->inheritance && !$compiler->nocache && !$compiler->tag_nocache) || ($compiler->inheritance && ($compiler->nocache ||$compiler->tag_nocache)))) {
+            $_caching = self::CACHING_NOCACHE_CODE;
+        }
+        /*
+        * if the {include} tag provides individual parameter for caching
+        * it will not be included into the common cache file and treated like
+        * a nocache section
+        */
+        if (isset($_attr['cache_lifetime'])) {
+            $_cache_lifetime = $_attr['cache_lifetime'];
+            $compiler->tag_nocache = true;
+            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        } else {
+            $_cache_lifetime = 'null';
+        }
+        if (isset($_attr['cache_id'])) {
+            $_cache_id = $_attr['cache_id'];
+            $compiler->tag_nocache = true;
+            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        } else {
+            $_cache_id = '$_smarty_tpl->cache_id';
+        }
+        if (isset($_attr['compile_id'])) {
+            $_compile_id = $_attr['compile_id'];
+        } else {
+            $_compile_id = '$_smarty_tpl->compile_id';
+        }
+        if ($_attr['caching'] === true) {
+            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        }
+        if ($_attr['nocache'] === true) {
+            $compiler->tag_nocache = true;
+            if ($merge_compiled_includes || $compiler->inheritance) {
+            $_caching = self::CACHING_NOCACHE_CODE;
+            } else {
+            $_caching = Smarty::CACHING_OFF;
+            }
+        }
+
+        $has_compiled_template = false;
+        if ($merge_compiled_includes || $compiler->inheritance) {
+            // 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->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->trigger_template_error(' variable compile_id not allow within {block} tags');
+                    }
+                }
+            }
+            if ($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache) && $_caching != self::CACHING_NOCACHE_CODE) {
+                $merge_compiled_includes = false;
+                if ($compiler->inheritance) {
+                    $compiler->trigger_template_error(' invalid caching mode of subtemplate within {block} tags');
+                }
+            }
+        }
+        if ($merge_compiled_includes || $compiler->inheritance) {
+            // we must observe different compile_id
+            $uid = sha1($_compile_id);
+            $tpl_name = null;
+            $nocache = false;
+            eval("\$tpl_name = $include_file;");
+            if (!isset($compiler->smarty->merged_templates_func[$tpl_name][$uid]) || $compiler->inheritance) {
+                $tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
+                // save unique function name
+                $compiler->smarty->merged_templates_func[$tpl_name][$uid]['func'] = $tpl->properties['unifunc'] = 'content_' . str_replace('.', '_', uniqid('', true));
+                // use current nocache hash for inlined code
+                $compiler->smarty->merged_templates_func[$tpl_name][$uid]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
+                if ($compiler->template->caching && $_caching == self::CACHING_NOCACHE_CODE) {
+                    // all code must be nocache
+                    $nocache = true;
+                }
+                if ($compiler->inheritance) {
+                    $tpl->compiler->inheritance = true;
+                }
+                // make sure whole chain gets compiled
+                $tpl->mustCompile = true;
+                if (!($tpl->source->uncompiled) && $tpl->source->exists) {
+
+
+                    // get compiled code
+                    $compiled_code = $tpl->compiler->compileTemplate($tpl, $nocache);
+                    // release compiler object to free memory
+                    unset($tpl->compiler);
+                    // merge compiled code for {function} tags
+                    $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']);
+                    // merge filedependency
+                    $tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp, $tpl->source->type);
+                    $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']);
+                    // remove header code
+                    $compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code);
+                    if ($tpl->has_nocache_code) {
+                        // replace nocache_hash
+                        $compiled_code = str_replace("{$tpl->properties['nocache_hash']}", $compiler->template->properties['nocache_hash'], $compiled_code);
+                        $compiler->template->has_nocache_code = true;
+                    }
+                    $compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
+                    $has_compiled_template = true;
+                    unset ($tpl);
+                }
+            } else {
+                $has_compiled_template = true;
+            }
+        }
+        // delete {include} standard attributes
+        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
+        // remaining attributes must be assigned as smarty variable
+        if (!empty($_attr)) {
+            if ($_parent_scope == Smarty::SCOPE_LOCAL) {
+                // create variables
+                foreach ($_attr as $key => $value) {
+                    $_pairs[] = "'$key'=>$value";
+                }
+                $_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'];
+            $_output = "<?php /*  Call merged included template \"" . $tpl_name . "\" */\n";
+            $_output .= "\$_tpl_stack[] = \$_smarty_tpl;\n";
+            $_output .= " \$_smarty_tpl = \$_smarty_tpl->setupInlineSubTemplate($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope, '$_hash');\n";
+            if (isset($_assign)) {
+                $_output .= 'ob_start(); ';
+            }
+            $_output .= $compiler->smarty->merged_templates_func[$tpl_name][$uid]['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 . "\" */?>";
+
+            return $_output;
+        }
+
+        // was there an assign attribute
+        if (isset($_assign)) {
+            $_output = "<?php \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(\$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope));?>\n";;
+        } else {
+            $_output = "<?php echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n";
+        }
+
+        return $_output;
+    }
+}