YetiForceCompany / YetiForceCRM

libraries/Smarty/libs/plugins/function.html_options.php

Doc Comments +4 added lines

@@ -192,6 +192,10 @@
     return $_html_result;
 }
 
+/**
+ * @param string|null $id
+ * @param integer $idx
+ */
 function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
 {
     $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";

Indentation +157 added lines, -157 removed lines

@@ -35,170 +35,170 @@
  */
 function smarty_function_html_options($params)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = null;
-    $values = null;
-    $options = null;
-    $selected = null;
-    $output = null;
-    $id = null;
-    $class = null;
-
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'class':
-            case 'id':
-                $$_key = (string) $_val;
-                break;
-
-            case 'options':
-                $options = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            case 'selected':
-                if (is_array($_val)) {
-                    $selected = array();
-                    foreach ($_val as $_sel) {
-                        if (is_object($_sel)) {
-                            if (method_exists($_sel, "__toString")) {
-                                $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
-                            } else {
-                                trigger_error("html_options: selected attribute contains an object of class '" .
-                                              get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
-                                continue;
-                            }
-                        } else {
-                            $_sel = smarty_function_escape_special_chars((string) $_sel);
-                        }
-                        $selected[ $_sel ] = true;
-                    }
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_options: selected attribute is an object of class '" . get_class($_val) .
-                                      "' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = smarty_function_escape_special_chars((string) $_val);
-                }
-                break;
-
-            case 'strict':
-                break;
-
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
-                                      E_USER_NOTICE);
-                    }
-
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-
-                    break;
-                }
-            // omit break; to fall through!
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-
-        return '';
-    }
-
-    $_html_result = '';
-    $_idx = 0;
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        }
-    }
-
-    if (!empty($name)) {
-        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
-        $_html_result =
-            '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
-            '</select>' . "\n";
-    }
-
-    return $_html_result;
+	require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+	$name = null;
+	$values = null;
+	$options = null;
+	$selected = null;
+	$output = null;
+	$id = null;
+	$class = null;
+
+	$extra = '';
+
+	foreach ($params as $_key => $_val) {
+		switch ($_key) {
+			case 'name':
+			case 'class':
+			case 'id':
+				$$_key = (string) $_val;
+				break;
+
+			case 'options':
+				$options = (array) $_val;
+				break;
+
+			case 'values':
+			case 'output':
+				$$_key = array_values((array) $_val);
+				break;
+
+			case 'selected':
+				if (is_array($_val)) {
+					$selected = array();
+					foreach ($_val as $_sel) {
+						if (is_object($_sel)) {
+							if (method_exists($_sel, "__toString")) {
+								$_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
+							} else {
+								trigger_error("html_options: selected attribute contains an object of class '" .
+											  get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
+								continue;
+							}
+						} else {
+							$_sel = smarty_function_escape_special_chars((string) $_sel);
+						}
+						$selected[ $_sel ] = true;
+					}
+				} elseif (is_object($_val)) {
+					if (method_exists($_val, "__toString")) {
+						$selected = smarty_function_escape_special_chars((string) $_val->__toString());
+					} else {
+						trigger_error("html_options: selected attribute is an object of class '" . get_class($_val) .
+									  "' without __toString() method", E_USER_NOTICE);
+					}
+				} else {
+					$selected = smarty_function_escape_special_chars((string) $_val);
+				}
+				break;
+
+			case 'strict':
+				break;
+
+			case 'disabled':
+			case 'readonly':
+				if (!empty($params[ 'strict' ])) {
+					if (!is_scalar($_val)) {
+						trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+									  E_USER_NOTICE);
+					}
+
+					if ($_val === true || $_val === $_key) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+					}
+
+					break;
+				}
+			// omit break; to fall through!
+
+			default:
+				if (!is_array($_val)) {
+					$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+				} else {
+					trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+				}
+				break;
+		}
+	}
+
+	if (!isset($options) && !isset($values)) {
+		/* raise error here? */
+
+		return '';
+	}
+
+	$_html_result = '';
+	$_idx = 0;
+
+	if (isset($options)) {
+		foreach ($options as $_key => $_val) {
+			$_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+		}
+	} else {
+		foreach ($values as $_i => $_key) {
+			$_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+			$_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+		}
+	}
+
+	if (!empty($name)) {
+		$_html_class = !empty($class) ? ' class="' . $class . '"' : '';
+		$_html_id = !empty($id) ? ' id="' . $id . '"' : '';
+		$_html_result =
+			'<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
+			'</select>' . "\n";
+	}
+
+	return $_html_result;
 }
 
 function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
 {
-    if (!is_array($value)) {
-        $_key = smarty_function_escape_special_chars($key);
-        $_html_result = '<option value="' . $_key . '"';
-        if (is_array($selected)) {
-            if (isset($selected[ $_key ])) {
-                $_html_result .= ' selected="selected"';
-            }
-        } elseif ($_key === $selected) {
-            $_html_result .= ' selected="selected"';
-        }
-        $_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
-        if (is_object($value)) {
-            if (method_exists($value, "__toString")) {
-                $value = smarty_function_escape_special_chars((string) $value->__toString());
-            } else {
-                trigger_error("html_options: value is an object of class '" . get_class($value) .
-                              "' without __toString() method", E_USER_NOTICE);
-
-                return '';
-            }
-        } else {
-            $value = smarty_function_escape_special_chars((string) $value);
-        }
-        $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-        $idx ++;
-    } else {
-        $_idx = 0;
-        $_html_result =
-            smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null,
-                                                  $class, $_idx);
-        $idx ++;
-    }
-
-    return $_html_result;
+	if (!is_array($value)) {
+		$_key = smarty_function_escape_special_chars($key);
+		$_html_result = '<option value="' . $_key . '"';
+		if (is_array($selected)) {
+			if (isset($selected[ $_key ])) {
+				$_html_result .= ' selected="selected"';
+			}
+		} elseif ($_key === $selected) {
+			$_html_result .= ' selected="selected"';
+		}
+		$_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
+		$_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
+		if (is_object($value)) {
+			if (method_exists($value, "__toString")) {
+				$value = smarty_function_escape_special_chars((string) $value->__toString());
+			} else {
+				trigger_error("html_options: value is an object of class '" . get_class($value) .
+							  "' without __toString() method", E_USER_NOTICE);
+
+				return '';
+			}
+		} else {
+			$value = smarty_function_escape_special_chars((string) $value);
+		}
+		$_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
+		$idx ++;
+	} else {
+		$_idx = 0;
+		$_html_result =
+			smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null,
+												  $class, $_idx);
+		$idx ++;
+	}
+
+	return $_html_result;
 }
 
 function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
 {
-    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
-    foreach ($values as $key => $value) {
-        $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
-    }
-    $optgroup_html .= "</optgroup>\n";
+	$optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
+	foreach ($values as $key => $value) {
+		$optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
+	}
+	$optgroup_html .= "</optgroup>\n";
 
-    return $optgroup_html;
+	return $optgroup_html;
 }

Spacing +6 added lines, -6 removed lines

@@ -79,7 +79,7 @@ 
                         } else {
                             $_sel = smarty_function_escape_special_chars((string) $_sel);
                         }
-                        $selected[ $_sel ] = true;
+                        $selected[$_sel] = true;
                     }
                 } elseif (is_object($_val)) {
                     if (method_exists($_val, "__toString")) {
@@ -98,7 +98,7 @@ 
 
             case 'disabled':
             case 'readonly':
-                if (!empty($params[ 'strict' ])) {
+                if (!empty($params['strict'])) {
                     if (!is_scalar($_val)) {
                         trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
                                       E_USER_NOTICE);
@@ -137,7 +137,7 @@ 
         }
     } else {
         foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
         }
     }
@@ -159,7 +159,7 @@ 
         $_key = smarty_function_escape_special_chars($key);
         $_html_result = '<option value="' . $_key . '"';
         if (is_array($selected)) {
-            if (isset($selected[ $_key ])) {
+            if (isset($selected[$_key])) {
                 $_html_result .= ' selected="selected"';
             }
         } elseif ($_key === $selected) {
@@ -180,13 +180,13 @@ 
             $value = smarty_function_escape_special_chars((string) $value);
         }
         $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-        $idx ++;
+        $idx++;
     } else {
         $_idx = 0;
         $_html_result =
             smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null,
                                                   $class, $_idx);
-        $idx ++;
+        $idx++;
     }
 
     return $_html_result;

libraries/Smarty/libs/plugins/function.html_radios.php

Doc Comments +8 added lines

@@ -164,6 +164,14 @@
     }
 }
 
+/**
+ * @param string $name
+ * @param string $extra
+ * @param string $separator
+ * @param boolean $labels
+ * @param boolean $label_ids
+ * @param boolean $escape
+ */
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids,
                                             $escape)
 {

Indentation +180 added lines, -180 removed lines

@@ -45,188 +45,188 @@
  */
 function smarty_function_html_radios($params, $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = 'radio';
-    $values = null;
-    $options = null;
-    $selected = null;
-    $separator = '';
-    $escape = true;
-    $labels = true;
-    $label_ids = false;
-    $output = null;
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = (string) $_val;
-                break;
-
-            case 'checked':
-            case 'selected':
-                if (is_array($_val)) {
-                    trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_radios: selected attribute is an object of class '" . get_class($_val) .
-                                      "' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = (string) $_val;
-                }
-                break;
-
-            case 'escape':
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool) $_val;
-                break;
-
-            case 'options':
-                $$_key = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            case 'radios':
-                trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
-                              E_USER_WARNING);
-                $options = (array) $_val;
-                break;
-
-            case 'assign':
-                break;
-
-            case 'strict':
-                break;
-
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
-                                      E_USER_NOTICE);
-                    }
-
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-
-                    break;
-                }
-            // omit break; to fall through!
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-
-        return '';
-    }
-
-    $_html_result = array();
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] =
-                smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
-                                                   $label_ids, $escape);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result[] =
-                smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
-                                                   $label_ids, $escape);
-        }
-    }
-
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
-    } else {
-        return implode("\n", $_html_result);
-    }
+	require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+	$name = 'radio';
+	$values = null;
+	$options = null;
+	$selected = null;
+	$separator = '';
+	$escape = true;
+	$labels = true;
+	$label_ids = false;
+	$output = null;
+	$extra = '';
+
+	foreach ($params as $_key => $_val) {
+		switch ($_key) {
+			case 'name':
+			case 'separator':
+				$$_key = (string) $_val;
+				break;
+
+			case 'checked':
+			case 'selected':
+				if (is_array($_val)) {
+					trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
+				} elseif (is_object($_val)) {
+					if (method_exists($_val, "__toString")) {
+						$selected = smarty_function_escape_special_chars((string) $_val->__toString());
+					} else {
+						trigger_error("html_radios: selected attribute is an object of class '" . get_class($_val) .
+									  "' without __toString() method", E_USER_NOTICE);
+					}
+				} else {
+					$selected = (string) $_val;
+				}
+				break;
+
+			case 'escape':
+			case 'labels':
+			case 'label_ids':
+				$$_key = (bool) $_val;
+				break;
+
+			case 'options':
+				$$_key = (array) $_val;
+				break;
+
+			case 'values':
+			case 'output':
+				$$_key = array_values((array) $_val);
+				break;
+
+			case 'radios':
+				trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
+							  E_USER_WARNING);
+				$options = (array) $_val;
+				break;
+
+			case 'assign':
+				break;
+
+			case 'strict':
+				break;
+
+			case 'disabled':
+			case 'readonly':
+				if (!empty($params[ 'strict' ])) {
+					if (!is_scalar($_val)) {
+						trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+									  E_USER_NOTICE);
+					}
+
+					if ($_val === true || $_val === $_key) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+					}
+
+					break;
+				}
+			// omit break; to fall through!
+
+			default:
+				if (!is_array($_val)) {
+					$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+				} else {
+					trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+				}
+				break;
+		}
+	}
+
+	if (!isset($options) && !isset($values)) {
+		/* raise error here? */
+
+		return '';
+	}
+
+	$_html_result = array();
+
+	if (isset($options)) {
+		foreach ($options as $_key => $_val) {
+			$_html_result[] =
+				smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+												   $label_ids, $escape);
+		}
+	} else {
+		foreach ($values as $_i => $_key) {
+			$_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+			$_html_result[] =
+				smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+												   $label_ids, $escape);
+		}
+	}
+
+	if (!empty($params[ 'assign' ])) {
+		$template->assign($params[ 'assign' ], $_html_result);
+	} else {
+		return implode("\n", $_html_result);
+	}
 }
 
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids,
-                                            $escape)
+											$escape)
 {
-    $_output = '';
-
-    if (is_object($value)) {
-        if (method_exists($value, "__toString")) {
-            $value = (string) $value->__toString();
-        } else {
-            trigger_error("html_options: value is an object of class '" . get_class($value) .
-                          "' without __toString() method", E_USER_NOTICE);
-
-            return '';
-        }
-    } else {
-        $value = (string) $value;
-    }
-
-    if (is_object($output)) {
-        if (method_exists($output, "__toString")) {
-            $output = (string) $output->__toString();
-        } else {
-            trigger_error("html_options: output is an object of class '" . get_class($output) .
-                          "' without __toString() method", E_USER_NOTICE);
-
-            return '';
-        }
-    } else {
-        $output = (string) $output;
-    }
-
-    if ($labels) {
-        if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
-                                                                     $name . '_' . $value));
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-
-    $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
-
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-
-    if ($value === $selected) {
-        $_output .= ' checked="checked"';
-    }
-
-    $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-
-    $_output .= $separator;
-
-    return $_output;
+	$_output = '';
+
+	if (is_object($value)) {
+		if (method_exists($value, "__toString")) {
+			$value = (string) $value->__toString();
+		} else {
+			trigger_error("html_options: value is an object of class '" . get_class($value) .
+						  "' without __toString() method", E_USER_NOTICE);
+
+			return '';
+		}
+	} else {
+		$value = (string) $value;
+	}
+
+	if (is_object($output)) {
+		if (method_exists($output, "__toString")) {
+			$output = (string) $output->__toString();
+		} else {
+			trigger_error("html_options: output is an object of class '" . get_class($output) .
+						  "' without __toString() method", E_USER_NOTICE);
+
+			return '';
+		}
+	} else {
+		$output = (string) $output;
+	}
+
+	if ($labels) {
+		if ($label_ids) {
+			$_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
+																	 $name . '_' . $value));
+			$_output .= '<label for="' . $_id . '">';
+		} else {
+			$_output .= '<label>';
+		}
+	}
+
+	$name = smarty_function_escape_special_chars($name);
+	$value = smarty_function_escape_special_chars($value);
+	if ($escape) {
+		$output = smarty_function_escape_special_chars($output);
+	}
+
+	$_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
+
+	if ($labels && $label_ids) {
+		$_output .= ' id="' . $_id . '"';
+	}
+
+	if ($value === $selected) {
+		$_output .= ' checked="checked"';
+	}
+
+	$_output .= $extra . ' />' . $output;
+	if ($labels) {
+		$_output .= '</label>';
+	}
+
+	$_output .= $separator;
+
+	return $_output;
 }

Spacing +4 added lines, -4 removed lines

@@ -110,7 +110,7 @@ 
 
             case 'disabled':
             case 'readonly':
-                if (!empty($params[ 'strict' ])) {
+                if (!empty($params['strict'])) {
                     if (!is_scalar($_val)) {
                         trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
                                       E_USER_NOTICE);
@@ -150,15 +150,15 @@ 
         }
     } else {
         foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result[] =
                 smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
                                                    $label_ids, $escape);
         }
     }
 
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
+    if (!empty($params['assign'])) {
+        $template->assign($params['assign'], $_html_result);
     } else {
         return implode("\n", $_html_result);
     }

libraries/Smarty/libs/plugins/function.html_table.php

Doc Comments +4 added lines

@@ -164,6 +164,10 @@
     return $output;
 }
 
+/**
+ * @param string $name
+ * @param string $var
+ */
 function smarty_function_html_table_cycle($name, $var, $no)
 {
     if (!is_array($var)) {

Indentation +119 added lines, -119 removed lines

@@ -49,128 +49,128 @@
  */
 function smarty_function_html_table($params)
 {
-    $table_attr = 'border="1"';
-    $tr_attr = '';
-    $th_attr = '';
-    $td_attr = '';
-    $cols = $cols_count = 3;
-    $rows = 3;
-    $trailpad = ' ';
-    $vdir = 'down';
-    $hdir = 'right';
-    $inner = 'cols';
-    $caption = '';
-    $loop = null;
-
-    if (!isset($params[ 'loop' ])) {
-        trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
-
-        return;
-    }
-
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'loop':
-                $$_key = (array) $_value;
-                break;
-
-            case 'cols':
-                if (is_array($_value) && !empty($_value)) {
-                    $cols = $_value;
-                    $cols_count = count($_value);
-                } elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
-                    $cols = explode(',', $_value);
-                    $cols_count = count($cols);
-                } elseif (!empty($_value)) {
-                    $cols_count = (int) $_value;
-                } else {
-                    $cols_count = $cols;
-                }
-                break;
-
-            case 'rows':
-                $$_key = (int) $_value;
-                break;
-
-            case 'table_attr':
-            case 'trailpad':
-            case 'hdir':
-            case 'vdir':
-            case 'inner':
-            case 'caption':
-                $$_key = (string) $_value;
-                break;
-
-            case 'tr_attr':
-            case 'td_attr':
-            case 'th_attr':
-                $$_key = $_value;
-                break;
-        }
-    }
-
-    $loop_count = count($loop);
-    if (empty($params[ 'rows' ])) {
-        /* no rows specified */
-        $rows = ceil($loop_count / $cols_count);
-    } elseif (empty($params[ 'cols' ])) {
-        if (!empty($params[ 'rows' ])) {
-            /* no cols specified, but rows */
-            $cols_count = ceil($loop_count / $rows);
-        }
-    }
-
-    $output = "<table $table_attr>\n";
-
-    if (!empty($caption)) {
-        $output .= '<caption>' . $caption . "</caption>\n";
-    }
-
-    if (is_array($cols)) {
-        $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
-        $output .= "<thead><tr>\n";
-
-        for ($r = 0; $r < $cols_count; $r ++) {
-            $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-            $output .= $cols[ $r ];
-            $output .= "</th>\n";
-        }
-        $output .= "</tr></thead>\n";
-    }
-
-    $output .= "<tbody>\n";
-    for ($r = 0; $r < $rows; $r ++) {
-        $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
-
-        for ($c = 0; $c < $cols_count; $c ++) {
-            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
-            if ($inner != 'cols') {
-                /* shuffle x to loop over rows*/
-                $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
-            }
-
-            if ($x < $loop_count) {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
-            } else {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
-            }
-        }
-        $output .= "</tr>\n";
-    }
-    $output .= "</tbody>\n";
-    $output .= "</table>\n";
-
-    return $output;
+	$table_attr = 'border="1"';
+	$tr_attr = '';
+	$th_attr = '';
+	$td_attr = '';
+	$cols = $cols_count = 3;
+	$rows = 3;
+	$trailpad = '&nbsp;';
+	$vdir = 'down';
+	$hdir = 'right';
+	$inner = 'cols';
+	$caption = '';
+	$loop = null;
+
+	if (!isset($params[ 'loop' ])) {
+		trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
+
+		return;
+	}
+
+	foreach ($params as $_key => $_value) {
+		switch ($_key) {
+			case 'loop':
+				$$_key = (array) $_value;
+				break;
+
+			case 'cols':
+				if (is_array($_value) && !empty($_value)) {
+					$cols = $_value;
+					$cols_count = count($_value);
+				} elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
+					$cols = explode(',', $_value);
+					$cols_count = count($cols);
+				} elseif (!empty($_value)) {
+					$cols_count = (int) $_value;
+				} else {
+					$cols_count = $cols;
+				}
+				break;
+
+			case 'rows':
+				$$_key = (int) $_value;
+				break;
+
+			case 'table_attr':
+			case 'trailpad':
+			case 'hdir':
+			case 'vdir':
+			case 'inner':
+			case 'caption':
+				$$_key = (string) $_value;
+				break;
+
+			case 'tr_attr':
+			case 'td_attr':
+			case 'th_attr':
+				$$_key = $_value;
+				break;
+		}
+	}
+
+	$loop_count = count($loop);
+	if (empty($params[ 'rows' ])) {
+		/* no rows specified */
+		$rows = ceil($loop_count / $cols_count);
+	} elseif (empty($params[ 'cols' ])) {
+		if (!empty($params[ 'rows' ])) {
+			/* no cols specified, but rows */
+			$cols_count = ceil($loop_count / $rows);
+		}
+	}
+
+	$output = "<table $table_attr>\n";
+
+	if (!empty($caption)) {
+		$output .= '<caption>' . $caption . "</caption>\n";
+	}
+
+	if (is_array($cols)) {
+		$cols = ($hdir == 'right') ? $cols : array_reverse($cols);
+		$output .= "<thead><tr>\n";
+
+		for ($r = 0; $r < $cols_count; $r ++) {
+			$output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
+			$output .= $cols[ $r ];
+			$output .= "</th>\n";
+		}
+		$output .= "</tr></thead>\n";
+	}
+
+	$output .= "<tbody>\n";
+	for ($r = 0; $r < $rows; $r ++) {
+		$output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
+		$rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
+
+		for ($c = 0; $c < $cols_count; $c ++) {
+			$x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
+			if ($inner != 'cols') {
+				/* shuffle x to loop over rows*/
+				$x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
+			}
+
+			if ($x < $loop_count) {
+				$output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
+			} else {
+				$output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
+			}
+		}
+		$output .= "</tr>\n";
+	}
+	$output .= "</tbody>\n";
+	$output .= "</table>\n";
+
+	return $output;
 }
 
 function smarty_function_html_table_cycle($name, $var, $no)
 {
-    if (!is_array($var)) {
-        $ret = $var;
-    } else {
-        $ret = $var[ $no % count($var) ];
-    }
+	if (!is_array($var)) {
+		$ret = $var;
+	} else {
+		$ret = $var[ $no % count($var) ];
+	}
 
-    return ($ret) ? ' ' . $ret : '';
+	return ($ret) ? ' ' . $ret : '';
 }

