Inspection of "ADD separator" - YetiForceCompany/YetiForceCRM - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — developer ( 67fdb5...f9e515 )

by Błażej

created 2017-01-10 11:33 UTC

Status

Indentation +302 added lines, -302 removed lines patch added patch discarded remove patch

@@ -16,330 +16,330 @@
 block discarded – undo
  */
 class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
 {
-    /**
-     * caching mode to create nocache code but no cache file
-     */
-    const CACHING_NOCACHE_CODE = 9999;
+	/**
+	 * caching mode to create nocache code but no cache file
+	 */
+	const CACHING_NOCACHE_CODE = 9999;
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $required_attributes = array('file');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $shorttag_order = array('file');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('nocache', 'inline', 'caching');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $option_flags = array('nocache', 'inline', 'caching');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $optional_attributes = array('_any');
 
-    /**
-     * Valid scope names
-     *
-     * @var array
-     */
-    public $valid_scopes = array('parent' => Smarty::SCOPE_PARENT, 'root' => Smarty::SCOPE_ROOT,
-                                 'global' => Smarty::SCOPE_GLOBAL, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
-                                 'smarty' => Smarty::SCOPE_SMARTY);
+	/**
+	 * Valid scope names
+	 *
+	 * @var array
+	 */
+	public $valid_scopes = array('parent' => Smarty::SCOPE_PARENT, 'root' => Smarty::SCOPE_ROOT,
+								 'global' => Smarty::SCOPE_GLOBAL, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
+								 'smarty' => Smarty::SCOPE_SMARTY);
 
-    /**
-     * Compiles code for the {include} tag
-     *
-     * @param  array                                  $args      array with attributes from parser
-     * @param  Smarty_Internal_SmartyTemplateCompiler $compiler  compiler object
-     * @param  array                                  $parameter array with compilation parameter
-     *
-     * @throws SmartyCompilerException
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler, $parameter)
-    {
-        $uid = $t_hash = null;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
+	/**
+	 * Compiles code for the {include} tag
+	 *
+	 * @param  array                                  $args      array with attributes from parser
+	 * @param  Smarty_Internal_SmartyTemplateCompiler $compiler  compiler object
+	 * @param  array                                  $parameter array with compilation parameter
+	 *
+	 * @throws SmartyCompilerException
+	 * @return string compiled code
+	 */
+	public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler, $parameter)
+	{
+		$uid = $t_hash = null;
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
 
-        $fullResourceName = $source_resource = $_attr[ 'file' ];
-        $variable_template = false;
-        $cache_tpl = false;
-        // parse resource_name
-        if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)|(.+))\1$/', $source_resource, $match)) {
-            $type = !empty($match[ 3 ]) ? $match[ 3 ] : $compiler->template->smarty->default_resource_type;
-            $name = !empty($match[ 5 ]) ? $match[ 5 ] : $match[ 6 ];
-            $handler = Smarty_Resource::load($compiler->smarty, $type);
-            if ($handler->recompiled || $handler->uncompiled) {
-                $variable_template = true;
-            }
-            if (!$variable_template) {
-                if ($type != 'string') {
-                    $fullResourceName = "{$type}:{$name}";
-                    $compiled = $compiler->parent_compiler->template->compiled;
-                    if (isset($compiled->includes[ $fullResourceName ])) {
-                        $compiled->includes[ $fullResourceName ] ++;
-                        $cache_tpl = true;
-                    } else {
-                        if ("{$compiler->template->source->type}:{$compiler->template->source->name}" ==
-                            $fullResourceName
-                        ) {
-                            // recursive call of current template
-                            $compiled->includes[ $fullResourceName ] = 2;
-                            $cache_tpl = true;
-                        } else {
-                            $compiled->includes[ $fullResourceName ] = 1;
-                        }
-                    }
-                    $fullResourceName = '"' . $fullResourceName . '"';
-                }
-            }
-            if (empty($match[ 5 ])) {
-                $variable_template = true;
-            }
-        } else {
-            $variable_template = true;
-        }
+		$fullResourceName = $source_resource = $_attr[ 'file' ];
+		$variable_template = false;
+		$cache_tpl = false;
+		// parse resource_name
+		if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)|(.+))\1$/', $source_resource, $match)) {
+			$type = !empty($match[ 3 ]) ? $match[ 3 ] : $compiler->template->smarty->default_resource_type;
+			$name = !empty($match[ 5 ]) ? $match[ 5 ] : $match[ 6 ];
+			$handler = Smarty_Resource::load($compiler->smarty, $type);
+			if ($handler->recompiled || $handler->uncompiled) {
+				$variable_template = true;
+			}
+			if (!$variable_template) {
+				if ($type != 'string') {
+					$fullResourceName = "{$type}:{$name}";
+					$compiled = $compiler->parent_compiler->template->compiled;
+					if (isset($compiled->includes[ $fullResourceName ])) {
+						$compiled->includes[ $fullResourceName ] ++;
+						$cache_tpl = true;
+					} else {
+						if ("{$compiler->template->source->type}:{$compiler->template->source->name}" ==
+							$fullResourceName
+						) {
+							// recursive call of current template
+							$compiled->includes[ $fullResourceName ] = 2;
+							$cache_tpl = true;
+						} else {
+							$compiled->includes[ $fullResourceName ] = 1;
+						}
+					}
+					$fullResourceName = '"' . $fullResourceName . '"';
+				}
+			}
+			if (empty($match[ 5 ])) {
+				$variable_template = true;
+			}
+		} else {
+			$variable_template = true;
+		}
 
-        // scope setup
-        $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
+		// scope setup
+		$_scope = $compiler->convertScope($_attr, $this->valid_scopes);
 
-        // set flag to cache subtemplate object when called within loop or template name is variable.
-        if ($cache_tpl || $variable_template || $compiler->loopNesting > 0) {
-            $_cache_tpl = 'true';
-        } else {
-            $_cache_tpl = 'false';
-        }
-        // assume caching is off
-        $_caching = Smarty::CACHING_OFF;
+		// set flag to cache subtemplate object when called within loop or template name is variable.
+		if ($cache_tpl || $variable_template || $compiler->loopNesting > 0) {
+			$_cache_tpl = 'true';
+		} else {
+			$_cache_tpl = 'false';
+		}
+		// assume caching is off
+		$_caching = Smarty::CACHING_OFF;
 
-        $call_nocache = $compiler->tag_nocache || $compiler->nocache;
+		$call_nocache = $compiler->tag_nocache || $compiler->nocache;
 
-        // caching was on and {include} is not in nocache mode
-        if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
-            $_caching = self::CACHING_NOCACHE_CODE;
-        }
+		// caching was on and {include} is not in nocache mode
+		if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
+			$_caching = self::CACHING_NOCACHE_CODE;
+		}
 
-        // flag if included template code should be merged into caller
-        $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr[ 'inline' ] === true) &&
-                                   !$compiler->template->source->handler->recompiled;
+		// flag if included template code should be merged into caller
+		$merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr[ 'inline' ] === true) &&
+								   !$compiler->template->source->handler->recompiled;
 
-        if ($merge_compiled_includes) {
-            // variable template name ?
-            if ($variable_template) {
-                $merge_compiled_includes = false;
-            }
-            // variable compile_id?
-            if (isset($_attr[ 'compile_id' ]) && $compiler->isVariable($_attr[ 'compile_id' ])) {
-                $merge_compiled_includes = false;
-            }
-        }
+		if ($merge_compiled_includes) {
+			// variable template name ?
+			if ($variable_template) {
+				$merge_compiled_includes = false;
+			}
+			// variable compile_id?
+			if (isset($_attr[ 'compile_id' ]) && $compiler->isVariable($_attr[ 'compile_id' ])) {
+				$merge_compiled_includes = false;
+			}
+		}
 
-        /*
+		/*
         * if the {include} tag provides individual parameter for caching or compile_id
         * the subtemplate must not be included into the common cache file and is treated like
         * a call in nocache mode.
         *
         */
-        if ($_attr[ 'nocache' ] !== true && $_attr[ 'caching' ]) {
-            $_caching = $_new_caching = (int) $_attr[ 'caching' ];
-            $call_nocache = true;
-        } else {
-            $_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        }
-        if (isset($_attr[ 'cache_lifetime' ])) {
-            $_cache_lifetime = $_attr[ 'cache_lifetime' ];
-            $call_nocache = true;
-            $_caching = $_new_caching;
-        } else {
-            $_cache_lifetime = '$_smarty_tpl->cache_lifetime';
-        }
-        if (isset($_attr[ 'cache_id' ])) {
-            $_cache_id = $_attr[ 'cache_id' ];
-            $call_nocache = true;
-            $_caching = $_new_caching;
-        } else {
-            $_cache_id = '$_smarty_tpl->cache_id';
-        }
-        if (isset($_attr[ 'compile_id' ])) {
-            $_compile_id = $_attr[ 'compile_id' ];
-        } else {
-            $_compile_id = '$_smarty_tpl->compile_id';
-        }
+		if ($_attr[ 'nocache' ] !== true && $_attr[ 'caching' ]) {
+			$_caching = $_new_caching = (int) $_attr[ 'caching' ];
+			$call_nocache = true;
+		} else {
+			$_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
+		}
+		if (isset($_attr[ 'cache_lifetime' ])) {
+			$_cache_lifetime = $_attr[ 'cache_lifetime' ];
+			$call_nocache = true;
+			$_caching = $_new_caching;
+		} else {
+			$_cache_lifetime = '$_smarty_tpl->cache_lifetime';
+		}
+		if (isset($_attr[ 'cache_id' ])) {
+			$_cache_id = $_attr[ 'cache_id' ];
+			$call_nocache = true;
+			$_caching = $_new_caching;
+		} else {
+			$_cache_id = '$_smarty_tpl->cache_id';
+		}
+		if (isset($_attr[ 'compile_id' ])) {
+			$_compile_id = $_attr[ 'compile_id' ];
+		} else {
+			$_compile_id = '$_smarty_tpl->compile_id';
+		}
 
-        // if subtemplate will be called in nocache mode do not merge
-        if ($compiler->template->caching && $call_nocache) {
-            $merge_compiled_includes = false;
-        }
-        // assign attribute
-        if (isset($_attr[ 'assign' ])) {
-            // output will be stored in a smarty variable instead of being displayed
-            if ($_assign = $compiler->getId($_attr[ 'assign' ])) {
-                $_assign = "'{$_assign}'";
-                if ($compiler->tag_nocache || $compiler->nocache || $call_nocache) {
-                    // create nocache var to make it know for further compiling
-                    $compiler->setNocacheInVariable($_attr[ 'assign' ]);
-                }
-            } else {
-                $_assign = $_attr[ 'assign' ];
-            }
-        }
+		// if subtemplate will be called in nocache mode do not merge
+		if ($compiler->template->caching && $call_nocache) {
+			$merge_compiled_includes = false;
+		}
+		// assign attribute
+		if (isset($_attr[ 'assign' ])) {
+			// output will be stored in a smarty variable instead of being displayed
+			if ($_assign = $compiler->getId($_attr[ 'assign' ])) {
+				$_assign = "'{$_assign}'";
+				if ($compiler->tag_nocache || $compiler->nocache || $call_nocache) {
+					// create nocache var to make it know for further compiling
+					$compiler->setNocacheInVariable($_attr[ 'assign' ]);
+				}
+			} else {
+				$_assign = $_attr[ 'assign' ];
+			}
+		}
 
-        $has_compiled_template = false;
-        if ($merge_compiled_includes) {
-            $c_id = isset($_attr[ 'compile_id' ]) ? $_attr[ 'compile_id' ] : $compiler->template->compile_id;
-            // we must observe different compile_id and caching
-            $t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
-            $compiler->smarty->allow_ambiguous_resources = true;
-            /* @var Smarty_Internal_Template $tpl */
-            $tpl = new $compiler->smarty->template_class (trim($fullResourceName, '"\''), $compiler->smarty,
-                                                          $compiler->template, $compiler->template->cache_id, $c_id,
-                                                          $_caching);
-            $uid = $tpl->source->type . $tpl->source->uid;
-            if (!isset($compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ])) {
-                $has_compiled_template = $this->compileInlineTemplate($compiler, $tpl, $t_hash);
-            } else {
-                $has_compiled_template = true;
-            }
-            unset($tpl);
-        }
-        // delete {include} standard attributes
-        unset($_attr[ 'file' ], $_attr[ 'assign' ], $_attr[ 'cache_id' ], $_attr[ 'compile_id' ], $_attr[ 'cache_lifetime' ], $_attr[ 'nocache' ], $_attr[ 'caching' ], $_attr[ 'scope' ], $_attr[ 'inline' ]);
-        // remaining attributes must be assigned as smarty variable
-        $_vars = 'array()';
-        if (!empty($_attr)) {
-            $_pairs = array();
-            // create variables
-            foreach ($_attr as $key => $value) {
-                $_pairs[] = "'$key'=>$value";
-            }
-            $_vars = 'array(' . join(',', $_pairs) . ')';
-        }
-        $update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache &&
-                             $_compile_id != '$_smarty_tpl->compile_id';
-        if ($has_compiled_template && !$call_nocache) {
-            $_output = "<?php\n";
-            if ($update_compile_id) {
-                $_output .= $compiler->makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n");
-            }
-            if (!empty($_attr) && $_caching == 9999 && $compiler->template->caching) {
-                $_vars_nc = "foreach ($_vars as \$ik => \$iv) {\n";
-                $_vars_nc .= "\$_smarty_tpl->tpl_vars[\$ik] =  new Smarty_Variable(\$iv);\n";
-                $_vars_nc .= "}\n";
-                $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, - 3);
-            }
-            if (isset($_assign)) {
-                $_output .= "ob_start();\n";
-            }
-            $_output .= "\$_smarty_tpl->_subTemplateRender({$fullResourceName}, {$_cache_id}, {$_compile_id}, {$_caching}, {$_cache_lifetime}, {$_vars}, {$_scope}, {$_cache_tpl}, '{$compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['uid']}', '{$compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['func']}');\n";
-            if (isset($_assign)) {
-                $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
-            }
-            if ($update_compile_id) {
-                $_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n");
-            }
-            $_output .= "?>\n";
+		$has_compiled_template = false;
+		if ($merge_compiled_includes) {
+			$c_id = isset($_attr[ 'compile_id' ]) ? $_attr[ 'compile_id' ] : $compiler->template->compile_id;
+			// we must observe different compile_id and caching
+			$t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
+			$compiler->smarty->allow_ambiguous_resources = true;
+			/* @var Smarty_Internal_Template $tpl */
+			$tpl = new $compiler->smarty->template_class (trim($fullResourceName, '"\''), $compiler->smarty,
+														  $compiler->template, $compiler->template->cache_id, $c_id,
+														  $_caching);
+			$uid = $tpl->source->type . $tpl->source->uid;
+			if (!isset($compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ])) {
+				$has_compiled_template = $this->compileInlineTemplate($compiler, $tpl, $t_hash);
+			} else {
+				$has_compiled_template = true;
+			}
+			unset($tpl);
+		}
+		// delete {include} standard attributes
+		unset($_attr[ 'file' ], $_attr[ 'assign' ], $_attr[ 'cache_id' ], $_attr[ 'compile_id' ], $_attr[ 'cache_lifetime' ], $_attr[ 'nocache' ], $_attr[ 'caching' ], $_attr[ 'scope' ], $_attr[ 'inline' ]);
+		// remaining attributes must be assigned as smarty variable
+		$_vars = 'array()';
+		if (!empty($_attr)) {
+			$_pairs = array();
+			// create variables
+			foreach ($_attr as $key => $value) {
+				$_pairs[] = "'$key'=>$value";
+			}
+			$_vars = 'array(' . join(',', $_pairs) . ')';
+		}
+		$update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache &&
+							 $_compile_id != '$_smarty_tpl->compile_id';
+		if ($has_compiled_template && !$call_nocache) {
+			$_output = "<?php\n";
+			if ($update_compile_id) {
+				$_output .= $compiler->makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n");
+			}
+			if (!empty($_attr) && $_caching == 9999 && $compiler->template->caching) {
+				$_vars_nc = "foreach ($_vars as \$ik => \$iv) {\n";
+				$_vars_nc .= "\$_smarty_tpl->tpl_vars[\$ik] =  new Smarty_Variable(\$iv);\n";
+				$_vars_nc .= "}\n";
+				$_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, - 3);
+			}
+			if (isset($_assign)) {
+				$_output .= "ob_start();\n";
+			}
+			$_output .= "\$_smarty_tpl->_subTemplateRender({$fullResourceName}, {$_cache_id}, {$_compile_id}, {$_caching}, {$_cache_lifetime}, {$_vars}, {$_scope}, {$_cache_tpl}, '{$compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['uid']}', '{$compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['func']}');\n";
+			if (isset($_assign)) {
+				$_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+			}
+			if ($update_compile_id) {
+				$_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n");
+			}
+			$_output .= "?>\n";
 
-            return $_output;
-        }
+			return $_output;
+		}
 
-        if ($call_nocache) {
-            $compiler->tag_nocache = true;
-        }
-        $_output = "<?php ";
-        if ($update_compile_id) {
-            $_output .= "\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n";
-        }
-        // was there an assign attribute
-        if (isset($_assign)) {
-            $_output .= "ob_start();\n";
-        }
-        $_output .= "\$_smarty_tpl->_subTemplateRender({$fullResourceName}, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_scope, {$_cache_tpl});\n";
-        if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
-        }
-        if ($update_compile_id) {
-            $_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n";
-        }
-        $_output .= "?>\n";
-        return $_output;
-    }
+		if ($call_nocache) {
+			$compiler->tag_nocache = true;
+		}
+		$_output = "<?php ";
+		if ($update_compile_id) {
+			$_output .= "\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n";
+		}
+		// was there an assign attribute
+		if (isset($_assign)) {
+			$_output .= "ob_start();\n";
+		}
+		$_output .= "\$_smarty_tpl->_subTemplateRender({$fullResourceName}, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_scope, {$_cache_tpl});\n";
+		if (isset($_assign)) {
+			$_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+		}
+		if ($update_compile_id) {
+			$_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n";
+		}
+		$_output .= "?>\n";
+		return $_output;
+	}
 
