YetiForceCompany / YetiForceCRM

libraries/Smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php

Indentation +27 added lines, -27 removed lines

@@ -11,32 +11,32 @@
  */
 class Smarty_Internal_Method_RegisterDefaultConfigHandler
 {
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
+	/**
+	 * Valid for Smarty and template object
+	 *
+	 * @var int
+	 */
+	public $objMap = 3;
 
-    /**
-     * Register config default handler
-     *
-     * @api  Smarty::registerDefaultConfigHandler()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  callable                                                       $callback class/method name
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws SmartyException              if $callback is not callable
-     */
-    public function registerDefaultConfigHandler(Smarty_Internal_TemplateBase $obj, $callback)
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        if (is_callable($callback)) {
-            $smarty->default_config_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default config handler not callable");
-        }
-        return $obj;
-    }
+	/**
+	 * Register config default handler
+	 *
+	 * @api  Smarty::registerDefaultConfigHandler()
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+	 * @param  callable                                                       $callback class/method name
+	 *
+	 * @return \Smarty|\Smarty_Internal_Template
+	 * @throws SmartyException              if $callback is not callable
+	 */
+	public function registerDefaultConfigHandler(Smarty_Internal_TemplateBase $obj, $callback)
+	{
+		$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+		if (is_callable($callback)) {
+			$smarty->default_config_handler_func = $callback;
+		} else {
+			throw new SmartyException("Default config handler not callable");
+		}
+		return $obj;
+	}
 }
\ No newline at end of file

libraries/Smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php

Indentation +26 added lines, -26 removed lines

@@ -11,31 +11,31 @@
  */
 class Smarty_Internal_Method_SetDebugTemplate
 {
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
+	/**
+	 * Valid for Smarty and template object
+	 *
+	 * @var int
+	 */
+	public $objMap = 3;
 
-    /**
-     * set the debug template
-     *
-     * @api Smarty::setDebugTemplate()
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  string                                                         $tpl_name
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws SmartyException if file is not readable
-     */
-    public function setDebugTemplate(Smarty_Internal_TemplateBase $obj, $tpl_name)
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        if (!is_readable($tpl_name)) {
-            throw new SmartyException("Unknown file '{$tpl_name}'");
-        }
-        $smarty->debug_tpl = $tpl_name;
-        return $obj;
-    }
+	/**
+	 * set the debug template
+	 *
+	 * @api Smarty::setDebugTemplate()
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+	 * @param  string                                                         $tpl_name
+	 *
+	 * @return \Smarty|\Smarty_Internal_Template
+	 * @throws SmartyException if file is not readable
+	 */
+	public function setDebugTemplate(Smarty_Internal_TemplateBase $obj, $tpl_name)
+	{
+		$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+		if (!is_readable($tpl_name)) {
+			throw new SmartyException("Unknown file '{$tpl_name}'");
+		}
+		$smarty->debug_tpl = $tpl_name;
+		return $obj;
+	}
 }
\ No newline at end of file

libraries/Smarty/libs/sysplugins/smarty_internal_method_registerresource.php

Indentation +29 added lines, -29 removed lines

@@ -11,34 +11,34 @@
  */
 class Smarty_Internal_Method_RegisterResource
 {
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
+	/**
+	 * Valid for Smarty and template object
+	 *
+	 * @var int
+	 */
+	public $objMap = 3;
 
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @api  Smarty::registerResource()
-     * @link http://www.smarty.net/docs/en/api.register.resource.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  string                                                         $name             name of resource type
-     * @param  Smarty_Resource|array                                          $resource_handler or instance of
-     *                                                                                          Smarty_Resource, or
-     *                                                                                          array of callbacks to
-     *                                                                                          handle resource
-     *                                                                                          (deprecated)
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, $resource_handler)
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        $smarty->registered_resources[ $name ] =
-            $resource_handler instanceof Smarty_Resource ? $resource_handler : array($resource_handler, false);
-        return $obj;
-    }
+	/**
+	 * Registers a resource to fetch a template
+	 *
+	 * @api  Smarty::registerResource()
+	 * @link http://www.smarty.net/docs/en/api.register.resource.tpl
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+	 * @param  string                                                         $name             name of resource type
+	 * @param  Smarty_Resource|array                                          $resource_handler or instance of
+	 *                                                                                          Smarty_Resource, or
+	 *                                                                                          array of callbacks to
+	 *                                                                                          handle resource
+	 *                                                                                          (deprecated)
+	 *
+	 * @return \Smarty|\Smarty_Internal_Template
+	 */
+	public function registerResource(Smarty_Internal_TemplateBase $obj, $name, $resource_handler)
+	{
+		$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+		$smarty->registered_resources[ $name ] =
+			$resource_handler instanceof Smarty_Resource ? $resource_handler : array($resource_handler, false);
+		return $obj;
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     public function registerResource(Smarty_Internal_TemplateBase $obj, $name, $resource_handler)
     {
         $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        $smarty->registered_resources[ $name ] =
+        $smarty->registered_resources[$name] =
             $resource_handler instanceof Smarty_Resource ? $resource_handler : array($resource_handler, false);
         return $obj;
     }

libraries/Smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 } else {
                     $handler = Smarty_Resource::load($tpl->smarty, $_file_to_check[2]);
                     if ($handler->checkTimestamps()) {
-                        $source = Smarty_Template_Source::load($tpl, $tpl->smarty, $_file_to_check[ 0 ]);
+                        $source = Smarty_Template_Source::load($tpl, $tpl->smarty, $_file_to_check[0]);
                         $mtime = $source->getTimeStamp();
                     } else {
                         continue;

Indentation +71 added lines, -71 removed lines

@@ -10,75 +10,75 @@
  **/
 class Smarty_Internal_Runtime_ValidateCompiled
 {
-    /**
-     * This function is executed automatically when a compiled or cached template file is included
-     * - Decode saved properties from compiled template and cache files
-     * - Check if compiled or cache file is valid
-     *
-     * @param  array $properties special template properties
-     * @param  bool  $cache      flag if called from cache file
-     *
-     * @return bool  flag if compiled or cache file is valid
-     */
-    public function decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
-    {
-        $is_valid = true;
-        if (Smarty::SMARTY_VERSION != $properties['version']) {
-            // new version must rebuild
-            $is_valid = false;
-        } elseif ($is_valid && !empty($properties['file_dependency']) &&
-            ((!$cache && $tpl->smarty->compile_check) || $tpl->smarty->compile_check == 1)
-        ) {
-            // check file dependencies at compiled code
-            foreach ($properties['file_dependency'] as $_file_to_check) {
-                if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'extends' || $_file_to_check[2] == 'php') {
-                    if ($tpl->source->filepath == $_file_to_check[0]) {
-                        // do not recheck current template
-                        continue;
-                    } else {
-                        // file and php types can be checked without loading the respective resource handlers
-                        $mtime = is_file($_file_to_check[0]) ? filemtime($_file_to_check[0]) : false;
-                    }
-                } elseif ($_file_to_check[2] == 'string') {
-                    continue;
-                } else {
-                    $handler = Smarty_Resource::load($tpl->smarty, $_file_to_check[2]);
-                    if ($handler->checkTimestamps()) {
-                        $source = Smarty_Template_Source::load($tpl, $tpl->smarty, $_file_to_check[ 0 ]);
-                        $mtime = $source->getTimeStamp();
-                    } else {
-                        continue;
-                    }
-                }
-                if (!$mtime || $mtime > $_file_to_check[1]) {
-                    $is_valid = false;
-                    break;
-                }
-            }
-        }
-        if ($cache) {
-            // CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
-            if ($tpl->caching === Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0 &&
-                (time() > ($tpl->cached->timestamp + $properties['cache_lifetime']))
-            ) {
-                $is_valid = false;
-            }
-            $tpl->cached->cache_lifetime = $properties['cache_lifetime'];
-            $tpl->cached->valid = $is_valid;
-            $resource = $tpl->cached;
-        } else {
-            $tpl->mustCompile = !$is_valid;
-            $resource = $tpl->compiled;
-            $resource->includes = isset($properties['includes']) ? $properties['includes'] : array();
-        }
-        if ($is_valid) {
-            $resource->unifunc = $properties['unifunc'];
-            $resource->has_nocache_code = $properties['has_nocache_code'];
-            $resource->file_dependency = $properties['file_dependency'];
-            if (isset($properties['tpl_function'])) {
-                $tpl->tpl_function = $properties['tpl_function'];
-            }
-        }
-        return $is_valid && !function_exists($properties['unifunc']);
-    }
+	/**
+	 * This function is executed automatically when a compiled or cached template file is included
+	 * - Decode saved properties from compiled template and cache files
+	 * - Check if compiled or cache file is valid
+	 *
+	 * @param  array $properties special template properties
+	 * @param  bool  $cache      flag if called from cache file
+	 *
+	 * @return bool  flag if compiled or cache file is valid
+	 */
+	public function decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
+	{
+		$is_valid = true;
+		if (Smarty::SMARTY_VERSION != $properties['version']) {
+			// new version must rebuild
+			$is_valid = false;
+		} elseif ($is_valid && !empty($properties['file_dependency']) &&
+			((!$cache && $tpl->smarty->compile_check) || $tpl->smarty->compile_check == 1)
+		) {
+			// check file dependencies at compiled code
+			foreach ($properties['file_dependency'] as $_file_to_check) {
+				if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'extends' || $_file_to_check[2] == 'php') {
+					if ($tpl->source->filepath == $_file_to_check[0]) {
+						// do not recheck current template
+						continue;
+					} else {
+						// file and php types can be checked without loading the respective resource handlers
+						$mtime = is_file($_file_to_check[0]) ? filemtime($_file_to_check[0]) : false;
+					}
+				} elseif ($_file_to_check[2] == 'string') {
+					continue;
+				} else {
+					$handler = Smarty_Resource::load($tpl->smarty, $_file_to_check[2]);
+					if ($handler->checkTimestamps()) {
+						$source = Smarty_Template_Source::load($tpl, $tpl->smarty, $_file_to_check[ 0 ]);
+						$mtime = $source->getTimeStamp();
+					} else {
+						continue;
+					}
+				}
+				if (!$mtime || $mtime > $_file_to_check[1]) {
+					$is_valid = false;
+					break;
+				}
+			}
+		}
+		if ($cache) {
+			// CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
+			if ($tpl->caching === Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0 &&
+				(time() > ($tpl->cached->timestamp + $properties['cache_lifetime']))
+			) {
+				$is_valid = false;
+			}
+			$tpl->cached->cache_lifetime = $properties['cache_lifetime'];
+			$tpl->cached->valid = $is_valid;
+			$resource = $tpl->cached;
+		} else {
+			$tpl->mustCompile = !$is_valid;
+			$resource = $tpl->compiled;
+			$resource->includes = isset($properties['includes']) ? $properties['includes'] : array();
+		}
+		if ($is_valid) {
+			$resource->unifunc = $properties['unifunc'];
+			$resource->has_nocache_code = $properties['has_nocache_code'];
+			$resource->file_dependency = $properties['file_dependency'];
+			if (isset($properties['tpl_function'])) {
+				$tpl->tpl_function = $properties['tpl_function'];
+			}
+		}
+		return $is_valid && !function_exists($properties['unifunc']);
+	}
 }

libraries/Smarty/libs/sysplugins/smarty_internal_method_registerobject.php

Indentation +57 added lines, -57 removed lines

