YetiForceCompany / YetiForceCRM

libraries/Smarty/libs/sysplugins/smarty_internal_block.php

Indentation +69 added lines, -69 removed lines

@@ -9,82 +9,82 @@
  */
 class Smarty_Internal_Block
 {
-    /**
-     * Block name
-     *
-     * @var string
-     */
-    public $name = '';
+	/**
+	 * Block name
+	 *
+	 * @var string
+	 */
+	public $name = '';
 
-    /**
-     * Hide attribute
-     *
-     * @var bool
-     */
-    public $hide = false;
+	/**
+	 * Hide attribute
+	 *
+	 * @var bool
+	 */
+	public $hide = false;
 
-    /**
-     * Append attribute
-     *
-     * @var bool
-     */
-    public $append = false;
+	/**
+	 * Append attribute
+	 *
+	 * @var bool
+	 */
+	public $append = false;
 
-    /**
-     * prepend attribute
-     *
-     * @var bool
-     */
-    public $prepend = false;
+	/**
+	 * prepend attribute
+	 *
+	 * @var bool
+	 */
+	public $prepend = false;
 
-    /**
-     * Block calls {$smarty.block.child}
-     *
-     * @var bool
-     */
-    public $callsChild = false;
+	/**
+	 * Block calls {$smarty.block.child}
+	 *
+	 * @var bool
+	 */
+	public $callsChild = false;
 
-    /**
-     * Inheritance child block
-     *
-     * @var Smarty_Internal_Block|null
-     */
-    public $child = null;
+	/**
+	 * Inheritance child block
+	 *
+	 * @var Smarty_Internal_Block|null
+	 */
+	public $child = null;
 
-    /**
-     * Inheritance calling parent block
-     *
-     * @var Smarty_Internal_Block|null
-     */
-    public $parent = null;
+	/**
+	 * Inheritance calling parent block
+	 *
+	 * @var Smarty_Internal_Block|null
+	 */
+	public $parent = null;
 
-    /**
-     * Inheritance Template index
-     *
-     * @var int
-     */
-    public $tplIndex = 0;
+	/**
+	 * Inheritance Template index
+	 *
+	 * @var int
+	 */
+	public $tplIndex = 0;
 
-    /**
-     * Smarty_Internal_Block constructor.
-     * - if outer level {block} of child template ($state == 1) save it as child root block
-     * - otherwise process inheritance and render
-     *
-     * @param string   $name     block name
-     * @param int|null $tplIndex index of outer level {block} if nested
-     */
-    public function __construct($name, $tplIndex)
-    {
-        $this->name = $name;
-        $this->tplIndex = $tplIndex;
-    }
+	/**
+	 * Smarty_Internal_Block constructor.
+	 * - if outer level {block} of child template ($state == 1) save it as child root block
+	 * - otherwise process inheritance and render
+	 *
+	 * @param string   $name     block name
+	 * @param int|null $tplIndex index of outer level {block} if nested
+	 */
+	public function __construct($name, $tplIndex)
+	{
+		$this->name = $name;
+		$this->tplIndex = $tplIndex;
+	}
 
-    /**
-     * Compiled block code overloaded by {block} class
-     *
-     * @param \Smarty_Internal_Template $tpl
-     */
-    public function callBlock(Smarty_Internal_Template $tpl)
-    {
-    }
+	/**
+	 * Compiled block code overloaded by {block} class
+	 *
+	 * @param \Smarty_Internal_Template $tpl
+	 */
+	public function callBlock(Smarty_Internal_Template $tpl)
+	{
+	}
 }
\ No newline at end of file

libraries/Smarty/libs/sysplugins/smarty_internal_compile_for.php

Indentation +125 added lines, -125 removed lines