Spacing +10 added lines, -10 removed lines

@@ -62,7 +62,7 @@ 
     $caption = '';
     $loop = null;
 
-    if (!isset($params[ 'loop' ])) {
+    if (!isset($params['loop'])) {
         trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
 
         return;
@@ -110,11 +110,11 @@ 
     }
 
     $loop_count = count($loop);
-    if (empty($params[ 'rows' ])) {
+    if (empty($params['rows'])) {
         /* no rows specified */
         $rows = ceil($loop_count / $cols_count);
-    } elseif (empty($params[ 'cols' ])) {
-        if (!empty($params[ 'rows' ])) {
+    } elseif (empty($params['cols'])) {
+        if (!empty($params['rows'])) {
             /* no cols specified, but rows */
             $cols_count = ceil($loop_count / $rows);
         }
@@ -130,20 +130,20 @@ 
         $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
         $output .= "<thead><tr>\n";
 
-        for ($r = 0; $r < $cols_count; $r ++) {
+        for ($r = 0; $r < $cols_count; $r++) {
             $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-            $output .= $cols[ $r ];
+            $output .= $cols[$r];
             $output .= "</th>\n";
         }
         $output .= "</tr></thead>\n";
     }
 
     $output .= "<tbody>\n";
-    for ($r = 0; $r < $rows; $r ++) {
+    for ($r = 0; $r < $rows; $r++) {
         $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
         $rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
 
-        for ($c = 0; $c < $cols_count; $c ++) {
+        for ($c = 0; $c < $cols_count; $c++) {
             $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
             if ($inner != 'cols') {
                 /* shuffle x to loop over rows*/
@@ -151,7 +151,7 @@ 
             }
 
             if ($x < $loop_count) {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
+                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
             } else {
                 $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
             }
@@ -169,7 +169,7 @@ 
     if (!is_array($var)) {
         $ret = $var;
     } else {
-        $ret = $var[ $no % count($var) ];
+        $ret = $var[$no % count($var)];
     }
 
     return ($ret) ? ' ' . $ret : '';

libraries/Smarty/libs/Smarty.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -1159,7 +1159,7 @@
      * @param string                    $template_name
      * @param null|mixed                $cache_id
      * @param null|mixed                $compile_id
-     * @param null                      $caching
+     * @param integer                      $caching
      * @param \Smarty_Internal_Template $template
      *
      * @return string

Indentation +1355 added lines, -1355 removed lines

@@ -34,7 +34,7 @@ 
  * define shorthand directory separator constant
  */
 if (!defined('DS')) {
-    define('DS', DIRECTORY_SEPARATOR);
+	define('DS', DIRECTORY_SEPARATOR);
 }
 
 /**
@@ -42,7 +42,7 @@ 
  * Sets SMARTY_DIR only if user application has not already defined it.
  */
 if (!defined('SMARTY_DIR')) {
-    define('SMARTY_DIR', dirname(__FILE__) . DS);
+	define('SMARTY_DIR', dirname(__FILE__) . DS);
 }
 
 /**
@@ -50,26 +50,26 @@ 
  * Sets SMARTY_SYSPLUGINS_DIR only if user application has not already defined it.
  */
 if (!defined('SMARTY_SYSPLUGINS_DIR')) {
-    define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DS);
+	define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DS);
 }
 if (!defined('SMARTY_PLUGINS_DIR')) {
-    define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
+	define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
 }
 if (!defined('SMARTY_MBSTRING')) {
-    define('SMARTY_MBSTRING', function_exists('mb_get_info'));
+	define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
 if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
-    // UTF-8 can only be done properly when mbstring is available!
-    /**
-     * @deprecated in favor of Smarty::$_CHARSET
-     */
-    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
+	// UTF-8 can only be done properly when mbstring is available!
+	/**
+	 * @deprecated in favor of Smarty::$_CHARSET
+	 */
+	define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
 }
 if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
-    /**
-     * @deprecated in favor of Smarty::$_DATE_FORMAT
-     */
-    define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
+	/**
+	 * @deprecated in favor of Smarty::$_DATE_FORMAT
+	 */
+	define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
 }
 
 /**
@@ -78,17 +78,17 @@ 
  * Otherwise we may have a global autoloader like Composer
  */
 if (!class_exists('Smarty_Autoloader', false)) {
-    if (!class_exists('Smarty_Internal_Data', true)) {
-        require_once dirname(__FILE__) . '/Autoloader.php';
-        Smarty_Autoloader::registerBC();
-    }
+	if (!class_exists('Smarty_Internal_Data', true)) {
+		require_once dirname(__FILE__) . '/Autoloader.php';
+		Smarty_Autoloader::registerBC();
+	}
 }
 
 /**
  * Load always needed external class files
  */
 if (!class_exists('Smarty_Internal_Data', false)) {
-    require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
+	require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
 }
 require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_extension_handler.php';
 require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
@@ -114,1385 +114,1385 @@ 
  */
 class Smarty extends Smarty_Internal_TemplateBase
 {
-    /**#@+
+	/**#@+
      * constant definitions
      */
 
-    /**
-     * smarty version
-     */
-    const SMARTY_VERSION = '3.1.30';
+	/**
+	 * smarty version
+	 */
+	const SMARTY_VERSION = '3.1.30';
 
-    /**
-     * define variable scopes
-     */
-    const SCOPE_LOCAL = 1;
+	/**
+	 * define variable scopes
+	 */
+	const SCOPE_LOCAL = 1;
 
-    const SCOPE_PARENT = 2;
+	const SCOPE_PARENT = 2;
 
-    const SCOPE_TPL_ROOT = 4;
+	const SCOPE_TPL_ROOT = 4;
 
-    const SCOPE_ROOT = 8;
+	const SCOPE_ROOT = 8;
 
-    const SCOPE_SMARTY = 16;
+	const SCOPE_SMARTY = 16;
 
-    const SCOPE_GLOBAL = 32;
+	const SCOPE_GLOBAL = 32;
 
-    /**
-     * define caching modes
-     */
-    const CACHING_OFF = 0;
+	/**
+	 * define caching modes
+	 */
+	const CACHING_OFF = 0;
 
-    const CACHING_LIFETIME_CURRENT = 1;
+	const CACHING_LIFETIME_CURRENT = 1;
 
-    const CACHING_LIFETIME_SAVED = 2;
+	const CACHING_LIFETIME_SAVED = 2;
 
-    /**
-     * define constant for clearing cache files be saved expiration dates
-     */
-    const CLEAR_EXPIRED = - 1;
+	/**
+	 * define constant for clearing cache files be saved expiration dates
+	 */
+	const CLEAR_EXPIRED = - 1;
 
-    /**
-     * define compile check modes
-     */
-    const COMPILECHECK_OFF = 0;
+	/**
+	 * define compile check modes
+	 */
+	const COMPILECHECK_OFF = 0;
 
-    const COMPILECHECK_ON = 1;
+	const COMPILECHECK_ON = 1;
 
-    const COMPILECHECK_CACHEMISS = 2;
+	const COMPILECHECK_CACHEMISS = 2;
 
-    /**
-     * define debug modes
-     */
-    const DEBUG_OFF = 0;
+	/**
+	 * define debug modes
+	 */
+	const DEBUG_OFF = 0;
 
-    const DEBUG_ON = 1;
+	const DEBUG_ON = 1;
 
-    const DEBUG_INDIVIDUAL = 2;
+	const DEBUG_INDIVIDUAL = 2;
 
-    /**
-     * modes for handling of "<?php ... ?>" tags in templates.
-     */
-    const PHP_PASSTHRU = 0; //-> print tags as plain text
+	/**
+	 * modes for handling of "<?php ... ?>" tags in templates.
+	 */
+	const PHP_PASSTHRU = 0; //-> print tags as plain text
 
-    const PHP_QUOTE = 1; //-> escape tags as entities
+	const PHP_QUOTE = 1; //-> escape tags as entities
 
-    const PHP_REMOVE = 2; //-> escape tags as entities
+	const PHP_REMOVE = 2; //-> escape tags as entities
 
-    const PHP_ALLOW = 3; //-> escape tags as entities
+	const PHP_ALLOW = 3; //-> escape tags as entities
 
-    /**
-     * filter types
-     */
-    const FILTER_POST = 'post';
+	/**
+	 * filter types
+	 */
+	const FILTER_POST = 'post';
 
-    const FILTER_PRE = 'pre';
+	const FILTER_PRE = 'pre';
 
-    const FILTER_OUTPUT = 'output';
+	const FILTER_OUTPUT = 'output';
 
-    const FILTER_VARIABLE = 'variable';
+	const FILTER_VARIABLE = 'variable';
 
-    /**
-     * plugin types
-     */
-    const PLUGIN_FUNCTION = 'function';
+	/**
+	 * plugin types
+	 */
+	const PLUGIN_FUNCTION = 'function';
 
-    const PLUGIN_BLOCK = 'block';
+	const PLUGIN_BLOCK = 'block';
 
-    const PLUGIN_COMPILER = 'compiler';
+	const PLUGIN_COMPILER = 'compiler';
 
-    const PLUGIN_MODIFIER = 'modifier';
+	const PLUGIN_MODIFIER = 'modifier';
 
-    const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
+	const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
 
-    /**
-     * Resource caching modes
-     * (not used since 3.1.30)
-     */
-    const RESOURCE_CACHE_OFF = 0;
+	/**
+	 * Resource caching modes
+	 * (not used since 3.1.30)
+	 */
+	const RESOURCE_CACHE_OFF = 0;
 
-    const RESOURCE_CACHE_AUTOMATIC = 1; // cache template objects by rules
+	const RESOURCE_CACHE_AUTOMATIC = 1; // cache template objects by rules
 
-    const RESOURCE_CACHE_TEMPLATE = 2; // cache all template objects
+	const RESOURCE_CACHE_TEMPLATE = 2; // cache all template objects
 
-    const RESOURCE_CACHE_ON = 4;    // cache source and compiled resources
+	const RESOURCE_CACHE_ON = 4;    // cache source and compiled resources
 
-    /**#@-*/
+	/**#@-*/
 
-    /**
-     * assigned global tpl vars
-     */
-    public static $global_tpl_vars = array();
+	/**
+	 * assigned global tpl vars
+	 */
+	public static $global_tpl_vars = array();
 
-    /**
-     * error handler returned by set_error_handler() in Smarty::muteExpectedErrors()
-     */
-    public static $_previous_error_handler = null;
+	/**
+	 * error handler returned by set_error_handler() in Smarty::muteExpectedErrors()
+	 */
+	public static $_previous_error_handler = null;
 
-    /**
-     * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
-     */
-    public static $_muted_directories = array();
+	/**
+	 * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
+	 */
+	public static $_muted_directories = array();
 
-    /**
-     * Flag denoting if Multibyte String functions are available
-     */
-    public static $_MBSTRING = SMARTY_MBSTRING;
+	/**
+	 * Flag denoting if Multibyte String functions are available
+	 */
+	public static $_MBSTRING = SMARTY_MBSTRING;
 
-    /**
-     * The character set to adhere to (e.g. "UTF-8")
-     */
-    public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
+	/**
+	 * The character set to adhere to (e.g. "UTF-8")
+	 */
+	public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
 
-    /**
-     * The date format to be used internally
-     * (accepts date() and strftime())
-     */
-    public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
+	/**
+	 * The date format to be used internally
+	 * (accepts date() and strftime())
+	 */
+	public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
 
-    /**
-     * Flag denoting if PCRE should run in UTF-8 mode
-     */
-    public static $_UTF8_MODIFIER = 'u';
+	/**
+	 * Flag denoting if PCRE should run in UTF-8 mode
+	 */
+	public static $_UTF8_MODIFIER = 'u';
 
-    /**
-     * Flag denoting if operating system is windows
-     */
-    public static $_IS_WINDOWS = false;
+	/**
+	 * Flag denoting if operating system is windows
+	 */
+	public static $_IS_WINDOWS = false;
 
-    /**#@+
+	/**#@+
      * variables
      */
 
-    /**
-     * auto literal on delimiters with whitespace
-     *
-     * @var boolean
-     */
-    public $auto_literal = true;
-
-    /**
-     * display error on not assigned variables
-     *
-     * @var boolean
-     */
-    public $error_unassigned = false;
-
-    /**
-     * look up relative file path in include_path
-     *
-     * @var boolean
-     */
-    public $use_include_path = false;
-
-    /**
-     * template directory
-     *
-     * @var array
-     */
-    protected $template_dir = array('./templates/');
-
-    /**
-     * flags for normalized template directory entries
-     *
-     * @var array
-     */
-    protected $_processedTemplateDir = array();
-
-    /**
-     * flag if template_dir is normalized
-     *
-     * @var bool
-     */
-    public $_templateDirNormalized = false;
-
-    /**
-     * joined template directory string used in cache keys
-     *
-     * @var string
-     */
-    public $_joined_template_dir = null;
-
-    /**
-     * config directory
-     *
-     * @var array
-     */
-    protected $config_dir = array('./configs/');
-
-    /**
-     * flags for normalized template directory entries
-     *
-     * @var array
-     */
-    protected $_processedConfigDir = array();
-
-    /**
-     * flag if config_dir is normalized
-     *
-     * @var bool
-     */
-    public $_configDirNormalized = false;
-
-    /**
-     * joined config directory string used in cache keys
-     *
-     * @var string
-     */
-    public $_joined_config_dir = null;
-
-    /**
-     * default template handler
-     *
-     * @var callable
-     */
-    public $default_template_handler_func = null;
-
-    /**
-     * default config handler
-     *
-     * @var callable
-     */
-    public $default_config_handler_func = null;
-
-    /**
-     * default plugin handler
-     *
-     * @var callable
-     */
-    public $default_plugin_handler_func = null;
-
-    /**
-     * compile directory
-     *
-     * @var string
-     */
-    protected $compile_dir = './templates_c/';
-
-    /**
-     * flag if template_dir is normalized
-     *
-     * @var bool
-     */
-    public $_compileDirNormalized = false;
-
-    /**
-     * plugins directory
-     *
-     * @var array
-     */
-    protected $plugins_dir = array();
-
-    /**
-     * flag if plugins_dir is normalized
-     *
-     * @var bool
-     */
-    public $_pluginsDirNormalized = false;
-
-    /**
-     * cache directory
-     *
-     * @var string
-     */
-    protected $cache_dir = './cache/';
-
-    /**
-     * flag if template_dir is normalized
-     *
-     * @var bool
-     */
-    public $_cacheDirNormalized = false;
-
-    /**
-     * force template compiling?
-     *
-     * @var boolean
-     */
-    public $force_compile = false;
-
-    /**
-     * check template for modifications?
-     *
-     * @var boolean
-     */
-    public $compile_check = true;
-
-    /**
-     * use sub dirs for compiled/cached files?
-     *
-     * @var boolean
-     */
-    public $use_sub_dirs = false;
-
-    /**
-     * allow ambiguous resources (that are made unique by the resource handler)
-     *
-     * @var boolean
-     */
-    public $allow_ambiguous_resources = false;
-
-    /**
-     * merge compiled includes
-     *
-     * @var boolean
-     */
-    public $merge_compiled_includes = false;
-
-    /**
-     * force cache file creation
-     *
-     * @var boolean
-     */
-    public $force_cache = false;
-
-    /**
-     * template left-delimiter
-     *
-     * @var string
-     */
-    public $left_delimiter = "{";
-
-    /**
-     * template right-delimiter
-     *
-     * @var string
-     */
-    public $right_delimiter = "}";
-
-    /**#@+
+	/**
+	 * auto literal on delimiters with whitespace
+	 *
+	 * @var boolean
+	 */
+	public $auto_literal = true;
+
+	/**
+	 * display error on not assigned variables
+	 *
+	 * @var boolean
+	 */
+	public $error_unassigned = false;
+
+	/**
+	 * look up relative file path in include_path
+	 *
+	 * @var boolean
+	 */
+	public $use_include_path = false;
+
+	/**
+	 * template directory
+	 *
+	 * @var array
+	 */
+	protected $template_dir = array('./templates/');
+
+	/**
+	 * flags for normalized template directory entries
+	 *
+	 * @var array
+	 */
+	protected $_processedTemplateDir = array();
+
+	/**
+	 * flag if template_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_templateDirNormalized = false;
+
+	/**
+	 * joined template directory string used in cache keys
+	 *
+	 * @var string
+	 */
+	public $_joined_template_dir = null;
+
+	/**
+	 * config directory
+	 *
+	 * @var array
+	 */
+	protected $config_dir = array('./configs/');
+
+	/**
+	 * flags for normalized template directory entries
+	 *
+	 * @var array
+	 */
+	protected $_processedConfigDir = array();
+
+	/**
+	 * flag if config_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_configDirNormalized = false;
+
+	/**
+	 * joined config directory string used in cache keys
+	 *
+	 * @var string
+	 */
+	public $_joined_config_dir = null;
+
+	/**
+	 * default template handler
+	 *
+	 * @var callable
+	 */
+	public $default_template_handler_func = null;
+
+	/**
+	 * default config handler
+	 *
+	 * @var callable
+	 */
+	public $default_config_handler_func = null;
+
+	/**
+	 * default plugin handler
+	 *
+	 * @var callable
+	 */
+	public $default_plugin_handler_func = null;
+
+	/**
+	 * compile directory
+	 *
+	 * @var string
+	 */
+	protected $compile_dir = './templates_c/';
+
+	/**
+	 * flag if template_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_compileDirNormalized = false;
+
+	/**
+	 * plugins directory
+	 *
+	 * @var array
+	 */
+	protected $plugins_dir = array();
+
+	/**
+	 * flag if plugins_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_pluginsDirNormalized = false;
+
+	/**
+	 * cache directory
+	 *
+	 * @var string
+	 */
+	protected $cache_dir = './cache/';
+
+	/**
+	 * flag if template_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_cacheDirNormalized = false;
+
+	/**
+	 * force template compiling?
+	 *
+	 * @var boolean
+	 */
+	public $force_compile = false;
+
+	/**
+	 * check template for modifications?
+	 *
+	 * @var boolean
+	 */
+	public $compile_check = true;
+
+	/**
+	 * use sub dirs for compiled/cached files?
+	 *
+	 * @var boolean
+	 */
+	public $use_sub_dirs = false;
+
+	/**
+	 * allow ambiguous resources (that are made unique by the resource handler)
+	 *
+	 * @var boolean
+	 */
+	public $allow_ambiguous_resources = false;
+
+	/**
+	 * merge compiled includes
+	 *
+	 * @var boolean
+	 */
+	public $merge_compiled_includes = false;
+
+	/**
+	 * force cache file creation
+	 *
+	 * @var boolean
+	 */
+	public $force_cache = false;
+
+	/**
+	 * template left-delimiter
+	 *
+	 * @var string
+	 */
+	public $left_delimiter = "{";
+
+	/**
+	 * template right-delimiter
+	 *
+	 * @var string
+	 */
+	public $right_delimiter = "}";
+
+	/**#@+
      * security
      */
-    /**
-     * class name
-     * This should be instance of Smarty_Security.
-     *
-     * @var string
-     * @see Smarty_Security
-     */
-    public $security_class = 'Smarty_Security';
-
-    /**
-     * implementation of security class
-     *
-     * @var Smarty_Security
-     */
-    public $security_policy = null;
-
-    /**
-     * controls handling of PHP-blocks
-     *
-     * @var integer
-     */
-    public $php_handling = self::PHP_PASSTHRU;
-
-    /**
-     * controls if the php template file resource is allowed
-     *
-     * @var bool
-     */
-    public $allow_php_templates = false;
-
-    /**#@-*/
-    /**
-     * debug mode
-     * Setting this to true enables the debug-console.
-     *
-     * @var boolean
-     */
-    public $debugging = false;
-
-    /**
-     * This determines if debugging is enable-able from the browser.
-     * <ul>
-     *  <li>NONE => no debugging control allowed</li>
-     *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
-     * </ul>
-     *
-     * @var string
-     */
-    public $debugging_ctrl = 'NONE';
-
-    /**
-     * Name of debugging URL-param.
-     * Only used when $debugging_ctrl is set to 'URL'.
-     * The name of the URL-parameter that activates debugging.
-     *
-     * @var string
-     */
-    public $smarty_debug_id = 'SMARTY_DEBUG';
-
-    /**
-     * Path of debug template.
-     *
-     * @var string
-     */
-    public $debug_tpl = null;
-
-    /**
-     * When set, smarty uses this value as error_reporting-level.
-     *
-     * @var int
-     */
-    public $error_reporting = null;
-
-    /**#@+
+	/**
+	 * class name
+	 * This should be instance of Smarty_Security.
+	 *
+	 * @var string
+	 * @see Smarty_Security
+	 */
+	public $security_class = 'Smarty_Security';
+
+	/**
+	 * implementation of security class
+	 *
+	 * @var Smarty_Security
+	 */
+	public $security_policy = null;
+
+	/**
+	 * controls handling of PHP-blocks
+	 *
+	 * @var integer
+	 */
+	public $php_handling = self::PHP_PASSTHRU;
+
+	/**
+	 * controls if the php template file resource is allowed
+	 *
+	 * @var bool
+	 */
+	public $allow_php_templates = false;
+
+	/**#@-*/
+	/**
+	 * debug mode
+	 * Setting this to true enables the debug-console.
+	 *
+	 * @var boolean
+	 */
+	public $debugging = false;
+
+	/**
+	 * This determines if debugging is enable-able from the browser.
+	 * <ul>
+	 *  <li>NONE => no debugging control allowed</li>
+	 *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
+	 * </ul>
+	 *
+	 * @var string
+	 */
+	public $debugging_ctrl = 'NONE';
+
+	/**
+	 * Name of debugging URL-param.
+	 * Only used when $debugging_ctrl is set to 'URL'.
+	 * The name of the URL-parameter that activates debugging.
+	 *
+	 * @var string
+	 */
+	public $smarty_debug_id = 'SMARTY_DEBUG';
+
+	/**
+	 * Path of debug template.
+	 *
+	 * @var string
+	 */
+	public $debug_tpl = null;
+
+	/**
+	 * When set, smarty uses this value as error_reporting-level.
+	 *
+	 * @var int
+	 */
+	public $error_reporting = null;
+
+	/**#@+
      * config var settings
      */
 
-    /**
-     * Controls whether variables with the same name overwrite each other.
-     *
-     * @var boolean
-     */
-    public $config_overwrite = true;
+	/**
+	 * Controls whether variables with the same name overwrite each other.
+	 *
+	 * @var boolean
+	 */
+	public $config_overwrite = true;
 
-    /**
-     * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
-     *
-     * @var boolean
-     */
-    public $config_booleanize = true;
+	/**
+	 * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
+	 *
+	 * @var boolean
+	 */
+	public $config_booleanize = true;
 
-    /**
-     * Controls whether hidden config sections/vars are read from the file.
-     *
-     * @var boolean
-     */
-    public $config_read_hidden = false;
+	/**
+	 * Controls whether hidden config sections/vars are read from the file.
+	 *
+	 * @var boolean
+	 */
+	public $config_read_hidden = false;
 
-    /**#@-*/
+	/**#@-*/
 
-    /**#@+
+	/**#@+
      * resource locking
      */
 
-    /**
-     * locking concurrent compiles
-     *
-     * @var boolean
-     */
-    public $compile_locking = true;
-
-    /**
-     * Controls whether cache resources should use locking mechanism
-     *
-     * @var boolean
-     */
-    public $cache_locking = false;
-
-    /**
-     * seconds to wait for acquiring a lock before ignoring the write lock
-     *
-     * @var float
-     */
-    public $locking_timeout = 10;
-
-    /**#@-*/
-
-    /**
-     * resource type used if none given
-     * Must be an valid key of $registered_resources.
-     *
-     * @var string
-     */
-    public $default_resource_type = 'file';
-
-    /**
-     * caching type
-     * Must be an element of $cache_resource_types.
-     *
-     * @var string
-     */
-    public $caching_type = 'file';
-
-    /**
-     * config type
-     *
-     * @var string
-     */
-    public $default_config_type = 'file';
-
-    /**
-     * check If-Modified-Since headers
-     *
-     * @var boolean
-     */
-    public $cache_modified_check = false;
-
-    /**
-     * registered plugins
-     *
-     * @var array
-     */
-    public $registered_plugins = array();
-
-    /**
-     * registered objects
-     *
-     * @var array
-     */
-    public $registered_objects = array();
-
-    /**
-     * registered classes
-     *
-     * @var array
-     */
-    public $registered_classes = array();
-
-    /**
-     * registered filters
-     *
-     * @var array
-     */
-    public $registered_filters = array();
-
-    /**
-     * registered resources
-     *
-     * @var array
-     */
-    public $registered_resources = array();
-
-    /**
-     * registered cache resources
-     *
-     * @var array
-     */
-    public $registered_cache_resources = array();
-
-    /**
-     * autoload filter
-     *
-     * @var array
-     */
-    public $autoload_filters = array();
-
-    /**
-     * default modifier
-     *
-     * @var array
-     */
-    public $default_modifiers = array();
-
-    /**
-     * autoescape variable output
-     *
-     * @var boolean
-     */
-    public $escape_html = false;
-
-    /**
-     * start time for execution time calculation
-     *
-     * @var int
-     */
-    public $start_time = 0;
-
-    /**
-     * required by the compiler for BC
-     *
-     * @var string
-     */
-    public $_current_file = null;
-
-    /**
-     * internal flag to enable parser debugging
-     *
-     * @var bool
-     */
-    public $_parserdebug = false;
-
-    /**
-     * This object type (Smarty = 1, template = 2, data = 4)
-     *
-     * @var int
-     */
-    public $_objType = 1;
-
-    /**
-     * Debug object
-     *
-     * @var Smarty_Internal_Debug
-     */
-    public $_debug = null;
-
-    /**
-     * removed properties
-     *
-     * @var string[]
-     */
-    private $obsoleteProperties = array('resource_caching', 'template_resource_caching', 'direct_access_security',
-                                        '_dir_perms', '_file_perms', 'plugin_search_order',
-                                        'inheritance_merge_compiled_includes', 'resource_cache_mode',);
-
-    /**
-     * List of private properties which will call getter/setter on a direct access
-     *
-     * @var string[]
-     */
-    private $accessMap = array('template_dir' => 'TemplateDir', 'config_dir' => 'ConfigDir',
-                               'plugins_dir' => 'PluginsDir', 'compile_dir' => 'CompileDir',
-                               'cache_dir' => 'CacheDir',);
-
-    /**#@-*/
-
-    /**
-     * Initialize new Smarty object
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        if (is_callable('mb_internal_encoding')) {
-            mb_internal_encoding(Smarty::$_CHARSET);
-        }
-        $this->start_time = microtime(true);
-
-        if (isset($_SERVER[ 'SCRIPT_NAME' ])) {
-            Smarty::$global_tpl_vars[ 'SCRIPT_NAME' ] = new Smarty_Variable($_SERVER[ 'SCRIPT_NAME' ]);
-        }
-
-        // Check if we're running on windows
-        Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
-        // let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
-        if (Smarty::$_CHARSET !== 'UTF-8') {
-            Smarty::$_UTF8_MODIFIER = '';
-        }
-    }
-
-    /**
-     * Check if a template resource exists
-     *
-     * @param  string $resource_name template name
-     *
-     * @return boolean status
-     */
-    public function templateExists($resource_name)
-    {
-        // create source object
-        $source = Smarty_Template_Source::load(null, $this, $resource_name);
-        return $source->exists;
-    }
-
-    /**
-     * Loads security class and enables security
-     *
-     * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
-     *
-     * @return Smarty                 current Smarty instance for chaining
-     * @throws SmartyException        when an invalid class name is provided
-     */
-    public function enableSecurity($security_class = null)
-    {
-        Smarty_Security::enableSecurity($this, $security_class);
-        return $this;
-    }
-
-    /**
-     * Disable security
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function disableSecurity()
-    {
-        $this->security_policy = null;
-
-        return $this;
-    }
-
-    /**
-     * Set template directory
-     *
-     * @param  string|array $template_dir directory(s) of template sources
-     * @param bool          $isConfig     true for config_dir
-     *
-     * @return \Smarty current Smarty instance for chaining
-     */
-    public function setTemplateDir($template_dir, $isConfig = false)
-    {
-        if ($isConfig) {
-            $this->config_dir = array();
-            $this->_processedConfigDir = array();
-        } else {
-            $this->template_dir = array();
-            $this->_processedTemplateDir = array();
-        }
-        $this->addTemplateDir($template_dir, null, $isConfig);
-        return $this;
-    }
-
-    /**
-     * Add template directory(s)
-     *
-     * @param  string|array $template_dir directory(s) of template sources
-     * @param  string       $key          of the array element to assign the template dir to
-     * @param bool          $isConfig     true for config_dir
-     *
-     * @return Smarty          current Smarty instance for chaining
-     */
-    public function addTemplateDir($template_dir, $key = null, $isConfig = false)
-    {
-        if ($isConfig) {
-            $processed = &$this->_processedConfigDir;
-            $dir = &$this->config_dir;
-            $this->_configDirNormalized = false;
-        } else {
-            $processed = &$this->_processedTemplateDir;
-            $dir = &$this->template_dir;
-            $this->_templateDirNormalized = false;
-        }
-        if (is_array($template_dir)) {
-            foreach ($template_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $dir[] = $v;
-                } else {
-                    // string indexes are overridden
-                    $dir[ $k ] = $v;
-                    unset($processed[ $key ]);
-                }
-            }
-        } else {
-            if ($key !== null) {
-                // override directory at specified index
-                $dir[ $key ] = $template_dir;
-                unset($processed[ $key ]);
-            } else {
-                // append new directory
-                $dir[] = $template_dir;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Get template directories
-     *
-     * @param mixed $index    index of directory to get, null to get all
-     * @param bool  $isConfig true for config_dir
-     *
-     * @return array list of template directories, or directory of $index
-     */
-    public function getTemplateDir($index = null, $isConfig = false)
-    {
-        if ($isConfig) {
-            $dir = &$this->config_dir;
-        } else {
-            $dir = &$this->template_dir;
-        }
-        if ($isConfig ? !$this->_configDirNormalized : !$this->_templateDirNormalized) {
-            $this->_nomalizeTemplateConfig($isConfig);
-        }
-        if ($index !== null) {
-            return isset($dir[ $index ]) ? $dir[ $index ] : null;
-        }
-        return $dir;
-    }
-
-    /**
-     * Set config directory
-     *
-     * @param $config_dir
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setConfigDir($config_dir)
-    {
-        return $this->setTemplateDir($config_dir, true);
-    }
-
-    /**
-     * Add config directory(s)
-     *
-     * @param string|array $config_dir directory(s) of config sources
-     * @param mixed        $key        key of the array element to assign the config dir to
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addConfigDir($config_dir, $key = null)
-    {
-        return $this->addTemplateDir($config_dir, $key, true);
-    }
-
-    /**
-     * Get config directory
-     *
-     * @param mixed $index index of directory to get, null to get all
-     *
-     * @return array configuration directory
-     */
-    public function getConfigDir($index = null)
-    {
-        return $this->getTemplateDir($index, true);
-    }
-
-    /**
-     * Set plugins directory
-     *
-     * @param  string|array $plugins_dir directory(s) of plugins
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setPluginsDir($plugins_dir)
-    {
-        $this->plugins_dir = (array) $plugins_dir;
-        $this->_pluginsDirNormalized = false;
-        return $this;
-    }
-
-    /**
-     * Adds directory of plugin files
-     *
-     * @param null|array $plugins_dir
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addPluginsDir($plugins_dir)
-    {
-        if (empty($this->plugins_dir)) {
-            $this->plugins_dir[] = SMARTY_PLUGINS_DIR;
-        }
-        $this->plugins_dir = array_merge($this->plugins_dir, (array) $plugins_dir);
-        $this->_pluginsDirNormalized = false;
-        return $this;
-    }
-
-    /**
-     * Get plugin directories
-     *
-     * @return array list of plugin directories
-     */
-    public function getPluginsDir()
-    {
-        if (empty($this->plugins_dir)) {
-            $this->plugins_dir[] = SMARTY_PLUGINS_DIR;
-            $this->_pluginsDirNormalized = false;
-        }
-        if (!$this->_pluginsDirNormalized) {
-            if (!is_array($this->plugins_dir)) {
-                $this->plugins_dir = (array) $this->plugins_dir;
-            }
-            foreach ($this->plugins_dir as $k => $v) {
-                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, "/\\") . DS, true);
-            }
-            $this->_cache[ 'plugin_files' ] = array();
-            $this->_pluginsDirNormalized = true;
-        }
-        return $this->plugins_dir;
-    }
-
-    /**
-     *
-     * @param  string $compile_dir directory to store compiled templates in
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setCompileDir($compile_dir)
-    {
-        $this->_normalizeDir('compile_dir', $compile_dir);
-        $this->_compileDirNormalized = true;
-        return $this;
-    }
-
-    /**
-     * Get compiled directory
-     *
-     * @return string path to compiled templates
-     */
-    public function getCompileDir()
-    {
-        if (!$this->_compileDirNormalized) {
-            $this->_normalizeDir('compile_dir', $this->compile_dir);
-            $this->_compileDirNormalized = true;
-        }
-        return $this->compile_dir;
-    }
-
-    /**
-     * Set cache directory
-     *
-     * @param  string $cache_dir directory to store cached templates in
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setCacheDir($cache_dir)
-    {
-        $this->_normalizeDir('cache_dir', $cache_dir);
-        $this->_cacheDirNormalized = true;
-        return $this;
-    }
-
-    /**
-     * Get cache directory
-     *
-     * @return string path of cache directory
-     */
-    public function getCacheDir()
-    {
-        if (!$this->_cacheDirNormalized) {
-            $this->_normalizeDir('cache_dir', $this->cache_dir);
-            $this->_cacheDirNormalized = true;
-        }
-        return $this->cache_dir;
-    }
-
-    /**
-     * Normalize and set directory string
-     *
-     * @param string $dirName cache_dir or compile_dir
-     * @param string $dir     filepath of folder
-     */
-    private function _normalizeDir($dirName, $dir)
-    {
-        $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DS, true);
-        if (!isset(Smarty::$_muted_directories[ $this->{$dirName} ])) {
-            Smarty::$_muted_directories[ $this->{$dirName} ] = null;
-        }
-    }
-
-    /**
-     * Normalize template_dir or config_dir
-     *
-     * @param bool $isConfig true for config_dir
-     *
-     */
-    private function _nomalizeTemplateConfig($isConfig)
-    {
-        if ($isConfig) {
-            $processed = &$this->_processedConfigDir;
-            $dir = &$this->config_dir;
-        } else {
-            $processed = &$this->_processedTemplateDir;
-            $dir = &$this->template_dir;
-        }
-        if (!is_array($dir)) {
-            $dir = (array) $dir;
-        }
-        foreach ($dir as $k => $v) {
-            if (!isset($processed[ $k ])) {
-                $dir[ $k ] = $v = $this->_realpath(rtrim($v, "/\\") . DS, true);
-                $processed[ $k ] = true;
-            }
-        }
-        $isConfig ? $this->_configDirNormalized = true : $this->_templateDirNormalized = true;
-        $isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) :
-            $this->_joined_template_dir = join('#', $this->template_dir);
-    }
-
-    /**
-     * creates a template object
-     *
-     * @param  string  $template   the resource handle of the template file
-     * @param  mixed   $cache_id   cache id to be used with this template
-     * @param  mixed   $compile_id compile id to be used with this template
-     * @param  object  $parent     next higher level of Smarty variables
-     * @param  boolean $do_clone   flag is Smarty object shall be cloned
-     *
-     * @return object  template object
-     */
-    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
-    {
-        if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if ($parent !== null && is_array($parent)) {
-            $data = $parent;
-            $parent = null;
-        } else {
-            $data = null;
-        }
-        $_templateId = $this->_getTemplateId($template, $cache_id, $compile_id);
-        $tpl = null;
-        if ($this->caching && isset($this->_cache[ 'isCached' ][ $_templateId ])) {
-            $tpl = $do_clone ? clone $this->_cache[ 'isCached' ][ $_templateId ] :
-                $this->_cache[ 'isCached' ][ $_templateId ];
-            $tpl->tpl_vars = $tpl->config_vars = array();
-        } else if (!$do_clone && isset($this->_cache[ 'tplObjects' ][ $_templateId ])) {
-            $tpl = clone $this->_cache[ 'tplObjects' ][ $_templateId ];
-        } else {
-            /* @var Smarty_Internal_Template $tpl */
-            $tpl = new $this->template_class($template, $this, null, $cache_id, $compile_id, null, null);
-            $tpl->templateId = $_templateId;
-        }
-        if ($do_clone) {
-            $tpl->smarty = clone $tpl->smarty;
-        }
-        $tpl->parent = $parent ? $parent : $this;
-        // fill data if present
-        if (!empty($data) && is_array($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val);
-            }
-        }
-        if ($this->debugging || $this->debugging_ctrl == 'URL') {
-            $tpl->smarty->_debug = new Smarty_Internal_Debug();
-            // check URL debugging control
-            if (!$this->debugging && $this->debugging_ctrl == 'URL') {
-                $tpl->smarty->_debug->debugUrl($tpl->smarty);
-            }
-        }
-        return $tpl;
-    }
-
-    /**
-     * Takes unknown classes and loads plugin files for them
-     * class name format: Smarty_PluginType_PluginName
-     * plugin filename format: plugintype.pluginname.php
-     *
-     * @param  string $plugin_name class plugin name to load
-     * @param  bool   $check       check if already loaded
-     *
-     * @throws SmartyException
-     * @return string |boolean filepath of loaded file or false
-     */
-    public function loadPlugin($plugin_name, $check = true)
-    {
-        return $this->ext->loadPlugin->loadPlugin($this, $plugin_name, $check);
-    }
-
-    /**
-     * Get unique template id
-     *
-     * @param string                    $template_name
-     * @param null|mixed                $cache_id
-     * @param null|mixed                $compile_id
-     * @param null                      $caching
-     * @param \Smarty_Internal_Template $template
-     *
-     * @return string
-     */
-    public function _getTemplateId($template_name, $cache_id = null, $compile_id = null, $caching = null,
-                                   Smarty_Internal_Template $template = null)
-    {
-        $template_name = (strpos($template_name, ':') === false) ? "{$this->default_resource_type}:{$template_name}" :
-            $template_name;
-        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
-        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
-        $caching = (int) ($caching === null ? $this->caching : $caching);
-
-        if ((isset($template) && strpos($template_name, ':.') !== false) || $this->allow_ambiguous_resources) {
-            $_templateId =
-                Smarty_Resource::getUniqueTemplateName((isset($template) ? $template : $this), $template_name) .
-                "#{$cache_id}#{$compile_id}#{$caching}";
-        } else {
-            $_templateId = $this->_joined_template_dir . "#{$template_name}#{$cache_id}#{$compile_id}#{$caching}";
-        }
-        if (isset($_templateId[ 150 ])) {
-            $_templateId = sha1($_templateId);
-        }
-        return $_templateId;
-    }
-
-    /**
-     * Normalize path
-     *  - remove /./ and /../
-     *  - make it absolute if required
-     *
-     * @param string $path      file path
-     * @param bool   $realpath  if true - convert to absolute
-     *                          false - convert to relative
-     *                          null - keep as it is but remove /./ /../
-     *
-     * @return string
-     */
-    public function _realpath($path, $realpath = null)
-    {
-        $nds = DS == '/' ? '\\' : '/';
-        // normalize DS 
-        $path = str_replace($nds, DS, $path);
-        preg_match('%^(?<root>(?:[[:alpha:]]:[\\\\]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(?:[[:print:]]*))$%',
-                   $path, $parts);
-        $path = $parts[ 'path' ];
-        if ($parts[ 'root' ] == '\\') {
-            $parts[ 'root' ] = substr(getcwd(), 0, 2) . $parts[ 'root' ];
-        } else {
-            if ($realpath !== null && !$parts[ 'root' ]) {
-                $path = getcwd() . DS . $path;
-            }
-        }
-        // remove noop 'DS DS' and 'DS.DS' patterns
-        $path = preg_replace('#([\\\\/]([.]?[\\\\/])+)#', DS, $path);
-        // resolve '..DS' pattern, smallest first
-        if (strpos($path, '..' . DS) != false &&
-            preg_match_all('#(([.]?[\\\\/])*([.][.])[\\\\/]([.]?[\\\\/])*)+#', $path, $match)
-        ) {
-            $counts = array();
-            foreach ($match[ 0 ] as $m) {
-                $counts[] = (int) ((strlen($m) - 1) / 3);
-            }
-            sort($counts);
-            foreach ($counts as $count) {
-                $path = preg_replace('#(([\\\\/]([.]?[\\\\/])*[^\\\\/.]+){' . $count .
-                                     '}[\\\\/]([.]?[\\\\/])*([.][.][\\\\/]([.]?[\\\\/])*){' . $count . '})(?=[^.])#',
-                                     DS, $path);
-            }
-        }
-
-        return $parts[ 'root' ] . $path;
-    }
-
-    /**
-     * Empty template objects cache
-     */
-    public function _clearTemplateCache()
-    {
-        $this->_cache[ 'isCached' ] = array();
-        $this->_cache[ 'tplObjects' ] = array();
-    }
-
-    /**
-     * @param boolean $compile_check
-     */
-    public function setCompileCheck($compile_check)
-    {
-        $this->compile_check = $compile_check;
-    }
-
-    /**
-     * @param boolean $use_sub_dirs
-     */
-    public function setUseSubDirs($use_sub_dirs)
-    {
-        $this->use_sub_dirs = $use_sub_dirs;
-    }
-
-    /**
-     * @param int $error_reporting
-     */
-    public function setErrorReporting($error_reporting)
-    {
-        $this->error_reporting = $error_reporting;
-    }
-
-    /**
-     * @param boolean $escape_html
-     */
-    public function setEscapeHtml($escape_html)
-    {
-        $this->escape_html = $escape_html;
-    }
-
-    /**
-     * @param boolean $auto_literal
-     */
-    public function setAutoLiteral($auto_literal)
-    {
-        $this->auto_literal = $auto_literal;
-    }
-
-    /**
-     * @param boolean $force_compile
-     */
-    public function setForceCompile($force_compile)
-    {
-        $this->force_compile = $force_compile;
-    }
-
-    /**
-     * @param boolean $merge_compiled_includes
-     */
-    public function setMergeCompiledIncludes($merge_compiled_includes)
-    {
-        $this->merge_compiled_includes = $merge_compiled_includes;
-    }
-
-    /**
-     * @param string $left_delimiter
-     */
-    public function setLeftDelimiter($left_delimiter)
-    {
-        $this->left_delimiter = $left_delimiter;
-    }
-
-    /**
-     * @param string $right_delimiter
-     */
-    public function setRightDelimiter($right_delimiter)
-    {
-        $this->right_delimiter = $right_delimiter;
-    }
-
-    /**
-     * @param boolean $debugging
-     */
-    public function setDebugging($debugging)
-    {
-        $this->debugging = $debugging;
-    }
-
-    /**
-     * @param boolean $config_overwrite
-     */
-    public function setConfigOverwrite($config_overwrite)
-    {
-        $this->config_overwrite = $config_overwrite;
-    }
-
-    /**
-     * @param boolean $config_booleanize
-     */
-    public function setConfigBooleanize($config_booleanize)
-    {
-        $this->config_booleanize = $config_booleanize;
-    }
-
-    /**
-     * @param boolean $config_read_hidden
-     */
-    public function setConfigReadHidden($config_read_hidden)
-    {
-        $this->config_read_hidden = $config_read_hidden;
-    }
-
-    /**
-     * @param boolean $compile_locking
-     */
-    public function setCompileLocking($compile_locking)
-    {
-        $this->compile_locking = $compile_locking;
-    }
-
-    /**
-     * @param string $default_resource_type
-     */
-    public function setDefaultResourceType($default_resource_type)
-    {
-        $this->default_resource_type = $default_resource_type;
-    }
-
-    /**
-     * @param string $caching_type
-     */
-    public function setCachingType($caching_type)
-    {
-        $this->caching_type = $caching_type;
-    }
-
-    /**
-     * Test install
-     *
-     * @param null $errors
-     */
-    public function testInstall(&$errors = null)
-    {
-        Smarty_Internal_TestInstall::testInstall($this, $errors);
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     * Calls the appropriate getter function.
-     * Issues an E_USER_NOTICE if no valid getter is found.
-     *
-     * @param  string $name property name
-     *
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (isset($this->accessMap[ $name ])) {
-            $method = 'get' . $this->accessMap[ $name ];
-            return $this->{$method}();
-        } elseif (isset($this->_cache[ $name ])) {
-            return $this->_cache[ $name ];
-        } elseif (in_array($name, $this->obsoleteProperties)) {
-            return null;
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
-        }
-        return null;
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     * Calls the appropriate setter function.
-     * Issues an E_USER_NOTICE if no valid setter is found.
-     *
-     * @param string $name  property name
-     * @param mixed  $value parameter passed to setter
-     */
-    public function __set($name, $value)
-    {
-        if (isset($this->accessMap[ $name ])) {
-            $method = 'set' . $this->accessMap[ $name ];
-            $this->{$method}($value);
-        } elseif (in_array($name, $this->obsoleteProperties)) {
-            return;
-        } else {
-            if (is_object($value) && method_exists($value, $name)) {
-                $this->$name = $value;
-            } else {
-                trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
-            }
-        }
-    }
-
-    /**
-     * Error Handler to mute expected messages
-     *
-     * @link http://php.net/set_error_handler
-     *
-     * @param  integer $errno Error level
-     * @param          $errstr
-     * @param          $errfile
-     * @param          $errline
-     * @param          $errcontext
-     *
-     * @return bool|void
-     */
-    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
-    {
-        $_is_muted_directory = false;
-
-        // add the SMARTY_DIR to the list of muted directories
-        if (!isset(Smarty::$_muted_directories[ SMARTY_DIR ])) {
-            $smarty_dir = realpath(SMARTY_DIR);
-            if ($smarty_dir !== false) {
-                Smarty::$_muted_directories[ SMARTY_DIR ] =
-                    array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
-            }
-        }
-
-        // walk the muted directories and test against $errfile
-        foreach (Smarty::$_muted_directories as $key => &$dir) {
-            if (!$dir) {
-                // resolve directory and length for speedy comparisons
-                $file = realpath($key);
-                if ($file === false) {
-                    // this directory does not exist, remove and skip it
-                    unset(Smarty::$_muted_directories[ $key ]);
-                    continue;
-                }
-                $dir = array('file' => $file, 'length' => strlen($file),);
-            }
-            if (!strncmp($errfile, $dir[ 'file' ], $dir[ 'length' ])) {
-                $_is_muted_directory = true;
-                break;
-            }
-        }
-        // pass to next error handler if this error did not occur inside SMARTY_DIR
-        // or the error was within smarty but masked to be ignored
-        if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
-            if (Smarty::$_previous_error_handler) {
-                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline,
-                                      $errcontext);
-            } else {
-                return false;
-            }
-        }
-        return;
-    }
-
-    /**
-     * Enable error handler to mute expected messages
-     *
-     * @return void
-     */
-    public static function muteExpectedErrors()
-    {
-        /*
+	/**
+	 * locking concurrent compiles
+	 *
+	 * @var boolean
+	 */
+	public $compile_locking = true;
+
+	/**
+	 * Controls whether cache resources should use locking mechanism
+	 *
+	 * @var boolean
+	 */
+	public $cache_locking = false;
+
+	/**
+	 * seconds to wait for acquiring a lock before ignoring the write lock
+	 *
+	 * @var float
+	 */
+	public $locking_timeout = 10;
+
+	/**#@-*/
+
+	/**
+	 * resource type used if none given
+	 * Must be an valid key of $registered_resources.
+	 *
+	 * @var string
+	 */
+	public $default_resource_type = 'file';
+
+	/**
+	 * caching type
+	 * Must be an element of $cache_resource_types.
+	 *
+	 * @var string
+	 */
+	public $caching_type = 'file';
+
+	/**
+	 * config type
+	 *
+	 * @var string
+	 */
+	public $default_config_type = 'file';
+
+	/**
+	 * check If-Modified-Since headers
+	 *
+	 * @var boolean
+	 */
+	public $cache_modified_check = false;
+
+	/**
+	 * registered plugins
+	 *
+	 * @var array
+	 */
+	public $registered_plugins = array();
+
+	/**
+	 * registered objects
+	 *
+	 * @var array
+	 */
+	public $registered_objects = array();
+
+	/**
+	 * registered classes
+	 *
+	 * @var array
+	 */
+	public $registered_classes = array();
+
+	/**
+	 * registered filters
+	 *
+	 * @var array
+	 */
+	public $registered_filters = array();
+
+	/**
+	 * registered resources
+	 *
+	 * @var array
+	 */
+	public $registered_resources = array();
+
+	/**
+	 * registered cache resources
+	 *
+	 * @var array
+	 */
+	public $registered_cache_resources = array();
+
+	/**
+	 * autoload filter
+	 *
+	 * @var array
+	 */
+	public $autoload_filters = array();
+
+	/**
+	 * default modifier
+	 *
+	 * @var array
+	 */
+	public $default_modifiers = array();
+
+	/**
+	 * autoescape variable output
+	 *
+	 * @var boolean
+	 */
+	public $escape_html = false;
+
+	/**
+	 * start time for execution time calculation
+	 *
+	 * @var int
+	 */
+	public $start_time = 0;
+
+	/**
+	 * required by the compiler for BC
+	 *
+	 * @var string
+	 */
+	public $_current_file = null;
+
+	/**
+	 * internal flag to enable parser debugging
+	 *
+	 * @var bool
+	 */
+	public $_parserdebug = false;
+
+	/**
+	 * This object type (Smarty = 1, template = 2, data = 4)
+	 *
+	 * @var int
+	 */
+	public $_objType = 1;
+
+	/**
+	 * Debug object
+	 *
+	 * @var Smarty_Internal_Debug
+	 */
+	public $_debug = null;
+
+	/**
+	 * removed properties
+	 *
+	 * @var string[]
+	 */
+	private $obsoleteProperties = array('resource_caching', 'template_resource_caching', 'direct_access_security',
+										'_dir_perms', '_file_perms', 'plugin_search_order',
+										'inheritance_merge_compiled_includes', 'resource_cache_mode',);
+
+	/**
+	 * List of private properties which will call getter/setter on a direct access
+	 *
+	 * @var string[]
+	 */
+	private $accessMap = array('template_dir' => 'TemplateDir', 'config_dir' => 'ConfigDir',
+							   'plugins_dir' => 'PluginsDir', 'compile_dir' => 'CompileDir',
+							   'cache_dir' => 'CacheDir',);
+
+	/**#@-*/
+
+	/**
+	 * Initialize new Smarty object
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		if (is_callable('mb_internal_encoding')) {
+			mb_internal_encoding(Smarty::$_CHARSET);
+		}
+		$this->start_time = microtime(true);
+
+		if (isset($_SERVER[ 'SCRIPT_NAME' ])) {
+			Smarty::$global_tpl_vars[ 'SCRIPT_NAME' ] = new Smarty_Variable($_SERVER[ 'SCRIPT_NAME' ]);
+		}
+
+		// Check if we're running on windows
+		Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
+		// let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
+		if (Smarty::$_CHARSET !== 'UTF-8') {
+			Smarty::$_UTF8_MODIFIER = '';
+		}
+	}
+
+	/**
+	 * Check if a template resource exists
+	 *
+	 * @param  string $resource_name template name
+	 *
+	 * @return boolean status
+	 */
+	public function templateExists($resource_name)
+	{
+		// create source object
+		$source = Smarty_Template_Source::load(null, $this, $resource_name);
+		return $source->exists;
+	}
+
+	/**
+	 * Loads security class and enables security
+	 *
+	 * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
+	 *
+	 * @return Smarty                 current Smarty instance for chaining
+	 * @throws SmartyException        when an invalid class name is provided
+	 */
+	public function enableSecurity($security_class = null)
+	{
+		Smarty_Security::enableSecurity($this, $security_class);
+		return $this;
+	}
+
+	/**
+	 * Disable security
+	 *
+	 * @return Smarty current Smarty instance for chaining
+	 */
+	public function disableSecurity()
+	{
+		$this->security_policy = null;
+
+		return $this;
+	}
+
+	/**
+	 * Set template directory
+	 *
+	 * @param  string|array $template_dir directory(s) of template sources
+	 * @param bool          $isConfig     true for config_dir
+	 *
+	 * @return \Smarty current Smarty instance for chaining
+	 */
+	public function setTemplateDir($template_dir, $isConfig = false)
+	{
+		if ($isConfig) {
+			$this->config_dir = array();
+			$this->_processedConfigDir = array();
+		} else {
+			$this->template_dir = array();
+			$this->_processedTemplateDir = array();
+		}
+		$this->addTemplateDir($template_dir, null, $isConfig);
+		return $this;
+	}
+
+	/**
+	 * Add template directory(s)
+	 *
+	 * @param  string|array $template_dir directory(s) of template sources
+	 * @param  string       $key          of the array element to assign the template dir to
+	 * @param bool          $isConfig     true for config_dir
+	 *
+	 * @return Smarty          current Smarty instance for chaining
+	 */
+	public function addTemplateDir($template_dir, $key = null, $isConfig = false)
+	{
+		if ($isConfig) {
+			$processed = &$this->_processedConfigDir;
+			$dir = &$this->config_dir;
+			$this->_configDirNormalized = false;
+		} else {
+			$processed = &$this->_processedTemplateDir;
+			$dir = &$this->template_dir;
+			$this->_templateDirNormalized = false;
+		}
+		if (is_array($template_dir)) {
+			foreach ($template_dir as $k => $v) {
+				if (is_int($k)) {
+					// indexes are not merged but appended
+					$dir[] = $v;
+				} else {
+					// string indexes are overridden
+					$dir[ $k ] = $v;
+					unset($processed[ $key ]);
+				}
+			}
+		} else {
+			if ($key !== null) {
+				// override directory at specified index
+				$dir[ $key ] = $template_dir;
+				unset($processed[ $key ]);
+			} else {
+				// append new directory
+				$dir[] = $template_dir;
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * Get template directories
+	 *
+	 * @param mixed $index    index of directory to get, null to get all
+	 * @param bool  $isConfig true for config_dir
+	 *
+	 * @return array list of template directories, or directory of $index
+	 */
+	public function getTemplateDir($index = null, $isConfig = false)
+	{
+		if ($isConfig) {
+			$dir = &$this->config_dir;
+		} else {
+			$dir = &$this->template_dir;
+		}
+		if ($isConfig ? !$this->_configDirNormalized : !$this->_templateDirNormalized) {
+			$this->_nomalizeTemplateConfig($isConfig);
+		}
+		if ($index !== null) {
+			return isset($dir[ $index ]) ? $dir[ $index ] : null;
+		}
+		return $dir;
+	}
+
+	/**
+	 * Set config directory
+	 *
+	 * @param $config_dir
+	 *
+	 * @return Smarty       current Smarty instance for chaining
+	 */
+	public function setConfigDir($config_dir)
+	{
+		return $this->setTemplateDir($config_dir, true);
+	}
+
+	/**
+	 * Add config directory(s)
+	 *
+	 * @param string|array $config_dir directory(s) of config sources
+	 * @param mixed        $key        key of the array element to assign the config dir to
+	 *
+	 * @return Smarty current Smarty instance for chaining
+	 */
+	public function addConfigDir($config_dir, $key = null)
+	{
+		return $this->addTemplateDir($config_dir, $key, true);
+	}
+
+	/**
+	 * Get config directory
+	 *
+	 * @param mixed $index index of directory to get, null to get all
+	 *
+	 * @return array configuration directory
+	 */
+	public function getConfigDir($index = null)
+	{
+		return $this->getTemplateDir($index, true);
+	}
+
+	/**
+	 * Set plugins directory
+	 *
+	 * @param  string|array $plugins_dir directory(s) of plugins
+	 *
+	 * @return Smarty       current Smarty instance for chaining
+	 */
+	public function setPluginsDir($plugins_dir)
+	{
+		$this->plugins_dir = (array) $plugins_dir;
+		$this->_pluginsDirNormalized = false;
+		return $this;
+	}
+
+	/**
+	 * Adds directory of plugin files
+	 *
+	 * @param null|array $plugins_dir
+	 *
+	 * @return Smarty current Smarty instance for chaining
+	 */
+	public function addPluginsDir($plugins_dir)
+	{
+		if (empty($this->plugins_dir)) {
+			$this->plugins_dir[] = SMARTY_PLUGINS_DIR;
+		}
+		$this->plugins_dir = array_merge($this->plugins_dir, (array) $plugins_dir);
+		$this->_pluginsDirNormalized = false;
+		return $this;
+	}
+
+	/**
+	 * Get plugin directories
+	 *
+	 * @return array list of plugin directories
+	 */
+	public function getPluginsDir()
+	{
+		if (empty($this->plugins_dir)) {
+			$this->plugins_dir[] = SMARTY_PLUGINS_DIR;
+			$this->_pluginsDirNormalized = false;
+		}
+		if (!$this->_pluginsDirNormalized) {
+			if (!is_array($this->plugins_dir)) {
+				$this->plugins_dir = (array) $this->plugins_dir;
+			}
+			foreach ($this->plugins_dir as $k => $v) {
+				$this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, "/\\") . DS, true);
+			}
+			$this->_cache[ 'plugin_files' ] = array();
+			$this->_pluginsDirNormalized = true;
+		}
+		return $this->plugins_dir;
+	}
+
+	/**
+	 *
+	 * @param  string $compile_dir directory to store compiled templates in
+	 *
+	 * @return Smarty current Smarty instance for chaining
+	 */
+	public function setCompileDir($compile_dir)
+	{
+		$this->_normalizeDir('compile_dir', $compile_dir);
+		$this->_compileDirNormalized = true;
+		return $this;
+	}
+
+	/**
+	 * Get compiled directory
+	 *
+	 * @return string path to compiled templates
+	 */
+	public function getCompileDir()
+	{
+		if (!$this->_compileDirNormalized) {
+			$this->_normalizeDir('compile_dir', $this->compile_dir);
+			$this->_compileDirNormalized = true;
+		}
+		return $this->compile_dir;
+	}
+
+	/**
+	 * Set cache directory
+	 *
+	 * @param  string $cache_dir directory to store cached templates in
+	 *
+	 * @return Smarty current Smarty instance for chaining
+	 */
+	public function setCacheDir($cache_dir)
+	{
+		$this->_normalizeDir('cache_dir', $cache_dir);
+		$this->_cacheDirNormalized = true;
+		return $this;
+	}
+
+	/**
+	 * Get cache directory
+	 *
+	 * @return string path of cache directory
+	 */
+	public function getCacheDir()
+	{
+		if (!$this->_cacheDirNormalized) {
+			$this->_normalizeDir('cache_dir', $this->cache_dir);
+			$this->_cacheDirNormalized = true;
+		}
+		return $this->cache_dir;
+	}
+
+	/**
+	 * Normalize and set directory string
+	 *
+	 * @param string $dirName cache_dir or compile_dir
+	 * @param string $dir     filepath of folder
+	 */
+	private function _normalizeDir($dirName, $dir)
+	{
+		$this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DS, true);
+		if (!isset(Smarty::$_muted_directories[ $this->{$dirName} ])) {
+			Smarty::$_muted_directories[ $this->{$dirName} ] = null;
+		}
+	}
+
+	/**
+	 * Normalize template_dir or config_dir
+	 *
+	 * @param bool $isConfig true for config_dir
+	 *
+	 */
+	private function _nomalizeTemplateConfig($isConfig)
+	{
+		if ($isConfig) {
+			$processed = &$this->_processedConfigDir;
+			$dir = &$this->config_dir;
+		} else {
+			$processed = &$this->_processedTemplateDir;
+			$dir = &$this->template_dir;
+		}
+		if (!is_array($dir)) {
+			$dir = (array) $dir;
+		}
+		foreach ($dir as $k => $v) {
+			if (!isset($processed[ $k ])) {
+				$dir[ $k ] = $v = $this->_realpath(rtrim($v, "/\\") . DS, true);
+				$processed[ $k ] = true;
+			}
+		}
+		$isConfig ? $this->_configDirNormalized = true : $this->_templateDirNormalized = true;
+		$isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) :
+			$this->_joined_template_dir = join('#', $this->template_dir);
+	}
+
+	/**
+	 * creates a template object
+	 *
+	 * @param  string  $template   the resource handle of the template file
+	 * @param  mixed   $cache_id   cache id to be used with this template
+	 * @param  mixed   $compile_id compile id to be used with this template
+	 * @param  object  $parent     next higher level of Smarty variables
+	 * @param  boolean $do_clone   flag is Smarty object shall be cloned
+	 *
+	 * @return object  template object
+	 */
+	public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
+	{
+		if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
+			$parent = $cache_id;
+			$cache_id = null;
+		}
+		if ($parent !== null && is_array($parent)) {
+			$data = $parent;
+			$parent = null;
+		} else {
+			$data = null;
+		}
+		$_templateId = $this->_getTemplateId($template, $cache_id, $compile_id);
+		$tpl = null;
+		if ($this->caching && isset($this->_cache[ 'isCached' ][ $_templateId ])) {
+			$tpl = $do_clone ? clone $this->_cache[ 'isCached' ][ $_templateId ] :
+				$this->_cache[ 'isCached' ][ $_templateId ];
+			$tpl->tpl_vars = $tpl->config_vars = array();
+		} else if (!$do_clone && isset($this->_cache[ 'tplObjects' ][ $_templateId ])) {
+			$tpl = clone $this->_cache[ 'tplObjects' ][ $_templateId ];
+		} else {
+			/* @var Smarty_Internal_Template $tpl */
+			$tpl = new $this->template_class($template, $this, null, $cache_id, $compile_id, null, null);
+			$tpl->templateId = $_templateId;
+		}
+		if ($do_clone) {
+			$tpl->smarty = clone $tpl->smarty;
+		}
+		$tpl->parent = $parent ? $parent : $this;
+		// fill data if present
+		if (!empty($data) && is_array($data)) {
+			// set up variable values
+			foreach ($data as $_key => $_val) {
+				$tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val);
+			}
+		}
+		if ($this->debugging || $this->debugging_ctrl == 'URL') {
+			$tpl->smarty->_debug = new Smarty_Internal_Debug();
+			// check URL debugging control
+			if (!$this->debugging && $this->debugging_ctrl == 'URL') {
+				$tpl->smarty->_debug->debugUrl($tpl->smarty);
+			}
+		}
+		return $tpl;
+	}
+
+	/**
+	 * Takes unknown classes and loads plugin files for them
+	 * class name format: Smarty_PluginType_PluginName
+	 * plugin filename format: plugintype.pluginname.php
+	 *
+	 * @param  string $plugin_name class plugin name to load
+	 * @param  bool   $check       check if already loaded
+	 *
+	 * @throws SmartyException
+	 * @return string |boolean filepath of loaded file or false
+	 */
+	public function loadPlugin($plugin_name, $check = true)
+	{
+		return $this->ext->loadPlugin->loadPlugin($this, $plugin_name, $check);
+	}
+
+	/**
+	 * Get unique template id
+	 *
+	 * @param string                    $template_name
+	 * @param null|mixed                $cache_id
+	 * @param null|mixed                $compile_id
+	 * @param null                      $caching
+	 * @param \Smarty_Internal_Template $template
+	 *
+	 * @return string
+	 */
+	public function _getTemplateId($template_name, $cache_id = null, $compile_id = null, $caching = null,
+								   Smarty_Internal_Template $template = null)
+	{
+		$template_name = (strpos($template_name, ':') === false) ? "{$this->default_resource_type}:{$template_name}" :
+			$template_name;
+		$cache_id = $cache_id === null ? $this->cache_id : $cache_id;
+		$compile_id = $compile_id === null ? $this->compile_id : $compile_id;
+		$caching = (int) ($caching === null ? $this->caching : $caching);
+
+		if ((isset($template) && strpos($template_name, ':.') !== false) || $this->allow_ambiguous_resources) {
+			$_templateId =
+				Smarty_Resource::getUniqueTemplateName((isset($template) ? $template : $this), $template_name) .
+				"#{$cache_id}#{$compile_id}#{$caching}";
+		} else {
+			$_templateId = $this->_joined_template_dir . "#{$template_name}#{$cache_id}#{$compile_id}#{$caching}";
+		}
+		if (isset($_templateId[ 150 ])) {
+			$_templateId = sha1($_templateId);
+		}
+		return $_templateId;
+	}
+
+	/**
+	 * Normalize path
+	 *  - remove /./ and /../
+	 *  - make it absolute if required
+	 *
+	 * @param string $path      file path
+	 * @param bool   $realpath  if true - convert to absolute
+	 *                          false - convert to relative
+	 *                          null - keep as it is but remove /./ /../
+	 *
+	 * @return string
+	 */
+	public function _realpath($path, $realpath = null)
+	{
+		$nds = DS == '/' ? '\\' : '/';
+		// normalize DS 
+		$path = str_replace($nds, DS, $path);
+		preg_match('%^(?<root>(?:[[:alpha:]]:[\\\\]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(?:[[:print:]]*))$%',
+				   $path, $parts);
+		$path = $parts[ 'path' ];
+		if ($parts[ 'root' ] == '\\') {
+			$parts[ 'root' ] = substr(getcwd(), 0, 2) . $parts[ 'root' ];
+		} else {
+			if ($realpath !== null && !$parts[ 'root' ]) {
+				$path = getcwd() . DS . $path;
+			}
+		}
+		// remove noop 'DS DS' and 'DS.DS' patterns
+		$path = preg_replace('#([\\\\/]([.]?[\\\\/])+)#', DS, $path);
+		// resolve '..DS' pattern, smallest first
+		if (strpos($path, '..' . DS) != false &&
+			preg_match_all('#(([.]?[\\\\/])*([.][.])[\\\\/]([.]?[\\\\/])*)+#', $path, $match)
+		) {
+			$counts = array();
+			foreach ($match[ 0 ] as $m) {
+				$counts[] = (int) ((strlen($m) - 1) / 3);
+			}
+			sort($counts);
+			foreach ($counts as $count) {
+				$path = preg_replace('#(([\\\\/]([.]?[\\\\/])*[^\\\\/.]+){' . $count .
+									 '}[\\\\/]([.]?[\\\\/])*([.][.][\\\\/]([.]?[\\\\/])*){' . $count . '})(?=[^.])#',
+									 DS, $path);
+			}
+		}
+
+		return $parts[ 'root' ] . $path;
+	}
+
+	/**
+	 * Empty template objects cache
+	 */
+	public function _clearTemplateCache()
+	{
+		$this->_cache[ 'isCached' ] = array();
+		$this->_cache[ 'tplObjects' ] = array();
+	}
+
+	/**
+	 * @param boolean $compile_check
+	 */
+	public function setCompileCheck($compile_check)
+	{
+		$this->compile_check = $compile_check;
+	}
+
+	/**
+	 * @param boolean $use_sub_dirs
+	 */
+	public function setUseSubDirs($use_sub_dirs)
+	{
+		$this->use_sub_dirs = $use_sub_dirs;
+	}
+
+	/**
+	 * @param int $error_reporting
+	 */
+	public function setErrorReporting($error_reporting)
+	{
+		$this->error_reporting = $error_reporting;
+	}
+
+	/**
+	 * @param boolean $escape_html
+	 */
+	public function setEscapeHtml($escape_html)
+	{
+		$this->escape_html = $escape_html;
+	}
+
+	/**
+	 * @param boolean $auto_literal
+	 */
+	public function setAutoLiteral($auto_literal)
+	{
+		$this->auto_literal = $auto_literal;
+	}
+
+	/**
+	 * @param boolean $force_compile
+	 */
+	public function setForceCompile($force_compile)
+	{
+		$this->force_compile = $force_compile;
+	}
+
+	/**
+	 * @param boolean $merge_compiled_includes
+	 */
+	public function setMergeCompiledIncludes($merge_compiled_includes)
+	{
+		$this->merge_compiled_includes = $merge_compiled_includes;
+	}
+
+	/**
+	 * @param string $left_delimiter
+	 */
+	public function setLeftDelimiter($left_delimiter)
+	{
+		$this->left_delimiter = $left_delimiter;
+	}
+
+	/**
+	 * @param string $right_delimiter
+	 */
+	public function setRightDelimiter($right_delimiter)
+	{
+		$this->right_delimiter = $right_delimiter;
+	}
+
+	/**
+	 * @param boolean $debugging
+	 */
+	public function setDebugging($debugging)
+	{
+		$this->debugging = $debugging;
+	}
+
+	/**
+	 * @param boolean $config_overwrite
+	 */
+	public function setConfigOverwrite($config_overwrite)
+	{
+		$this->config_overwrite = $config_overwrite;
+	}
+
+	/**
+	 * @param boolean $config_booleanize
+	 */
+	public function setConfigBooleanize($config_booleanize)
+	{
+		$this->config_booleanize = $config_booleanize;
+	}
+
+	/**
+	 * @param boolean $config_read_hidden
+	 */
+	public function setConfigReadHidden($config_read_hidden)
+	{
+		$this->config_read_hidden = $config_read_hidden;
+	}
+
+	/**
+	 * @param boolean $compile_locking
+	 */
+	public function setCompileLocking($compile_locking)
+	{
+		$this->compile_locking = $compile_locking;
+	}
+
+	/**
+	 * @param string $default_resource_type
+	 */
+	public function setDefaultResourceType($default_resource_type)
+	{
+		$this->default_resource_type = $default_resource_type;
+	}
+
+	/**
+	 * @param string $caching_type
+	 */
+	public function setCachingType($caching_type)
+	{
+		$this->caching_type = $caching_type;
+	}
+
+	/**
+	 * Test install
+	 *
+	 * @param null $errors
+	 */
+	public function testInstall(&$errors = null)
+	{
+		Smarty_Internal_TestInstall::testInstall($this, $errors);
+	}
+
+	/**
+	 * <<magic>> Generic getter.
+	 * Calls the appropriate getter function.
+	 * Issues an E_USER_NOTICE if no valid getter is found.
+	 *
+	 * @param  string $name property name
+	 *
+	 * @return mixed
+	 */
+	public function __get($name)
+	{
+		if (isset($this->accessMap[ $name ])) {
+			$method = 'get' . $this->accessMap[ $name ];
+			return $this->{$method}();
+		} elseif (isset($this->_cache[ $name ])) {
+			return $this->_cache[ $name ];
+		} elseif (in_array($name, $this->obsoleteProperties)) {
+			return null;
+		} else {
+			trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+		}
+		return null;
+	}
+
+	/**
+	 * <<magic>> Generic setter.
+	 * Calls the appropriate setter function.
+	 * Issues an E_USER_NOTICE if no valid setter is found.
+	 *
+	 * @param string $name  property name
+	 * @param mixed  $value parameter passed to setter
+	 */
+	public function __set($name, $value)
+	{
+		if (isset($this->accessMap[ $name ])) {
+			$method = 'set' . $this->accessMap[ $name ];
+			$this->{$method}($value);
+		} elseif (in_array($name, $this->obsoleteProperties)) {
+			return;
+		} else {
+			if (is_object($value) && method_exists($value, $name)) {
+				$this->$name = $value;
+			} else {
+				trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+			}
+		}
+	}
+
+	/**
+	 * Error Handler to mute expected messages
+	 *
+	 * @link http://php.net/set_error_handler
+	 *
+	 * @param  integer $errno Error level
+	 * @param          $errstr
+	 * @param          $errfile
+	 * @param          $errline
+	 * @param          $errcontext
+	 *
+	 * @return bool|void
+	 */
+	public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
+	{
+		$_is_muted_directory = false;
+
+		// add the SMARTY_DIR to the list of muted directories
+		if (!isset(Smarty::$_muted_directories[ SMARTY_DIR ])) {
+			$smarty_dir = realpath(SMARTY_DIR);
+			if ($smarty_dir !== false) {
+				Smarty::$_muted_directories[ SMARTY_DIR ] =
+					array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
+			}
+		}
+
+		// walk the muted directories and test against $errfile
+		foreach (Smarty::$_muted_directories as $key => &$dir) {
+			if (!$dir) {
+				// resolve directory and length for speedy comparisons
+				$file = realpath($key);
+				if ($file === false) {
+					// this directory does not exist, remove and skip it
+					unset(Smarty::$_muted_directories[ $key ]);
+					continue;
+				}
+				$dir = array('file' => $file, 'length' => strlen($file),);
+			}
+			if (!strncmp($errfile, $dir[ 'file' ], $dir[ 'length' ])) {
+				$_is_muted_directory = true;
+				break;
+			}
+		}
+		// pass to next error handler if this error did not occur inside SMARTY_DIR
+		// or the error was within smarty but masked to be ignored
+		if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
+			if (Smarty::$_previous_error_handler) {
+				return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline,
+									  $errcontext);
+			} else {
+				return false;
+			}
+		}
+		return;
+	}
+
+	/**
+	 * Enable error handler to mute expected messages
+	 *
+	 * @return void
+	 */
+	public static function muteExpectedErrors()
+	{
+		/*
             error muting is done because some people implemented custom error_handlers using
             http://php.net/set_error_handler and for some reason did not understand the following paragraph:
 
@@ -1508,22 +1508,22 @@ 
                 - between file_exists() and filemtime() a possible race condition is opened,
                   which does not exist using the simple @filemtime() approach.
         */
-        $error_handler = array('Smarty', 'mutingErrorHandler');
-        $previous = set_error_handler($error_handler);
-
-        // avoid dead loops
-        if ($previous !== $error_handler) {
-            Smarty::$_previous_error_handler = $previous;
-        }
-    }
-
-    /**
-     * Disable error handler muting expected messages
-     *
-     * @return void
-     */
-    public static function unmuteExpectedErrors()
-    {
-        restore_error_handler();
-    }
+		$error_handler = array('Smarty', 'mutingErrorHandler');
+		$previous = set_error_handler($error_handler);
+
+		// avoid dead loops
+		if ($previous !== $error_handler) {
+			Smarty::$_previous_error_handler = $previous;
+		}
+	}
+
+	/**
+	 * Disable error handler muting expected messages
+	 *
+	 * @return void
+	 */
+	public static function unmuteExpectedErrors()
+	{
+		restore_error_handler();
+	}
 }

