YetiForceCompany / YetiForceCRM

libraries/Smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php

Indentation +23 added lines, -23 removed lines

@@ -11,28 +11,28 @@
  */
 class Smarty_Internal_Method_SetDefaultModifiers
 {
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
+	/**
+	 * Valid for Smarty and template object
+	 *
+	 * @var int
+	 */
+	public $objMap = 3;
 
-    /**
-     * Set default modifiers
-     *
-     * @api Smarty::setDefaultModifiers()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  array|string                                                   $modifiers modifier or list of modifiers
-     *                                                                                   to set
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function setDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        $smarty->default_modifiers = (array) $modifiers;
-        return $obj;
-    }
+	/**
+	 * Set default modifiers
+	 *
+	 * @api Smarty::setDefaultModifiers()
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+	 * @param  array|string                                                   $modifiers modifier or list of modifiers
+	 *                                                                                   to set
+	 *
+	 * @return \Smarty|\Smarty_Internal_Template
+	 */
+	public function setDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+	{
+		$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+		$smarty->default_modifiers = (array) $modifiers;
+		return $obj;
+	}
 }
\ No newline at end of file

libraries/Smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php

Indentation +53 added lines, -53 removed lines

@@ -11,60 +11,60 @@
  */
 class Smarty_Internal_Method_SetAutoloadFilters
 {
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
+	/**
+	 * Valid for Smarty and template object
+	 *
+	 * @var int
+	 */
+	public $objMap = 3;
 
-    /**
-     * Valid filter types
-     *
-     * @var array
-     */
-    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+	/**
+	 * Valid filter types
+	 *
+	 * @var array
+	 */
+	private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
 
-    /**
-     * Set autoload filters
-     *
-     * @api Smarty::setAutoloadFilters()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  array                                                          $filters filters to load automatically
-     * @param  string                                                         $type    "pre", "output", … specify the
-     *                                                                                 filter type to set. Defaults to
-     *                                                                                 none treating $filters' keys as
-     *                                                                                 the appropriate types
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function setAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        if ($type !== null) {
-            $this->_checkFilterType($type);
-            $smarty->autoload_filters[ $type ] = (array) $filters;
-        } else {
-            foreach ((array) $filters as $type => $value) {
-                $this->_checkFilterType($type);
-            }
-            $smarty->autoload_filters = (array) $filters;
-        }
-        return $obj;
-    }
+	/**
+	 * Set autoload filters
+	 *
+	 * @api Smarty::setAutoloadFilters()
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+	 * @param  array                                                          $filters filters to load automatically
+	 * @param  string                                                         $type    "pre", "output", … specify the
+	 *                                                                                 filter type to set. Defaults to
+	 *                                                                                 none treating $filters' keys as
+	 *                                                                                 the appropriate types
+	 *
+	 * @return \Smarty|\Smarty_Internal_Template
+	 */
+	public function setAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+	{
+		$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+		if ($type !== null) {
+			$this->_checkFilterType($type);
+			$smarty->autoload_filters[ $type ] = (array) $filters;
+		} else {
+			foreach ((array) $filters as $type => $value) {
+				$this->_checkFilterType($type);
+			}
+			$smarty->autoload_filters = (array) $filters;
+		}
+		return $obj;
+	}
 
-    /**
-     * Check if filter type is valid
-     *
-     * @param string $type
-     *
-     * @throws \SmartyException
-     */
-    public function _checkFilterType($type)
-    {
-        if (!isset($this->filterTypes[ $type ])) {
-            throw new SmartyException("Illegal filter type \"{$type}\"");
-        }
-    }
+	/**
+	 * Check if filter type is valid
+	 *
+	 * @param string $type
+	 *
+	 * @throws \SmartyException
+	 */
+	public function _checkFilterType($type)
+	{
+		if (!isset($this->filterTypes[ $type ])) {
+			throw new SmartyException("Illegal filter type \"{$type}\"");
+		}
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
         $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
         if ($type !== null) {
             $this->_checkFilterType($type);
-            $smarty->autoload_filters[ $type ] = (array) $filters;
+            $smarty->autoload_filters[$type] = (array) $filters;
         } else {
             foreach ((array) $filters as $type => $value) {
                 $this->_checkFilterType($type);
@@ -63,7 +63,7 @@ 
      */
     public function _checkFilterType($type)
     {
-        if (!isset($this->filterTypes[ $type ])) {
+        if (!isset($this->filterTypes[$type])) {
             throw new SmartyException("Illegal filter type \"{$type}\"");
         }
     }

libraries/Smarty/libs/sysplugins/smarty_internal_method_getglobal.php

Indentation +32 added lines, -32 removed lines

@@ -11,37 +11,37 @@
  */
 class Smarty_Internal_Method_GetGlobal
 {
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
+	/**
+	 * Valid for all objects
+	 *
+	 * @var int
+	 */
+	public $objMap = 7;
 
-    /**
-     * Returns a single or all global  variables
-     *
-     * @api  Smarty::getGlobal()
-     *
-     * @param \Smarty_Internal_Data $data
-     * @param  string               $varName variable name or null
-     *
-     * @return string variable value or or array of variables
-     */
-    public function getGlobal(Smarty_Internal_Data $data, $varName = null)
-    {
-        if (isset($varName)) {
-            if (isset(Smarty::$global_tpl_vars[ $varName ])) {
-                return Smarty::$global_tpl_vars[ $varName ]->value;
-            } else {
-                return '';
-            }
-        } else {
-            $_result = array();
-            foreach (Smarty::$global_tpl_vars AS $key => $var) {
-                $_result[ $key ] = $var->value;
-            }
-            return $_result;
-        }
-    }
+	/**
+	 * Returns a single or all global  variables
+	 *
+	 * @api  Smarty::getGlobal()
+	 *
+	 * @param \Smarty_Internal_Data $data
+	 * @param  string               $varName variable name or null
+	 *
+	 * @return string variable value or or array of variables
+	 */
+	public function getGlobal(Smarty_Internal_Data $data, $varName = null)
+	{
+		if (isset($varName)) {
+			if (isset(Smarty::$global_tpl_vars[ $varName ])) {
+				return Smarty::$global_tpl_vars[ $varName ]->value;
+			} else {
+				return '';
+			}
+		} else {
+			$_result = array();
+			foreach (Smarty::$global_tpl_vars AS $key => $var) {
+				$_result[ $key ] = $var->value;
+			}
+			return $_result;
+		}
+	}
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -31,15 +31,15 @@
     public function getGlobal(Smarty_Internal_Data $data, $varName = null)
     {
         if (isset($varName)) {
-            if (isset(Smarty::$global_tpl_vars[ $varName ])) {
-                return Smarty::$global_tpl_vars[ $varName ]->value;
+            if (isset(Smarty::$global_tpl_vars[$varName])) {
+                return Smarty::$global_tpl_vars[$varName]->value;
             } else {
                 return '';
             }
         } else {
             $_result = array();
             foreach (Smarty::$global_tpl_vars AS $key => $var) {
-                $_result[ $key ] = $var->value;
+                $_result[$key] = $var->value;
             }
             return $_result;
         }

libraries/Smarty/libs/sysplugins/smarty_resource_uncompiled.php

Indentation +28 added lines, -28 removed lines

@@ -16,34 +16,34 @@
  */
 abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
 {
-    /**
-     * Flag that it's an uncompiled resource
-     *
-     * @var bool
-     */
-    public $uncompiled = true;
+	/**
+	 * Flag that it's an uncompiled resource
+	 *
+	 * @var bool
+	 */
+	public $uncompiled = true;
 
-    /**
-     * Resource does implement populateCompiledFilepath() method
-     *
-     * @var bool
-     */
-    public $hasCompiledHandler = true;
+	/**
+	 * Resource does implement populateCompiledFilepath() method
+	 *
+	 * @var bool
+	 */
+	public $hasCompiledHandler = true;
     
-    /**
-     * populate compiled object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $compiled->filepath = $_template->source->filepath;
-        $compiled->timestamp = $_template->source->timestamp;
-        $compiled->exists = $_template->source->exists;
-        if ($_template->smarty->merge_compiled_includes || $_template->source->handler->checkTimestamps()) {
-            $compiled->file_dependency[ $_template->source->uid ] =
-                array($compiled->filepath, $compiled->timestamp, $_template->source->type,);
-        }
-    }
+	/**
+	 * populate compiled object with compiled filepath
+	 *
+	 * @param Smarty_Template_Compiled $compiled  compiled object
+	 * @param Smarty_Internal_Template $_template template object
+	 */
+	public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+	{
+		$compiled->filepath = $_template->source->filepath;
+		$compiled->timestamp = $_template->source->timestamp;
+		$compiled->exists = $_template->source->exists;
+		if ($_template->smarty->merge_compiled_includes || $_template->source->handler->checkTimestamps()) {
+			$compiled->file_dependency[ $_template->source->uid ] =
+				array($compiled->filepath, $compiled->timestamp, $_template->source->type,);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $compiled->timestamp = $_template->source->timestamp;
         $compiled->exists = $_template->source->exists;
         if ($_template->smarty->merge_compiled_includes || $_template->source->handler->checkTimestamps()) {
-            $compiled->file_dependency[ $_template->source->uid ] =
+            $compiled->file_dependency[$_template->source->uid] =
                 array($compiled->filepath, $compiled->timestamp, $_template->source->type,);
         }
     }

libraries/Smarty/libs/sysplugins/smarty_internal_extension_handler.php

Indentation +104 added lines, -104 removed lines

@@ -33,115 +33,115 @@
 class Smarty_Internal_Extension_Handler
 {
 
-    public $objType = null;
+	public $objType = null;
 
-    /**
-     * Cache for property information from generic getter/setter
-     * Preloaded with names which should not use with generic getter/setter
-     *
-     * @var array
-     */
-    private $_property_info = array('AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0,
-                                    'DebugTemplate' => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0,
-                                    'TemplateVars' => 0,);#
+	/**
+	 * Cache for property information from generic getter/setter
+	 * Preloaded with names which should not use with generic getter/setter
+	 *
+	 * @var array
+	 */
+	private $_property_info = array('AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0,
+									'DebugTemplate' => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0,
+									'TemplateVars' => 0,);#
 
-    private $resolvedProperties = array();
+	private $resolvedProperties = array();
 
-    /**
-     * Call external Method
-     *
-     * @param \Smarty_Internal_Data $data
-     * @param string                $name external method names
-     * @param array                 $args argument array
-     *
-     * @return mixed
-     * @throws SmartyException
-     */
-    public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
-    {
-        /* @var Smarty $data ->smarty */
-        $smarty = isset($data->smarty) ? $data->smarty : $data;
-        if (!isset($smarty->ext->$name)) {
-            $class = 'Smarty_Internal_Method_' . ucfirst($name);
-            if (preg_match('/^(set|get)([A-Z].*)$/', $name, $match)) {
-                if (!isset($this->_property_info[ $prop = $match[ 2 ] ])) {
-                    // convert camel case to underscored name
-                    $this->resolvedProperties[ $prop ] = $pn = strtolower(join('_',
-                                                                               preg_split('/([A-Z][^A-Z]*)/', $prop,
-                                                                                          - 1, PREG_SPLIT_NO_EMPTY |
-                                                                                               PREG_SPLIT_DELIM_CAPTURE)));
-                    $this->_property_info[ $prop ] = property_exists($data, $pn) ? 1 :
-                        ($data->_objType == 2 && property_exists($smarty, $pn) ? 2 : 0);
-                }
-                if ($this->_property_info[ $prop ]) {
-                    $pn = $this->resolvedProperties[ $prop ];
-                    if ($match[ 1 ] == 'get') {
-                        return $this->_property_info[ $prop ] == 1 ? $data->$pn : $data->smarty->$pn;
-                    } else {
-                        return $this->_property_info[ $prop ] == 1 ? $data->$pn = $args[ 0 ] :
-                            $data->smarty->$pn = $args[ 0 ];
-                    }
-                } elseif (!class_exists($class)) {
-                    throw new SmartyException("property '$pn' does not exist.");
-                }
-            }
-            if (class_exists($class)) {
-                $callback = array($smarty->ext->$name = new $class(), $name);
-            }
-        } else {
-            $callback = array($smarty->ext->$name, $name);
-        }
-        array_unshift($args, $data);
-        if (isset($callback) && $callback[ 0 ]->objMap | $data->_objType) {
-            return call_user_func_array($callback, $args);
-        }
-        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
-    }
+	/**
+	 * Call external Method
+	 *
+	 * @param \Smarty_Internal_Data $data
+	 * @param string                $name external method names
+	 * @param array                 $args argument array
+	 *
+	 * @return mixed
+	 * @throws SmartyException
+	 */
+	public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
+	{
+		/* @var Smarty $data ->smarty */
+		$smarty = isset($data->smarty) ? $data->smarty : $data;
+		if (!isset($smarty->ext->$name)) {
+			$class = 'Smarty_Internal_Method_' . ucfirst($name);
+			if (preg_match('/^(set|get)([A-Z].*)$/', $name, $match)) {
+				if (!isset($this->_property_info[ $prop = $match[ 2 ] ])) {
+					// convert camel case to underscored name
+					$this->resolvedProperties[ $prop ] = $pn = strtolower(join('_',
+																			   preg_split('/([A-Z][^A-Z]*)/', $prop,
+																						  - 1, PREG_SPLIT_NO_EMPTY |
+																							   PREG_SPLIT_DELIM_CAPTURE)));
+					$this->_property_info[ $prop ] = property_exists($data, $pn) ? 1 :
+						($data->_objType == 2 && property_exists($smarty, $pn) ? 2 : 0);
+				}
+				if ($this->_property_info[ $prop ]) {
+					$pn = $this->resolvedProperties[ $prop ];
+					if ($match[ 1 ] == 'get') {
+						return $this->_property_info[ $prop ] == 1 ? $data->$pn : $data->smarty->$pn;
+					} else {
+						return $this->_property_info[ $prop ] == 1 ? $data->$pn = $args[ 0 ] :
+							$data->smarty->$pn = $args[ 0 ];
+					}
+				} elseif (!class_exists($class)) {
+					throw new SmartyException("property '$pn' does not exist.");
+				}
+			}
+			if (class_exists($class)) {
+				$callback = array($smarty->ext->$name = new $class(), $name);
+			}
+		} else {
+			$callback = array($smarty->ext->$name, $name);
+		}
+		array_unshift($args, $data);
+		if (isset($callback) && $callback[ 0 ]->objMap | $data->_objType) {
+			return call_user_func_array($callback, $args);
+		}
+		return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
+	}
 
-    /**
-     * set extension property
-     *
-     * @param string $property_name property name
-     * @param mixed  $value         value
-     *
-     * @throws SmartyException
-     */
-    public function __set($property_name, $value)
-    {
-        $this->$property_name = $value;
-    }
+	/**
+	 * set extension property
+	 *
+	 * @param string $property_name property name
+	 * @param mixed  $value         value
+	 *
+	 * @throws SmartyException
+	 */
+	public function __set($property_name, $value)
+	{
+		$this->$property_name = $value;
+	}
 
-    /**
-     * get extension object
-     *
-     * @param string $property_name property name
-     *
-     * @return mixed|Smarty_Template_Cached
-     * @throws SmartyException
-     */
-    public function __get($property_name)
-    {
-        // object properties of runtime template extensions will start with '_'
-        if ($property_name[ 0 ] == '_') {
-            $class = 'Smarty_Internal_Runtime_' . ucfirst(substr($property_name, 1));
-        } else {
-            $class = 'Smarty_Internal_Method_' . ucfirst($property_name);
-        }
-        return $this->$property_name = new $class();
-    }
+	/**
+	 * get extension object
+	 *
+	 * @param string $property_name property name
+	 *
+	 * @return mixed|Smarty_Template_Cached
+	 * @throws SmartyException
+	 */
+	public function __get($property_name)
+	{
+		// object properties of runtime template extensions will start with '_'
+		if ($property_name[ 0 ] == '_') {
+			$class = 'Smarty_Internal_Runtime_' . ucfirst(substr($property_name, 1));
+		} else {
+			$class = 'Smarty_Internal_Method_' . ucfirst($property_name);
+		}
+		return $this->$property_name = new $class();
+	}
 
-    /**
-     * Call error handler for undefined method
-     *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
-     *
-     * @return mixed
-     * @throws SmartyException
-     */
-    public function __call($name, $args)
-    {
-        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), array($this));
-    }
+	/**
+	 * Call error handler for undefined method
+	 *
+	 * @param string $name unknown method-name
+	 * @param array  $args argument array
+	 *
+	 * @return mixed
+	 * @throws SmartyException
+	 */
+	public function __call($name, $args)
+	{
+		return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), array($this));
+	}
 
 }
\ No newline at end of file

Spacing +11 added lines, -13 removed lines

@@ -43,7 +43,7 @@ 
      */
     private $_property_info = array('AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0,
                                     'DebugTemplate' => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0,
-                                    'TemplateVars' => 0,);#
+                                    'TemplateVars' => 0,); #
 
     private $resolvedProperties = array();
 
@@ -64,22 +64,20 @@ 
         if (!isset($smarty->ext->$name)) {
             $class = 'Smarty_Internal_Method_' . ucfirst($name);
             if (preg_match('/^(set|get)([A-Z].*)$/', $name, $match)) {
-                if (!isset($this->_property_info[ $prop = $match[ 2 ] ])) {
+                if (!isset($this->_property_info[$prop = $match[2]])) {
                     // convert camel case to underscored name
-                    $this->resolvedProperties[ $prop ] = $pn = strtolower(join('_',
+                    $this->resolvedProperties[$prop] = $pn = strtolower(join('_',
                                                                                preg_split('/([A-Z][^A-Z]*)/', $prop,
                                                                                           - 1, PREG_SPLIT_NO_EMPTY |
                                                                                                PREG_SPLIT_DELIM_CAPTURE)));
-                    $this->_property_info[ $prop ] = property_exists($data, $pn) ? 1 :
-                        ($data->_objType == 2 && property_exists($smarty, $pn) ? 2 : 0);
+                    $this->_property_info[$prop] = property_exists($data, $pn) ? 1 : ($data->_objType == 2 && property_exists($smarty, $pn) ? 2 : 0);
                 }
-                if ($this->_property_info[ $prop ]) {
-                    $pn = $this->resolvedProperties[ $prop ];
-                    if ($match[ 1 ] == 'get') {
-                        return $this->_property_info[ $prop ] == 1 ? $data->$pn : $data->smarty->$pn;
+                if ($this->_property_info[$prop]) {
+                    $pn = $this->resolvedProperties[$prop];
+                    if ($match[1] == 'get') {
+                        return $this->_property_info[$prop] == 1 ? $data->$pn : $data->smarty->$pn;
                     } else {
-                        return $this->_property_info[ $prop ] == 1 ? $data->$pn = $args[ 0 ] :
-                            $data->smarty->$pn = $args[ 0 ];
+                        return $this->_property_info[$prop] == 1 ? $data->$pn = $args[0] : $data->smarty->$pn = $args[0];
                     }
                 } elseif (!class_exists($class)) {
                     throw new SmartyException("property '$pn' does not exist.");
@@ -92,7 +90,7 @@ 
             $callback = array($smarty->ext->$name, $name);
         }
         array_unshift($args, $data);
-        if (isset($callback) && $callback[ 0 ]->objMap | $data->_objType) {
+        if (isset($callback) && $callback[0]->objMap | $data->_objType) {
             return call_user_func_array($callback, $args);
         }
         return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
@@ -122,7 +120,7 @@ 
     public function __get($property_name)
     {
         // object properties of runtime template extensions will start with '_'
-        if ($property_name[ 0 ] == '_') {
+        if ($property_name[0] == '_') {
             $class = 'Smarty_Internal_Runtime_' . ucfirst(substr($property_name, 1));
         } else {
             $class = 'Smarty_Internal_Method_' . ucfirst($property_name);

libraries/Smarty/libs/sysplugins/smarty_internal_data.php

Indentation +212 added lines, -212 removed lines

@@ -28,216 +28,216 @@
  */
 class Smarty_Internal_Data
 {
-    /**
-     * This object type (Smarty = 1, template = 2, data = 4)
-     *
-     * @var int
-     */
-    public $_objType = 4;
-
-    /**
-     * name of class used for templates
-     *
-     * @var string
-     */
-    public $template_class = 'Smarty_Internal_Template';
-
-    /**
-     * template variables
-     *
-     * @var Smarty_Variable[]
-     */
-    public $tpl_vars = array();
-
-    /**
-     * parent template (if any)
-     *
-     * @var Smarty|Smarty_Internal_Template|Smarty_Internal_Data
-     */
-    public $parent = null;
-
-    /**
-     * configuration settings
-     *
-     * @var string[]
-     */
-    public $config_vars = array();
-
-    /**
-     * extension handler
-     *
-     * @var Smarty_Internal_Extension_Handler
-     */
-    public $ext = null;
-
-    /**
-     * Smarty_Internal_Data constructor.
-     *
-     * Install extension handler
-     */
-    public function __construct()
-    {
-        $this->ext = new Smarty_Internal_Extension_Handler();
-        $this->ext->objType = $this->_objType;
-    }
-
-    /**
-     * assigns a Smarty variable
-     *
-     * @param  array|string $tpl_var the template variable name(s)
-     * @param  mixed        $value   the value to assign
-     * @param  boolean      $nocache if true any output of this variable will be not cached
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for
-     *                              chaining
-     */
-    public function assign($tpl_var, $value = null, $nocache = false)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $_key => $_val) {
-                $this->assign($_key, $_val, $nocache);
-            }
-        } else {
-            if ($tpl_var != '') {
-                if ($this->_objType == 2) {
-                    /** @var  Smarty_Internal_Template $this */
-                    $this->_assignInScope($tpl_var, $value, $nocache);
-                } else {
-                    $this->tpl_vars[ $tpl_var ] = new Smarty_Variable($value, $nocache);
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * appends values to template variables
-     *
-     * @api  Smarty::append()
-     * @link http://www.smarty.net/docs/en/api.append.tpl
-     *
-     * @param  array|string $tpl_var                                           the template variable name(s)
-     * @param  mixed        $value                                             the value to append
-     * @param  bool         $merge                                             flag if array elements shall be merged
-     * @param  bool         $nocache                                           if true any output of this variable will
-     *                                                                         be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
-    {
-        return $this->ext->append->append($this, $tpl_var, $value, $merge, $nocache);
-    }
-
-    /**
-     * assigns a global Smarty variable
-     *
-     * @param  string  $varName the global variable name
-     * @param  mixed   $value   the value to assign
-     * @param  boolean $nocache if true any output of this variable will be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function assignGlobal($varName, $value = null, $nocache = false)
-    {
-        return $this->ext->assignGlobal->assignGlobal($this, $varName, $value, $nocache);
-    }
-
-    /**
-     * appends values to template variables by reference
-     *
-     * @param  string  $tpl_var the template variable name
-     * @param  mixed   &$value  the referenced value to append
-     * @param  boolean $merge   flag if array elements shall be merged
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function appendByRef($tpl_var, &$value, $merge = false)
-    {
-        return $this->ext->appendByRef->appendByRef($this, $tpl_var, $value, $merge);
-    }
-
-    /**
-     * assigns values to template variables by reference
-     *
-     * @param string   $tpl_var the template variable name
-     * @param          $value
-     * @param  boolean $nocache if true any output of this variable will be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function assignByRef($tpl_var, &$value, $nocache = false)
-    {
-        return $this->ext->assignByRef->assignByRef($this, $tpl_var, $value, $nocache);
-    }
-
-    /**
-     * Returns a single or all template variables
-     *
-     * @api  Smarty::getTemplateVars()
-     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
-     *
-     * @param  string                                                 $varName       variable name or null
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
-     * @param  bool                                                   $searchParents include parent templates?
-     *
-     * @return mixed variable value or or array of variables
-     */
-    public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
-    {
-        return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
-    }
-
-    /**
-     * gets the object of a Smarty variable
-     *
-     * @param  string               $variable      the name of the Smarty variable
-     * @param  Smarty_Internal_Data $_ptr          optional pointer to data object
-     * @param  boolean              $searchParents search also in parent data
-     * @param bool                  $error_enable
-     *
-     * @return Smarty_Variable|Smarty_Undefined_Variable the object of the variable
-     * @deprecated since 3.1.28 please use Smarty_Internal_Data::getTemplateVars() instead.
-     */
-    public function getVariable($variable = null, Smarty_Internal_Data $_ptr = null, $searchParents = true,
-                                $error_enable = true)
-    {
-        return $this->ext->getTemplateVars->_getVariable($this, $variable, $_ptr, $searchParents, $error_enable);
-    }
-
-    /**
-     * Follow the parent chain an merge template and config variables
-     *
-     * @param \Smarty_Internal_Data|null $data
-     */
-    public function _mergeVars(Smarty_Internal_Data $data = null)
-    {
-        if (isset($data)) {
-            if (!empty($this->tpl_vars)) {
-                $data->tpl_vars = array_merge($this->tpl_vars, $data->tpl_vars);
-            }
-            if (!empty($this->config_vars)) {
-                $data->config_vars = array_merge($this->config_vars, $data->config_vars);
-            }
-        } else {
-            $data = $this;
-        }
-        if (isset($this->parent)) {
-            $this->parent->_mergeVars($data);
-        }
-    }
-
-    /**
-     * Handle unknown class methods
-     *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
-     *
-     * @return mixed
-     * @throws SmartyException
-     */
-    public function __call($name, $args)
-    {
-        return $this->ext->_callExternalMethod($this, $name, $args);
-    }
+	/**
+	 * This object type (Smarty = 1, template = 2, data = 4)
+	 *
+	 * @var int
+	 */
+	public $_objType = 4;
+
+	/**
+	 * name of class used for templates
+	 *
+	 * @var string
+	 */
+	public $template_class = 'Smarty_Internal_Template';
+
+	/**
+	 * template variables
+	 *
+	 * @var Smarty_Variable[]
+	 */
+	public $tpl_vars = array();
+
+	/**
+	 * parent template (if any)
+	 *
+	 * @var Smarty|Smarty_Internal_Template|Smarty_Internal_Data
+	 */
+	public $parent = null;
+
+	/**
+	 * configuration settings
+	 *
+	 * @var string[]
+	 */
+	public $config_vars = array();
+
+	/**
+	 * extension handler
+	 *
+	 * @var Smarty_Internal_Extension_Handler
+	 */
+	public $ext = null;
+
+	/**
+	 * Smarty_Internal_Data constructor.
+	 *
+	 * Install extension handler
+	 */
+	public function __construct()
+	{
+		$this->ext = new Smarty_Internal_Extension_Handler();
+		$this->ext->objType = $this->_objType;
+	}
+
+	/**
+	 * assigns a Smarty variable
+	 *
+	 * @param  array|string $tpl_var the template variable name(s)
+	 * @param  mixed        $value   the value to assign
+	 * @param  boolean      $nocache if true any output of this variable will be not cached
+	 *
+	 * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for
+	 *                              chaining
+	 */
+	public function assign($tpl_var, $value = null, $nocache = false)
+	{
+		if (is_array($tpl_var)) {
+			foreach ($tpl_var as $_key => $_val) {
+				$this->assign($_key, $_val, $nocache);
+			}
+		} else {
+			if ($tpl_var != '') {
+				if ($this->_objType == 2) {
+					/** @var  Smarty_Internal_Template $this */
+					$this->_assignInScope($tpl_var, $value, $nocache);
+				} else {
+					$this->tpl_vars[ $tpl_var ] = new Smarty_Variable($value, $nocache);
+				}
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * appends values to template variables
+	 *
+	 * @api  Smarty::append()
+	 * @link http://www.smarty.net/docs/en/api.append.tpl
+	 *
+	 * @param  array|string $tpl_var                                           the template variable name(s)
+	 * @param  mixed        $value                                             the value to append
+	 * @param  bool         $merge                                             flag if array elements shall be merged
+	 * @param  bool         $nocache                                           if true any output of this variable will
+	 *                                                                         be not cached
+	 *
+	 * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+	 */
+	public function append($tpl_var, $value = null, $merge = false, $nocache = false)
+	{
+		return $this->ext->append->append($this, $tpl_var, $value, $merge, $nocache);
+	}
+
+	/**
+	 * assigns a global Smarty variable
+	 *
+	 * @param  string  $varName the global variable name
+	 * @param  mixed   $value   the value to assign
+	 * @param  boolean $nocache if true any output of this variable will be not cached
+	 *
+	 * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+	 */
+	public function assignGlobal($varName, $value = null, $nocache = false)
+	{
+		return $this->ext->assignGlobal->assignGlobal($this, $varName, $value, $nocache);
+	}
+
+	/**
+	 * appends values to template variables by reference
+	 *
+	 * @param  string  $tpl_var the template variable name
+	 * @param  mixed   &$value  the referenced value to append
+	 * @param  boolean $merge   flag if array elements shall be merged
+	 *
+	 * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+	 */
+	public function appendByRef($tpl_var, &$value, $merge = false)
+	{
+		return $this->ext->appendByRef->appendByRef($this, $tpl_var, $value, $merge);
+	}
+
+	/**
+	 * assigns values to template variables by reference
+	 *
+	 * @param string   $tpl_var the template variable name
+	 * @param          $value
+	 * @param  boolean $nocache if true any output of this variable will be not cached
+	 *
+	 * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+	 */
+	public function assignByRef($tpl_var, &$value, $nocache = false)
+	{
+		return $this->ext->assignByRef->assignByRef($this, $tpl_var, $value, $nocache);
+	}
+
+	/**
+	 * Returns a single or all template variables
+	 *
+	 * @api  Smarty::getTemplateVars()
+	 * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+	 *
+	 * @param  string                                                 $varName       variable name or null
+	 * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+	 * @param  bool                                                   $searchParents include parent templates?
+	 *
+	 * @return mixed variable value or or array of variables
+	 */
+	public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
+	{
+		return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
+	}
+
+	/**
+	 * gets the object of a Smarty variable
+	 *
+	 * @param  string               $variable      the name of the Smarty variable
+	 * @param  Smarty_Internal_Data $_ptr          optional pointer to data object
+	 * @param  boolean              $searchParents search also in parent data
+	 * @param bool                  $error_enable
+	 *
+	 * @return Smarty_Variable|Smarty_Undefined_Variable the object of the variable
+	 * @deprecated since 3.1.28 please use Smarty_Internal_Data::getTemplateVars() instead.
+	 */
+	public function getVariable($variable = null, Smarty_Internal_Data $_ptr = null, $searchParents = true,
+								$error_enable = true)
+	{
+		return $this->ext->getTemplateVars->_getVariable($this, $variable, $_ptr, $searchParents, $error_enable);
+	}
+
+	/**
+	 * Follow the parent chain an merge template and config variables
+	 *
+	 * @param \Smarty_Internal_Data|null $data
+	 */
+	public function _mergeVars(Smarty_Internal_Data $data = null)
+	{
+		if (isset($data)) {
+			if (!empty($this->tpl_vars)) {
+				$data->tpl_vars = array_merge($this->tpl_vars, $data->tpl_vars);
+			}
+			if (!empty($this->config_vars)) {
+				$data->config_vars = array_merge($this->config_vars, $data->config_vars);
+			}
+		} else {
+			$data = $this;
+		}
+		if (isset($this->parent)) {
+			$this->parent->_mergeVars($data);
+		}
+	}
+
+	/**
+	 * Handle unknown class methods
+	 *
+	 * @param string $name unknown method-name
+	 * @param array  $args argument array
+	 *
+	 * @return mixed
+	 * @throws SmartyException
+	 */
+	public function __call($name, $args)
+	{
+		return $this->ext->_callExternalMethod($this, $name, $args);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
                     /** @var  Smarty_Internal_Template $this */
                     $this->_assignInScope($tpl_var, $value, $nocache);
                 } else {
-                    $this->tpl_vars[ $tpl_var ] = new Smarty_Variable($value, $nocache);
+                    $this->tpl_vars[$tpl_var] = new Smarty_Variable($value, $nocache);
                 }
             }
         }

libraries/Smarty/libs/sysplugins/smarty_internal_debug.php

Spacing +57 added lines, -57 removed lines

@@ -53,12 +53,12 @@ 
     public function start_template(Smarty_Internal_Template $template, $mode = null)
     {
         if (isset($mode)) {
-            $this->index ++;
-            $this->offset ++;
-            $this->template_data[ $this->index ] = null;
+            $this->index++;
+            $this->offset++;
+            $this->template_data[$this->index] = null;
         }
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_template_time' ] = microtime(true);
+        $this->template_data[$this->index][$key]['start_template_time'] = microtime(true);
     }
 
     /**
@@ -69,8 +69,8 @@ 
     public function end_template(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'total_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_template_time' ];
+        $this->template_data[$this->index][$key]['total_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_template_time'];
     }
 
     /**
@@ -83,24 +83,24 @@ 
         static $_is_stringy = array('string' => true, 'eval' => true);
         if (!empty($template->compiler->trace_uid)) {
             $key = $template->compiler->trace_uid;
-            if (!isset($this->template_data[ $this->index ][ $key ])) {
-                if (isset($_is_stringy[ $template->source->type ])) {
-                    $this->template_data[ $this->index ][ $key ][ 'name' ] =
+            if (!isset($this->template_data[$this->index][$key])) {
+                if (isset($_is_stringy[$template->source->type])) {
+                    $this->template_data[$this->index][$key]['name'] =
                         '\'' . substr($template->source->name, 0, 25) . '...\'';
                 } else {
-                    $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+                    $this->template_data[$this->index][$key]['name'] = $template->source->filepath;
                 }
-                $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
-                $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
-                $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
+                $this->template_data[$this->index][$key]['compile_time'] = 0;
+                $this->template_data[$this->index][$key]['render_time'] = 0;
+                $this->template_data[$this->index][$key]['cache_time'] = 0;
             }
         } else {
-            if (isset($this->ignore_uid[ $template->source->uid ])) {
+            if (isset($this->ignore_uid[$template->source->uid])) {
                 return;
             }
             $key = $this->get_key($template);
         }
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
     }
 
     /**
@@ -113,14 +113,14 @@ 
         if (!empty($template->compiler->trace_uid)) {
             $key = $template->compiler->trace_uid;
         } else {
-            if (isset($this->ignore_uid[ $template->source->uid ])) {
+            if (isset($this->ignore_uid[$template->source->uid])) {
                 return;
             }
 
             $key = $this->get_key($template);
         }
-        $this->template_data[ $this->index ][ $key ][ 'compile_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+        $this->template_data[$this->index][$key]['compile_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
@@ -131,7 +131,7 @@ 
     public function start_render(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
     }
 
     /**
@@ -142,8 +142,8 @@ 
     public function end_render(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'render_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+        $this->template_data[$this->index][$key]['render_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
@@ -154,7 +154,7 @@ 
     public function start_cache(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
     }
 
     /**
@@ -165,8 +165,8 @@ 
     public function end_cache(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'cache_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+        $this->template_data[$this->index][$key]['cache_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
@@ -196,7 +196,7 @@ 
     public function display_debug($obj, $full = false)
     {
         if (!$full) {
-            $this->offset ++;
+            $this->offset++;
             $savedIndex = $this->index;
             $this->index = 9999;
         }
@@ -243,7 +243,7 @@ 
             $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
         }
         if ($obj->_objType == 1 || $full) {
-            $_template->assign('template_data', $this->template_data[ $this->index ]);
+            $_template->assign('template_data', $this->template_data[$this->index]);
         } else {
             $_template->assign('template_data', null);
         }
@@ -254,7 +254,7 @@ 
         $_template->assign('offset', $this->offset * 50);
         echo $_template->fetch();
         if (isset($full)) {
-            $this->index --;
+            $this->index--;
         }
         if (!$full) {
             $this->index = $savedIndex;
@@ -272,53 +272,53 @@ 
     {
         $config_vars = array();
         foreach ($obj->config_vars as $key => $var) {
-            $config_vars[ $key ][ 'value' ] = $var;
+            $config_vars[$key]['value'] = $var;
             if ($obj->_objType == 2) {
-                $config_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+                $config_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
             } elseif ($obj->_objType == 4) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
             } else {
-                $config_vars[ $key ][ 'scope' ] = 'Smarty object';
+                $config_vars[$key]['scope'] = 'Smarty object';
             }
         }
         $tpl_vars = array();
         foreach ($obj->tpl_vars as $key => $var) {
             foreach ($var as $varkey => $varvalue) {
                 if ($varkey == 'value') {
-                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                    $tpl_vars[$key][$varkey] = $varvalue;
                 } else {
                     if ($varkey == 'nocache') {
                         if ($varvalue == true) {
-                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                            $tpl_vars[$key][$varkey] = $varvalue;
                         }
                     } else {
                         if ($varkey != 'scope' || $varvalue !== 0) {
-                            $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+                            $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
                         }
                     }
                 }
             }
             if ($obj->_objType == 2) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+                $tpl_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
             } elseif ($obj->_objType == 4) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
             } else {
-                $tpl_vars[ $key ][ 'scope' ] = 'Smarty object';
+                $tpl_vars[$key]['scope'] = 'Smarty object';
             }
         }
 
         if (isset($obj->parent)) {
             $parent = $this->get_debug_vars($obj->parent);
             foreach ($parent->tpl_vars as $name => $pvar) {
-                if (isset($tpl_vars[ $name ]) && $tpl_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
-                    $tpl_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+                if (isset($tpl_vars[$name]) && $tpl_vars[$name]['value'] === $pvar['value']) {
+                    $tpl_vars[$name]['scope'] = $pvar['scope'];
                 }
             }
             $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
 
             foreach ($parent->config_vars as $name => $pvar) {
-                if (isset($config_vars[ $name ]) && $config_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
-                    $config_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+                if (isset($config_vars[$name]) && $config_vars[$name]['value'] === $pvar['value']) {
+                    $config_vars[$name]['scope'] = $pvar['scope'];
                 }
             }
             $config_vars = array_merge($parent->config_vars, $config_vars);
@@ -327,20 +327,20 @@ 
                 if (!array_key_exists($key, $tpl_vars)) {
                     foreach ($var as $varkey => $varvalue) {
                         if ($varkey == 'value') {
-                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                            $tpl_vars[$key][$varkey] = $varvalue;
                         } else {
                             if ($varkey == 'nocache') {
                                 if ($varvalue == true) {
-                                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                                    $tpl_vars[$key][$varkey] = $varvalue;
                                 }
                             } else {
                                 if ($varkey != 'scope' || $varvalue !== 0) {
-                                    $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+                                    $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
                                 }
                             }
                         }
                     }
-                    $tpl_vars[ $key ][ 'scope' ] = 'Global';
+                    $tpl_vars[$key]['scope'] = 'Global';
                 }
             }
         }
@@ -363,19 +363,19 @@ 
             $template->source->filepath;
         }
         $key = $template->source->uid;
-        if (isset($this->template_data[ $this->index ][ $key ])) {
+        if (isset($this->template_data[$this->index][$key])) {
             return $key;
         } else {
-            if (isset($_is_stringy[ $template->source->type ])) {
-                $this->template_data[ $this->index ][ $key ][ 'name' ] =
+            if (isset($_is_stringy[$template->source->type])) {
+                $this->template_data[$this->index][$key]['name'] =
                     '\'' . substr($template->source->name, 0, 25) . '...\'';
             } else {
-                $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+                $this->template_data[$this->index][$key]['name'] = $template->source->filepath;
             }
-            $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
+            $this->template_data[$this->index][$key]['compile_time'] = 0;
+            $this->template_data[$this->index][$key]['render_time'] = 0;
+            $this->template_data[$this->index][$key]['cache_time'] = 0;
+            $this->template_data[$this->index][$key]['total_time'] = 0;
 
             return $key;
         }
@@ -392,7 +392,7 @@ 
         if ($template->source->uid == '') {
             $template->source->filepath;
         }
-        $this->ignore_uid[ $template->source->uid ] = true;
+        $this->ignore_uid[$template->source->uid] = true;
     }
 
     /**
@@ -402,8 +402,8 @@ 
      */
     public function debugUrl(Smarty $smarty)
     {
-        if (isset($_SERVER[ 'QUERY_STRING' ])) {
-            $_query_string = $_SERVER[ 'QUERY_STRING' ];
+        if (isset($_SERVER['QUERY_STRING'])) {
+            $_query_string = $_SERVER['QUERY_STRING'];
         } else {
             $_query_string = '';
         }
@@ -421,7 +421,7 @@ 
                 $smarty->debugging = true;
             }
         } else {
-            if (isset($_COOKIE[ 'SMARTY_DEBUG' ])) {
+            if (isset($_COOKIE['SMARTY_DEBUG'])) {
                 $smarty->debugging = true;
             }
         }

Indentation +386 added lines, -386 removed lines

@@ -16,414 +16,414 @@
  */
 class Smarty_Internal_Debug extends Smarty_Internal_Data
 {
-    /**
-     * template data
-     *
-     * @var array
-     */
-    public $template_data = array();
+	/**
+	 * template data
+	 *
+	 * @var array
+	 */
+	public $template_data = array();
 
-    /**
-     * List of uid's which shall be ignored
-     *
-     * @var array
-     */
-    public $ignore_uid = array();
+	/**
+	 * List of uid's which shall be ignored
+	 *
+	 * @var array
+	 */
+	public $ignore_uid = array();
 
-    /**
-     * Index of display() and fetch() calls
-     *
-     * @var int
-     */
-    public $index = 0;
+	/**
+	 * Index of display() and fetch() calls
+	 *
+	 * @var int
+	 */
+	public $index = 0;
 
-    /**
-     * Counter for window offset
-     *
-     * @var int
-     */
-    public $offset = 0;
+	/**
+	 * Counter for window offset
+	 *
+	 * @var int
+	 */
+	public $offset = 0;
 
-    /**
-     * Start logging template
-     *
-     * @param \Smarty_Internal_Template $template template
-     * @param null                      $mode     true: display   false: fetch  null: subtemplate
-     */
-    public function start_template(Smarty_Internal_Template $template, $mode = null)
-    {
-        if (isset($mode)) {
-            $this->index ++;
-            $this->offset ++;
-            $this->template_data[ $this->index ] = null;
-        }
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_template_time' ] = microtime(true);
-    }
+	/**
+	 * Start logging template
+	 *
+	 * @param \Smarty_Internal_Template $template template
+	 * @param null                      $mode     true: display   false: fetch  null: subtemplate
+	 */
+	public function start_template(Smarty_Internal_Template $template, $mode = null)
+	{
+		if (isset($mode)) {
+			$this->index ++;
+			$this->offset ++;
+			$this->template_data[ $this->index ] = null;
+		}
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'start_template_time' ] = microtime(true);
+	}
 
-    /**
-     * End logging of cache time
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public function end_template(Smarty_Internal_Template $template)
-    {
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'total_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_template_time' ];
-    }
+	/**
+	 * End logging of cache time
+	 *
+	 * @param \Smarty_Internal_Template $template cached template
+	 */
+	public function end_template(Smarty_Internal_Template $template)
+	{
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'total_time' ] +=
+			microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_template_time' ];
+	}
 
-    /**
-     * Start logging of compile time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function start_compile(Smarty_Internal_Template $template)
-    {
-        static $_is_stringy = array('string' => true, 'eval' => true);
-        if (!empty($template->compiler->trace_uid)) {
-            $key = $template->compiler->trace_uid;
-            if (!isset($this->template_data[ $this->index ][ $key ])) {
-                if (isset($_is_stringy[ $template->source->type ])) {
-                    $this->template_data[ $this->index ][ $key ][ 'name' ] =
-                        '\'' . substr($template->source->name, 0, 25) . '...\'';
-                } else {
-                    $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
-                }
-                $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
-                $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
-                $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
-            }
-        } else {
-            if (isset($this->ignore_uid[ $template->source->uid ])) {
-                return;
-            }
-            $key = $this->get_key($template);
-        }
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
-    }
+	/**
+	 * Start logging of compile time
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function start_compile(Smarty_Internal_Template $template)
+	{
+		static $_is_stringy = array('string' => true, 'eval' => true);
+		if (!empty($template->compiler->trace_uid)) {
+			$key = $template->compiler->trace_uid;
+			if (!isset($this->template_data[ $this->index ][ $key ])) {
+				if (isset($_is_stringy[ $template->source->type ])) {
+					$this->template_data[ $this->index ][ $key ][ 'name' ] =
+						'\'' . substr($template->source->name, 0, 25) . '...\'';
+				} else {
+					$this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+				}
+				$this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
+				$this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
+				$this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
+			}
+		} else {
+			if (isset($this->ignore_uid[ $template->source->uid ])) {
+				return;
+			}
+			$key = $this->get_key($template);
+		}
+		$this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+	}
 
-    /**
-     * End logging of compile time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function end_compile(Smarty_Internal_Template $template)
-    {
-        if (!empty($template->compiler->trace_uid)) {
-            $key = $template->compiler->trace_uid;
-        } else {
-            if (isset($this->ignore_uid[ $template->source->uid ])) {
-                return;
-            }
+	/**
+	 * End logging of compile time
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function end_compile(Smarty_Internal_Template $template)
+	{
+		if (!empty($template->compiler->trace_uid)) {
+			$key = $template->compiler->trace_uid;
+		} else {
+			if (isset($this->ignore_uid[ $template->source->uid ])) {
+				return;
+			}
 
-            $key = $this->get_key($template);
-        }
-        $this->template_data[ $this->index ][ $key ][ 'compile_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
-    }
+			$key = $this->get_key($template);
+		}
+		$this->template_data[ $this->index ][ $key ][ 'compile_time' ] +=
+			microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+	}
 
-    /**
-     * Start logging of render time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function start_render(Smarty_Internal_Template $template)
-    {
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
-    }
+	/**
+	 * Start logging of render time
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function start_render(Smarty_Internal_Template $template)
+	{
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+	}
 
-    /**
-     * End logging of compile time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function end_render(Smarty_Internal_Template $template)
-    {
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'render_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
-    }
+	/**
+	 * End logging of compile time
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function end_render(Smarty_Internal_Template $template)
+	{
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'render_time' ] +=
+			microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+	}
 
-    /**
-     * Start logging of cache time
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public function start_cache(Smarty_Internal_Template $template)
-    {
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
-    }
+	/**
+	 * Start logging of cache time
+	 *
+	 * @param \Smarty_Internal_Template $template cached template
+	 */
+	public function start_cache(Smarty_Internal_Template $template)
+	{
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+	}
 
-    /**
-     * End logging of cache time
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public function end_cache(Smarty_Internal_Template $template)
-    {
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'cache_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
-    }
+	/**
+	 * End logging of cache time
+	 *
+	 * @param \Smarty_Internal_Template $template cached template
+	 */
+	public function end_cache(Smarty_Internal_Template $template)
+	{
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'cache_time' ] +=
+			microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+	}
 
-    /**
-     * Register template object
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public function register_template(Smarty_Internal_Template $template)
-    {
-    }
+	/**
+	 * Register template object
+	 *
+	 * @param \Smarty_Internal_Template $template cached template
+	 */
+	public function register_template(Smarty_Internal_Template $template)
+	{
+	}
 
-    /**
-     * Register data object
-     *
-     * @param \Smarty_Data $data data object
-     */
-    public static function register_data(Smarty_Data $data)
-    {
-    }
+	/**
+	 * Register data object
+	 *
+	 * @param \Smarty_Data $data data object
+	 */
+	public static function register_data(Smarty_Data $data)
+	{
+	}
 
-    /**
-     * Opens a window for the Smarty Debugging Console and display the data
-     *
-     * @param Smarty_Internal_Template|Smarty $obj object to debug
-     * @param bool                            $full
-     */
-    public function display_debug($obj, $full = false)
-    {
-        if (!$full) {
-            $this->offset ++;
-            $savedIndex = $this->index;
-            $this->index = 9999;
-        }
-        if ($obj->_objType == 1) {
-            $smarty = $obj;
-        } else {
-            $smarty = $obj->smarty;
-        }
-        // create fresh instance of smarty for displaying the debug console
-        // to avoid problems if the application did overload the Smarty class
-        $debObj = new Smarty();
-        // copy the working dirs from application
-        $debObj->setCompileDir($smarty->getCompileDir());
-        // init properties by hand as user may have edited the original Smarty class
-        $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ . '/../plugins' : $smarty->getPluginsDir());
-        $debObj->force_compile = false;
-        $debObj->compile_check = true;
-        $debObj->left_delimiter = '{';
-        $debObj->right_delimiter = '}';
-        $debObj->security_policy = null;
-        $debObj->debugging = false;
-        $debObj->debugging_ctrl = 'NONE';
-        $debObj->error_reporting = E_ALL & ~E_NOTICE;
-        $debObj->debug_tpl = isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
-        $debObj->registered_plugins = array();
-        $debObj->registered_resources = array();
-        $debObj->registered_filters = array();
-        $debObj->autoload_filters = array();
-        $debObj->default_modifiers = array();
-        $debObj->escape_html = true;
-        $debObj->caching = false;
-        $debObj->compile_id = null;
-        $debObj->cache_id = null;
-        // prepare information of assigned variables
-        $ptr = $this->get_debug_vars($obj);
-        $_assigned_vars = $ptr->tpl_vars;
-        ksort($_assigned_vars);
-        $_config_vars = $ptr->config_vars;
-        ksort($_config_vars);
-        $debugging = $smarty->debugging;
+	/**
+	 * Opens a window for the Smarty Debugging Console and display the data
+	 *
+	 * @param Smarty_Internal_Template|Smarty $obj object to debug
+	 * @param bool                            $full
+	 */
+	public function display_debug($obj, $full = false)
+	{
+		if (!$full) {
+			$this->offset ++;
+			$savedIndex = $this->index;
+			$this->index = 9999;
+		}
+		if ($obj->_objType == 1) {
+			$smarty = $obj;
+		} else {
+			$smarty = $obj->smarty;
+		}
+		// create fresh instance of smarty for displaying the debug console
+		// to avoid problems if the application did overload the Smarty class
+		$debObj = new Smarty();
+		// copy the working dirs from application
+		$debObj->setCompileDir($smarty->getCompileDir());
+		// init properties by hand as user may have edited the original Smarty class
+		$debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ . '/../plugins' : $smarty->getPluginsDir());
+		$debObj->force_compile = false;
+		$debObj->compile_check = true;
+		$debObj->left_delimiter = '{';
+		$debObj->right_delimiter = '}';
+		$debObj->security_policy = null;
+		$debObj->debugging = false;
+		$debObj->debugging_ctrl = 'NONE';
+		$debObj->error_reporting = E_ALL & ~E_NOTICE;
+		$debObj->debug_tpl = isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
+		$debObj->registered_plugins = array();
+		$debObj->registered_resources = array();
+		$debObj->registered_filters = array();
+		$debObj->autoload_filters = array();
+		$debObj->default_modifiers = array();
+		$debObj->escape_html = true;
+		$debObj->caching = false;
+		$debObj->compile_id = null;
+		$debObj->cache_id = null;
+		// prepare information of assigned variables
+		$ptr = $this->get_debug_vars($obj);
+		$_assigned_vars = $ptr->tpl_vars;
+		ksort($_assigned_vars);
+		$_config_vars = $ptr->config_vars;
+		ksort($_config_vars);
+		$debugging = $smarty->debugging;
 
-        $_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
-        if ($obj->_objType == 2) {
-            $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
-        }
-        if ($obj->_objType == 1 || $full) {
-            $_template->assign('template_data', $this->template_data[ $this->index ]);
-        } else {
-            $_template->assign('template_data', null);
-        }
-        $_template->assign('assigned_vars', $_assigned_vars);
-        $_template->assign('config_vars', $_config_vars);
-        $_template->assign('execution_time', microtime(true) - $smarty->start_time);
-        $_template->assign('display_mode', $debugging == 2 || !$full);
-        $_template->assign('offset', $this->offset * 50);
-        echo $_template->fetch();
-        if (isset($full)) {
-            $this->index --;
-        }
-        if (!$full) {
-            $this->index = $savedIndex;
-        }
-    }
+		$_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
+		if ($obj->_objType == 2) {
+			$_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
+		}
+		if ($obj->_objType == 1 || $full) {
+			$_template->assign('template_data', $this->template_data[ $this->index ]);
+		} else {
+			$_template->assign('template_data', null);
+		}
+		$_template->assign('assigned_vars', $_assigned_vars);
+		$_template->assign('config_vars', $_config_vars);
+		$_template->assign('execution_time', microtime(true) - $smarty->start_time);
+		$_template->assign('display_mode', $debugging == 2 || !$full);
+		$_template->assign('offset', $this->offset * 50);
+		echo $_template->fetch();
+		if (isset($full)) {
+			$this->index --;
+		}
+		if (!$full) {
+			$this->index = $savedIndex;
+		}
+	}
 
-    /**
-     * Recursively gets variables from all template/data scopes
-     *
-     * @param  Smarty_Internal_Template|Smarty_Data $obj object to debug
-     *
-     * @return StdClass
-     */
-    public function get_debug_vars($obj)
-    {
-        $config_vars = array();
-        foreach ($obj->config_vars as $key => $var) {
-            $config_vars[ $key ][ 'value' ] = $var;
-            if ($obj->_objType == 2) {
-                $config_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj->_objType == 4) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
-            } else {
-                $config_vars[ $key ][ 'scope' ] = 'Smarty object';
-            }
-        }
-        $tpl_vars = array();
-        foreach ($obj->tpl_vars as $key => $var) {
-            foreach ($var as $varkey => $varvalue) {
-                if ($varkey == 'value') {
-                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
-                } else {
-                    if ($varkey == 'nocache') {
-                        if ($varvalue === true) {
-                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
-                        }
-                    } else {
-                        if ($varkey != 'scope' || $varvalue !== 0) {
-                            $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
-                        }
-                    }
-                }
-            }
-            if ($obj->_objType == 2) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj->_objType == 4) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
-            } else {
-                $tpl_vars[ $key ][ 'scope' ] = 'Smarty object';
-            }
-        }
+	/**
+	 * Recursively gets variables from all template/data scopes
+	 *
+	 * @param  Smarty_Internal_Template|Smarty_Data $obj object to debug
+	 *
+	 * @return StdClass
+	 */
+	public function get_debug_vars($obj)
+	{
+		$config_vars = array();
+		foreach ($obj->config_vars as $key => $var) {
+			$config_vars[ $key ][ 'value' ] = $var;
+			if ($obj->_objType == 2) {
+				$config_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+			} elseif ($obj->_objType == 4) {
+				$tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+			} else {
+				$config_vars[ $key ][ 'scope' ] = 'Smarty object';
+			}
+		}
+		$tpl_vars = array();
+		foreach ($obj->tpl_vars as $key => $var) {
+			foreach ($var as $varkey => $varvalue) {
+				if ($varkey == 'value') {
+					$tpl_vars[ $key ][ $varkey ] = $varvalue;
+				} else {
+					if ($varkey == 'nocache') {
+						if ($varvalue === true) {
+							$tpl_vars[ $key ][ $varkey ] = $varvalue;
+						}
+					} else {
+						if ($varkey != 'scope' || $varvalue !== 0) {
+							$tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+						}
+					}
+				}
+			}
+			if ($obj->_objType == 2) {
+				$tpl_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+			} elseif ($obj->_objType == 4) {
+				$tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+			} else {
+				$tpl_vars[ $key ][ 'scope' ] = 'Smarty object';
+			}
+		}
 
-        if (isset($obj->parent)) {
-            $parent = $this->get_debug_vars($obj->parent);
-            foreach ($parent->tpl_vars as $name => $pvar) {
-                if (isset($tpl_vars[ $name ]) && $tpl_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
-                    $tpl_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
-                }
-            }
-            $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
+		if (isset($obj->parent)) {
+			$parent = $this->get_debug_vars($obj->parent);
+			foreach ($parent->tpl_vars as $name => $pvar) {
+				if (isset($tpl_vars[ $name ]) && $tpl_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
+					$tpl_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+				}
+			}
+			$tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
 
-            foreach ($parent->config_vars as $name => $pvar) {
-                if (isset($config_vars[ $name ]) && $config_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
-                    $config_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
-                }
-            }
-            $config_vars = array_merge($parent->config_vars, $config_vars);
-        } else {
-            foreach (Smarty::$global_tpl_vars as $key => $var) {
-                if (!array_key_exists($key, $tpl_vars)) {
-                    foreach ($var as $varkey => $varvalue) {
-                        if ($varkey == 'value') {
-                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
-                        } else {
-                            if ($varkey == 'nocache') {
-                                if ($varvalue === true) {
-                                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
-                                }
-                            } else {
-                                if ($varkey != 'scope' || $varvalue !== 0) {
-                                    $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
-                                }
-                            }
-                        }
-                    }
-                    $tpl_vars[ $key ][ 'scope' ] = 'Global';
-                }
-            }
-        }
+			foreach ($parent->config_vars as $name => $pvar) {
+				if (isset($config_vars[ $name ]) && $config_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
+					$config_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+				}
+			}
+			$config_vars = array_merge($parent->config_vars, $config_vars);
+		} else {
+			foreach (Smarty::$global_tpl_vars as $key => $var) {
+				if (!array_key_exists($key, $tpl_vars)) {
+					foreach ($var as $varkey => $varvalue) {
+						if ($varkey == 'value') {
+							$tpl_vars[ $key ][ $varkey ] = $varvalue;
+						} else {
+							if ($varkey == 'nocache') {
+								if ($varvalue === true) {
+									$tpl_vars[ $key ][ $varkey ] = $varvalue;
+								}
+							} else {
+								if ($varkey != 'scope' || $varvalue !== 0) {
+									$tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+								}
+							}
+						}
+					}
+					$tpl_vars[ $key ][ 'scope' ] = 'Global';
+				}
+			}
+		}
 
-        return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
-    }
+		return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
+	}
 
-    /**
-     * Return key into $template_data for template
-     *
-     * @param \Smarty_Internal_Template $template template object
-     *
-     * @return string key into $template_data
-     */
-    private function get_key(Smarty_Internal_Template $template)
-    {
-        static $_is_stringy = array('string' => true, 'eval' => true);
-        // calculate Uid if not already done
-        if ($template->source->uid == '') {
-            $template->source->filepath;
-        }
-        $key = $template->source->uid;
-        if (isset($this->template_data[ $this->index ][ $key ])) {
-            return $key;
-        } else {
-            if (isset($_is_stringy[ $template->source->type ])) {
-                $this->template_data[ $this->index ][ $key ][ 'name' ] =
-                    '\'' . substr($template->source->name, 0, 25) . '...\'';
-            } else {
-                $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
-            }
-            $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
+	/**
+	 * Return key into $template_data for template
+	 *
+	 * @param \Smarty_Internal_Template $template template object
+	 *
+	 * @return string key into $template_data
+	 */
+	private function get_key(Smarty_Internal_Template $template)
+	{
+		static $_is_stringy = array('string' => true, 'eval' => true);
+		// calculate Uid if not already done
+		if ($template->source->uid == '') {
+			$template->source->filepath;
+		}
+		$key = $template->source->uid;
+		if (isset($this->template_data[ $this->index ][ $key ])) {
+			return $key;
+		} else {
+			if (isset($_is_stringy[ $template->source->type ])) {
+				$this->template_data[ $this->index ][ $key ][ 'name' ] =
+					'\'' . substr($template->source->name, 0, 25) . '...\'';
+			} else {
+				$this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+			}
+			$this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
+			$this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
+			$this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
+			$this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
 
-            return $key;
-        }
-    }
+			return $key;
+		}
+	}
 
-    /**
-     * Ignore template
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function ignore(Smarty_Internal_Template $template)
-    {
-        // calculate Uid if not already done
-        if ($template->source->uid == '') {
-            $template->source->filepath;
-        }
-        $this->ignore_uid[ $template->source->uid ] = true;
-    }
+	/**
+	 * Ignore template
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function ignore(Smarty_Internal_Template $template)
+	{
+		// calculate Uid if not already done
+		if ($template->source->uid == '') {
+			$template->source->filepath;
+		}
+		$this->ignore_uid[ $template->source->uid ] = true;
+	}
 
-    /**
-     * handle 'URL' debugging mode
-     *
-     * @param Smarty $smarty
-     */
-    public function debugUrl(Smarty $smarty)
-    {
-        if (isset($_SERVER[ 'QUERY_STRING' ])) {
-            $_query_string = $_SERVER[ 'QUERY_STRING' ];
-        } else {
-            $_query_string = '';
-        }
-        if (false !== strpos($_query_string, $smarty->smarty_debug_id)) {
-            if (false !== strpos($_query_string, $smarty->smarty_debug_id . '=on')) {
-                // enable debugging for this browser session
-                setcookie('SMARTY_DEBUG', true);
-                $smarty->debugging = true;
-            } elseif (false !== strpos($_query_string, $smarty->smarty_debug_id . '=off')) {
-                // disable debugging for this browser session
-                setcookie('SMARTY_DEBUG', false);
-                $smarty->debugging = false;
-            } else {
-                // enable debugging for this page
-                $smarty->debugging = true;
-            }
-        } else {
-            if (isset($_COOKIE[ 'SMARTY_DEBUG' ])) {
-                $smarty->debugging = true;
-            }
-        }
-    }
+	/**
+	 * handle 'URL' debugging mode
+	 *
+	 * @param Smarty $smarty
+	 */
+	public function debugUrl(Smarty $smarty)
+	{
+		if (isset($_SERVER[ 'QUERY_STRING' ])) {
+			$_query_string = $_SERVER[ 'QUERY_STRING' ];
+		} else {
+			$_query_string = '';
+		}
+		if (false !== strpos($_query_string, $smarty->smarty_debug_id)) {
+			if (false !== strpos($_query_string, $smarty->smarty_debug_id . '=on')) {
+				// enable debugging for this browser session
+				setcookie('SMARTY_DEBUG', true);
+				$smarty->debugging = true;
+			} elseif (false !== strpos($_query_string, $smarty->smarty_debug_id . '=off')) {
+				// disable debugging for this browser session
+				setcookie('SMARTY_DEBUG', false);
+				$smarty->debugging = false;
+			} else {
+				// enable debugging for this page
+				$smarty->debugging = true;
+			}
+		} else {
+			if (isset($_COOKIE[ 'SMARTY_DEBUG' ])) {
+				$smarty->debugging = true;
+			}
+		}
+	}
 }

libraries/Smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php

Indentation +37 added lines, -37 removed lines

@@ -12,41 +12,41 @@
 class Smarty_Internal_Method_AddAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
 {
 
-    /**
-     * Add autoload filters
-     *
-     * @api Smarty::setAutoloadFilters()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  array                                                          $filters filters to load automatically
-     * @param  string                                                         $type    "pre", "output", … specify the
-     *                                                                                 filter type to set. Defaults to
-     *                                                                                 none treating $filters' keys as
-     *                                                                                 the appropriate types
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function addAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        if ($type !== null) {
-            $this->_checkFilterType($type);
-            if (!empty($smarty->autoload_filters[ $type ])) {
-                $smarty->autoload_filters[ $type ] = array_merge($smarty->autoload_filters[ $type ], (array) $filters);
-            } else {
-                $smarty->autoload_filters[ $type ] = (array) $filters;
-            }
-        } else {
-            foreach ((array) $filters as $type => $value) {
-                $this->_checkFilterType($type);
-                if (!empty($smarty->autoload_filters[ $type ])) {
-                    $smarty->autoload_filters[ $type ] =
-                        array_merge($smarty->autoload_filters[ $type ], (array) $value);
-                } else {
-                    $smarty->autoload_filters[ $type ] = (array) $value;
-                }
-            }
-        }
-        return $obj;
-    }
+	/**
+	 * Add autoload filters
+	 *
+	 * @api Smarty::setAutoloadFilters()
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+	 * @param  array                                                          $filters filters to load automatically
+	 * @param  string                                                         $type    "pre", "output", … specify the
+	 *                                                                                 filter type to set. Defaults to
+	 *                                                                                 none treating $filters' keys as
+	 *                                                                                 the appropriate types
+	 *
+	 * @return \Smarty|\Smarty_Internal_Template
+	 */
+	public function addAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+	{
+		$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+		if ($type !== null) {
+			$this->_checkFilterType($type);
+			if (!empty($smarty->autoload_filters[ $type ])) {
+				$smarty->autoload_filters[ $type ] = array_merge($smarty->autoload_filters[ $type ], (array) $filters);
+			} else {
+				$smarty->autoload_filters[ $type ] = (array) $filters;
+			}
+		} else {
+			foreach ((array) $filters as $type => $value) {
+				$this->_checkFilterType($type);
+				if (!empty($smarty->autoload_filters[ $type ])) {
+					$smarty->autoload_filters[ $type ] =
+						array_merge($smarty->autoload_filters[ $type ], (array) $value);
+				} else {
+					$smarty->autoload_filters[ $type ] = (array) $value;
+				}
+			}
+		}
+		return $obj;
+	}
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -31,19 +31,19 @@
         $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
         if ($type !== null) {
             $this->_checkFilterType($type);
-            if (!empty($smarty->autoload_filters[ $type ])) {
-                $smarty->autoload_filters[ $type ] = array_merge($smarty->autoload_filters[ $type ], (array) $filters);
+            if (!empty($smarty->autoload_filters[$type])) {
+                $smarty->autoload_filters[$type] = array_merge($smarty->autoload_filters[$type], (array) $filters);
             } else {
-                $smarty->autoload_filters[ $type ] = (array) $filters;
+                $smarty->autoload_filters[$type] = (array) $filters;
             }
         } else {
             foreach ((array) $filters as $type => $value) {
                 $this->_checkFilterType($type);
-                if (!empty($smarty->autoload_filters[ $type ])) {
-                    $smarty->autoload_filters[ $type ] =
-                        array_merge($smarty->autoload_filters[ $type ], (array) $value);
+                if (!empty($smarty->autoload_filters[$type])) {
+                    $smarty->autoload_filters[$type] =
+                        array_merge($smarty->autoload_filters[$type], (array) $value);
                 } else {
-                    $smarty->autoload_filters[ $type ] = (array) $value;
+                    $smarty->autoload_filters[$type] = (array) $value;
                 }
             }
         }

libraries/Smarty/libs/sysplugins/smarty_internal_method_configload.php

Indentation +164 added lines, -164 removed lines

@@ -11,174 +11,174 @@
  */
 class Smarty_Internal_Method_ConfigLoad
 {
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
+	/**
+	 * Valid for all objects
+	 *
+	 * @var int
+	 */
+	public $objMap = 7;
 
-    /**
-     * load a config file, optionally load just selected sections
-     *
-     * @api  Smarty::configLoad()
-     * @link http://www.smarty.net/docs/en/api.config.load.tpl
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param  string                                                 $config_file filename
-     * @param  mixed                                                  $sections    array of section names, single
-     *                                                                             section or null
-     *
-     * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function configLoad(Smarty_Internal_Data $data, $config_file, $sections = null)
-    {
-        $this->_loadConfigFile($data, $config_file, $sections, null);
-        return $data;
-    }
+	/**
+	 * load a config file, optionally load just selected sections
+	 *
+	 * @api  Smarty::configLoad()
+	 * @link http://www.smarty.net/docs/en/api.config.load.tpl
+	 *
+	 * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+	 * @param  string                                                 $config_file filename
+	 * @param  mixed                                                  $sections    array of section names, single
+	 *                                                                             section or null
+	 *
+	 * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
+	 * @throws \SmartyException
+	 */
+	public function configLoad(Smarty_Internal_Data $data, $config_file, $sections = null)
+	{
+		$this->_loadConfigFile($data, $config_file, $sections, null);
+		return $data;
+	}
 
-    /**
-     * load a config file, optionally load just selected sections
-     *
-     * @api  Smarty::configLoad()
-     * @link http://www.smarty.net/docs/en/api.config.load.tpl
-     *
-     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
-     * @param  string                                                 $config_file filename
-     * @param  mixed                                                  $sections    array of section names, single
-     *                                                                             section or null
-     * @param int                                                     $scope       scope into which config variables
-     *                                                                             shall be loaded
-     *
-     * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function _loadConfigFile(Smarty_Internal_Data $data, $config_file, $sections = null, $scope = 0)
-    {
-        /* @var \Smarty $smarty */
-        $smarty = isset($data->smarty) ? $data->smarty : $data;
-        /* @var \Smarty_Internal_Template $confObj */
-        $confObj = new Smarty_Internal_Template($config_file, $smarty, $data);
-        $confObj->caching = Smarty::CACHING_OFF;
-        $confObj->source = Smarty_Template_Config::load($confObj);
-        $confObj->source->config_sections = $sections;
-        $confObj->source->scope = $scope;
-        $confObj->compiled = Smarty_Template_Compiled::load($confObj);
-        $confObj->compiled->render($confObj);
-        if ($data->_objType == 2) {
-            $data->compiled->file_dependency[ $confObj->source->uid ] =
-                array($confObj->source->filepath, $confObj->source->getTimeStamp(), $confObj->source->type);
-        }
-    }
+	/**
+	 * load a config file, optionally load just selected sections
+	 *
+	 * @api  Smarty::configLoad()
+	 * @link http://www.smarty.net/docs/en/api.config.load.tpl
+	 *
+	 * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+	 * @param  string                                                 $config_file filename
+	 * @param  mixed                                                  $sections    array of section names, single
+	 *                                                                             section or null
+	 * @param int                                                     $scope       scope into which config variables
+	 *                                                                             shall be loaded
+	 *
+	 * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
+	 * @throws \SmartyException
+	 */
+	public function _loadConfigFile(Smarty_Internal_Data $data, $config_file, $sections = null, $scope = 0)
+	{
+		/* @var \Smarty $smarty */
+		$smarty = isset($data->smarty) ? $data->smarty : $data;
+		/* @var \Smarty_Internal_Template $confObj */
+		$confObj = new Smarty_Internal_Template($config_file, $smarty, $data);
+		$confObj->caching = Smarty::CACHING_OFF;
+		$confObj->source = Smarty_Template_Config::load($confObj);
+		$confObj->source->config_sections = $sections;
+		$confObj->source->scope = $scope;
+		$confObj->compiled = Smarty_Template_Compiled::load($confObj);
+		$confObj->compiled->render($confObj);
+		if ($data->_objType == 2) {
+			$data->compiled->file_dependency[ $confObj->source->uid ] =
+				array($confObj->source->filepath, $confObj->source->getTimeStamp(), $confObj->source->type);
+		}
+	}
 
-    /**
-     * load config variables into template object
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param  array                    $new_config_vars
-     *
-     */
-    public function _loadConfigVars(Smarty_Internal_Template $tpl, $new_config_vars)
-    {
-        $this->_assignConfigVars($tpl->parent->config_vars, $tpl, $new_config_vars);
-        $tagScope = $tpl->source->scope;
-        if ($tagScope >= 0) {
-            if ($tagScope == Smarty::SCOPE_LOCAL) {
-                $this->_updateVarStack($tpl, $new_config_vars);
-                $tagScope = 0;
-                if (!$tpl->scope) {
-                    return;
-                }
-            }
-            if ($tpl->parent->_objType == 2 && ($tagScope || $tpl->parent->scope)) {
-                $mergedScope = $tagScope | $tpl->scope;
-                if ($mergedScope) {
-                    // update scopes
-                    foreach ($tpl->smarty->ext->_updateScope->_getAffectedScopes($tpl->parent, $mergedScope) as $ptr) {
-                        $this->_assignConfigVars($ptr->config_vars, $tpl, $new_config_vars);
-                        if ($tagScope && $ptr->_objType == 2 && isset($tpl->_cache[ 'varStack' ])) {
-                            $this->_updateVarStack($tpl, $new_config_vars);
-                        }
-                    }
-                }
-            }
-        }
-    }
+	/**
+	 * load config variables into template object
+	 *
+	 * @param \Smarty_Internal_Template $tpl
+	 * @param  array                    $new_config_vars
+	 *
+	 */
+	public function _loadConfigVars(Smarty_Internal_Template $tpl, $new_config_vars)
+	{
+		$this->_assignConfigVars($tpl->parent->config_vars, $tpl, $new_config_vars);
+		$tagScope = $tpl->source->scope;
+		if ($tagScope >= 0) {
+			if ($tagScope == Smarty::SCOPE_LOCAL) {
+				$this->_updateVarStack($tpl, $new_config_vars);
+				$tagScope = 0;
+				if (!$tpl->scope) {
+					return;
+				}
+			}
+			if ($tpl->parent->_objType == 2 && ($tagScope || $tpl->parent->scope)) {
+				$mergedScope = $tagScope | $tpl->scope;
+				if ($mergedScope) {
+					// update scopes
+					foreach ($tpl->smarty->ext->_updateScope->_getAffectedScopes($tpl->parent, $mergedScope) as $ptr) {
+						$this->_assignConfigVars($ptr->config_vars, $tpl, $new_config_vars);
+						if ($tagScope && $ptr->_objType == 2 && isset($tpl->_cache[ 'varStack' ])) {
+							$this->_updateVarStack($tpl, $new_config_vars);
+						}
+					}
+				}
+			}
+		}
+	}
 
-    /**
-     * Assign all config variables in given scope
-     *
-     * @param array    $config_vars config variables in scope
-     * @param \Smarty_Internal_Template $tpl
-     * @param  array                    $new_config_vars loaded config variables
-     */
-    public function _assignConfigVars(&$config_vars, Smarty_Internal_Template $tpl, $new_config_vars)
-    {
-        // copy global config vars
-        foreach ($new_config_vars[ 'vars' ] as $variable => $value) {
-            if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
-                $config_vars[ $variable ] = $value;
-            } else {
-                $config_vars[ $variable ] = array_merge((array) $config_vars[ $variable ], (array) $value);
-            }
-        }
-        // scan sections
-        $sections = $tpl->source->config_sections;
-        if (!empty($sections)) {
-            foreach ((array) $sections as $tpl_section) {
-                if (isset($new_config_vars[ 'sections' ][ $tpl_section ])) {
-                    foreach ($new_config_vars[ 'sections' ][ $tpl_section ][ 'vars' ] as $variable => $value) {
-                        if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
-                            $config_vars[ $variable ] = $value;
-                        } else {
-                            $config_vars[ $variable ] = array_merge((array) $config_vars[ $variable ], (array) $value);
-                        }
-                    }
-                }
-            }
-        }
-    }
+	/**
+	 * Assign all config variables in given scope
+	 *
+	 * @param array    $config_vars config variables in scope
+	 * @param \Smarty_Internal_Template $tpl
+	 * @param  array                    $new_config_vars loaded config variables
+	 */
+	public function _assignConfigVars(&$config_vars, Smarty_Internal_Template $tpl, $new_config_vars)
+	{
+		// copy global config vars
+		foreach ($new_config_vars[ 'vars' ] as $variable => $value) {
+			if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
+				$config_vars[ $variable ] = $value;
+			} else {
+				$config_vars[ $variable ] = array_merge((array) $config_vars[ $variable ], (array) $value);
+			}
+		}
+		// scan sections
+		$sections = $tpl->source->config_sections;
+		if (!empty($sections)) {
+			foreach ((array) $sections as $tpl_section) {
+				if (isset($new_config_vars[ 'sections' ][ $tpl_section ])) {
+					foreach ($new_config_vars[ 'sections' ][ $tpl_section ][ 'vars' ] as $variable => $value) {
+						if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
+							$config_vars[ $variable ] = $value;
+						} else {
+							$config_vars[ $variable ] = array_merge((array) $config_vars[ $variable ], (array) $value);
+						}
+					}
+				}
+			}
+		}
+	}
 
-    /**
-     * Update config variables in template local variable stack
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param array                     $config_vars
-     */
-    public function _updateVarStack(Smarty_Internal_Template $tpl, $config_vars)
-    {
-        $i = 0;
-        while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
-            $this->_assignConfigVars($tpl->_cache[ 'varStack' ][ $i ][ 'config' ], $tpl, $config_vars);
-            $i ++;
-        }
-    }
+	/**
+	 * Update config variables in template local variable stack
+	 *
+	 * @param \Smarty_Internal_Template $tpl
+	 * @param array                     $config_vars
+	 */
+	public function _updateVarStack(Smarty_Internal_Template $tpl, $config_vars)
+	{
+		$i = 0;
+		while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
+			$this->_assignConfigVars($tpl->_cache[ 'varStack' ][ $i ][ 'config' ], $tpl, $config_vars);
+			$i ++;
+		}
+	}
 
-    /**
-     * gets  a config variable value
-     *
-     * @param \Smarty_Internal_Template $tpl     template object
-     * @param string                    $varName the name of the config variable
-     * @param bool                      $errorEnable
-     *
-     * @return mixed  the value of the config variable
-     */
-    public function _getConfigVariable(Smarty_Internal_Template $tpl, $varName, $errorEnable = true)
-    {
-        $_ptr = $tpl;
-        while ($_ptr !== null) {
-            if (isset($_ptr->config_vars[ $varName ])) {
-                // found it, return it
-                return $_ptr->config_vars[ $varName ];
-            }
-            // not found, try at parent
-            $_ptr = $_ptr->parent;
-        }
-        if ($tpl->smarty->error_unassigned && $errorEnable) {
-            // force a notice
-            $x = $$varName;
-        }
-        return null;
-    }
+	/**
+	 * gets  a config variable value
+	 *
+	 * @param \Smarty_Internal_Template $tpl     template object
+	 * @param string                    $varName the name of the config variable
+	 * @param bool                      $errorEnable
+	 *
+	 * @return mixed  the value of the config variable
+	 */
+	public function _getConfigVariable(Smarty_Internal_Template $tpl, $varName, $errorEnable = true)
+	{
+		$_ptr = $tpl;
+		while ($_ptr !== null) {
+			if (isset($_ptr->config_vars[ $varName ])) {
+				// found it, return it
+				return $_ptr->config_vars[ $varName ];
+			}
+			// not found, try at parent
+			$_ptr = $_ptr->parent;
+		}
+		if ($tpl->smarty->error_unassigned && $errorEnable) {
+			// force a notice
+			$x = $$varName;
+		}
+		return null;
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -67,7 +67,7 @@ 
         $confObj->compiled = Smarty_Template_Compiled::load($confObj);
         $confObj->compiled->render($confObj);
         if ($data->_objType == 2) {
-            $data->compiled->file_dependency[ $confObj->source->uid ] =
+            $data->compiled->file_dependency[$confObj->source->uid] =
                 array($confObj->source->filepath, $confObj->source->getTimeStamp(), $confObj->source->type);
         }
     }
@@ -97,7 +97,7 @@ 
                     // update scopes
                     foreach ($tpl->smarty->ext->_updateScope->_getAffectedScopes($tpl->parent, $mergedScope) as $ptr) {
                         $this->_assignConfigVars($ptr->config_vars, $tpl, $new_config_vars);
-                        if ($tagScope && $ptr->_objType == 2 && isset($tpl->_cache[ 'varStack' ])) {
+                        if ($tagScope && $ptr->_objType == 2 && isset($tpl->_cache['varStack'])) {
                             $this->_updateVarStack($tpl, $new_config_vars);
                         }
                     }
@@ -116,23 +116,23 @@ 
     public function _assignConfigVars(&$config_vars, Smarty_Internal_Template $tpl, $new_config_vars)
     {
         // copy global config vars
-        foreach ($new_config_vars[ 'vars' ] as $variable => $value) {
-            if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
-                $config_vars[ $variable ] = $value;
+        foreach ($new_config_vars['vars'] as $variable => $value) {
+            if ($tpl->smarty->config_overwrite || !isset($config_vars[$variable])) {
+                $config_vars[$variable] = $value;
             } else {
-                $config_vars[ $variable ] = array_merge((array) $config_vars[ $variable ], (array) $value);
+                $config_vars[$variable] = array_merge((array) $config_vars[$variable], (array) $value);
             }
         }
         // scan sections
         $sections = $tpl->source->config_sections;
         if (!empty($sections)) {
             foreach ((array) $sections as $tpl_section) {
-                if (isset($new_config_vars[ 'sections' ][ $tpl_section ])) {
-                    foreach ($new_config_vars[ 'sections' ][ $tpl_section ][ 'vars' ] as $variable => $value) {
-                        if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
-                            $config_vars[ $variable ] = $value;
+                if (isset($new_config_vars['sections'][$tpl_section])) {
+                    foreach ($new_config_vars['sections'][$tpl_section]['vars'] as $variable => $value) {
+                        if ($tpl->smarty->config_overwrite || !isset($config_vars[$variable])) {
+                            $config_vars[$variable] = $value;
                         } else {
-                            $config_vars[ $variable ] = array_merge((array) $config_vars[ $variable ], (array) $value);
+                            $config_vars[$variable] = array_merge((array) $config_vars[$variable], (array) $value);
                         }
                     }
                 }
@@ -149,9 +149,9 @@ 
     public function _updateVarStack(Smarty_Internal_Template $tpl, $config_vars)
     {
         $i = 0;
-        while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
-            $this->_assignConfigVars($tpl->_cache[ 'varStack' ][ $i ][ 'config' ], $tpl, $config_vars);
-            $i ++;
+        while (isset($tpl->_cache['varStack'][$i])) {
+            $this->_assignConfigVars($tpl->_cache['varStack'][$i]['config'], $tpl, $config_vars);
+            $i++;
         }
     }
 
@@ -168,9 +168,9 @@ 
     {
         $_ptr = $tpl;
         while ($_ptr !== null) {
-            if (isset($_ptr->config_vars[ $varName ])) {
+            if (isset($_ptr->config_vars[$varName])) {
                 // found it, return it
-                return $_ptr->config_vars[ $varName ];
+                return $_ptr->config_vars[$varName];
             }
             // not found, try at parent
             $_ptr = $_ptr->parent;