-    /**
-     * Compile inline sub template
-     *
-     * @param \Smarty_Internal_SmartyTemplateCompiler $compiler
-     * @param \Smarty_Internal_Template               $tpl
-     * @param  string                                 $t_hash
-     *
-     * @return bool
-     */
-    public function compileInlineTemplate(Smarty_Internal_SmartyTemplateCompiler $compiler,
-                                          Smarty_Internal_Template $tpl, $t_hash)
-    {
-        $uid = $tpl->source->type . $tpl->source->uid;
-        if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
-            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'uid' ] =
-                $tpl->source->uid;
-            if (isset($compiler->template->inheritance)) {
-                $tpl->inheritance = clone $compiler->template->inheritance;
-            }
-            $tpl->compiled = new Smarty_Template_Compiled();
-            $tpl->compiled->nocache_hash = $compiler->parent_compiler->template->compiled->nocache_hash;
-            $tpl->loadCompiler();
-            // save unique function name
-            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'func' ] =
-            $tpl->compiled->unifunc = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-            // make sure whole chain gets compiled
-            $tpl->mustCompile = true;
-            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'nocache_hash' ] =
-                $tpl->compiled->nocache_hash;
-            if ($compiler->template->source->type == 'file') {
-                $sourceInfo = $compiler->template->source->filepath;
-            } else {
-                $basename = $compiler->template->source->handler->getBasename($compiler->template->source);
-                $sourceInfo = $compiler->template->source->type . ':' .
-                              ($basename ? $basename : $compiler->template->source->name);
-            }
-            // get compiled code
-            $compiled_code = "<?php\n\n";
-            $compiled_code .= "/* Start inline template \"{$sourceInfo}\" =============================*/\n";
-            $compiled_code .= "function {$tpl->compiled->unifunc} (\$_smarty_tpl) {\n";
-            $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
-            $compiled_code .= "<?php\n";
-            $compiled_code .= "}\n?>\n";
-            $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
-            $compiled_code .= "<?php\n\n";
-            $compiled_code .= "/* End inline template \"{$sourceInfo}\" =============================*/\n";
-            $compiled_code .= "?>";
-            unset($tpl->compiler);
-            if ($tpl->compiled->has_nocache_code) {
-                // replace nocache_hash
-                $compiled_code =
-                    str_replace("{$tpl->compiled->nocache_hash}", $compiler->template->compiled->nocache_hash,
-                                $compiled_code);
-                $compiler->template->compiled->has_nocache_code = true;
-            }
-            $compiler->parent_compiler->mergedSubTemplatesCode[ $tpl->compiled->unifunc ] = $compiled_code;
-            return true;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Compile inline sub template
+	 *
+	 * @param \Smarty_Internal_SmartyTemplateCompiler $compiler
+	 * @param \Smarty_Internal_Template               $tpl
+	 * @param  string                                 $t_hash
+	 *
+	 * @return bool
+	 */
+	public function compileInlineTemplate(Smarty_Internal_SmartyTemplateCompiler $compiler,
+										  Smarty_Internal_Template $tpl, $t_hash)
+	{
+		$uid = $tpl->source->type . $tpl->source->uid;
+		if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
+			$compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'uid' ] =
+				$tpl->source->uid;
+			if (isset($compiler->template->inheritance)) {
+				$tpl->inheritance = clone $compiler->template->inheritance;
+			}
+			$tpl->compiled = new Smarty_Template_Compiled();
+			$tpl->compiled->nocache_hash = $compiler->parent_compiler->template->compiled->nocache_hash;
+			$tpl->loadCompiler();
+			// save unique function name
+			$compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'func' ] =
+			$tpl->compiled->unifunc = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+			// make sure whole chain gets compiled
+			$tpl->mustCompile = true;
+			$compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'nocache_hash' ] =
+				$tpl->compiled->nocache_hash;
+			if ($compiler->template->source->type == 'file') {
+				$sourceInfo = $compiler->template->source->filepath;
+			} else {
+				$basename = $compiler->template->source->handler->getBasename($compiler->template->source);
+				$sourceInfo = $compiler->template->source->type . ':' .
+							  ($basename ? $basename : $compiler->template->source->name);
+			}
+			// get compiled code
+			$compiled_code = "<?php\n\n";
+			$compiled_code .= "/* Start inline template \"{$sourceInfo}\" =============================*/\n";
+			$compiled_code .= "function {$tpl->compiled->unifunc} (\$_smarty_tpl) {\n";
+			$compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
+			$compiled_code .= "<?php\n";
+			$compiled_code .= "}\n?>\n";
+			$compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
+			$compiled_code .= "<?php\n\n";
+			$compiled_code .= "/* End inline template \"{$sourceInfo}\" =============================*/\n";
+			$compiled_code .= "?>";
+			unset($tpl->compiler);
+			if ($tpl->compiled->has_nocache_code) {
+				// replace nocache_hash
+				$compiled_code =
+					str_replace("{$tpl->compiled->nocache_hash}", $compiler->template->compiled->nocache_hash,
+								$compiled_code);
+				$compiler->template->compiled->has_nocache_code = true;
+			}
+			$compiler->parent_compiler->mergedSubTemplatesCode[ $tpl->compiled->unifunc ] = $compiled_code;
+			return true;
+		} else {
+			return false;
+		}
+	}
 }

Please login to merge, or discard this patch.

Spacing +30 added lines, -30 removed lines patch added patch discarded remove patch

@@ -78,13 +78,13 @@  discard block
 block discarded – undo
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        $fullResourceName = $source_resource = $_attr[ 'file' ];
+        $fullResourceName = $source_resource = $_attr['file'];
         $variable_template = false;
         $cache_tpl = false;
         // parse resource_name
         if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)|(.+))\1$/', $source_resource, $match)) {
-            $type = !empty($match[ 3 ]) ? $match[ 3 ] : $compiler->template->smarty->default_resource_type;
-            $name = !empty($match[ 5 ]) ? $match[ 5 ] : $match[ 6 ];
+            $type = !empty($match[3]) ? $match[3] : $compiler->template->smarty->default_resource_type;
+            $name = !empty($match[5]) ? $match[5] : $match[6];
             $handler = Smarty_Resource::load($compiler->smarty, $type);
             if ($handler->recompiled || $handler->uncompiled) {
                 $variable_template = true;
@@ -93,24 +93,24 @@  discard block
 block discarded – undo
                 if ($type != 'string') {
                     $fullResourceName = "{$type}:{$name}";
                     $compiled = $compiler->parent_compiler->template->compiled;
-                    if (isset($compiled->includes[ $fullResourceName ])) {
-                        $compiled->includes[ $fullResourceName ] ++;
+                    if (isset($compiled->includes[$fullResourceName])) {
+                        $compiled->includes[$fullResourceName]++;
                         $cache_tpl = true;
                     } else {
                         if ("{$compiler->template->source->type}:{$compiler->template->source->name}" ==
                             $fullResourceName
                         ) {
                             // recursive call of current template
-                            $compiled->includes[ $fullResourceName ] = 2;
+                            $compiled->includes[$fullResourceName] = 2;
                             $cache_tpl = true;
                         } else {
-                            $compiled->includes[ $fullResourceName ] = 1;
+                            $compiled->includes[$fullResourceName] = 1;
                         }
                     }
                     $fullResourceName = '"' . $fullResourceName . '"';
                 }
             }
-            if (empty($match[ 5 ])) {
+            if (empty($match[5])) {
                 $variable_template = true;
             }
         } else {
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
         }
 
         // flag if included template code should be merged into caller
-        $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr[ 'inline' ] === true) &&
+        $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) &&
                                    !$compiler->template->source->handler->recompiled;
 
         if ($merge_compiled_includes) {
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
                 $merge_compiled_includes = false;
             }
             // variable compile_id?
-            if (isset($_attr[ 'compile_id' ]) && $compiler->isVariable($_attr[ 'compile_id' ])) {
+            if (isset($_attr['compile_id']) && $compiler->isVariable($_attr['compile_id'])) {
                 $merge_compiled_includes = false;
             }
         }
@@ -157,28 +157,28 @@  discard block
 block discarded – undo
         * a call in nocache mode.
         *
         */