Spacing +41 added lines, -44 removed lines

@@ -215,7 +215,7 @@ 
 
     const RESOURCE_CACHE_TEMPLATE = 2; // cache all template objects
 
-    const RESOURCE_CACHE_ON = 4;    // cache source and compiled resources
+    const RESOURCE_CACHE_ON = 4; // cache source and compiled resources
 
     /**#@-*/
 
@@ -749,8 +749,8 @@ 
         }
         $this->start_time = microtime(true);
 
-        if (isset($_SERVER[ 'SCRIPT_NAME' ])) {
-            Smarty::$global_tpl_vars[ 'SCRIPT_NAME' ] = new Smarty_Variable($_SERVER[ 'SCRIPT_NAME' ]);
+        if (isset($_SERVER['SCRIPT_NAME'])) {
+            Smarty::$global_tpl_vars['SCRIPT_NAME'] = new Smarty_Variable($_SERVER['SCRIPT_NAME']);
         }
 
         // Check if we're running on windows
@@ -849,15 +849,15 @@ 
                     $dir[] = $v;
                 } else {
                     // string indexes are overridden
-                    $dir[ $k ] = $v;
-                    unset($processed[ $key ]);
+                    $dir[$k] = $v;
+                    unset($processed[$key]);
                 }
             }
         } else {
             if ($key !== null) {
                 // override directory at specified index
-                $dir[ $key ] = $template_dir;
-                unset($processed[ $key ]);
+                $dir[$key] = $template_dir;
+                unset($processed[$key]);
             } else {
                 // append new directory
                 $dir[] = $template_dir;
@@ -885,7 +885,7 @@ 
             $this->_nomalizeTemplateConfig($isConfig);
         }
         if ($index !== null) {
-            return isset($dir[ $index ]) ? $dir[ $index ] : null;
+            return isset($dir[$index]) ? $dir[$index] : null;
         }
         return $dir;
     }
@@ -974,9 +974,9 @@ 
                 $this->plugins_dir = (array) $this->plugins_dir;
             }
             foreach ($this->plugins_dir as $k => $v) {
-                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, "/\\") . DS, true);
+                $this->plugins_dir[$k] = $this->_realpath(rtrim($v, "/\\") . DS, true);
             }
-            $this->_cache[ 'plugin_files' ] = array();
+            $this->_cache['plugin_files'] = array();
             $this->_pluginsDirNormalized = true;
         }
         return $this->plugins_dir;
@@ -1046,8 +1046,8 @@ 
     private function _normalizeDir($dirName, $dir)
     {
         $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DS, true);
-        if (!isset(Smarty::$_muted_directories[ $this->{$dirName} ])) {
-            Smarty::$_muted_directories[ $this->{$dirName} ] = null;
+        if (!isset(Smarty::$_muted_directories[$this->{$dirName}])) {
+            Smarty::$_muted_directories[$this->{$dirName}] = null;
         }
     }
 
@@ -1070,14 +1070,13 @@ 
             $dir = (array) $dir;
         }
         foreach ($dir as $k => $v) {
-            if (!isset($processed[ $k ])) {
-                $dir[ $k ] = $v = $this->_realpath(rtrim($v, "/\\") . DS, true);
-                $processed[ $k ] = true;
+            if (!isset($processed[$k])) {
+                $dir[$k] = $v = $this->_realpath(rtrim($v, "/\\") . DS, true);
+                $processed[$k] = true;
             }
         }
         $isConfig ? $this->_configDirNormalized = true : $this->_templateDirNormalized = true;
-        $isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) :
-            $this->_joined_template_dir = join('#', $this->template_dir);
+        $isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) : $this->_joined_template_dir = join('#', $this->template_dir);
     }
 
     /**
@@ -1105,12 +1104,11 @@ 
         }
         $_templateId = $this->_getTemplateId($template, $cache_id, $compile_id);
         $tpl = null;
-        if ($this->caching && isset($this->_cache[ 'isCached' ][ $_templateId ])) {
-            $tpl = $do_clone ? clone $this->_cache[ 'isCached' ][ $_templateId ] :
-                $this->_cache[ 'isCached' ][ $_templateId ];
+        if ($this->caching && isset($this->_cache['isCached'][$_templateId])) {
+            $tpl = $do_clone ? clone $this->_cache['isCached'][$_templateId] : $this->_cache['isCached'][$_templateId];
             $tpl->tpl_vars = $tpl->config_vars = array();
-        } else if (!$do_clone && isset($this->_cache[ 'tplObjects' ][ $_templateId ])) {
-            $tpl = clone $this->_cache[ 'tplObjects' ][ $_templateId ];
+        } else if (!$do_clone && isset($this->_cache['tplObjects'][$_templateId])) {
+            $tpl = clone $this->_cache['tplObjects'][$_templateId];
         } else {
             /* @var Smarty_Internal_Template $tpl */
             $tpl = new $this->template_class($template, $this, null, $cache_id, $compile_id, null, null);