@@ -16,90 +16,90 @@ 
  */
 class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
 {
-    /**
-     * Compiles code for the {for} tag
-     * Smarty 3 does implement two different syntax's:
-     * - {for $var in $array}
-     * For looping over arrays or iterators
-     * - {for $x=0; $x<$y; $x++}
-     * For general loops
-     * The parser is generating different sets of attribute by which this compiler can
-     * determine which syntax is used.
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        $compiler->loopNesting ++;
-        if ($parameter == 0) {
-            $this->required_attributes = array('start', 'to');
-            $this->optional_attributes = array('max', 'step');
-        } else {
-            $this->required_attributes = array('start', 'ifexp', 'var', 'step');
-            $this->optional_attributes = array();
-        }
-        $this->mapCache = array();
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
+	/**
+	 * Compiles code for the {for} tag
+	 * Smarty 3 does implement two different syntax's:
+	 * - {for $var in $array}
+	 * For looping over arrays or iterators
+	 * - {for $x=0; $x<$y; $x++}
+	 * For general loops
+	 * The parser is generating different sets of attribute by which this compiler can
+	 * determine which syntax is used.
+	 *
+	 * @param  array  $args      array with attributes from parser
+	 * @param  object $compiler  compiler object
+	 * @param  array  $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, $compiler, $parameter)
+	{
+		$compiler->loopNesting ++;
+		if ($parameter == 0) {
+			$this->required_attributes = array('start', 'to');
+			$this->optional_attributes = array('max', 'step');
+		} else {
+			$this->required_attributes = array('start', 'ifexp', 'var', 'step');
+			$this->optional_attributes = array();
+		}
+		$this->mapCache = array();
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
 
-        $output = "<?php\n";
-        if ($parameter == 1) {
-            foreach ($_attr[ 'start' ] as $_statement) {
-                if (is_array($_statement[ 'var' ])) {
-                    $var = $_statement[ 'var' ][ 'var' ];
-                    $index = $_statement[ 'var' ][ 'smarty_internal_index' ];
-                } else {
-                    $var = $_statement[ 'var' ];
-                    $index = '';
-                }
-                $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);\n";
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->value{$index} = {$_statement['value']};\n";
-            }
-            if (is_array($_attr[ 'var' ])) {
-                $var = $_attr[ 'var' ][ 'var' ];
-                $index = $_attr[ 'var' ][ 'smarty_internal_index' ];
-            } else {
-                $var = $_attr[ 'var' ];
-                $index = '';
-            }
-            $output .= "if ($_attr[ifexp]) {\nfor (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
-        } else {
-            $_statement = $_attr[ 'start' ];
-            if (is_array($_statement[ 'var' ])) {
-                $var = $_statement[ 'var' ][ 'var' ];
-                $index = $_statement[ 'var' ][ 'smarty_internal_index' ];
-            } else {
-                $var = $_statement[ 'var' ];
-                $index = '';
-            }
-            $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);";
-            if (isset($_attr[ 'step' ])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
-            }
-            if (isset($_attr[ 'max' ])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
-            }
-            $output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
-            $output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
-            $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration == 1;";
-            $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration == \$_smarty_tpl->tpl_vars[$var]->total;";
-        }
-        $output .= "?>";
+		$output = "<?php\n";
+		if ($parameter == 1) {
+			foreach ($_attr[ 'start' ] as $_statement) {
+				if (is_array($_statement[ 'var' ])) {
+					$var = $_statement[ 'var' ][ 'var' ];
+					$index = $_statement[ 'var' ][ 'smarty_internal_index' ];
+				} else {
+					$var = $_statement[ 'var' ];
+					$index = '';
+				}
+				$output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);\n";
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->value{$index} = {$_statement['value']};\n";
+			}
+			if (is_array($_attr[ 'var' ])) {
+				$var = $_attr[ 'var' ][ 'var' ];
+				$index = $_attr[ 'var' ][ 'smarty_internal_index' ];
+			} else {
+				$var = $_attr[ 'var' ];
+				$index = '';
+			}
+			$output .= "if ($_attr[ifexp]) {\nfor (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
+		} else {
+			$_statement = $_attr[ 'start' ];
+			if (is_array($_statement[ 'var' ])) {
+				$var = $_statement[ 'var' ][ 'var' ];
+				$index = $_statement[ 'var' ][ 'smarty_internal_index' ];
+			} else {
+				$var = $_statement[ 'var' ];
+				$index = '';
+			}
+			$output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);";
+			if (isset($_attr[ 'step' ])) {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
+			} else {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
+			}
+			if (isset($_attr[ 'max' ])) {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
+			} else {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
+			}
+			$output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
+			$output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
+			$output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration == 1;";
+			$output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration == \$_smarty_tpl->tpl_vars[$var]->total;";
+		}
+		$output .= "?>";
 
-        $this->openTag($compiler, 'for', array('for', $compiler->nocache));
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        // return compiled code
-        return $output;
-    }
+		$this->openTag($compiler, 'for', array('for', $compiler->nocache));
+		// maybe nocache because of nocache variables
+		$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+		// return compiled code
+		return $output;
+	}
 }
 
 /**
@@ -110,25 +110,25 @@ 
  */
 class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase
 {
-    /**
-     * Compiles code for the {forelse} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
+	/**
+	 * Compiles code for the {forelse} tag
+	 *
+	 * @param  array  $args      array with attributes from parser
+	 * @param  object $compiler  compiler object
+	 * @param  array  $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, $compiler, $parameter)
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
 
-        list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
-        $this->openTag($compiler, 'forelse', array('forelse', $nocache));
+		list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
+		$this->openTag($compiler, 'forelse', array('forelse', $nocache));
 
-        return "<?php }} else { ?>";
-    }
+		return "<?php }} else { ?>";
+	}
 }
 
 /**
@@ -139,32 +139,32 @@ 
  */
 class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
 {
-    /**
-     * Compiles code for the {/for} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        $compiler->loopNesting --;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
+	/**
+	 * Compiles code for the {/for} tag
+	 *
+	 * @param  array  $args      array with attributes from parser
+	 * @param  object $compiler  compiler object
+	 * @param  array  $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, $compiler, $parameter)
+	{
+		$compiler->loopNesting --;
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		// must endblock be nocache?
+		if ($compiler->nocache) {
+			$compiler->tag_nocache = true;
+		}
 
-        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
+		list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
 
-        $output = "<?php }\n";
-        if ($openTag != 'forelse') {
-            $output .= "}\n";
-        }
-        $output .= "?>\n";
-        return $output;
-    }
+		$output = "<?php }\n";
+		if ($openTag != 'forelse') {
+			$output .= "}\n";
+		}
+		$output .= "?>\n";
+		return $output;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function compile($args, $compiler, $parameter)
     {
-        $compiler->loopNesting ++;
+        $compiler->loopNesting++;
         if ($parameter == 0) {
             $this->required_attributes = array('start', 'to');
             $this->optional_attributes = array('max', 'step');
@@ -48,41 +48,41 @@ 
 
         $output = "<?php\n";
         if ($parameter == 1) {
-            foreach ($_attr[ 'start' ] as $_statement) {
-                if (is_array($_statement[ 'var' ])) {
-                    $var = $_statement[ 'var' ][ 'var' ];
-                    $index = $_statement[ 'var' ][ 'smarty_internal_index' ];
+            foreach ($_attr['start'] as $_statement) {
+                if (is_array($_statement['var'])) {
+                    $var = $_statement['var']['var'];
+                    $index = $_statement['var']['smarty_internal_index'];
                 } else {
-                    $var = $_statement[ 'var' ];
+                    $var = $_statement['var'];
                     $index = '';
                 }
                 $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);\n";
                 $output .= "\$_smarty_tpl->tpl_vars[$var]->value{$index} = {$_statement['value']};\n";
             }
-            if (is_array($_attr[ 'var' ])) {
-                $var = $_attr[ 'var' ][ 'var' ];
-                $index = $_attr[ 'var' ][ 'smarty_internal_index' ];
+            if (is_array($_attr['var'])) {
+                $var = $_attr['var']['var'];
+                $index = $_attr['var']['smarty_internal_index'];
             } else {
-                $var = $_attr[ 'var' ];
+                $var = $_attr['var'];
                 $index = '';
             }
             $output .= "if ($_attr[ifexp]) {\nfor (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
         } else {
-            $_statement = $_attr[ 'start' ];
-            if (is_array($_statement[ 'var' ])) {
-                $var = $_statement[ 'var' ][ 'var' ];
-                $index = $_statement[ 'var' ][ 'smarty_internal_index' ];
+            $_statement = $_attr['start'];
+            if (is_array($_statement['var'])) {
+                $var = $_statement['var']['var'];
+                $index = $_statement['var']['smarty_internal_index'];
             } else {
-                $var = $_statement[ 'var' ];
+                $var = $_statement['var'];
                 $index = '';
             }
             $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);";
-            if (isset($_attr[ 'step' ])) {
+            if (isset($_attr['step'])) {
                 $output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
             } else {
                 $output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
             }
-            if (isset($_attr[ 'max' ])) {
+            if (isset($_attr['max'])) {
                 $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
             } else {
                 $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
@@ -150,7 +150,7 @@ 
      */
     public function compile($args, $compiler, $parameter)
     {
-        $compiler->loopNesting --;
+        $compiler->loopNesting--;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         // must endblock be nocache?

libraries/Smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php

Indentation +195 added lines, -195 removed lines

@@ -11,212 +11,212 @@
 class Smarty_Internal_Runtime_Inheritance
 {
 
-    /**
-     * State machine
-     * - 0 idle next extends will create a new inheritance tree
-     * - 1 processing child template
-     * - 2 wait for next inheritance template
-     * - 3 assume parent template, if child will loaded goto state 1
-     *     a call to a sub template resets the state to 0
-     *
-     * @var int
-     */
-    public $state = 0;
+	/**
+	 * State machine
+	 * - 0 idle next extends will create a new inheritance tree
+	 * - 1 processing child template
+	 * - 2 wait for next inheritance template
+	 * - 3 assume parent template, if child will loaded goto state 1
+	 *     a call to a sub template resets the state to 0
+	 *
+	 * @var int
+	 */
+	public $state = 0;
 
-    /**
-     * Array of root child {block} objects
-     *
-     * @var Smarty_Internal_Block[]
-     */
-    public $childRoot = array();
+	/**
+	 * Array of root child {block} objects
+	 *
+	 * @var Smarty_Internal_Block[]
+	 */
+	public $childRoot = array();
 
-    /**
-     * inheritance template nesting level
-     *
-     * @var int
-     */
-    public $inheritanceLevel = 0;
+	/**
+	 * inheritance template nesting level
+	 *
+	 * @var int
+	 */
+	public $inheritanceLevel = 0;
 
-    /**
-     * inheritance template index
-     *
-     * @var int
-     */
-    public $tplIndex = - 1;
+	/**
+	 * inheritance template index
+	 *
+	 * @var int
+	 */
+	public $tplIndex = - 1;
 
-    /**
-     * Array of template source objects
-     * - key template index
-     *
-     * @var Smarty_Template_Source[]
-     */
-    public $sources = array();
+	/**
+	 * Array of template source objects
+	 * - key template index
+	 *
+	 * @var Smarty_Template_Source[]
+	 */
+	public $sources = array();
 
-    /**
-     * Stack of source objects while executing block code
-     *
-     * @var Smarty_Template_Source[]
-     */
-    public $sourceStack = array();
+	/**
+	 * Stack of source objects while executing block code
+	 *
+	 * @var Smarty_Template_Source[]
+	 */
+	public $sourceStack = array();
 
-    /**
-     * Initialize inheritance
-     *
-     * @param \Smarty_Internal_Template $tpl        template object of caller
-     * @param bool                      $initChild  if true init for child template
-     * @param array                     $blockNames outer level block name
-     *
-     */
-    public function init(Smarty_Internal_Template $tpl, $initChild, $blockNames = array())
-    {
-        // if called while executing parent template it must be a sub-template with new inheritance root
-        if ($initChild && $this->state == 3 && (strpos($tpl->template_resource, 'extendsall') === false)) {
-            $tpl->inheritance = new Smarty_Internal_Runtime_Inheritance();
-            $tpl->inheritance->init($tpl, $initChild, $blockNames);
-            return;
-        }
-        $this->tplIndex ++;
-        $this->sources[ $this->tplIndex ] = $tpl->source;
+	/**
+	 * Initialize inheritance
+	 *
+	 * @param \Smarty_Internal_Template $tpl        template object of caller
+	 * @param bool                      $initChild  if true init for child template
+	 * @param array                     $blockNames outer level block name
+	 *
+	 */
+	public function init(Smarty_Internal_Template $tpl, $initChild, $blockNames = array())
+	{
+		// if called while executing parent template it must be a sub-template with new inheritance root
+		if ($initChild && $this->state == 3 && (strpos($tpl->template_resource, 'extendsall') === false)) {
+			$tpl->inheritance = new Smarty_Internal_Runtime_Inheritance();
+			$tpl->inheritance->init($tpl, $initChild, $blockNames);
+			return;
+		}
+		$this->tplIndex ++;
+		$this->sources[ $this->tplIndex ] = $tpl->source;
 
-        // start of child sub template(s)
-        if ($initChild) {
-            $this->state = 1;
-            if (!$this->inheritanceLevel) {
-                //grab any output of child templates
-                ob_start();
-            }
-            $this->inheritanceLevel ++;
-            //           $tpl->startRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateStart');
-            //           $tpl->endRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateEnd');
-        }
-        // if state was waiting for parent change state to parent
-        if ($this->state == 2) {
-            $this->state = 3;
-        }
-    }
+		// start of child sub template(s)
+		if ($initChild) {
+			$this->state = 1;
+			if (!$this->inheritanceLevel) {
+				//grab any output of child templates
+				ob_start();
+			}
+			$this->inheritanceLevel ++;
+			//           $tpl->startRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateStart');
+			//           $tpl->endRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateEnd');
+		}
+		// if state was waiting for parent change state to parent
+		if ($this->state == 2) {
+			$this->state = 3;
+		}
+	}
 
-    /**
-     * End of child template(s)
-     * - if outer level is reached flush output buffer and switch to wait for parent template state
-     *
-     */
-    public function endChild()
-    {
-        $this->inheritanceLevel --;
-        if (!$this->inheritanceLevel) {
-            ob_end_clean();
-            $this->state = 2;
-        }
-    }
+	/**
+	 * End of child template(s)
+	 * - if outer level is reached flush output buffer and switch to wait for parent template state
+	 *
+	 */
+	public function endChild()
+	{
+		$this->inheritanceLevel --;
+		if (!$this->inheritanceLevel) {
+			ob_end_clean();
+			$this->state = 2;
+		}
+	}
 
-    /**
-     * Smarty_Internal_Block constructor.
-     * - if outer level {block} of child template ($state == 1) save it as child root block
-     * - otherwise process inheritance and render
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param                           $className
-     * @param string                    $name
-     * @param int|null                  $tplIndex index of outer level {block} if nested
-     */
-    public function instanceBlock(Smarty_Internal_Template $tpl, $className, $name, $tplIndex = null)
-    {
-        $block = new $className($name, $tplIndex ? $tplIndex : $this->tplIndex);
-        if (isset($this->childRoot[ $name ])) {
-            $block->child = $this->childRoot[ $name ];
-        }
-        if ($this->state == 1) {
-            $this->childRoot[ $name ] = $block;
-            return;
-        }
-        // make sure we got child block of child template of current block
-        while ($block->child && $block->tplIndex <= $block->child->tplIndex) {
-            $block->child = $block->child->child;
-        }
-        $this->process($tpl, $block);
-    }
+	/**
+	 * Smarty_Internal_Block constructor.
+	 * - if outer level {block} of child template ($state == 1) save it as child root block
+	 * - otherwise process inheritance and render
+	 *
+	 * @param \Smarty_Internal_Template $tpl
+	 * @param                           $className
+	 * @param string                    $name
+	 * @param int|null                  $tplIndex index of outer level {block} if nested
+	 */
+	public function instanceBlock(Smarty_Internal_Template $tpl, $className, $name, $tplIndex = null)
+	{
+		$block = new $className($name, $tplIndex ? $tplIndex : $this->tplIndex);
+		if (isset($this->childRoot[ $name ])) {
+			$block->child = $this->childRoot[ $name ];
+		}
+		if ($this->state == 1) {
+			$this->childRoot[ $name ] = $block;
+			return;
+		}
+		// make sure we got child block of child template of current block
+		while ($block->child && $block->tplIndex <= $block->child->tplIndex) {
+			$block->child = $block->child->child;
+		}
+		$this->process($tpl, $block);
+	}
 
-    /**
-     * Goto child block or render this
-     *
-     * @param \Smarty_Internal_Template   $tpl
-     * @param \Smarty_Internal_Block      $block
-     * @param \Smarty_Internal_Block|null $parent
-     *
-     * @throws \SmartyException
-     */
-    public function process(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block,
-                            Smarty_Internal_Block $parent = null)
-    {
-        if ($block->hide && !isset($block->child)) {
-            return;
-        }
-        if (isset($block->child) && $block->child->hide && !isset($block->child->child)) {
-            $block->child = null;
-        }
-        $block->parent = $parent;
-        if ($block->append && !$block->prepend && isset($parent)) {
-            $this->callParent($tpl, $block);
-        }
-        if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) {
-            $this->callBlock($block, $tpl);
-        } else {
-            $this->process($tpl, $block->child, $block);
-        }
-        if ($block->prepend && isset($parent)) {
-            $this->callParent($tpl, $block);
-            if ($block->append) {
-                if ($block->callsChild || !isset($block->child) ||
-                    ($block->child->hide && !isset($block->child->child))
-                ) {
-                    $this->callBlock($block, $tpl);
-                } else {
-                    $this->process($tpl, $block->child, $block);
-                }
-            }
-        }
-        $block->parent = null;
-    }
+	/**
+	 * Goto child block or render this
+	 *
+	 * @param \Smarty_Internal_Template   $tpl
+	 * @param \Smarty_Internal_Block      $block
+	 * @param \Smarty_Internal_Block|null $parent
+	 *
+	 * @throws \SmartyException
+	 */
+	public function process(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block,
+							Smarty_Internal_Block $parent = null)
+	{
+		if ($block->hide && !isset($block->child)) {
+			return;
+		}
+		if (isset($block->child) && $block->child->hide && !isset($block->child->child)) {
+			$block->child = null;
+		}
+		$block->parent = $parent;
+		if ($block->append && !$block->prepend && isset($parent)) {
+			$this->callParent($tpl, $block);
+		}
+		if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) {
+			$this->callBlock($block, $tpl);
+		} else {
+			$this->process($tpl, $block->child, $block);
+		}
+		if ($block->prepend && isset($parent)) {
+			$this->callParent($tpl, $block);
+			if ($block->append) {
+				if ($block->callsChild || !isset($block->child) ||
+					($block->child->hide && !isset($block->child->child))
+				) {
+					$this->callBlock($block, $tpl);
+				} else {
+					$this->process($tpl, $block->child, $block);
+				}
+			}
+		}
+		$block->parent = null;
+	}
 
-    /**
-     * Render child on {$smarty.block.child}
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param \Smarty_Internal_Block    $block
-     */
-    public function callChild(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block)
-    {
-        if (isset($block->child)) {
-            $this->process($tpl, $block->child, $block);
-        }
-    }
+	/**
+	 * Render child on {$smarty.block.child}
+	 *
+	 * @param \Smarty_Internal_Template $tpl
+	 * @param \Smarty_Internal_Block    $block
+	 */
+	public function callChild(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block)
+	{
+		if (isset($block->child)) {
+			$this->process($tpl, $block->child, $block);
+		}
+	}
 
-    /**
-     * Render parent on {$smarty.block.parent} or {block append/prepend}     *
-     *
-     * @param \Smarty_Internal_Template $tpl
-     * @param \Smarty_Internal_Block    $block
-     *
-     * @throws \SmartyException
-     */
-    public function callParent(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block)
-    {
-        if (isset($block->parent)) {
-            $this->callBlock($block->parent, $tpl);
-        } else {
-            throw new SmartyException("inheritance: illegal {\$smarty.block.parent} or {block append/prepend} used in parent template '{$tpl->inheritance->sources[$block->tplIndex]->filepath}' block '{$block->name}'");
-        }
-    }
+	/**
+	 * Render parent on {$smarty.block.parent} or {block append/prepend}     *
+	 *
+	 * @param \Smarty_Internal_Template $tpl
+	 * @param \Smarty_Internal_Block    $block
+	 *
+	 * @throws \SmartyException
+	 */
+	public function callParent(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block)
+	{
+		if (isset($block->parent)) {
+			$this->callBlock($block->parent, $tpl);
+		} else {
+			throw new SmartyException("inheritance: illegal {\$smarty.block.parent} or {block append/prepend} used in parent template '{$tpl->inheritance->sources[$block->tplIndex]->filepath}' block '{$block->name}'");
+		}
+	}
 
-    /**
-     * @param \Smarty_Internal_Block    $block
-     * @param \Smarty_Internal_Template $tpl
-     */
-    public function callBlock(Smarty_Internal_Block $block, Smarty_Internal_Template $tpl)
-    {
-        $this->sourceStack[] = $tpl->source;
-        $tpl->source = $this->sources[ $block->tplIndex ];
-        $block->callBlock($tpl);
-        $tpl->source = array_pop($this->sourceStack);
-    }
+	/**
+	 * @param \Smarty_Internal_Block    $block
+	 * @param \Smarty_Internal_Template $tpl
+	 */
+	public function callBlock(Smarty_Internal_Block $block, Smarty_Internal_Template $tpl)
+	{
+		$this->sourceStack[] = $tpl->source;
+		$tpl->source = $this->sources[ $block->tplIndex ];
+		$block->callBlock($tpl);
+		$tpl->source = array_pop($this->sourceStack);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -75,8 +75,8 @@ 
             $tpl->inheritance->init($tpl, $initChild, $blockNames);
             return;
         }
-        $this->tplIndex ++;
-        $this->sources[ $this->tplIndex ] = $tpl->source;
+        $this->tplIndex++;
+        $this->sources[$this->tplIndex] = $tpl->source;
 
         // start of child sub template(s)
         if ($initChild) {
@@ -85,7 +85,7 @@ 
                 //grab any output of child templates
                 ob_start();
             }
-            $this->inheritanceLevel ++;
+            $this->inheritanceLevel++;
             //           $tpl->startRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateStart');
             //           $tpl->endRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateEnd');
         }
@@ -102,7 +102,7 @@ 
      */
     public function endChild()
     {
-        $this->inheritanceLevel --;
+        $this->inheritanceLevel--;
         if (!$this->inheritanceLevel) {
             ob_end_clean();
             $this->state = 2;
@@ -122,11 +122,11 @@ 
     public function instanceBlock(Smarty_Internal_Template $tpl, $className, $name, $tplIndex = null)
     {
         $block = new $className($name, $tplIndex ? $tplIndex : $this->tplIndex);
-        if (isset($this->childRoot[ $name ])) {
-            $block->child = $this->childRoot[ $name ];
+        if (isset($this->childRoot[$name])) {
+            $block->child = $this->childRoot[$name];
         }
         if ($this->state == 1) {
-            $this->childRoot[ $name ] = $block;
+            $this->childRoot[$name] = $block;
             return;
         }
         // make sure we got child block of child template of current block
@@ -215,7 +215,7 @@ 
     public function callBlock(Smarty_Internal_Block $block, Smarty_Internal_Template $tpl)
     {
         $this->sourceStack[] = $tpl->source;
-        $tpl->source = $this->sources[ $block->tplIndex ];
+        $tpl->source = $this->sources[$block->tplIndex];
         $block->callBlock($tpl);
         $tpl->source = array_pop($this->sourceStack);
     }

libraries/Smarty/libs/sysplugins/smarty_internal_parsetree_tag.php

Indentation +43 added lines, -43 removed lines

@@ -19,51 +19,51 @@
 class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
 {
 
-    /**
-     * Saved block nesting level
-     *
-     * @var int
-     */
-    public $saved_block_nesting;
+	/**
+	 * Saved block nesting level
+	 *
+	 * @var int
+	 */
+	public $saved_block_nesting;
 
-    /**
-     * Create parse tree buffer for Smarty tag
-     *
-     * @param \Smarty_Internal_Templateparser $parser parser object
-     * @param string                          $data   content
-     */
-    public function __construct(Smarty_Internal_Templateparser $parser, $data)
-    {
-        $this->data = $data;
-        $this->saved_block_nesting = $parser->block_nesting_level;
-    }
+	/**
+	 * Create parse tree buffer for Smarty tag
+	 *
+	 * @param \Smarty_Internal_Templateparser $parser parser object
+	 * @param string                          $data   content
+	 */
+	public function __construct(Smarty_Internal_Templateparser $parser, $data)
+	{
+		$this->data = $data;
+		$this->saved_block_nesting = $parser->block_nesting_level;
+	}
 
-    /**
-     * Return buffer content
-     *
-     * @param \Smarty_Internal_Templateparser $parser
-     *
-     * @return string content
-     */
-    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
-    {
-        return $this->data;
-    }
+	/**
+	 * Return buffer content
+	 *
+	 * @param \Smarty_Internal_Templateparser $parser
+	 *
+	 * @return string content
+	 */
+	public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+	{
+		return $this->data;
+	}
 
-    /**
-     * Return complied code that loads the evaluated output of buffer content into a temporary variable
-     *
-     * @param \Smarty_Internal_Templateparser $parser
-     *
-     * @return string template code
-     */
-    public function assign_to_var(Smarty_Internal_Templateparser $parser)
-    {
-        $var = $parser->compiler->getNewPrefixVariable();
-        $tmp = $parser->compiler->appendCode('<?php ob_start();?>', $this->data);
-        $tmp = $parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
-        $parser->compiler->prefix_code[] = sprintf("%s", $tmp);
+	/**
+	 * Return complied code that loads the evaluated output of buffer content into a temporary variable
+	 *
+	 * @param \Smarty_Internal_Templateparser $parser
+	 *
+	 * @return string template code
+	 */
+	public function assign_to_var(Smarty_Internal_Templateparser $parser)
+	{
+		$var = $parser->compiler->getNewPrefixVariable();
+		$tmp = $parser->compiler->appendCode('<?php ob_start();?>', $this->data);
+		$tmp = $parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
+		$parser->compiler->prefix_code[] = sprintf("%s", $tmp);
 
-        return $var;
-    }
+		return $var;
+	}
 }

libraries/Smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php

Indentation +80 added lines, -80 removed lines

@@ -14,85 +14,85 @@
  */
 class Smarty_Internal_Runtime_CodeFrame
 {
-    /**
-     * Create code frame for compiled and cached templates
-     *
-     * @param Smarty_Internal_Template              $_template
-     * @param string                                $content   optional template content
-     * @param string                                $functions compiled template function and block code
-     * @param bool                                  $cache     flag for cache file
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     *
-     * @return string
-     */
-    public function create(Smarty_Internal_Template $_template, $content = '', $functions = '', $cache = false,
-                           Smarty_Internal_TemplateCompilerBase $compiler = null)
-    {
-        // build property code
-        $properties[ 'version' ] = Smarty::SMARTY_VERSION;
-        $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-        if (!$cache) {
-            $properties[ 'has_nocache_code' ] = $_template->compiled->has_nocache_code;
-            $properties[ 'file_dependency' ] = $_template->compiled->file_dependency;
-            $properties[ 'includes' ] = $_template->compiled->includes;
-         } else {
-            $properties[ 'has_nocache_code' ] = $_template->cached->has_nocache_code;
-            $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
-            $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
-        }
-        $output = "<?php\n";
-        $output .= "/* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
-                   "\n  from \"" . $_template->source->filepath . "\" */\n\n";
-        $output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
-        $dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .
-               ($cache ? 'true' : 'false') . ")";
-        $output .= "if ({$dec}) {\n";
-        $output .= "function {$properties['unifunc']} (Smarty_Internal_Template \$_smarty_tpl) {\n";
-        if (!$cache && !empty($compiler->tpl_function)) {
-            $output .= "\$_smarty_tpl->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " .
-                       var_export($compiler->tpl_function, true) . ");\n";
-        }
-        if ($cache && isset($_template->ext->_tplFunction)) {
-            $output .= "\$_smarty_tpl->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " .
-                       var_export($_template->ext->_tplFunction->getTplFunction(), true) . ");\n";
+	/**
+	 * Create code frame for compiled and cached templates
+	 *
+	 * @param Smarty_Internal_Template              $_template
+	 * @param string                                $content   optional template content
+	 * @param string                                $functions compiled template function and block code
+	 * @param bool                                  $cache     flag for cache file
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 *
+	 * @return string
+	 */
+	public function create(Smarty_Internal_Template $_template, $content = '', $functions = '', $cache = false,
+						   Smarty_Internal_TemplateCompilerBase $compiler = null)
+	{
+		// build property code
+		$properties[ 'version' ] = Smarty::SMARTY_VERSION;
+		$properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+		if (!$cache) {
+			$properties[ 'has_nocache_code' ] = $_template->compiled->has_nocache_code;
+			$properties[ 'file_dependency' ] = $_template->compiled->file_dependency;
+			$properties[ 'includes' ] = $_template->compiled->includes;
+		 } else {
+			$properties[ 'has_nocache_code' ] = $_template->cached->has_nocache_code;
+			$properties[ 'file_dependency' ] = $_template->cached->file_dependency;
+			$properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
+		}
+		$output = "<?php\n";
+		$output .= "/* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
+				   "\n  from \"" . $_template->source->filepath . "\" */\n\n";
+		$output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
+		$dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .
+			   ($cache ? 'true' : 'false') . ")";
+		$output .= "if ({$dec}) {\n";
+		$output .= "function {$properties['unifunc']} (Smarty_Internal_Template \$_smarty_tpl) {\n";
+		if (!$cache && !empty($compiler->tpl_function)) {
+			$output .= "\$_smarty_tpl->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " .
+					   var_export($compiler->tpl_function, true) . ");\n";
+		}
+		if ($cache && isset($_template->ext->_tplFunction)) {
+			$output .= "\$_smarty_tpl->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " .
+					   var_export($_template->ext->_tplFunction->getTplFunction(), true) . ");\n";
 
-        }
-        // include code for plugins
-        if (!$cache) {
-            if (!empty($_template->compiled->required_plugins[ 'compiled' ])) {
-                foreach ($_template->compiled->required_plugins[ 'compiled' ] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data[ 'file' ]);
-                        if (is_array($data[ 'function' ])) {
-                            $output .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n";
-                        } else {
-                            $output .= "if (!is_callable('{$data['function']}')) require_once '{$file}';\n";
-                        }
-                    }
-                }
-            }
-            if ($_template->caching && !empty($_template->compiled->required_plugins[ 'nocache' ])) {
-                $_template->compiled->has_nocache_code = true;
-                $output .= "echo '/*%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
-                foreach ($_template->compiled->required_plugins[ 'nocache' ] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data[ 'file' ]);
-                        if (is_array($data[ 'function' ])) {
-                            $output .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n");
-                        } else {
-                            $output .= addslashes("if (!is_callable('{$data['function']}')) require_once '{$file}';\n");
-                        }
-                    }
-                }
-                $output .= "?>/*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/';\n";
-            }
-        }
-        $output .= "?>\n";
-        $output .= $content;
-        $output .= "<?php }\n?>";
-        $output .= $functions;
-        $output .= "<?php }\n";
-        // remove unneeded PHP tags
-        return preg_replace(array('/\s*\?>[\n]?<\?php\s*/', '/\?>\s*$/'), array("\n", ''), $output);
-    }
+		}
+		// include code for plugins
+		if (!$cache) {
+			if (!empty($_template->compiled->required_plugins[ 'compiled' ])) {
+				foreach ($_template->compiled->required_plugins[ 'compiled' ] as $tmp) {
+					foreach ($tmp as $data) {
+						$file = addslashes($data[ 'file' ]);
+						if (is_array($data[ 'function' ])) {
+							$output .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n";
+						} else {
+							$output .= "if (!is_callable('{$data['function']}')) require_once '{$file}';\n";
+						}
+					}
+				}
+			}
+			if ($_template->caching && !empty($_template->compiled->required_plugins[ 'nocache' ])) {
+				$_template->compiled->has_nocache_code = true;
+				$output .= "echo '/*%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
+				foreach ($_template->compiled->required_plugins[ 'nocache' ] as $tmp) {
+					foreach ($tmp as $data) {
+						$file = addslashes($data[ 'file' ]);
+						if (is_array($data[ 'function' ])) {
+							$output .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n");
+						} else {
+							$output .= addslashes("if (!is_callable('{$data['function']}')) require_once '{$file}';\n");
+						}
+					}
+				}
+				$output .= "?>/*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/';\n";
+			}
+		}
+		$output .= "?>\n";
+		$output .= $content;
+		$output .= "<?php }\n?>";
+		$output .= $functions;
+		$output .= "<?php }\n";
+		// remove unneeded PHP tags
+		return preg_replace(array('/\s*\?>[\n]?<\?php\s*/', '/\?>\s*$/'), array("\n", ''), $output);
+	}
 }
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -29,16 +29,16 @@ 
                            Smarty_Internal_TemplateCompilerBase $compiler = null)
     {
         // build property code
-        $properties[ 'version' ] = Smarty::SMARTY_VERSION;
-        $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+        $properties['version'] = Smarty::SMARTY_VERSION;
+        $properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
         if (!$cache) {
-            $properties[ 'has_nocache_code' ] = $_template->compiled->has_nocache_code;
-            $properties[ 'file_dependency' ] = $_template->compiled->file_dependency;
-            $properties[ 'includes' ] = $_template->compiled->includes;
+            $properties['has_nocache_code'] = $_template->compiled->has_nocache_code;
+            $properties['file_dependency'] = $_template->compiled->file_dependency;
+            $properties['includes'] = $_template->compiled->includes;
          } else {
-            $properties[ 'has_nocache_code' ] = $_template->cached->has_nocache_code;
-            $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
-            $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
+            $properties['has_nocache_code'] = $_template->cached->has_nocache_code;
+            $properties['file_dependency'] = $_template->cached->file_dependency;
+            $properties['cache_lifetime'] = $_template->cache_lifetime;
         }
         $output = "<?php\n";
         $output .= "/* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
@@ -59,11 +59,11 @@ 
         }
         // include code for plugins
         if (!$cache) {
-            if (!empty($_template->compiled->required_plugins[ 'compiled' ])) {
-                foreach ($_template->compiled->required_plugins[ 'compiled' ] as $tmp) {
+            if (!empty($_template->compiled->required_plugins['compiled'])) {
+                foreach ($_template->compiled->required_plugins['compiled'] as $tmp) {
                     foreach ($tmp as $data) {
-                        $file = addslashes($data[ 'file' ]);
-                        if (is_array($data[ 'function' ])) {
+                        $file = addslashes($data['file']);
+                        if (is_array($data['function'])) {
                             $output .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n";
                         } else {
                             $output .= "if (!is_callable('{$data['function']}')) require_once '{$file}';\n";
@@ -71,13 +71,13 @@ 
                     }
                 }
             }
-            if ($_template->caching && !empty($_template->compiled->required_plugins[ 'nocache' ])) {
+            if ($_template->caching && !empty($_template->compiled->required_plugins['nocache'])) {
                 $_template->compiled->has_nocache_code = true;
                 $output .= "echo '/*%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
-                foreach ($_template->compiled->required_plugins[ 'nocache' ] as $tmp) {
+                foreach ($_template->compiled->required_plugins['nocache'] as $tmp) {
                     foreach ($tmp as $data) {
-                        $file = addslashes($data[ 'file' ]);
-                        if (is_array($data[ 'function' ])) {
+                        $file = addslashes($data['file']);
+                        if (is_array($data['function'])) {
                             $output .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n");
                         } else {
                             $output .= addslashes("if (!is_callable('{$data['function']}')) require_once '{$file}';\n");

libraries/Smarty/libs/sysplugins/smarty_internal_config_file_compiler.php

Indentation +165 added lines, -165 removed lines

@@ -17,183 +17,183 @@
  */
 class Smarty_Internal_Config_File_Compiler
 {
-    /**
-     * Lexer class name
-     *
-     * @var string
-     */
-    public $lexer_class;
+	/**
+	 * Lexer class name
+	 *
+	 * @var string
+	 */
+	public $lexer_class;
 
-    /**
-     * Parser class name
-     *
-     * @var string
-     */
-    public $parser_class;
+	/**
+	 * Parser class name
+	 *
+	 * @var string
+	 */
+	public $parser_class;
 
-    /**
-     * Lexer object
-     *
-     * @var object
-     */
-    public $lex;
+	/**
+	 * Lexer object
+	 *
+	 * @var object
+	 */
+	public $lex;
 
-    /**
-     * Parser object
-     *
-     * @var object
-     */
-    public $parser;
+	/**
+	 * Parser object
+	 *
+	 * @var object
+	 */
+	public $parser;
 
-    /**
-     * Smarty object
-     *
-     * @var Smarty object
-     */
-    public $smarty;
+	/**
+	 * Smarty object
+	 *
+	 * @var Smarty object
+	 */
+	public $smarty;
 
-    /**
-     * Smarty object
-     *
-     * @var Smarty_Internal_Template object
-     */
-    public $template;
+	/**
+	 * Smarty object
+	 *
+	 * @var Smarty_Internal_Template object
+	 */
+	public $template;
 
-    /**
-     * Compiled config data sections and variables
-     *
-     * @var array
-     */
-    public $config_data = array();
+	/**
+	 * Compiled config data sections and variables
+	 *
+	 * @var array
+	 */
+	public $config_data = array();
 
-    /**
-     * compiled config data must always be written
-     *
-     * @var bool
-     */
-    public $write_compiled_code = true;
+	/**
+	 * compiled config data must always be written
+	 *
+	 * @var bool
+	 */
+	public $write_compiled_code = true;
 
-    /**
-     * Initialize compiler
-     *
-     * @param string $lexer_class  class name
-     * @param string $parser_class class name
-     * @param Smarty $smarty       global instance
-     */
-    public function __construct($lexer_class, $parser_class, Smarty $smarty)
-    {
-        $this->smarty = $smarty;
-        // get required plugins
-        $this->lexer_class = $lexer_class;
-        $this->parser_class = $parser_class;
-        $this->smarty = $smarty;
-        $this->config_data[ 'sections' ] = array();
-        $this->config_data[ 'vars' ] = array();
-    }
+	/**
+	 * Initialize compiler
+	 *
+	 * @param string $lexer_class  class name
+	 * @param string $parser_class class name
+	 * @param Smarty $smarty       global instance
+	 */
+	public function __construct($lexer_class, $parser_class, Smarty $smarty)
+	{
+		$this->smarty = $smarty;
+		// get required plugins
+		$this->lexer_class = $lexer_class;
+		$this->parser_class = $parser_class;
+		$this->smarty = $smarty;
+		$this->config_data[ 'sections' ] = array();
+		$this->config_data[ 'vars' ] = array();
+	}
 
-    /**
-     * Method to compile Smarty config source.
-     *
-     * @param Smarty_Internal_Template $template
-     *
-     * @return bool true if compiling succeeded, false if it failed
-     */
-    public function compileTemplate(Smarty_Internal_Template $template)
-    {
-        $this->template = $template;
-        $this->template->compiled->file_dependency[ $this->template->source->uid ] =
-            array($this->template->source->filepath, $this->template->source->getTimeStamp(),
-                  $this->template->source->type);
-        if ($this->smarty->debugging) {
-            if (!isset( $this->smarty->_debug)) {
-                $this->smarty->_debug  = new Smarty_Internal_Debug();
-            }
-            $this->smarty->_debug->start_compile($this->template);
-        }
-        // init the lexer/parser to compile the config file
-        /* @var Smarty_Internal_ConfigFileLexer $lex */
-        $lex = new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $template->source->getContent()) . "\n",
-                                      $this);
-        /* @var Smarty_Internal_ConfigFileParser $parser */
-        $parser = new $this->parser_class($lex, $this);
+	/**
+	 * Method to compile Smarty config source.
+	 *
+	 * @param Smarty_Internal_Template $template
+	 *
+	 * @return bool true if compiling succeeded, false if it failed
+	 */
+	public function compileTemplate(Smarty_Internal_Template $template)
+	{
+		$this->template = $template;
+		$this->template->compiled->file_dependency[ $this->template->source->uid ] =
+			array($this->template->source->filepath, $this->template->source->getTimeStamp(),
+				  $this->template->source->type);
+		if ($this->smarty->debugging) {
+			if (!isset( $this->smarty->_debug)) {
+				$this->smarty->_debug  = new Smarty_Internal_Debug();
+			}
+			$this->smarty->_debug->start_compile($this->template);
+		}
+		// init the lexer/parser to compile the config file
+		/* @var Smarty_Internal_ConfigFileLexer $lex */
+		$lex = new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $template->source->getContent()) . "\n",
+									  $this);
+		/* @var Smarty_Internal_ConfigFileParser $parser */
+		$parser = new $this->parser_class($lex, $this);
 
-        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        } else {
-            $mbEncoding = null;
-        }
+		if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+			$mbEncoding = mb_internal_encoding();
+			mb_internal_encoding('ASCII');
+		} else {
+			$mbEncoding = null;
+		}
 
-        if ($this->smarty->_parserdebug) {
-            $parser->PrintTrace();
-        }
-        // get tokens from lexer and parse them
-        while ($lex->yylex()) {
-            if ($this->smarty->_parserdebug) {
-                echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
-            }
-            $parser->doParse($lex->token, $lex->value);
-        }
-        // finish parsing process
-        $parser->doParse(0, 0);
+		if ($this->smarty->_parserdebug) {
+			$parser->PrintTrace();
+		}
+		// get tokens from lexer and parse them
+		while ($lex->yylex()) {
+			if ($this->smarty->_parserdebug) {
+				echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
+			}
+			$parser->doParse($lex->token, $lex->value);
+		}
+		// finish parsing process
+		$parser->doParse(0, 0);
 
-        if ($mbEncoding) {
-            mb_internal_encoding($mbEncoding);
-        }
-        if ($this->smarty->debugging) {
-            $this->smarty->_debug->end_compile($this->template);
-        }
-        // template header code
-        $template_header =
-            "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
-            "\n";
-        $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
+		if ($mbEncoding) {
+			mb_internal_encoding($mbEncoding);
+		}
+		if ($this->smarty->debugging) {
+			$this->smarty->_debug->end_compile($this->template);
+		}
+		// template header code
+		$template_header =
+			"<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
+			"\n";
+		$template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
 
-        $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
-                var_export($this->config_data, true) . '); ?>';
-        return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
-    }
+		$code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
+				var_export($this->config_data, true) . '); ?>';
+		return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
+	}
 
-    /**
-     * display compiler error messages without dying
-     * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about expected tokens.
-     * If parameter $args contains a string this is used as error message
-     *
-     * @param string $args individual error message or null
-     *
-     * @throws SmartyCompilerException
-     */
-    public function trigger_config_file_error($args = null)
-    {
-        $this->lex = Smarty_Internal_Configfilelexer::instance();
-        $this->parser = Smarty_Internal_Configfileparser::instance();
-        // get config source line which has error
-        $line = $this->lex->line;
-        if (isset($args)) {
-            // $line--;
-        }
-        $match = preg_split("/\n/", $this->lex->data);
-        $error_text =
-            "Syntax error in config file '{$this->template->source->filepath}' on line {$line} '{$match[$line - 1]}' ";
-        if (isset($args)) {
-            // individual error message
-            $error_text .= $args;
-        } else {
-            // expected token from parser
-            foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                $exp_token = $this->parser->yyTokenName[ $token ];
-                if (isset($this->lex->smarty_token_names[ $exp_token ])) {
-                    // token type from lexer
-                    $expect[] = '"' . $this->lex->smarty_token_names[ $exp_token ] . '"';
-                } else {
-                    // otherwise internal token name
-                    $expect[] = $this->parser->yyTokenName[ $token ];
-                }
-            }
-            // output parser error message
-            $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
-        }
-        throw new SmartyCompilerException($error_text);
-    }
+	/**
+	 * display compiler error messages without dying
+	 * If parameter $args is empty it is a parser detected syntax error.
+	 * In this case the parser is called to obtain information about expected tokens.
+	 * If parameter $args contains a string this is used as error message
+	 *
+	 * @param string $args individual error message or null
+	 *
+	 * @throws SmartyCompilerException
+	 */
+	public function trigger_config_file_error($args = null)
+	{
+		$this->lex = Smarty_Internal_Configfilelexer::instance();
+		$this->parser = Smarty_Internal_Configfileparser::instance();
+		// get config source line which has error
+		$line = $this->lex->line;
+		if (isset($args)) {
+			// $line--;
+		}
+		$match = preg_split("/\n/", $this->lex->data);
+		$error_text =
+			"Syntax error in config file '{$this->template->source->filepath}' on line {$line} '{$match[$line - 1]}' ";
+		if (isset($args)) {
+			// individual error message
+			$error_text .= $args;
+		} else {
+			// expected token from parser
+			foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+				$exp_token = $this->parser->yyTokenName[ $token ];
+				if (isset($this->lex->smarty_token_names[ $exp_token ])) {
+					// token type from lexer
+					$expect[] = '"' . $this->lex->smarty_token_names[ $exp_token ] . '"';
+				} else {
+					// otherwise internal token name
+					$expect[] = $this->parser->yyTokenName[ $token ];
+				}
+			}
+			// output parser error message
+			$error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
+		}
+		throw new SmartyCompilerException($error_text);
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -87,8 +87,8 @@ 
         $this->lexer_class = $lexer_class;
         $this->parser_class = $parser_class;
         $this->smarty = $smarty;
-        $this->config_data[ 'sections' ] = array();
-        $this->config_data[ 'vars' ] = array();
+        $this->config_data['sections'] = array();
+        $this->config_data['vars'] = array();
     }
 
     /**
@@ -101,12 +101,12 @@ 
     public function compileTemplate(Smarty_Internal_Template $template)
     {
         $this->template = $template;
-        $this->template->compiled->file_dependency[ $this->template->source->uid ] =
+        $this->template->compiled->file_dependency[$this->template->source->uid] =
             array($this->template->source->filepath, $this->template->source->getTimeStamp(),
                   $this->template->source->type);
         if ($this->smarty->debugging) {
-            if (!isset( $this->smarty->_debug)) {
-                $this->smarty->_debug  = new Smarty_Internal_Debug();
+            if (!isset($this->smarty->_debug)) {
+                $this->smarty->_debug = new Smarty_Internal_Debug();
             }
             $this->smarty->_debug->start_compile($this->template);
         }
@@ -182,13 +182,13 @@ 
         } else {
             // expected token from parser
             foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                $exp_token = $this->parser->yyTokenName[ $token ];
-                if (isset($this->lex->smarty_token_names[ $exp_token ])) {
+                $exp_token = $this->parser->yyTokenName[$token];
+                if (isset($this->lex->smarty_token_names[$exp_token])) {
                     // token type from lexer
-                    $expect[] = '"' . $this->lex->smarty_token_names[ $exp_token ] . '"';
+                    $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
                 } else {
                     // otherwise internal token name
-                    $expect[] = $this->parser->yyTokenName[ $token ];
+                    $expect[] = $this->parser->yyTokenName[$token];
                 }
             }
             // output parser error message

Doc Comments +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
      * @param  mixed $_content template source
      * @param bool   $isTemplateSource
      *
-     * @return bool true if compiling succeeded, false if it failed
+     * @return string true if compiling succeeded, false if it failed
      * @throws \SmartyCompilerException
      */
     protected function doCompile($_content, $isTemplateSource = false)

libraries/Smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php

Indentation +154 added lines, -154 removed lines

@@ -15,168 +15,168 @@
  */
 class Smarty_Internal_Runtime_GetIncludePath
 {
-    /**
-     * include path cache
-     *
-     * @var string
-     */
-    public $_include_path = '';
+	/**
+	 * include path cache
+	 *
+	 * @var string
+	 */
+	public $_include_path = '';
 
-    /**
-     * include path directory cache
-     *
-     * @var array
-     */
-    public $_include_dirs = array();
+	/**
+	 * include path directory cache
+	 *
+	 * @var array
+	 */
+	public $_include_dirs = array();
 
-    /**
-     * include path directory cache
-     *
-     * @var array
-     */
-    public $_user_dirs = array();
+	/**
+	 * include path directory cache
+	 *
+	 * @var array
+	 */
+	public $_user_dirs = array();
 
-    /**
-     * stream cache
-     *
-     * @var string[]
-     */
-    public $isFile = array();
+	/**
+	 * stream cache
+	 *
+	 * @var string[]
+	 */
+	public $isFile = array();
 
-    /**
-     * stream cache
-     *
-     * @var string[]
-     */
-    public $isPath = array();
+	/**
+	 * stream cache
+	 *
+	 * @var string[]
+	 */
+	public $isPath = array();
 
-    /**
-     * stream cache
-     *
-     * @var int[]
-     */
-    public $number = array();
+	/**
+	 * stream cache
+	 *
+	 * @var int[]
+	 */
+	public $number = array();
 
-    /**
-     * status cache
-     *
-     * @var bool
-     */
-    public $_has_stream_include = null;
+	/**
+	 * status cache
+	 *
+	 * @var bool
+	 */
+	public $_has_stream_include = null;
 
-    /**
-     * Number for array index
-     *
-     * @var int
-     */
-    public $counter = 0;
+	/**
+	 * Number for array index
+	 *
+	 * @var int
+	 */
+	public $counter = 0;
 
-    /**
-     * Check if include path was updated
-     *
-     * @param \Smarty $smarty
-     *
-     * @return bool
-     */
-    public function isNewIncludePath(Smarty $smarty)
-    {
-        $_i_path = get_include_path();
-        if ($this->_include_path != $_i_path) {
-            $this->_include_dirs = array();
-            $this->_include_path = $_i_path;
-            $_dirs = (array) explode(PATH_SEPARATOR, $_i_path);
-            foreach ($_dirs as $_path) {
-                if (is_dir($_path)) {
-                    $this->_include_dirs[] = $smarty->_realpath($_path . DS, true);
-                }
-            }
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * Check if include path was updated
+	 *
+	 * @param \Smarty $smarty
+	 *
+	 * @return bool
+	 */
+	public function isNewIncludePath(Smarty $smarty)
+	{
+		$_i_path = get_include_path();
+		if ($this->_include_path != $_i_path) {
+			$this->_include_dirs = array();
+			$this->_include_path = $_i_path;
+			$_dirs = (array) explode(PATH_SEPARATOR, $_i_path);
+			foreach ($_dirs as $_path) {
+				if (is_dir($_path)) {
+					$this->_include_dirs[] = $smarty->_realpath($_path . DS, true);
+				}
+			}
+			return true;
+		}
+		return false;
+	}
 
-    /**
-     * return array with include path directories
-     *
-     * @param \Smarty $smarty
-     *
-     * @return array
-     */
-    public function getIncludePathDirs(Smarty $smarty)
-    {
-        $this->isNewIncludePath($smarty);
-        return $this->_include_dirs;
-    }
+	/**
+	 * return array with include path directories
+	 *
+	 * @param \Smarty $smarty
+	 *
+	 * @return array
+	 */
+	public function getIncludePathDirs(Smarty $smarty)
+	{
+		$this->isNewIncludePath($smarty);
+		return $this->_include_dirs;
+	}
 
-    /**
-     * Return full file path from PHP include_path
-     *
-     * @param  string[] $dirs
-     * @param  string   $file
-     * @param \Smarty   $smarty
-     *
-     * @return bool|string full filepath or false
-     *
-     */
-    public function getIncludePath($dirs, $file, Smarty $smarty)
-    {
-        //if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = false)) {
-        if (!(isset($this->_has_stream_include) ? $this->_has_stream_include :
-            $this->_has_stream_include = function_exists('stream_resolve_include_path'))
-        ) {
-            $this->isNewIncludePath($smarty);
-        }
-        // try PHP include_path
-        foreach ($dirs as $dir) {
-            $dir_n = isset($this->number[ $dir ]) ? $this->number[ $dir ] : $this->number[ $dir ] = $this->counter ++;
-            if (isset($this->isFile[ $dir_n ][ $file ])) {
-                if ($this->isFile[ $dir_n ][ $file ]) {
-                    return $this->isFile[ $dir_n ][ $file ];
-                } else {
-                    continue;
-                }
-            }
-            if (isset($this->_user_dirs[ $dir_n ])) {
-                if (false === $this->_user_dirs[ $dir_n ]) {
-                    continue;
-                } else {
-                    $dir = $this->_user_dirs[ $dir_n ];
-                }
-            } else {
-                if ($dir[ 0 ] == '/' || $dir[ 1 ] == ':') {
-                    $dir = str_ireplace(getcwd(), '.', $dir);
-                    if ($dir[ 0 ] == '/' || $dir[ 1 ] == ':') {
-                        $this->_user_dirs[ $dir_n ] = false;
-                        continue;
-                    }
-                }
-                $dir = substr($dir, 2);
-                $this->_user_dirs[ $dir_n ] = $dir;
-            }
-            if ($this->_has_stream_include) {
-                $path = stream_resolve_include_path($dir . (isset($file) ? $file : ''));
-                if ($path) {
-                    return $this->isFile[ $dir_n ][ $file ] = $path;
-                }
-            } else {
-                foreach ($this->_include_dirs as $key => $_i_path) {
-                    $path = isset($this->isPath[ $key ][ $dir_n ]) ? $this->isPath[ $key ][ $dir_n ] :
-                        $this->isPath[ $key ][ $dir_n ] = is_dir($_dir_path = $_i_path . $dir) ? $_dir_path : false;
-                    if ($path === false) {
-                        continue;
-                    }
-                    if (isset($file)) {
-                        $_file = $this->isFile[ $dir_n ][ $file ] = (is_file($path . $file)) ? $path . $file : false;
-                        if ($_file) {
-                            return $_file;
-                        }
-                    } else {
-                        // no file was given return directory path
-                        return $path;
-                    }
-                }
-            }
-        }
-        return false;
-    }
+	/**
+	 * Return full file path from PHP include_path
+	 *
+	 * @param  string[] $dirs
+	 * @param  string   $file
+	 * @param \Smarty   $smarty
+	 *
+	 * @return bool|string full filepath or false
+	 *
+	 */
+	public function getIncludePath($dirs, $file, Smarty $smarty)
+	{
+		//if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = false)) {
+		if (!(isset($this->_has_stream_include) ? $this->_has_stream_include :
+			$this->_has_stream_include = function_exists('stream_resolve_include_path'))
+		) {
+			$this->isNewIncludePath($smarty);
+		}
+		// try PHP include_path
+		foreach ($dirs as $dir) {
+			$dir_n = isset($this->number[ $dir ]) ? $this->number[ $dir ] : $this->number[ $dir ] = $this->counter ++;
+			if (isset($this->isFile[ $dir_n ][ $file ])) {
+				if ($this->isFile[ $dir_n ][ $file ]) {
+					return $this->isFile[ $dir_n ][ $file ];
+				} else {
+					continue;
+				}
+			}
+			if (isset($this->_user_dirs[ $dir_n ])) {
+				if (false === $this->_user_dirs[ $dir_n ]) {
+					continue;
+				} else {
+					$dir = $this->_user_dirs[ $dir_n ];
+				}
+			} else {
+				if ($dir[ 0 ] == '/' || $dir[ 1 ] == ':') {
+					$dir = str_ireplace(getcwd(), '.', $dir);
+					if ($dir[ 0 ] == '/' || $dir[ 1 ] == ':') {
+						$this->_user_dirs[ $dir_n ] = false;
+						continue;
+					}
+				}
+				$dir = substr($dir, 2);
+				$this->_user_dirs[ $dir_n ] = $dir;
+			}
+			if ($this->_has_stream_include) {
+				$path = stream_resolve_include_path($dir . (isset($file) ? $file : ''));
+				if ($path) {
+					return $this->isFile[ $dir_n ][ $file ] = $path;
+				}
+			} else {
+				foreach ($this->_include_dirs as $key => $_i_path) {
+					$path = isset($this->isPath[ $key ][ $dir_n ]) ? $this->isPath[ $key ][ $dir_n ] :
+						$this->isPath[ $key ][ $dir_n ] = is_dir($_dir_path = $_i_path . $dir) ? $_dir_path : false;
+					if ($path === false) {
+						continue;
+					}
+					if (isset($file)) {
+						$_file = $this->isFile[ $dir_n ][ $file ] = (is_file($path . $file)) ? $path . $file : false;
+						if ($_file) {
+							return $_file;
+						}
+					} else {
+						// no file was given return directory path
+						return $path;
+					}
+				}
+			}
+		}
+		return false;
+	}
 }

Spacing +15 added lines, -17 removed lines

@@ -121,52 +121,50 @@
     public function getIncludePath($dirs, $file, Smarty $smarty)
     {
         //if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = false)) {
-        if (!(isset($this->_has_stream_include) ? $this->_has_stream_include :
-            $this->_has_stream_include = function_exists('stream_resolve_include_path'))
+        if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = function_exists('stream_resolve_include_path'))
         ) {
             $this->isNewIncludePath($smarty);
         }
         // try PHP include_path
         foreach ($dirs as $dir) {
-            $dir_n = isset($this->number[ $dir ]) ? $this->number[ $dir ] : $this->number[ $dir ] = $this->counter ++;
-            if (isset($this->isFile[ $dir_n ][ $file ])) {
-                if ($this->isFile[ $dir_n ][ $file ]) {
-                    return $this->isFile[ $dir_n ][ $file ];
+            $dir_n = isset($this->number[$dir]) ? $this->number[$dir] : $this->number[$dir] = $this->counter++;
+            if (isset($this->isFile[$dir_n][$file])) {
+                if ($this->isFile[$dir_n][$file]) {
+                    return $this->isFile[$dir_n][$file];
                 } else {
                     continue;
                 }
             }
-            if (isset($this->_user_dirs[ $dir_n ])) {
-                if (false === $this->_user_dirs[ $dir_n ]) {
+            if (isset($this->_user_dirs[$dir_n])) {
+                if (false === $this->_user_dirs[$dir_n]) {
                     continue;
                 } else {
-                    $dir = $this->_user_dirs[ $dir_n ];
+                    $dir = $this->_user_dirs[$dir_n];
                 }
             } else {
-                if ($dir[ 0 ] == '/' || $dir[ 1 ] == ':') {
+                if ($dir[0] == '/' || $dir[1] == ':') {
                     $dir = str_ireplace(getcwd(), '.', $dir);
-                    if ($dir[ 0 ] == '/' || $dir[ 1 ] == ':') {
-                        $this->_user_dirs[ $dir_n ] = false;
+                    if ($dir[0] == '/' || $dir[1] == ':') {
+                        $this->_user_dirs[$dir_n] = false;
                         continue;
                     }
                 }
                 $dir = substr($dir, 2);
-                $this->_user_dirs[ $dir_n ] = $dir;
+                $this->_user_dirs[$dir_n] = $dir;
             }
             if ($this->_has_stream_include) {
                 $path = stream_resolve_include_path($dir . (isset($file) ? $file : ''));
                 if ($path) {
-                    return $this->isFile[ $dir_n ][ $file ] = $path;
+                    return $this->isFile[$dir_n][$file] = $path;
                 }
             } else {
                 foreach ($this->_include_dirs as $key => $_i_path) {
-                    $path = isset($this->isPath[ $key ][ $dir_n ]) ? $this->isPath[ $key ][ $dir_n ] :
-                        $this->isPath[ $key ][ $dir_n ] = is_dir($_dir_path = $_i_path . $dir) ? $_dir_path : false;
+                    $path = isset($this->isPath[$key][$dir_n]) ? $this->isPath[$key][$dir_n] : $this->isPath[$key][$dir_n] = is_dir($_dir_path = $_i_path . $dir) ? $_dir_path : false;
                     if ($path === false) {
                         continue;
                     }
                     if (isset($file)) {
-                        $_file = $this->isFile[ $dir_n ][ $file ] = (is_file($path . $file)) ? $path . $file : false;
+                        $_file = $this->isFile[$dir_n][$file] = (is_file($path . $file)) ? $path . $file : false;
                         if ($_file) {
                             return $_file;
                         }

libraries/Smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php

Indentation +101 added lines, -101 removed lines

@@ -11,110 +11,110 @@
  */
 class Smarty_Internal_Method_ClearCompiledTemplate
 {
-    /**
-     * Valid for Smarty object
-     *
-     * @var int
-     */
-    public $objMap = 1;
+	/**
+	 * Valid for Smarty object
+	 *
+	 * @var int
+	 */
+	public $objMap = 1;
 
-    /**
-     * Delete compiled template file
-     *
-     * @api  Smarty::clearCompiledTemplate()
-     * @link http://www.smarty.net/docs/en/api.clear.compiled.template.tpl
-     *
-     * @param \Smarty  $smarty
-     * @param  string  $resource_name template name
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time
-     *
-     * @return integer number of template files deleted
-     */
-    public function clearCompiledTemplate(Smarty $smarty, $resource_name = null, $compile_id = null, $exp_time = null)
-    {
-        // clear template objects cache
-        $smarty->_clearTemplateCache();
+	/**
+	 * Delete compiled template file
+	 *
+	 * @api  Smarty::clearCompiledTemplate()
+	 * @link http://www.smarty.net/docs/en/api.clear.compiled.template.tpl
+	 *
+	 * @param \Smarty  $smarty
+	 * @param  string  $resource_name template name
+	 * @param  string  $compile_id    compile id
+	 * @param  integer $exp_time      expiration time
+	 *
+	 * @return integer number of template files deleted
+	 */
+	public function clearCompiledTemplate(Smarty $smarty, $resource_name = null, $compile_id = null, $exp_time = null)
+	{
+		// clear template objects cache
+		$smarty->_clearTemplateCache();
 
-        $_compile_dir = $smarty->getCompileDir();
-        if ($_compile_dir == '/') { //We should never want to delete this!
-            return 0;
-        }
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? DS : '^';
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = false;
-            /* @var Smarty_Internal_Template $tpl */
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-            if (!$tpl->source->handler->uncompiled && !$tpl->source->handler->recompiled && $tpl->source->exists) {
-                $_resource_part_1 = basename(str_replace('^', DS, $tpl->compiled->filepath));
-                $_resource_part_1_length = strlen($_resource_part_1);
-            } else {
-                return 0;
-            }
-            $_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
-            $_resource_part_2_length = strlen($_resource_part_2);
-        }
-        $_dir = $_compile_dir;
-        if ($smarty->use_sub_dirs && isset($_compile_id)) {
-            $_dir .= $_compile_id . $_dir_sep;
-        }
-        if (isset($_compile_id)) {
-            $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
-            $_compile_id_part_length = strlen($_compile_id_part);
-        }
-        $_count = 0;
-        try {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            // NOTE: UnexpectedValueException thrown for PHP >= 5.3
-        }
-        catch (Exception $e) {
-            return 0;
-        }
-        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
-        foreach ($_compile as $_file) {
-            if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-                continue;
-            }
+		$_compile_dir = $smarty->getCompileDir();
+		if ($_compile_dir == '/') { //We should never want to delete this!
+			return 0;
+		}
+		$_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+		$_dir_sep = $smarty->use_sub_dirs ? DS : '^';
+		if (isset($resource_name)) {
+			$_save_stat = $smarty->caching;
+			$smarty->caching = false;
+			/* @var Smarty_Internal_Template $tpl */
+			$tpl = new $smarty->template_class($resource_name, $smarty);
+			$smarty->caching = $_save_stat;
+			if (!$tpl->source->handler->uncompiled && !$tpl->source->handler->recompiled && $tpl->source->exists) {
+				$_resource_part_1 = basename(str_replace('^', DS, $tpl->compiled->filepath));
+				$_resource_part_1_length = strlen($_resource_part_1);
+			} else {
+				return 0;
+			}
+			$_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
+			$_resource_part_2_length = strlen($_resource_part_2);
+		}
+		$_dir = $_compile_dir;
+		if ($smarty->use_sub_dirs && isset($_compile_id)) {
+			$_dir .= $_compile_id . $_dir_sep;
+		}
+		if (isset($_compile_id)) {
+			$_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
+			$_compile_id_part_length = strlen($_compile_id_part);
+		}
+		$_count = 0;
+		try {
+			$_compileDirs = new RecursiveDirectoryIterator($_dir);
+			// NOTE: UnexpectedValueException thrown for PHP >= 5.3
+		}
+		catch (Exception $e) {
+			return 0;
+		}
+		$_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
+		foreach ($_compile as $_file) {
+			if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+				continue;
+			}
 
-            $_filepath = (string) $_file;
+			$_filepath = (string) $_file;
 
-            if ($_file->isDir()) {
-                if (!$_compile->isDot()) {
-                    // delete folder if empty
-                    @rmdir($_file->getPathname());
-                }
-            } else {
-                $unlink = false;
-                if ((!isset($_compile_id) || (isset($_filepath[ $_compile_id_part_length ]) && $a =
-                                !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) &&
-                    (!isset($resource_name) || (isset($_filepath[ $_resource_part_1_length ]) &&
-                                                substr_compare($_filepath, $_resource_part_1,
-                                                               - $_resource_part_1_length, $_resource_part_1_length) ==
-                                                0) || (isset($_filepath[ $_resource_part_2_length ]) &&
-                                                       substr_compare($_filepath, $_resource_part_2,
-                                                                      - $_resource_part_2_length,
-                                                                      $_resource_part_2_length) == 0))
-                ) {
-                    if (isset($exp_time)) {
-                        if (time() - @filemtime($_filepath) >= $exp_time) {
-                            $unlink = true;
-                        }
-                    } else {
-                        $unlink = true;
-                    }
-                }
+			if ($_file->isDir()) {
+				if (!$_compile->isDot()) {
+					// delete folder if empty
+					@rmdir($_file->getPathname());
+				}
+			} else {
+				$unlink = false;
+				if ((!isset($_compile_id) || (isset($_filepath[ $_compile_id_part_length ]) && $a =
+								!strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) &&
+					(!isset($resource_name) || (isset($_filepath[ $_resource_part_1_length ]) &&
+												substr_compare($_filepath, $_resource_part_1,
+															   - $_resource_part_1_length, $_resource_part_1_length) ==
+												0) || (isset($_filepath[ $_resource_part_2_length ]) &&
+													   substr_compare($_filepath, $_resource_part_2,
+																	  - $_resource_part_2_length,
+																	  $_resource_part_2_length) == 0))
+				) {
+					if (isset($exp_time)) {
+						if (time() - @filemtime($_filepath) >= $exp_time) {
+							$unlink = true;
+						}
+					} else {
+						$unlink = true;
+					}
+				}
 
-                if ($unlink && @unlink($_filepath)) {
-                    $_count ++;
-                    if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) {
-                        opcache_invalidate($_filepath, true);
-                    }
-                }
-            }
-        }
-        return $_count;
-    }
+				if ($unlink && @unlink($_filepath)) {
+					$_count ++;
+					if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) {
+						opcache_invalidate($_filepath, true);
+					}
+				}
+			}
+		}
+		return $_count;
+	}
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -88,12 +88,12 @@ 
                 }
             } else {
                 $unlink = false;
-                if ((!isset($_compile_id) || (isset($_filepath[ $_compile_id_part_length ]) && $a =
+                if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) && $a =
                                 !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) &&
-                    (!isset($resource_name) || (isset($_filepath[ $_resource_part_1_length ]) &&
+                    (!isset($resource_name) || (isset($_filepath[$_resource_part_1_length]) &&
                                                 substr_compare($_filepath, $_resource_part_1,
                                                                - $_resource_part_1_length, $_resource_part_1_length) ==
-                                                0) || (isset($_filepath[ $_resource_part_2_length ]) &&
+                                                0) || (isset($_filepath[$_resource_part_2_length]) &&
                                                        substr_compare($_filepath, $_resource_part_2,
                                                                       - $_resource_part_2_length,
                                                                       $_resource_part_2_length) == 0))
@@ -108,7 +108,7 @@ 
                 }
 
                 if ($unlink && @unlink($_filepath)) {
-                    $_count ++;
+                    $_count++;
                     if (function_exists('opcache_invalidate') && strlen(ini_get("opcache.restrict_api")) < 1) {
                         opcache_invalidate($_filepath, true);
                     }

Braces +1 added lines, -2 removed lines

@@ -213,8 +213,7 @@
                 error_reporting($_smarty_old_error_level);
             }
             return $result;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             while (ob_get_level() > $level) {
                 ob_end_clean();
             }

libraries/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php

Indentation +70 added lines, -70 removed lines

@@ -16,83 +16,83 @@
  */
 class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
 {
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $required_attributes = array('file');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file', 'section');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $shorttag_order = array('file', 'section');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('section', 'scope');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $optional_attributes = array('section', 'scope');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('nocache', 'noscope');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $option_flags = array('nocache', 'noscope');
 
-    /**
-     * Valid scope names
-     *
-     * @var array
-     */
-    public $valid_scopes = array('local' => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
-                                 'root' => Smarty::SCOPE_ROOT, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
-                                 'smarty' => Smarty::SCOPE_SMARTY);
+	/**
+	 * Valid scope names
+	 *
+	 * @var array
+	 */
+	public $valid_scopes = array('local' => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
+								 'root' => Smarty::SCOPE_ROOT, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
+								 'smarty' => Smarty::SCOPE_SMARTY);
 
-    /**
-     * Compiles code for the {config_load} tag
-     *
-     * @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)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
+	/**
+	 * Compiles code for the {config_load} tag
+	 *
+	 * @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)
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
 
-        if ($_attr[ 'nocache' ] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', null, true);
-        }
+		if ($_attr[ 'nocache' ] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', null, true);
+		}
 
-        // save possible attributes
-        $conf_file = $_attr[ 'file' ];
-        if (isset($_attr[ 'section' ])) {
-            $section = $_attr[ 'section' ];
-        } else {
-            $section = 'null';
-        }
-        // scope setup
-        if ($_attr[ 'noscope' ]) {
-            $_scope = - 1;
-        } else {
-            $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
-        }
+		// save possible attributes
+		$conf_file = $_attr[ 'file' ];
+		if (isset($_attr[ 'section' ])) {
+			$section = $_attr[ 'section' ];
+		} else {
+			$section = 'null';
+		}
+		// scope setup
+		if ($_attr[ 'noscope' ]) {
+			$_scope = - 1;
+		} else {
+			$_scope = $compiler->convertScope($_attr, $this->valid_scopes);
+		}
 
-        // create config object
-        $_output =
-            "<?php\n\$_smarty_tpl->smarty->ext->configLoad->_loadConfigFile(\$_smarty_tpl, {$conf_file}, {$section}, {$_scope});\n?>\n";
+		// create config object
+		$_output =
+			"<?php\n\$_smarty_tpl->smarty->ext->configLoad->_loadConfigFile(\$_smarty_tpl, {$conf_file}, {$section}, {$_scope});\n?>\n";
 
-        return $_output;
-    }
+		return $_output;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -71,19 +71,19 @@
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        if ($_attr[ 'nocache' ] === true) {
+        if ($_attr['nocache'] === true) {
             $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
 
         // save possible attributes
-        $conf_file = $_attr[ 'file' ];
-        if (isset($_attr[ 'section' ])) {
-            $section = $_attr[ 'section' ];
+        $conf_file = $_attr['file'];
+        if (isset($_attr['section'])) {
+            $section = $_attr['section'];
         } else {
             $section = 'null';
         }
         // scope setup
-        if ($_attr[ 'noscope' ]) {
+        if ($_attr['noscope']) {
             $_scope = - 1;
         } else {
             $_scope = $compiler->convertScope($_attr, $this->valid_scopes);