-        if ($_attr[ 'nocache' ] !== true && $_attr[ 'caching' ]) {
-            $_caching = $_new_caching = (int) $_attr[ 'caching' ];
+        if ($_attr['nocache'] !== true && $_attr['caching']) {
+            $_caching = $_new_caching = (int) $_attr['caching'];
             $call_nocache = true;
         } else {
             $_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
         }
-        if (isset($_attr[ 'cache_lifetime' ])) {
-            $_cache_lifetime = $_attr[ 'cache_lifetime' ];
+        if (isset($_attr['cache_lifetime'])) {
+            $_cache_lifetime = $_attr['cache_lifetime'];
             $call_nocache = true;
             $_caching = $_new_caching;
         } else {
             $_cache_lifetime = '$_smarty_tpl->cache_lifetime';
         }
-        if (isset($_attr[ 'cache_id' ])) {
-            $_cache_id = $_attr[ 'cache_id' ];
+        if (isset($_attr['cache_id'])) {
+            $_cache_id = $_attr['cache_id'];
             $call_nocache = true;
             $_caching = $_new_caching;
         } else {
             $_cache_id = '$_smarty_tpl->cache_id';
         }
-        if (isset($_attr[ 'compile_id' ])) {
-            $_compile_id = $_attr[ 'compile_id' ];
+        if (isset($_attr['compile_id'])) {
+            $_compile_id = $_attr['compile_id'];
         } else {
             $_compile_id = '$_smarty_tpl->compile_id';
         }
@@ -188,31 +188,31 @@  discard block
 block discarded – undo
             $merge_compiled_includes = false;
         }
         // assign attribute
-        if (isset($_attr[ 'assign' ])) {
+        if (isset($_attr['assign'])) {
             // output will be stored in a smarty variable instead of being displayed
-            if ($_assign = $compiler->getId($_attr[ 'assign' ])) {
+            if ($_assign = $compiler->getId($_attr['assign'])) {
                 $_assign = "'{$_assign}'";
                 if ($compiler->tag_nocache || $compiler->nocache || $call_nocache) {
                     // create nocache var to make it know for further compiling
-                    $compiler->setNocacheInVariable($_attr[ 'assign' ]);
+                    $compiler->setNocacheInVariable($_attr['assign']);
                 }
             } else {
-                $_assign = $_attr[ 'assign' ];
+                $_assign = $_attr['assign'];
             }
         }
 
         $has_compiled_template = false;
         if ($merge_compiled_includes) {
-            $c_id = isset($_attr[ 'compile_id' ]) ? $_attr[ 'compile_id' ] : $compiler->template->compile_id;
+            $c_id = isset($_attr['compile_id']) ? $_attr['compile_id'] : $compiler->template->compile_id;
             // we must observe different compile_id and caching
             $t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
             $compiler->smarty->allow_ambiguous_resources = true;
             /* @var Smarty_Internal_Template $tpl */
-            $tpl = new $compiler->smarty->template_class (trim($fullResourceName, '"\''), $compiler->smarty,
+            $tpl = new $compiler->smarty->template_class(trim($fullResourceName, '"\''), $compiler->smarty,
                                                           $compiler->template, $compiler->template->cache_id, $c_id,
                                                           $_caching);
             $uid = $tpl->source->type . $tpl->source->uid;
-            if (!isset($compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ])) {
+            if (!isset($compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash])) {
                 $has_compiled_template = $this->compileInlineTemplate($compiler, $tpl, $t_hash);
             } else {
                 $has_compiled_template = true;
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
             unset($tpl);
         }
         // delete {include} standard attributes
-        unset($_attr[ 'file' ], $_attr[ 'assign' ], $_attr[ 'cache_id' ], $_attr[ 'compile_id' ], $_attr[ 'cache_lifetime' ], $_attr[ 'nocache' ], $_attr[ 'caching' ], $_attr[ 'scope' ], $_attr[ 'inline' ]);
+        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
         // remaining attributes must be assigned as smarty variable
         $_vars = 'array()';
         if (!empty($_attr)) {
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
     {
         $uid = $tpl->source->type . $tpl->source->uid;
         if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
-            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'uid' ] =
+            $compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['uid'] =
                 $tpl->source->uid;
             if (isset($compiler->template->inheritance)) {
                 $tpl->inheritance = clone $compiler->template->inheritance;
@@ -304,11 +304,11 @@  discard block
 block discarded – undo
             $tpl->compiled->nocache_hash = $compiler->parent_compiler->template->compiled->nocache_hash;
             $tpl->loadCompiler();
             // save unique function name
-            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'func' ] =
+            $compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['func'] =
             $tpl->compiled->unifunc = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
             // make sure whole chain gets compiled
             $tpl->mustCompile = true;
-            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'nocache_hash' ] =
+            $compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['nocache_hash'] =
                 $tpl->compiled->nocache_hash;
             if ($compiler->template->source->type == 'file') {
                 $sourceInfo = $compiler->template->source->filepath;
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
                                 $compiled_code);
                 $compiler->template->compiled->has_nocache_code = true;
             }
-            $compiler->parent_compiler->mergedSubTemplatesCode[ $tpl->compiled->unifunc ] = $compiled_code;
+            $compiler->parent_compiler->mergedSubTemplatesCode[$tpl->compiled->unifunc] = $compiled_code;
             return true;
         } else {
             return false;

Please login to merge, or discard this patch.

libraries/Smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php 2 patches

Indentation +184 added lines, -184 removed lines patch added patch discarded remove patch

@@ -11,193 +11,193 @@
 block discarded – undo
 class Smarty_Internal_Runtime_SubTemplate
 {
 
-    /**
-     * Subtemplate template object cache
-     *
-     * @var Smarty_Internal_Template[]
-     */
-    public $tplObjects = array();
+	/**
+	 * Subtemplate template object cache
+	 *
+	 * @var Smarty_Internal_Template[]
+	 */
+	public $tplObjects = array();
 
-    /**
-     * Subtemplate call count
-     *
-     * @var int[]
-     */
-    public $subTplInfo = array();
+	/**
+	 * Subtemplate call count
+	 *
+	 * @var int[]
+	 */
+	public $subTplInfo = array();
 
-    /**
-     * Runtime function to render subtemplate
-     *
-     * @param \Smarty_Internal_Template $parent
-     * @param string                    $template       template name
-     * @param mixed                     $cache_id       cache id
-     * @param mixed                     $compile_id     compile id
-     * @param integer                   $caching        cache mode
-     * @param integer                   $cache_lifetime life time of cache data
-     * @param array                     $data           passed parameter template variables
-     * @param int                       $scope          scope in which {include} should execute
-     * @param bool                      $forceTplCache  cache template object
-     * @param string                    $uid            file dependency uid
-     * @param string                    $content_func   function name
-     *
-     */
-    public function render(Smarty_Internal_Template $parent, $template, $cache_id, $compile_id, $caching,
-                           $cache_lifetime, $data, $scope, $forceTplCache, $uid = null, $content_func = null)
-    {
-        // if there are cached template objects calculate $templateID
-        $_templateId =
-            !empty($this->tplObjects) ? $parent->smarty->_getTemplateId($template, $cache_id, $compile_id, $caching) :
-                null;
-        // already in template cache?
-        /* @var Smarty_Internal_Template $tpl */
-        if (isset($_templateId) && isset($this->tplObjects[$_templateId])) {
-            // clone cached template object because of possible recursive call
-            $tpl = clone $this->tplObjects[$_templateId];
-            $tpl->parent = $parent;
-            // if $caching mode changed the compiled resource is invalid
-            if ((bool) $tpl->caching !== (bool) $caching) {
-                unset($tpl->compiled);
-            }
-            // get variables from calling scope
-            $tpl->tpl_vars = $parent->tpl_vars;
-            $tpl->config_vars = $parent->config_vars;
-            // get template functions
-            $tpl->tpl_function = $parent->tpl_function;
-            // copy inheritance object?
-            if (isset($parent->ext->_inheritance)) {
-                $tpl->ext->_inheritance = $parent->ext->_inheritance;
-            } else {
-                unset($tpl->ext->_inheritance);
-            }
-        } else {
-            $tpl = clone $parent;
-            $tpl->parent = $parent;
-            if (!isset($tpl->templateId) || $tpl->templateId !== $_templateId) {
-                $tpl->templateId = $_templateId;
-                $tpl->template_resource = $template;
-                $tpl->cache_id = $cache_id;
-                $tpl->compile_id = $compile_id;
-                if (isset($uid)) {
-                    // for inline templates we can get all resource information from file dependency
-                    if (isset($tpl->compiled->file_dependency[$uid])) {
-                        list($filepath, $timestamp, $resource) = $tpl->compiled->file_dependency[$uid];
-                        $tpl->source =
-                            new Smarty_Template_Source(isset($tpl->smarty->_cache['resource_handlers'][$resource]) ?
-                                                           $tpl->smarty->_cache['resource_handlers'][$resource] :
-                                                           Smarty_Resource::load($tpl->smarty, $resource), $tpl->smarty,
-                                                       $filepath, $resource, $filepath);
-                        $tpl->source->filepath = $filepath;
-                        $tpl->source->timestamp = $timestamp;
-                        $tpl->source->exists = true;
-                        $tpl->source->uid = $uid;
-                    } else {
-                        $tpl->source = null;
-                    }
-                } else {
-                    $tpl->source = null;
-                }
-                if (!isset($tpl->source)) {
-                    $tpl->source = Smarty_Template_Source::load($tpl);
-                    unset($tpl->compiled);
-                }
-                unset($tpl->cached);
-            }
-        }
-        $tpl->caching = $caching;
-        $tpl->cache_lifetime = $cache_lifetime;
-        if ($caching == 9999) {
-            $tpl->cached = $parent->cached;
-        }
-        // set template scope
-        $tpl->scope = $scope;
-        $scopePtr = false;
-        if ($scope & ~Smarty::SCOPE_BUBBLE_UP) {
-            if ($scope == Smarty::SCOPE_GLOBAL) {
-                $tpl->tpl_vars = Smarty::$global_tpl_vars;
-                $tpl->config_vars = $tpl->smarty->config_vars;
-                $scopePtr = true;
-            } else {
-                if ($scope == Smarty::SCOPE_PARENT) {
-                    $scopePtr = $parent;
-                } elseif ($scope == Smarty::SCOPE_SMARTY) {
-                    $scopePtr = $tpl->smarty;
-                } else {
-                    $scopePtr = $tpl;
-                    while (isset($scopePtr->parent)) {
-                        if ($scopePtr->parent->_objType != 2 && $scope & Smarty::SCOPE_TPL_ROOT) {
-                            break;
-                        }
-                        $scopePtr = $scopePtr->parent;
-                    }
-                }
-                $tpl->tpl_vars = $scopePtr->tpl_vars;
-                $tpl->config_vars = $scopePtr->config_vars;
-            }
-        }
+	/**
+	 * Runtime function to render subtemplate
+	 *
+	 * @param \Smarty_Internal_Template $parent
+	 * @param string                    $template       template name
+	 * @param mixed                     $cache_id       cache id
+	 * @param mixed                     $compile_id     compile id
+	 * @param integer                   $caching        cache mode
+	 * @param integer                   $cache_lifetime life time of cache data
+	 * @param array                     $data           passed parameter template variables
+	 * @param int                       $scope          scope in which {include} should execute
+	 * @param bool                      $forceTplCache  cache template object
+	 * @param string                    $uid            file dependency uid
+	 * @param string                    $content_func   function name
+	 *
+	 */
+	public function render(Smarty_Internal_Template $parent, $template, $cache_id, $compile_id, $caching,
+						   $cache_lifetime, $data, $scope, $forceTplCache, $uid = null, $content_func = null)
+	{
+		// if there are cached template objects calculate $templateID
+		$_templateId =
+			!empty($this->tplObjects) ? $parent->smarty->_getTemplateId($template, $cache_id, $compile_id, $caching) :
+				null;
+		// already in template cache?
+		/* @var Smarty_Internal_Template $tpl */
+		if (isset($_templateId) && isset($this->tplObjects[$_templateId])) {
+			// clone cached template object because of possible recursive call
+			$tpl = clone $this->tplObjects[$_templateId];
+			$tpl->parent = $parent;
+			// if $caching mode changed the compiled resource is invalid
+			if ((bool) $tpl->caching !== (bool) $caching) {
+				unset($tpl->compiled);
+			}
+			// get variables from calling scope
+			$tpl->tpl_vars = $parent->tpl_vars;
+			$tpl->config_vars = $parent->config_vars;
+			// get template functions
+			$tpl->tpl_function = $parent->tpl_function;
+			// copy inheritance object?
+			if (isset($parent->ext->_inheritance)) {
+				$tpl->ext->_inheritance = $parent->ext->_inheritance;
+			} else {
+				unset($tpl->ext->_inheritance);
+			}
+		} else {
+			$tpl = clone $parent;
+			$tpl->parent = $parent;
+			if (!isset($tpl->templateId) || $tpl->templateId !== $_templateId) {
+				$tpl->templateId = $_templateId;
+				$tpl->template_resource = $template;
+				$tpl->cache_id = $cache_id;
+				$tpl->compile_id = $compile_id;
+				if (isset($uid)) {
+					// for inline templates we can get all resource information from file dependency
+					if (isset($tpl->compiled->file_dependency[$uid])) {
+						list($filepath, $timestamp, $resource) = $tpl->compiled->file_dependency[$uid];
+						$tpl->source =
+							new Smarty_Template_Source(isset($tpl->smarty->_cache['resource_handlers'][$resource]) ?
+														   $tpl->smarty->_cache['resource_handlers'][$resource] :
+														   Smarty_Resource::load($tpl->smarty, $resource), $tpl->smarty,
+													   $filepath, $resource, $filepath);
+						$tpl->source->filepath = $filepath;
+						$tpl->source->timestamp = $timestamp;
+						$tpl->source->exists = true;
+						$tpl->source->uid = $uid;
+					} else {
+						$tpl->source = null;
+					}
+				} else {
+					$tpl->source = null;
+				}
+				if (!isset($tpl->source)) {
+					$tpl->source = Smarty_Template_Source::load($tpl);
+					unset($tpl->compiled);
+				}
+				unset($tpl->cached);
+			}
+		}
+		$tpl->caching = $caching;
+		$tpl->cache_lifetime = $cache_lifetime;
+		if ($caching == 9999) {
+			$tpl->cached = $parent->cached;
+		}
+		// set template scope
+		$tpl->scope = $scope;
+		$scopePtr = false;
+		if ($scope & ~Smarty::SCOPE_BUBBLE_UP) {
+			if ($scope == Smarty::SCOPE_GLOBAL) {
+				$tpl->tpl_vars = Smarty::$global_tpl_vars;
+				$tpl->config_vars = $tpl->smarty->config_vars;
+				$scopePtr = true;
+			} else {
+				if ($scope == Smarty::SCOPE_PARENT) {
+					$scopePtr = $parent;
+				} elseif ($scope == Smarty::SCOPE_SMARTY) {
+					$scopePtr = $tpl->smarty;
+				} else {
+					$scopePtr = $tpl;
+					while (isset($scopePtr->parent)) {
+						if ($scopePtr->parent->_objType != 2 && $scope & Smarty::SCOPE_TPL_ROOT) {
+							break;
+						}
+						$scopePtr = $scopePtr->parent;
+					}
+				}
+				$tpl->tpl_vars = $scopePtr->tpl_vars;
+				$tpl->config_vars = $scopePtr->config_vars;
+			}
+		}
 
-        if (!isset($this->tplObjects[$tpl->_getTemplateId()]) && !$tpl->source->handler->recompiled) {
-            // if template is called multiple times set flag to to cache template objects
-            $forceTplCache = $forceTplCache ||
-                (isset($this->subTplInfo[$tpl->template_resource]) && $this->subTplInfo[$tpl->template_resource] > 1);
-            // check if template object should be cached
-            if ($tpl->parent->_objType == 2 && isset($this->tplObjects[$tpl->parent->templateId]) ||
-                ($forceTplCache && $tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_AUTOMATIC) ||
-                ($tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
-            ) {
-                $this->tplObjects[$tpl->_getTemplateId()] = $tpl;
-            }
-        }
+		if (!isset($this->tplObjects[$tpl->_getTemplateId()]) && !$tpl->source->handler->recompiled) {
+			// if template is called multiple times set flag to to cache template objects
+			$forceTplCache = $forceTplCache ||
+				(isset($this->subTplInfo[$tpl->template_resource]) && $this->subTplInfo[$tpl->template_resource] > 1);
+			// check if template object should be cached
+			if ($tpl->parent->_objType == 2 && isset($this->tplObjects[$tpl->parent->templateId]) ||
+				($forceTplCache && $tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_AUTOMATIC) ||
+				($tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
+			) {
+				$this->tplObjects[$tpl->_getTemplateId()] = $tpl;
+			}
+		}
 
-        if (!empty($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
-            }
-        }
-        if (isset($uid)) {
-            if ($parent->smarty->debugging) {
-                $parent->smarty->_debug->start_template($tpl);
-                $parent->smarty->_debug->start_render($tpl);
-            }
-            $tpl->compiled->getRenderedTemplateCode($tpl, $content_func);
-            if ($parent->smarty->debugging) {
-                $parent->smarty->_debug->end_template($tpl);
-                $parent->smarty->_debug->end_render($tpl);
-            }
-            if ($tpl->caching == 9999 && $tpl->compiled->has_nocache_code) {
-                $parent->cached->hashes[$tpl->compiled->nocache_hash] = true;
-            }
-        } else {
-            if (isset($tpl->compiled)) {
-                $tpl->compiled->render($tpl);
-            } else {
-                $tpl->render();
-            }
-        }
-        if ($scopePtr) {
-            if ($scope == Smarty::SCOPE_GLOBAL) {
-                Smarty::$global_tpl_vars = $tpl->tpl_vars;
-                $tpl->smarty->config_vars = $tpl->config_vars;
-            } else {
-                $scopePtr->tpl_vars = $tpl->tpl_vars;
-                $scopePtr->config_vars = $tpl->config_vars;
-            }
-        }
-    }
+		if (!empty($data)) {
+			// set up variable values
+			foreach ($data as $_key => $_val) {
+				$tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
+			}
+		}
+		if (isset($uid)) {
+			if ($parent->smarty->debugging) {
+				$parent->smarty->_debug->start_template($tpl);
+				$parent->smarty->_debug->start_render($tpl);
+			}
+			$tpl->compiled->getRenderedTemplateCode($tpl, $content_func);
+			if ($parent->smarty->debugging) {
+				$parent->smarty->_debug->end_template($tpl);
+				$parent->smarty->_debug->end_render($tpl);
+			}
+			if ($tpl->caching == 9999 && $tpl->compiled->has_nocache_code) {
+				$parent->cached->hashes[$tpl->compiled->nocache_hash] = true;
+			}
+		} else {
+			if (isset($tpl->compiled)) {
+				$tpl->compiled->render($tpl);
+			} else {
+				$tpl->render();
+			}
+		}
+		if ($scopePtr) {
+			if ($scope == Smarty::SCOPE_GLOBAL) {
+				Smarty::$global_tpl_vars = $tpl->tpl_vars;
+				$tpl->smarty->config_vars = $tpl->config_vars;
+			} else {
+				$scopePtr->tpl_vars = $tpl->tpl_vars;
+				$scopePtr->config_vars = $tpl->config_vars;
+			}
+		}
+	}
 
-    /**
-     * Get called subtemplates from compiled template and save call count
-     *
-     * @param \Smarty_Internal_Template $tpl
-     */
-    public function registerSubTemplates(Smarty_Internal_Template $tpl)
-    {
-        foreach ($tpl->compiled->includes as $name => $count) {
-            if (isset($this->subTplInfo[$name])) {
-                $this->subTplInfo[$name] += $count;
-            } else {
-                $this->subTplInfo[$name] = $count;
-            }
-        }
-    }
+	/**
+	 * Get called subtemplates from compiled template and save call count
+	 *
+	 * @param \Smarty_Internal_Template $tpl
+	 */
+	public function registerSubTemplates(Smarty_Internal_Template $tpl)
+	{
+		foreach ($tpl->compiled->includes as $name => $count) {
+			if (isset($this->subTplInfo[$name])) {
+				$this->subTplInfo[$name] += $count;
+			} else {
+				$this->subTplInfo[$name] = $count;
+			}
+		}
+	}
 }

Please login to merge, or discard this patch.

Spacing +2 added lines, -4 removed lines patch added patch discarded remove patch

@@ -46,8 +46,7 @@  discard block
 block discarded – undo
     {
         // if there are cached template objects calculate $templateID
         $_templateId =
-            !empty($this->tplObjects) ? $parent->smarty->_getTemplateId($template, $cache_id, $compile_id, $caching) :
-                null;
+            !empty($this->tplObjects) ? $parent->smarty->_getTemplateId($template, $cache_id, $compile_id, $caching) : null;
         // already in template cache?
         /* @var Smarty_Internal_Template $tpl */
         if (isset($_templateId) && isset($this->tplObjects[$_templateId])) {
@@ -83,8 +82,7 @@  discard block
 block discarded – undo
                         list($filepath, $timestamp, $resource) = $tpl->compiled->file_dependency[$uid];
                         $tpl->source =
                             new Smarty_Template_Source(isset($tpl->smarty->_cache['resource_handlers'][$resource]) ?
-                                                           $tpl->smarty->_cache['resource_handlers'][$resource] :
-                                                           Smarty_Resource::load($tpl->smarty, $resource), $tpl->smarty,
+                                                           $tpl->smarty->_cache['resource_handlers'][$resource] : Smarty_Resource::load($tpl->smarty, $resource), $tpl->smarty,
                                                        $filepath, $resource, $filepath);
                         $tpl->source->filepath = $filepath;
                         $tpl->source->timestamp = $timestamp;

Please login to merge, or discard this patch.

libraries/Smarty/libs/sysplugins/smarty_resource_custom.php 1 patch

Indentation +70 added lines, -70 removed lines patch added patch discarded remove patch

@@ -16,80 +16,80 @@
 block discarded – undo
  */
 abstract class Smarty_Resource_Custom extends Smarty_Resource
 {
-    /**
-     * fetch template and its modification time from data source
-     *
-     * @param string  $name    template name
-     * @param string  &$source template source
-     * @param integer &$mtime  template modification timestamp (epoch)
-     */
-    abstract protected function fetch($name, &$source, &$mtime);
+	/**
+	 * fetch template and its modification time from data source
+	 *
+	 * @param string  $name    template name
+	 * @param string  &$source template source
+	 * @param integer &$mtime  template modification timestamp (epoch)
+	 */
+	abstract protected function fetch($name, &$source, &$mtime);
 
-    /**
-     * Fetch template's modification timestamp from data source
-     * {@internal implementing this method is optional.
-     *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
-     *
-     * @param  string $name template name
-     *
-     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-     */
-    protected function fetchTimestamp($name)
-    {
-        return null;
-    }
+	/**
+	 * Fetch template's modification timestamp from data source
+	 * {@internal implementing this method is optional.
+	 *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
+	 *
+	 * @param  string $name template name
+	 *
+	 * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+	 */
+	protected function fetchTimestamp($name)
+	{
+		return null;
+	}
 
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->filepath = $source->type . ':' . $source->name;
-        $source->uid = sha1($source->type . ':' . $source->name);
+	/**
+	 * populate Source Object with meta data from Resource
+	 *
+	 * @param Smarty_Template_Source   $source    source object
+	 * @param Smarty_Internal_Template $_template template object
+	 */
+	public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+	{
+		$source->filepath = $source->type . ':' . $source->name;
+		$source->uid = sha1($source->type . ':' . $source->name);
 
-        $mtime = $this->fetchTimestamp($source->name);
-        if ($mtime !== null) {
-            $source->timestamp = $mtime;
-        } else {
-            $this->fetch($source->name, $content, $timestamp);
-            $source->timestamp = isset($timestamp) ? $timestamp : false;
-            if (isset($content)) {
-                $source->content = $content;
-            }
-        }
-        $source->exists = !!$source->timestamp;
-    }
+		$mtime = $this->fetchTimestamp($source->name);
+		if ($mtime !== null) {
+			$source->timestamp = $mtime;
+		} else {
+			$this->fetch($source->name, $content, $timestamp);
+			$source->timestamp = isset($timestamp) ? $timestamp : false;
+			if (isset($content)) {
+				$source->content = $content;
+			}
+		}
+		$source->exists = !!$source->timestamp;
+	}
 
-    /**
-     * Load template's source into current template object
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        $this->fetch($source->name, $content, $timestamp);
-        if (isset($content)) {
-            return $content;
-        }
+	/**
+	 * Load template's source into current template object
+	 *
+	 * @param  Smarty_Template_Source $source source object
+	 *
+	 * @return string                 template source
+	 * @throws SmartyException        if source cannot be loaded
+	 */
+	public function getContent(Smarty_Template_Source $source)
+	{
+		$this->fetch($source->name, $content, $timestamp);
+		if (isset($content)) {
+			return $content;
+		}
 
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-    }
+		throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+	}
 
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return basename($source->name);
-    }
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @param  Smarty_Template_Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(Smarty_Template_Source $source)
+	{
+		return basename($source->name);
+	}
 }

Please login to merge, or discard this patch.

libraries/Smarty/libs/sysplugins/smarty_internal_method_clearconfig.php 2 patches

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -11,31 +11,31 @@
 block discarded – undo
  */
 class Smarty_Internal_Method_ClearConfig
 {
-    /**
-     * Valid for all objects
-     *
-     * @var int
-     */
-    public $objMap = 7;
+	/**
+	 * Valid for all objects
+	 *
+	 * @var int
+	 */
+	public $objMap = 7;
 
-    /**
-     * clear a single or all config variables
-     *
-     * @api  Smarty::clearConfig()
-     * @link http://www.smarty.net/docs/en/api.clear.config.tpl
-     *
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
-     * @param  string|null                                            $name variable name or null
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function clearConfig(Smarty_Internal_Data $data, $name = null)
-    {
-        if (isset($name)) {
-            unset($data->config_vars[ $name ]);
-        } else {
-            $data->config_vars = array();
-        }
-        return $data;
-    }
+	/**
+	 * clear a single or all config variables
+	 *
+	 * @api  Smarty::clearConfig()
+	 * @link http://www.smarty.net/docs/en/api.clear.config.tpl
+	 *
+	 * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+	 * @param  string|null                                            $name variable name or null
+	 *
+	 * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+	 */
+	public function clearConfig(Smarty_Internal_Data $data, $name = null)
+	{
+		if (isset($name)) {
+			unset($data->config_vars[ $name ]);
+		} else {
+			$data->config_vars = array();
+		}
+		return $data;
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -32,7 +32,7 @@
 block discarded – undo
     public function clearConfig(Smarty_Internal_Data $data, $name = null)
     {
         if (isset($name)) {
-            unset($data->config_vars[ $name ]);
+            unset($data->config_vars[$name]);
         } else {
             $data->config_vars = array();
         }

Please login to merge, or discard this patch.

Smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php 2 patches

Indentation +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -16,31 +16,31 @@
 block discarded – undo
  */
 class Smarty_Internal_Compile_Shared_Inheritance extends Smarty_Internal_CompileBase
 {
-    /**
-     * Register post compile callback to compile inheritance initialization code
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     * @param bool|false                            $initChildSequence if true force child template
-     */
-    public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
-    {
-        if ($initChildSequence || !isset($compiler->_cache[ 'inheritanceInit' ])) {
-            $compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
-                                                   array($initChildSequence), 'inheritanceInit', $initChildSequence);
+	/**
+	 * Register post compile callback to compile inheritance initialization code
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 * @param bool|false                            $initChildSequence if true force child template
+	 */
+	public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+	{
+		if ($initChildSequence || !isset($compiler->_cache[ 'inheritanceInit' ])) {
+			$compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
+												   array($initChildSequence), 'inheritanceInit', $initChildSequence);
 
-            $compiler->_cache[ 'inheritanceInit' ] = true;
-        }
-    }
+			$compiler->_cache[ 'inheritanceInit' ] = true;
+		}
+	}
 
-    /**
-     * Compile inheritance initialization code as prefix
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     * @param bool|false                            $initChildSequence if true force child template
-     */
-    static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
-    {
-        $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->_loadInheritance();\n\$_smarty_tpl->inheritance->init(\$_smarty_tpl, " .
-                                         var_export($initChildSequence, true) . ");\n?>\n";
-    }
+	/**
+	 * Compile inheritance initialization code as prefix
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 * @param bool|false                            $initChildSequence if true force child template
+	 */
+	static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+	{
+		$compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->_loadInheritance();\n\$_smarty_tpl->inheritance->init(\$_smarty_tpl, " .
+										 var_export($initChildSequence, true) . ");\n?>\n";
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -24,11 +24,11 @@
 block discarded – undo
      */
     public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
     {
-        if ($initChildSequence || !isset($compiler->_cache[ 'inheritanceInit' ])) {
+        if ($initChildSequence || !isset($compiler->_cache['inheritanceInit'])) {
             $compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
                                                    array($initChildSequence), 'inheritanceInit', $initChildSequence);
 
-            $compiler->_cache[ 'inheritanceInit' ] = true;
+            $compiler->_cache['inheritanceInit'] = true;
         }
     }
 

Please login to merge, or discard this patch.

libraries/Smarty/libs/sysplugins/smarty_internal_resource_string.php 1 patch

Indentation +75 added lines, -75 removed lines patch added patch discarded remove patch

@@ -18,90 +18,90 @@
 block discarded – undo
  */
 class Smarty_Internal_Resource_String extends Smarty_Resource
 {
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->uid = $source->filepath = sha1($source->name . $source->smarty->_joined_template_dir);
-        $source->timestamp = $source->exists = true;
-    }
+	/**
+	 * populate Source Object with meta data from Resource
+	 *
+	 * @param  Smarty_Template_Source   $source    source object
+	 * @param  Smarty_Internal_Template $_template template object
+	 *
+	 * @return void
+	 */
+	public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+	{
+		$source->uid = $source->filepath = sha1($source->name . $source->smarty->_joined_template_dir);
+		$source->timestamp = $source->exists = true;
+	}
 
-    /**
-     * Load template's source from $resource_name into current template object
-     *
-     * @uses decode() to decode base64 and urlencoded template_resources
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        return $this->decode($source->name);
-    }
+	/**
+	 * Load template's source from $resource_name into current template object
+	 *
+	 * @uses decode() to decode base64 and urlencoded template_resources
+	 *
+	 * @param  Smarty_Template_Source $source source object
+	 *
+	 * @return string                 template source
+	 */
+	public function getContent(Smarty_Template_Source $source)
+	{
+		return $this->decode($source->name);
+	}
 
-    /**
-     * decode base64 and urlencode
-     *
-     * @param  string $string template_resource to decode
-     *
-     * @return string decoded template_resource
-     */
-    protected function decode($string)
-    {
-        // decode if specified
-        if (($pos = strpos($string, ':')) !== false) {
-            if (!strncmp($string, 'base64', 6)) {
-                return base64_decode(substr($string, 7));
-            } elseif (!strncmp($string, 'urlencode', 9)) {
-                return urldecode(substr($string, 10));
-            }
-        }
+	/**
+	 * decode base64 and urlencode
+	 *
+	 * @param  string $string template_resource to decode
+	 *
+	 * @return string decoded template_resource
+	 */
+	protected function decode($string)
+	{
+		// decode if specified
+		if (($pos = strpos($string, ':')) !== false) {
+			if (!strncmp($string, 'base64', 6)) {
+				return base64_decode(substr($string, 7));
+			} elseif (!strncmp($string, 'urlencode', 9)) {
+				return urldecode(substr($string, 10));
+			}
+		}
 
-        return $string;
-    }
+		return $string;
+	}
 
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param  Smarty  $smarty        Smarty instance
-     * @param  string  $resource_name resource_name to make unique
-     * @param  boolean $isConfig      flag for config resource
-     *
-     * @return string unique resource name
-     */
-    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
-    {
-        return get_class($this) . '#' . $this->decode($resource_name);
-    }
+	/**
+	 * modify resource_name according to resource handlers specifications
+	 *
+	 * @param  Smarty  $smarty        Smarty instance
+	 * @param  string  $resource_name resource_name to make unique
+	 * @param  boolean $isConfig      flag for config resource
+	 *
+	 * @return string unique resource name
+	 */
+	public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
+	{
+		return get_class($this) . '#' . $this->decode($resource_name);
+	}
 
-    /**
-     * Determine basename for compiled filename
-     * Always returns an empty string.
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return '';
-    }
+	/**
+	 * Determine basename for compiled filename
+	 * Always returns an empty string.
+	 *
+	 * @param  Smarty_Template_Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(Smarty_Template_Source $source)
+	{
+		return '';
+	}
 
-    /*
+	/*
         * Disable timestamp checks for string resource.
         *
         * @return bool
         */
-    public function checkTimestamps()
-    {
-        return false;
-    }
+	public function checkTimestamps()
+	{
+		return false;
+	}
 }
 

Please login to merge, or discard this patch.

libraries/Smarty/libs/sysplugins/smarty_internal_compile_rdelim.php 2 patches

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -16,25 +16,25 @@
 block discarded – undo
  */
 class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase
 {
-    /**
-     * Compiles code for the {rdelim} tag
-     * This tag does output the right delimiter.
-     *
-     * @param  array                                $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr[ 'nocache' ] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', null, true);
-        }
-        // this tag does not return compiled code
-        $compiler->has_code = true;
+	/**
+	 * Compiles code for the {rdelim} tag
+	 * This tag does output the right delimiter.
+	 *
+	 * @param  array                                $args     array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \SmartyCompilerException
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		$_attr = $this->getAttributes($compiler, $args);
+		if ($_attr[ 'nocache' ] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', null, true);
+		}
+		// this tag does not return compiled code
+		$compiler->has_code = true;
 
-        return $compiler->smarty->right_delimiter;
-    }
+		return $compiler->smarty->right_delimiter;
+	}
 }

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -29,7 +29,7 @@
 block discarded – undo
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr[ 'nocache' ] === true) {
+        if ($_attr['nocache'] === true) {
             $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
         // this tag does not return compiled code

Please login to merge, or discard this patch.

libraries/Smarty/libs/sysplugins/smarty_internal_compilebase.php 2 patches

Indentation +168 added lines, -168 removed lines patch added patch discarded remove patch

@@ -15,182 +15,182 @@
 block discarded – undo
  */
 abstract class Smarty_Internal_CompileBase
 {
-    /**
-     * Array of names of required attribute required by tag
-     *
-     * @var array
-     */
-    public $required_attributes = array();
+	/**
+	 * Array of names of required attribute required by tag
+	 *
+	 * @var array
+	 */
+	public $required_attributes = array();
 
-    /**
-     * Array of names of optional attribute required by tag
-     * use array('_any') if there is no restriction of attributes names
-     *
-     * @var array
-     */
-    public $optional_attributes = array();
+	/**
+	 * Array of names of optional attribute required by tag
+	 * use array('_any') if there is no restriction of attributes names
+	 *
+	 * @var array
+	 */
+	public $optional_attributes = array();
 
-    /**
-     * Shorttag attribute order defined by its names
-     *
-     * @var array
-     */
-    public $shorttag_order = array();
+	/**
+	 * Shorttag attribute order defined by its names
+	 *
+	 * @var array
+	 */
+	public $shorttag_order = array();
 
-    /**
-     * Array of names of valid option flags
-     *
-     * @var array
-     */
-    public $option_flags = array('nocache');
+	/**
+	 * Array of names of valid option flags
+	 *
+	 * @var array
+	 */
+	public $option_flags = array('nocache');
 
-    /**
-     * Mapping array for boolqn option value
-     * 
-     * @var array
-     */
-    public $optionMap = array(1 => true, 0 => false, 'true' => true, 'false' => false);
+	/**
+	 * Mapping array for boolqn option value
+	 * 
+	 * @var array
+	 */
+	public $optionMap = array(1 => true, 0 => false, 'true' => true, 'false' => false);
 
-    /**
-     * Mapping array with attributes as key
-     * 
-     * @var array
-     */
-    public $mapCache = array();
+	/**
+	 * Mapping array with attributes as key
+	 * 
+	 * @var array
+	 */
+	public $mapCache = array();
 
-    /**
-     * This function checks if the attributes passed are valid
-     * The attributes passed for the tag to compile are checked against the list of required and
-     * optional attributes. Required attributes must be present. Optional attributes are check against
-     * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
-     * as valid
-     *
-     * @param  object $compiler   compiler object
-     * @param  array  $attributes attributes applied to the tag
-     *
-     * @return array  of mapped attributes for further processing
-     */
-    public function getAttributes($compiler, $attributes)
-    {
-        $_indexed_attr = array();
-        if (!isset($this->mapCache[ 'option' ])) {
-            $this->mapCache[ 'option' ] = array_fill_keys($this->option_flags, true);
-        }
-        foreach ($attributes as $key => $mixed) {
-            // shorthand ?
-            if (!is_array($mixed)) {
-                // option flag ?
-                if (isset($this->mapCache[ 'option' ][ trim($mixed, '\'"') ])) {
-                    $_indexed_attr[ trim($mixed, '\'"') ] = true;
-                    // shorthand attribute ?
-                } elseif (isset($this->shorttag_order[ $key ])) {
-                    $_indexed_attr[ $this->shorttag_order[ $key ] ] = $mixed;
-                } else {
-                    // too many shorthands
-                    $compiler->trigger_template_error('too many shorthand attributes', null, true);
-                }
-                // named attribute
-            } else {
-                foreach ($mixed as $k => $v) {
-                    // option flag?
-                    if (isset($this->mapCache[ 'option' ][ $k ])) {
-                        if (is_bool($v)) {
-                            $_indexed_attr[ $k ] = $v;
-                        } else {
-                            if (is_string($v)) {
-                                $v = trim($v, '\'" ');
-                            }
-                            if (isset($this->optionMap[ $v ])) {
-                                $_indexed_attr[ $k ] = $this->optionMap[ $v ];
-                            } else {
-                                $compiler->trigger_template_error("illegal value '" . var_export($v, true) .
-                                                                  "' for option flag '{$k}'", null, true);
-                            }
-                        }
-                        // must be named attribute
-                    } else {
-                        $_indexed_attr[ $k ] = $v;
-                    }
-                }
-            }
-        }
-        // check if all required attributes present
-        foreach ($this->required_attributes as $attr) {
-            if (!isset($_indexed_attr[ $attr ])) {
-                $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", null, true);
-            }
-        }
-        // check for not allowed attributes
-        if ($this->optional_attributes != array('_any')) {
-            if (!isset($this->mapCache[ 'all' ])) {
-                $this->mapCache[ 'all' ] =
-                    array_fill_keys(array_merge($this->required_attributes, $this->optional_attributes,
-                                                $this->option_flags), true);
-            }
-            foreach ($_indexed_attr as $key => $dummy) {
-                if (!isset($this->mapCache[ 'all' ][ $key ]) && $key !== 0) {
-                    $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", null, true);
-                }
-            }
-        }
-        // default 'false' for all option flags not set
-        foreach ($this->option_flags as $flag) {
-            if (!isset($_indexed_attr[ $flag ])) {
-                $_indexed_attr[ $flag ] = false;
-            }
-        }
-        if (isset($_indexed_attr[ 'nocache' ]) && $_indexed_attr[ 'nocache' ]) {
-            $compiler->tag_nocache = true;
-        }
-        return $_indexed_attr;
-    }
+	/**
+	 * This function checks if the attributes passed are valid
+	 * The attributes passed for the tag to compile are checked against the list of required and
+	 * optional attributes. Required attributes must be present. Optional attributes are check against
+	 * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
+	 * as valid
+	 *
+	 * @param  object $compiler   compiler object
+	 * @param  array  $attributes attributes applied to the tag
+	 *
+	 * @return array  of mapped attributes for further processing
+	 */
+	public function getAttributes($compiler, $attributes)
+	{
+		$_indexed_attr = array();
+		if (!isset($this->mapCache[ 'option' ])) {
+			$this->mapCache[ 'option' ] = array_fill_keys($this->option_flags, true);
+		}
+		foreach ($attributes as $key => $mixed) {
+			// shorthand ?
+			if (!is_array($mixed)) {
+				// option flag ?
+				if (isset($this->mapCache[ 'option' ][ trim($mixed, '\'"') ])) {
+					$_indexed_attr[ trim($mixed, '\'"') ] = true;
+					// shorthand attribute ?
+				} elseif (isset($this->shorttag_order[ $key ])) {
+					$_indexed_attr[ $this->shorttag_order[ $key ] ] = $mixed;
+				} else {
+					// too many shorthands
+					$compiler->trigger_template_error('too many shorthand attributes', null, true);
+				}
+				// named attribute
+			} else {
+				foreach ($mixed as $k => $v) {
+					// option flag?
+					if (isset($this->mapCache[ 'option' ][ $k ])) {
+						if (is_bool($v)) {
+							$_indexed_attr[ $k ] = $v;
+						} else {
+							if (is_string($v)) {
+								$v = trim($v, '\'" ');
+							}
+							if (isset($this->optionMap[ $v ])) {
+								$_indexed_attr[ $k ] = $this->optionMap[ $v ];
+							} else {
+								$compiler->trigger_template_error("illegal value '" . var_export($v, true) .
+																  "' for option flag '{$k}'", null, true);
+							}
+						}
+						// must be named attribute
+					} else {
+						$_indexed_attr[ $k ] = $v;
+					}
+				}
+			}
+		}
+		// check if all required attributes present
+		foreach ($this->required_attributes as $attr) {
+			if (!isset($_indexed_attr[ $attr ])) {
+				$compiler->trigger_template_error("missing \"" . $attr . "\" attribute", null, true);
+			}
+		}
+		// check for not allowed attributes
+		if ($this->optional_attributes != array('_any')) {
+			if (!isset($this->mapCache[ 'all' ])) {
+				$this->mapCache[ 'all' ] =
+					array_fill_keys(array_merge($this->required_attributes, $this->optional_attributes,
+												$this->option_flags), true);
+			}
+			foreach ($_indexed_attr as $key => $dummy) {
+				if (!isset($this->mapCache[ 'all' ][ $key ]) && $key !== 0) {
+					$compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", null, true);
+				}
+			}
+		}
+		// default 'false' for all option flags not set
+		foreach ($this->option_flags as $flag) {
+			if (!isset($_indexed_attr[ $flag ])) {
+				$_indexed_attr[ $flag ] = false;
+			}
+		}
+		if (isset($_indexed_attr[ 'nocache' ]) && $_indexed_attr[ 'nocache' ]) {
+			$compiler->tag_nocache = true;
+		}
+		return $_indexed_attr;
+	}
 
-    /**
-     * Push opening tag name on stack
-     * Optionally additional data can be saved on stack
-     *
-     * @param object $compiler compiler object
-     * @param string $openTag  the opening tag's name
-     * @param mixed  $data     optional data saved
-     */
-    public function openTag($compiler, $openTag, $data = null)
-    {
-        array_push($compiler->_tag_stack, array($openTag, $data));
-    }
+	/**
+	 * Push opening tag name on stack
+	 * Optionally additional data can be saved on stack
+	 *
+	 * @param object $compiler compiler object
+	 * @param string $openTag  the opening tag's name
+	 * @param mixed  $data     optional data saved
+	 */
+	public function openTag($compiler, $openTag, $data = null)
+	{
+		array_push($compiler->_tag_stack, array($openTag, $data));
+	}
 
-    /**
-     * Pop closing tag
-     * Raise an error if this stack-top doesn't match with expected opening tags
-     *
-     * @param  object       $compiler    compiler object
-     * @param  array|string $expectedTag the expected opening tag names
-     *
-     * @return mixed        any type the opening tag's name or saved data
-     */
-    public function closeTag($compiler, $expectedTag)
-    {
-        if (count($compiler->_tag_stack) > 0) {
-            // get stacked info
-            list($_openTag, $_data) = array_pop($compiler->_tag_stack);
-            // open tag must match with the expected ones
-            if (in_array($_openTag, (array) $expectedTag)) {
-                if (is_null($_data)) {
-                    // return opening tag
-                    return $_openTag;
-                } else {
-                    // return restored data
-                    return $_data;
-                }
-            }
-            // wrong nesting of tags
-            $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag .
-                                              "{$compiler->smarty->right_delimiter} tag");
+	/**
+	 * Pop closing tag
+	 * Raise an error if this stack-top doesn't match with expected opening tags
+	 *
+	 * @param  object       $compiler    compiler object
+	 * @param  array|string $expectedTag the expected opening tag names
+	 *
+	 * @return mixed        any type the opening tag's name or saved data
+	 */
+	public function closeTag($compiler, $expectedTag)
+	{
+		if (count($compiler->_tag_stack) > 0) {
+			// get stacked info
+			list($_openTag, $_data) = array_pop($compiler->_tag_stack);
+			// open tag must match with the expected ones
+			if (in_array($_openTag, (array) $expectedTag)) {
+				if (is_null($_data)) {
+					// return opening tag
+					return $_openTag;
+				} else {
+					// return restored data
+					return $_data;
+				}
+			}
+			// wrong nesting of tags
+			$compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag .
+											  "{$compiler->smarty->right_delimiter} tag");
 
-            return;
-        }
-        // wrong nesting of tags
-        $compiler->trigger_template_error("unexpected closing tag", null, true);
+			return;
+		}
+		// wrong nesting of tags
+		$compiler->trigger_template_error("unexpected closing tag", null, true);
 
-        return;
-    }
+		return;
+	}
 }

Please login to merge, or discard this patch.

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -73,18 +73,18 @@  discard block
 block discarded – undo
     public function getAttributes($compiler, $attributes)
     {
         $_indexed_attr = array();
-        if (!isset($this->mapCache[ 'option' ])) {
-            $this->mapCache[ 'option' ] = array_fill_keys($this->option_flags, true);
+        if (!isset($this->mapCache['option'])) {
+            $this->mapCache['option'] = array_fill_keys($this->option_flags, true);
         }
         foreach ($attributes as $key => $mixed) {
             // shorthand ?
             if (!is_array($mixed)) {
                 // option flag ?
-                if (isset($this->mapCache[ 'option' ][ trim($mixed, '\'"') ])) {
-                    $_indexed_attr[ trim($mixed, '\'"') ] = true;
+                if (isset($this->mapCache['option'][trim($mixed, '\'"')])) {
+                    $_indexed_attr[trim($mixed, '\'"')] = true;
                     // shorthand attribute ?
-                } elseif (isset($this->shorttag_order[ $key ])) {
-                    $_indexed_attr[ $this->shorttag_order[ $key ] ] = $mixed;
+                } elseif (isset($this->shorttag_order[$key])) {
+                    $_indexed_attr[$this->shorttag_order[$key]] = $mixed;
                 } else {
                     // too many shorthands
                     $compiler->trigger_template_error('too many shorthand attributes', null, true);
@@ -93,15 +93,15 @@  discard block
 block discarded – undo
             } else {
                 foreach ($mixed as $k => $v) {
                     // option flag?
-                    if (isset($this->mapCache[ 'option' ][ $k ])) {
+                    if (isset($this->mapCache['option'][$k])) {
                         if (is_bool($v)) {
-                            $_indexed_attr[ $k ] = $v;
+                            $_indexed_attr[$k] = $v;
                         } else {
                             if (is_string($v)) {
                                 $v = trim($v, '\'" ');
                             }
-                            if (isset($this->optionMap[ $v ])) {
-                                $_indexed_attr[ $k ] = $this->optionMap[ $v ];
+                            if (isset($this->optionMap[$v])) {
+                                $_indexed_attr[$k] = $this->optionMap[$v];
                             } else {
                                 $compiler->trigger_template_error("illegal value '" . var_export($v, true) .
                                                                   "' for option flag '{$k}'", null, true);
@@ -109,37 +109,37 @@  discard block
 block discarded – undo
                         }
                         // must be named attribute
                     } else {
-                        $_indexed_attr[ $k ] = $v;
+                        $_indexed_attr[$k] = $v;
                     }
                 }
             }
         }
         // check if all required attributes present
         foreach ($this->required_attributes as $attr) {
-            if (!isset($_indexed_attr[ $attr ])) {
+            if (!isset($_indexed_attr[$attr])) {
                 $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", null, true);
             }
         }
         // check for not allowed attributes
         if ($this->optional_attributes != array('_any')) {
-            if (!isset($this->mapCache[ 'all' ])) {
-                $this->mapCache[ 'all' ] =
+            if (!isset($this->mapCache['all'])) {
+                $this->mapCache['all'] =
                     array_fill_keys(array_merge($this->required_attributes, $this->optional_attributes,
                                                 $this->option_flags), true);
             }
             foreach ($_indexed_attr as $key => $dummy) {
-                if (!isset($this->mapCache[ 'all' ][ $key ]) && $key !== 0) {
+                if (!isset($this->mapCache['all'][$key]) && $key !== 0) {
                     $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", null, true);
                 }
             }
         }
         // default 'false' for all option flags not set
         foreach ($this->option_flags as $flag) {
-            if (!isset($_indexed_attr[ $flag ])) {
-                $_indexed_attr[ $flag ] = false;
+            if (!isset($_indexed_attr[$flag])) {
+                $_indexed_attr[$flag] = false;
             }
         }
-        if (isset($_indexed_attr[ 'nocache' ]) && $_indexed_attr[ 'nocache' ]) {
+        if (isset($_indexed_attr['nocache']) && $_indexed_attr['nocache']) {
             $compiler->tag_nocache = true;
         }
         return $_indexed_attr;

Please login to merge, or discard this patch.

Smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php 2 patches

Indentation +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -11,30 +11,30 @@
 block discarded – undo
  */
 class Smarty_Internal_Method_UnregisterObject
 {
-    /**
-     * Valid for Smarty and template object
-     *
-     * @var int
-     */
-    public $objMap = 3;
+	/**
+	 * Valid for Smarty and template object
+	 *
+	 * @var int
+	 */
+	public $objMap = 3;
 
-    /**
-     * Registers plugin to be used in templates
-     *
-     * @api  Smarty::unregisterObject()
-     * @link http://www.smarty.net/docs/en/api.unregister.object.tpl
-     *
-     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  string                                                         $object_name name of object
-     *
-     * @return \Smarty|\Smarty_Internal_Template
-     */
-    public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        if (isset($smarty->registered_objects[ $object_name ])) {
-            unset($smarty->registered_objects[ $object_name ]);
-        }
-        return $obj;
-    }
+	/**
+	 * Registers plugin to be used in templates
+	 *
+	 * @api  Smarty::unregisterObject()
+	 * @link http://www.smarty.net/docs/en/api.unregister.object.tpl
+	 *
+	 * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+	 * @param  string                                                         $object_name name of object
+	 *
+	 * @return \Smarty|\Smarty_Internal_Template
+	 */
+	public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
+	{
+		$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+		if (isset($smarty->registered_objects[ $object_name ])) {
+			unset($smarty->registered_objects[ $object_name ]);
+		}
+		return $obj;
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -32,8 +32,8 @@
 block discarded – undo
     public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
     {
         $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
-        if (isset($smarty->registered_objects[ $object_name ])) {
-            unset($smarty->registered_objects[ $object_name ]);
+        if (isset($smarty->registered_objects[$object_name])) {
+            unset($smarty->registered_objects[$object_name]);
         }
         return $obj;
     }

Please login to merge, or discard this patch.

		@@ -78,13 +78,13 @@ discard block
		block discarded – undo
78	78	// check and get attributes
79	79	$_attr = $this->getAttributes($compiler, $args);
80	80
81		- $fullResourceName = $source_resource = $_attr[ 'file' ];
	81	+ $fullResourceName = $source_resource = $_attr['file'];
82	82	$variable_template = false;
83	83	$cache_tpl = false;
84	84	// parse resource_name
85	85	if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)\|(.+))\1$/', $source_resource, $match)) {
86		- $type = !empty($match[ 3 ]) ? $match[ 3 ] : $compiler->template->smarty->default_resource_type;
87		- $name = !empty($match[ 5 ]) ? $match[ 5 ] : $match[ 6 ];
	86	+ $type = !empty($match[3]) ? $match[3] : $compiler->template->smarty->default_resource_type;
	87	+ $name = !empty($match[5]) ? $match[5] : $match[6];
88	88	$handler = Smarty_Resource::load($compiler->smarty, $type);
89	89	if ($handler->recompiled \|\| $handler->uncompiled) {
90	90	$variable_template = true;
		@@ -93,24 +93,24 @@ discard block
		block discarded – undo
93	93	if ($type != 'string') {
94	94	$fullResourceName = "{$type}:{$name}";
95	95	$compiled = $compiler->parent_compiler->template->compiled;
96		- if (isset($compiled->includes[ $fullResourceName ])) {
97		- $compiled->includes[ $fullResourceName ] ++;
	96	+ if (isset($compiled->includes[$fullResourceName])) {
	97	+ $compiled->includes[$fullResourceName]++;
98	98	$cache_tpl = true;
99	99	} else {
100	100	if ("{$compiler->template->source->type}:{$compiler->template->source->name}" ==
101	101	$fullResourceName
102	102	) {
103	103	// recursive call of current template
104		- $compiled->includes[ $fullResourceName ] = 2;
	104	+ $compiled->includes[$fullResourceName] = 2;
105	105	$cache_tpl = true;
106	106	} else {
107		- $compiled->includes[ $fullResourceName ] = 1;
	107	+ $compiled->includes[$fullResourceName] = 1;
108	108	}
109	109	}
110	110	$fullResourceName = '"' . $fullResourceName . '"';
111	111	}
112	112	}
113		- if (empty($match[ 5 ])) {
	113	+ if (empty($match[5])) {
114	114	$variable_template = true;
115	115	}
116	116	} else {
		@@ -137,7 +137,7 @@ discard block
		block discarded – undo
137	137	}
138	138
139	139	// flag if included template code should be merged into caller
140		- $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes \|\| $_attr[ 'inline' ] === true) &&
	140	+ $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes \|\| $_attr['inline'] === true) &&
141	141	!$compiler->template->source->handler->recompiled;
142	142
143	143	if ($merge_compiled_includes) {
		@@ -146,7 +146,7 @@ discard block
		block discarded – undo
146	146	$merge_compiled_includes = false;
147	147	}
148	148	// variable compile_id?
149		- if (isset($_attr[ 'compile_id' ]) && $compiler->isVariable($_attr[ 'compile_id' ])) {
	149	+ if (isset($_attr['compile_id']) && $compiler->isVariable($_attr['compile_id'])) {
150	150	$merge_compiled_includes = false;
151	151	}
152	152	}
		@@ -157,28 +157,28 @@ discard block
		block discarded – undo
157	157	* a call in nocache mode.
158	158	*
159	159	*/
160		- if ($_attr[ 'nocache' ] !== true && $_attr[ 'caching' ]) {
161		- $_caching = $_new_caching = (int) $_attr[ 'caching' ];
	160	+ if ($_attr['nocache'] !== true && $_attr['caching']) {
	161	+ $_caching = $_new_caching = (int) $_attr['caching'];
162	162	$call_nocache = true;
163	163	} else {
164	164	$_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
165	165	}
166		- if (isset($_attr[ 'cache_lifetime' ])) {
167		- $_cache_lifetime = $_attr[ 'cache_lifetime' ];
	166	+ if (isset($_attr['cache_lifetime'])) {
	167	+ $_cache_lifetime = $_attr['cache_lifetime'];
168	168	$call_nocache = true;
169	169	$_caching = $_new_caching;
170	170	} else {
171	171	$_cache_lifetime = '$_smarty_tpl->cache_lifetime';
172	172	}
173		- if (isset($_attr[ 'cache_id' ])) {
174		- $_cache_id = $_attr[ 'cache_id' ];
	173	+ if (isset($_attr['cache_id'])) {
	174	+ $_cache_id = $_attr['cache_id'];
175	175	$call_nocache = true;
176	176	$_caching = $_new_caching;
177	177	} else {
178	178	$_cache_id = '$_smarty_tpl->cache_id';
179	179	}
180		- if (isset($_attr[ 'compile_id' ])) {
181		- $_compile_id = $_attr[ 'compile_id' ];
	180	+ if (isset($_attr['compile_id'])) {
	181	+ $_compile_id = $_attr['compile_id'];
182	182	} else {
183	183	$_compile_id = '$_smarty_tpl->compile_id';
184	184	}
		@@ -188,31 +188,31 @@ discard block
		block discarded – undo
188	188	$merge_compiled_includes = false;
189	189	}
190	190	// assign attribute
191		- if (isset($_attr[ 'assign' ])) {
	191	+ if (isset($_attr['assign'])) {
192	192	// output will be stored in a smarty variable instead of being displayed
193		- if ($_assign = $compiler->getId($_attr[ 'assign' ])) {
	193	+ if ($_assign = $compiler->getId($_attr['assign'])) {
194	194	$_assign = "'{$_assign}'";
195	195	if ($compiler->tag_nocache \|\| $compiler->nocache \|\| $call_nocache) {
196	196	// create nocache var to make it know for further compiling
197		- $compiler->setNocacheInVariable($_attr[ 'assign' ]);
	197	+ $compiler->setNocacheInVariable($_attr['assign']);
198	198	}
199	199	} else {
200		- $_assign = $_attr[ 'assign' ];
	200	+ $_assign = $_attr['assign'];
201	201	}
202	202	}
203	203
204	204	$has_compiled_template = false;
205	205	if ($merge_compiled_includes) {
206		- $c_id = isset($_attr[ 'compile_id' ]) ? $_attr[ 'compile_id' ] : $compiler->template->compile_id;
	206	+ $c_id = isset($_attr['compile_id']) ? $_attr['compile_id'] : $compiler->template->compile_id;
207	207	// we must observe different compile_id and caching
208	208	$t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
209	209	$compiler->smarty->allow_ambiguous_resources = true;
210	210	/* @var Smarty_Internal_Template $tpl */
211		- $tpl = new $compiler->smarty->template_class (trim($fullResourceName, '"\''), $compiler->smarty,
	211	+ $tpl = new $compiler->smarty->template_class(trim($fullResourceName, '"\''), $compiler->smarty,
212	212	$compiler->template, $compiler->template->cache_id, $c_id,
213	213	$_caching);
214	214	$uid = $tpl->source->type . $tpl->source->uid;
215		- if (!isset($compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ])) {
	215	+ if (!isset($compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash])) {
216	216	$has_compiled_template = $this->compileInlineTemplate($compiler, $tpl, $t_hash);
217	217	} else {
218	218	$has_compiled_template = true;
		@@ -220,7 +220,7 @@ discard block
		block discarded – undo
220	220	unset($tpl);
221	221	}
222	222	// delete {include} standard attributes
223		- unset($_attr[ 'file' ], $_attr[ 'assign' ], $_attr[ 'cache_id' ], $_attr[ 'compile_id' ], $_attr[ 'cache_lifetime' ], $_attr[ 'nocache' ], $_attr[ 'caching' ], $_attr[ 'scope' ], $_attr[ 'inline' ]);
	223	+ unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
224	224	// remaining attributes must be assigned as smarty variable
225	225	$_vars = 'array()';
226	226	if (!empty($_attr)) {
		@@ -295,7 +295,7 @@ discard block
		block discarded – undo
295	295	{
296	296	$uid = $tpl->source->type . $tpl->source->uid;
297	297	if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
298		- $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'uid' ] =
	298	+ $compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['uid'] =
299	299	$tpl->source->uid;
300	300	if (isset($compiler->template->inheritance)) {
301	301	$tpl->inheritance = clone $compiler->template->inheritance;
		@@ -304,11 +304,11 @@ discard block
		block discarded – undo
304	304	$tpl->compiled->nocache_hash = $compiler->parent_compiler->template->compiled->nocache_hash;
305	305	$tpl->loadCompiler();
306	306	// save unique function name
307		- $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'func' ] =
	307	+ $compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['func'] =
308	308	$tpl->compiled->unifunc = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
309	309	// make sure whole chain gets compiled
310	310	$tpl->mustCompile = true;
311		- $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'nocache_hash' ] =
	311	+ $compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['nocache_hash'] =
312	312	$tpl->compiled->nocache_hash;
313	313	if ($compiler->template->source->type == 'file') {
314	314	$sourceInfo = $compiler->template->source->filepath;
		@@ -336,7 +336,7 @@ discard block
		block discarded – undo
336	336	$compiled_code);
337	337	$compiler->template->compiled->has_nocache_code = true;
338	338	}
339		- $compiler->parent_compiler->mergedSubTemplatesCode[ $tpl->compiled->unifunc ] = $compiled_code;
	339	+ $compiler->parent_compiler->mergedSubTemplatesCode[$tpl->compiled->unifunc] = $compiled_code;
340	340	return true;
341	341	} else {
342	342	return false;

		@@ -73,18 +73,18 @@ discard block
		block discarded – undo
73	73	public function getAttributes($compiler, $attributes)
74	74	{
75	75	$_indexed_attr = array();
76		- if (!isset($this->mapCache[ 'option' ])) {
77		- $this->mapCache[ 'option' ] = array_fill_keys($this->option_flags, true);
	76	+ if (!isset($this->mapCache['option'])) {
	77	+ $this->mapCache['option'] = array_fill_keys($this->option_flags, true);
78	78	}
79	79	foreach ($attributes as $key => $mixed) {
80	80	// shorthand ?
81	81	if (!is_array($mixed)) {
82	82	// option flag ?
83		- if (isset($this->mapCache[ 'option' ][ trim($mixed, '\'"') ])) {
84		- $_indexed_attr[ trim($mixed, '\'"') ] = true;
	83	+ if (isset($this->mapCache['option'][trim($mixed, '\'"')])) {
	84	+ $_indexed_attr[trim($mixed, '\'"')] = true;
85	85	// shorthand attribute ?
86		- } elseif (isset($this->shorttag_order[ $key ])) {
87		- $_indexed_attr[ $this->shorttag_order[ $key ] ] = $mixed;
	86	+ } elseif (isset($this->shorttag_order[$key])) {
	87	+ $_indexed_attr[$this->shorttag_order[$key]] = $mixed;
88	88	} else {
89	89	// too many shorthands
90	90	$compiler->trigger_template_error('too many shorthand attributes', null, true);
		@@ -93,15 +93,15 @@ discard block
		block discarded – undo
93	93	} else {
94	94	foreach ($mixed as $k => $v) {
95	95	// option flag?
96		- if (isset($this->mapCache[ 'option' ][ $k ])) {
	96	+ if (isset($this->mapCache['option'][$k])) {
97	97	if (is_bool($v)) {
98		- $_indexed_attr[ $k ] = $v;
	98	+ $_indexed_attr[$k] = $v;
99	99	} else {
100	100	if (is_string($v)) {
101	101	$v = trim($v, '\'" ');
102	102	}
103		- if (isset($this->optionMap[ $v ])) {
104		- $_indexed_attr[ $k ] = $this->optionMap[ $v ];
	103	+ if (isset($this->optionMap[$v])) {
	104	+ $_indexed_attr[$k] = $this->optionMap[$v];
105	105	} else {
106	106	$compiler->trigger_template_error("illegal value '" . var_export($v, true) .
107	107	"' for option flag '{$k}'", null, true);
		@@ -109,37 +109,37 @@ discard block
		block discarded – undo
109	109	}
110	110	// must be named attribute
111	111	} else {
112		- $_indexed_attr[ $k ] = $v;
	112	+ $_indexed_attr[$k] = $v;
113	113	}
114	114	}
115	115	}
116	116	}
117	117	// check if all required attributes present
118	118	foreach ($this->required_attributes as $attr) {
119		- if (!isset($_indexed_attr[ $attr ])) {
	119	+ if (!isset($_indexed_attr[$attr])) {
120	120	$compiler->trigger_template_error("missing \"" . $attr . "\" attribute", null, true);
121	121	}
122	122	}
123	123	// check for not allowed attributes
124	124	if ($this->optional_attributes != array('_any')) {
125		- if (!isset($this->mapCache[ 'all' ])) {
126		- $this->mapCache[ 'all' ] =
	125	+ if (!isset($this->mapCache['all'])) {
	126	+ $this->mapCache['all'] =
127	127	array_fill_keys(array_merge($this->required_attributes, $this->optional_attributes,
128	128	$this->option_flags), true);
129	129	}
130	130	foreach ($_indexed_attr as $key => $dummy) {
131		- if (!isset($this->mapCache[ 'all' ][ $key ]) && $key !== 0) {
	131	+ if (!isset($this->mapCache['all'][$key]) && $key !== 0) {
132	132	$compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", null, true);
133	133	}
134	134	}
135	135	}
136	136	// default 'false' for all option flags not set
137	137	foreach ($this->option_flags as $flag) {
138		- if (!isset($_indexed_attr[ $flag ])) {
139		- $_indexed_attr[ $flag ] = false;
	138	+ if (!isset($_indexed_attr[$flag])) {
	139	+ $_indexed_attr[$flag] = false;
140	140	}
141	141	}
142		- if (isset($_indexed_attr[ 'nocache' ]) && $_indexed_attr[ 'nocache' ]) {
	142	+ if (isset($_indexed_attr['nocache']) && $_indexed_attr['nocache']) {
143	143	$compiler->tag_nocache = true;
144	144	}
145	145	return $_indexed_attr;

		@@ -11,193 +11,193 @@
		block discarded – undo
11	11	class Smarty_Internal_Runtime_SubTemplate
12	12	{
13	13
14		- /**
15		- * Subtemplate template object cache
16		- *
17		- * @var Smarty_Internal_Template[]
18		- */
19		- public $tplObjects = array();
	14	+ /**
	15	+ * Subtemplate template object cache
	16	+ *
	17	+ * @var Smarty_Internal_Template[]
	18	+ */
	19	+ public $tplObjects = array();
20	20
21		- /**
22		- * Subtemplate call count
23		- *
24		- * @var int[]
25		- */
26		- public $subTplInfo = array();
	21	+ /**
	22	+ * Subtemplate call count
	23	+ *
	24	+ * @var int[]
	25	+ */
	26	+ public $subTplInfo = array();
27	27
28		- /**
29		- * Runtime function to render subtemplate
30		- *
31		- * @param \Smarty_Internal_Template $parent
32		- * @param string $template template name
33		- * @param mixed $cache_id cache id
34		- * @param mixed $compile_id compile id
35		- * @param integer $caching cache mode
36		- * @param integer $cache_lifetime life time of cache data
37		- * @param array $data passed parameter template variables
38		- * @param int $scope scope in which {include} should execute
39		- * @param bool $forceTplCache cache template object
40		- * @param string $uid file dependency uid
41		- * @param string $content_func function name
42		- *
43		- */
44		- public function render(Smarty_Internal_Template $parent, $template, $cache_id, $compile_id, $caching,
45		- $cache_lifetime, $data, $scope, $forceTplCache, $uid = null, $content_func = null)
46		- {
47		- // if there are cached template objects calculate $templateID
48		- $_templateId =
49		- !empty($this->tplObjects) ? $parent->smarty->_getTemplateId($template, $cache_id, $compile_id, $caching) :
50		- null;
51		- // already in template cache?
52		- /* @var Smarty_Internal_Template $tpl */
53		- if (isset($_templateId) && isset($this->tplObjects[$_templateId])) {
54		- // clone cached template object because of possible recursive call
55		- $tpl = clone $this->tplObjects[$_templateId];
56		- $tpl->parent = $parent;
57		- // if $caching mode changed the compiled resource is invalid
58		- if ((bool) $tpl->caching !== (bool) $caching) {
59		- unset($tpl->compiled);
60		- }
61		- // get variables from calling scope
62		- $tpl->tpl_vars = $parent->tpl_vars;
63		- $tpl->config_vars = $parent->config_vars;
64		- // get template functions
65		- $tpl->tpl_function = $parent->tpl_function;
66		- // copy inheritance object?
67		- if (isset($parent->ext->_inheritance)) {
68		- $tpl->ext->_inheritance = $parent->ext->_inheritance;
69		- } else {
70		- unset($tpl->ext->_inheritance);
71		- }
72		- } else {
73		- $tpl = clone $parent;
74		- $tpl->parent = $parent;
75		- if (!isset($tpl->templateId) \|\| $tpl->templateId !== $_templateId) {
76		- $tpl->templateId = $_templateId;
77		- $tpl->template_resource = $template;
78		- $tpl->cache_id = $cache_id;
79		- $tpl->compile_id = $compile_id;
80		- if (isset($uid)) {
81		- // for inline templates we can get all resource information from file dependency
82		- if (isset($tpl->compiled->file_dependency[$uid])) {
83		- list($filepath, $timestamp, $resource) = $tpl->compiled->file_dependency[$uid];
84		- $tpl->source =
85		- new Smarty_Template_Source(isset($tpl->smarty->_cache['resource_handlers'][$resource]) ?
86		- $tpl->smarty->_cache['resource_handlers'][$resource] :
87		- Smarty_Resource::load($tpl->smarty, $resource), $tpl->smarty,
88		- $filepath, $resource, $filepath);
89		- $tpl->source->filepath = $filepath;
90		- $tpl->source->timestamp = $timestamp;
91		- $tpl->source->exists = true;
92		- $tpl->source->uid = $uid;
93		- } else {
94		- $tpl->source = null;
95		- }
96		- } else {
97		- $tpl->source = null;
98		- }
99		- if (!isset($tpl->source)) {
100		- $tpl->source = Smarty_Template_Source::load($tpl);
101		- unset($tpl->compiled);
102		- }
103		- unset($tpl->cached);
104		- }
105		- }
106		- $tpl->caching = $caching;
107		- $tpl->cache_lifetime = $cache_lifetime;
108		- if ($caching == 9999) {
109		- $tpl->cached = $parent->cached;
110		- }
111		- // set template scope
112		- $tpl->scope = $scope;
113		- $scopePtr = false;
114		- if ($scope & ~Smarty::SCOPE_BUBBLE_UP) {
115		- if ($scope == Smarty::SCOPE_GLOBAL) {
116		- $tpl->tpl_vars = Smarty::$global_tpl_vars;
117		- $tpl->config_vars = $tpl->smarty->config_vars;
118		- $scopePtr = true;
119		- } else {
120		- if ($scope == Smarty::SCOPE_PARENT) {
121		- $scopePtr = $parent;
122		- } elseif ($scope == Smarty::SCOPE_SMARTY) {
123		- $scopePtr = $tpl->smarty;
124		- } else {
125		- $scopePtr = $tpl;
126		- while (isset($scopePtr->parent)) {
127		- if ($scopePtr->parent->_objType != 2 && $scope & Smarty::SCOPE_TPL_ROOT) {
128		- break;
129		- }
130		- $scopePtr = $scopePtr->parent;
131		- }
132		- }
133		- $tpl->tpl_vars = $scopePtr->tpl_vars;
134		- $tpl->config_vars = $scopePtr->config_vars;
135		- }
136		- }
	28	+ /**
	29	+ * Runtime function to render subtemplate
	30	+ *
	31	+ * @param \Smarty_Internal_Template $parent
	32	+ * @param string $template template name
	33	+ * @param mixed $cache_id cache id
	34	+ * @param mixed $compile_id compile id
	35	+ * @param integer $caching cache mode
	36	+ * @param integer $cache_lifetime life time of cache data
	37	+ * @param array $data passed parameter template variables
	38	+ * @param int $scope scope in which {include} should execute
	39	+ * @param bool $forceTplCache cache template object
	40	+ * @param string $uid file dependency uid
	41	+ * @param string $content_func function name
	42	+ *
	43	+ */
	44	+ public function render(Smarty_Internal_Template $parent, $template, $cache_id, $compile_id, $caching,
	45	+ $cache_lifetime, $data, $scope, $forceTplCache, $uid = null, $content_func = null)
	46	+ {
	47	+ // if there are cached template objects calculate $templateID
	48	+ $_templateId =
	49	+ !empty($this->tplObjects) ? $parent->smarty->_getTemplateId($template, $cache_id, $compile_id, $caching) :
	50	+ null;
	51	+ // already in template cache?
	52	+ /* @var Smarty_Internal_Template $tpl */
	53	+ if (isset($_templateId) && isset($this->tplObjects[$_templateId])) {
	54	+ // clone cached template object because of possible recursive call
	55	+ $tpl = clone $this->tplObjects[$_templateId];
	56	+ $tpl->parent = $parent;
	57	+ // if $caching mode changed the compiled resource is invalid
	58	+ if ((bool) $tpl->caching !== (bool) $caching) {
	59	+ unset($tpl->compiled);
	60	+ }
	61	+ // get variables from calling scope
	62	+ $tpl->tpl_vars = $parent->tpl_vars;
	63	+ $tpl->config_vars = $parent->config_vars;
	64	+ // get template functions
	65	+ $tpl->tpl_function = $parent->tpl_function;
	66	+ // copy inheritance object?
	67	+ if (isset($parent->ext->_inheritance)) {
	68	+ $tpl->ext->_inheritance = $parent->ext->_inheritance;
	69	+ } else {
	70	+ unset($tpl->ext->_inheritance);
	71	+ }
	72	+ } else {
	73	+ $tpl = clone $parent;
	74	+ $tpl->parent = $parent;
	75	+ if (!isset($tpl->templateId) \|\| $tpl->templateId !== $_templateId) {
	76	+ $tpl->templateId = $_templateId;
	77	+ $tpl->template_resource = $template;
	78	+ $tpl->cache_id = $cache_id;
	79	+ $tpl->compile_id = $compile_id;
	80	+ if (isset($uid)) {
	81	+ // for inline templates we can get all resource information from file dependency
	82	+ if (isset($tpl->compiled->file_dependency[$uid])) {
	83	+ list($filepath, $timestamp, $resource) = $tpl->compiled->file_dependency[$uid];
	84	+ $tpl->source =
	85	+ new Smarty_Template_Source(isset($tpl->smarty->_cache['resource_handlers'][$resource]) ?
	86	+ $tpl->smarty->_cache['resource_handlers'][$resource] :
	87	+ Smarty_Resource::load($tpl->smarty, $resource), $tpl->smarty,
	88	+ $filepath, $resource, $filepath);
	89	+ $tpl->source->filepath = $filepath;
	90	+ $tpl->source->timestamp = $timestamp;
	91	+ $tpl->source->exists = true;
	92	+ $tpl->source->uid = $uid;
	93	+ } else {
	94	+ $tpl->source = null;
	95	+ }
	96	+ } else {
	97	+ $tpl->source = null;
	98	+ }
	99	+ if (!isset($tpl->source)) {
	100	+ $tpl->source = Smarty_Template_Source::load($tpl);
	101	+ unset($tpl->compiled);
	102	+ }
	103	+ unset($tpl->cached);
	104	+ }
	105	+ }
	106	+ $tpl->caching = $caching;
	107	+ $tpl->cache_lifetime = $cache_lifetime;
	108	+ if ($caching == 9999) {
	109	+ $tpl->cached = $parent->cached;
	110	+ }
	111	+ // set template scope
	112	+ $tpl->scope = $scope;
	113	+ $scopePtr = false;
	114	+ if ($scope & ~Smarty::SCOPE_BUBBLE_UP) {
	115	+ if ($scope == Smarty::SCOPE_GLOBAL) {
	116	+ $tpl->tpl_vars = Smarty::$global_tpl_vars;
	117	+ $tpl->config_vars = $tpl->smarty->config_vars;
	118	+ $scopePtr = true;
	119	+ } else {
	120	+ if ($scope == Smarty::SCOPE_PARENT) {
	121	+ $scopePtr = $parent;
	122	+ } elseif ($scope == Smarty::SCOPE_SMARTY) {
	123	+ $scopePtr = $tpl->smarty;
	124	+ } else {
	125	+ $scopePtr = $tpl;
	126	+ while (isset($scopePtr->parent)) {
	127	+ if ($scopePtr->parent->_objType != 2 && $scope & Smarty::SCOPE_TPL_ROOT) {
	128	+ break;
	129	+ }
	130	+ $scopePtr = $scopePtr->parent;
	131	+ }
	132	+ }
	133	+ $tpl->tpl_vars = $scopePtr->tpl_vars;
	134	+ $tpl->config_vars = $scopePtr->config_vars;
	135	+ }
	136	+ }
137	137
138		- if (!isset($this->tplObjects[$tpl->_getTemplateId()]) && !$tpl->source->handler->recompiled) {
139		- // if template is called multiple times set flag to to cache template objects
140		- $forceTplCache = $forceTplCache \|\|
141		- (isset($this->subTplInfo[$tpl->template_resource]) && $this->subTplInfo[$tpl->template_resource] > 1);
142		- // check if template object should be cached
143		- if ($tpl->parent->_objType == 2 && isset($this->tplObjects[$tpl->parent->templateId]) \|\|
144		- ($forceTplCache && $tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_AUTOMATIC) \|\|
145		- ($tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
146		- ) {
147		- $this->tplObjects[$tpl->_getTemplateId()] = $tpl;
148		- }
149		- }
	138	+ if (!isset($this->tplObjects[$tpl->_getTemplateId()]) && !$tpl->source->handler->recompiled) {
	139	+ // if template is called multiple times set flag to to cache template objects
	140	+ $forceTplCache = $forceTplCache \|\|
	141	+ (isset($this->subTplInfo[$tpl->template_resource]) && $this->subTplInfo[$tpl->template_resource] > 1);
	142	+ // check if template object should be cached
	143	+ if ($tpl->parent->_objType == 2 && isset($this->tplObjects[$tpl->parent->templateId]) \|\|
	144	+ ($forceTplCache && $tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_AUTOMATIC) \|\|
	145	+ ($tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
	146	+ ) {
	147	+ $this->tplObjects[$tpl->_getTemplateId()] = $tpl;
	148	+ }
	149	+ }
150	150
151		- if (!empty($data)) {
152		- // set up variable values
153		- foreach ($data as $_key => $_val) {
154		- $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
155		- }
156		- }
157		- if (isset($uid)) {
158		- if ($parent->smarty->debugging) {
159		- $parent->smarty->_debug->start_template($tpl);
160		- $parent->smarty->_debug->start_render($tpl);
161		- }
162		- $tpl->compiled->getRenderedTemplateCode($tpl, $content_func);
163		- if ($parent->smarty->debugging) {
164		- $parent->smarty->_debug->end_template($tpl);
165		- $parent->smarty->_debug->end_render($tpl);
166		- }
167		- if ($tpl->caching == 9999 && $tpl->compiled->has_nocache_code) {
168		- $parent->cached->hashes[$tpl->compiled->nocache_hash] = true;
169		- }
170		- } else {
171		- if (isset($tpl->compiled)) {
172		- $tpl->compiled->render($tpl);
173		- } else {
174		- $tpl->render();
175		- }
176		- }
177		- if ($scopePtr) {
178		- if ($scope == Smarty::SCOPE_GLOBAL) {
179		- Smarty::$global_tpl_vars = $tpl->tpl_vars;
180		- $tpl->smarty->config_vars = $tpl->config_vars;
181		- } else {
182		- $scopePtr->tpl_vars = $tpl->tpl_vars;
183		- $scopePtr->config_vars = $tpl->config_vars;
184		- }
185		- }
186		- }
	151	+ if (!empty($data)) {
	152	+ // set up variable values
	153	+ foreach ($data as $_key => $_val) {
	154	+ $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
	155	+ }
	156	+ }
	157	+ if (isset($uid)) {
	158	+ if ($parent->smarty->debugging) {
	159	+ $parent->smarty->_debug->start_template($tpl);
	160	+ $parent->smarty->_debug->start_render($tpl);
	161	+ }
	162	+ $tpl->compiled->getRenderedTemplateCode($tpl, $content_func);
	163	+ if ($parent->smarty->debugging) {
	164	+ $parent->smarty->_debug->end_template($tpl);
	165	+ $parent->smarty->_debug->end_render($tpl);
	166	+ }
	167	+ if ($tpl->caching == 9999 && $tpl->compiled->has_nocache_code) {
	168	+ $parent->cached->hashes[$tpl->compiled->nocache_hash] = true;
	169	+ }
	170	+ } else {
	171	+ if (isset($tpl->compiled)) {
	172	+ $tpl->compiled->render($tpl);
	173	+ } else {
	174	+ $tpl->render();
	175	+ }
	176	+ }
	177	+ if ($scopePtr) {
	178	+ if ($scope == Smarty::SCOPE_GLOBAL) {
	179	+ Smarty::$global_tpl_vars = $tpl->tpl_vars;
	180	+ $tpl->smarty->config_vars = $tpl->config_vars;
	181	+ } else {
	182	+ $scopePtr->tpl_vars = $tpl->tpl_vars;
	183	+ $scopePtr->config_vars = $tpl->config_vars;
	184	+ }
	185	+ }
	186	+ }
187	187
188		- /**
189		- * Get called subtemplates from compiled template and save call count
190		- *
191		- * @param \Smarty_Internal_Template $tpl
192		- */
193		- public function registerSubTemplates(Smarty_Internal_Template $tpl)
194		- {
195		- foreach ($tpl->compiled->includes as $name => $count) {
196		- if (isset($this->subTplInfo[$name])) {
197		- $this->subTplInfo[$name] += $count;
198		- } else {
199		- $this->subTplInfo[$name] = $count;
200		- }
201		- }
202		- }
	188	+ /**
	189	+ * Get called subtemplates from compiled template and save call count
	190	+ *
	191	+ * @param \Smarty_Internal_Template $tpl
	192	+ */
	193	+ public function registerSubTemplates(Smarty_Internal_Template $tpl)
	194	+ {
	195	+ foreach ($tpl->compiled->includes as $name => $count) {
	196	+ if (isset($this->subTplInfo[$name])) {
	197	+ $this->subTplInfo[$name] += $count;
	198	+ } else {
	199	+ $this->subTplInfo[$name] = $count;
	200	+ }
	201	+ }
	202	+ }
203	203	}

		@@ -46,8 +46,7 @@ discard block
		block discarded – undo
46	46	{
47	47	// if there are cached template objects calculate $templateID
48	48	$_templateId =
49		- !empty($this->tplObjects) ? $parent->smarty->_getTemplateId($template, $cache_id, $compile_id, $caching) :
50		- null;
	49	+ !empty($this->tplObjects) ? $parent->smarty->_getTemplateId($template, $cache_id, $compile_id, $caching) : null;
51	50	// already in template cache?
52	51	/* @var Smarty_Internal_Template $tpl */
53	52	if (isset($_templateId) && isset($this->tplObjects[$_templateId])) {
		@@ -83,8 +82,7 @@ discard block
		block discarded – undo
83	82	list($filepath, $timestamp, $resource) = $tpl->compiled->file_dependency[$uid];
84	83	$tpl->source =
85	84	new Smarty_Template_Source(isset($tpl->smarty->_cache['resource_handlers'][$resource]) ?
86		- $tpl->smarty->_cache['resource_handlers'][$resource] :
87		- Smarty_Resource::load($tpl->smarty, $resource), $tpl->smarty,
	85	+ $tpl->smarty->_cache['resource_handlers'][$resource] : Smarty_Resource::load($tpl->smarty, $resource), $tpl->smarty,
88	86	$filepath, $resource, $filepath);
89	87	$tpl->source->filepath = $filepath;
90	88	$tpl->source->timestamp = $timestamp;

		@@ -16,80 +16,80 @@
		block discarded – undo
16	16	*/
17	17	abstract class Smarty_Resource_Custom extends Smarty_Resource
18	18	{
19		- /**
20		- * fetch template and its modification time from data source
21		- *
22		- * @param string $name template name
23		- * @param string &$source template source
24		- * @param integer &$mtime template modification timestamp (epoch)
25		- */
26		- abstract protected function fetch($name, &$source, &$mtime);
	19	+ /**
	20	+ * fetch template and its modification time from data source
	21	+ *
	22	+ * @param string $name template name
	23	+ * @param string &$source template source
	24	+ * @param integer &$mtime template modification timestamp (epoch)
	25	+ */
	26	+ abstract protected function fetch($name, &$source, &$mtime);
27	27
28		- /**
29		- * Fetch template's modification timestamp from data source
30		- * {@internal implementing this method is optional.
31		- * Only implement it if modification times can be accessed faster than loading the complete template source.}}
32		- *
33		- * @param string $name template name
34		- *
35		- * @return integer\|boolean timestamp (epoch) the template was modified, or false if not found
36		- */
37		- protected function fetchTimestamp($name)
38		- {
39		- return null;
40		- }
	28	+ /**
	29	+ * Fetch template's modification timestamp from data source
	30	+ * {@internal implementing this method is optional.
	31	+ * Only implement it if modification times can be accessed faster than loading the complete template source.}}
	32	+ *
	33	+ * @param string $name template name
	34	+ *
	35	+ * @return integer\|boolean timestamp (epoch) the template was modified, or false if not found
	36	+ */
	37	+ protected function fetchTimestamp($name)
	38	+ {
	39	+ return null;
	40	+ }
41	41
42		- /**
43		- * populate Source Object with meta data from Resource
44		- *
45		- * @param Smarty_Template_Source $source source object
46		- * @param Smarty_Internal_Template $_template template object
47		- */
48		- public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
49		- {
50		- $source->filepath = $source->type . ':' . $source->name;
51		- $source->uid = sha1($source->type . ':' . $source->name);
	42	+ /**
	43	+ * populate Source Object with meta data from Resource
	44	+ *
	45	+ * @param Smarty_Template_Source $source source object
	46	+ * @param Smarty_Internal_Template $_template template object
	47	+ */
	48	+ public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
	49	+ {
	50	+ $source->filepath = $source->type . ':' . $source->name;
	51	+ $source->uid = sha1($source->type . ':' . $source->name);
52	52
53		- $mtime = $this->fetchTimestamp($source->name);
54		- if ($mtime !== null) {
55		- $source->timestamp = $mtime;
56		- } else {
57		- $this->fetch($source->name, $content, $timestamp);
58		- $source->timestamp = isset($timestamp) ? $timestamp : false;
59		- if (isset($content)) {
60		- $source->content = $content;
61		- }
62		- }
63		- $source->exists = !!$source->timestamp;
64		- }
	53	+ $mtime = $this->fetchTimestamp($source->name);
	54	+ if ($mtime !== null) {
	55	+ $source->timestamp = $mtime;
	56	+ } else {
	57	+ $this->fetch($source->name, $content, $timestamp);
	58	+ $source->timestamp = isset($timestamp) ? $timestamp : false;
	59	+ if (isset($content)) {
	60	+ $source->content = $content;
	61	+ }
	62	+ }
	63	+ $source->exists = !!$source->timestamp;
	64	+ }
65	65
66		- /**
67		- * Load template's source into current template object
68		- *
69		- * @param Smarty_Template_Source $source source object
70		- *
71		- * @return string template source
72		- * @throws SmartyException if source cannot be loaded
73		- */
74		- public function getContent(Smarty_Template_Source $source)
75		- {
76		- $this->fetch($source->name, $content, $timestamp);
77		- if (isset($content)) {
78		- return $content;
79		- }
	66	+ /**
	67	+ * Load template's source into current template object
	68	+ *
	69	+ * @param Smarty_Template_Source $source source object
	70	+ *
	71	+ * @return string template source
	72	+ * @throws SmartyException if source cannot be loaded
	73	+ */
	74	+ public function getContent(Smarty_Template_Source $source)
	75	+ {
	76	+ $this->fetch($source->name, $content, $timestamp);
	77	+ if (isset($content)) {
	78	+ return $content;
	79	+ }
80	80
81		- throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
82		- }
	81	+ throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
	82	+ }
83	83
84		- /**
85		- * Determine basename for compiled filename
86		- *
87		- * @param Smarty_Template_Source $source source object
88		- *
89		- * @return string resource's basename
90		- */
91		- public function getBasename(Smarty_Template_Source $source)
92		- {
93		- return basename($source->name);
94		- }
	84	+ /**
	85	+ * Determine basename for compiled filename
	86	+ *
	87	+ * @param Smarty_Template_Source $source source object
	88	+ *
	89	+ * @return string resource's basename
	90	+ */
	91	+ public function getBasename(Smarty_Template_Source $source)
	92	+ {
	93	+ return basename($source->name);
	94	+ }
95	95	}

		@@ -11,31 +11,31 @@
		block discarded – undo
11	11	*/
12	12	class Smarty_Internal_Method_ClearConfig
13	13	{
14		- /**
15		- * Valid for all objects
16		- *
17		- * @var int
18		- */
19		- public $objMap = 7;
	14	+ /**
	15	+ * Valid for all objects
	16	+ *
	17	+ * @var int
	18	+ */
	19	+ public $objMap = 7;
20	20
21		- /**
22		- * clear a single or all config variables
23		- *
24		- * @api Smarty::clearConfig()
25		- * @link http://www.smarty.net/docs/en/api.clear.config.tpl
26		- *
27		- * @param \Smarty_Internal_Data\|\Smarty_Internal_Template\|\Smarty $data
28		- * @param string\|null $name variable name or null
29		- *
30		- * @return \Smarty_Internal_Data\|\Smarty_Internal_Template\|\Smarty
31		- */
32		- public function clearConfig(Smarty_Internal_Data $data, $name = null)
33		- {
34		- if (isset($name)) {
35		- unset($data->config_vars[ $name ]);
36		- } else {
37		- $data->config_vars = array();
38		- }
39		- return $data;
40		- }
	21	+ /**
	22	+ * clear a single or all config variables
	23	+ *
	24	+ * @api Smarty::clearConfig()
	25	+ * @link http://www.smarty.net/docs/en/api.clear.config.tpl
	26	+ *
	27	+ * @param \Smarty_Internal_Data\|\Smarty_Internal_Template\|\Smarty $data
	28	+ * @param string\|null $name variable name or null
	29	+ *
	30	+ * @return \Smarty_Internal_Data\|\Smarty_Internal_Template\|\Smarty
	31	+ */
	32	+ public function clearConfig(Smarty_Internal_Data $data, $name = null)
	33	+ {
	34	+ if (isset($name)) {
	35	+ unset($data->config_vars[ $name ]);
	36	+ } else {
	37	+ $data->config_vars = array();
	38	+ }
	39	+ return $data;
	40	+ }
41	41	}
42	42	\ No newline at end of file

		@@ -32,7 +32,7 @@
		block discarded – undo
32	32	public function clearConfig(Smarty_Internal_Data $data, $name = null)
33	33	{
34	34	if (isset($name)) {
35		- unset($data->config_vars[ $name ]);
	35	+ unset($data->config_vars[$name]);
36	36	} else {
37	37	$data->config_vars = array();
38	38	}

		@@ -16,31 +16,31 @@
		block discarded – undo
16	16	*/
17	17	class Smarty_Internal_Compile_Shared_Inheritance extends Smarty_Internal_CompileBase
18	18	{
19		- /**
20		- * Register post compile callback to compile inheritance initialization code
21		- *
22		- * @param \Smarty_Internal_TemplateCompilerBase $compiler
23		- * @param bool\|false $initChildSequence if true force child template
24		- */
25		- public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
26		- {
27		- if ($initChildSequence \|\| !isset($compiler->_cache[ 'inheritanceInit' ])) {
28		- $compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
29		- array($initChildSequence), 'inheritanceInit', $initChildSequence);
	19	+ /**
	20	+ * Register post compile callback to compile inheritance initialization code
	21	+ *
	22	+ * @param \Smarty_Internal_TemplateCompilerBase $compiler
	23	+ * @param bool\|false $initChildSequence if true force child template
	24	+ */
	25	+ public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
	26	+ {
	27	+ if ($initChildSequence \|\| !isset($compiler->_cache[ 'inheritanceInit' ])) {
	28	+ $compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
	29	+ array($initChildSequence), 'inheritanceInit', $initChildSequence);
30	30
31		- $compiler->_cache[ 'inheritanceInit' ] = true;
32		- }
33		- }
	31	+ $compiler->_cache[ 'inheritanceInit' ] = true;
	32	+ }
	33	+ }
34	34
35		- /**
36		- * Compile inheritance initialization code as prefix
37		- *
38		- * @param \Smarty_Internal_TemplateCompilerBase $compiler
39		- * @param bool\|false $initChildSequence if true force child template
40		- */
41		- static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
42		- {
43		- $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->_loadInheritance();\n\$_smarty_tpl->inheritance->init(\$_smarty_tpl, " .
44		- var_export($initChildSequence, true) . ");\n?>\n";
45		- }
	35	+ /**
	36	+ * Compile inheritance initialization code as prefix
	37	+ *
	38	+ * @param \Smarty_Internal_TemplateCompilerBase $compiler
	39	+ * @param bool\|false $initChildSequence if true force child template
	40	+ */
	41	+ static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
	42	+ {
	43	+ $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->_loadInheritance();\n\$_smarty_tpl->inheritance->init(\$_smarty_tpl, " .
	44	+ var_export($initChildSequence, true) . ");\n?>\n";
	45	+ }
46	46	}
47	47	\ No newline at end of file

		@@ -24,11 +24,11 @@
		block discarded – undo
24	24	*/
25	25	public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
26	26	{
27		- if ($initChildSequence \|\| !isset($compiler->_cache[ 'inheritanceInit' ])) {
	27	+ if ($initChildSequence \|\| !isset($compiler->_cache['inheritanceInit'])) {
28	28	$compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
29	29	array($initChildSequence), 'inheritanceInit', $initChildSequence);
30	30
31		- $compiler->_cache[ 'inheritanceInit' ] = true;
	31	+ $compiler->_cache['inheritanceInit'] = true;
32	32	}
33	33	}
34	34

		@@ -18,90 +18,90 @@
		block discarded – undo
18	18	*/
19	19	class Smarty_Internal_Resource_String extends Smarty_Resource
20	20	{
21		- /**
22		- * populate Source Object with meta data from Resource
23		- *
24		- * @param Smarty_Template_Source $source source object
25		- * @param Smarty_Internal_Template $_template template object
26		- *
27		- * @return void
28		- */
29		- public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
30		- {
31		- $source->uid = $source->filepath = sha1($source->name . $source->smarty->_joined_template_dir);
32		- $source->timestamp = $source->exists = true;
33		- }
	21	+ /**
	22	+ * populate Source Object with meta data from Resource
	23	+ *
	24	+ * @param Smarty_Template_Source $source source object
	25	+ * @param Smarty_Internal_Template $_template template object
	26	+ *
	27	+ * @return void
	28	+ */
	29	+ public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
	30	+ {
	31	+ $source->uid = $source->filepath = sha1($source->name . $source->smarty->_joined_template_dir);
	32	+ $source->timestamp = $source->exists = true;
	33	+ }
34	34
35		- /**
36		- * Load template's source from $resource_name into current template object
37		- *
38		- * @uses decode() to decode base64 and urlencoded template_resources
39		- *
40		- * @param Smarty_Template_Source $source source object
41		- *
42		- * @return string template source
43		- */
44		- public function getContent(Smarty_Template_Source $source)
45		- {
46		- return $this->decode($source->name);
47		- }
	35	+ /**
	36	+ * Load template's source from $resource_name into current template object
	37	+ *
	38	+ * @uses decode() to decode base64 and urlencoded template_resources
	39	+ *
	40	+ * @param Smarty_Template_Source $source source object
	41	+ *
	42	+ * @return string template source
	43	+ */
	44	+ public function getContent(Smarty_Template_Source $source)
	45	+ {
	46	+ return $this->decode($source->name);
	47	+ }
48	48
49		- /**
50		- * decode base64 and urlencode
51		- *
52		- * @param string $string template_resource to decode
53		- *
54		- * @return string decoded template_resource
55		- */
56		- protected function decode($string)
57		- {
58		- // decode if specified
59		- if (($pos = strpos($string, ':')) !== false) {
60		- if (!strncmp($string, 'base64', 6)) {
61		- return base64_decode(substr($string, 7));
62		- } elseif (!strncmp($string, 'urlencode', 9)) {
63		- return urldecode(substr($string, 10));
64		- }
65		- }
	49	+ /**
	50	+ * decode base64 and urlencode
	51	+ *
	52	+ * @param string $string template_resource to decode
	53	+ *
	54	+ * @return string decoded template_resource
	55	+ */
	56	+ protected function decode($string)
	57	+ {
	58	+ // decode if specified
	59	+ if (($pos = strpos($string, ':')) !== false) {
	60	+ if (!strncmp($string, 'base64', 6)) {
	61	+ return base64_decode(substr($string, 7));
	62	+ } elseif (!strncmp($string, 'urlencode', 9)) {
	63	+ return urldecode(substr($string, 10));
	64	+ }
	65	+ }
66	66
67		- return $string;
68		- }
	67	+ return $string;
	68	+ }
69	69
70		- /**
71		- * modify resource_name according to resource handlers specifications
72		- *
73		- * @param Smarty $smarty Smarty instance
74		- * @param string $resource_name resource_name to make unique
75		- * @param boolean $isConfig flag for config resource
76		- *
77		- * @return string unique resource name
78		- */
79		- public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
80		- {
81		- return get_class($this) . '#' . $this->decode($resource_name);
82		- }
	70	+ /**
	71	+ * modify resource_name according to resource handlers specifications
	72	+ *
	73	+ * @param Smarty $smarty Smarty instance
	74	+ * @param string $resource_name resource_name to make unique
	75	+ * @param boolean $isConfig flag for config resource
	76	+ *
	77	+ * @return string unique resource name
	78	+ */
	79	+ public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
	80	+ {
	81	+ return get_class($this) . '#' . $this->decode($resource_name);
	82	+ }
83	83
84		- /**
85		- * Determine basename for compiled filename
86		- * Always returns an empty string.
87		- *
88		- * @param Smarty_Template_Source $source source object
89		- *
90		- * @return string resource's basename
91		- */
92		- public function getBasename(Smarty_Template_Source $source)
93		- {
94		- return '';
95		- }
	84	+ /**
	85	+ * Determine basename for compiled filename
	86	+ * Always returns an empty string.
	87	+ *
	88	+ * @param Smarty_Template_Source $source source object
	89	+ *
	90	+ * @return string resource's basename
	91	+ */
	92	+ public function getBasename(Smarty_Template_Source $source)
	93	+ {
	94	+ return '';
	95	+ }
96	96
97		- /*
	97	+ /*
98	98	* Disable timestamp checks for string resource.
99	99	*
100	100	* @return bool
101	101	*/
102		- public function checkTimestamps()
103		- {
104		- return false;
105		- }
	102	+ public function checkTimestamps()
	103	+ {
	104	+ return false;
	105	+ }
106	106	}
107	107

		@@ -16,25 +16,25 @@
		block discarded – undo
16	16	*/
17	17	class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase
18	18	{
19		- /**
20		- * Compiles code for the {rdelim} tag
21		- * This tag does output the right delimiter.
22		- *
23		- * @param array $args array with attributes from parser
24		- * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
25		- *
26		- * @return string compiled code
27		- * @throws \SmartyCompilerException
28		- */
29		- public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
30		- {
31		- $_attr = $this->getAttributes($compiler, $args);
32		- if ($_attr[ 'nocache' ] === true) {
33		- $compiler->trigger_template_error('nocache option not allowed', null, true);
34		- }
35		- // this tag does not return compiled code
36		- $compiler->has_code = true;
	19	+ /**
	20	+ * Compiles code for the {rdelim} tag
	21	+ * This tag does output the right delimiter.
	22	+ *
	23	+ * @param array $args array with attributes from parser
	24	+ * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
	25	+ *
	26	+ * @return string compiled code
	27	+ * @throws \SmartyCompilerException
	28	+ */
	29	+ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
	30	+ {
	31	+ $_attr = $this->getAttributes($compiler, $args);
	32	+ if ($_attr[ 'nocache' ] === true) {
	33	+ $compiler->trigger_template_error('nocache option not allowed', null, true);
	34	+ }
	35	+ // this tag does not return compiled code
	36	+ $compiler->has_code = true;
37	37
38		- return $compiler->smarty->right_delimiter;
39		- }
	38	+ return $compiler->smarty->right_delimiter;
	39	+ }
40	40	}

		@@ -29,7 +29,7 @@
		block discarded – undo
29	29	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
30	30	{
31	31	$_attr = $this->getAttributes($compiler, $args);
32		- if ($_attr[ 'nocache' ] === true) {
	32	+ if ($_attr['nocache'] === true) {
33	33	$compiler->trigger_template_error('nocache option not allowed', null, true);
34	34	}
35	35	// this tag does not return compiled code

		@@ -15,182 +15,182 @@
		block discarded – undo
15	15	*/
16	16	abstract class Smarty_Internal_CompileBase
17	17	{
18		- /**
19		- * Array of names of required attribute required by tag
20		- *
21		- * @var array
22		- */
23		- public $required_attributes = array();
	18	+ /**
	19	+ * Array of names of required attribute required by tag
	20	+ *
	21	+ * @var array
	22	+ */
	23	+ public $required_attributes = array();
24	24
25		- /**
26		- * Array of names of optional attribute required by tag
27		- * use array('_any') if there is no restriction of attributes names
28		- *
29		- * @var array
30		- */
31		- public $optional_attributes = array();
	25	+ /**
	26	+ * Array of names of optional attribute required by tag
	27	+ * use array('_any') if there is no restriction of attributes names
	28	+ *
	29	+ * @var array
	30	+ */
	31	+ public $optional_attributes = array();
32	32
33		- /**
34		- * Shorttag attribute order defined by its names
35		- *
36		- * @var array
37		- */
38		- public $shorttag_order = array();
	33	+ /**
	34	+ * Shorttag attribute order defined by its names
	35	+ *
	36	+ * @var array
	37	+ */
	38	+ public $shorttag_order = array();
39	39
40		- /**
41		- * Array of names of valid option flags
42		- *
43		- * @var array
44		- */
45		- public $option_flags = array('nocache');
	40	+ /**
	41	+ * Array of names of valid option flags
	42	+ *
	43	+ * @var array
	44	+ */
	45	+ public $option_flags = array('nocache');
46	46
47		- /**
48		- * Mapping array for boolqn option value
49		- *
50		- * @var array
51		- */
52		- public $optionMap = array(1 => true, 0 => false, 'true' => true, 'false' => false);
	47	+ /**
	48	+ * Mapping array for boolqn option value
	49	+ *
	50	+ * @var array
	51	+ */
	52	+ public $optionMap = array(1 => true, 0 => false, 'true' => true, 'false' => false);
53	53
54		- /**
55		- * Mapping array with attributes as key
56		- *
57		- * @var array
58		- */
59		- public $mapCache = array();
	54	+ /**
	55	+ * Mapping array with attributes as key
	56	+ *
	57	+ * @var array
	58	+ */
	59	+ public $mapCache = array();
60	60
61		- /**
62		- * This function checks if the attributes passed are valid
63		- * The attributes passed for the tag to compile are checked against the list of required and
64		- * optional attributes. Required attributes must be present. Optional attributes are check against
65		- * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
66		- * as valid
67		- *
68		- * @param object $compiler compiler object
69		- * @param array $attributes attributes applied to the tag
70		- *
71		- * @return array of mapped attributes for further processing
72		- */
73		- public function getAttributes($compiler, $attributes)
74		- {
75		- $_indexed_attr = array();
76		- if (!isset($this->mapCache[ 'option' ])) {
77		- $this->mapCache[ 'option' ] = array_fill_keys($this->option_flags, true);
78		- }
79		- foreach ($attributes as $key => $mixed) {
80		- // shorthand ?
81		- if (!is_array($mixed)) {
82		- // option flag ?
83		- if (isset($this->mapCache[ 'option' ][ trim($mixed, '\'"') ])) {
84		- $_indexed_attr[ trim($mixed, '\'"') ] = true;
85		- // shorthand attribute ?
86		- } elseif (isset($this->shorttag_order[ $key ])) {
87		- $_indexed_attr[ $this->shorttag_order[ $key ] ] = $mixed;
88		- } else {
89		- // too many shorthands
90		- $compiler->trigger_template_error('too many shorthand attributes', null, true);
91		- }
92		- // named attribute
93		- } else {
94		- foreach ($mixed as $k => $v) {
95		- // option flag?
96		- if (isset($this->mapCache[ 'option' ][ $k ])) {
97		- if (is_bool($v)) {
98		- $_indexed_attr[ $k ] = $v;
99		- } else {
100		- if (is_string($v)) {
101		- $v = trim($v, '\'" ');
102		- }
103		- if (isset($this->optionMap[ $v ])) {
104		- $_indexed_attr[ $k ] = $this->optionMap[ $v ];
105		- } else {
106		- $compiler->trigger_template_error("illegal value '" . var_export($v, true) .
107		- "' for option flag '{$k}'", null, true);
108		- }
109		- }
110		- // must be named attribute
111		- } else {
112		- $_indexed_attr[ $k ] = $v;
113		- }
114		- }
115		- }
116		- }
117		- // check if all required attributes present
118		- foreach ($this->required_attributes as $attr) {
119		- if (!isset($_indexed_attr[ $attr ])) {
120		- $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", null, true);
121		- }
122		- }
123		- // check for not allowed attributes
124		- if ($this->optional_attributes != array('_any')) {
125		- if (!isset($this->mapCache[ 'all' ])) {
126		- $this->mapCache[ 'all' ] =
127		- array_fill_keys(array_merge($this->required_attributes, $this->optional_attributes,
128		- $this->option_flags), true);
129		- }
130		- foreach ($_indexed_attr as $key => $dummy) {
131		- if (!isset($this->mapCache[ 'all' ][ $key ]) && $key !== 0) {
132		- $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", null, true);
133		- }
134		- }
135		- }
136		- // default 'false' for all option flags not set
137		- foreach ($this->option_flags as $flag) {
138		- if (!isset($_indexed_attr[ $flag ])) {
139		- $_indexed_attr[ $flag ] = false;
140		- }
141		- }
142		- if (isset($_indexed_attr[ 'nocache' ]) && $_indexed_attr[ 'nocache' ]) {
143		- $compiler->tag_nocache = true;
144		- }
145		- return $_indexed_attr;
146		- }
	61	+ /**
	62	+ * This function checks if the attributes passed are valid
	63	+ * The attributes passed for the tag to compile are checked against the list of required and
	64	+ * optional attributes. Required attributes must be present. Optional attributes are check against
	65	+ * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
	66	+ * as valid
	67	+ *
	68	+ * @param object $compiler compiler object
	69	+ * @param array $attributes attributes applied to the tag
	70	+ *
	71	+ * @return array of mapped attributes for further processing
	72	+ */
	73	+ public function getAttributes($compiler, $attributes)
	74	+ {
	75	+ $_indexed_attr = array();
	76	+ if (!isset($this->mapCache[ 'option' ])) {
	77	+ $this->mapCache[ 'option' ] = array_fill_keys($this->option_flags, true);
	78	+ }
	79	+ foreach ($attributes as $key => $mixed) {
	80	+ // shorthand ?
	81	+ if (!is_array($mixed)) {
	82	+ // option flag ?
	83	+ if (isset($this->mapCache[ 'option' ][ trim($mixed, '\'"') ])) {
	84	+ $_indexed_attr[ trim($mixed, '\'"') ] = true;
	85	+ // shorthand attribute ?
	86	+ } elseif (isset($this->shorttag_order[ $key ])) {
	87	+ $_indexed_attr[ $this->shorttag_order[ $key ] ] = $mixed;
	88	+ } else {
	89	+ // too many shorthands
	90	+ $compiler->trigger_template_error('too many shorthand attributes', null, true);
	91	+ }
	92	+ // named attribute
	93	+ } else {
	94	+ foreach ($mixed as $k => $v) {
	95	+ // option flag?
	96	+ if (isset($this->mapCache[ 'option' ][ $k ])) {
	97	+ if (is_bool($v)) {
	98	+ $_indexed_attr[ $k ] = $v;
	99	+ } else {
	100	+ if (is_string($v)) {
	101	+ $v = trim($v, '\'" ');
	102	+ }
	103	+ if (isset($this->optionMap[ $v ])) {
	104	+ $_indexed_attr[ $k ] = $this->optionMap[ $v ];
	105	+ } else {
	106	+ $compiler->trigger_template_error("illegal value '" . var_export($v, true) .
	107	+ "' for option flag '{$k}'", null, true);
	108	+ }
	109	+ }
	110	+ // must be named attribute
	111	+ } else {
	112	+ $_indexed_attr[ $k ] = $v;
	113	+ }
	114	+ }
	115	+ }
	116	+ }
	117	+ // check if all required attributes present
	118	+ foreach ($this->required_attributes as $attr) {
	119	+ if (!isset($_indexed_attr[ $attr ])) {
	120	+ $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", null, true);
	121	+ }
	122	+ }
	123	+ // check for not allowed attributes
	124	+ if ($this->optional_attributes != array('_any')) {
	125	+ if (!isset($this->mapCache[ 'all' ])) {
	126	+ $this->mapCache[ 'all' ] =
	127	+ array_fill_keys(array_merge($this->required_attributes, $this->optional_attributes,
	128	+ $this->option_flags), true);
	129	+ }
	130	+ foreach ($_indexed_attr as $key => $dummy) {
	131	+ if (!isset($this->mapCache[ 'all' ][ $key ]) && $key !== 0) {
	132	+ $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", null, true);
	133	+ }
	134	+ }
	135	+ }
	136	+ // default 'false' for all option flags not set
	137	+ foreach ($this->option_flags as $flag) {
	138	+ if (!isset($_indexed_attr[ $flag ])) {
	139	+ $_indexed_attr[ $flag ] = false;
	140	+ }
	141	+ }
	142	+ if (isset($_indexed_attr[ 'nocache' ]) && $_indexed_attr[ 'nocache' ]) {
	143	+ $compiler->tag_nocache = true;
	144	+ }
	145	+ return $_indexed_attr;
	146	+ }
147	147
148		- /**
149		- * Push opening tag name on stack
150		- * Optionally additional data can be saved on stack
151		- *
152		- * @param object $compiler compiler object
153		- * @param string $openTag the opening tag's name
154		- * @param mixed $data optional data saved
155		- */
156		- public function openTag($compiler, $openTag, $data = null)
157		- {
158		- array_push($compiler->_tag_stack, array($openTag, $data));
159		- }
	148	+ /**
	149	+ * Push opening tag name on stack
	150	+ * Optionally additional data can be saved on stack
	151	+ *
	152	+ * @param object $compiler compiler object
	153	+ * @param string $openTag the opening tag's name
	154	+ * @param mixed $data optional data saved
	155	+ */
	156	+ public function openTag($compiler, $openTag, $data = null)
	157	+ {
	158	+ array_push($compiler->_tag_stack, array($openTag, $data));
	159	+ }
160	160
161		- /**
162		- * Pop closing tag
163		- * Raise an error if this stack-top doesn't match with expected opening tags
164		- *
165		- * @param object $compiler compiler object
166		- * @param array\|string $expectedTag the expected opening tag names
167		- *
168		- * @return mixed any type the opening tag's name or saved data
169		- */
170		- public function closeTag($compiler, $expectedTag)
171		- {
172		- if (count($compiler->_tag_stack) > 0) {
173		- // get stacked info
174		- list($_openTag, $_data) = array_pop($compiler->_tag_stack);
175		- // open tag must match with the expected ones
176		- if (in_array($_openTag, (array) $expectedTag)) {
177		- if (is_null($_data)) {
178		- // return opening tag
179		- return $_openTag;
180		- } else {
181		- // return restored data
182		- return $_data;
183		- }
184		- }
185		- // wrong nesting of tags
186		- $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag .
187		- "{$compiler->smarty->right_delimiter} tag");
	161	+ /**
	162	+ * Pop closing tag
	163	+ * Raise an error if this stack-top doesn't match with expected opening tags
	164	+ *
	165	+ * @param object $compiler compiler object
	166	+ * @param array\|string $expectedTag the expected opening tag names
	167	+ *
	168	+ * @return mixed any type the opening tag's name or saved data
	169	+ */
	170	+ public function closeTag($compiler, $expectedTag)
	171	+ {
	172	+ if (count($compiler->_tag_stack) > 0) {
	173	+ // get stacked info
	174	+ list($_openTag, $_data) = array_pop($compiler->_tag_stack);
	175	+ // open tag must match with the expected ones
	176	+ if (in_array($_openTag, (array) $expectedTag)) {
	177	+ if (is_null($_data)) {
	178	+ // return opening tag
	179	+ return $_openTag;
	180	+ } else {
	181	+ // return restored data
	182	+ return $_data;
	183	+ }
	184	+ }
	185	+ // wrong nesting of tags
	186	+ $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag .
	187	+ "{$compiler->smarty->right_delimiter} tag");
188	188
189		- return;
190		- }
191		- // wrong nesting of tags
192		- $compiler->trigger_template_error("unexpected closing tag", null, true);
	189	+ return;
	190	+ }
	191	+ // wrong nesting of tags
	192	+ $compiler->trigger_template_error("unexpected closing tag", null, true);
193	193
194		- return;
195		- }
	194	+ return;
	195	+ }
196	196	}

		@@ -11,30 +11,30 @@
		block discarded – undo
11	11	*/
12	12	class Smarty_Internal_Method_UnregisterObject
13	13	{
14		- /**
15		- * Valid for Smarty and template object
16		- *
17		- * @var int
18		- */
19		- public $objMap = 3;
	14	+ /**
	15	+ * Valid for Smarty and template object
	16	+ *
	17	+ * @var int
	18	+ */
	19	+ public $objMap = 3;
20	20
21		- /**
22		- * Registers plugin to be used in templates
23		- *
24		- * @api Smarty::unregisterObject()
25		- * @link http://www.smarty.net/docs/en/api.unregister.object.tpl
26		- *
27		- * @param \Smarty_Internal_TemplateBase\|\Smarty_Internal_Template\|\Smarty $obj
28		- * @param string $object_name name of object
29		- *
30		- * @return \Smarty\|\Smarty_Internal_Template
31		- */
32		- public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
33		- {
34		- $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
35		- if (isset($smarty->registered_objects[ $object_name ])) {
36		- unset($smarty->registered_objects[ $object_name ]);
37		- }
38		- return $obj;
39		- }
	21	+ /**
	22	+ * Registers plugin to be used in templates
	23	+ *
	24	+ * @api Smarty::unregisterObject()
	25	+ * @link http://www.smarty.net/docs/en/api.unregister.object.tpl
	26	+ *
	27	+ * @param \Smarty_Internal_TemplateBase\|\Smarty_Internal_Template\|\Smarty $obj
	28	+ * @param string $object_name name of object
	29	+ *
	30	+ * @return \Smarty\|\Smarty_Internal_Template
	31	+ */
	32	+ public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
	33	+ {
	34	+ $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
	35	+ if (isset($smarty->registered_objects[ $object_name ])) {
	36	+ unset($smarty->registered_objects[ $object_name ]);
	37	+ }
	38	+ return $obj;
	39	+ }
40	40	}
41	41	\ No newline at end of file

		@@ -32,8 +32,8 @@
		block discarded – undo
32	32	public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
33	33	{
34	34	$smarty = isset($obj->smarty) ? $obj->smarty : $obj;
35		- if (isset($smarty->registered_objects[ $object_name ])) {
36		- unset($smarty->registered_objects[ $object_name ]);
	35	+ if (isset($smarty->registered_objects[$object_name])) {
	36	+ unset($smarty->registered_objects[$object_name]);
37	37	}
38	38	return $obj;
39	39	}

YetiForceCompany / YetiForceCRM

Push — developer ( 67fdb5...f9e515 )

Status

Category

Indentation +302 added lines, -302 removed lines patch added patch discarded remove patch

Spacing +30 added lines, -30 removed lines patch added patch discarded remove patch

Indentation +184 added lines, -184 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +70 added lines, -70 removed lines patch added patch discarded remove patch

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +25 added lines, -25 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +75 added lines, -75 removed lines patch added patch discarded remove patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +168 added lines, -168 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Indentation +25 added lines, -25 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch