YetiForceCompany / YetiForceCRM

libraries/Smarty/libs/sysplugins/smarty_internal_compile_nocache.php

Indentation +43 added lines, -43 removed lines

@@ -16,33 +16,33 @@ 
  */
 class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
 {
-    /**
-     * Array of names of valid option flags
-     *
-     * @var array
-     */
-    public $option_flags = array();
+	/**
+	 * Array of names of valid option flags
+	 *
+	 * @var array
+	 */
+	public $option_flags = array();
 
-    /**
-     * Compiles code for the {nocache} tag
-     * This tag does not generate compiled output. It only sets a compiler flag.
-     *
-     * @param  array                                $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return bool
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        $this->openTag($compiler, 'nocache', array($compiler->nocache));
-        // enter nocache mode
-        $compiler->nocache = true;
-        // this tag does not return compiled code
-        $compiler->has_code = false;
+	/**
+	 * Compiles code for the {nocache} tag
+	 * This tag does not generate compiled output. It only sets a compiler flag.
+	 *
+	 * @param  array                                $args     array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+	 *
+	 * @return bool
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		$_attr = $this->getAttributes($compiler, $args);
+		$this->openTag($compiler, 'nocache', array($compiler->nocache));
+		// enter nocache mode
+		$compiler->nocache = true;
+		// this tag does not return compiled code
+		$compiler->has_code = false;
 
-        return true;
-    }
+		return true;
+	}
 }
 
 /**
@@ -53,23 +53,23 @@ 
  */
 class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
 {
-    /**
-     * Compiles code for the {/nocache} tag
-     * This tag does not generate compiled output. It only sets a compiler flag.
-     *
-     * @param  array                                $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return bool
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        // leave nocache mode
-        list($compiler->nocache) = $this->closeTag($compiler, array('nocache'));
-        // this tag does not return compiled code
-        $compiler->has_code = false;
+	/**
+	 * Compiles code for the {/nocache} tag
+	 * This tag does not generate compiled output. It only sets a compiler flag.
+	 *
+	 * @param  array                                $args     array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+	 *
+	 * @return bool
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		$_attr = $this->getAttributes($compiler, $args);
+		// leave nocache mode
+		list($compiler->nocache) = $this->closeTag($compiler, array('nocache'));
+		// this tag does not return compiled code
+		$compiler->has_code = false;
 
-        return true;
-    }
+		return true;
+	}
 }

libraries/Smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php

Indentation +98 added lines, -98 removed lines

@@ -11,106 +11,106 @@
  */
 class Smarty_Internal_Method_GetTemplateVars
 {
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
+	/**
+	 * Valid for all objects
+	 *
+	 * @var int
+	 */
+	public $objMap = 7;
 
-    /**
-     * Returns a single or all template variables
-     *
-     * @api  Smarty::getTemplateVars()
-     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @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(Smarty_Internal_Data $data, $varName = null, Smarty_Internal_Data $_ptr = null,
-                                    $searchParents = true)
-    {
-        if (isset($varName)) {
-            $_var = $this->_getVariable($data, $varName, $_ptr, $searchParents, false);
-            if (is_object($_var)) {
-                return $_var->value;
-            } else {
-                return null;
-            }
-        } else {
-            $_result = array();
-            if ($_ptr === null) {
-                $_ptr = $data;
-            }
-            while ($_ptr !== null) {
-                foreach ($_ptr->tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[ $key ] = $var->value;
-                    }
-                }
-                // not found, try at parent
-                if ($searchParents) {
-                    $_ptr = $_ptr->parent;
-                } else {
-                    $_ptr = null;
-                }
-            }
-            if ($searchParents && isset(Smarty::$global_tpl_vars)) {
-                foreach (Smarty::$global_tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[ $key ] = $var->value;
-                    }
-                }
-            }
-            return $_result;
-        }
-    }
+	/**
+	 * Returns a single or all template variables
+	 *
+	 * @api  Smarty::getTemplateVars()
+	 * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+	 *
+	 * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+	 * @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(Smarty_Internal_Data $data, $varName = null, Smarty_Internal_Data $_ptr = null,
+									$searchParents = true)
+	{
+		if (isset($varName)) {
+			$_var = $this->_getVariable($data, $varName, $_ptr, $searchParents, false);
+			if (is_object($_var)) {
+				return $_var->value;
+			} else {
+				return null;
+			}
+		} else {
+			$_result = array();
+			if ($_ptr === null) {
+				$_ptr = $data;
+			}
+			while ($_ptr !== null) {
+				foreach ($_ptr->tpl_vars AS $key => $var) {
+					if (!array_key_exists($key, $_result)) {
+						$_result[ $key ] = $var->value;
+					}
+				}
+				// not found, try at parent
+				if ($searchParents) {
+					$_ptr = $_ptr->parent;
+				} else {
+					$_ptr = null;
+				}
+			}
+			if ($searchParents && isset(Smarty::$global_tpl_vars)) {
+				foreach (Smarty::$global_tpl_vars AS $key => $var) {
+					if (!array_key_exists($key, $_result)) {
+						$_result[ $key ] = $var->value;
+					}
+				}
+			}
+			return $_result;
+		}
+	}
 
-    /**
-     * gets the object of a Smarty variable
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param string                                                  $varName       the name of the Smarty variable
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
-     * @param bool                                                    $searchParents search also in parent data
-     * @param bool                                                    $errorEnable
-     *
-     * @return \Smarty_Variable
-     */
-    public function _getVariable(Smarty_Internal_Data $data, $varName, Smarty_Internal_Data $_ptr = null,
-                                 $searchParents = true, $errorEnable = true)
-    {
-        if ($_ptr === null) {
-            $_ptr = $data;
-        }
-        while ($_ptr !== null) {
-            if (isset($_ptr->tpl_vars[ $varName ])) {
-                // found it, return it
-                return $_ptr->tpl_vars[ $varName ];
-            }
-            // not found, try at parent
-            if ($searchParents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset(Smarty::$global_tpl_vars[ $varName ])) {
-            // found it, return it
-            return Smarty::$global_tpl_vars[ $varName ];
-        }
-        /* @var \Smarty $smarty */
-        $smarty = isset($data->smarty) ? $data->smarty : $data;
-        if ($smarty->error_unassigned && $errorEnable) {
-            // force a notice
-            $x = $$varName;
-        }
+	/**
+	 * gets the object of a Smarty variable
+	 *
+	 * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+	 * @param string                                                  $varName       the name of the Smarty variable
+	 * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+	 * @param bool                                                    $searchParents search also in parent data
+	 * @param bool                                                    $errorEnable
+	 *
+	 * @return \Smarty_Variable
+	 */
+	public function _getVariable(Smarty_Internal_Data $data, $varName, Smarty_Internal_Data $_ptr = null,
+								 $searchParents = true, $errorEnable = true)
+	{
+		if ($_ptr === null) {
+			$_ptr = $data;
+		}
+		while ($_ptr !== null) {
+			if (isset($_ptr->tpl_vars[ $varName ])) {
+				// found it, return it
+				return $_ptr->tpl_vars[ $varName ];
+			}
+			// not found, try at parent
+			if ($searchParents) {
+				$_ptr = $_ptr->parent;
+			} else {
+				$_ptr = null;
+			}
+		}
+		if (isset(Smarty::$global_tpl_vars[ $varName ])) {
+			// found it, return it
+			return Smarty::$global_tpl_vars[ $varName ];
+		}
+		/* @var \Smarty $smarty */
+		$smarty = isset($data->smarty) ? $data->smarty : $data;
+		if ($smarty->error_unassigned && $errorEnable) {
+			// force a notice
+			$x = $$varName;
+		}
 
-        return new Smarty_Undefined_Variable;
-    }
+		return new Smarty_Undefined_Variable;
+	}
 
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -49,7 +49,7 @@ 
             while ($_ptr !== null) {
                 foreach ($_ptr->tpl_vars AS $key => $var) {
                     if (!array_key_exists($key, $_result)) {
-                        $_result[ $key ] = $var->value;
+                        $_result[$key] = $var->value;
                     }
                 }
                 // not found, try at parent
@@ -62,7 +62,7 @@ 
             if ($searchParents && isset(Smarty::$global_tpl_vars)) {
                 foreach (Smarty::$global_tpl_vars AS $key => $var) {
                     if (!array_key_exists($key, $_result)) {
-                        $_result[ $key ] = $var->value;
+                        $_result[$key] = $var->value;
                     }
                 }
             }
@@ -88,9 +88,9 @@ 
             $_ptr = $data;
         }
         while ($_ptr !== null) {
-            if (isset($_ptr->tpl_vars[ $varName ])) {
+            if (isset($_ptr->tpl_vars[$varName])) {
                 // found it, return it
-                return $_ptr->tpl_vars[ $varName ];
+                return $_ptr->tpl_vars[$varName];
             }
             // not found, try at parent
             if ($searchParents) {
@@ -99,9 +99,9 @@ 
                 $_ptr = null;
             }
         }
-        if (isset(Smarty::$global_tpl_vars[ $varName ])) {
+        if (isset(Smarty::$global_tpl_vars[$varName])) {
             // found it, return it
-            return Smarty::$global_tpl_vars[ $varName ];
+            return Smarty::$global_tpl_vars[$varName];
         }
         /* @var \Smarty $smarty */
         $smarty = isset($data->smarty) ? $data->smarty : $data;

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}')");
+	}
 }