@@ -11,62 +11,62 @@
  */
 class Smarty_Internal_Method_RegisterObject
 {
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
+	/**
+	 * Valid for Smarty and template object
+	 *
+	 * @var int
+	 */
+	public $objMap = 3;
 
-    /**
-     * Registers object to be used in templates
-     *
-     * @api  Smarty::registerObject()
-     * @link http://www.smarty.net/docs/en/api.register.object.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  string                                                         $object_name
-     * @param  object                                                         $object                     the
-     *                                                                                                    referenced
-     *                                                                                                    PHP object to
-     *                                                                                                    register
-     * @param  array                                                          $allowed_methods_properties list of
-     *                                                                                                    allowed
-     *                                                                                                    methods
-     *                                                                                                    (empty = all)
-     * @param  bool                                                           $format                     smarty
-     *                                                                                                    argument
-     *                                                                                                    format, else
-     *                                                                                                    traditional
-     * @param  array                                                          $block_methods              list of
-     *                                                                                                    block-methods
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     * @throws \SmartyException
-     */
-    public function registerObject(Smarty_Internal_TemplateBase $obj, $object_name, $object,
-                                   $allowed_methods_properties = array(), $format = true, $block_methods = array())
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        // test if allowed methods callable
-        if (!empty($allowed_methods_properties)) {
-            foreach ((array) $allowed_methods_properties as $method) {
-                if (!is_callable(array($object, $method)) && !property_exists($object, $method)) {
-                    throw new SmartyException("Undefined method or property '$method' in registered object");
-                }
-            }
-        }
-        // test if block methods callable
-        if (!empty($block_methods)) {
-            foreach ((array) $block_methods as $method) {
-                if (!is_callable(array($object, $method))) {
-                    throw new SmartyException("Undefined method '$method' in registered object");
-                }
-            }
-        }
-        // register the object
-        $smarty->registered_objects[ $object_name ] =
-            array($object, (array) $allowed_methods_properties, (boolean) $format, (array) $block_methods);
-        return $obj;
-    }
+	/**
+	 * Registers object to be used in templates
+	 *
+	 * @api  Smarty::registerObject()
+	 * @link http://www.smarty.net/docs/en/api.register.object.tpl
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+	 * @param  string                                                         $object_name
+	 * @param  object                                                         $object                     the
+	 *                                                                                                    referenced
+	 *                                                                                                    PHP object to
+	 *                                                                                                    register
+	 * @param  array                                                          $allowed_methods_properties list of
+	 *                                                                                                    allowed
+	 *                                                                                                    methods
+	 *                                                                                                    (empty = all)
+	 * @param  bool                                                           $format                     smarty
+	 *                                                                                                    argument
+	 *                                                                                                    format, else
+	 *                                                                                                    traditional
+	 * @param  array                                                          $block_methods              list of
+	 *                                                                                                    block-methods
+	 *
+	 * @return \Smarty|\Smarty_Internal_Template
+	 * @throws \SmartyException
+	 */
+	public function registerObject(Smarty_Internal_TemplateBase $obj, $object_name, $object,
+								   $allowed_methods_properties = array(), $format = true, $block_methods = array())
+	{
+		$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+		// test if allowed methods callable
+		if (!empty($allowed_methods_properties)) {
+			foreach ((array) $allowed_methods_properties as $method) {
+				if (!is_callable(array($object, $method)) && !property_exists($object, $method)) {
+					throw new SmartyException("Undefined method or property '$method' in registered object");
+				}
+			}
+		}
+		// test if block methods callable
+		if (!empty($block_methods)) {
+			foreach ((array) $block_methods as $method) {
+				if (!is_callable(array($object, $method))) {
+					throw new SmartyException("Undefined method '$method' in registered object");
+				}
+			}
+		}
+		// register the object
+		$smarty->registered_objects[ $object_name ] =
+			array($object, (array) $allowed_methods_properties, (boolean) $format, (array) $block_methods);
+		return $obj;
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             }
         }
         // register the object
-        $smarty->registered_objects[ $object_name ] =
+        $smarty->registered_objects[$object_name] =
             array($object, (array) $allowed_methods_properties, (boolean) $format, (array) $block_methods);
         return $obj;
     }

libraries/Smarty/libs/sysplugins/smarty_internal_runtime_var.php

Indentation +20 added lines, -20 removed lines

@@ -10,24 +10,24 @@
  **/
 class Smarty_Internal_Runtime_Var
 {
-    /**
-     * Template code runtime function to create a local Smarty variable for array assignments
-     *
-     * @param \Smarty_Internal_Template $tpl     template object
-     * @param string                    $varName template variable name
-     * @param bool                      $nocache cache mode of variable
-     */
-    public function createLocalArrayVariable(Smarty_Internal_Template $tpl, $varName, $nocache = false)
-    {
-        if (!isset($tpl->tpl_vars[$varName])) {
-            $tpl->tpl_vars[$varName] = new Smarty_Variable(array(), $nocache);
-        } else {
-            $tpl->tpl_vars[$varName] = clone $tpl->tpl_vars[$varName];
-            if (!(is_array($tpl->tpl_vars[$varName]->value) ||
-                $tpl->tpl_vars[$varName]->value instanceof ArrayAccess)
-            ) {
-                settype($tpl->tpl_vars[$varName]->value, 'array');
-            }
-        }
-    }
+	/**
+	 * Template code runtime function to create a local Smarty variable for array assignments
+	 *
+	 * @param \Smarty_Internal_Template $tpl     template object
+	 * @param string                    $varName template variable name
+	 * @param bool                      $nocache cache mode of variable
+	 */
+	public function createLocalArrayVariable(Smarty_Internal_Template $tpl, $varName, $nocache = false)
+	{
+		if (!isset($tpl->tpl_vars[$varName])) {
+			$tpl->tpl_vars[$varName] = new Smarty_Variable(array(), $nocache);
+		} else {
+			$tpl->tpl_vars[$varName] = clone $tpl->tpl_vars[$varName];
+			if (!(is_array($tpl->tpl_vars[$varName]->value) ||
+				$tpl->tpl_vars[$varName]->value instanceof ArrayAccess)
+			) {
+				settype($tpl->tpl_vars[$varName]->value, 'array');
+			}
+		}
+	}
 }

libraries/Smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php

Indentation +23 added lines, -23 removed lines