@@ -1124,7 +1122,7 @@ 
         if (!empty($data) && is_array($data)) {
             // set up variable values
             foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val);
+                $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
             }
         }
         if ($this->debugging || $this->debugging_ctrl == 'URL') {
@@ -1167,8 +1165,7 @@ 
     public function _getTemplateId($template_name, $cache_id = null, $compile_id = null, $caching = null,
                                    Smarty_Internal_Template $template = null)
     {
-        $template_name = (strpos($template_name, ':') === false) ? "{$this->default_resource_type}:{$template_name}" :
-            $template_name;
+        $template_name = (strpos($template_name, ':') === false) ? "{$this->default_resource_type}:{$template_name}" : $template_name;
         $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
         $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
         $caching = (int) ($caching === null ? $this->caching : $caching);
@@ -1180,7 +1177,7 @@ 
         } else {
             $_templateId = $this->_joined_template_dir . "#{$template_name}#{$cache_id}#{$compile_id}#{$caching}";
         }
-        if (isset($_templateId[ 150 ])) {
+        if (isset($_templateId[150])) {
             $_templateId = sha1($_templateId);
         }
         return $_templateId;
@@ -1205,11 +1202,11 @@ 
         $path = str_replace($nds, DS, $path);
         preg_match('%^(?<root>(?:[[:alpha:]]:[\\\\]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(?:[[:print:]]*))$%',
                    $path, $parts);
-        $path = $parts[ 'path' ];
-        if ($parts[ 'root' ] == '\\') {
-            $parts[ 'root' ] = substr(getcwd(), 0, 2) . $parts[ 'root' ];
+        $path = $parts['path'];
+        if ($parts['root'] == '\\') {
+            $parts['root'] = substr(getcwd(), 0, 2) . $parts['root'];
         } else {
-            if ($realpath !== null && !$parts[ 'root' ]) {
+            if ($realpath !== null && !$parts['root']) {
                 $path = getcwd() . DS . $path;
             }
         }
@@ -1220,7 +1217,7 @@ 
             preg_match_all('#(([.]?[\\\\/])*([.][.])[\\\\/]([.]?[\\\\/])*)+#', $path, $match)
         ) {
             $counts = array();
-            foreach ($match[ 0 ] as $m) {
+            foreach ($match[0] as $m) {
                 $counts[] = (int) ((strlen($m) - 1) / 3);
             }
             sort($counts);
@@ -1231,7 +1228,7 @@ 
             }
         }
 
-        return $parts[ 'root' ] . $path;
+        return $parts['root'] . $path;
     }
 
     /**
@@ -1239,8 +1236,8 @@ 
      */
     public function _clearTemplateCache()
     {
-        $this->_cache[ 'isCached' ] = array();
-        $this->_cache[ 'tplObjects' ] = array();
+        $this->_cache['isCached'] = array();
+        $this->_cache['tplObjects'] = array();
     }
 
     /**
@@ -1392,11 +1389,11 @@ 
      */
     public function __get($name)
     {
-        if (isset($this->accessMap[ $name ])) {
-            $method = 'get' . $this->accessMap[ $name ];
+        if (isset($this->accessMap[$name])) {
+            $method = 'get' . $this->accessMap[$name];
             return $this->{$method}();
-        } elseif (isset($this->_cache[ $name ])) {
-            return $this->_cache[ $name ];
+        } elseif (isset($this->_cache[$name])) {
+            return $this->_cache[$name];
         } elseif (in_array($name, $this->obsoleteProperties)) {
             return null;
         } else {
@@ -1415,8 +1412,8 @@ 
      */
     public function __set($name, $value)
     {
-        if (isset($this->accessMap[ $name ])) {
-            $method = 'set' . $this->accessMap[ $name ];
+        if (isset($this->accessMap[$name])) {
+            $method = 'set' . $this->accessMap[$name];
             $this->{$method}($value);
         } elseif (in_array($name, $this->obsoleteProperties)) {
             return;
@@ -1447,10 +1444,10 @@ 
         $_is_muted_directory = false;
 
         // add the SMARTY_DIR to the list of muted directories
-        if (!isset(Smarty::$_muted_directories[ SMARTY_DIR ])) {
+        if (!isset(Smarty::$_muted_directories[SMARTY_DIR])) {
             $smarty_dir = realpath(SMARTY_DIR);
             if ($smarty_dir !== false) {
-                Smarty::$_muted_directories[ SMARTY_DIR ] =
+                Smarty::$_muted_directories[SMARTY_DIR] =
                     array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
             }
         }
@@ -1462,12 +1459,12 @@ 
                 $file = realpath($key);
                 if ($file === false) {
                     // this directory does not exist, remove and skip it
-                    unset(Smarty::$_muted_directories[ $key ]);
+                    unset(Smarty::$_muted_directories[$key]);
                     continue;
                 }
                 $dir = array('file' => $file, 'length' => strlen($file),);
             }
-            if (!strncmp($errfile, $dir[ 'file' ], $dir[ 'length' ])) {
+            if (!strncmp($errfile, $dir['file'], $dir['length'])) {
                 $_is_muted_directory = true;
                 break;
             }

libraries/Smarty/libs/sysplugins/smarty_internal_compile_block.php

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
      * @param  \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
      * @param  array                                 $parameter array with compilation parameter
      *
-     * @return bool true
+     * @return boolean|null true
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
@@ -158,7 +158,7 @@ 
      * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
      * @param  array                                $parameter array with compilation parameter
      *
-     * @return bool true
+     * @return string true
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {

Indentation +208 added lines, -208 removed lines

@@ -15,134 +15,134 @@ 
  */
 class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inheritance
 {
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $required_attributes = array('name');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $shorttag_order = array('name');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('hide', 'nocache');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $option_flags = array('hide', 'nocache');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('assign');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $optional_attributes = array('assign');
 
-    /**
-     * nesting level of block tags
-     *
-     * @var int
-     */
-    public static $blockTagNestingLevel = 0;
+	/**
+	 * nesting level of block tags
+	 *
+	 * @var int
+	 */
+	public static $blockTagNestingLevel = 0;
 
-    /**
-     * Saved compiler object
-     *
-     * @var Smarty_Internal_TemplateCompilerBase
-     */
-    public $compiler = null;
+	/**
+	 * Saved compiler object
+	 *
+	 * @var Smarty_Internal_TemplateCompilerBase
+	 */
+	public $compiler = null;
 
-    /**
-     * Compiles code for the {block} tag
-     *
-     * @param  array                                 $args      array with attributes from parser
-     * @param  \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                 $parameter array with compilation parameter
-     *
-     * @return bool true
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->_cache[ 'blockNesting' ] = 0;
-        }
-        if ($compiler->_cache[ 'blockNesting' ] == 0) {
-            // make sure that inheritance gets initialized in template code
-            $this->registerInit($compiler);
-            $this->option_flags = array('hide', 'nocache', 'append', 'prepend');
-        } else {
-            $this->option_flags = array('hide', 'nocache');
-        }
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $compiler->_cache[ 'blockNesting' ] ++;
-        $compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ];
-        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array();
-        $this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
-                                                 $compiler->template->compiled->has_nocache_code,
-                                                 $compiler->template->caching));
-        // must whole block be nocache ?
-        if ($compiler->tag_nocache) {
-            $i = 0;
-        }
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        if ($_attr[ 'nocache' ] === true) {
+	/**
+	 * Compiles code for the {block} tag
+	 *
+	 * @param  array                                 $args      array with attributes from parser
+	 * @param  \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                 $parameter array with compilation parameter
+	 *
+	 * @return bool true
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		if (!isset($compiler->_cache[ 'blockNesting' ])) {
+			$compiler->_cache[ 'blockNesting' ] = 0;
+		}
+		if ($compiler->_cache[ 'blockNesting' ] == 0) {
+			// make sure that inheritance gets initialized in template code
+			$this->registerInit($compiler);
+			$this->option_flags = array('hide', 'nocache', 'append', 'prepend');
+		} else {
+			$this->option_flags = array('hide', 'nocache');
+		}
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$compiler->_cache[ 'blockNesting' ] ++;
+		$compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ];
+		$compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array();
+		$this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
+												 $compiler->template->compiled->has_nocache_code,
+												 $compiler->template->caching));
+		// must whole block be nocache ?
+		if ($compiler->tag_nocache) {
+			$i = 0;
+		}
+		$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+		if ($_attr[ 'nocache' ] === true) {
 
-        }
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        $compiler->template->compiled->has_nocache_code = false;
-        $compiler->suppressNocacheProcessing = true;
-    }
+		}
+		$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+		$compiler->template->compiled->has_nocache_code = false;
+		$compiler->suppressNocacheProcessing = true;
+	}
 
-    /**
-     * Compile saved child block source
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase compiler object
-     * @param string                                $_name   optional name of child block
-     *
-     * @return string   compiled code of child block
-     */
-    static function compileChildBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
-    {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ',
-                                              $compiler->parser->lex->taglineno);
-        }
-        $compiler->has_code = true;
-        $compiler->suppressNocacheProcessing = true;
-        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
-        $output = "<?php \n\$_smarty_tpl->inheritance->callChild(\$_smarty_tpl, \$this);\n?>\n";
-        return $output;
-    }
+	/**
+	 * Compile saved child block source
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase compiler object
+	 * @param string                                $_name   optional name of child block
+	 *
+	 * @return string   compiled code of child block
+	 */
+	static function compileChildBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
+	{
+		if (!isset($compiler->_cache[ 'blockNesting' ])) {
+			$compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ',
+											  $compiler->parser->lex->taglineno);
+		}
+		$compiler->has_code = true;
+		$compiler->suppressNocacheProcessing = true;
+		$compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
+		$output = "<?php \n\$_smarty_tpl->inheritance->callChild(\$_smarty_tpl, \$this);\n?>\n";
+		return $output;
+	}
 
-    /**
-     * Compile $smarty.block.parent
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     * @param string                                $_name    optional name of child block
-     *
-     * @return string   compiled code of child block
-     */
-    static function compileParentBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
-    {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ',
-                                              $compiler->parser->lex->taglineno);
-        }
-        $compiler->suppressNocacheProcessing = true;
-        $compiler->has_code = true;
-        $output = "<?php \n\$_smarty_tpl->inheritance->callParent(\$_smarty_tpl, \$this);\n?>\n";
-        return $output;
-    }
+	/**
+	 * Compile $smarty.block.parent
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+	 * @param string                                $_name    optional name of child block
+	 *
+	 * @return string   compiled code of child block
+	 */
+	static function compileParentBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
+	{
+		if (!isset($compiler->_cache[ 'blockNesting' ])) {
+			$compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ',
+											  $compiler->parser->lex->taglineno);
+		}
+		$compiler->suppressNocacheProcessing = true;
+		$compiler->has_code = true;
+		$output = "<?php \n\$_smarty_tpl->inheritance->callParent(\$_smarty_tpl, \$this);\n?>\n";
+		return $output;
+	}
 }
 
 /**
@@ -151,95 +151,95 @@ 
  */
 class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_Inheritance
 {
-    /**
-     * Compiles code for the {/block} tag
-     *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
-     *
-     * @return bool true
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
-        // init block parameter
-        $_block = $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ];
-        unset($compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ]);
-        $_name = $_attr[ 'name' ];
-        $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
-        unset($_attr[ 'assign' ], $_attr[ 'name' ]);
-        foreach ($_attr as $name => $stat) {
-            if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) {
-                $_block[ $name ] = 'true';
-            }
-        }
-        $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
-        // get compiled block code
-        $_functionCode = $compiler->parser->current_buffer;
-        // setup buffer for template function code
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+	/**
+	 * Compiles code for the {/block} tag
+	 *
+	 * @param  array                                $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                $parameter array with compilation parameter
+	 *
+	 * @return bool true
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
+		// init block parameter
+		$_block = $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ];
+		unset($compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ]);
+		$_name = $_attr[ 'name' ];
+		$_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
+		unset($_attr[ 'assign' ], $_attr[ 'name' ]);
+		foreach ($_attr as $name => $stat) {
+			if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) {
+				$_block[ $name ] = 'true';
+			}
+		}
+		$_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
+		// get compiled block code
+		$_functionCode = $compiler->parser->current_buffer;
+		// setup buffer for template function code
+		$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
 
-        $output = "<?php\n";
-        $output .= "/* {block {$_name}} */\n";
-        $output .= "class {$_className} extends Smarty_Internal_Block\n";
-        $output .= "{\n";
-        foreach ($_block as $property => $value) {
-            $output .= "public \${$property} = {$value};\n";
-        }
-        $output .= "public function callBlock(Smarty_Internal_Template \$_smarty_tpl) {\n";
-        if ($compiler->template->compiled->has_nocache_code) {
-            $output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
-        }
-        if (isset($_assign)) {
-            $output .= "ob_start();\n";
-        }
-        $output .= "?>\n";
-        $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                            $output));
-        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
-        $output = "<?php\n";
-        if (isset($_assign)) {
-            $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
-        }
-        $output .= "}\n";
-        $output .= "}\n";
-        $output .= "/* {/block {$_name}} */\n\n";
-        $output .= "?>\n";
-        $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                            $output));
-        $compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        // nocache plugins must be copied
-        if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
-            foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
-                        $data;
-                }
-            }
-        }
+		$output = "<?php\n";
+		$output .= "/* {block {$_name}} */\n";
+		$output .= "class {$_className} extends Smarty_Internal_Block\n";
+		$output .= "{\n";
+		foreach ($_block as $property => $value) {
+			$output .= "public \${$property} = {$value};\n";
+		}
+		$output .= "public function callBlock(Smarty_Internal_Template \$_smarty_tpl) {\n";
+		if ($compiler->template->compiled->has_nocache_code) {
+			$output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
+		}
+		if (isset($_assign)) {
+			$output .= "ob_start();\n";
+		}
+		$output .= "?>\n";
+		$compiler->parser->current_buffer->append_subtree($compiler->parser,
+														  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																							$output));
+		$compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+		$output = "<?php\n";
+		if (isset($_assign)) {
+			$output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+		}
+		$output .= "}\n";
+		$output .= "}\n";
+		$output .= "/* {/block {$_name}} */\n\n";
+		$output .= "?>\n";
+		$compiler->parser->current_buffer->append_subtree($compiler->parser,
+														  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																							$output));
+		$compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+		$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+		// nocache plugins must be copied
+		if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
+			foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
+				foreach ($tmp as $type => $data) {
+					$compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
+						$data;
+				}
+			}
+		}
 
-        // restore old status
-        $compiler->template->compiled->has_nocache_code = $_has_nocache_code;
-        $compiler->tag_nocache = $compiler->nocache;
-        $compiler->nocache = $_nocache;
-        $compiler->parser->current_buffer = $_buffer;
-        $output = "<?php \n";
-        if ($compiler->_cache[ 'blockNesting' ] == 1) {
-            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
-        } else {
-            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
-        }
-        $output .= "?>\n";
-        $compiler->_cache[ 'blockNesting' ] --;
-        if ($compiler->_cache[ 'blockNesting' ] == 0) {
-            unset($compiler->_cache[ 'blockNesting' ]);
-        }
-        $compiler->has_code = true;
-        $compiler->suppressNocacheProcessing = true;
-        return $output;
-    }
+		// restore old status
+		$compiler->template->compiled->has_nocache_code = $_has_nocache_code;
+		$compiler->tag_nocache = $compiler->nocache;
+		$compiler->nocache = $_nocache;
+		$compiler->parser->current_buffer = $_buffer;
+		$output = "<?php \n";
+		if ($compiler->_cache[ 'blockNesting' ] == 1) {
+			$output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
+		} else {
+			$output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
+		}
+		$output .= "?>\n";
+		$compiler->_cache[ 'blockNesting' ] --;
+		if ($compiler->_cache[ 'blockNesting' ] == 0) {
+			unset($compiler->_cache[ 'blockNesting' ]);
+		}
+		$compiler->has_code = true;
+		$compiler->suppressNocacheProcessing = true;
+		return $output;
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -72,10 +72,10 @@ 
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->_cache[ 'blockNesting' ] = 0;
+        if (!isset($compiler->_cache['blockNesting'])) {
+            $compiler->_cache['blockNesting'] = 0;
         }
-        if ($compiler->_cache[ 'blockNesting' ] == 0) {
+        if ($compiler->_cache['blockNesting'] == 0) {
             // make sure that inheritance gets initialized in template code
             $this->registerInit($compiler);
             $this->option_flags = array('hide', 'nocache', 'append', 'prepend');
@@ -84,9 +84,9 @@ 
         }
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        $compiler->_cache[ 'blockNesting' ] ++;
-        $compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ];
-        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array();
+        $compiler->_cache['blockNesting']++;
+        $compiler->_cache['blockName'][$compiler->_cache['blockNesting']] = $_attr['name'];
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']] = array();
         $this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
                                                  $compiler->template->compiled->has_nocache_code,
                                                  $compiler->template->caching));
@@ -95,7 +95,7 @@ 
             $i = 0;
         }
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        if ($_attr[ 'nocache' ] === true) {
+        if ($_attr['nocache'] === true) {
 
         }
         $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
@@ -113,13 +113,13 @@ 
      */
     static function compileChildBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
     {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
+        if (!isset($compiler->_cache['blockNesting'])) {
             $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ',
                                               $compiler->parser->lex->taglineno);
         }
         $compiler->has_code = true;
         $compiler->suppressNocacheProcessing = true;
-        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]['callsChild'] = 'true';
         $output = "<?php \n\$_smarty_tpl->inheritance->callChild(\$_smarty_tpl, \$this);\n?>\n";
         return $output;
     }
@@ -134,7 +134,7 @@ 
      */
     static function compileParentBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
     {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
+        if (!isset($compiler->_cache['blockNesting'])) {
             $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ',
                                               $compiler->parser->lex->taglineno);
         }
@@ -164,14 +164,14 @@ 
     {
         list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
         // init block parameter
-        $_block = $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ];
-        unset($compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ]);
-        $_name = $_attr[ 'name' ];
-        $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
-        unset($_attr[ 'assign' ], $_attr[ 'name' ]);
+        $_block = $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']];
+        unset($compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]);
+        $_name = $_attr['name'];
+        $_assign = isset($_attr['assign']) ? $_attr['assign'] : null;
+        unset($_attr['assign'], $_attr['name']);
         foreach ($_attr as $name => $stat) {
             if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) {
-                $_block[ $name ] = 'true';
+                $_block[$name] = 'true';
             }
         }
         $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
@@ -213,10 +213,10 @@ 
         $compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
         $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
         // nocache plugins must be copied
-        if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
-            foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
+        if (!empty($compiler->template->compiled->required_plugins['nocache'])) {
+            foreach ($compiler->template->compiled->required_plugins['nocache'] as $plugin => $tmp) {
                 foreach ($tmp as $type => $data) {
-                    $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
+                    $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$plugin][$type] =
                         $data;
                 }
             }
@@ -228,15 +228,15 @@ 
         $compiler->nocache = $_nocache;
         $compiler->parser->current_buffer = $_buffer;
         $output = "<?php \n";
-        if ($compiler->_cache[ 'blockNesting' ] == 1) {
+        if ($compiler->_cache['blockNesting'] == 1) {
             $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
         } else {
             $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
         }
         $output .= "?>\n";
-        $compiler->_cache[ 'blockNesting' ] --;
-        if ($compiler->_cache[ 'blockNesting' ] == 0) {
-            unset($compiler->_cache[ 'blockNesting' ]);
+        $compiler->_cache['blockNesting']--;
+        if ($compiler->_cache['blockNesting'] == 0) {
+            unset($compiler->_cache['blockNesting']);
         }
         $compiler->has_code = true;
         $compiler->suppressNocacheProcessing = true;

libraries/Smarty/libs/sysplugins/smarty_internal_compile_extends.php

Doc Comments +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
     /**
      * Create source code for {extends} from source components array
      *
-     * @param []\Smarty_Internal_Template_Source $components
+     * @param Smarty_Template_Source[] $components
      *
      * @return string
      */

Indentation +108 added lines, -108 removed lines

@@ -17,118 +17,118 @@
  */
 class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inheritance
 {
-    /**
-     * 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');
 
-    /**
-     * Array of names of optional attribute required by tag
-     * use array('_any') if there is no restriction of attributes names
-     *
-     * @var array
-     */
-    public $optional_attributes = array('extends_resource');
+	/**
+	 * Array of names of optional attribute required by tag
+	 * use array('_any') if there is no restriction of attributes names
+	 *
+	 * @var array
+	 */
+	public $optional_attributes = array('extends_resource');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $shorttag_order = array('file');
 
-    /**
-     * Compiles code for the {extends} tag extends: resource
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    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', $compiler->parser->lex->line - 1);
-        }
-        if (strpos($_attr[ 'file' ], '$_tmp') !== false) {
-            $compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
-        }
-        // add code to initialize inheritance
-        $this->registerInit($compiler, true);
-        $file = trim($_attr[ 'file' ], '\'"');
-        if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') {
-            // generate code for each template
-            $files = array_reverse(explode('|', substr($file, 8)));
-            $i = 0;
-            foreach ($files as $file) {
-                if ($file[ 0 ] == '"') {
-                    $file = trim($file, '".');
-                } else {
-                    $file = "'{$file}'";
-                }
-                $i ++;
-                if ($i == count($files) && isset($_attr[ 'extends_resource' ])) {
-                    $this->compileEndChild($compiler);
-                }
-                $this->compileInclude($compiler, $file);
-            }
-            if (!isset($_attr[ 'extends_resource' ])) {
-                $this->compileEndChild($compiler);
-            }
-        } else {
-            $this->compileEndChild($compiler);
-            $this->compileInclude($compiler, $_attr[ 'file' ]);
-        }
-        $compiler->has_code = false;
-        return '';
-    }
+	/**
+	 * Compiles code for the {extends} tag extends: resource
+	 *
+	 * @param array                                 $args     array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \SmartyCompilerException
+	 * @throws \SmartyException
+	 */
+	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', $compiler->parser->lex->line - 1);
+		}
+		if (strpos($_attr[ 'file' ], '$_tmp') !== false) {
+			$compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
+		}
+		// add code to initialize inheritance
+		$this->registerInit($compiler, true);
+		$file = trim($_attr[ 'file' ], '\'"');
+		if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') {
+			// generate code for each template
+			$files = array_reverse(explode('|', substr($file, 8)));
+			$i = 0;
+			foreach ($files as $file) {
+				if ($file[ 0 ] == '"') {
+					$file = trim($file, '".');
+				} else {
+					$file = "'{$file}'";
+				}
+				$i ++;
+				if ($i == count($files) && isset($_attr[ 'extends_resource' ])) {
+					$this->compileEndChild($compiler);
+				}
+				$this->compileInclude($compiler, $file);
+			}
+			if (!isset($_attr[ 'extends_resource' ])) {
+				$this->compileEndChild($compiler);
+			}
+		} else {
+			$this->compileEndChild($compiler);
+			$this->compileInclude($compiler, $_attr[ 'file' ]);
+		}
+		$compiler->has_code = false;
+		return '';
+	}
 
-    /**
-     * Add code for inheritance endChild() method to end of template
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                  "<?php \$_smarty_tpl->inheritance->endChild();\n?>\n");
-    }
+	/**
+	 * Add code for inheritance endChild() method to end of template
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 */
+	private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		$compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																				  "<?php \$_smarty_tpl->inheritance->endChild();\n?>\n");
+	}
 
-    /**
-     * Add code for including subtemplate to end of template
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     * @param  string                               $file subtemplate name
-     */
-    private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $file)
-    {
-        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                  $compiler->compileTag('include',
-                                                                                                        array($file,
-                                                                                                              array('scope' => 'parent'))));
-    }
+	/**
+	 * Add code for including subtemplate to end of template
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 * @param  string                               $file subtemplate name
+	 */
+	private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $file)
+	{
+		$compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																				  $compiler->compileTag('include',
+																										array($file,
+																											  array('scope' => 'parent'))));
+	}
 
-    /**
-     * Create source code for {extends} from source components array
-     *
-     * @param []\Smarty_Internal_Template_Source $components
-     *
-     * @return string
-     */
-    public static function extendsSourceArrayCode($components)
-    {
-        $resources = array();
-        foreach ($components as $source) {
-            $resources[] = $source->resource;
-        }
-        return '{extends file=\'extends:' . join('|', $resources) . '\' extends_resource=true}';
-    }
+	/**
+	 * Create source code for {extends} from source components array
+	 *
+	 * @param []\Smarty_Internal_Template_Source $components
+	 *
+	 * @return string
+	 */
+	public static function extendsSourceArrayCode($components)
+	{
+		$resources = array();
+		foreach ($components as $source) {
+			$resources[] = $source->resource;
+		}
+		return '{extends file=\'extends:' . join('|', $resources) . '\' extends_resource=true}';
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -55,37 +55,37 @@
     {
         // 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', $compiler->parser->lex->line - 1);
         }
-        if (strpos($_attr[ 'file' ], '$_tmp') !== false) {
+        if (strpos($_attr['file'], '$_tmp') !== false) {
             $compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
         }
         // add code to initialize inheritance
         $this->registerInit($compiler, true);
-        $file = trim($_attr[ 'file' ], '\'"');
+        $file = trim($_attr['file'], '\'"');
         if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') {
             // generate code for each template
             $files = array_reverse(explode('|', substr($file, 8)));
             $i = 0;
             foreach ($files as $file) {
-                if ($file[ 0 ] == '"') {
+                if ($file[0] == '"') {
                     $file = trim($file, '".');
                 } else {
                     $file = "'{$file}'";
                 }
-                $i ++;
-                if ($i == count($files) && isset($_attr[ 'extends_resource' ])) {
+                $i++;
+                if ($i == count($files) && isset($_attr['extends_resource'])) {
                     $this->compileEndChild($compiler);
                 }
                 $this->compileInclude($compiler, $file);
             }
-            if (!isset($_attr[ 'extends_resource' ])) {
+            if (!isset($_attr['extends_resource'])) {
                 $this->compileEndChild($compiler);
             }
         } else {
             $this->compileEndChild($compiler);
-            $this->compileInclude($compiler, $_attr[ 'file' ]);
+            $this->compileInclude($compiler, $_attr['file']);
         }
         $compiler->has_code = false;
         return '';

libraries/Smarty/libs/sysplugins/smarty_internal_compile_function.php

Doc Comments +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
      * Compiles code for the {/function} tag
      *
      * @param  array                                       $args      array with attributes from parser
-     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param Smarty_Internal_TemplateCompilerBase $compiler  compiler object
      * @param  array                                       $parameter array with compilation parameter
      *
      * @return bool true

Spacing +18 added lines, -18 removed lines

@@ -56,12 +56,12 @@ 
         // 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);
         }
-        unset($_attr[ 'nocache' ]);
-        $_name = trim($_attr[ 'name' ], "'\"");
-        $compiler->parent_compiler->tpl_function[ $_name ] = array();
+        unset($_attr['nocache']);
+        $_name = trim($_attr['name'], "'\"");
+        $compiler->parent_compiler->tpl_function[$_name] = array();
         $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
                       $compiler->template->caching);
         $this->openTag($compiler, 'function', $save);
@@ -101,13 +101,13 @@ 
     {
         $this->compiler = $compiler;
         $saved_data = $this->closeTag($compiler, array('function'));
-        $_attr = $saved_data[ 0 ];
-        $_name = trim($_attr[ 'name' ], "'\"");
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] =
+        $_attr = $saved_data[0];
+        $_name = trim($_attr['name'], "'\"");
+        $compiler->parent_compiler->tpl_function[$_name]['compiled_filepath'] =
             $compiler->parent_compiler->template->compiled->filepath;
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid;
+        $compiler->parent_compiler->tpl_function[$_name]['uid'] = $compiler->template->source->uid;
         $_parameter = $_attr;
-        unset($_parameter[ 'name' ]);
+        unset($_parameter['name']);
         // default parameter
         $_paramsArray = array();
         foreach ($_parameter as $_key => $_value) {
@@ -130,7 +130,7 @@ 
         $_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
         $_funcNameCaching = $_funcName . '_nocache';
         if ($compiler->template->compiled->has_nocache_code) {
-            $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
+            $compiler->parent_compiler->tpl_function[$_name]['call_name_caching'] = $_funcNameCaching;
             $output = "<?php\n";
             $output .= "/* {$_funcNameCaching} */\n";
             $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
@@ -162,7 +162,7 @@ 
                                                                                      array($this, 'removeNocache'),
                                                                                      $_functionCode->to_smarty_php($compiler->parser)));
         }
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
+        $compiler->parent_compiler->tpl_function[$_name]['call_name'] = $_funcName;
         $output = "<?php\n";
         $output .= "/* {$_funcName} */\n";
         $output .= "if (!function_exists('{$_funcName}')) {\n";
@@ -181,20 +181,20 @@ 
                                                                                             $output));
         $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
         // nocache plugins must be copied
-        if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
-            foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
+        if (!empty($compiler->template->compiled->required_plugins['nocache'])) {
+            foreach ($compiler->template->compiled->required_plugins['nocache'] as $plugin => $tmp) {
                 foreach ($tmp as $type => $data) {
-                    $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
+                    $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$plugin][$type] =
                         $data;
                 }
             }
         }
         // restore old buffer
 
-        $compiler->parser->current_buffer = $saved_data[ 1 ];
+        $compiler->parser->current_buffer = $saved_data[1];
         // restore old status
-        $compiler->template->compiled->has_nocache_code = $saved_data[ 2 ];
-        $compiler->template->caching = $saved_data[ 3 ];
+        $compiler->template->compiled->has_nocache_code = $saved_data[2];
+        $compiler->template->caching = $saved_data[3];
         return true;
     }
 
@@ -209,7 +209,7 @@ 
     {
         $code =
             preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
-                         '', $match[ 0 ]);
+                         '', $match[0]);
         $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
         return $code;
     }

Indentation +177 added lines, -177 removed lines

@@ -17,59 +17,59 @@ 
 class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
 {
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $required_attributes = array('name');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $shorttag_order = array('name');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $optional_attributes = array('_any');
 
-    /**
-     * Compiles code for the {function} tag
-     *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
-     *
-     * @return bool true
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
+	/**
+	 * Compiles code for the {function} tag
+	 *
+	 * @param  array                                $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                $parameter array with compilation parameter
+	 *
+	 * @return bool true
+	 * @throws \SmartyCompilerException
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
 
-        if ($_attr[ 'nocache' ] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', null, true);
-        }
-        unset($_attr[ 'nocache' ]);
-        $_name = trim($_attr[ 'name' ], "'\"");
-        $compiler->parent_compiler->tpl_function[ $_name ] = array();
-        $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
-                      $compiler->template->caching);
-        $this->openTag($compiler, 'function', $save);
-        // Init temporary context
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        $compiler->template->compiled->has_nocache_code = false;
-        return true;
-    }
+		if ($_attr[ 'nocache' ] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', null, true);
+		}
+		unset($_attr[ 'nocache' ]);
+		$_name = trim($_attr[ 'name' ], "'\"");
+		$compiler->parent_compiler->tpl_function[ $_name ] = array();
+		$save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
+					  $compiler->template->caching);
+		$this->openTag($compiler, 'function', $save);
+		// Init temporary context
+		$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+		$compiler->template->compiled->has_nocache_code = false;
+		return true;
+	}
 }
 
 /**
@@ -81,136 +81,136 @@ 
 class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
 {
 
-    /**
-     * Compiler object
-     *
-     * @var object
-     */
-    private $compiler = null;
+	/**
+	 * Compiler object
+	 *
+	 * @var object
+	 */
+	private $compiler = null;
 
-    /**
-     * Compiles code for the {/function} tag
-     *
-     * @param  array                                       $args      array with attributes from parser
-     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                       $parameter array with compilation parameter
-     *
-     * @return bool true
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $this->compiler = $compiler;
-        $saved_data = $this->closeTag($compiler, array('function'));
-        $_attr = $saved_data[ 0 ];
-        $_name = trim($_attr[ 'name' ], "'\"");
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] =
-            $compiler->parent_compiler->template->compiled->filepath;
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid;
-        $_parameter = $_attr;
-        unset($_parameter[ 'name' ]);
-        // default parameter
-        $_paramsArray = array();
-        foreach ($_parameter as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        if (!empty($_paramsArray)) {
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-            $_paramsCode = "\$params = array_merge($_params, \$params);\n";
-        } else {
-            $_paramsCode = '';
-        }
-        $_functionCode = $compiler->parser->current_buffer;
-        // setup buffer for template function code
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+	/**
+	 * Compiles code for the {/function} tag
+	 *
+	 * @param  array                                       $args      array with attributes from parser
+	 * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                       $parameter array with compilation parameter
+	 *
+	 * @return bool true
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		$this->compiler = $compiler;
+		$saved_data = $this->closeTag($compiler, array('function'));
+		$_attr = $saved_data[ 0 ];
+		$_name = trim($_attr[ 'name' ], "'\"");
+		$compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] =
+			$compiler->parent_compiler->template->compiled->filepath;
+		$compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid;
+		$_parameter = $_attr;
+		unset($_parameter[ 'name' ]);
+		// default parameter
+		$_paramsArray = array();
+		foreach ($_parameter as $_key => $_value) {
+			if (is_int($_key)) {
+				$_paramsArray[] = "$_key=>$_value";
+			} else {
+				$_paramsArray[] = "'$_key'=>$_value";
+			}
+		}
+		if (!empty($_paramsArray)) {
+			$_params = 'array(' . implode(",", $_paramsArray) . ')';
+			$_paramsCode = "\$params = array_merge($_params, \$params);\n";
+		} else {
+			$_paramsCode = '';
+		}
+		$_functionCode = $compiler->parser->current_buffer;
+		// setup buffer for template function code
+		$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
 
-        $_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
-        $_funcNameCaching = $_funcName . '_nocache';
-        if ($compiler->template->compiled->has_nocache_code) {
-            $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
-            $output = "<?php\n";
-            $output .= "/* {$_funcNameCaching} */\n";
-            $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
-            $output .= "function {$_funcNameCaching} (\$_smarty_tpl,\$params) {\n";
-            $output .= "ob_start();\n";
-            $output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
-            $output .= $_paramsCode;
-            $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}";
-            $output .= "\$params = var_export(\$params, true);\n";
-            $output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
-            $output .= "\\\$_smarty_tpl->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>";
-            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n\";?>";
-            $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                                $output));
-            $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
-            $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
-            $output .= "\\\$_smarty_tpl->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
-            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
-            $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
-            $output .= "}\n}\n";
-            $output .= "/*/ {$_funcName}_nocache */\n\n";
-            $output .= "?>\n";
-            $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                                $output));
-            $_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                               preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
-                                                                                     array($this, 'removeNocache'),
-                                                                                     $_functionCode->to_smarty_php($compiler->parser)));
-        }
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
-        $output = "<?php\n";
-        $output .= "/* {$_funcName} */\n";
-        $output .= "if (!function_exists('{$_funcName}')) {\n";
-        $output .= "function {$_funcName}(\$_smarty_tpl,\$params) {\n";
-        $output .= $_paramsCode;
-        $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}?>";
-        $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                            $output));
-        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
-        $output = "<?php\n}}\n";
-        $output .= "/*/ {$_funcName} */\n\n";
-        $output .= "?>\n";
-        $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                            $output));
-        $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
-        // nocache plugins must be copied
-        if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
-            foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
-                        $data;
-                }
-            }
-        }
-        // restore old buffer
+		$_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
+		$_funcNameCaching = $_funcName . '_nocache';
+		if ($compiler->template->compiled->has_nocache_code) {
+			$compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
+			$output = "<?php\n";
+			$output .= "/* {$_funcNameCaching} */\n";
+			$output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
+			$output .= "function {$_funcNameCaching} (\$_smarty_tpl,\$params) {\n";
+			$output .= "ob_start();\n";
+			$output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
+			$output .= $_paramsCode;
+			$output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}";
+			$output .= "\$params = var_export(\$params, true);\n";
+			$output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+			$output .= "\\\$_smarty_tpl->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>";
+			$output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n\";?>";
+			$compiler->parser->current_buffer->append_subtree($compiler->parser,
+															  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																								$output));
+			$compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+			$output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+			$output .= "\\\$_smarty_tpl->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
+			$output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
+			$output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
+			$output .= "}\n}\n";
+			$output .= "/*/ {$_funcName}_nocache */\n\n";
+			$output .= "?>\n";
+			$compiler->parser->current_buffer->append_subtree($compiler->parser,
+															  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																								$output));
+			$_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+															   preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+																					 array($this, 'removeNocache'),
+																					 $_functionCode->to_smarty_php($compiler->parser)));
+		}
+		$compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
+		$output = "<?php\n";
+		$output .= "/* {$_funcName} */\n";
+		$output .= "if (!function_exists('{$_funcName}')) {\n";
+		$output .= "function {$_funcName}(\$_smarty_tpl,\$params) {\n";
+		$output .= $_paramsCode;
+		$output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}?>";
+		$compiler->parser->current_buffer->append_subtree($compiler->parser,
+														  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																							$output));
+		$compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+		$output = "<?php\n}}\n";
+		$output .= "/*/ {$_funcName} */\n\n";
+		$output .= "?>\n";
+		$compiler->parser->current_buffer->append_subtree($compiler->parser,
+														  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																							$output));
+		$compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+		// nocache plugins must be copied
+		if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
+			foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
+				foreach ($tmp as $type => $data) {
+					$compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
+						$data;
+				}
+			}
+		}
+		// restore old buffer
 
-        $compiler->parser->current_buffer = $saved_data[ 1 ];
-        // restore old status
-        $compiler->template->compiled->has_nocache_code = $saved_data[ 2 ];
-        $compiler->template->caching = $saved_data[ 3 ];
-        return true;
-    }
+		$compiler->parser->current_buffer = $saved_data[ 1 ];
+		// restore old status
+		$compiler->template->compiled->has_nocache_code = $saved_data[ 2 ];
+		$compiler->template->caching = $saved_data[ 3 ];
+		return true;
+	}
 
-    /**
-     * Remove nocache code
-     * 
-     * @param $match
-     *
-     * @return string
-     */
-    public function removeNocache($match)
-    {
-        $code =
-            preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
-                         '', $match[ 0 ]);
-        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
-        return $code;
-    }
+	/**
+	 * Remove nocache code
+	 * 
+	 * @param $match
+	 *
+	 * @return string
+	 */
+	public function removeNocache($match)
+	{
+		$code =
+			preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+						 '', $match[ 0 ]);
+		$code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
+		return $code;
+	}
 }

libraries/Smarty/libs/sysplugins/smarty_internal_compile_private_php.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
      *
      * This code has been moved from lexer here fo easier debugging and maintenance
      *
-     * @param $lex
+     * @param Smarty_Internal_Templatelexer $lex
      */
     public function parsePhp($lex)
     {

Indentation +194 added lines, -194 removed lines

@@ -17,204 +17,204 @@
 class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
 {
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('code', 'type');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $required_attributes = array('code', 'type');
 
-    /**
-     * Compiles code for generating output from any expression
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $compiler->has_code = false;
-        if ($_attr[ 'type' ] == 'xml') {
-            $compiler->tag_nocache = true;
-            $save = $compiler->template->compiled->has_nocache_code;
-            $output = addcslashes($_attr[ 'code' ], "'\\");
-            $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                                $compiler->processNocacheCode("<?php echo '" .
-                                                                                                                              $output .
-                                                                                                                              "';?>",
-                                                                                                                              true)));
-            $compiler->template->compiled->has_nocache_code = $save;
-            return '';
-        }
-        if ($_attr[ 'type' ] != 'tag') {
-            if ($compiler->php_handling == Smarty::PHP_REMOVE) {
-                return '';
-            } elseif ($compiler->php_handling == Smarty::PHP_QUOTE) {
-                $output =
-                    preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
-                                          array($this, 'quote'), $_attr[ 'code' ]);
-                $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                                  new Smarty_Internal_ParseTree_Text($output));
-                return '';
-            } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr[ 'type' ] == 'unmatched') {
-                $compiler->tag_nocache = true;
-                $save = $compiler->template->compiled->has_nocache_code;
-                $output = addcslashes($_attr[ 'code' ], "'\\");
-                $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                                  new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                                    $compiler->processNocacheCode("<?php echo '" .
-                                                                                                                                  $output .
-                                                                                                                                  "';?>",
-                                                                                                                                  true)));
-                $compiler->template->compiled->has_nocache_code = $save;
-                return '';
-            } elseif ($compiler->php_handling == Smarty::PHP_ALLOW) {
-                if (!($compiler->smarty instanceof SmartyBC)) {
-                    $compiler->trigger_template_error('$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it',
-                                                      null, true);
-                }
-                $compiler->has_code = true;
-                return $_attr[ 'code' ];
-            } else {
-                $compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
-            }
-        } else {
-            $compiler->has_code = true;
-            if (!($compiler->smarty instanceof SmartyBC)) {
-                $compiler->trigger_template_error('{php}{/php} tags not allowed. Use SmartyBC to enable them', null,
-                                                  true);
-            }
-            $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
-            $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
-            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match);
-            if (!empty($match[ 2 ])) {
-                if ('nocache' == trim($match[ 2 ])) {
-                    $compiler->tag_nocache = true;
-                } else {
-                    $compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", null, true);
-                }
-            }
-            return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
-                                array('<?php ', '?>'), $_attr[ 'code' ]);
-        }
-    }
+	/**
+	 * Compiles code for generating output from any expression
+	 *
+	 * @param array                                 $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param array                                 $parameter array with compilation parameter
+	 *
+	 * @return string
+	 * @throws \SmartyException
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$compiler->has_code = false;
+		if ($_attr[ 'type' ] == 'xml') {
+			$compiler->tag_nocache = true;
+			$save = $compiler->template->compiled->has_nocache_code;
+			$output = addcslashes($_attr[ 'code' ], "'\\");
+			$compiler->parser->current_buffer->append_subtree($compiler->parser,
+															  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																								$compiler->processNocacheCode("<?php echo '" .
+																															  $output .
+																															  "';?>",
+																															  true)));
+			$compiler->template->compiled->has_nocache_code = $save;
+			return '';
+		}
+		if ($_attr[ 'type' ] != 'tag') {
+			if ($compiler->php_handling == Smarty::PHP_REMOVE) {
+				return '';
+			} elseif ($compiler->php_handling == Smarty::PHP_QUOTE) {
+				$output =
+					preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
+										  array($this, 'quote'), $_attr[ 'code' ]);
+				$compiler->parser->current_buffer->append_subtree($compiler->parser,
+																  new Smarty_Internal_ParseTree_Text($output));
+				return '';
+			} elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr[ 'type' ] == 'unmatched') {
+				$compiler->tag_nocache = true;
+				$save = $compiler->template->compiled->has_nocache_code;
+				$output = addcslashes($_attr[ 'code' ], "'\\");
+				$compiler->parser->current_buffer->append_subtree($compiler->parser,
+																  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																									$compiler->processNocacheCode("<?php echo '" .
+																																  $output .
+																																  "';?>",
+																																  true)));
+				$compiler->template->compiled->has_nocache_code = $save;
+				return '';
+			} elseif ($compiler->php_handling == Smarty::PHP_ALLOW) {
+				if (!($compiler->smarty instanceof SmartyBC)) {
+					$compiler->trigger_template_error('$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it',
+													  null, true);
+				}
+				$compiler->has_code = true;
+				return $_attr[ 'code' ];
+			} else {
+				$compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
+			}
+		} else {
+			$compiler->has_code = true;
+			if (!($compiler->smarty instanceof SmartyBC)) {
+				$compiler->trigger_template_error('{php}{/php} tags not allowed. Use SmartyBC to enable them', null,
+												  true);
+			}
+			$ldel = preg_quote($compiler->smarty->left_delimiter, '#');
+			$rdel = preg_quote($compiler->smarty->right_delimiter, '#');
+			preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match);
+			if (!empty($match[ 2 ])) {
+				if ('nocache' == trim($match[ 2 ])) {
+					$compiler->tag_nocache = true;
+				} else {
+					$compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", null, true);
+				}
+			}
+			return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
+								array('<?php ', '?>'), $_attr[ 'code' ]);
+		}
+	}
 
-    /**
-     * Lexer code for PHP tags
-     *
-     * This code has been moved from lexer here fo easier debugging and maintenance
-     *
-     * @param $lex
-     */
-    public function parsePhp($lex)
-    {
-        $lex->token = Smarty_Internal_Templateparser::TP_PHP;
-        $close = 0;
-        $lex->taglineno = $lex->line;
-        $closeTag = '?>';
-        if (strpos($lex->value, '<?xml') === 0) {
-            $lex->is_xml = true;
-            $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
-            return;
-        } elseif (strpos($lex->value, '<?') === 0) {
-            $lex->phpType = 'php';
-        } elseif (strpos($lex->value, '<%') === 0) {
-            $lex->phpType = 'asp';
-            $closeTag = '%>';
-        } elseif (strpos($lex->value, '%>') === 0) {
-            $lex->phpType = 'unmatched';
-        } elseif (strpos($lex->value, '?>') === 0) {
-            if ($lex->is_xml) {
-                $lex->is_xml = false;
-                $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
-                return;
-            }
-            $lex->phpType = 'unmatched';
-        } elseif (strpos($lex->value, '<s') === 0) {
-            $lex->phpType = 'script';
-            $closeTag = '</script>';
-        } elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
-            if ($lex->isAutoLiteral()) {
-                $lex->token = Smarty_Internal_Templateparser::TP_TEXT;
-                return;
-            }
-            $closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
-            if ($lex->value == $closeTag) {
-                $lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
-            }
-            $lex->phpType = 'tag';
-        }
-        if ($lex->phpType == 'unmatched') {
-            return;
-        }
-        if (($lex->phpType == 'php' || $lex->phpType == 'asp') &&
-            ($lex->compiler->php_handling == Smarty::PHP_PASSTHRU || $lex->compiler->php_handling == Smarty::PHP_QUOTE)
-        ) {
-            return;
-        }
-        $start = $lex->counter + strlen($lex->value);
-        $body = true;
-        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-            $close = $match[ 0 ][ 1 ];
-        } else {
-            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
-        }
-        while ($body) {
-            if (preg_match('~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
-                           $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-                $value = $match[ 0 ][ 0 ];
-                $from = $pos = $match[ 0 ][ 1 ];
-                if ($pos > $close) {
-                    $body = false;
-                } else {
-                    $start = $pos + strlen($value);
-                    $phpCommentStart = $value == '/*';
-                    if ($phpCommentStart) {
-                        $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
-                        if ($phpCommentEnd) {
-                            $pos2 = $match[ 0 ][ 1 ];
-                            $start = $pos2 + strlen($match[ 0 ][ 0 ]);
-                        }
-                    }
-                    while ($close > $pos && $close < $start) {
-                        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE,
-                                       $from)) {
-                            $close = $match[ 0 ][ 1 ];
-                            $from = $close + strlen($match[ 0 ][ 0 ]);
-                        } else {
-                            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
-                        }
-                    }
-                    if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
-                        $lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
-                        $lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
-                    }
-                }
-            } else {
-                $body = false;
-            }
-        }
-        $lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
-    }
+	/**
+	 * Lexer code for PHP tags
+	 *
+	 * This code has been moved from lexer here fo easier debugging and maintenance
+	 *
+	 * @param $lex
+	 */
+	public function parsePhp($lex)
+	{
+		$lex->token = Smarty_Internal_Templateparser::TP_PHP;
+		$close = 0;
+		$lex->taglineno = $lex->line;
+		$closeTag = '?>';
+		if (strpos($lex->value, '<?xml') === 0) {
+			$lex->is_xml = true;
+			$lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+			return;
+		} elseif (strpos($lex->value, '<?') === 0) {
+			$lex->phpType = 'php';
+		} elseif (strpos($lex->value, '<%') === 0) {
+			$lex->phpType = 'asp';
+			$closeTag = '%>';
+		} elseif (strpos($lex->value, '%>') === 0) {
+			$lex->phpType = 'unmatched';
+		} elseif (strpos($lex->value, '?>') === 0) {
+			if ($lex->is_xml) {
+				$lex->is_xml = false;
+				$lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+				return;
+			}
+			$lex->phpType = 'unmatched';
+		} elseif (strpos($lex->value, '<s') === 0) {
+			$lex->phpType = 'script';
+			$closeTag = '</script>';
+		} elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
+			if ($lex->isAutoLiteral()) {
+				$lex->token = Smarty_Internal_Templateparser::TP_TEXT;
+				return;
+			}
+			$closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
+			if ($lex->value == $closeTag) {
+				$lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
+			}
+			$lex->phpType = 'tag';
+		}
+		if ($lex->phpType == 'unmatched') {
+			return;
+		}
+		if (($lex->phpType == 'php' || $lex->phpType == 'asp') &&
+			($lex->compiler->php_handling == Smarty::PHP_PASSTHRU || $lex->compiler->php_handling == Smarty::PHP_QUOTE)
+		) {
+			return;
+		}
+		$start = $lex->counter + strlen($lex->value);
+		$body = true;
+		if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+			$close = $match[ 0 ][ 1 ];
+		} else {
+			$lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+		}
+		while ($body) {
+			if (preg_match('~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
+						   $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+				$value = $match[ 0 ][ 0 ];
+				$from = $pos = $match[ 0 ][ 1 ];
+				if ($pos > $close) {
+					$body = false;
+				} else {
+					$start = $pos + strlen($value);
+					$phpCommentStart = $value == '/*';
+					if ($phpCommentStart) {
+						$phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
+						if ($phpCommentEnd) {
+							$pos2 = $match[ 0 ][ 1 ];
+							$start = $pos2 + strlen($match[ 0 ][ 0 ]);
+						}
+					}
+					while ($close > $pos && $close < $start) {
+						if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE,
+									   $from)) {
+							$close = $match[ 0 ][ 1 ];
+							$from = $close + strlen($match[ 0 ][ 0 ]);
+						} else {
+							$lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+						}
+					}
+					if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
+						$lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
+						$lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
+					}
+				}
+			} else {
+				$body = false;
+			}
+		}
+		$lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
+	}
 
-    /*
+	/*
      * Call back function for $php_handling = PHP_QUOTE
      *
      */
-    /**
-     * @param $match
-     *
-     * @return string
-     */
-    private function quote($match)
-    {
-        return htmlspecialchars($match[ 0 ], ENT_QUOTES);
-    }
+	/**
+	 * @param $match
+	 *
+	 * @return string
+	 */
+	private function quote($match)
+	{
+		return htmlspecialchars($match[ 0 ], ENT_QUOTES);
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -40,10 +40,10 @@ 
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         $compiler->has_code = false;
-        if ($_attr[ 'type' ] == 'xml') {
+        if ($_attr['type'] == 'xml') {
             $compiler->tag_nocache = true;
             $save = $compiler->template->compiled->has_nocache_code;
-            $output = addcslashes($_attr[ 'code' ], "'\\");
+            $output = addcslashes($_attr['code'], "'\\");
             $compiler->parser->current_buffer->append_subtree($compiler->parser,
                                                               new Smarty_Internal_ParseTree_Tag($compiler->parser,
                                                                                                 $compiler->processNocacheCode("<?php echo '" .
@@ -53,20 +53,20 @@ 
             $compiler->template->compiled->has_nocache_code = $save;
             return '';
         }
-        if ($_attr[ 'type' ] != 'tag') {
+        if ($_attr['type'] != 'tag') {
             if ($compiler->php_handling == Smarty::PHP_REMOVE) {
                 return '';
             } elseif ($compiler->php_handling == Smarty::PHP_QUOTE) {
                 $output =
                     preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
-                                          array($this, 'quote'), $_attr[ 'code' ]);
+                                          array($this, 'quote'), $_attr['code']);
                 $compiler->parser->current_buffer->append_subtree($compiler->parser,
                                                                   new Smarty_Internal_ParseTree_Text($output));
                 return '';
-            } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr[ 'type' ] == 'unmatched') {
+            } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr['type'] == 'unmatched') {
                 $compiler->tag_nocache = true;
                 $save = $compiler->template->compiled->has_nocache_code;
-                $output = addcslashes($_attr[ 'code' ], "'\\");
+                $output = addcslashes($_attr['code'], "'\\");
                 $compiler->parser->current_buffer->append_subtree($compiler->parser,
                                                                   new Smarty_Internal_ParseTree_Tag($compiler->parser,
                                                                                                     $compiler->processNocacheCode("<?php echo '" .
@@ -81,7 +81,7 @@ 
                                                       null, true);
                 }
                 $compiler->has_code = true;
-                return $_attr[ 'code' ];
+                return $_attr['code'];
             } else {
                 $compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
             }
@@ -93,16 +93,16 @@ 
             }
             $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
             $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
-            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match);
-            if (!empty($match[ 2 ])) {
-                if ('nocache' == trim($match[ 2 ])) {
+            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr['code'], $match);
+            if (!empty($match[2])) {
+                if ('nocache' == trim($match[2])) {
                     $compiler->tag_nocache = true;
                 } else {
                     $compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", null, true);
                 }
             }
             return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
-                                array('<?php ', '?>'), $_attr[ 'code' ]);
+                                array('<?php ', '?>'), $_attr['code']);
         }
     }
 
@@ -162,15 +162,15 @@ 
         $start = $lex->counter + strlen($lex->value);
         $body = true;
         if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-            $close = $match[ 0 ][ 1 ];
+            $close = $match[0][1];
         } else {
             $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
         }
         while ($body) {
             if (preg_match('~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
                            $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-                $value = $match[ 0 ][ 0 ];
-                $from = $pos = $match[ 0 ][ 1 ];
+                $value = $match[0][0];
+                $from = $pos = $match[0][1];
                 if ($pos > $close) {
                     $body = false;
                 } else {
@@ -179,15 +179,15 @@ 
                     if ($phpCommentStart) {
                         $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
                         if ($phpCommentEnd) {
-                            $pos2 = $match[ 0 ][ 1 ];
-                            $start = $pos2 + strlen($match[ 0 ][ 0 ]);
+                            $pos2 = $match[0][1];
+                            $start = $pos2 + strlen($match[0][0]);
                         }
                     }
                     while ($close > $pos && $close < $start) {
                         if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE,
                                        $from)) {
-                            $close = $match[ 0 ][ 1 ];
-                            $from = $close + strlen($match[ 0 ][ 0 ]);
+                            $close = $match[0][1];
+                            $from = $close + strlen($match[0][0]);
                         } else {
                             $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
                         }
@@ -215,6 +215,6 @@ 
      */
     private function quote($match)
     {
-        return htmlspecialchars($match[ 0 ], ENT_QUOTES);
+        return htmlspecialchars($match[0], ENT_QUOTES);
     }
 }

libraries/Smarty/libs/sysplugins/smarty_internal_compile_setfilter.php

Doc Comments +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
      * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
      * @param  array                                $parameter array with compilation parameter
      *
-     * @return string compiled code
+     * @return boolean compiled code
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
@@ -51,7 +51,7 @@ 
      * @param  array                                $args     array with attributes from parser
      * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
-     * @return string compiled code
+     * @return boolean compiled code
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {

Indentation +39 added lines, -39 removed lines

@@ -16,24 +16,24 @@ 
  */
 class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
 {
-    /**
-     * Compiles code for setfilter tag
-     *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $compiler->variable_filter_stack[] = $compiler->variable_filters;
-        $compiler->variable_filters = $parameter[ 'modifier_list' ];
-        // this tag does not return compiled code
-        $compiler->has_code = false;
+	/**
+	 * Compiles code for setfilter tag
+	 *
+	 * @param  array                                $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		$compiler->variable_filter_stack[] = $compiler->variable_filters;
+		$compiler->variable_filters = $parameter[ 'modifier_list' ];
+		// this tag does not return compiled code
+		$compiler->has_code = false;
 
-        return true;
-    }
+		return true;
+	}
 }
 
 /**
@@ -44,27 +44,27 @@ 
  */
 class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
 {
-    /**
-     * Compiles code for the {/setfilter} tag
-     * This tag does not generate compiled output. It resets variable filter.
-     *
-     * @param  array                                $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        // reset variable filter to previous state
-        if (count($compiler->variable_filter_stack)) {
-            $compiler->variable_filters = array_pop($compiler->variable_filter_stack);
-        } else {
-            $compiler->variable_filters = array();
-        }
-        // this tag does not return compiled code
-        $compiler->has_code = false;
+	/**
+	 * Compiles code for the {/setfilter} tag
+	 * This tag does not generate compiled output. It resets variable filter.
+	 *
+	 * @param  array                                $args     array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		$_attr = $this->getAttributes($compiler, $args);
+		// reset variable filter to previous state
+		if (count($compiler->variable_filter_stack)) {
+			$compiler->variable_filters = array_pop($compiler->variable_filter_stack);
+		} else {
+			$compiler->variable_filters = array();
+		}
+		// this tag does not return compiled code
+		$compiler->has_code = false;
 
-        return true;
-    }
+		return true;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         $compiler->variable_filter_stack[] = $compiler->variable_filters;
-        $compiler->variable_filters = $parameter[ 'modifier_list' ];
+        $compiler->variable_filters = $parameter['modifier_list'];
         // this tag does not return compiled code
         $compiler->has_code = false;