@@ -16,27 +16,27 @@
  */
 class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_Compile_Private_Block_Plugin
 {
-    /**
-     * Setup callback and parameter array
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     * @param  array                                $_attr attributes
-     * @param  string                               $tag
-     * @param  string                               $method
-     *
-     * @return array
-     */
-    public function setup(Smarty_Internal_TemplateCompilerBase $compiler, $_attr, $tag, $method)
-    {
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        $callback = array("\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]", "->{$method}");
-        return array($callback, $_paramsArray, "array(\$_block_plugin{$this->nesting}, '{$method}')");
-    }
+	/**
+	 * Setup callback and parameter array
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 * @param  array                                $_attr attributes
+	 * @param  string                               $tag
+	 * @param  string                               $method
+	 *
+	 * @return array
+	 */
+	public function setup(Smarty_Internal_TemplateCompilerBase $compiler, $_attr, $tag, $method)
+	{
+		$_paramsArray = array();
+		foreach ($_attr as $_key => $_value) {
+			if (is_int($_key)) {
+				$_paramsArray[] = "$_key=>$_value";
+			} else {
+				$_paramsArray[] = "'$_key'=>$_value";
+			}
+		}
+		$callback = array("\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]", "->{$method}");
+		return array($callback, $_paramsArray, "array(\$_block_plugin{$this->nesting}, '{$method}')");
+	}
 }

libraries/Smarty/libs/sysplugins/smarty_internal_method_loadfilter.php

Indentation +60 added lines, -60 removed lines

@@ -11,67 +11,67 @@
  */
 class Smarty_Internal_Method_LoadFilter
 {
-    /**
-     * 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);
 
-    /**
-     * load a filter of specified type and name
-     *
-     * @api  Smarty::loadFilter()
-     *
-     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  string                                                         $type filter type
-     * @param  string                                                         $name filter name
-     *
-     * @return bool
-     * @throws SmartyException if filter could not be loaded
-     */
-    public function loadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        $this->_checkFilterType($type);
-        $_plugin = "smarty_{$type}filter_{$name}";
-        $_filter_name = $_plugin;
-        if (is_callable($_plugin)) {
-            $smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
-            return true;
-        }
-        if ($smarty->loadPlugin($_plugin)) {
-            if (class_exists($_plugin, false)) {
-                $_plugin = array($_plugin, 'execute');
-            }
-            if (is_callable($_plugin)) {
-                $smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
-                return true;
-            }
-        }
-        throw new SmartyException("{$type}filter \"{$name}\" not found or callable");
-    }
+	/**
+	 * load a filter of specified type and name
+	 *
+	 * @api  Smarty::loadFilter()
+	 *
+	 * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+	 * @param  string                                                         $type filter type
+	 * @param  string                                                         $name filter name
+	 *
+	 * @return bool
+	 * @throws SmartyException if filter could not be loaded
+	 */
+	public function loadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
+	{
+		$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+		$this->_checkFilterType($type);
+		$_plugin = "smarty_{$type}filter_{$name}";
+		$_filter_name = $_plugin;
+		if (is_callable($_plugin)) {
+			$smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
+			return true;
+		}
+		if ($smarty->loadPlugin($_plugin)) {
+			if (class_exists($_plugin, false)) {
+				$_plugin = array($_plugin, 'execute');
+			}
+			if (is_callable($_plugin)) {
+				$smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
+				return true;
+			}
+		}
+		throw new SmartyException("{$type}filter \"{$name}\" not found or callable");
+	}
 
-    /**
-     * 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 +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
         $_plugin = "smarty_{$type}filter_{$name}";
         $_filter_name = $_plugin;
         if (is_callable($_plugin)) {
-            $smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
+            $smarty->registered_filters[$type][$_filter_name] = $_plugin;
             return true;
         }
         if ($smarty->loadPlugin($_plugin)) {
@@ -54,7 +54,7 @@ 
                 $_plugin = array($_plugin, 'execute');
             }
             if (is_callable($_plugin)) {
-                $smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
+                $smarty->registered_filters[$type][$_filter_name] = $_plugin;
                 return true;
             }
         }
@@ -70,7 +70,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_compile_foreach.php

Indentation +278 added lines, -278 removed lines

@@ -16,242 +16,242 @@ 
  */
 class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_ForeachSection
 {
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('from', 'item');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $required_attributes = array('from', 'item');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('name', 'key', 'properties');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $optional_attributes = array('name', 'key', 'properties');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('from', 'item', 'key', 'name');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $shorttag_order = array('from', 'item', 'key', 'name');
 
-    /**
-     * counter
-     *
-     * @var int
-     */
-    public $counter = 0;
+	/**
+	 * counter
+	 *
+	 * @var int
+	 */
+	public $counter = 0;
 
-    /**
-     * Name of this tag
-     *
-     * @var string
-     */
-    public $tagName = 'foreach';
+	/**
+	 * Name of this tag
+	 *
+	 * @var string
+	 */
+	public $tagName = 'foreach';
 
-    /**
-     * Valid properties of $smarty.foreach.name.xxx variable
-     *
-     * @var array
-     */
-    public $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total');
+	/**
+	 * Valid properties of $smarty.foreach.name.xxx variable
+	 *
+	 * @var array
+	 */
+	public $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total');
 
-    /**
-     * Valid properties of $item@xxx variable
-     *
-     * @var array
-     */
-    public $itemProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'key');
+	/**
+	 * Valid properties of $item@xxx variable
+	 *
+	 * @var array
+	 */
+	public $itemProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'key');
 
-    /**
-     * Flag if tag had name attribute
-     *
-     * @var bool
-     */
-    public $isNamed = false;
+	/**
+	 * Flag if tag had name attribute
+	 *
+	 * @var bool
+	 */
+	public $isNamed = false;
 
-    /**
-     * Compiles code for the {foreach} tag
-     *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $compiler->loopNesting ++;
-        // init
-        $this->isNamed = false;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $from = $_attr[ 'from' ];
-        $item = $compiler->getId($_attr[ 'item' ]);
-        if ($item === false) {
-            $item = $compiler->getVariableName($_attr[ 'item' ]);
-        }
-        $key = $name = null;
-        $attributes = array('item' => $item);
-        if (isset($_attr[ 'key' ])) {
-            $key = $compiler->getId($_attr[ 'key' ]);
-            if ($key === false) {
-                $key = $compiler->getVariableName($_attr[ 'key' ]);
-            }
-            $attributes[ 'key' ] = $key;
-        }
-        if (isset($_attr[ 'name' ])) {
-            $this->isNamed = true;
-            $name = $attributes[ 'name' ] = $compiler->getId($_attr[ 'name' ]);
-        }
-        foreach ($attributes as $a => $v) {
-            if ($v === false) {
-                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
-            }
-        }
-        $fromName = $compiler->getVariableName($_attr[ 'from' ]);
-        if ($fromName) {
-            foreach (array('item', 'key') as $a) {
-                if (isset($attributes[ $a ]) && $attributes[ $a ] == $fromName) {
-                    $compiler->trigger_template_error("'{$a}' and 'from' may not have same variable name '{$fromName}'",
-                                                      null, true);
-                }
-            }
-        }
+	/**
+	 * Compiles code for the {foreach} tag
+	 *
+	 * @param  array                                $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \SmartyCompilerException
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		$compiler->loopNesting ++;
+		// init
+		$this->isNamed = false;
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$from = $_attr[ 'from' ];
+		$item = $compiler->getId($_attr[ 'item' ]);
+		if ($item === false) {
+			$item = $compiler->getVariableName($_attr[ 'item' ]);
+		}
+		$key = $name = null;
+		$attributes = array('item' => $item);
+		if (isset($_attr[ 'key' ])) {
+			$key = $compiler->getId($_attr[ 'key' ]);
+			if ($key === false) {
+				$key = $compiler->getVariableName($_attr[ 'key' ]);
+			}
+			$attributes[ 'key' ] = $key;
+		}
+		if (isset($_attr[ 'name' ])) {
+			$this->isNamed = true;
+			$name = $attributes[ 'name' ] = $compiler->getId($_attr[ 'name' ]);
+		}
+		foreach ($attributes as $a => $v) {
+			if ($v === false) {
+				$compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+			}
+		}
+		$fromName = $compiler->getVariableName($_attr[ 'from' ]);
+		if ($fromName) {
+			foreach (array('item', 'key') as $a) {
+				if (isset($attributes[ $a ]) && $attributes[ $a ] == $fromName) {
+					$compiler->trigger_template_error("'{$a}' and 'from' may not have same variable name '{$fromName}'",
+													  null, true);
+				}
+			}
+		}
 
-        $itemVar = "\$_smarty_tpl->tpl_vars['{$item}']";
-        $local = '$__foreach_' . $attributes[ 'item' ] . '_' . $this->counter ++ . '_';
-        // search for used tag attributes
-        $itemAttr = array();
-        $namedAttr = array();
-        $this->scanForProperties($attributes, $compiler);
-        if (!empty($this->matchResults[ 'item' ])) {
-            $itemAttr = $this->matchResults[ 'item' ];
-        }
-        if (!empty($this->matchResults[ 'named' ])) {
-            $namedAttr = $this->matchResults[ 'named' ];
-        }
-        if (isset($_attr[ 'properties' ]) && preg_match_all("/['](.*?)[']/", $_attr[ 'properties' ], $match)) {
-            foreach ($match[ 1 ] as $prop) {
-                if (in_array($prop, $this->itemProperties)) {
-                    $itemAttr[ $prop ] = true;
-                } else {
-                    $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
-                }
-            }
-            if ($this->isNamed) {
-                foreach ($match[ 1 ] as $prop) {
-                    if (in_array($prop, $this->nameProperties)) {
-                        $nameAttr[ $prop ] = true;
-                    } else {
-                        $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
-                    }
-                }
-            }
-        }
-        if (isset($itemAttr[ 'first' ])) {
-            $itemAttr[ 'index' ] = true;
-        }
-        if (isset($namedAttr[ 'first' ])) {
-            $namedAttr[ 'index' ] = true;
-        }
-        if (isset($namedAttr[ 'last' ])) {
-            $namedAttr[ 'iteration' ] = true;
-            $namedAttr[ 'total' ] = true;
-        }
-        if (isset($itemAttr[ 'last' ])) {
-            $itemAttr[ 'iteration' ] = true;
-            $itemAttr[ 'total' ] = true;
-        }
-        if (isset($namedAttr[ 'show' ])) {
-            $namedAttr[ 'total' ] = true;
-        }
-        if (isset($itemAttr[ 'show' ])) {
-            $itemAttr[ 'total' ] = true;
-        }
-        $keyTerm = '';
-        if (isset($attributes[ 'key' ])) {
-            $keyTerm = "\$_smarty_tpl->tpl_vars['{$key}']->value => ";
-        }
-        if (isset($itemAttr[ 'key' ])) {
-            $keyTerm = "{$itemVar}->key => ";
-        }
-        if ($this->isNamed) {
-            $foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
-        }
-        $needTotal = isset($itemAttr[ 'total' ]);
-        // Register tag
-        $this->openTag($compiler, 'foreach',
-                       array('foreach', $compiler->nocache, $local, $itemVar, empty($itemAttr) ? 1 : 2));
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        // generate output code
-        $output = "<?php\n";
-        $output .= "\$_from = \$_smarty_tpl->smarty->ext->_foreach->init(\$_smarty_tpl, $from, " .
-                   var_export($item, true);
-        if ($name || $needTotal || $key) {
-            $output .= ', ' . var_export($needTotal, true);
-        }
-        if ($name || $key) {
-            $output .= ', ' . var_export($key, true);
-        }
-        if ($name) {
-            $output .= ', ' . var_export($name, true) . ', ' . var_export($namedAttr, true);
-        }
-        $output .= ");\n";
-        if (isset($itemAttr[ 'show' ])) {
-            $output .= "{$itemVar}->show = ({$itemVar}->total > 0);\n";
-        }
-        if (isset($itemAttr[ 'iteration' ])) {
-            $output .= "{$itemVar}->iteration = 0;\n";
-        }
-        if (isset($itemAttr[ 'index' ])) {
-            $output .= "{$itemVar}->index = -1;\n";
-        }
-        $output .= "if (\$_from !== null) {\n";
-        $output .= "foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
-        if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
-            $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
-        }
-        if (isset($itemAttr[ 'iteration' ])) {
-            $output .= "{$itemVar}->iteration++;\n";
-        }
-        if (isset($itemAttr[ 'index' ])) {
-            $output .= "{$itemVar}->index++;\n";
-        }
-        if (isset($itemAttr[ 'first' ])) {
-            $output .= "{$itemVar}->first = !{$itemVar}->index;\n";
-        }
-        if (isset($itemAttr[ 'last' ])) {
-            $output .= "{$itemVar}->last = {$itemVar}->iteration == {$itemVar}->total;\n";
-        }
-        if ($this->isNamed) {
-            if (isset($namedAttr[ 'iteration' ])) {
-                $output .= "{$foreachVar}->value['iteration']++;\n";
-            }
-            if (isset($namedAttr[ 'index' ])) {
-                $output .= "{$foreachVar}->value['index']++;\n";
-            }
-            if (isset($namedAttr[ 'first' ])) {
-                $output .= "{$foreachVar}->value['first'] = !{$foreachVar}->value['index'];\n";
-            }
-            if (isset($namedAttr[ 'last' ])) {
-                $output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] == {$foreachVar}->value['total'];\n";
-            }
-        }
-        if (!empty($itemAttr)) {
-            $output .= "{$local}saved = {$itemVar};\n";
-        }
-        $output .= "?>";
+		$itemVar = "\$_smarty_tpl->tpl_vars['{$item}']";
+		$local = '$__foreach_' . $attributes[ 'item' ] . '_' . $this->counter ++ . '_';
+		// search for used tag attributes
+		$itemAttr = array();
+		$namedAttr = array();
+		$this->scanForProperties($attributes, $compiler);
+		if (!empty($this->matchResults[ 'item' ])) {
+			$itemAttr = $this->matchResults[ 'item' ];
+		}
+		if (!empty($this->matchResults[ 'named' ])) {
+			$namedAttr = $this->matchResults[ 'named' ];
+		}
+		if (isset($_attr[ 'properties' ]) && preg_match_all("/['](.*?)[']/", $_attr[ 'properties' ], $match)) {
+			foreach ($match[ 1 ] as $prop) {
+				if (in_array($prop, $this->itemProperties)) {
+					$itemAttr[ $prop ] = true;
+				} else {
+					$compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+				}
+			}
+			if ($this->isNamed) {
+				foreach ($match[ 1 ] as $prop) {
+					if (in_array($prop, $this->nameProperties)) {
+						$nameAttr[ $prop ] = true;
+					} else {
+						$compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+					}
+				}
+			}
+		}
+		if (isset($itemAttr[ 'first' ])) {
+			$itemAttr[ 'index' ] = true;
+		}
+		if (isset($namedAttr[ 'first' ])) {
+			$namedAttr[ 'index' ] = true;
+		}
+		if (isset($namedAttr[ 'last' ])) {
+			$namedAttr[ 'iteration' ] = true;
+			$namedAttr[ 'total' ] = true;
+		}
+		if (isset($itemAttr[ 'last' ])) {
+			$itemAttr[ 'iteration' ] = true;
+			$itemAttr[ 'total' ] = true;
+		}
+		if (isset($namedAttr[ 'show' ])) {
+			$namedAttr[ 'total' ] = true;
+		}
+		if (isset($itemAttr[ 'show' ])) {
+			$itemAttr[ 'total' ] = true;
+		}
+		$keyTerm = '';
+		if (isset($attributes[ 'key' ])) {
+			$keyTerm = "\$_smarty_tpl->tpl_vars['{$key}']->value => ";
+		}
+		if (isset($itemAttr[ 'key' ])) {
+			$keyTerm = "{$itemVar}->key => ";
+		}
+		if ($this->isNamed) {
+			$foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
+		}
+		$needTotal = isset($itemAttr[ 'total' ]);
+		// Register tag
+		$this->openTag($compiler, 'foreach',
+					   array('foreach', $compiler->nocache, $local, $itemVar, empty($itemAttr) ? 1 : 2));
+		// maybe nocache because of nocache variables
+		$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+		// generate output code
+		$output = "<?php\n";
+		$output .= "\$_from = \$_smarty_tpl->smarty->ext->_foreach->init(\$_smarty_tpl, $from, " .
+				   var_export($item, true);
+		if ($name || $needTotal || $key) {
+			$output .= ', ' . var_export($needTotal, true);
+		}
+		if ($name || $key) {
+			$output .= ', ' . var_export($key, true);
+		}
+		if ($name) {
+			$output .= ', ' . var_export($name, true) . ', ' . var_export($namedAttr, true);
+		}
+		$output .= ");\n";
+		if (isset($itemAttr[ 'show' ])) {
+			$output .= "{$itemVar}->show = ({$itemVar}->total > 0);\n";
+		}
+		if (isset($itemAttr[ 'iteration' ])) {
+			$output .= "{$itemVar}->iteration = 0;\n";
+		}
+		if (isset($itemAttr[ 'index' ])) {
+			$output .= "{$itemVar}->index = -1;\n";
+		}
+		$output .= "if (\$_from !== null) {\n";
+		$output .= "foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
+		if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
+			$output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
+		}
+		if (isset($itemAttr[ 'iteration' ])) {
+			$output .= "{$itemVar}->iteration++;\n";
+		}
+		if (isset($itemAttr[ 'index' ])) {
+			$output .= "{$itemVar}->index++;\n";
+		}
+		if (isset($itemAttr[ 'first' ])) {
+			$output .= "{$itemVar}->first = !{$itemVar}->index;\n";
+		}
+		if (isset($itemAttr[ 'last' ])) {
+			$output .= "{$itemVar}->last = {$itemVar}->iteration == {$itemVar}->total;\n";
+		}
+		if ($this->isNamed) {
+			if (isset($namedAttr[ 'iteration' ])) {
+				$output .= "{$foreachVar}->value['iteration']++;\n";
+			}
+			if (isset($namedAttr[ 'index' ])) {
+				$output .= "{$foreachVar}->value['index']++;\n";
+			}
+			if (isset($namedAttr[ 'first' ])) {
+				$output .= "{$foreachVar}->value['first'] = !{$foreachVar}->value['index'];\n";
+			}
+			if (isset($namedAttr[ 'last' ])) {
+				$output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] == {$foreachVar}->value['total'];\n";
+			}
+		}
+		if (!empty($itemAttr)) {
+			$output .= "{$local}saved = {$itemVar};\n";
+		}
+		$output .= "?>";
 
-        return $output;
-    }
+		return $output;
+	}
 }
 
 /**
@@ -262,29 +262,29 @@ 
  */
 class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
 {
-    /**
-     * Compiles code for the {foreachelse} tag
-     *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
+	/**
+	 * Compiles code for the {foreachelse} tag
+	 *
+	 * @param  array                                $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
 
-        list($openTag, $nocache, $local, $itemVar, $restore) = $this->closeTag($compiler, array('foreach'));
-        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $local, $itemVar, 0));
-        $output = "<?php\n";
-        if ($restore == 2) {
-            $output .= "{$itemVar} = {$local}saved;\n";
-        }
-        $output .= "}\n} else {\n?>\n";
-        return $output;
-    }
+		list($openTag, $nocache, $local, $itemVar, $restore) = $this->closeTag($compiler, array('foreach'));
+		$this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $local, $itemVar, 0));
+		$output = "<?php\n";
+		if ($restore == 2) {
+			$output .= "{$itemVar} = {$local}saved;\n";
+		}
+		$output .= "}\n} else {\n?>\n";
+		return $output;
+	}
 }
 
 /**
@@ -295,36 +295,36 @@ 
  */
 class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
 {
-    /**
-     * Compiles code for the {/foreach} tag
-     *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $compiler->loopNesting --;
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
+	/**
+	 * Compiles code for the {/foreach} tag
+	 *
+	 * @param  array                                $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		$compiler->loopNesting --;
+		// must endblock be nocache?
+		if ($compiler->nocache) {
+			$compiler->tag_nocache = true;
+		}
 
-        list($openTag, $compiler->nocache, $local, $itemVar, $restore) =
-            $this->closeTag($compiler, array('foreach', 'foreachelse'));
-        $output = "<?php\n";
+		list($openTag, $compiler->nocache, $local, $itemVar, $restore) =
+			$this->closeTag($compiler, array('foreach', 'foreachelse'));
+		$output = "<?php\n";
 
-        if ($restore == 2) {
-            $output .= "{$itemVar} = {$local}saved;\n";
-        }
-        if ($restore > 0) {
-            $output .= "}\n";
-        }
-        $output .= "}\n";
-        $output .= "\$_smarty_tpl->smarty->ext->_foreach->restore(\$_smarty_tpl);\n";
-        $output .= "?>\n";
-        return $output;
-    }
+		if ($restore == 2) {
+			$output .= "{$itemVar} = {$local}saved;\n";
+		}
+		if ($restore > 0) {
+			$output .= "}\n";
+		}
+		$output .= "}\n";
+		$output .= "\$_smarty_tpl->smarty->ext->_foreach->restore(\$_smarty_tpl);\n";
+		$output .= "?>\n";
+		return $output;
+	}
 }

Spacing +52 added lines, -52 removed lines

@@ -87,38 +87,38 @@ 
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $compiler->loopNesting ++;
+        $compiler->loopNesting++;
         // init
         $this->isNamed = false;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        $from = $_attr[ 'from' ];
-        $item = $compiler->getId($_attr[ 'item' ]);
+        $from = $_attr['from'];
+        $item = $compiler->getId($_attr['item']);
         if ($item === false) {
-            $item = $compiler->getVariableName($_attr[ 'item' ]);
+            $item = $compiler->getVariableName($_attr['item']);
         }
         $key = $name = null;
         $attributes = array('item' => $item);
-        if (isset($_attr[ 'key' ])) {
-            $key = $compiler->getId($_attr[ 'key' ]);
+        if (isset($_attr['key'])) {
+            $key = $compiler->getId($_attr['key']);
             if ($key === false) {
-                $key = $compiler->getVariableName($_attr[ 'key' ]);
+                $key = $compiler->getVariableName($_attr['key']);
             }
-            $attributes[ 'key' ] = $key;
+            $attributes['key'] = $key;
         }
-        if (isset($_attr[ 'name' ])) {
+        if (isset($_attr['name'])) {
             $this->isNamed = true;
-            $name = $attributes[ 'name' ] = $compiler->getId($_attr[ 'name' ]);
+            $name = $attributes['name'] = $compiler->getId($_attr['name']);
         }
         foreach ($attributes as $a => $v) {
             if ($v === false) {
                 $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
             }
         }
-        $fromName = $compiler->getVariableName($_attr[ 'from' ]);
+        $fromName = $compiler->getVariableName($_attr['from']);
         if ($fromName) {
             foreach (array('item', 'key') as $a) {
-                if (isset($attributes[ $a ]) && $attributes[ $a ] == $fromName) {
+                if (isset($attributes[$a]) && $attributes[$a] == $fromName) {
                     $compiler->trigger_template_error("'{$a}' and 'from' may not have same variable name '{$fromName}'",
                                                       null, true);
                 }
@@ -126,66 +126,66 @@ 
         }
 
         $itemVar = "\$_smarty_tpl->tpl_vars['{$item}']";
-        $local = '$__foreach_' . $attributes[ 'item' ] . '_' . $this->counter ++ . '_';
+        $local = '$__foreach_' . $attributes['item'] . '_' . $this->counter++ . '_';
         // search for used tag attributes
         $itemAttr = array();
         $namedAttr = array();
         $this->scanForProperties($attributes, $compiler);
-        if (!empty($this->matchResults[ 'item' ])) {
-            $itemAttr = $this->matchResults[ 'item' ];
+        if (!empty($this->matchResults['item'])) {
+            $itemAttr = $this->matchResults['item'];
         }
-        if (!empty($this->matchResults[ 'named' ])) {
-            $namedAttr = $this->matchResults[ 'named' ];
+        if (!empty($this->matchResults['named'])) {
+            $namedAttr = $this->matchResults['named'];
         }
-        if (isset($_attr[ 'properties' ]) && preg_match_all("/['](.*?)[']/", $_attr[ 'properties' ], $match)) {
-            foreach ($match[ 1 ] as $prop) {
+        if (isset($_attr['properties']) && preg_match_all("/['](.*?)[']/", $_attr['properties'], $match)) {
+            foreach ($match[1] as $prop) {
                 if (in_array($prop, $this->itemProperties)) {
-                    $itemAttr[ $prop ] = true;
+                    $itemAttr[$prop] = true;
                 } else {
                     $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
                 }
             }
             if ($this->isNamed) {
-                foreach ($match[ 1 ] as $prop) {
+                foreach ($match[1] as $prop) {
                     if (in_array($prop, $this->nameProperties)) {
-                        $nameAttr[ $prop ] = true;
+                        $nameAttr[$prop] = true;
                     } else {
                         $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
                     }
                 }
             }
         }
-        if (isset($itemAttr[ 'first' ])) {
-            $itemAttr[ 'index' ] = true;
+        if (isset($itemAttr['first'])) {
+            $itemAttr['index'] = true;
         }
-        if (isset($namedAttr[ 'first' ])) {
-            $namedAttr[ 'index' ] = true;
+        if (isset($namedAttr['first'])) {
+            $namedAttr['index'] = true;
         }
-        if (isset($namedAttr[ 'last' ])) {
-            $namedAttr[ 'iteration' ] = true;
-            $namedAttr[ 'total' ] = true;
+        if (isset($namedAttr['last'])) {
+            $namedAttr['iteration'] = true;
+            $namedAttr['total'] = true;
         }
-        if (isset($itemAttr[ 'last' ])) {
-            $itemAttr[ 'iteration' ] = true;
-            $itemAttr[ 'total' ] = true;
+        if (isset($itemAttr['last'])) {
+            $itemAttr['iteration'] = true;
+            $itemAttr['total'] = true;
         }
-        if (isset($namedAttr[ 'show' ])) {
-            $namedAttr[ 'total' ] = true;
+        if (isset($namedAttr['show'])) {
+            $namedAttr['total'] = true;
         }
-        if (isset($itemAttr[ 'show' ])) {
-            $itemAttr[ 'total' ] = true;
+        if (isset($itemAttr['show'])) {
+            $itemAttr['total'] = true;
         }
         $keyTerm = '';
-        if (isset($attributes[ 'key' ])) {
+        if (isset($attributes['key'])) {
             $keyTerm = "\$_smarty_tpl->tpl_vars['{$key}']->value => ";
         }
-        if (isset($itemAttr[ 'key' ])) {
+        if (isset($itemAttr['key'])) {
             $keyTerm = "{$itemVar}->key => ";
         }
         if ($this->isNamed) {
             $foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
         }
-        $needTotal = isset($itemAttr[ 'total' ]);
+        $needTotal = isset($itemAttr['total']);
         // Register tag
         $this->openTag($compiler, 'foreach',
                        array('foreach', $compiler->nocache, $local, $itemVar, empty($itemAttr) ? 1 : 2));
@@ -205,43 +205,43 @@ 
             $output .= ', ' . var_export($name, true) . ', ' . var_export($namedAttr, true);
         }
         $output .= ");\n";
-        if (isset($itemAttr[ 'show' ])) {
+        if (isset($itemAttr['show'])) {
             $output .= "{$itemVar}->show = ({$itemVar}->total > 0);\n";
         }
-        if (isset($itemAttr[ 'iteration' ])) {
+        if (isset($itemAttr['iteration'])) {
             $output .= "{$itemVar}->iteration = 0;\n";
         }
-        if (isset($itemAttr[ 'index' ])) {
+        if (isset($itemAttr['index'])) {
             $output .= "{$itemVar}->index = -1;\n";
         }
         $output .= "if (\$_from !== null) {\n";
         $output .= "foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
-        if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
+        if (isset($attributes['key']) && isset($itemAttr['key'])) {
             $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
         }
-        if (isset($itemAttr[ 'iteration' ])) {
+        if (isset($itemAttr['iteration'])) {
             $output .= "{$itemVar}->iteration++;\n";
         }
-        if (isset($itemAttr[ 'index' ])) {
+        if (isset($itemAttr['index'])) {
             $output .= "{$itemVar}->index++;\n";
         }
-        if (isset($itemAttr[ 'first' ])) {
+        if (isset($itemAttr['first'])) {
             $output .= "{$itemVar}->first = !{$itemVar}->index;\n";
         }
-        if (isset($itemAttr[ 'last' ])) {
+        if (isset($itemAttr['last'])) {
             $output .= "{$itemVar}->last = {$itemVar}->iteration == {$itemVar}->total;\n";
         }
         if ($this->isNamed) {
-            if (isset($namedAttr[ 'iteration' ])) {
+            if (isset($namedAttr['iteration'])) {
                 $output .= "{$foreachVar}->value['iteration']++;\n";
             }
-            if (isset($namedAttr[ 'index' ])) {
+            if (isset($namedAttr['index'])) {
                 $output .= "{$foreachVar}->value['index']++;\n";
             }
-            if (isset($namedAttr[ 'first' ])) {
+            if (isset($namedAttr['first'])) {
                 $output .= "{$foreachVar}->value['first'] = !{$foreachVar}->value['index'];\n";
             }
-            if (isset($namedAttr[ 'last' ])) {
+            if (isset($namedAttr['last'])) {
                 $output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] == {$foreachVar}->value['total'];\n";
             }
         }
@@ -306,7 +306,7 @@ 
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $compiler->loopNesting --;
+        $compiler->loopNesting--;
         // must endblock be nocache?
         if ($compiler->nocache) {
             $compiler->tag_nocache = true;