From 28ce879b21b9582fff94abe70463f3384b276882 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 25 Oct 2011 13:05:06 +0000 Subject: [PATCH] Updated smarty to 1.0.9 git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@21030 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../smarty/plugins/block.textformat.php | 77 +- .../smarty/plugins/function.counter.php | 8 +- .../include/smarty/plugins/function.cycle.php | 48 +- .../include/smarty/plugins/function.fetch.php | 14 +- .../plugins/function.html_checkboxes.php | 136 +- .../smarty/plugins/function.html_image.php | 25 +- .../smarty/plugins/function.html_options.php | 97 +- .../smarty/plugins/function.html_radios.php | 105 +- .../plugins/function.html_select_date.php | 470 +-- .../plugins/function.html_select_time.php | 422 +- .../smarty/plugins/function.html_table.php | 84 +- .../smarty/plugins/function.mailto.php | 118 +- .../include/smarty/plugins/function.math.php | 20 +- .../smarty/plugins/modifier.capitalize.php | 54 +- .../smarty/plugins/modifier.date_format.php | 9 +- .../plugins/modifier.debug_print_var.php | 40 +- .../smarty/plugins/modifier.escape.php | 124 +- .../smarty/plugins/modifier.regex_replace.php | 33 +- .../smarty/plugins/modifier.replace.php | 14 +- .../smarty/plugins/modifier.spacify.php | 22 +- .../smarty/plugins/modifier.truncate.php | 56 +- .../smarty/plugins/modifiercompiler.cat.php | 7 +- .../modifiercompiler.count_characters.php | 30 +- .../modifiercompiler.count_paragraphs.php | 5 +- .../modifiercompiler.count_sentences.php | 9 +- .../plugins/modifiercompiler.count_words.php | 27 +- .../plugins/modifiercompiler.default.php | 20 +- .../plugins/modifiercompiler.indent.php | 10 +- .../smarty/plugins/modifiercompiler.lower.php | 22 +- .../plugins/modifiercompiler.noprint.php | 1 - .../modifiercompiler.string_format.php | 12 +- .../smarty/plugins/modifiercompiler.strip.php | 12 +- .../plugins/modifiercompiler.strip_tags.php | 15 +- .../smarty/plugins/modifiercompiler.upper.php | 10 +- .../plugins/modifiercompiler.wordwrap.php | 13 +- .../plugins/outputfilter.trimwhitespace.php | 119 +- .../plugins/shared.escape_special_chars.php | 60 +- .../smarty/plugins/shared.make_timestamp.php | 17 +- .../smarty/plugins/shared.mb_str_replace.php | 85 +- .../variablefilter.htmlspecialchars.php | 13 +- .../smarty_internal_cacheresource_file.php | 282 +- .../smarty_internal_compile_append.php | 25 +- .../smarty_internal_compile_assign.php | 59 +- .../smarty_internal_compile_block.php | 255 +- .../smarty_internal_compile_break.php | 68 +- .../smarty_internal_compile_call.php | 100 +- .../smarty_internal_compile_capture.php | 85 +- .../smarty_internal_compile_config_load.php | 61 +- .../smarty_internal_compile_continue.php | 66 +- .../smarty_internal_compile_debug.php | 29 +- .../smarty_internal_compile_eval.php | 56 +- .../smarty_internal_compile_extends.php | 117 +- .../smarty_internal_compile_for.php | 122 +- .../smarty_internal_compile_foreach.php | 206 +- .../smarty_internal_compile_function.php | 109 +- .../sysplugins/smarty_internal_compile_if.php | 251 +- .../smarty_internal_compile_include.php | 194 +- .../smarty_internal_compile_include_php.php | 100 +- .../smarty_internal_compile_insert.php | 113 +- .../smarty_internal_compile_ldelim.php | 26 +- .../smarty_internal_compile_nocache.php | 58 +- ..._internal_compile_private_block_plugin.php | 79 +- ...ternal_compile_private_function_plugin.php | 45 +- ...arty_internal_compile_private_modifier.php | 64 +- ..._compile_private_object_block_function.php | 88 +- ...ternal_compile_private_object_function.php | 60 +- ...ernal_compile_private_print_expression.php | 179 +- ...ernal_compile_private_registered_block.php | 108 +- ...al_compile_private_registered_function.php | 64 +- ...ernal_compile_private_special_variable.php | 35 +- .../smarty_internal_compile_rdelim.php | 26 +- .../smarty_internal_compile_section.php | 112 +- .../smarty_internal_compile_while.php | 116 +- .../smarty_internal_compilebase.php | 144 +- .../sysplugins/smarty_internal_config.php | 399 +- .../smarty_internal_config_file_compiler.php | 110 +- .../smarty_internal_configfilelexer.php | 33 +- .../smarty_internal_configfileparser.php | 152 +- .../sysplugins/smarty_internal_data.php | 264 +- .../sysplugins/smarty_internal_debug.php | 343 +- .../smarty_internal_filter_handler.php | 85 +- .../smarty_internal_function_call_handler.php | 23 +- .../smarty_internal_get_include_path.php | 41 +- .../smarty_internal_nocache_insert.php | 36 +- .../sysplugins/smarty_internal_parsetree.php | 313 +- .../smarty_internal_resource_eval.php | 135 +- .../smarty_internal_resource_extends.php | 260 +- .../smarty_internal_resource_file.php | 162 +- .../smarty_internal_resource_php.php | 171 +- .../smarty_internal_resource_registered.php | 178 +- .../smarty_internal_resource_stream.php | 131 +- .../smarty_internal_resource_string.php | 175 +- ...smarty_internal_smartytemplatecompiler.php | 99 +- .../sysplugins/smarty_internal_template.php | 1195 ++++-- .../smarty_internal_templatecompilerbase.php | 397 +- .../smarty_internal_templatelexer.php | 64 +- .../smarty_internal_templateparser.php | 3680 ++++++++--------- .../sysplugins/smarty_internal_utility.php | 712 +--- .../sysplugins/smarty_internal_wrapper.php | 22 +- .../sysplugins/smarty_internal_write_file.php | 70 +- .../smarty/sysplugins/smarty_security.php | 430 +- 101 files changed, 6715 insertions(+), 8930 deletions(-) diff --git a/gosa-core/include/smarty/plugins/block.textformat.php b/gosa-core/include/smarty/plugins/block.textformat.php index bdd806731..517fd62dd 100644 --- a/gosa-core/include/smarty/plugins/block.textformat.php +++ b/gosa-core/include/smarty/plugins/block.textformat.php @@ -8,35 +8,34 @@ /** * Smarty {textformat}{/textformat} block plugin - * + * * Type: block function
* Name: textformat
* Purpose: format text a certain way with preset styles - * or custom wrap/indent settings
- * Params: + * or custom wrap/indent settings
+ * + * @link http://smarty.php.net/manual/en/language.function.textformat.php {textformat} + * (Smarty online manual) + * @param array $params parameters * 
- * - style         - string (email)
- * - indent        - integer (0)
- * - wrap          - integer (80)
- * - wrap_char     - string ("\n")
- * - indent_char   - string (" ")
- * - wrap_boundary - boolean (true)
+ * Params:   style: string (email)
+ *            indent: integer (0)
+ *            wrap: integer (80)
+ *            wrap_char string ("\n")
+ *            indent_char: string (" ")
+ *            wrap_boundary: boolean (true)
  *
- * - * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat} - * (Smarty online manual) - * @param array $params parameters - * @param string $content contents of the block - * @param Smarty_Internal_Template $template template object - * @param boolean &$repeat repeat flag + * @author Monte Ohrt + * @param string $content contents of the block + * @param object $template template object + * @param boolean &$repeat repeat flag * @return string content re-formatted - * @author Monte Ohrt */ function smarty_block_textformat($params, $content, $template, &$repeat) { if (is_null($content)) { return; - } + } $style = null; $indent = 0; @@ -68,46 +67,36 @@ function smarty_block_textformat($params, $content, $template, &$repeat) default: trigger_error("textformat: unknown attribute '$_key'"); - } - } + } + } if ($style == 'email') { $wrap = 72; - } + } // split into paragraphs - $_paragraphs = preg_split('![\r\n]{2}!', $content); + $_paragraphs = preg_split('![\r\n][\r\n]!', $content); $_output = ''; - - foreach ($_paragraphs as &$_paragraph) { - if (!$_paragraph) { + for($_x = 0, $_y = count($_paragraphs); $_x < $_y; $_x++) { + if ($_paragraphs[$_x] == '') { continue; - } + } // convert mult. spaces & special chars to single space - $_paragraph = preg_replace(array('!\s+!u', '!(^\s+)|(\s+$)!u'), array(' ', ''), $_paragraph); + $_paragraphs[$_x] = preg_replace(array('!\s+!', '!(^\s+)|(\s+$)!'), array(' ', ''), $_paragraphs[$_x]); // indent first line if ($indent_first > 0) { - $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph; - } + $_paragraphs[$_x] = str_repeat($indent_char, $indent_first) . $_paragraphs[$_x]; + } // wordwrap sentences - if (SMARTY_MBSTRING /* ^phpunit */&&empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) { - require_once(SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php'); - $_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut); - } else { - $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut); - } + $_paragraphs[$_x] = wordwrap($_paragraphs[$_x], $wrap - $indent, $wrap_char, $wrap_cut); // indent lines if ($indent > 0) { - $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph); - } - } + $_paragraphs[$_x] = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraphs[$_x]); + } + } $_output = implode($wrap_char . $wrap_char, $_paragraphs); - if ($assign) { - $template->assign($assign, $_output); - } else { - return $_output; - } -} + return $assign ? $template->assign($assign, $_output) : $_output; +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/plugins/function.counter.php b/gosa-core/include/smarty/plugins/function.counter.php index 3906badf0..7c50bd44b 100644 --- a/gosa-core/include/smarty/plugins/function.counter.php +++ b/gosa-core/include/smarty/plugins/function.counter.php @@ -11,12 +11,12 @@ * Type: function
* Name: counter
* Purpose: print out a counter value - * * @author Monte Ohrt - * @link http://www.smarty.net/manual/en/language.function.counter.php {counter} + * @link http://smarty.php.net/manual/en/language.function.counter.php {counter} * (Smarty online manual) - * @param array $params parameters - * @param Smarty_Internal_Template $template template object + * @param array parameters + * @param Smarty + * @param object $template template object * @return string|null */ function smarty_function_counter($params, $template) diff --git a/gosa-core/include/smarty/plugins/function.cycle.php b/gosa-core/include/smarty/plugins/function.cycle.php index 1778ffb53..98e3e2878 100644 --- a/gosa-core/include/smarty/plugins/function.cycle.php +++ b/gosa-core/include/smarty/plugins/function.cycle.php @@ -13,46 +13,46 @@ * Name: cycle
* Date: May 3, 2002
* Purpose: cycle through given values
- * Params: - * 
- * - name      - name of cycle (optional)
- * - values    - comma separated list of values to cycle, or an array of values to cycle
- *               (this can be left out for subsequent calls)
- * - reset     - boolean - resets given var to true
- * - print     - boolean - print var or not. default is true
- * - advance   - boolean - whether or not to advance the cycle
- * - delimiter - the value delimiter, default is ","
- * - assign    - boolean, assigns to template var instead of printed.
- *
+ * Input: + * - name = name of cycle (optional) + * - values = comma separated list of values to cycle, + * or an array of values to cycle + * (this can be left out for subsequent calls) + * - reset = boolean - resets given var to true + * - print = boolean - print var or not. default is true + * - advance = boolean - whether or not to advance the cycle + * - delimiter = the value delimiter, default is "," + * - assign = boolean, assigns to template var instead of + * printed. + * * Examples:
* 
  * {cycle values="#eeeeee,#d0d0d0d"}
  * {cycle name=row values="one,two,three" reset=true}
  * {cycle name=row}
  *
- * - * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle} + * @link http://smarty.php.net/manual/en/language.function.cycle.php {cycle} * (Smarty online manual) * @author Monte Ohrt * @author credit to Mark Priatel * @author credit to Gerard * @author credit to Jason Sweat * @version 1.3 - * @param array $params parameters - * @param Smarty_Internal_Template $template template object + * @param array + * @param object $template template object * @return string|null */ function smarty_function_cycle($params, $template) { static $cycle_vars; - + $name = (empty($params['name'])) ? 'default' : $params['name']; $print = (isset($params['print'])) ? (bool)$params['print'] : true; $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true; $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false; - - if (!isset($params['values'])) { + + if (!in_array('values', array_keys($params))) { if(!isset($cycle_vars[$name]['values'])) { trigger_error("cycle: missing 'values' parameter"); return; @@ -68,24 +68,24 @@ function smarty_function_cycle($params, $template) if (isset($params['delimiter'])) { $cycle_vars[$name]['delimiter'] = $params['delimiter']; } elseif (!isset($cycle_vars[$name]['delimiter'])) { - $cycle_vars[$name]['delimiter'] = ','; + $cycle_vars[$name]['delimiter'] = ','; } - + if(is_array($cycle_vars[$name]['values'])) { $cycle_array = $cycle_vars[$name]['values']; } else { $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']); } - + if(!isset($cycle_vars[$name]['index']) || $reset ) { $cycle_vars[$name]['index'] = 0; } - + if (isset($params['assign'])) { $print = false; $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]); } - + if($print) { $retval = $cycle_array[$cycle_vars[$name]['index']]; } else { @@ -99,7 +99,7 @@ function smarty_function_cycle($params, $template) $cycle_vars[$name]['index']++; } } - + return $retval; } diff --git a/gosa-core/include/smarty/plugins/function.fetch.php b/gosa-core/include/smarty/plugins/function.fetch.php index cde98d2ec..a800350bf 100644 --- a/gosa-core/include/smarty/plugins/function.fetch.php +++ b/gosa-core/include/smarty/plugins/function.fetch.php @@ -12,13 +12,13 @@ * Type: function
* Name: fetch
* Purpose: fetch file, web or ftp data and display results - * - * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch} + * @link http://smarty.php.net/manual/en/language.function.fetch.php {fetch} * (Smarty online manual) * @author Monte Ohrt - * @param array $params parameters - * @param Smarty_Internal_Template $template template object - * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable + * @param array $params parameters + * @param object $template template object + * @return string|null if the assign parameter is passed, Smarty assigns the + * result to a template variable */ function smarty_function_fetch($params, $template) { @@ -32,7 +32,7 @@ function smarty_function_fetch($params, $template) if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) { return; } - + // fetch the file if($fp = @fopen($params['file'],'r')) { while(!feof($fp)) { @@ -52,7 +52,7 @@ function smarty_function_fetch($params, $template) $host = $server_name = $uri_parts['host']; $timeout = 30; $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; - $agent = "Smarty Template Engine ". Smarty::SMARTY_VERSION; + $agent = "Smarty Template Engine ".$template->_version; $referer = ""; $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/'; $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : ''; diff --git a/gosa-core/include/smarty/plugins/function.html_checkboxes.php b/gosa-core/include/smarty/plugins/function.html_checkboxes.php index 1e8beb486..6a1a3ffdc 100644 --- a/gosa-core/include/smarty/plugins/function.html_checkboxes.php +++ b/gosa-core/include/smarty/plugins/function.html_checkboxes.php @@ -20,23 +20,20 @@ * {html_checkboxes values=$ids name='box' separator='
' output=$names} * {html_checkboxes values=$ids checked=$checked separator='
' output=$names} * - * Params: - * 
- * - name       (optional) - string default "checkbox"
- * - values     (required) - array
- * - options    (optional) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie 
 or  
- * - output     (optional) - the output next to each checkbox
- * - assign     (optional) - assign the output as an array to this variable
- *
- * - * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes} + * @link http://smarty.php.net/manual/en/language.function.html.checkboxes.php {html_checkboxes} * (Smarty online manual) * @author Christopher Kvarme * @author credits to Monte Ohrt * @version 1.0 * @param array $params parameters + * Input:
+ * - name (optional) - string default "checkbox" + * - values (required) - array + * - options (optional) - associative array + * - checked (optional) - array default not set + * - separator (optional) - ie
or   + * - output (optional) - the output next to each checkbox + * - assign (optional) - assign the output as an array to this variable * @param object $template template object * @return string * @uses smarty_function_escape_special_chars() @@ -48,10 +45,9 @@ function smarty_function_html_checkboxes($params, $template) $name = 'checkbox'; $values = null; $options = null; - $selected = array(); + $selected = null; $separator = ''; $labels = true; - $label_ids = false; $output = null; $extra = ''; @@ -60,54 +56,30 @@ function smarty_function_html_checkboxes($params, $template) switch($_key) { case 'name': case 'separator': - $$_key = (string) $_val; + $$_key = $_val; break; case 'labels': - case 'label_ids': - $$_key = (bool) $_val; + $$_key = (bool)$_val; break; case 'options': - $$_key = (array) $_val; + $$_key = (array)$_val; break; case 'values': case 'output': - $$_key = array_values((array) $_val); + $$_key = array_values((array)$_val); break; case 'checked': 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_checkboxes: 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_checkboxes: 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); - } + $selected = array_map('strval', array_values((array)$_val)); break; case 'checkboxes': trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING); - $options = (array) $_val; + $options = (array)$_val; break; case 'assign': @@ -126,85 +98,45 @@ function smarty_function_html_checkboxes($params, $template) if (!isset($options) && !isset($values)) return ''; /* raise error here? */ + settype($selected, 'array'); $_html_result = array(); if (isset($options)) { - foreach ($options as $_key=>$_val) { - $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids); - } + + foreach ($options as $_key=>$_val) + $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels); + + } else { foreach ($values as $_i=>$_key) { $_val = isset($output[$_i]) ? $output[$_i] : ''; - $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids); + $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels); } + } if(!empty($params['assign'])) { $template->assign($params['assign'], $_html_result); } else { - return implode("\n", $_html_result); + return implode("\n",$_html_result); } } -function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids) { +function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels) { $_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\-\.]!u', '_', $name . '_' . $value)); - $_output .= ''; $_output .= $separator; + return $_output; } diff --git a/gosa-core/include/smarty/plugins/function.html_image.php b/gosa-core/include/smarty/plugins/function.html_image.php index 2f1ef6413..f148f1c33 100644 --- a/gosa-core/include/smarty/plugins/function.html_image.php +++ b/gosa-core/include/smarty/plugins/function.html_image.php @@ -13,24 +13,23 @@ * Name: html_image
* Date: Feb 24, 2003
* Purpose: format HTML tags for the image
- * Examples: {html_image file="/images/masthead.gif"}
- * Output:
- * Params: - * 
- * - file        - (required) - file (and path) of image
- * - height      - (optional) - image height (default actual height)
- * - width       - (optional) - image width (default actual width)
- * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
- * - path_prefix - prefix for path output (optional, default empty)
- *
+ * Examples: {html_image file="/images/masthead.gif"} + * Output: * - * @link http://www.smarty.net/manual/en/language.function.html.image.php {html_image} + * @link http://smarty.php.net/manual/en/language.function.html.image.php {html_image} * (Smarty online manual) * @author Monte Ohrt * @author credits to Duda * @version 1.0 - * @param array $params parameters - * @param Smarty_Internal_Template $template template object + * @param array $params parameters + * Input:
+ * - file = file (and path) of image (required) + * - height = image height (optional, default actual height) + * - width = image width (optional, default actual width) + * - basedir = base directory for absolute paths, default + * is environment variable DOCUMENT_ROOT + * - path_prefix = prefix for path output (optional, default empty) + * @param object $template template object * @return string * @uses smarty_function_escape_special_chars() */ diff --git a/gosa-core/include/smarty/plugins/function.html_options.php b/gosa-core/include/smarty/plugins/function.html_options.php index 86266e269..7ac039028 100644 --- a/gosa-core/include/smarty/plugins/function.html_options.php +++ b/gosa-core/include/smarty/plugins/function.html_options.php @@ -12,24 +12,19 @@ * Type: function
* Name: html_options
* Purpose: Prints the list of ' . "\n"; $idx++; } else { $_idx = 0; - $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id.'-'.$idx) : null, $class, $_idx); + $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, $id.'-'.$idx, $class, $_idx); $idx++; } return $_html_result; diff --git a/gosa-core/include/smarty/plugins/function.html_radios.php b/gosa-core/include/smarty/plugins/function.html_radios.php index af29b9af2..c6b27edf2 100644 --- a/gosa-core/include/smarty/plugins/function.html_radios.php +++ b/gosa-core/include/smarty/plugins/function.html_radios.php @@ -14,16 +14,6 @@ * Name: html_radios
* Date: 24.Feb.2003
* Purpose: Prints out a list of radio input types
- * Params: - * 
- * - name       (optional) - string default "radio"
- * - values     (required) - array
- * - options    (required) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie 
 or  
- * - output     (optional) - the output next to each radio button
- * - assign     (optional) - assign the output as an array to this variable
- *
* Examples: * 
  * {html_radios values=$ids output=$names}
@@ -36,8 +26,16 @@
  * @author Christopher Kvarme  
  * @author credits to Monte Ohrt  
  * @version 1.0
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @param array $params parameters
+ * Input:

+ *            - name       (optional) - string default "radio"
+ *            - values     (required) - array
+ *            - options    (optional) - associative array
+ *            - checked    (optional) - array default not set
+ *            - separator  (optional) - ie 
 or  
+ *            - output     (optional) - the output next to each radio button
+ *            - assign     (optional) - assign the output as an array to this variable
+ * @param object $template template object
  * @return string 
  * @uses smarty_function_escape_special_chars()
  */
@@ -59,41 +57,35 @@ function smarty_function_html_radios($params, $template)
         switch ($_key) {
             case 'name':
             case 'separator':
-                $$_key = (string) $_val;
+                $$_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;
+                    $selected = (string)$_val;
                 } 
                 break;
 
             case 'labels':
             case 'label_ids':
-                $$_key = (bool) $_val;
+                $$_key = (bool)$_val;
                 break;
 
             case 'options':
-                $$_key = (array) $_val;
+                $$_key = (array)$_val;
                 break;
 
             case 'values':
             case 'output':
-                $$_key = array_values((array) $_val);
+                $$_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;
+                $options = (array)$_val;
                 break;
 
             case 'assign':
@@ -109,17 +101,15 @@ function smarty_function_html_radios($params, $template)
         } 
     } 
 
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
+    if (!isset($options) && !isset($values))
         return '';
-    }
+    /* raise error here? */
 
     $_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);
-        }
+        foreach ($options as $_key => $_val)
+        $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
     } else {
         foreach ($values as $_i => $_key) {
             $_val = isset($output[$_i]) ? $output[$_i] : '';
@@ -137,58 +127,27 @@ function smarty_function_html_radios($params, $template)
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids)
 {
     $_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\-\.]!u', '_', $name . '_' . $value));
+            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
             $_output .= '';
     $_output .= $separator;
+
     return $_output;
 } 
 
diff --git a/gosa-core/include/smarty/plugins/function.html_select_date.php b/gosa-core/include/smarty/plugins/function.html_select_date.php
index 16844052e..1d57fdc7a 100644
--- a/gosa-core/include/smarty/plugins/function.html_select_date.php
+++ b/gosa-core/include/smarty/plugins/function.html_select_date.php
@@ -6,15 +6,6 @@
  * @subpackage PluginsFunction
  */
 
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-
 /**
  * Smarty {html_select_date} plugin
  * 
@@ -22,52 +13,40 @@ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
  * Name:     html_select_date

  * Purpose:  Prints the dropdowns for date selection.
  * 
- * ChangeLog:
- * 
+ * ChangeLog:

  *            - 1.0 initial release
  *            - 1.1 added support for +/- N syntax for begin
- *              and end year values. (Monte)
+ *                 and end year values. (Monte)
  *            - 1.2 added support for yyyy-mm-dd syntax for
- *              time value. (Jan Rosier)
+ *                 time value. (Jan Rosier)
  *            - 1.3 added support for choosing format for
- *              month values (Gary Loescher)
+ *                 month values (Gary Loescher)
  *            - 1.3.1 added support for choosing format for
- *              day values (Marcus Bointon)
+ *                 day values (Marcus Bointon)
  *            - 1.3.2 support negative timestamps, force year
  *              dropdown to include given date unless explicitly set (Monte)
  *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
  *              of 0000-00-00 dates (cybot, boots)
- *            - 2.0 complete rewrite for performance,  
- *              added attributes month_names, *_id
- * 

  * 
- * @link http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
+ * @link http://smarty.php.net/manual/en/language.function.html.select.date.php {html_select_date}
  *      (Smarty online manual)
- * @version 2.0
+ * @version 1.3.4
  * @author Andrei Zmievski 
  * @author Monte Ohrt  
- * @author Rodney Rehm
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @param array $params parameters
+ * @param object $template template object
  * @return string 
  */
 function smarty_function_html_select_date($params, $template)
 {
-    // generate timestamps used for month names only
-    static $_month_timestamps = null;
-    static $_current_year = null;
-    if ($_month_timestamps === null) {
-        $_current_year = date('Y');
-        $_month_timestamps = array();
-        for ($i = 1; $i <= 12; $i++) {
-            $_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000);
-        }
-    }
+    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
+    require_once(SMARTY_PLUGINS_DIR . 'function.html_options.php');
 
     /* Default values. */
     $prefix = "Date_";
-    $start_year = null;
-    $end_year = null;
+    $start_year = strftime("%Y");
+    $end_year = $start_year;
     $display_days = true;
     $display_months = true;
     $display_years = true;
@@ -101,42 +80,23 @@ function smarty_function_html_select_date($params, $template)
     $field_order = 'MDY';
     /* String printed between the different fields. */
     $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-    // $all_empty = null;
-    // $day_empty = null;
-    // $month_empty = null;
-    // $year_empty = null;
+    $time = time();
+    $all_empty = null;
+    $day_empty = null;
+    $month_empty = null;
+    $year_empty = null;
     $extra_attrs = '';
-    $all_id = null;
-    $day_id = null;
-    $month_id = null;
-    $year_id = null;
 
     foreach ($params as $_key => $_value) {
         switch ($_key) {
-            case 'time':
-                if (!is_array($_value)) {
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
-                
-            case 'month_names':
-                if (is_array($_value) && count($_value) == 12) {
-                    $$_key = $_value;
-                } else {
-                    trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE);
-                }
-                break;
-                
             case 'prefix':
-            case 'field_array':
+            case 'time':
             case 'start_year':
             case 'end_year':
+            case 'month_format':
             case 'day_format':
             case 'day_value_format':
-            case 'month_format':
-            case 'month_value_format':
+            case 'field_array':
             case 'day_size':
             case 'month_size':
             case 'year_size':
@@ -146,18 +106,18 @@ function smarty_function_html_select_date($params, $template)
             case 'year_extra':
             case 'field_order':
             case 'field_separator':
-            case 'option_separator':
-            case 'all_empty':
+            case 'month_value_format':
             case 'month_empty':
             case 'day_empty':
             case 'year_empty':
-            case 'all_id':
-            case 'month_id':
-            case 'day_id':
-            case 'year_id':
                 $$_key = (string)$_value;
                 break;
 
+            case 'all_empty':
+                $$_key = (string)$_value;
+                $day_empty = $month_empty = $year_empty = $all_empty;
+                break;
+
             case 'display_days':
             case 'display_months':
             case 'display_years':
@@ -174,217 +134,197 @@ function smarty_function_html_select_date($params, $template)
                 } 
                 break;
         } 
-    }
-    
-    // Note: date() is faster than strftime()
-    // Note: explode(date()) is faster than date() date() date()
-    if (isset($params['time']) && is_array($params['time'])) {
-        if (isset($params['time'][$prefix . 'Year'])) {
-            // $_REQUEST[$field_array] given
-            foreach (array('Y' => 'Year',  'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$prefix . $_elementName])
-                    ? $params['time'][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
-        } elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
-            // $_REQUEST given
-            foreach (array('Y' => 'Year',  'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
-                    ? $params['time'][$field_array][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
-        } else {
-            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } elseif ($time === null) {
-        list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+    } 
+
+    if (preg_match('!^-\d+$!', $time)) {
+        // negative timestamp, use date()
+        $time = date('Y-m-d', $time);
+    } 
+    // If $time is not in format yyyy-mm-dd
+    if (preg_match('/^(\d{0,4}-\d{0,2}-\d{0,2})/', $time, $found)) {
+        $time = $found[1];
     } else {
-        list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
-    }
+        // use smarty_make_timestamp to get an unix timestamp and
+        // strftime to make yyyy-mm-dd
+        $time = strftime('%Y-%m-%d', smarty_make_timestamp($time));
+    } 
+    // Now split this in pieces, which later can be used to set the select
+    $time = explode("-", $time); 
+    // make syntax "+N" or "-N" work with start_year and end_year
+    if (preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match)) {
+        if ($match[1] == '+') {
+            $end_year = strftime('%Y') + $match[2];
+        } else {
+            $end_year = strftime('%Y') - $match[2];
+        } 
+    } 
+    if (preg_match('!^(\+|\-)\s*(\d+)$!', $start_year, $match)) {
+        if ($match[1] == '+') {
+            $start_year = strftime('%Y') + $match[2];
+        } else {
+            $start_year = strftime('%Y') - $match[2];
+        } 
+    } 
+    if (strlen($time[0]) > 0) {
+        if ($start_year > $time[0] && !isset($params['start_year'])) {
+            // force start year to include given date if not explicitly set
+            $start_year = $time[0];
+        } 
+        if ($end_year < $time[0] && !isset($params['end_year'])) {
+            // force end year to include given date if not explicitly set
+            $end_year = $time[0];
+        } 
+    } 
+
+    $field_order = strtoupper($field_order);
+
+    $html_result = $month_result = $day_result = $year_result = "";
+
+    $field_separator_count = -1;
+    if ($display_months) {
+        $field_separator_count++;
+        $month_names = array();
+        $month_values = array();
+        if (isset($month_empty)) {
+            $month_names[''] = $month_empty;
+            $month_values[''] = '';
+        } 
+        for ($i = 1; $i <= 12; $i++) {
+            $month_names[$i] = strftime($month_format, mktime(0, 0, 0, $i, 1, 2000));
+            $month_values[$i] = strftime($month_value_format, mktime(0, 0, 0, $i, 1, 2000));
+        } 
 
-    // make syntax "+N" or "-N" work with $start_year and $end_year
-    // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
-    foreach (array('start', 'end') as $key) {
-        $key .= '_year';
-        $t = $$key;
-        if ($t === null) {
-            $$key = (int)$_current_year;
-        } else if ($t[0] == '+') {
-            $$key = (int)($_current_year + trim(substr($t, 1)));
-        } else if ($t[0] == '-') {
-            $$key = (int)($_current_year - trim(substr($t, 1)));
+        $month_result .= '';
+    } 
 
-    // flip for ascending or descending
-    if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
-        $t = $end_year;
-        $end_year = $start_year;
-        $start_year = $t;
-    }
+    if ($display_days) {
+        $field_separator_count++;
+        $days = array();
+        if (isset($day_empty)) {
+            $days[''] = $day_empty;
+            $day_values[''] = '';
+        } 
+        for ($i = 1; $i <= 31; $i++) {
+            $days[] = sprintf($day_format, $i);
+            $day_values[] = sprintf($day_value_format, $i);
+        } 
+
+        $day_result .= '';
+    } 
 
-    // generate year 
     if ($display_years) {
-        $_html_years = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
+        $field_separator_count++;
+        if (null !== $field_array) {
+            $year_name = $field_array . '[' . $prefix . 'Year]';
+        } else {
+            $year_name = $prefix . 'Year';
         } 
-        if ($year_extra) {
-            $_extra .= ' ' . $year_extra;
-        }
-        
         if ($year_as_text) {
-            $_html_years = '';
+            $year_result .= '' . $option_separator;
-            
-            if (isset($year_empty) || isset($all_empty)) {
-                $_html_years .= '' . $option_separator;
-            }
-            
-            $op = $start_year > $end_year ? -1 : 1;
-            for ($i=$start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
-                $_html_years .= '' . $option_separator;
-            }
-            
-            $_html_years .= '';
-        }
-    }
-    
-    // generate month 
-    if ($display_months) {
-        $_html_month = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        } 
-        if ($month_extra) {
-            $_extra .= ' ' . $month_extra;
-        }
-        
-        $_html_months = '';
         } 
-        $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
-        
-        if (isset($month_empty) || isset($all_empty)) {
-            $_html_months .= '' . $option_separator;
-        }
-        
-        for ($i = 1; $i <= 12; $i++) {
-            $_val = sprintf('%02d', $i);
-            $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[$i]) : ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[$i]));
-            $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[$i]);
-            $_html_months .= '' . $option_separator;
-        }
-        
-        $_html_months .= '';
-    }
-    
-    // generate day 
-    if ($display_days) {
-        $_html_day = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
+    } 
+    // Loop thru the field_order field
+    for ($i = 0; $i <= 2; $i++) {
+        $c = substr($field_order, $i, 1);
+        switch ($c) {
+            case 'D':
+                $html_result .= $day_result;
+                break;
+
+            case 'M':
+                $html_result .= $month_result;
+                break;
+
+            case 'Y':
+                $html_result .= $year_result;
+                break;
         } 
-        if ($day_extra) {
-            $_extra .= ' ' . $day_extra;
-        }
-        
-        $_html_days = '';
-    }
+    } 
 
-    // order the fields for output
-    $_html = '';
-    for ($i=0; $i <= 2; $i++) {
-        switch ($field_order[$i]) {
-            case 'Y':
-            case 'y':
-                if (isset($_html_years)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_years;
-                }
-            break;
-            
-            case 'm':
-            case 'M':
-                if (isset($_html_months)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_months;
-                }
-            break;
-            
-            case 'd':
-            case 'D':
-                if (isset($_html_days)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_days;
-                }
-            break;
-        }
-    }
-    return $_html;
+    return $html_result;
 }
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/function.html_select_time.php b/gosa-core/include/smarty/plugins/function.html_select_time.php
index f4a19dd76..ddde4f5ac 100644
--- a/gosa-core/include/smarty/plugins/function.html_select_time.php
+++ b/gosa-core/include/smarty/plugins/function.html_select_time.php
@@ -1,78 +1,47 @@
 
  * Name:     html_select_time

  * Purpose:  Prints the dropdowns for time selection
- *
- * @link http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
+ * 
+ * @link http://smarty.php.net/manual/en/language.function.html.select.time.php {html_select_time}
  *          (Smarty online manual)
- * @author Roberto Berto 
- * @author Monte Ohrt 
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string
+ * @author Roberto Berto  
+ * @credits Monte Ohrt 
+ * @param array $params parameters
+ * @param object $template template object
+ * @return string 
  * @uses smarty_make_timestamp()
  */
 function smarty_function_html_select_time($params, $template)
 {
-    $prefix = "Time_";
-    $field_array = null;
-    $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
+    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
+    require_once(SMARTY_PLUGINS_DIR . 'function.html_options.php');
 
+    /* Default values. */
+    $prefix = "Time_";
+    $time = time();
     $display_hours = true;
     $display_minutes = true;
     $display_seconds = true;
     $display_meridian = true;
-
-    $hour_format = '%02d';
-    $hour_value_format = '%02d';
-    $minute_format = '%02d';
-    $minute_value_format = '%02d';
-    $second_format = '%02d';
-    $second_value_format = '%02d';
-
-    $hour_size = null;
-    $minute_size = null;
-    $second_size = null;
-    $meridian_size = null;
-
-    $all_empty = null;
-    $hour_empty = null;
-    $minute_empty = null;
-    $second_empty = null;
-    $meridian_empty = null;
-
-    $all_id = null;
-    $hour_id = null;
-    $minute_id = null;
-    $second_id = null;
-    $meridian_id = null;
-
     $use_24_hours = true;
     $minute_interval = 1;
     $second_interval = 1;
-
-    $extra_attrs = '';
+    /* Should the select boxes be part of an array when returned from PHP?
+       e.g. setting it to "birthday", would create "birthday[Hour]",
+       "birthday[Minute]", "birthday[Seconds]" & "birthday[Meridian]".
+       Can be combined with prefix. */
+    $field_array = null;
     $all_extra = null;
     $hour_extra = null;
     $minute_extra = null;
@@ -81,42 +50,14 @@ function smarty_function_html_select_time($params, $template)
 
     foreach ($params as $_key => $_value) {
         switch ($_key) {
-            case 'time':
-                if (!is_array($_value)) {
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
-
             case 'prefix':
+            case 'time':
             case 'field_array':
-
-            case 'field_separator':
-            case 'option_separator':
-
             case 'all_extra':
             case 'hour_extra':
             case 'minute_extra':
             case 'second_extra':
             case 'meridian_extra':
-
-            case 'all_empty':
-            case 'hour_empty':
-            case 'minute_empty':
-            case 'second_empty':
-            case 'meridian_empty':
-
-            case 'all_id':
-            case 'hour_id':
-            case 'minute_id':
-            case 'second_id':
-            case 'meridian_id':
-
-            case 'hour_format':
-            case 'hour_value_format':
-            case 'minute_format':
-            case 'minute_value_format':
-            case 'second_format':
-            case 'second_value_format':
                 $$_key = (string)$_value;
                 break;
 
@@ -130,235 +71,124 @@ function smarty_function_html_select_time($params, $template)
 
             case 'minute_interval':
             case 'second_interval':
-
-            case 'hour_size':
-            case 'minute_size':
-            case 'second_size':
-            case 'meridian_size':
                 $$_key = (int)$_value;
                 break;
 
             default:
-                if (!is_array($_value)) {
-                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
-                } else {
-                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
+                trigger_error("[html_select_time] unknown parameter $_key", E_USER_WARNING);
+        } 
+    } 
 
-    if (isset($params['time']) && is_array($params['time'])) {
-        if (isset($params['time'][$prefix . 'Hour'])) {
-            // $_REQUEST[$field_array] given
-            foreach (array('H' => 'Hour',  'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$prefix . $_elementName])
-                    ? $params['time'][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $_meridian = isset($params['time'][$prefix . 'Meridian'])
-                ? (' ' . $params['time'][$prefix . 'Meridian'])
-                : '';
-            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) {
-            // $_REQUEST given
-            foreach (array('H' => 'Hour',  'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
-                    ? $params['time'][$field_array][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $_meridian = isset($params['time'][$field_array][$prefix . 'Meridian'])
-                ? (' ' . $params['time'][$field_array][$prefix . 'Meridian'])
-                : '';
-            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } else {
-            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } elseif ($time === null) {
-        list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
-    } else {
-        list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-    }
-
-    // generate hour ' . $option_separator;
-
-        if (isset($hour_empty) || isset($all_empty)) {
-            $_html_hours .= '' . $option_separator;
-        }
-
-        $start = $use_24_hours ? 0 : 1;
-        $end = $use_24_hours ? 23 : 12;
-        for ($i=$start; $i <= $end; $i++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i);
-            $_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i);
-
-            if ($use_24_hours) {
-                $selected = $_hour == $_val;
-            } else {
-                $_hour12 = $_hour == 0
-                    ? 12
-                    : ($_hour <= 12 ? $_hour : $_hour -12);
-            }
+    $time = smarty_make_timestamp($time);
 
-            $selected = $use_24_hours ? $_hour == $_val : $_hour12 == $_val;
-            $_html_hours .= '' . $option_separator;
-        }
+    $html_result = '';
 
-        $_html_hours .= '';
-    }
+    if ($display_hours) {
+        $hours = $use_24_hours ? range(0, 23) : range(1, 12);
+        $hour_fmt = $use_24_hours ? '%H' : '%I';
+        for ($i = 0, $for_max = count($hours); $i < $for_max; $i++)
+        $hours[$i] = sprintf('%02d', $hours[$i]);
+        $html_result .= '\n";
+    } 
 
-    // generate minute ' . $option_separator;
-
-        if (isset($minute_empty) || isset($all_empty)) {
-            $_html_minutes .= '' . $option_separator;
-        }
-
-        $selected = $_minute - $_minute % $minute_interval;
-        for ($i=0; $i <= 59; $i += $minute_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i);
-            $_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i);
-            $_html_minutes .= '' . $option_separator;
-        }
-
-        $_html_minutes .= '';
-    }
+        $all_minutes = range(0, 59);
+        for ($i = 0, $for_max = count($all_minutes); $i < $for_max; $i += $minute_interval)
+        $minutes[] = sprintf('%02d', $all_minutes[$i]);
+        $selected = intval(floor(strftime('%M', $time) / $minute_interval) * $minute_interval);
+        $html_result .= '\n";
+    } 
 
-    // generate second ' . $option_separator;
-
-        if (isset($second_empty) || isset($all_empty)) {
-            $_html_seconds .= '' . $option_separator;
-        }
-
-        $selected = $_second - $_second % $second_interval;
-        for ($i=0; $i <= 59; $i += $second_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i);
-            $_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i);
-            $_html_seconds .= '' . $option_separator;
-        }
-
-        $_html_seconds .= '';
-    }
+        $all_seconds = range(0, 59);
+        for ($i = 0, $for_max = count($all_seconds); $i < $for_max; $i += $second_interval)
+        $seconds[] = sprintf('%02d', $all_seconds[$i]);
+        $selected = intval(floor(strftime('%S', $time) / $second_interval) * $second_interval);
+        $html_result .= '\n";
+    } 
 
-    // generate meridian ' . $option_separator;
-
-        if (isset($meridian_empty) || isset($all_empty)) {
-            $_html_meridian .= '' . $option_separator;
-        }
-
-        $_html_meridian .= '' . $option_separator
-            . '' . $option_separator
-            . '';
-    }
-
-    $_html = '';
-    foreach (array('_html_hours', '_html_minutes', '_html_seconds', '_html_meridian') as $k) {
-        if (isset($$k)) {
-            if ($_html) {
-                $_html .= $field_separator;
-            }
-            $_html .= $$k;
-        }
-    }
-
-    return $_html;
-}
+        $html_result .= '\n";
+    } 
+
+    return $html_result;
+} 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/function.html_table.php b/gosa-core/include/smarty/plugins/function.html_table.php
index 6b9cb9d12..7986a9bcf 100644
--- a/gosa-core/include/smarty/plugins/function.html_table.php
+++ b/gosa-core/include/smarty/plugins/function.html_table.php
@@ -1,51 +1,51 @@
 
  * Name:     html_table

  * Date:     Feb 17, 2003

  * Purpose:  make an html table from an array of data

- * Params:
- * 
- * - loop       - array to loop through
- * - cols       - number of columns, comma separated list of column names
- *                or array of column names
- * - rows       - number of rows
- * - table_attr - table attributes
- * - th_attr    - table heading attributes (arrays are cycled)
- * - tr_attr    - table row attributes (arrays are cycled)
- * - td_attr    - table cell attributes (arrays are cycled)
- * - trailpad   - value to pad trailing cells with
- * - caption    - text for caption element
- * - vdir       - vertical direction (default: "down", means top-to-bottom)
- * - hdir       - horizontal direction (default: "right", means left-to-right)
- * - inner      - inner loop (default "cols": print $loop line by line,
- *                $loop will be printed column by column otherwise)
- * 

+ * 
+ * 
  * Examples:
  * 
  * {table loop=$data}
  * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
  * {table loop=$data cols="first,second,third" tr_attr=$colors}
  * 

- *
- * @author Monte Ohrt 
- * @author credit to Messju Mohr 
- * @author credit to boots 
+ * 
+ * @author Monte Ohrt  
+ * @author credit to Messju Mohr  
+ * @author credit to boots  
  * @version 1.1
- * @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ * @link http://smarty.php.net/manual/en/language.function.html.table.php {html_table}
  *          (Smarty online manual)
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string
+ * @param array $params parameters
+ * Input:

+ *          - loop = array to loop through
+ *          - cols = number of columns, comma separated list of column names
+ *                   or array of column names
+ *          - rows = number of rows
+ *          - table_attr = table attributes
+ *          - th_attr = table heading attributes (arrays are cycled)
+ *          - tr_attr = table row attributes (arrays are cycled)
+ *          - td_attr = table cell attributes (arrays are cycled)
+ *          - trailpad = value to pad trailing cells with
+ *          - caption = text for caption element 
+ *          - vdir = vertical direction (default: "down", means top-to-bottom)
+ *          - hdir = horizontal direction (default: "right", means left-to-right)
+ *          - inner = inner loop (default "cols": print $loop line by line,
+ *                    $loop will be printed column by column otherwise)
+ * @param object $template template object
+ * @return string 
  */
 function smarty_function_html_table($params, $template)
 {
@@ -65,7 +65,7 @@ function smarty_function_html_table($params, $template)
     if (!isset($params['loop'])) {
         trigger_error("html_table: missing 'loop' parameter",E_USER_WARNING);
         return;
-    }
+    } 
 
     foreach ($params as $_key => $_value) {
         switch ($_key) {
@@ -84,7 +84,7 @@ function smarty_function_html_table($params, $template)
                     $cols_count = (int)$_value;
                 } else {
                     $cols_count = $cols;
-                }
+                } 
                 break;
 
             case 'rows':
@@ -105,8 +105,8 @@ function smarty_function_html_table($params, $template)
             case 'th_attr':
                 $$_key = $_value;
                 break;
-        }
-    }
+        } 
+    } 
 
     $loop_count = count($loop);
     if (empty($params['rows'])) {
@@ -116,14 +116,14 @@ function smarty_function_html_table($params, $template)
         if (!empty($params['rows'])) {
             /* no cols specified, but rows */
             $cols_count = ceil($loop_count / $rows);
-        }
-    }
+        } 
+    } 
 
     $output = "\n";
 
     if (!empty($caption)) {
         $output .= '\n";
-    }
+    } 
 
     if (is_array($cols)) {
         $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
@@ -133,9 +133,9 @@ function smarty_function_html_table($params, $template)
             $output .= '';
             $output .= $cols[$r];
             $output .= "\n";
-        }
+        } 
         $output .= "\n";
-    }
+    } 
 
     $output .= "\n";
     for ($r = 0; $r < $rows; $r++) {
@@ -147,21 +147,21 @@ function smarty_function_html_table($params, $template)
             if ($inner != 'cols') {
                 /* shuffle x to loop over rows*/
                 $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
-            }
+            } 
 
             if ($x < $loop_count) {
                 $output .= "" . $loop[$x] . "\n";
             } else {
                 $output .= "$trailpad\n";
-            }
-        }
+            } 
+        } 
         $output .= "\n";
-    }
+    } 
     $output .= "\n";
     $output .= "
' . $caption . "
\n";
 
     return $output;
-}
+} 
 
 function smarty_function_html_table_cycle($name, $var, $no)
 {
@@ -169,7 +169,7 @@ function smarty_function_html_table_cycle($name, $var, $no)
         $ret = $var;
     } else {
         $ret = $var[$no % count($var)];
-    }
+    } 
 
     return ($ret) ? ' ' . $ret : '';
 }
diff --git a/gosa-core/include/smarty/plugins/function.mailto.php b/gosa-core/include/smarty/plugins/function.mailto.php
index c61cf2dfe..976218f53 100644
--- a/gosa-core/include/smarty/plugins/function.mailto.php
+++ b/gosa-core/include/smarty/plugins/function.mailto.php
@@ -1,34 +1,20 @@
 
  * Name:     mailto

  * Date:     May 21, 2002
- * Purpose:  automate mailto address link creation, and optionally encode them.

- * Params:
- * 
- * - address    - (required) - e-mail address
- * - text       - (optional) - text to display, default is address
- * - encode     - (optional) - can be one of:
- *                             * none : no encoding (default)
- *                             * javascript : encode with javascript
- *                             * javascript_charcode : encode with javascript charcode
- *                             * hex : encode with hexidecimal (no javascript)
- * - cc         - (optional) - address(es) to carbon copy
- * - bcc        - (optional) - address(es) to blind carbon copy
- * - subject    - (optional) - e-mail subject
- * - newsgroups - (optional) - newsgroup(s) to post to
- * - followupto - (optional) - address(es) to follow up to
- * - extra      - (optional) - extra tags for the href link
- * 

+ * Purpose:  automate mailto address link creation, and optionally
+ *            encode them.

+ * 
  * Examples:
  * 
  * {mailto address="me@domain.com"}
@@ -38,19 +24,32 @@
  * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
  * {mailto address="me@domain.com" extra='class="mailto"'}
  * 

- *
- * @link http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
+ * 
+ * @link http://smarty.php.net/manual/en/language.function.mailto.php {mailto}
  *          (Smarty online manual)
  * @version 1.2
- * @author Monte Ohrt 
- * @author credits to Jason Sweat (added cc, bcc and subject functionality)
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string
+ * @author Monte Ohrt  
+ * @author credits to Jason Sweat (added cc, bcc and subject functionality) 
+ * @param array $params parameters
+ * Input:

+ *          - address = e-mail address
+ *          - text = (optional) text to display, default is address
+ *          - encode = (optional) can be one of:
+ *                 * none : no encoding (default)
+ *                 * javascript : encode with javascript
+ *                 * javascript_charcode : encode with javascript charcode
+ *                 * hex : encode with hexidecimal (no javascript)
+ *          - cc = (optional) address(es) to carbon copy
+ *          - bcc = (optional) address(es) to blind carbon copy
+ *          - subject = (optional) e-mail subject
+ *          - newsgroups = (optional) newsgroup(s) to post to
+ *          - followupto = (optional) address(es) to follow up to
+ *          - extra = (optional) extra tags for the href link
+ * @param object $template template object
+ * @return string 
  */
 function smarty_function_mailto($params, $template)
 {
-    static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
     $extra = '';
 
     if (empty($params['address'])) {
@@ -58,9 +57,9 @@ function smarty_function_mailto($params, $template)
         return;
     } else {
         $address = $params['address'];
-    }
+    } 
 
-    $text = $address;
+    $text = $address; 
     // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
     // so, don't encode it.
     $search = array('%40', '%2C');
@@ -85,26 +84,29 @@ function smarty_function_mailto($params, $template)
                 $$var = $value;
 
             default:
-        }
-    }
+        } 
+    } 
+
+    $mail_parm_vals = '';
+    for ($i = 0; $i < count($mail_parms); $i++) {
+        $mail_parm_vals .= (0 == $i) ? '?' : '&';
+        $mail_parm_vals .= $mail_parms[$i];
+    } 
+    $address .= $mail_parm_vals;
 
-    if ($mail_parms) {
-        $address .= '?' . join('&', $mail_parms);
-    }
-    
     $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
-    if (!isset($_allowed_encoding[$encode])) {
-        trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex", E_USER_WARNING);
+    if (!in_array($encode, array('javascript', 'javascript_charcode', 'hex', 'none'))) {
+        trigger_error("mailto: 'encode' parameter must be none, javascript or hex",E_USER_WARNING);
         return;
-    }
-    // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
+    } 
+
     if ($encode == 'javascript') {
         $string = 'document.write(\'' . $text . '\');';
 
         $js_encode = '';
-        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+        for ($x = 0; $x < strlen($string); $x++) {
             $js_encode .= '%' . bin2hex($string[$x]);
-        }
+        } 
 
         return '';
     } elseif ($encode == 'javascript_charcode') {
@@ -112,14 +114,16 @@ function smarty_function_mailto($params, $template)
 
         for($x = 0, $y = strlen($string); $x < $y; $x++) {
             $ord[] = ord($string[$x]);
-        }
+        } 
 
-        $_ret = "\n";
+        $_ret = "\n";
 
         return $_ret;
     } elseif ($encode == 'hex') {
@@ -127,26 +131,26 @@ function smarty_function_mailto($params, $template)
         if (!empty($match[2])) {
             trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.",E_USER_WARNING);
             return;
-        }
+        } 
         $address_encode = '';
-        for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
-            if (preg_match('!\w!u', $address[$x])) {
+        for ($x = 0; $x < strlen($address); $x++) {
+            if (preg_match('!\w!', $address[$x])) {
                 $address_encode .= '%' . bin2hex($address[$x]);
             } else {
                 $address_encode .= $address[$x];
-            }
-        }
+            } 
+        } 
         $text_encode = '';
-        for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
+        for ($x = 0; $x < strlen($text); $x++) {
             $text_encode .= '&#x' . bin2hex($text[$x]) . ';';
-        }
+        } 
 
         $mailto = "mailto:";
         return '' . $text_encode . '';
     } else {
         // no encoding
         return '' . $text . '';
-    }
-}
+    } 
+} 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/function.math.php b/gosa-core/include/smarty/plugins/function.math.php
index f4d3f05ee..cd90020a4 100644
--- a/gosa-core/include/smarty/plugins/function.math.php
+++ b/gosa-core/include/smarty/plugins/function.math.php
@@ -12,22 +12,16 @@
  *
  * Type:     function

  * Name:     math

- * Purpose:  handle math computations in template
- *
- * @link http://www.smarty.net/manual/en/language.function.math.php {math}
+ * Purpose:  handle math computations in template

+ * @link http://smarty.php.net/manual/en/language.function.math.php {math}
  *          (Smarty online manual)
  * @author   Monte Ohrt 
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
+ * @param array $params parameters
+ * @param object $template template object
  * @return string|null
  */
 function smarty_function_math($params, $template)
 {
-    static $_allowed_funcs = array(
-        'int' => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true,
-        'log' => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true,
-        'rand' => true, 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true ,'tan' => true
-    );
     // be sure equation parameter is present
     if (empty($params['equation'])) {
         trigger_error("math: missing equation parameter",E_USER_WARNING);
@@ -44,9 +38,11 @@ function smarty_function_math($params, $template)
 
     // match all vars in equation, make sure all are passed
     preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
-
+    $allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10',
+                           'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
+    
     foreach($match[1] as $curr_var) {
-        if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) {
+        if ($curr_var && !in_array($curr_var, array_keys($params)) && !in_array($curr_var, $allowed_funcs)) {
             trigger_error("math: function call $curr_var not allowed",E_USER_WARNING);
             return;
         }
diff --git a/gosa-core/include/smarty/plugins/modifier.capitalize.php b/gosa-core/include/smarty/plugins/modifier.capitalize.php
index 1e1990968..cd24589d8 100644
--- a/gosa-core/include/smarty/plugins/modifier.capitalize.php
+++ b/gosa-core/include/smarty/plugins/modifier.capitalize.php
@@ -12,53 +12,25 @@
  * Type:     modifier

  * Name:     capitalize

  * Purpose:  capitalize words in the string
- *
- * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
- *
- * @param string  $string    string to capitalize
- * @param boolean $uc_digits also capitalize "x123" to "X123"
- * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
- * @return string capitalized string
+ * 
+ * @link 
  * @author Monte Ohrt  
- * @author Rodney Rehm
+ * @param string $ 
+ * @return string 
  */
-function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
-{
-    if (SMARTY_MBSTRING /* ^phpunit */&&empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-        if ($lc_rest) {
-            // uppercase (including hyphenated words)
-            $upper_string = mb_convert_case( $string, MB_CASE_TITLE, SMARTY_RESOURCE_CHAR_SET );
-        } else {
-            // uppercase word breaks
-            $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!ueS", "stripslashes('\\1').mb_convert_case(stripslashes('\\2'),MB_CASE_UPPER, SMARTY_RESOURCE_CHAR_SET)", $string);
-        }
-        // check uc_digits case
-        if (!$uc_digits) {
-            if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!u", $string, $matches, PREG_OFFSET_CAPTURE)) {
-                foreach($matches[1] as $match) {
-                    $upper_string = substr_replace($upper_string, mb_strtolower($match[0], SMARTY_RESOURCE_CHAR_SET), $match[1], strlen($match[0]));
-                }
-            } 
-        }
-        $upper_string = preg_replace("!((^|\s)['\"])(\w)!ue", "stripslashes('\\1').mb_convert_case(stripslashes('\\3'),MB_CASE_UPPER, SMARTY_RESOURCE_CHAR_SET)", $upper_string);
-        return $upper_string;
-    }
-    
-    // lowercase first
-    if ($lc_rest) {
-        $string = strtolower($string);
-    }
-    // uppercase (including hyphenated words)
-    $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!ueS", "stripslashes('\\1').ucfirst(stripslashes('\\2'))", $string); 
+function smarty_modifier_capitalize($string, $uc_digits = false)
+{ 
+    // uppercase with php function ucwords
+    $upper_string = ucwords($string); 
+    // check for any missed hyphenated words
+    $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!ue", "'\\1'.ucfirst('\\2')", $upper_string); 
     // check uc_digits case
     if (!$uc_digits) {
         if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!u", $string, $matches, PREG_OFFSET_CAPTURE)) {
-            foreach($matches[1] as $match) {
-                $upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0]));
-            }
+            foreach($matches[1] as $match)
+            $upper_string = substr_replace($upper_string, $match[0], $match[1], strlen($match[0]));
         } 
-    }
-    $upper_string = preg_replace("!((^|\s)['\"])(\w)!ue", "stripslashes('\\1').strtoupper(stripslashes('\\3'))", $upper_string);
+    } 
     return $upper_string;
 } 
 
diff --git a/gosa-core/include/smarty/plugins/modifier.date_format.php b/gosa-core/include/smarty/plugins/modifier.date_format.php
index 729322b20..3656c1c88 100644
--- a/gosa-core/include/smarty/plugins/modifier.date_format.php
+++ b/gosa-core/include/smarty/plugins/modifier.date_format.php
@@ -17,12 +17,11 @@
  *          - format: strftime format for output
  *          - default_date: default date if $string is empty
  * 
- * @link http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
+ * @link http://smarty.php.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
  * @author Monte Ohrt  
- * @param string $string       input date string
- * @param string $format       strftime format for output
- * @param string $default_date default date if $string is empty
- * @param string $formatter    either 'strftime' or 'auto'
+ * @param string $ 
+ * @param string $ 
+ * @param string $ 
  * @return string |void
  * @uses smarty_make_timestamp()
  */
diff --git a/gosa-core/include/smarty/plugins/modifier.debug_print_var.php b/gosa-core/include/smarty/plugins/modifier.debug_print_var.php
index 747c87fde..013337ae0 100644
--- a/gosa-core/include/smarty/plugins/modifier.debug_print_var.php
+++ b/gosa-core/include/smarty/plugins/modifier.debug_print_var.php
@@ -12,11 +12,12 @@
  * Type:     modifier

  * Name:     debug_print_var

  * Purpose:  formats variable contents for display in the console
- *
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.debug.print.var.php debug_print_var (Smarty online manual)
  * @author Monte Ohrt  
- * @param array|object $var     variable to be formatted
- * @param integer      $depth   maximum recursion depth if $var is an array
- * @param integer      $length  maximum string length if $var is a string
+ * @param array $ |object
+ * @param integer $ 
+ * @param integer $ 
  * @return string 
  */
 function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
@@ -36,7 +37,6 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
                 $depth--;
             } 
             break;
-            
         case 'object' :
             $object_vars = get_object_vars($var);
             $results = '' . get_class($var) . ' Object (' . count($object_vars) . ')';
@@ -47,7 +47,6 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
                 $depth--;
             } 
             break;
-            
         case 'boolean' :
         case 'NULL' :
         case 'resource' :
@@ -62,40 +61,23 @@ function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
             } 
             $results = '' . $results . '';
             break;
-            
         case 'integer' :
         case 'float' :
             $results = htmlspecialchars((string) $var);
             break;
-            
         case 'string' :
             $results = strtr($var, $_replace);
-            if (SMARTY_MBSTRING /* ^phpunit */&&empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-                if (mb_strlen($var, SMARTY_RESOURCE_CHAR_SET) > $length) {
-                    $results = mb_substr($var, 0, $length - 3, SMARTY_RESOURCE_CHAR_SET) . '...';
-                }
-            } else {
-                if (isset($var[$length])) {
-                    $results = substr($var, 0, $length - 3) . '...';
-                }
-            }
-
+            if (strlen($var) > $length) {
+                $results = substr($var, 0, $length - 3) . '...';
+            } 
             $results = htmlspecialchars('"' . $results . '"');
             break;
-            
         case 'unknown type' :
         default :
             $results = strtr((string) $var, $_replace);
-            if (SMARTY_MBSTRING /* ^phpunit */&&empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-                if (mb_strlen($results, SMARTY_RESOURCE_CHAR_SET) > $length) {
-                    $results = mb_substr($results, 0, $length - 3, SMARTY_RESOURCE_CHAR_SET) . '...';
-                }
-            } else {
-                if (strlen($results) > $length) {
-                    $results = substr($results, 0, $length - 3) . '...';
-                }
-            }
-             
+            if (strlen($results) > $length) {
+                $results = substr($results, 0, $length - 3) . '...';
+            } 
             $results = htmlspecialchars($results);
     } 
 
diff --git a/gosa-core/include/smarty/plugins/modifier.escape.php b/gosa-core/include/smarty/plugins/modifier.escape.php
index 5e865a8fe..37bc0e30e 100644
--- a/gosa-core/include/smarty/plugins/modifier.escape.php
+++ b/gosa-core/include/smarty/plugins/modifier.escape.php
@@ -1,46 +1,33 @@
 
  * Name:     escape

  * Purpose:  escape string for output
- *
- * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
- * @author Monte Ohrt 
- * @param string  $string        input string
- * @param string  $esc_type      escape type
- * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
- * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @author Monte Ohrt  
+ * @param string $string input string
+ * @param string $esc_type escape type
+ * @param string $char_set character set
  * @return string escaped input string
  */
-function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
+function smarty_modifier_escape($string, $esc_type = 'html', $char_set = SMARTY_RESOURCE_CHAR_SET)
 {
-    if (!$char_set) {
-        $char_set = SMARTY_RESOURCE_CHAR_SET;
-    }
-
     switch ($esc_type) {
         case 'html':
-            return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
+            return htmlspecialchars($string, ENT_QUOTES, $char_set);
 
         case 'htmlall':
-            if (SMARTY_MBSTRING /* ^phpunit */ && empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-                // mb_convert_encoding ignores htmlspecialchars()
-                $string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-                // htmlentities() won't convert everything, so use mb_convert_encoding
-                return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
-            }
-
-            // no MBString fallback
-            return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
+            return htmlentities($string, ENT_QUOTES, $char_set);
 
         case 'url':
             return rawurlencode($string);
@@ -48,96 +35,57 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
         case 'urlpathinfo':
             return str_replace('%2F', '/', rawurlencode($string));
 
-        case 'quotes':
+        case 'quotes': 
             // escape unescaped single quotes
             return preg_replace("%(? '\\\\', "'" => "\\'", '"' => '\\"', "\r" => '\\r', "\n" => '\\n', ' '<\/'));
 
-        case 'mail':
-            if (SMARTY_MBSTRING /* ^phpunit */ && empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-                return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
-            }
-            // no MBString fallback
-            return str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
+        case 'mail': 
+          require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+          return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
 
-        case 'nonstd':
+        case 'nonstd': 
             // escape non-standard chars, such as ms document quotes
-            $return = '';
-            if (SMARTY_MBSTRING /* ^phpunit */ && empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
-                foreach (smarty_mb_to_unicode($string, SMARTY_RESOURCE_CHAR_SET) as $unicode) {
-                    if ($unicode >= 126) {
-                        $return .= '&#' . $unicode . ';';
-                    } else {
-                        $return .= chr($unicode);
-                    }
-                }
-                return $return;
-            }
-
-            $_length = strlen($string);
-            for ($_i = 0; $_i < $_length; $_i++) {
-                $_ord = ord(substr($string, $_i, 1));
+            $_res = '';
+            for($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
+                $_ord = ord(substr($string, $_i, 1)); 
                 // non-standard char, escape it
                 if ($_ord >= 126) {
-                    $return .= '&#' . $_ord . ';';
+                    $_res .= '&#' . $_ord . ';';
                 } else {
-                    $return .= substr($string, $_i, 1);
-                }
-            }
-            return $return;
+                    $_res .= substr($string, $_i, 1);
+                } 
+            } 
+            return $_res;
 
         default:
             return $string;
-    }
-}
+    } 
+} 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifier.regex_replace.php b/gosa-core/include/smarty/plugins/modifier.regex_replace.php
index f9fd5fa53..9f148800e 100644
--- a/gosa-core/include/smarty/plugins/modifier.regex_replace.php
+++ b/gosa-core/include/smarty/plugins/modifier.regex_replace.php
@@ -12,41 +12,32 @@
  * Type:     modifier

  * Name:     regex_replace

  * Purpose:  regular expression search/replace
- *
  * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
  *          regex_replace (Smarty online manual)
- * @author Monte Ohrt 
- * @param string       $string   input string
- * @param string|array $search   regular expression(s) to search for
- * @param string|array $replace  string(s) that should be replaced
+ * @author   Monte Ohrt 
+ * @param string
+ * @param string|array
+ * @param string|array
  * @return string
  */
 function smarty_modifier_regex_replace($string, $search, $replace)
 {
     if(is_array($search)) {
-        foreach($search as $idx => $s) {
-            $search[$idx] = _smarty_regex_replace_check($s);
-        }
+      foreach($search as $idx => $s)
+        $search[$idx] = _smarty_regex_replace_check($s);
     } else {
-        $search = _smarty_regex_replace_check($search);
-    }
+      $search = _smarty_regex_replace_check($search);
+    }       
+
     return preg_replace($search, $replace, $string);
 }
 
-/**
- * @param  string $search string(s) that should be replaced
- * @return string
- * @ignore
- */
 function _smarty_regex_replace_check($search)
 {
-    // null-byte injection detection
-    // anything behind the first null-byte is ignored
-    if (($pos = strpos($search,"\0")) !== false) {
-        $search = substr($search,0,$pos);
-    }
-    // remove eval-modifier from $search
+    if (($pos = strpos($search,"\0")) !== false)
+      $search = substr($search,0,$pos);
     if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
+        /* remove eval-modifier from $search */
         $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
     }
     return $search;
diff --git a/gosa-core/include/smarty/plugins/modifier.replace.php b/gosa-core/include/smarty/plugins/modifier.replace.php
index ce671b1f7..6a6698164 100644
--- a/gosa-core/include/smarty/plugins/modifier.replace.php
+++ b/gosa-core/include/smarty/plugins/modifier.replace.php
@@ -15,19 +15,17 @@
  * @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
  * @author Monte Ohrt  
  * @author Uwe Tews 
- * @param string $string  input string
- * @param string $search  text to search for
- * @param string $replace replacement text
+ * @param string $ 
+ * @param string $ 
+ * @param string $ 
  * @return string 
  */
 function smarty_modifier_replace($string, $search, $replace)
 {
-    if (SMARTY_MBSTRING /* ^phpunit */&&empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-        require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-        return smarty_mb_str_replace($search, $replace, $string);
+    if (function_exists('mb_split')) {
+    	require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+    	return smarty_mb_str_replace($search, $replace, $string);
     }
-    
     return str_replace($search, $replace, $string);
 } 
-
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifier.spacify.php b/gosa-core/include/smarty/plugins/modifier.spacify.php
index f7985add4..f14e026bc 100644
--- a/gosa-core/include/smarty/plugins/modifier.spacify.php
+++ b/gosa-core/include/smarty/plugins/modifier.spacify.php
@@ -14,14 +14,24 @@
  * 
  * @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
  * @author Monte Ohrt  
- * @param string $string       input string
- * @param string $spacify_char string to insert between characters.
- * @return string
+ * @param string $ 
+ * @param string $ 
+ * @return string 
  */
 function smarty_modifier_spacify($string, $spacify_char = ' ')
-{
-    // well… what about charsets besides latin and UTF-8?
-    return implode($spacify_char, preg_split('//u', $string, -1, PREG_SPLIT_NO_EMPTY));
+{ 
+    // mb_ functions available?
+    if (function_exists('mb_strlen') && mb_detect_encoding($string, 'UTF-8, ISO-8859-1') === 'UTF-8') {
+        $strlen = mb_strlen($string);
+        while ($strlen) {
+            $array[] = mb_substr($string, 0, 1, "UTF-8");
+            $string = mb_substr($string, 1, $strlen, "UTF-8");
+            $strlen = mb_strlen($string);
+        } 
+        return implode($spacify_char, $array);
+    } else {
+        return implode($spacify_char, preg_split('//', $string, -1));
+    } 
 } 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifier.truncate.php b/gosa-core/include/smarty/plugins/modifier.truncate.php
index 99ae54375..0e9d4b9f2 100644
--- a/gosa-core/include/smarty/plugins/modifier.truncate.php
+++ b/gosa-core/include/smarty/plugins/modifier.truncate.php
@@ -17,43 +17,51 @@
  * 
  * @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
  * @author Monte Ohrt  
- * @param string  $string      input string
- * @param integer $length      length of truncated text
- * @param string  $etc         end string
+ * @param string $string input string
+ * @param integer $length lenght of truncated text
+ * @param string $etc end string
  * @param boolean $break_words truncate at word boundary
- * @param boolean $middle      truncate in the middle of text
+ * @param boolean $middle truncate in the middle of text
  * @return string truncated string
  */
-function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false) {
+function smarty_modifier_truncate($string, $length = 80, $etc = '...',
+    $break_words = false, $middle = false)
+{
     if ($length == 0)
         return '';
 
-    if (SMARTY_MBSTRING /* ^phpunit */&&empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-        if (mb_strlen($string, SMARTY_RESOURCE_CHAR_SET) > $length) {
-            $length -= min($length, mb_strlen($etc, SMARTY_RESOURCE_CHAR_SET));
-            if (!$break_words && !$middle) {
-                $string = preg_replace('/\s+?(\S+)?$/u', '', mb_substr($string, 0, $length + 1, SMARTY_RESOURCE_CHAR_SET));
+    if (is_callable('mb_strlen')) {
+        if (mb_detect_encoding($string, 'UTF-8, ISO-8859-1') === 'UTF-8') {
+            // $string has utf-8 encoding
+            if (mb_strlen($string) > $length) {
+                $length -= min($length, mb_strlen($etc));
+                if (!$break_words && !$middle) {
+                    $string = preg_replace('/\s+?(\S+)?$/u', '', mb_substr($string, 0, $length + 1));
+                } 
+                if (!$middle) {
+                    return mb_substr($string, 0, $length) . $etc;
+                } else {
+                    return mb_substr($string, 0, $length / 2) . $etc . mb_substr($string, - $length / 2);
+                } 
+            } else {
+                return $string;
             } 
-            if (!$middle) {
-                return mb_substr($string, 0, $length, SMARTY_RESOURCE_CHAR_SET) . $etc;
-            }
-            return mb_substr($string, 0, $length / 2, SMARTY_RESOURCE_CHAR_SET) . $etc . mb_substr($string, - $length / 2, $length, SMARTY_RESOURCE_CHAR_SET);
-        }
-        return $string;
-    }
-    
-    // no MBString fallback
-    if (isset($string[$length])) {
+        } 
+    } 
+    // $string has no utf-8 encoding
+    if (strlen($string) > $length) {
         $length -= min($length, strlen($etc));
         if (!$break_words && !$middle) {
             $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
         } 
         if (!$middle) {
             return substr($string, 0, $length) . $etc;
-        }
-        return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
-    }
-    return $string;
+        } else {
+            return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
+        } 
+    } else {
+        return $string;
+    } 
 } 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.cat.php b/gosa-core/include/smarty/plugins/modifiercompiler.cat.php
index 1cfe6308a..37019d723 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.cat.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.cat.php
@@ -11,11 +11,10 @@
  *
  * Type:     modifier

  * Name:     cat

- * Date:     Feb 24, 2003

- * Purpose:  catenate a value to a variable

- * Input:    string to catenate

+ * Date:     Feb 24, 2003
+ * Purpose:  catenate a value to a variable
+ * Input:    string to catenate
  * Example:  {$var|cat:"foo"}
- *
  * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
  *          (Smarty online manual)
  * @author   Uwe Tews
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.count_characters.php b/gosa-core/include/smarty/plugins/modifiercompiler.count_characters.php
index ae95fda4a..40867f529 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.count_characters.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.count_characters.php
@@ -8,26 +8,32 @@
 
 /**
  * Smarty count_characters modifier plugin
- *
+ * 
  * Type:     modifier

  * Name:     count_characteres

  * Purpose:  count the number of characters in a text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
- * @author Uwe Tews
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @author Uwe Tews 
  * @param array $params parameters
  * @return string with compiled code
  */
 function smarty_modifiercompiler_count_characters($params, $compiler)
 {
-    if (!isset($params[1]) || $params[1] != 'true') {
-        return 'preg_match_all(\'/[^\s]/u\',' . $params[0] . ', $tmp)';
-    }
-    if (SMARTY_MBSTRING /* ^phpunit */&&empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-        return 'mb_strlen(' . $params[0] . ', SMARTY_RESOURCE_CHAR_SET)';
-    }
-    // no MBString fallback
-    return 'strlen(' . $params[0] . ')';
+    // mb_ functions available?
+    if (function_exists('mb_strlen')) {
+        // count also spaces?
+        if (isset($params[1]) && $params[1] == 'true') {
+            return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strlen(' . $params[0] . ', SMARTY_RESOURCE_CHAR_SET) : strlen(' . $params[0] . '))';
+        } 
+        return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? preg_match_all(\'#[^\s\pZ]#u\', ' . $params[0] . ', $tmp) : preg_match_all(\'/[^\s]/\',' . $params[0] . ', $tmp))';
+    } else {
+        // count also spaces?
+        if (isset($params[1]) && $params[1] == 'true') {
+            return 'strlen(' . $params[0] . ')';
+        } 
+        return 'preg_match_all(\'/[^\s]/\',' . $params[0] . ', $tmp)';
+    } 
 }
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.count_paragraphs.php b/gosa-core/include/smarty/plugins/modifiercompiler.count_paragraphs.php
index 0e1b0af83..09973ef35 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.count_paragraphs.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.count_paragraphs.php
@@ -12,10 +12,9 @@
  * Type:     modifier

  * Name:     count_paragraphs

  * Purpose:  count the number of paragraphs in a text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
  *          count_paragraphs (Smarty online manual)
- * @author Uwe Tews
+ * @author Uwe Tews 
  * @param array $params parameters
  * @return string with compiled code
  */
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.count_sentences.php b/gosa-core/include/smarty/plugins/modifiercompiler.count_sentences.php
index 7f48a3ece..cde5c4679 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.count_sentences.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.count_sentences.php
@@ -12,17 +12,16 @@
  * Type:     modifier

  * Name:     count_sentences
  * Purpose:  count the number of sentences in a text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ * @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
  *          count_sentences (Smarty online manual)
- * @author Uwe Tews
+ * @author Uwe Tews 
  * @param array $params parameters
  * @return string with compiled code
  */
 function smarty_modifiercompiler_count_sentences($params, $compiler)
 {
-    // find periods, question marks, exclamation marks with a word before but not after.
-    return 'preg_match_all("#\w[\.\?\!](\W|$)#uS", ' . $params[0] . ', $tmp)';
+    // find periods with a word before but not after.
+    return 'preg_match_all(\'/[^\s]\.(?!\w)/\', ' . $params[0] . ', $tmp)';
 }
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.count_words.php b/gosa-core/include/smarty/plugins/modifiercompiler.count_words.php
index cd9ae5bf7..dbc2f43be 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.count_words.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.count_words.php
@@ -1,32 +1,31 @@
 
  * Name:     count_words

  * Purpose:  count the number of words in a text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
- * @author Uwe Tews
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
+ * @author Uwe Tews 
  * @param array $params parameters
  * @return string with compiled code
 */
 function smarty_modifiercompiler_count_words($params, $compiler)
-{
-    if (SMARTY_MBSTRING /* ^phpunit */&&empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-        // return 'preg_match_all(\'#[\w\pL]+#u\', ' . $params[0] . ', $tmp)';
-        // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
-        return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/u\', ' . $params[0] . ', $tmp)';
-    }
-    // no MBString fallback
-    return 'str_word_count(' . $params[0] . ')';
-}
+{ 
+    // mb_ functions available?
+    if (function_exists('mb_strlen')) {
+        return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? preg_match_all(\'#[\w\pL]+#u\', ' . $params[0] . ', $tmp) : preg_match_all(\'#\w+#\',' . $params[0] . ', $tmp))';
+    } else {
+        return 'str_word_count(' . $params[0] . ')';
+    } 
+} 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.default.php b/gosa-core/include/smarty/plugins/modifiercompiler.default.php
index 4f831a589..7bfda8b0f 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.default.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.default.php
@@ -8,13 +8,13 @@
 
 /**
  * Smarty default modifier plugin
- *
+ * 
  * Type:     modifier

  * Name:     default

  * Purpose:  designate default value for empty variables
- *
- * @link http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
- * @author Uwe Tews
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.default.php default (Smarty online manual)
+ * @author Uwe Tews 
  * @param array $params parameters
  * @return string with compiled code
  */
@@ -23,13 +23,11 @@ function smarty_modifiercompiler_default ($params, $compiler)
     $output = $params[0];
     if (!isset($params[1])) {
         $params[1] = "''";
-    }
-    
-    array_shift($params);
-    foreach ($params as $param) {
-        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
-    }
+    } 
+    for ($i = 1, $cnt = count($params); $i < $cnt; $i++) {
+        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $params[$i] . ' : $tmp)';
+    } 
     return $output;
-}
+} 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.indent.php b/gosa-core/include/smarty/plugins/modifiercompiler.indent.php
index 020c4fdb3..e62d56ca6 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.indent.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.indent.php
@@ -11,9 +11,9 @@
  * Type:     modifier

  * Name:     indent

  * Purpose:  indent lines of text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
- * @author Uwe Tews
+ * @link http://smarty.php.net/manual/en/language.modifier.indent.php
+ *          indent (Smarty online manual)
+ * @author Uwe Tews 
  * @param array $params parameters
  * @return string with compiled code
  */
@@ -22,10 +22,10 @@ function smarty_modifiercompiler_indent($params, $compiler)
 {
     if (!isset($params[1])) {
         $params[1] = 4;
-    }
+    } 
     if (!isset($params[2])) {
         $params[2] = "' '";
-    }
+    } 
     return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')';
 }
 
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.lower.php b/gosa-core/include/smarty/plugins/modifiercompiler.lower.php
index 17441584e..3604994a9 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.lower.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.lower.php
@@ -7,25 +7,25 @@
 
 /**
  * Smarty lower modifier plugin
- *
+ * 
  * Type:     modifier

  * Name:     lower

  * Purpose:  convert string to lowercase
- *
- * @link http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
- * @author Monte Ohrt 
- * @author Uwe Tews
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
+ * @author Monte Ohrt  
+ * @author Uwe Tews 
  * @param array $params parameters
  * @return string with compiled code
  */
 
 function smarty_modifiercompiler_lower($params, $compiler)
 {
-    if (SMARTY_MBSTRING /* ^phpunit */&&empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-        return 'mb_strtolower(' . $params[0] . ',SMARTY_RESOURCE_CHAR_SET)' ;
-    }
-    // no MBString fallback
-    return 'strtolower(' . $params[0] . ')';
-}
+    if (function_exists('mb_strtolower')) {
+        return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strtolower(' . $params[0] . ',SMARTY_RESOURCE_CHAR_SET) : strtolower(' . $params[0] . '))' ;
+    } else {
+        return 'strtolower(' . $params[0] . ')';
+    } 
+} 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.noprint.php b/gosa-core/include/smarty/plugins/modifiercompiler.noprint.php
index 3ca26571a..cd2a663ec 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.noprint.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.noprint.php
@@ -12,7 +12,6 @@
  * Type:     modifier

  * Name:     noprint

  * Purpose:  return an empty string
- *
  * @author   Uwe Tews
  * @param array $params parameters
  * @return string with compiled code
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.string_format.php b/gosa-core/include/smarty/plugins/modifiercompiler.string_format.php
index 83345977b..fd9fd876c 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.string_format.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.string_format.php
@@ -1,26 +1,26 @@
 
  * Name:     string_format

  * Purpose:  format strings via sprintf
- *
- * @link http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
- * @author Uwe Tews
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
+ * @author Uwe Tews 
  * @param array $params parameters
  * @return string with compiled code
  */
 function smarty_modifiercompiler_string_format($params, $compiler)
 {
     return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
-}
+} 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.strip.php b/gosa-core/include/smarty/plugins/modifiercompiler.strip.php
index 2a2d9d0e3..55b98e0ef 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.strip.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.strip.php
@@ -8,16 +8,16 @@
 
 /**
  * Smarty strip modifier plugin
- *
+ * 
  * Type:     modifier

  * Name:     strip

  * Purpose:  Replace all repeated spaces, newlines, tabs
  *              with a single space or supplied replacement string.

- * Example:  {$var|strip} {$var|strip:" "}

+ * Example:  {$var|strip} {$var|strip:" "}
  * Date:     September 25th, 2002
- *
- * @link http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
- * @author Uwe Tews
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
+ * @author Uwe Tews 
  * @param array $params parameters
  * @return string with compiled code
  */
@@ -28,6 +28,6 @@ function smarty_modifiercompiler_strip($params, $compiler)
         $params[1] = "' '";
     }
     return "preg_replace('!\s+!u', {$params[1]},{$params[0]})";
-}
+} 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.strip_tags.php b/gosa-core/include/smarty/plugins/modifiercompiler.strip_tags.php
index 296a3a2da..5e479b284 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.strip_tags.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.strip_tags.php
@@ -8,26 +8,27 @@
 
 /**
  * Smarty strip_tags modifier plugin
- *
+ * 
  * Type:     modifier

  * Name:     strip_tags

  * Purpose:  strip html tags from text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
- * @author Uwe Tews
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
+ * @author Uwe Tews 
  * @param array $params parameters
  * @return string with compiled code
  */
+
 function smarty_modifiercompiler_strip_tags($params, $compiler)
 {
    if (!isset($params[1])) {
         $params[1] = true;
-    }
+    } 
     if ($params[1] === true) {
         return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
     } else {
         return 'strip_tags(' . $params[0] . ')';
-    }
-}
+    } 
+} 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.upper.php b/gosa-core/include/smarty/plugins/modifiercompiler.upper.php
index 739057ce9..2869b879f 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.upper.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.upper.php
@@ -20,11 +20,11 @@
  */
 function smarty_modifiercompiler_upper($params, $compiler)
 {
-    if (SMARTY_MBSTRING /* ^phpunit */&&empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-        return 'mb_strtoupper(' . $params[0] . ',SMARTY_RESOURCE_CHAR_SET)' ;
-    }
-    // no MBString fallback
-    return 'strtoupper(' . $params[0] . ')';
+    if (function_exists('mb_strtoupper')) {
+        return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strtoupper(' . $params[0] . ',SMARTY_RESOURCE_CHAR_SET) : strtoupper(' . $params[0] . '))' ;
+    } else {
+        return 'strtoupper(' . $params[0] . ')';
+    } 
 } 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/modifiercompiler.wordwrap.php b/gosa-core/include/smarty/plugins/modifiercompiler.wordwrap.php
index 577135add..5b91f64c3 100644
--- a/gosa-core/include/smarty/plugins/modifiercompiler.wordwrap.php
+++ b/gosa-core/include/smarty/plugins/modifiercompiler.wordwrap.php
@@ -29,18 +29,7 @@ function smarty_modifiercompiler_wordwrap($params, $compiler)
     if (!isset($params[3])) {
         $params[3] = 'false';
     } 
-    $function = 'wordwrap';
-    if (SMARTY_MBSTRING /* ^phpunit */&&empty($_SERVER['SMARTY_PHPUNIT_DISABLE_MBSTRING'])/* phpunit$ */) {
-        if ($compiler->tag_nocache | $compiler->nocache) {
-            $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php';
-            $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
-        } else {
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php';
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
-        }
-        $function = 'smarty_mb_wordwrap';
-    }
-    return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
+    return 'wordwrap(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
 } 
 
 ?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/plugins/outputfilter.trimwhitespace.php b/gosa-core/include/smarty/plugins/outputfilter.trimwhitespace.php
index 41828e1d3..20e9bb600 100644
--- a/gosa-core/include/smarty/plugins/outputfilter.trimwhitespace.php
+++ b/gosa-core/include/smarty/plugins/outputfilter.trimwhitespace.php
@@ -9,84 +9,69 @@
 /**
  * Smarty trimwhitespace outputfilter plugin
  *
- * Trim unnecessary whitespace from HTML markup.
- *
- * @author   Rodney Rehm
- * @param string                   $source input string
- * @param Smarty_Internal_Template $smarty Smarty object
+ * File:     outputfilter.trimwhitespace.php

+ * Type:     outputfilter

+ * Name:     trimwhitespace

+ * Date:     Jan 25, 2003

+ * Purpose:  trim leading white space and blank lines from
+ *           template source after it gets interpreted, cleaning
+ *           up code and saving bandwidth. Does not affect
+ *           <
>
 and  blocks.

+ * Install:  Drop into the plugin directory, call
+ *           $smarty->load_filter('output','trimwhitespace');
+ *           from application.
+ * @author   Monte Ohrt 
+ * @author Contributions from Lars Noschinski 
+ * @version  1.3
+ * @param string $source input string
+ * @param object &$smarty Smarty object
  * @return string filtered output
  */
-function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $smarty)
+function smarty_outputfilter_trimwhitespace($source, $smarty)
 {
-    $store = array();
-    $_store = 0;
-    $_offset = 0;
-
-    // Unify Line-Breaks to \n
-    $source = preg_replace("/\015\012|\015|\012/", "\n", $source);
-
-    // capture Internet Explorer Conditional Comments
-    if (preg_match_all('##is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $store[] = $match[0][0];
-            $_length = strlen($match[0][0]);
-            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
-
-            $_offset += $_length - strlen($replace);
-            $_store++;
-        }
-    }
+    // Pull out the script blocks
+    preg_match_all("!]*?>.*?!is", $source, $match);
+    $_script_blocks = $match[0];
+    $source = preg_replace("!]*?>.*?!is",
+                           '@@@SMARTY:TRIM:SCRIPT@@@', $source);
 
-    // Strip all HTML-Comments
-    $source = preg_replace( '##ms', '', $source );
+    // Pull out the pre blocks
+    preg_match_all("!]*?>.*?
!is", $source, $match); + $_pre_blocks = $match[0]; + $source = preg_replace("!]*?>.*?!is", + '@@@SMARTY:TRIM:PRE@@@', $source); + + // Pull out the textarea blocks + preg_match_all("!]*?>.*?!is", $source, $match); + $_textarea_blocks = $match[0]; + $source = preg_replace("!]*?>.*?!is", + '@@@SMARTY:TRIM:TEXTAREA@@@', $source); - // capture html elements not to be messed with - $_offset = 0; - if (preg_match_all('#<(script|pre|textarea)[^>]*>.*?#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) { - foreach ($matches as $match) { - $store[] = $match[0][0]; - $_length = strlen($match[0][0]); - $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@'; - $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length); + // remove all leading spaces, tabs and carriage returns NOT + // preceeded by a php close tag. + $source = trim(preg_replace('/((?)\n)[\s]+/m', '\1', $source)); - $_offset += $_length - strlen($replace); - $_store++; - } - } + // replace textarea blocks + smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $source); - $expressions = array( - // replace multiple spaces between tags by a single space - // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements - '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2', - // remove spaces between attributes (but not in attribute values!) - '#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4', - // note: for some very weird reason trim() seems to remove spaces inside attributes. - // maybe a \0 byte or something is interfering? - '#^\s+<#Ss' => '<', - '#>\s+$#Ss' => '>', - ); + // replace pre blocks + smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:PRE@@@",$_pre_blocks, $source); - $source = preg_replace( array_keys($expressions), array_values($expressions), $source ); - // note: for some very weird reason trim() seems to remove spaces inside attributes. - // maybe a \0 byte or something is interfering? - // $source = trim( $source ); + // replace script blocks + smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$_script_blocks, $source); - // capture html elements not to be messed with - $_offset = 0; - if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) { - foreach ($matches as $match) { - $store[] = $match[0][0]; - $_length = strlen($match[0][0]); - $replace = array_shift($store); - $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length); + return $source; +} - $_offset += strlen($replace) - $_length; - $_store++; - } - } +function smarty_outputfilter_trimwhitespace_replace($search_str, $replace, &$subject) { + $_len = strlen($search_str); + $_pos = 0; + for ($_i=0, $_count=count($replace); $_i<$_count; $_i++) + if (($_pos=strpos($subject, $search_str, $_pos))!==false) + $subject = substr_replace($subject, $replace[$_i], $_pos, $_len); + else + break; - return $source; } ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/plugins/shared.escape_special_chars.php b/gosa-core/include/smarty/plugins/shared.escape_special_chars.php index c087be1fd..e36b2c897 100644 --- a/gosa-core/include/smarty/plugins/shared.escape_special_chars.php +++ b/gosa-core/include/smarty/plugins/shared.escape_special_chars.php @@ -6,46 +6,24 @@ * @subpackage PluginsShared */ -if (version_compare(PHP_VERSION, '5.2.3', '>=')) { - /** - * escape_special_chars common function - * - * Function: smarty_function_escape_special_chars
- * Purpose: used by other smarty functions to escape - * special chars except for already escaped ones - * - * @author Monte Ohrt - * @param string $string text that should by escaped - * @return string - */ - function smarty_function_escape_special_chars($string) - { - if (!is_array($string)) { - $string = htmlspecialchars($string, ENT_COMPAT, SMARTY_RESOURCE_CHAR_SET, false); - } - return $string; - } -} else { - /** - * escape_special_chars common function - * - * Function: smarty_function_escape_special_chars
- * Purpose: used by other smarty functions to escape - * special chars except for already escaped ones - * - * @author Monte Ohrt - * @param string $string text that should by escaped - * @return string - */ - function smarty_function_escape_special_chars($string) - { - if (!is_array($string)) { - $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); - $string = htmlspecialchars($string); - $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); - } - return $string; - } -} +/** + * escape_special_chars common function + * + * Function: smarty_function_escape_special_chars
+ * Purpose: used by other smarty functions to escape + * special chars except for already escaped ones + * @author Monte Ohrt + * @param string + * @return string + */ +function smarty_function_escape_special_chars($string) +{ + if(!is_array($string)) { + $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); + $string = htmlspecialchars($string); + $string = str_replace(array('%%%SMARTY_START%%%','%%%SMARTY_END%%%'), array('&',';'), $string); + } + return $string; +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/plugins/shared.make_timestamp.php b/gosa-core/include/smarty/plugins/shared.make_timestamp.php index 5d7c97e91..9789f53f7 100644 --- a/gosa-core/include/smarty/plugins/shared.make_timestamp.php +++ b/gosa-core/include/smarty/plugins/shared.make_timestamp.php @@ -8,26 +8,27 @@ /** * Function: smarty_make_timestamp
- * Purpose: used by other smarty functions to make a timestamp from a string. - * + * Purpose: used by other smarty functions to make a timestamp + * from a string. * @author Monte Ohrt - * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime() - * @return int + * @param string $string + * @return string */ + function smarty_make_timestamp($string) { - if (empty($string)) { + if(empty($string)) { // use "now": return time(); } elseif ($string instanceof DateTime) { return $string->getTimestamp(); - } elseif (strlen($string) == 14 && ctype_digit($string)) { - // it is mysql timestamp format of YYYYMMDDHHMMSS? + } elseif (strlen($string)==14 && ctype_digit($string)) { + // it is mysql timestamp format of YYYYMMDDHHMMSS? return mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2), substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4)); } elseif (is_numeric($string)) { // it is a numeric string, we handle it as timestamp - return (int) $string; + return (int)$string; } else { // strtotime should handle it $time = strtotime($string); diff --git a/gosa-core/include/smarty/plugins/shared.mb_str_replace.php b/gosa-core/include/smarty/plugins/shared.mb_str_replace.php index ecafeb74a..8bc156f08 100644 --- a/gosa-core/include/smarty/plugins/shared.mb_str_replace.php +++ b/gosa-core/include/smarty/plugins/shared.mb_str_replace.php @@ -1,55 +1,38 @@ \ No newline at end of file diff --git a/gosa-core/include/smarty/plugins/variablefilter.htmlspecialchars.php b/gosa-core/include/smarty/plugins/variablefilter.htmlspecialchars.php index aeaeb6005..4d3550c04 100644 --- a/gosa-core/include/smarty/plugins/variablefilter.htmlspecialchars.php +++ b/gosa-core/include/smarty/plugins/variablefilter.htmlspecialchars.php @@ -1,21 +1,22 @@ \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_cacheresource_file.php b/gosa-core/include/smarty/sysplugins/smarty_internal_cacheresource_file.php index c5e985b6d..512f6fbf7 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_cacheresource_file.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_cacheresource_file.php @@ -1,257 +1,207 @@ smarty = $smarty; + } /** - * populate Cached Object with meta data from Resource - * - * @param Smarty_Template_Cached $cached cached object - * @param Smarty_Internal_Template $_template template object - * @return void + * Returns the filepath of the cached template output + * + * @param object $_template current template + * @return string the cache filepath */ - public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template) + public function getCachedFilepath($_template) { - $_source_file_path = str_replace(':', '.', $_template->source->filepath); + $_source_file_path = str_replace(':', '.', $_template->getTemplateFilepath()); $_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null; $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null; - $_filepath = $_template->source->uid; + $_filepath = $_template->templateUid; // if use_sub_dirs, break file into directories - if ($_template->smarty->use_sub_dirs) { + if ($this->smarty->use_sub_dirs) { $_filepath = substr($_filepath, 0, 2) . DS - . substr($_filepath, 2, 2) . DS - . substr($_filepath, 4, 2) . DS - . $_filepath; - } - $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^'; + . substr($_filepath, 2, 2) . DS + . substr($_filepath, 4, 2) . DS + . $_filepath; + } + $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^'; if (isset($_cache_id)) { $_cache_id = str_replace('|', $_compile_dir_sep, $_cache_id) . $_compile_dir_sep; } else { $_cache_id = ''; - } + } if (isset($_compile_id)) { $_compile_id = $_compile_id . $_compile_dir_sep; } else { $_compile_id = ''; - } - $_cache_dir = $_template->smarty->getCacheDir(); - if ($_template->smarty->cache_locking) { - // create locking file name - // relative file name? - if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_cache_dir)) { - $_lock_dir = rtrim(getcwd(), '/\\') . DS . $_cache_dir; - } else { - $_lock_dir = $_cache_dir; - } - $cached->lock_id = $_lock_dir.sha1($_cache_id.$_compile_id.$_template->source->uid).'.lock'; - } - $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php'; - $cached->timestamp = @filemtime($cached->filepath); - $cached->exists = !!$cached->timestamp; - } + } + $_cache_dir = $this->smarty->cache_dir; + if (strpos('/\\', substr($_cache_dir, -1)) === false) { + $_cache_dir .= DS; + } + return $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php'; + } /** - * populate Cached Object with timestamp and exists from Resource - * - * @param Smarty_Template_Cached $cached cached object - * @return void + * Returns the timpestamp of the cached template output + * + * @param object $_template current template + * @return integer |booelan the template timestamp or false if the file does not exist */ - public function populateTimestamp(Smarty_Template_Cached $cached) - { - $cached->timestamp = @filemtime($cached->filepath); - $cached->exists = !!$cached->timestamp; - } + public function getCachedTimestamp($_template) + { + // return @filemtime ($_template->getCachedFilepath()); + return ($_template->getCachedFilepath() && file_exists($_template->getCachedFilepath())) ? filemtime($_template->getCachedFilepath()) : false ; + } /** - * Read the cached template and process its header - * - * @param Smarty_Internal_Template $_template template object - * @param Smarty_Template_Cached $cached cached object - * @return booelan true or false if the cached content does not exist + * Returns the cached template output + * + * @param object $_template current template + * @return string |booelan the template content or false if the file does not exist */ - public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null) + public function getCachedContents($_template, $no_render = false) { + if (!$no_render) { + ob_start(); + } $_smarty_tpl = $_template; - return @include $_template->cached->filepath; - } + include $_template->getCachedFilepath(); + if ($no_render) { + return null; + } else { + return ob_get_clean(); + } + } /** - * Write the rendered template output to cache - * - * @param Smarty_Internal_Template $_template template object - * @param string $content content to cache - * @return boolean success + * Writes the rendered template output to cache file + * + * @param object $_template current template + * @return boolean status */ - public function writeCachedContent(Smarty_Internal_Template $_template, $content) + public function writeCachedContent($_template, $content) { - if (Smarty_Internal_Write_File::writeFile($_template->cached->filepath, $content, $_template->smarty) === true) { - $_template->cached->timestamp = filemtime($_template->cached->filepath); - $_template->cached->exists = !!$_template->cached->timestamp; - return true; - } + if (!$_template->resource_object->isEvaluated) { + if (Smarty_Internal_Write_File::writeFile($_template->getCachedFilepath(), $content, $this->smarty) === true) { + $_template->cached_timestamp = filemtime($_template->getCachedFilepath()); + return true; + } + } return false; - } + } /** - * Empty cache - * - * @param Smarty_Internal_Template $_template template object - * @param integer $exp_time expiration time (number of seconds, not timestamp) + * Empty cache folder + * + * @param integer $exp_time expiration time * @return integer number of cache files deleted */ - public function clearAll(Smarty $smarty, $exp_time = null) + public function clearAll($exp_time = null) { - return $this->clear($smarty, null, null, null, $exp_time); - } - + return $this->clear(null, null, null, $exp_time); + } /** * Empty cache for a specific template - * - * @param Smarty $_template template object - * @param string $resource_name template name - * @param string $cache_id cache id - * @param string $compile_id compile id - * @param integer $exp_time expiration time (number of seconds, not timestamp) + * + * @param string $resource_name template name + * @param string $cache_id cache id + * @param string $compile_id compile id + * @param integer $exp_time expiration time * @return integer number of cache files deleted - */ - public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time) + */ + public function clear($resource_name, $cache_id, $compile_id, $exp_time) { $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null; $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null; - $_dir_sep = $smarty->use_sub_dirs ? '/' : '^'; - $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0; - $_dir = $smarty->getCacheDir(); + $_dir_sep = $this->smarty->use_sub_dirs ? '/' : '^'; + $_compile_id_offset = $this->smarty->use_sub_dirs ? 3 : 0; + $_dir = rtrim($this->smarty->cache_dir, '/\\') . DS; $_dir_length = strlen($_dir); if (isset($_cache_id)) { $_cache_id_parts = explode('|', $_cache_id); $_cache_id_parts_count = count($_cache_id_parts); - if ($smarty->use_sub_dirs) { + if ($this->smarty->use_sub_dirs) { foreach ($_cache_id_parts as $id_part) { $_dir .= $id_part . DS; - } - } - } + } + } + } if (isset($resource_name)) { - $_save_stat = $smarty->caching; - $smarty->caching = true; - $tpl = new $smarty->template_class($resource_name, $smarty); - $smarty->caching = $_save_stat; - - // remove from template cache - $tpl->source; // have the template registered before unset() - $_templateId = sha1($tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id); - unset($smarty->template_objects[$_templateId]); - - if ($tpl->source->exists) { - $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath)); + $_save_stat = $this->smarty->caching; + $this->smarty->caching = true; + $tpl = new $this->smarty->template_class($resource_name, $this->smarty); + $this->smarty->caching = $_save_stat; + if ($tpl->isExisting()) { + $_resourcename_parts = basename(str_replace('^', '/', $tpl->getCachedFilepath())); + // remove from template cache + unset($this->smarty->template_objects[sha1($tpl->template_resource . $tpl->cache_id . $tpl->compile_id)]); } else { + // remove from template cache + unset($this->smarty->template_objects[sha1($tpl->template_resource . $tpl->cache_id . $tpl->compile_id)]); return 0; - } - } + } + } $_count = 0; - $_time = time(); if (file_exists($_dir)) { $_cacheDirs = new RecursiveDirectoryIterator($_dir); $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST); foreach ($_cache as $_file) { - if (substr($_file->getBasename(),0,1) == '.' || strpos($_file, '.svn') !== false) continue; + if (substr($_file->getBasename(),0,1) == '.') continue; // directory ? if ($_file->isDir()) { if (!$_cache->isDot()) { // delete folder if empty @rmdir($_file->getPathname()); - } + } } else { $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string)$_file, $_dir_length))); - $_parts_count = count($_parts); + $_parts_count = count($_parts); // check name if (isset($resource_name)) { if ($_parts[$_parts_count-1] != $_resourcename_parts) { continue; - } - } + } + } // check compile id if (isset($_compile_id) && (!isset($_parts[$_parts_count-2 - $_compile_id_offset]) || $_parts[$_parts_count-2 - $_compile_id_offset] != $_compile_id)) { continue; - } + } // check cache id if (isset($_cache_id)) { // count of cache id parts $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset : $_parts_count - 1 - $_compile_id_offset; if ($_parts_count < $_cache_id_parts_count) { continue; - } + } for ($i = 0; $i < $_cache_id_parts_count; $i++) { if ($_parts[$i] != $_cache_id_parts[$i]) continue 2; - } - } + } + } // expired ? - if (isset($exp_time) && $_time - @filemtime($_file) < $exp_time) { + if (isset($exp_time) && time() - @filemtime($_file) < $exp_time) { continue; - } + } $_count += @unlink((string) $_file) ? 1 : 0; - } - } - } + } + } + } return $_count; - } - - /** - * Check is cache is locked for this template - * - * @param Smarty $smarty Smarty object - * @param Smarty_Template_Cached $cached cached object - * @return booelan true or false if cache is locked - */ - public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached) - { - if (version_compare(PHP_VERSION, '5.3.0', '>=')) { - clearstatcache(true, $cached->lock_id); - } else { - clearstatcache(); - } - $t = @filemtime($cached->lock_id); - return $t && (time() - $t < $smarty->locking_timeout); - } - - /** - * Lock cache for this template - * - * @param Smarty $smarty Smarty object - * @param Smarty_Template_Cached $cached cached object - */ - public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached) - { - $cached->is_locked = true; - touch($cached->lock_id); - } - - /** - * Unlock cache for this template - * - * @param Smarty $smarty Smarty object - * @param Smarty_Template_Cached $cached cached object - */ - public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached) - { - $cached->is_locked = false; - @unlink($cached->lock_id); - } -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_append.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_append.php index f6036e883..98e696e30 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_append.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_append.php @@ -1,25 +1,22 @@ compiler = $compiler; // the following must be assigned at runtime because it will be overwritten in parent class $this->required_attributes = array('var', 'value'); $this->shorttag_order = array('var', 'value'); - $this->optional_attributes = array('scope', 'index'); + $this->optional_attributes = array('scope','index'); // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); // map to compile assign attributes if (isset($_attr['index'])) { $_params['smarty_internal_index'] = '[' . $_attr['index'] . ']'; @@ -43,11 +41,10 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign { $_new_attr = array(); foreach ($_attr as $key => $value) { $_new_attr[] = array($key => $value); - } + } // call compile assign return parent::compile($_new_attr, $compiler, $_params); - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_assign.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_assign.php index 40e468621..8d8c643af 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_assign.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_assign.php @@ -1,46 +1,44 @@ compiler = $compiler; // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append $this->required_attributes = array('var', 'value'); $this->shorttag_order = array('var', 'value'); $this->optional_attributes = array('scope'); $_nocache = 'null'; - $_scope = Smarty::SCOPE_LOCAL; + $_scope = 'null'; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - // nocache ? - if ($compiler->tag_nocache || $compiler->nocache) { - $_nocache = 'true'; + $_attr = $this->_get_attributes($args); + // nocache ? + if ($this->compiler->tag_nocache || $this->compiler->nocache) { + $_nocache = 'true'; // create nocache var to make it know for further compiling $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true); - } + } // scope setup if (isset($_attr['scope'])) { $_attr['scope'] = trim($_attr['scope'], "'\""); @@ -51,27 +49,16 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase { } elseif ($_attr['scope'] == 'global') { $_scope = Smarty::SCOPE_GLOBAL; } else { - $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno); - } - } + $this->compiler->trigger_template_error('illegal value for "scope" attribute', $this->compiler->lex->taglineno); + } + } // compiled output if (isset($parameter['smarty_internal_index'])) { - $output = "createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];"; + return "tpl_vars[$_attr[var]]) || !is_array(\$_smarty_tpl->tpl_vars[$_attr[var]]->value)) \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];?>"; } else { - $output = "tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);"; - } - if ($_scope == Smarty::SCOPE_PARENT) { - $output .= "\nif (\$_smarty_tpl->parent != null) \$_smarty_tpl->parent->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];"; - } elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) { - $output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }"; - } - if ( $_scope == Smarty::SCOPE_GLOBAL) { - $output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];"; - } - $output .= '?>'; - return $output; - } - -} + return "tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);?>"; + } + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_block.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_block.php index 3a9f91b63..fc003dd71 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_block.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_block.php @@ -11,228 +11,177 @@ /** * Smarty Internal Plugin Compile Block Class - * - * @package Smarty - * @subpackage Compiler */ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase { - - /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ + // attribute definitions public $required_attributes = array('name'); - /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ - public $shorttag_order = array('name', 'hide'); - /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ - public $optional_attributes = array('hide'); - + public $shorttag_order = array('name'); /** * Compiles code for the {block} tag * - * @param array $args array with attributes from parser + * @param array $args array with attributes from parser * @param object $compiler compiler object * @return boolean true */ public function compile($args, $compiler) { + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - $save = array($_attr, $compiler->parser->current_buffer, $compiler->nocache, $compiler->smarty->merge_compiled_includes); - $this->openTag($compiler, 'block', $save); + $_attr = $this->_get_attributes($args); + $save = array($_attr, $compiler->parser->current_buffer, $this->compiler->nocache, $this->compiler->smarty->merge_compiled_includes, $compiler->smarty->inheritance); + $this->_open_tag('block', $save); if ($_attr['nocache'] == true) { $compiler->nocache = true; } // set flag for {block} tag - $compiler->inheritance = true; + $compiler->smarty->inheritance = true; // must merge includes - $compiler->smarty->merge_compiled_includes = true; + $this->compiler->smarty->merge_compiled_includes = true; $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser); $compiler->has_code = false; return true; } - /** - * Save or replace child block source by block name during parsing - * - * @param string $block_content block source content - * @param string $block_tag opening block tag - * @param object $template template object - * @param string $filepath filepath of template source - */ - public static function saveBlockData($block_content, $block_tag, $template, $filepath) + + static function saveBlockData($block_content, $block_tag, $template, $filepath) { - $_rdl = preg_quote($template->smarty->right_delimiter); + $_rdl = preg_quote($template->smarty->right_delimiter); $_ldl = preg_quote($template->smarty->left_delimiter); - if (0 == preg_match("!({$_ldl}block\s+)(name=)?(\w+|'.*'|\".*\")(\s*?)?((append|prepend|nocache)?(\s*)?(hide)?)?(\s*{$_rdl})!", $block_tag, $_match)) { - $error_text = 'Syntax Error in template "' . $template->source->filepath . '" "' . htmlspecialchars($block_tag) . '" illegal options'; + if (0 == preg_match("!({$_ldl}block\s+)(name=)?(\w+|'.*'|\".*\")(\s*?)?((append|prepend|nocache)(=true)?)?(\s*{$_rdl})!", $block_tag, $_match)) { + $error_text = 'Syntax Error in template "' . $template->getTemplateFilepath() . '" "' . htmlspecialchars($block_tag) . '" illegal options'; throw new SmartyCompilerException($error_text); } else { $_name = trim($_match[3], '\'"'); - if ($_match[8] != 'hide' || isset($template->block_data[$_name])) { // replace {$smarty.block.child} - if (strpos($block_content, $template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter) !== false) { - if (isset($template->block_data[$_name])) { - $block_content = str_replace($template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter, - $template->block_data[$_name]['source'], $block_content); - unset($template->block_data[$_name]); - } else { - $block_content = str_replace($template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter, - '', $block_content); - } - } + // replace {$smarty.block.child} + if (strpos($block_content, $template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter) !== false) { if (isset($template->block_data[$_name])) { - if (strpos($template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) { - $template->block_data[$_name]['source'] = - str_replace('%%%%SMARTY_PARENT%%%%', $block_content, $template->block_data[$_name]['source']); - } elseif ($template->block_data[$_name]['mode'] == 'prepend') { - $template->block_data[$_name]['source'] .= $block_content; - } elseif ($template->block_data[$_name]['mode'] == 'append') { - $template->block_data[$_name]['source'] = $block_content . $template->block_data[$_name]['source']; - } + $block_content = str_replace($template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter, + $template->block_data[$_name]['source'], $block_content); + unset($template->block_data[$_name]); } else { - $template->block_data[$_name]['source'] = $block_content; - $template->block_data[$_name]['file'] = $filepath; + $block_content = str_replace($template->smarty->left_delimiter . '$smarty.block.child' . $template->smarty->right_delimiter, + '', $block_content); } - if ($_match[6] == 'append') { - $template->block_data[$_name]['mode'] = 'append'; - } elseif ($_match[6] == 'prepend') { - $template->block_data[$_name]['mode'] = 'prepend'; - } else { - $template->block_data[$_name]['mode'] = 'replace'; + } + if (isset($template->block_data[$_name])) { + if (strpos($template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) { + $template->block_data[$_name]['source'] = + str_replace('%%%%SMARTY_PARENT%%%%', $block_content, $template->block_data[$_name]['source']); + } elseif ($template->block_data[$_name]['mode'] == 'prepend') { + $template->block_data[$_name]['source'] .= $block_content; + } elseif ($template->block_data[$_name]['mode'] == 'append') { + $template->block_data[$_name]['source'] = $block_content . $template->block_data[$_name]['source']; } + } else { + $template->block_data[$_name]['source'] = $block_content; } + if ($_match[6] == 'append') { + $template->block_data[$_name]['mode'] = 'append'; + } elseif ($_match[6] == 'prepend') { + $template->block_data[$_name]['mode'] = 'prepend'; + } else { + $template->block_data[$_name]['mode'] = 'replace'; + } + $template->block_data[$_name]['file'] = $filepath; } } - /** - * Compile saved child block source - * - * @param object $compiler compiler object - * @param string $_name optional name of child block - * @return string compiled code of schild block - */ - public static function compileChildBlock($compiler, $_name = null) - { - $_output = ''; + static function compileChildBlock ($compiler, $_name = null) + { + $_output = ''; // if called by {$smarty.block.child} we must search the name of enclosing {block} - if ($_name == null) { - $stack_count = count($compiler->_tag_stack); + if ($_name == null) { + $stack_count = count($compiler->_tag_stack); while (--$stack_count >= 0) { - if ($compiler->_tag_stack[$stack_count][0] == 'block') { - $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'] ,"'\""); - break; - } - } - // flag that child is already compile by {$smarty.block.child} inclusion - $compiler->template->block_data[$_name]['compiled'] = true; - } - if ($_name == null) { - $compiler->trigger_template_error('{$smarty.block.child} used out of context', $compiler->lex->taglineno); - } - // undefined child? - if (!isset($compiler->template->block_data[$_name]['source'])) { - return ''; - } - $_tpl = new Smarty_Internal_template ('string:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id, - $compiler->template->compile_id = null, $compiler->template->caching, $compiler->template->cache_lifetime); - $_tpl->variable_filters = $compiler->template->variable_filters; - $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash']; - $_tpl->source->filepath = $compiler->template->block_data[$_name]['file']; - $_tpl->allow_relative_path = true; - if ($compiler->nocache) { - $_tpl->compiler->forceNocache = 2; - } else { - $_tpl->compiler->forceNocache = 1; - } - $_tpl->compiler->suppressHeader = true; - $_tpl->compiler->suppressTemplatePropertyHeader = true; - $_tpl->compiler->suppressMergedTemplates = true; - if (strpos($compiler->template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) { - $_output = str_replace('%%%%SMARTY_PARENT%%%%', $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl)); - } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') { - $_output = $_tpl->compiler->compileTemplate($_tpl) . $compiler->parser->current_buffer->to_smarty_php(); - } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') { - $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl); - } elseif (!empty($compiler->template->block_data[$_name])) { - $_output = $_tpl->compiler->compileTemplate($_tpl); - } - $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']); - $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']); - $compiler->merged_templates = array_merge($compiler->merged_templates, $_tpl->compiler->merged_templates); - $compiler->template->variable_filters = $_tpl->variable_filters; - if ($_tpl->has_nocache_code) { - $compiler->template->has_nocache_code = true; - } - foreach($_tpl->required_plugins as $code => $tmp1) { - foreach($tmp1 as $name => $tmp) { - foreach($tmp as $type => $data) { - $compiler->template->required_plugins[$code][$name][$type] = $data; + if ($compiler->_tag_stack[$stack_count][0] == 'block') { + $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'] ,"'\""); + break; } } + // flag that child is already compile by {$smarty.block.child} inclusion + $compiler->template->block_data[$_name]['compiled'] = true; } - unset($_tpl); - return $_output; - } + if ($_name == null) { + $compiler->trigger_template_error('{$smarty.block.child} used out of context', $compiler->lex->taglineno); + } + // undefined child? + if (!isset($compiler->template->block_data[$_name])) { + return ''; + } + $_tpl = new Smarty_Internal_template ('eval:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id, + $compiler->template->compile_id = null, $compiler->template->caching, $compiler->template->cache_lifetime); + $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash']; + $_tpl->template_filepath = $compiler->template->block_data[$_name]['file']; + if ($compiler->nocache) { + $_tpl->forceNocache = 2; + } else { + $_tpl->forceNocache = 1; + } + $_tpl->suppressHeader = true; + $_tpl->suppressFileDependency = true; + if (strpos($compiler->template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) { + $_output = str_replace('%%%%SMARTY_PARENT%%%%', $compiler->parser->current_buffer->to_smarty_php(), $_tpl->getCompiledTemplate()); + } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') { + $_output = $_tpl->getCompiledTemplate() . $compiler->parser->current_buffer->to_smarty_php(); + } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') { + $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->getCompiledTemplate(); + } elseif (!empty($compiler->template->block_data[$_name])) { + $_output = $_tpl->getCompiledTemplate(); + } + $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']); + $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']); + if ($_tpl->has_nocache_code) { + $compiler->template->has_nocache_code = true; + } + foreach($_tpl->required_plugins as $code => $tmp1) { + foreach($tmp1 as $name => $tmp) { + foreach($tmp as $type => $data) { + $compiler->template->required_plugins[$code][$name][$type] = $data; + } + } + } + unset($_tpl); + return $_output; + } } /** * Smarty Internal Plugin Compile BlockClose Class - * - * @package Smarty - * @subpackage Compiler -*/ + */ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase { - /** * Compiles code for the {/block} tag * - * @param array $args array with attributes from parser + * @param array $args array with attributes from parser * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) { - $compiler->has_code = true; + $this->compiler = $compiler; + $this->smarty = $compiler->smarty; + $this->compiler->has_code = true; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - $saved_data = $this->closeTag($compiler, array('block')); + $_attr = $this->_get_attributes($args); + $saved_data = $this->_close_tag(array('block')); $_name = trim($saved_data[0]['name'], "\"'"); if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) { - $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name); + $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name); } else { - if (isset($saved_data[0]['hide']) && !isset($compiler->template->block_data[$_name]['source'])) { - $_output = ''; - } else { - $_output = $compiler->parser->current_buffer->to_smarty_php(); - } + $_output = $compiler->parser->current_buffer->to_smarty_php(); unset ($compiler->template->block_data[$_name]['compiled']); } // reset flags $compiler->parser->current_buffer = $saved_data[1]; $compiler->nocache = $saved_data[2]; $compiler->smarty->merge_compiled_includes = $saved_data[3]; - // reset flag for {block} tag - $compiler->inheritance = false; + $compiler->smarty->inheritance = $saved_data[4]; // $_output content has already nocache code processed $compiler->suppressNocacheProcessing = true; return $_output; } - } - ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_break.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_break.php index 259c66e2b..2e57da401 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_break.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_break.php @@ -1,77 +1,65 @@ true, 'foreach' => true, 'while' => true, 'section' => true); + { + $this->compiler = $compiler; + $this->smarty = $compiler->smarty; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); if ($_attr['nocache'] === true) { - $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); + $this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno); } if (isset($_attr['levels'])) { if (!is_numeric($_attr['levels'])) { - $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno); - } + $this->compiler->trigger_template_error('level attribute must be a numeric constant', $this->compiler->lex->taglineno); + } $_levels = $_attr['levels']; } else { $_levels = 1; - } + } $level_count = $_levels; $stack_count = count($compiler->_tag_stack) - 1; while ($level_count > 0 && $stack_count >= 0) { - if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) { + if (in_array($compiler->_tag_stack[$stack_count][0], array('for', 'foreach', 'while', 'section'))) { $level_count--; - } + } $stack_count--; - } + } if ($level_count != 0) { - $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno); - } - $compiler->has_code = true; + $this->compiler->trigger_template_error("cannot break {$_levels} level(s)", $this->compiler->lex->taglineno); + } + // this tag does not return compiled code + $this->compiler->has_code = true; return ""; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_call.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_call.php index af12a048c..50ba6328d 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_call.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_call.php @@ -1,79 +1,58 @@ compiler = $compiler; + $this->smarty = $compiler->smarty; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); // save possible attributes if (isset($_attr['assign'])) { // output will be stored in a smarty variable instead of beind displayed $_assign = $_attr['assign']; - } + } $_name = $_attr['name']; - if ($compiler->compiles_template_function) { - $compiler->called_functions[] = trim($_name, "'\""); - } - unset($_attr['name'], $_attr['assign'], $_attr['nocache']); + unset($_attr['name'], $_attr['assign'], $_attr['nocache']); // set flag (compiled code of {function} must be included in cache file if ($compiler->nocache || $compiler->tag_nocache) { $_nocache = 'true'; } else { $_nocache = 'false'; - } + } $_paramsArray = array(); foreach ($_attr as $_key => $_value) { if (is_int($_key)) { $_paramsArray[] = "$_key=>$_value"; } else { $_paramsArray[] = "'$_key'=>$_value"; - } + } } if (isset($compiler->template->properties['function'][$_name]['parameter'])) { foreach ($compiler->template->properties['function'][$_name]['parameter'] as $_key => $_value) { @@ -82,49 +61,48 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase { $_paramsArray[] = "$_key=>$_value"; } else { $_paramsArray[] = "'$_key'=>$_value"; - } - } - } - } elseif (isset($compiler->smarty->template_functions[$_name]['parameter'])) { - foreach ($compiler->smarty->template_functions[$_name]['parameter'] as $_key => $_value) { + } + } + } + } elseif (isset($this->smarty->template_functions[$_name]['parameter'])) { + foreach ($this->smarty->template_functions[$_name]['parameter'] as $_key => $_value) { if (!isset($_attr[$_key])) { if (is_int($_key)) { $_paramsArray[] = "$_key=>$_value"; } else { $_paramsArray[] = "'$_key'=>$_value"; - } - } - } + } + } + } } //varibale name? - if (!(strpos($_name, '$') === false)) { - $call_cache = $_name; - $call_function = '$tmp = "smarty_template_function_".' . $_name . '; $tmp'; - } else { - $_name = trim($_name, "'\""); - $call_cache = "'{$_name}'"; - $call_function = 'smarty_template_function_' . $_name; + if (!(strpos($_name,'$')===false)) { + $call_cache = $_name; + $call_function = '$tmp = "smarty_template_function_".'.$_name.'; $tmp'; + } else { + $_name = trim($_name, "'\""); + $call_cache = "'{$_name}'"; + $call_function = 'smarty_template_function_'.$_name; } - + $_params = 'array(' . implode(",", $_paramsArray) . ')'; - $_hash = str_replace('-', '_', $compiler->template->properties['nocache_hash']); + $_hash = str_replace('-','_',$compiler->template->properties['nocache_hash']); // was there an assign attribute if (isset($_assign)) { if ($compiler->template->caching) { $_output = "assign({$_assign}, ob_get_clean());?>\n"; } else { $_output = "assign({$_assign}, ob_get_clean());?>\n"; - } + } } else { if ($compiler->template->caching) { $_output = "\n"; } else { $_output = "\n"; - } - } + } + } return $_output; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_capture.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_capture.php index fe54b36b8..74ade6804 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_capture.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_capture.php @@ -1,98 +1,81 @@ compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); $buffer = isset($_attr['name']) ? $_attr['name'] : "'default'"; - $assign = isset($_attr['assign']) ? $_attr['assign'] : 'null'; - $append = isset($_attr['append']) ? $_attr['append'] : 'null'; + $assign = isset($_attr['assign']) ? $_attr['assign'] : null; + $append = isset($_attr['append']) ? $_attr['append'] : null; - $compiler->_capture_stack[] = array($buffer, $assign, $append, $compiler->nocache); + $this->compiler->_capture_stack[] = array($buffer, $assign, $append, $this->compiler->nocache); // maybe nocache because of nocache variables - $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; - $_output = "_capture_stack[] = array($buffer, $assign, $append); ob_start(); ?>"; + $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; + $_output = ""; return $_output; - } - -} + } +} /** * Smarty Internal Plugin Compile Captureclose Class - * - * @package Smarty - * @subpackage Compiler */ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase { - /** * Compiles code for the {/capture} tag - * - * @param array $args array with attributes from parser + * + * @param array $args array with attributes from parser * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) { + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); // must endblock be nocache? - if ($compiler->nocache) { - $compiler->tag_nocache = true; - } + if ($this->compiler->nocache) { + $this->compiler->tag_nocache = true; + } - list($buffer, $assign, $append, $compiler->nocache) = array_pop($compiler->_capture_stack); + list($buffer, $assign, $append, $this->compiler->nocache) = array_pop($this->compiler->_capture_stack); - $_output = "_capture_stack);\n"; - $_output .= "if (!empty(\$_capture_buffer)) {\n"; - $_output .= " if (isset(\$_capture_assign)) \$_smarty_tpl->assign(\$_capture_assign, ob_get_contents());\n"; - $_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n"; - $_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n"; - $_output .= "} else \$_smarty_tpl->capture_error();?>"; + $_output = "assign($assign, ob_get_contents());"; + } + if (isset($append)) { + $_output .= " \$_smarty_tpl->append($append, ob_get_contents());"; + } + $_output .= " Smarty::\$_smarty_vars['capture'][$buffer]=ob_get_clean();?>"; return $_output; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_config_load.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_config_load.php index deaa052c5..733e1ac5d 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_config_load.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_config_load.php @@ -1,85 +1,64 @@ true,'parent' => true,'root' => true,'global' => true); + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - + $_attr = $this->_get_attributes($args); + if ($_attr['nocache'] === true) { - $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); + $this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno); } - + // save posible attributes $conf_file = $_attr['file']; if (isset($_attr['section'])) { $section = $_attr['section']; } else { $section = 'null'; - } + } $scope = 'local'; // scope setup if (isset($_attr['scope'])) { $_attr['scope'] = trim($_attr['scope'], "'\""); - if (isset($_is_legal_scope[$_attr['scope']])) { + if (in_array($_attr['scope'],array('local','parent','root','global'))) { $scope = $_attr['scope']; } else { - $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno); - } - } + $this->compiler->trigger_template_error('illegal value for "scope" attribute', $this->compiler->lex->taglineno); + } + } // create config object $_output = "smarty, \$_smarty_tpl);"; $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>"; return $_output; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_continue.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_continue.php index 4082a93b3..7d7966732 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_continue.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_continue.php @@ -1,78 +1,64 @@ true, 'foreach' => true, 'while' => true, 'section' => true); + $this->compiler = $compiler; + $this->smarty = $compiler->smarty; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); if ($_attr['nocache'] === true) { - $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); + $this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno); } if (isset($_attr['levels'])) { if (!is_numeric($_attr['levels'])) { - $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno); - } + $this->compiler->trigger_template_error('level attribute must be a numeric constant', $this->compiler->lex->taglineno); + } $_levels = $_attr['levels']; } else { $_levels = 1; - } + } $level_count = $_levels; $stack_count = count($compiler->_tag_stack) - 1; while ($level_count > 0 && $stack_count >= 0) { - if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) { + if (in_array($compiler->_tag_stack[$stack_count][0], array('for', 'foreach', 'while', 'section'))) { $level_count--; - } + } $stack_count--; - } + } if ($level_count != 0) { - $compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno); - } - $compiler->has_code = true; + $this->compiler->trigger_template_error("cannot continue {$_levels} level(s)", $this->compiler->lex->taglineno); + } + // this tag does not return compiled code + $this->compiler->has_code = true; return ""; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_debug.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_debug.php index f50c7aee2..f6189e7e1 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_debug.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_debug.php @@ -1,10 +1,9 @@ -compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); - // compile always as nocache - $compiler->tag_nocache = true; + // compile always as nocache + $this->compiler->tag_nocache = true; // display debug template $_output = "smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>"; return $_output; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_eval.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_eval.php index 6cf481b50..aa3c25807 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_eval.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_eval.php @@ -1,9 +1,9 @@ compiler = $compiler; $this->required_attributes = array('var'); - $this->optional_attributes = array('assign'); + $this->optional_attributes = array('assign'); // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); if (isset($_attr['assign'])) { // output will be stored in a smarty variable instead of beind displayed $_assign = $_attr['assign']; } - + // create template object - $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'.".$_attr['var'].", \$_smarty_tpl->smarty, \$_smarty_tpl);"; - //was there an assign attribute? + $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'.".$_attr['var'].", \$_smarty_tpl->smarty, \$_smarty_tpl);"; + //was there an assign attribute? if (isset($_assign)) { - $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());"; + $_output .= "\$_smarty_tpl->assign($_assign,\$_template->getRenderedTemplate());"; } else { - $_output .= "echo \$_template->fetch();"; - } + $_output .= "echo \$_template->getRenderedTemplate();"; + } return ""; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_extends.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_extends.php index 8a4deeed8..b76cf98d4 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_extends.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_extends.php @@ -1,121 +1,90 @@ true, 'eval' => true); - $this->_rdl = preg_quote($compiler->smarty->right_delimiter); - $this->_ldl = preg_quote($compiler->smarty->left_delimiter); - $filepath = $compiler->template->source->filepath; + $this->compiler = $compiler; + $this->smarty = $compiler->smarty; + $this->_rdl = preg_quote($this->smarty->right_delimiter); + $this->_ldl = preg_quote($this->smarty->left_delimiter); + $filepath = $compiler->template->getTemplateFilepath(); // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); if ($_attr['nocache'] === true) { - $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); + $this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno); } $_smarty_tpl = $compiler->template; $include_file = null; - if (strpos($_attr['file'], '$_tmp') !== false) { - $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno); + if (strpos($_attr['file'],'$_tmp') !== false || strpos($_attr['file'],'$_smarty_tpl') !== false || strpos($_attr['file'],'::') !== false) { + $this->compiler->trigger_template_error('a variable file attribute is illegal', $this->compiler->lex->taglineno); } eval('$include_file = ' . $_attr['file'] . ';'); // create template object - $_template = new $compiler->smarty->template_class($include_file, $compiler->smarty, $compiler->template); + $_template = new $compiler->smarty->template_class($include_file, $this->smarty, $compiler->template); // save file dependency - if (isset($_is_stringy[$_template->source->type])) { - $template_sha1 = sha1($include_file); - } else { - $template_sha1 = sha1($_template->source->filepath); - } + if (in_array($_template->resource_type,array('eval','string'))) { + $template_sha1 = sha1($include_file); + } else { + $template_sha1 = sha1($_template->getTemplateFilepath()); + } if (isset($compiler->template->properties['file_dependency'][$template_sha1])) { - $compiler->trigger_template_error("illegal recursive call of \"{$include_file}\"", $compiler->lex->line - 1); + $this->compiler->trigger_template_error("illegal recursive call of \"{$include_file}\"",$compiler->lex->line-1); } - $compiler->template->properties['file_dependency'][$template_sha1] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type); - $_content = substr($compiler->template->source->content, $compiler->lex->counter - 1); + $compiler->template->properties['file_dependency'][$template_sha1] = array($_template->getTemplateFilepath(), $_template->getTemplateTimestamp(),$_template->resource_type); + $_content = substr($compiler->template->template_source,$compiler->lex->counter-1); if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $s) != - preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $c)) { - $compiler->trigger_template_error('unmatched {block} {/block} pairs'); + preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $c)) { + $this->compiler->trigger_template_error('unmatched {block} {/block} pairs'); } - preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}|{$this->_ldl}\*([\S\s]*?)\*{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE); + preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE); $_result_count = count($_result[0]); $_start = 0; - while ($_start+1 < $_result_count) { + while ($_start < $_result_count) { $_end = 0; $_level = 1; - if (substr($_result[0][$_start][0],0,strlen($compiler->smarty->left_delimiter)+1) == $compiler->smarty->left_delimiter.'*') { - $_start++; - continue; - } while ($_level != 0) { $_end++; - if (substr($_result[0][$_start + $_end][0],0,strlen($compiler->smarty->left_delimiter)+1) == $compiler->smarty->left_delimiter.'*') { - continue; - } if (!strpos($_result[0][$_start + $_end][0], '/')) { $_level++; } else { $_level--; } } - $_block_content = str_replace($compiler->smarty->left_delimiter . '$smarty.block.parent' . $compiler->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%', - substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))); + $_block_content = str_replace($this->smarty->left_delimiter . '$smarty.block.parent' . $this->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%', + substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))); Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath); $_start = $_start + $_end + 1; } - if ($_template->source->type == 'extends') { - $_template->block_data = $compiler->template->block_data; - } - $compiler->template->source->content = $_template->source->content; - if ($_template->source->type == 'extends') { - $compiler->template->block_data = $_template->block_data; - foreach ($_template->source->components as $key => $component) { - $compiler->template->properties['file_dependency'][$key] = array($component->filepath, $component->timestamp, $component->type); - } - } - $compiler->template->source->filepath = $_template->source->filepath; + $compiler->template->template_source = $_template->getTemplateSource(); + $compiler->template->template_filepath = $_template->getTemplateFilepath(); $compiler->abort_and_recompile = true; return ''; } } - ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_for.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_for.php index 057f4fb79..2e5d0a11f 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_for.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_for.php @@ -1,151 +1,147 @@ compiler = $compiler; if ($parameter == 0) { - $this->required_attributes = array('start', 'to'); - $this->optional_attributes = array('max', 'step'); + $this->required_attributes = array('start','to'); + $this->optional_attributes = array('max','step'); } else { - $this->required_attributes = array('start', 'ifexp', 'var', 'step'); - $this->optional_attributes = array(); + $this->required_attributes = array('start','ifexp','var','step'); + $this->optional_attributes = array(); } // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); + + $local_vars = array(); $output = "tpl_vars[$_statement[var]] = new Smarty_Variable;"; $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n"; - } + $compiler->local_var[$_statement['var']] = true; + $local_vars[] = $_statement['var']; + } $output .= " if ($_attr[ifexp]){ for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]){\n"; } else { $_statement = $_attr['start']; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;"; + $compiler->local_var[$_statement['var']] = true; + $local_vars[] = $_statement['var']; if (isset($_attr['step'])) { $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = $_attr[step];"; } else { $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;"; - } + } if (isset($_attr['max'])) { $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n"; } else { $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n"; - } + } $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0){\n"; $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++){\n"; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;"; $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;"; - } + } $output .= "?>"; - $this->openTag($compiler, 'for', array('for', $compiler->nocache)); + $this->_open_tag('for', array('for', $this->compiler->nocache, $local_vars)); // maybe nocache because of nocache variables - $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; + $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; // return compiled code return $output; - } - -} + } +} /** * Smarty Internal Plugin Compile Forelse Class - * - * @package Smarty - * @subpackage Compiler */ class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase { - /** * Compiles code for the {forelse} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) { + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); - list($openTag, $nocache) = $this->closeTag($compiler, array('for')); - $this->openTag($compiler, 'forelse', array('forelse', $nocache)); + list($_open_tag, $nocache, $local_vars) = $this->_close_tag(array('for')); + $this->_open_tag('forelse', array('forelse', $nocache, $local_vars)); return ""; - } - -} + } +} /** * Smarty Internal Plugin Compile Forclose Class - * - * @package Smarty - * @subpackage Compiler */ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase { - /** * Compiles code for the {/for} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) { + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); // must endblock be nocache? - if ($compiler->nocache) { - $compiler->tag_nocache = true; - } + if ($this->compiler->nocache) { + $this->compiler->tag_nocache = true; + } - list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse')); + list($_open_tag, $this->compiler->nocache, $local_vars) = $this->_close_tag(array('for', 'forelse')); - if ($openTag == 'forelse') { + foreach ($local_vars as $var) { + unset($compiler->local_var[$var]); + } + if ($_open_tag == 'forelse') return ""; - } else { + else return ""; - } - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_foreach.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_foreach.php index 1354c89d5..6ad1e07ef 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_foreach.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_foreach.php @@ -1,72 +1,54 @@ template; + $this->compiler = $compiler; + $tpl = $compiler->template; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); $from = $_attr['from']; $item = $_attr['item']; - if (!strncmp("\$_smarty_tpl->tpl_vars[$item]", $from, strlen($item) + 24)) { - $compiler->trigger_template_error("item variable {$item} may not be the same variable as at 'from'", $compiler->lex->taglineno); - } + + if (substr_compare("\$_smarty_tpl->getVariable($item)", $from,0, strlen("\$_smarty_tpl->getVariable($item)")) == 0) { + $this->compiler->trigger_template_error("item variable {$item} may not be the same variable as at 'from'", $this->compiler->lex->taglineno); + } if (isset($_attr['key'])) { $key = $_attr['key']; } else { $key = null; - } + } - $this->openTag($compiler, 'foreach', array('foreach', $compiler->nocache, $item, $key)); + $this->_open_tag('foreach', array('foreach', $this->compiler->nocache, $item, $key)); // maybe nocache because of nocache variables - $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; + $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; if (isset($_attr['name'])) { $name = $_attr['name']; @@ -75,157 +57,163 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase { } else { $name = null; $has_name = false; - } - $ItemVarName = '$' . trim($item, '\'"') . '@'; + } + $ItemVarName = '$' . trim($item, '\'"') . '@'; // evaluates which Smarty variables and properties have to be computed if ($has_name) { - $usesSmartyFirst = strpos($tpl->source->content, $SmartyVarName . 'first') !== false; - $usesSmartyLast = strpos($tpl->source->content, $SmartyVarName . 'last') !== false; - $usesSmartyIndex = strpos($tpl->source->content, $SmartyVarName . 'index') !== false; - $usesSmartyIteration = strpos($tpl->source->content, $SmartyVarName . 'iteration') !== false; - $usesSmartyShow = strpos($tpl->source->content, $SmartyVarName . 'show') !== false; - $usesSmartyTotal = strpos($tpl->source->content, $SmartyVarName . 'total') !== false; + $usesSmartyFirst = strpos($tpl->template_source, $SmartyVarName . 'first') !== false; + $usesSmartyLast = strpos($tpl->template_source, $SmartyVarName . 'last') !== false; + $usesSmartyIndex = strpos($tpl->template_source, $SmartyVarName . 'index') !== false; + $usesSmartyIteration = strpos($tpl->template_source, $SmartyVarName . 'iteration') !== false; + $usesSmartyShow = strpos($tpl->template_source, $SmartyVarName . 'show') !== false; + $usesSmartyTotal = strpos($tpl->template_source, $SmartyVarName . 'total') !== false; } else { $usesSmartyFirst = false; $usesSmartyLast = false; $usesSmartyTotal = false; $usesSmartyShow = false; - } - - $usesPropFirst = $usesSmartyFirst || strpos($tpl->source->content, $ItemVarName . 'first') !== false; - $usesPropLast = $usesSmartyLast || strpos($tpl->source->content, $ItemVarName . 'last') !== false; - $usesPropIndex = $usesPropFirst || strpos($tpl->source->content, $ItemVarName . 'index') !== false; - $usesPropIteration = $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'iteration') !== false; - $usesPropShow = strpos($tpl->source->content, $ItemVarName . 'show') !== false; - $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'total') !== false; + } + + $usesPropFirst = $usesSmartyFirst || strpos($tpl->template_source, $ItemVarName . 'first') !== false; + $usesPropLast = $usesSmartyLast || strpos($tpl->template_source, $ItemVarName . 'last') !== false; + $usesPropIndex = $usesPropFirst || strpos($tpl->template_source, $ItemVarName . 'index') !== false; + $usesPropIteration = $usesPropLast || strpos($tpl->template_source, $ItemVarName . 'iteration') !== false; + $usesPropShow = strpos($tpl->template_source, $ItemVarName . 'show') !== false; + $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($tpl->template_source, $ItemVarName . 'total') !== false; // generate output code $output = "tpl_vars[$item] = new Smarty_Variable; \$_smarty_tpl->tpl_vars[$item]->_loop = false;\n"; + $output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable;\n"; + $compiler->local_var[$item] = true; if ($key != null) { $output .= " \$_smarty_tpl->tpl_vars[$key] = new Smarty_Variable;\n"; - } + $compiler->local_var[$key] = true; + } $output .= " \$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array');}\n"; if ($usesPropTotal) { $output .= " \$_smarty_tpl->tpl_vars[$item]->total= \$_smarty_tpl->_count(\$_from);\n"; - } + } if ($usesPropIteration) { $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration=0;\n"; - } + } if ($usesPropIndex) { $output .= " \$_smarty_tpl->tpl_vars[$item]->index=-1;\n"; - } + } if ($usesPropShow) { $output .= " \$_smarty_tpl->tpl_vars[$item]->show = (\$_smarty_tpl->tpl_vars[$item]->total > 0);\n"; - } + } if ($has_name) { if ($usesSmartyTotal) { $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['total'] = \$_smarty_tpl->tpl_vars[$item]->total;\n"; - } + } if ($usesSmartyIteration) { $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']=0;\n"; - } + } if ($usesSmartyIndex) { $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']=-1;\n"; - } + } if ($usesSmartyShow) { $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n"; - } - } - $output .= "foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value){\n\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n"; + } + } + if ($usesPropTotal) { + $output .= "if (\$_smarty_tpl->tpl_vars[$item]->total > 0){\n"; + } else { + $output .= "if (\$_smarty_tpl->_count(\$_from) > 0){\n"; + } + $output .= " foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value){\n"; if ($key != null) { $output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n"; - } + } if ($usesPropIteration) { $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration++;\n"; - } + } if ($usesPropIndex) { $output .= " \$_smarty_tpl->tpl_vars[$item]->index++;\n"; - } + } if ($usesPropFirst) { $output .= " \$_smarty_tpl->tpl_vars[$item]->first = \$_smarty_tpl->tpl_vars[$item]->index === 0;\n"; - } + } if ($usesPropLast) { $output .= " \$_smarty_tpl->tpl_vars[$item]->last = \$_smarty_tpl->tpl_vars[$item]->iteration === \$_smarty_tpl->tpl_vars[$item]->total;\n"; - } + } if ($has_name) { if ($usesSmartyFirst) { $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['first'] = \$_smarty_tpl->tpl_vars[$item]->first;\n"; - } + } if ($usesSmartyIteration) { $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']++;\n"; - } + } if ($usesSmartyIndex) { $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']++;\n"; - } + } if ($usesSmartyLast) { $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['last'] = \$_smarty_tpl->tpl_vars[$item]->last;\n"; - } - } + } + } $output .= "?>"; return $output; - } -} + } +} /** * Smarty Internal Plugin Compile Foreachelse Class - * - * @package Smarty - * @subpackage Compiler */ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase { - /** * Compiles code for the {foreachelse} tag - * - * @param array $args array with attributes from parser + * + * @param array $args array with attributes from parser * @param object $compiler compiler object - * @param array $parameter array with compilation parameter + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) { + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); - list($openTag, $nocache, $item, $key) = $this->closeTag($compiler, array('foreach')); - $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $item, $key)); + list($_open_tag, $nocache, $item, $key) = $this->_close_tag(array('foreach')); + $this->_open_tag('foreachelse', array('foreachelse', $nocache, $item, $key)); - return "tpl_vars[$item]->_loop) {\n?>"; - } - -} + return ""; + } +} /** * Smarty Internal Plugin Compile Foreachclose Class - * - * @package Smarty - * @subpackage Compiler */ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase { - /** * Compiles code for the {/foreach} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) { + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); // must endblock be nocache? - if ($compiler->nocache) { - $compiler->tag_nocache = true; - } - - list($openTag, $compiler->nocache, $item, $key) = $this->closeTag($compiler, array('foreach', 'foreachelse')); + if ($this->compiler->nocache) { + $this->compiler->tag_nocache = true; + } - return ""; - } - -} + list($_open_tag, $this->compiler->nocache, $item, $key) = $this->_close_tag(array('foreach', 'foreachelse')); + unset($compiler->local_var[$item]); + if ($key != null) { + unset($compiler->local_var[$key]); + } + + if ($_open_tag == 'foreachelse') + return ""; + else + return ""; + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_function.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_function.php index 876b13dee..db2409a30 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_function.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_function.php @@ -1,74 +1,52 @@ compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); if ($_attr['nocache'] === true) { - $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); + $this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno); } - unset($_attr['nocache']); + unset($_attr['nocache']); $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->has_nocache_code, $compiler->template->required_plugins); - $this->openTag($compiler, 'function', $save); + $this->_open_tag('function', $save); $_name = trim($_attr['name'], "'\""); unset($_attr['name']); - // set flag that we are compiling a template function - $compiler->compiles_template_function = true; $compiler->template->properties['function'][$_name]['parameter'] = array(); - $_smarty_tpl = $compiler->template; + $_smarty_tpl = $compiler->template; foreach ($_attr as $_key => $_data) { - eval ('$tmp='.$_data.';'); + eval ('$tmp='.$_data.';'); $compiler->template->properties['function'][$_name]['parameter'][$_key] = $tmp; - } + } $compiler->smarty->template_functions[$_name]['parameter'] = $compiler->template->properties['function'][$_name]['parameter']; if ($compiler->template->caching) { $output = ''; @@ -76,9 +54,9 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase { $output = "tpl_vars; - foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}; + foreach (\$_smarty_tpl->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}; foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>"; - } + } // Init temporay context $compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array()); $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser); @@ -87,21 +65,16 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase { $compiler->has_code = false; $compiler->template->properties['function'][$_name]['compiled'] = ''; return true; - } - -} + } +} /** * Smarty Internal Plugin Compile Functionclose Class - * - * @package Smarty - * @subpackage Compiler */ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase { - /** * Compiles code for the {/function} tag - * + * * @param array $args array with attributes from parser * @param object $compiler compiler object * @param array $parameter array with compilation parameter @@ -109,9 +82,10 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase */ public function compile($args, $compiler, $parameter) { - $_attr = $this->getAttributes($compiler, $args); - $saved_data = $this->closeTag($compiler, array('function')); - $_name = trim($saved_data[0]['name'], "'\""); + $this->compiler = $compiler; + $_attr = $this->_get_attributes($args); + $saved_data = $this->_close_tag(array('function')); + $_name = trim($saved_data[0]['name'], "'\""); // build plugin include code $plugins_string = ''; if (!empty($compiler->template->required_plugins['compiled'])) { @@ -119,47 +93,42 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase foreach($compiler->template->required_plugins['compiled'] as $tmp) { foreach($tmp as $data) { $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n"; - } - } + } + } $plugins_string .= '?>'; - } + } if (!empty($compiler->template->required_plugins['nocache'])) { $plugins_string .= "template->properties['nocache_hash']}%%*/template->required_plugins['nocache'] as $tmp) { foreach($tmp as $data) { $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n"; - } - } + } + } $plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n"; - } - // remove last line break from function definition - $last = count($compiler->parser->current_buffer->subtrees) - 1; - if ($compiler->parser->current_buffer->subtrees[$last] instanceof _smarty_linebreak) { - unset($compiler->parser->current_buffer->subtrees[$last]); - } + } + // remove last line break from function definition + $last = count($compiler->parser->current_buffer->subtrees) - 1; + if ($compiler->parser->current_buffer->subtrees[$last] instanceof _smarty_linebreak) { + unset($compiler->parser->current_buffer->subtrees[$last]); + } // if caching save template function for possible nocache call if ($compiler->template->caching) { $compiler->template->properties['function'][$_name]['compiled'] .= $plugins_string . $compiler->parser->current_buffer->to_smarty_php(); $compiler->template->properties['function'][$_name]['nocache_hash'] = $compiler->template->properties['nocache_hash']; $compiler->template->properties['function'][$_name]['has_nocache_code'] = $compiler->template->has_nocache_code; - $compiler->template->properties['function'][$_name]['called_functions'] = $compiler->called_functions; - $compiler->called_functions = array(); $compiler->smarty->template_functions[$_name] = $compiler->template->properties['function'][$_name]; $compiler->has_code = false; $output = true; } else { $output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "tpl_vars = \$saved_tpl_vars;}}?>\n"; - } - // reset flag that we are compiling a template function - $compiler->compiles_template_function = false; + } // restore old compiler status $compiler->parser->current_buffer = $saved_data[1]; $compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2]; $compiler->template->required_plugins = $saved_data[3]; return $output; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_if.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_if.php index 98e8ac91d..41e6597e4 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_if.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_if.php @@ -1,198 +1,179 @@ compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - $this->openTag($compiler, 'if', array(1, $compiler->nocache)); + $_attr = $this->_get_attributes($args); + $this->_open_tag('if',array(1,$this->compiler->nocache)); // must whole block be nocache ? - $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; + $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; if (is_array($parameter['if condition'])) { - if ($compiler->nocache) { - $_nocache = ',true'; - // create nocache var to make it know for further compiling - if (is_array($parameter['if condition']['var'])) { - $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true); - } else { - $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true); - } - } else { - $_nocache = ''; - } + if ($this->compiler->nocache) { + $_nocache = ',true'; + // create nocache var to make it know for further compiling + if (is_array($parameter['if condition']['var'])) { + $this->compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true); + } else { + $this->compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true); + } + } else { + $_nocache = ''; + } if (is_array($parameter['if condition']['var'])) { - $_output = "tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n"; - $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>"; + $_output = "tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n"; + $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>"; } else { - $_output = "tpl_vars[".$parameter['if condition']['var']."])) \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(null{$_nocache});"; - $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>"; - } + $_output = "tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});"; + $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>"; + } return $_output; } else { return ""; - } - } - -} + } + } +} /** * Smarty Internal Plugin Compile Else Class - * - * @package Smarty - * @subpackage Compiler */ class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase { - /** * Compiles code for the {else} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) { - list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif')); - $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache)); + $this->compiler = $compiler; + list($nesting, $compiler->tag_nocache) = $this->_close_tag(array('if', 'elseif')); + $this->_open_tag('else',array($nesting,$compiler->tag_nocache)); return ""; - } - -} + } +} /** * Smarty Internal Plugin Compile ElseIf Class - * - * @package Smarty - * @subpackage Compiler */ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase { - /** * Compiles code for the {elseif} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compile($args, $compiler, $parameter) { + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - - list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif')); - - if (is_array($parameter['if condition'])) { - $condition_by_assign = true; - if ($compiler->nocache) { - $_nocache = ',true'; - // create nocache var to make it know for further compiling - if (is_array($parameter['if condition']['var'])) { - $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true); - } else { - $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true); - } - } else { - $_nocache = ''; - } - } else { - $condition_by_assign = false; - } - - if (empty($compiler->prefix_code)) { - if ($condition_by_assign) { - $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache)); - if (is_array($parameter['if condition']['var'])) { - $_output = "tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; - $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>"; - } else { - $_output = "tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});"; - $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>"; - } - return $_output; - } else { - $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache)); - return ""; - } + $_attr = $this->_get_attributes($args); + + list($nesting, $compiler->tag_nocache) = $this->_close_tag(array('if', 'elseif')); + + if (is_array($parameter['if condition'])) { + $condition_by_assign = true; + if ($this->compiler->nocache) { + $_nocache = ',true'; + // create nocache var to make it know for further compiling + if (is_array($parameter['if condition']['var'])) { + $this->compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true); + } else { + $this->compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true); + } + } else { + $_nocache = ''; + } + } else { + $condition_by_assign = false; + } + + if (empty($this->compiler->prefix_code)) { + if ($condition_by_assign) { + $this->_open_tag('elseif', array($nesting + 1, $compiler->tag_nocache)); + if (is_array($parameter['if condition']['var'])) { + $_output = "tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n"; + $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>"; + } else { + $_output = "tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});"; + $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>"; + } + return $_output; + } else { + $this->_open_tag('elseif', array($nesting, $compiler->tag_nocache)); + return ""; + } } else { $tmp = ''; - foreach ($compiler->prefix_code as $code) - $tmp .= $code; - $compiler->prefix_code = array(); - $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache)); - if ($condition_by_assign) { - if (is_array($parameter['if condition']['var'])) { - $_output = "{$tmp}tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; - $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>"; - } else { - $_output = "{$tmp}tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});"; - $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>"; - } - return $_output; - } else { - return "{$tmp}"; - } - } - } - -} + foreach ($this->compiler->prefix_code as $code) $tmp .= $code; + $this->compiler->prefix_code = array(); + $this->_open_tag('elseif', array($nesting + 1, $compiler->tag_nocache)); + if ($condition_by_assign) { + if (is_array($parameter['if condition']['var'])) { + $_output = "{$tmp}tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n"; + $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>"; + } else { + $_output = "{$tmp}tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});"; + $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>"; + } + return $_output; + } else { + return "{$tmp}"; + } + } + } +} /** - * Smarty Internal Plugin Compile Ifclose Class - * - * @package Smarty - * @subpackage Compiler - */ +* Smarty Internal Plugin Compile Ifclose Class +*/ class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase { - /** - * Compiles code for the {/if} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @param array $parameter array with compilation parameter - * @return string compiled code - */ + * Compiles code for the {/if} tag + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @param array $parameter array with compilation parameter + * @return string compiled code + */ public function compile($args, $compiler, $parameter) { - // must endblock be nocache? - if ($compiler->nocache) { - $compiler->tag_nocache = true; - } - list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif')); + $this->compiler = $compiler; + // must endblock be nocache? + if ($this->compiler->nocache) { + $this->compiler->tag_nocache = true; + } + list($nesting, $this->compiler->nocache) = $this->_close_tag(array('if', 'else', 'elseif')); $tmp = ''; - for ($i = 0; $i < $nesting; $i++) { - $tmp .= '}'; - } + for ($i = 0; $i < $nesting ; $i++) $tmp .= '}'; return ""; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_include.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_include.php index d45db3614..a85be6d5b 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_include.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_include.php @@ -1,69 +1,42 @@ compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); // save posible attributes $include_file = $_attr['file']; + $has_compiled_template = false; if (isset($_attr['assign'])) { // output will be stored in a smarty variable instead of beind displayed @@ -82,11 +55,11 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase { } } $_caching = 'null'; - if ($compiler->nocache || $compiler->tag_nocache) { + if ($this->compiler->nocache || $this->compiler->tag_nocache) { $_caching = Smarty::CACHING_OFF; } // default for included templates - if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) { + if ($compiler->template->caching && !$this->compiler->nocache && !$this->compiler->tag_nocache) { $_caching = self::CACHING_NOCACHE_CODE; } /* @@ -96,14 +69,14 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase { */ if (isset($_attr['cache_lifetime'])) { $_cache_lifetime = $_attr['cache_lifetime']; - $compiler->tag_nocache = true; + $this->compiler->tag_nocache = true; $_caching = Smarty::CACHING_LIFETIME_CURRENT; } else { $_cache_lifetime = 'null'; } if (isset($_attr['cache_id'])) { $_cache_id = $_attr['cache_id']; - $compiler->tag_nocache = true; + $this->compiler->tag_nocache = true; $_caching = Smarty::CACHING_LIFETIME_CURRENT; } else { $_cache_id = '$_smarty_tpl->cache_id'; @@ -117,99 +90,100 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase { $_caching = Smarty::CACHING_LIFETIME_CURRENT; } if ($_attr['nocache'] === true) { - $compiler->tag_nocache = true; + $this->compiler->tag_nocache = true; $_caching = Smarty::CACHING_OFF; } - $has_compiled_template = false; - if (($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) && !$compiler->template->source->recompiled - && !($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache)) && $_caching != Smarty::CACHING_LIFETIME_CURRENT) { + + if (($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) && !($compiler->template->caching && ($this->compiler->tag_nocache || $this->compiler->nocache)) && $_caching != Smarty::CACHING_LIFETIME_CURRENT) { // check if compiled code can be merged (contains no variable part) - if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2) - and substr_count($include_file, '(') == 0 and substr_count($include_file, '$_smarty_tpl->') == 0) { - $tpl_name = null; - eval("\$tpl_name = $include_file;"); - if (!isset($compiler->smarty->merged_templates_func[$tpl_name]) || $compiler->inheritance) { - $tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id); - // save unique function name - $compiler->smarty->merged_templates_func[$tpl_name]['func'] = $tpl->properties['unifunc'] = 'content_'.uniqid(); - // use current nocache hash for inlined code - $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash']; - if ($compiler->template->caching) { + if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2) and substr_count($include_file, '(') == 0) { + $tmp = null; + eval("\$tmp = $include_file;"); + if ($this->compiler->template->template_resource != $tmp) { + $tpl = new $compiler->smarty->template_class ($tmp, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id); + // suppress writing of compiled file + $tpl->write_compiled_code = false; + if ($this->compiler->template->caching) { // needs code for cached page but no cache file $tpl->caching = self::CACHING_NOCACHE_CODE; } - // make sure whole chain gest compiled - $tpl->mustCompile = true; - if (!($tpl->source->uncompiled) && $tpl->source->exists) { +// if ($this->compiler->template->mustCompile) { + // make sure whole chain gest compiled + $tpl->mustCompile = true; +// } + if ($tpl->resource_object->usesCompiler && $tpl->isExisting()) { // get compiled code - $compiled_code = $tpl->compiler->compileTemplate($tpl); - // release compiler object to free memory - unset($tpl->compiler); + $compiled_tpl = $tpl->getCompiledTemplate(); // merge compiled code for {function} tags $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']); - // merge filedependency - $tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp,$tpl->source->type); - $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']); + // merge filedependency by evaluating header code + preg_match_all("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", $compiled_tpl, $result); + $saved_has_nocache_code = $compiler->template->has_nocache_code; + $saved_nocache_hash = $compiler->template->properties['nocache_hash']; + $_smarty_tpl = $compiler->template; + eval($result[2][0]); + $compiler->template->properties['nocache_hash'] = $saved_nocache_hash; + $compiler->template->has_nocache_code = $saved_has_nocache_code; // remove header code - $compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code); + $compiled_tpl = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_tpl); if ($tpl->has_nocache_code) { // replace nocache_hash - $compiled_code = preg_replace("/{$tpl->properties['nocache_hash']}/", $compiler->template->properties['nocache_hash'], $compiled_code); + $compiled_tpl = preg_replace("/{$tpl->properties['nocache_hash']}/", $compiler->template->properties['nocache_hash'], $compiled_tpl); $compiler->template->has_nocache_code = true; } - $compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code; $has_compiled_template = true; } - } else { - $has_compiled_template = true; } } } + + // create template object + $_output = "smarty->template_objects[\$sha])) {\n"; + $_output .= "\$_template = \$_smarty_tpl->smarty->template_objects[\$sha]; \$_template->parent = \$_smarty_tpl; \$_template->caching = $_caching; \$_template->cache_lifetime = $_cache_lifetime;\n"; + $_output .= "} else {\n"; + } + $_output .= "\$_template = new {$compiler->smarty->template_class}($include_file, \$_smarty_tpl->smarty, \$_smarty_tpl, $_cache_id, $_compile_id, $_caching, $_cache_lifetime);\n"; + if ($_caching != 'null' && $_caching != Smarty::CACHING_OFF) { + $_output .= "}\n"; + } // delete {include} standard attributes unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']); // remaining attributes must be assigned as smarty variable if (!empty($_attr)) { if ($_parent_scope == Smarty::SCOPE_LOCAL) { // create variables - foreach ($_attr as $key => $value) { - $_pairs[] = "'$key'=>$value"; + foreach ($_attr as $_key => $_value) { + $_output .= "\$_template->assign('$_key',$_value);"; } - $_vars = 'array('.join(',',$_pairs).')'; - $_has_vars = true; } else { - $compiler->trigger_template_error('variable passing not allowed in parent/global scope', $compiler->lex->taglineno); - } - } else { - $_vars = 'array()'; - $_has_vars = false; - } - if ($has_compiled_template) { - $_hash = $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash']; - $_output = "setupInlineSubTemplate($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope, '$_hash');\n"; - if (isset($_assign)) { - $_output .= 'ob_start(); '; + $this->compiler->trigger_template_error('variable passing not allowed in parent/global scope', $this->compiler->lex->taglineno); } - $_output .= $compiler->smarty->merged_templates_func[$tpl_name]['func']. "(\$_smarty_tpl);\n"; - $_output .= "\$_smarty_tpl = array_pop(\$_tpl_stack); "; - if (isset($_assign)) { - $_output .= " \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(ob_get_clean());"; - } - $_output .= "/* End of included template \"" . $tpl_name . "\" */?>"; - return $_output; } - // was there an assign attribute if (isset($_assign)) { - $_output = "tpl_vars[$_assign] = new Smarty_variable(\$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope));?>\n";; + $_output .= "\$_smarty_tpl->assign($_assign,\$_template->getRenderedTemplate());?>"; } else { - $_output = "getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n"; + if ($has_compiled_template) { + $_output .= "\$_template->properties['nocache_hash'] = '{$compiler->template->properties['nocache_hash']}';\n"; + $_output .= "\$_tpl_stack[] = \$_smarty_tpl; \$_smarty_tpl = \$_template;?>\n"; + $_output .= $compiled_tpl; + $_output .= "updateParentVariables($_parent_scope);?>\n"; + $_output .= "getTemplateFilepath() . "\" */ ?>\n"; + $_output .= ""; + } else { + $_output .= " echo \$_template->getRenderedTemplate(); \$_template->rendered_content = null;?>"; + if ($_parent_scope != Smarty::SCOPE_LOCAL) { + $_output .= "updateParentVariables($_parent_scope);?>"; + } + } } + $_output .= ""; return $_output; } - } ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_include_php.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_include_php.php index d52712368..19ee186bc 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_include_php.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_include_php.php @@ -1,108 +1,90 @@ smarty instanceof SmartyBC)) { - throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable"); - } + if (!$compiler->smarty->allow_php_tag) { + throw new SmartyException("{include_php} is deprecated, set allow_php_tag = true to enable"); + } + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); - $_output = 'template; + $_smarty_tpl = $compiler->template; $_filepath = false; - eval('$_file = ' . $_attr['file'] . ';'); - if (!isset($compiler->smarty->security_policy) && file_exists($_file)) { - $_filepath = $_file; + eval('$_file = ' . $_attr['file'] . ';'); + if (!isset($this->compiler->smarty->security_policy) && file_exists($_file)) { + $_filepath = $_file; } else { - if (isset($compiler->smarty->security_policy)) { - $_dir = $compiler->smarty->security_policy->trusted_dir; + if (isset($this->compiler->smarty->security_policy)) { + $_dir = $this->compiler->smarty->security_policy->trusted_dir; } else { - $_dir = $compiler->smarty->trusted_dir; - } + $_dir = $this->compiler->smarty->trusted_dir; + } if (!empty($_dir)) { foreach((array)$_dir as $_script_dir) { - $_script_dir = rtrim($_script_dir, '/\\') . DS; + if (strpos('/\\', substr($_script_dir, -1)) === false) { + $_script_dir .= DS; + } if (file_exists($_script_dir . $_file)) { $_filepath = $_script_dir . $_file; break; - } - } - } - } + } + } + } + } if ($_filepath == false) { - $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $compiler->lex->taglineno); - } + $this->compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $this->compiler->lex->taglineno); + } - if (isset($compiler->smarty->security_policy)) { - $compiler->smarty->security_policy->isTrustedPHPDir($_filepath); - } + if (isset($this->compiler->smarty->security_policy)) { + $this->compiler->smarty->security_policy->isTrustedPHPDir($_filepath); + } if (isset($_attr['assign'])) { // output will be stored in a smarty variable instead of being displayed $_assign = $_attr['assign']; - } + } $_once = '_once'; if (isset($_attr['once'])) { if ($_attr['once'] == 'false') { $_once = ''; - } - } + } + } if (isset($_assign)) { return "assign({$_assign},ob_get_contents()); ob_end_clean();?>"; } else { return "\n"; - } - } - -} + } + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_insert.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_insert.php index e4d3f9355..898e5315a 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_insert.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_insert.php @@ -2,141 +2,122 @@ /** * Smarty Internal Plugin Compile Insert - * + * * Compiles the {insert} tag - * + * * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Insert Class - * - * @package Smarty - * @subpackage Compiler */ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase { - - /** - * Attribute definition: Overwrites base class. - * - * @var array - * @see Smarty_Internal_CompileBase - */ + // attribute definitions 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 $optional_attributes = array('_any'); + public $shorttag_order = array('name'); + public $optional_attributes = array('_any'); /** * Compiles code for the {insert} tag - * - * @param array $args array with attributes from parser + * + * @param array $args array with attributes from parser * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) { + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); // never compile as nocache code - $compiler->suppressNocacheProcessing = true; - $compiler->tag_nocache = true; + $this->compiler->suppressNocacheProcessing = true; + $this->compiler->tag_nocache = true; $_smarty_tpl = $compiler->template; $_name = null; $_script = null; - $_output = 'template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true); - } + $this->compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true); + } if (isset($_attr['script'])) { // script which must be included $_function = "smarty_insert_{$_name}"; $_smarty_tpl = $compiler->template; $_filepath = false; eval('$_script = ' . $_attr['script'] . ';'); - if (!isset($compiler->smarty->security_policy) && file_exists($_script)) { + if (!isset($this->compiler->smarty->security_policy) && file_exists($_script)) { $_filepath = $_script; } else { - if (isset($compiler->smarty->security_policy)) { - $_dir = $compiler->smarty->security_policy->trusted_dir; + if (isset($this->compiler->smarty->security_policy)) { + $_dir = $this->compiler->smarty->security_policy->trusted_dir; } else { - $_dir = $compiler->smarty->trusted_dir; - } + $_dir = $this->compiler->smarty->trusted_dir; + } if (!empty($_dir)) { foreach((array)$_dir as $_script_dir) { - $_script_dir = rtrim($_script_dir, '/\\') . DS; + if (strpos('/\\', substr($_script_dir, -1)) === false) { + $_script_dir .= DS; + } if (file_exists($_script_dir . $_script)) { $_filepath = $_script_dir . $_script; break; - } - } - } - } + } + } + } + } if ($_filepath == false) { - $compiler->trigger_template_error("{insert} missing script file '{$_script}'", $compiler->lex->taglineno); - } + $this->compiler->trigger_template_error("{insert} missing script file '{$_script}'", $this->compiler->lex->taglineno); + } // code for script file loading $_output .= "require_once '{$_filepath}' ;"; require_once $_filepath; if (!is_callable($_function)) { - $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", $compiler->lex->taglineno); - } + $this->compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", $this->compiler->lex->taglineno); + } } else { $_filepath = 'null'; - $_function = "insert_{$_name}"; + $_function = "insert_{$_name}"; // function in PHP script ? if (!is_callable($_function)) { // try plugin - if (!$_function = $compiler->getPlugin($_name, 'insert')) { - $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", $compiler->lex->taglineno); - } - } - } + if (!$_function = $this->compiler->getPlugin($_name, 'insert')) { + $this->compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", $this->compiler->lex->taglineno); + } + } + } // delete {insert} standard attributes - unset($_attr['name'], $_attr['assign'], $_attr['script'], $_attr['nocache']); + unset($_attr['name'], $_attr['assign'], $_attr['script'], $_attr['nocache']); // convert attributes into parameter array string $_paramsArray = array(); foreach ($_attr as $_key => $_value) { $_paramsArray[] = "'$_key' => $_value"; - } - $_params = 'array(' . implode(", ", $_paramsArray) . ')'; + } + $_params = 'array(' . implode(", ", $_paramsArray) . ')'; // call insert if (isset($_assign)) { if ($_smarty_tpl->caching) { $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>"; } else { $_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>"; - } + } } else { - $compiler->has_output = true; + $this->compiler->has_output = true; if ($_smarty_tpl->caching) { $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>"; } else { $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>"; - } - } + } + } return $_output; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_ldelim.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_ldelim.php index 990632590..bdf86de4c 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_ldelim.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_ldelim.php @@ -1,9 +1,9 @@ getAttributes($compiler, $args); + $this->compiler = $compiler; + $_attr = $this->_get_attributes($args); if ($_attr['nocache'] === true) { - $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); + $this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno); } // this tag does not return compiled code - $compiler->has_code = true; - return $compiler->smarty->left_delimiter; - } - + $this->compiler->has_code = true; + return $this->compiler->smarty->left_delimiter; + } } ?> diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_nocache.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_nocache.php index 5fb71b71d..0c88b14bd 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_nocache.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_nocache.php @@ -1,73 +1,63 @@ getAttributes($compiler, $args); + $this->compiler = $compiler; + $_attr = $this->_get_attributes($args); if ($_attr['nocache'] === true) { - $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); + $this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno); } // enter nocache mode - $compiler->nocache = true; + $this->compiler->nocache = true; // this tag does not return compiled code - $compiler->has_code = false; + $this->compiler->has_code = false; return true; - } - -} + } +} /** * Smarty Internal Plugin Compile Nocacheclose Class - * - * @package Smarty - * @subpackage Compiler - */ + */ class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase { - /** * Compiles code for the {/nocache} tag * - * This tag does not generate compiled output. It only sets a compiler flag. - * - * @param array $args array with attributes from parser + * This tag does not generate compiled output. It only sets a compiler flag + * @param array $args array with attributes from parser * @param object $compiler compiler object - * @return bool + * @return string compiled code */ public function compile($args, $compiler) { - $_attr = $this->getAttributes($compiler, $args); + $this->compiler = $compiler; + $_attr = $this->_get_attributes($args); // leave nocache mode - $compiler->nocache = false; + $this->compiler->nocache = false; // this tag does not return compiled code - $compiler->has_code = false; + $this->compiler->has_code = false; return true; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php index 5288f4560..f61ff4909 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php @@ -1,50 +1,42 @@ compiler = $compiler; + if (strlen($tag) < 6 || substr($tag, -5) != 'close') { // opening tag of block plugin - // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - if ($_attr['nocache'] === true) { - $compiler->tag_nocache = true; - } - unset($_attr['nocache']); + // check and get attributes + $_attr = $this->_get_attributes($args); + if ($_attr['nocache'] === true) { + $this->compiler->tag_nocache = true; + } + unset($_attr['nocache']); // convert attributes into parameter array string $_paramsArray = array(); foreach ($_attr as $_key => $_value) { @@ -52,36 +44,35 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi $_paramsArray[] = "$_key=>$_value"; } else { $_paramsArray[] = "'$_key'=>$_value"; - } - } + } + } $_params = 'array(' . implode(",", $_paramsArray) . ')'; - $this->openTag($compiler, $tag, array($_params, $compiler->nocache)); + $this->_open_tag($tag, array($_params, $this->compiler->nocache)); // maybe nocache because of nocache variables or nocache plugin - $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; + $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; // compile code - $output = "smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; + $output = "smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; } else { // must endblock be nocache? - if ($compiler->nocache) { - $compiler->tag_nocache = true; - } + if ($this->compiler->nocache) { + $this->compiler->tag_nocache = true; + } // closing tag of block plugin, restore nocache - list($_params, $compiler->nocache) = $this->closeTag($compiler, substr($tag, 0, -5)); + list($_params, $this->compiler->nocache) = $this->_close_tag(substr($tag, 0, -5)); // This tag does create output - $compiler->has_output = true; + $this->compiler->has_output = true; // compile code if (!isset($parameter['modifier_list'])) { - $mod_pre = $mod_post =''; + $mod_pre = $mod_post =''; } else { - $mod_pre = ' ob_start(); '; - $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';'; + $mod_pre = ' ob_start(); '; + $mod_post = 'echo '.$this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';'; } $output = "smarty->_tag_stack);?>"; - } + } return $output . "\n"; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php index 70e764318..965d696ef 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php @@ -1,40 +1,25 @@ compiler = $compiler; // This tag does create output - $compiler->has_output = true; + $this->compiler->has_output = true; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); if ($_attr['nocache'] === true) { - $compiler->tag_nocache = true; + $this->compiler->tag_nocache = true; } unset($_attr['nocache']); // convert attributes into parameter array string @@ -60,14 +46,13 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co $_paramsArray[] = "$_key=>$_value"; } else { $_paramsArray[] = "'$_key'=>$_value"; - } - } - $_params = 'array(' . implode(",", $_paramsArray) . ')'; + } + } + $_params = 'array(' . implode(",", $_paramsArray) . ')'; // compile code $output = "\n"; return $output; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_modifier.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_modifier.php index ca4d90774..1648db2ed 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_modifier.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_modifier.php @@ -1,41 +1,38 @@ compiler = $compiler; + $this->smarty = $this->compiler->smarty; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - $output = $parameter['value']; + $_attr = $this->_get_attributes($args); + $output = $parameter['value']; // loop over list of modifiers foreach ($parameter['modifierlist'] as $single_modifier) { $modifier = $single_modifier[0]; - $single_modifier[0] = $output; - $params = implode(',', $single_modifier); + $single_modifier[0] = $output; + $params = implode(',', $single_modifier); // check for registered modifier if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier])) { $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0]; @@ -46,36 +43,27 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')'; } else { $output = $function[0] . '::' . $function[1] . '(' . $params . ')'; - } - } - } else if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0])) { - $output = call_user_func($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0], $single_modifier, $compiler->smarty); + } + } // check for plugin modifiercompiler } else if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) { - // check if modifier allowed - if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) { - $plugin = 'smarty_modifiercompiler_' . $modifier; - $output = $plugin($single_modifier, $compiler); - } + $plugin = 'smarty_modifiercompiler_' . $modifier; + $output = $plugin($single_modifier, $compiler); // check for plugin modifier - } else if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) { - // check if modifier allowed - if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) { - $output = "{$function}({$params})"; - } + } else if ($function = $this->compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) { + $output = "{$function}({$params})"; // check if trusted PHP function } else if (is_callable($modifier)) { // check if modifier allowed - if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)) { + if (!is_object($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedModifier($modifier, $this->compiler)) { $output = "{$modifier}({$params})"; - } + } } else { - $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", $compiler->lex->taglineno); - } - } + $this->compiler->trigger_template_error ("unknown modifier \"" . $modifier . "\"", $this->compiler->lex->taglineno); + } + } return $output; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php index cca924d10..97737e8d2 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php @@ -1,50 +1,43 @@ compiler = $compiler; + if (strlen($tag) < 5 || substr($tag, -5) != 'close') { // opening tag of block plugin - // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - if ($_attr['nocache'] === true) { - $compiler->tag_nocache = true; - } - unset($_attr['nocache']); + // check and get attributes + $_attr = $this->_get_attributes($args); + if ($_attr['nocache'] === true) { + $this->compiler->tag_nocache = true; + } + unset($_attr['nocache']); // convert attributes into parameter array string $_paramsArray = array(); foreach ($_attr as $_key => $_value) { @@ -52,37 +45,36 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter $_paramsArray[] = "$_key=>$_value"; } else { $_paramsArray[] = "'$_key'=>$_value"; - } - } + } + } $_params = 'array(' . implode(",", $_paramsArray) . ')'; - $this->openTag($compiler, $tag . '->' . $method, array($_params, $compiler->nocache)); + $this->_open_tag($tag . '->' . $methode, array($_params, $this->compiler->nocache)); // maybe nocache because of nocache variables or nocache plugin - $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; + $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; // compile code - $output = "smarty->_tag_stack[] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; + $output = "smarty->_tag_stack[] = array('{$tag}->{$methode}', {$_params}); \$_block_repeat=true; \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; } else { - $base_tag = substr($tag, 0, -5); + $base_tag = substr($tag, 0, -5); // must endblock be nocache? - if ($compiler->nocache) { - $compiler->tag_nocache = true; - } + if ($this->compiler->nocache) { + $this->compiler->tag_nocache = true; + } // closing tag of block plugin, restore nocache - list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag . '->' . $method); + list($_params, $this->compiler->nocache) = $this->_close_tag($base_tag . '->' . $methode); // This tag does create output - $compiler->has_output = true; + $this->compiler->has_output = true; // compile code if (!isset($parameter['modifier_list'])) { - $mod_pre = $mod_post = ''; + $mod_pre = $mod_post =''; } else { - $mod_pre = ' ob_start(); '; - $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';'; + $mod_pre = ' ob_start(); '; + $mod_post = 'echo '.$this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';'; } - $output = "smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . " } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; - } - return $output . "\n"; - } - -} + $output = "smarty->registered_objects['{$base_tag}'][0]->{$methode}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; + } + return $output."\n"; + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_function.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_function.php index f649084c3..f0755f062 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_function.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_function.php @@ -1,79 +1,71 @@ compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); if ($_attr['nocache'] === true) { - $compiler->tag_nocache = true; + $this->compiler->tag_nocache = true; } unset($_attr['nocache']); $_assign = null; if (isset($_attr['assign'])) { $_assign = $_attr['assign']; unset($_attr['assign']); - } + } // convert attributes into parameter array string - if ($compiler->smarty->registered_objects[$tag][2]) { + if ($this->compiler->smarty->registered_objects[$tag][2]) { $_paramsArray = array(); foreach ($_attr as $_key => $_value) { if (is_int($_key)) { $_paramsArray[] = "$_key=>$_value"; } else { $_paramsArray[] = "'$_key'=>$_value"; - } - } + } + } $_params = 'array(' . implode(",", $_paramsArray) . ')'; - $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)"; + $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params},\$_smarty_tpl)"; } else { $_params = implode(",", $_attr); - $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})"; - } + $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params})"; + } if (empty($_assign)) { // This tag does create output - $compiler->has_output = true; + $this->compiler->has_output = true; $output = "\n"; } else { $output = "assign({$_assign},{$return});?>\n"; - } - return $output; } - + return $output; + } } ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_print_expression.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_print_expression.php index 1e9a502f0..5a9c93191 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_print_expression.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_print_expression.php @@ -1,156 +1,77 @@ compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); // nocache option if ($_attr['nocache'] === true) { - $compiler->tag_nocache = true; - } + $this->compiler->tag_nocache = true; + } // filter handling if ($_attr['nofilter'] === true) { $_filter = 'false'; } else { $_filter = 'true'; - } + } + // compiled output + // compiled output if (isset($_attr['assign'])) { // assign output to variable $output = "assign({$_attr['assign']},{$parameter['value']});?>"; } else { // display value - $output = $parameter['value']; - // tag modifier + if (!$_attr['nofilter'] && isset($this->compiler->smarty->registered_filters['variable'])) { + $output = "Smarty_Internal_Filter_Handler::runFilter('variable', {$parameter['value']}, \$_smarty_tpl, {$_filter})"; + } else { + $output = $parameter['value']; + } + if (!$_attr['nofilter'] && !empty($this->compiler->smarty->default_modifiers)) { + $modifierlist = array(); + foreach ($this->compiler->smarty->default_modifiers as $key => $single_default_modifier) { + preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array); + for ($i = 0, $count = count($mod_array[0]);$i < $count;$i++) { + if ($mod_array[0][$i] != ':') { + $modifierlist[$key][] = $mod_array[0][$i]; + } + } + } + $output = $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $modifierlist, 'value' => $output)); + } if (!empty($parameter['modifierlist'])) { - $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output)); - } - if (!$_attr['nofilter']) { - // default modifier - if (!empty($compiler->smarty->default_modifiers)) { - if (empty($compiler->default_modifier_list)) { - $modifierlist = array(); - foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) { - preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array); - for ($i = 0, $count = count($mod_array[0]);$i < $count;$i++) { - if ($mod_array[0][$i] != ':') { - $modifierlist[$key][] = $mod_array[0][$i]; - } - } - } - $compiler->default_modifier_list = $modifierlist; - } - $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list, 'value' => $output)); - } - // autoescape html - if ($compiler->template->smarty->escape_html) { - $output = "htmlspecialchars({$output}, ENT_QUOTES, SMARTY_RESOURCE_CHAR_SET)"; - } - // loop over registerd filters - if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) { - foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) { - if (!is_array($function)) { - $output = "{$function}({$output},\$_smarty_tpl)"; - } else if (is_object($function[0])) { - $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE][{$key}][0]->{$function[1]}({$output},\$_smarty_tpl)"; - } else { - $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)"; - } - } - } - // auto loaded filters - if (isset($compiler->smarty->autoload_filters[Smarty::FILTER_VARIABLE])) { - foreach ((array)$compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) { - $result = $this->compile_output_filter($compiler, $name, $output); - if ($result !== false) { - $output = $result; - } else { - // not found, throw exception - throw new SmartyException("Unable to load filter '{$name}'"); - } - } - } - if (isset($compiler->template->variable_filters)) { - foreach ($compiler->template->variable_filters as $filter) { - if (count($filter) == 1 && ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false) { - $output = $result; - } else { - $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter), 'value' => $output)); - } - } - } - } - - $compiler->has_output = true; + $output = $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output)); + } + $this->compiler->has_output = true; $output = ""; - } + } return $output; - } - - /** - * @param object $compiler compiler object - * @param string $name name of variable filter - * @param type $output embedded output - * @return string - */ - private function compile_output_filter($compiler, $name, $output) - { - $plugin_name = "smarty_variablefilter_{$name}"; - $path = $compiler->smarty->loadPlugin($plugin_name, false); - if ($path) { - if ($compiler->template->caching) { - $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path; - $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name; - } else { - $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path; - $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name; - } - } else { - // not found - return false; - } - return "{$plugin_name}({$output},\$_smarty_tpl)"; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_block.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_block.php index 9fed36c3b..054036241 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_block.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_block.php @@ -1,101 +1,84 @@ compiler = $compiler; + if (strlen($tag) < 6 || substr($tag,-5) != 'close') { // opening tag of block plugin - // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - if ($_attr['nocache']) { - $compiler->tag_nocache = true; - } - unset($_attr['nocache']); - if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag])) { - $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag]; - } else { - $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$tag]; - } + // check and get attributes + $_attr = $this->_get_attributes($args); + if ($_attr['nocache']) { + $this->compiler->tag_nocache = true; + } + unset($_attr['nocache']); // convert attributes into parameter array string $_paramsArray = array(); foreach ($_attr as $_key => $_value) { if (is_int($_key)) { $_paramsArray[] = "$_key=>$_value"; - } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) { - $_value = str_replace("'","^#^",$_value); - $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^"; + } elseif ($this->compiler->template->caching && in_array($_key,$compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag][2])) { + $_value = str_replace("'","^#^",$_value); + $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^"; } else { $_paramsArray[] = "'$_key'=>$_value"; - } - } + } + } $_params = 'array(' . implode(",", $_paramsArray) . ')'; - $this->openTag($compiler, $tag, array($_params, $compiler->nocache)); + $this->_open_tag($tag, array($_params, $this->compiler->nocache)); // maybe nocache because of nocache variables or nocache plugin - $compiler->nocache = !$tag_info[1] | $compiler->nocache | $compiler->tag_nocache; - $function = $tag_info[0]; + $this->compiler->nocache = !$compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag][1] | $this->compiler->nocache | $this->compiler->tag_nocache; + $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag][0]; // compile code if (!is_array($function)) { - $output = "smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; + $output = "smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; } else if (is_object($function[0])) { - $output = "smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; + $output = "smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; } else { - $output = "smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; - } + $output = "smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>"; + } } else { // must endblock be nocache? - if ($compiler->nocache) { - $compiler->tag_nocache = true; - } - $base_tag = substr($tag, 0, -5); + if ($this->compiler->nocache) { + $this->compiler->tag_nocache = true; + } + $base_tag = substr($tag, 0, -5); // closing tag of block plugin, restore nocache - list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag); + list($_params, $this->compiler->nocache) = $this->_close_tag($base_tag); // This tag does create output - $compiler->has_output = true; - if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) { - $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0]; - } else { - $function = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0]; - } + $this->compiler->has_output = true; + $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0]; // compile code if (!isset($parameter['modifier_list'])) { - $mod_pre = $mod_post =''; + $mod_pre = $mod_post =''; } else { - $mod_pre = ' ob_start(); '; - $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';'; + $mod_pre = ' ob_start(); '; + $mod_post = 'echo '.$this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';'; } if (!is_array($function)) { $output = "smarty->_tag_stack);?>"; @@ -103,11 +86,10 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C $output = "smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>"; } else { $output = "smarty->_tag_stack);?>"; - } - } - return $output . "\n"; - } - -} + } + } + return $output."\n"; + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_function.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_function.php index 5058bfbbd..f79edf684 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_function.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_function.php @@ -1,70 +1,57 @@ compiler = $compiler; // This tag does create output - $compiler->has_output = true; + $this->compiler->has_output = true; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); if ($_attr['nocache']) { - $compiler->tag_nocache = true; + $this->compiler->tag_nocache = true; } unset($_attr['nocache']); - if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) { - $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag]; - } else { - $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_FUNCTION][$tag]; - } // not cachable? - $compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[1]; + $this->compiler->tag_nocache = $this->compiler->tag_nocache || !$compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag][1]; // convert attributes into parameter array string $_paramsArray = array(); foreach ($_attr as $_key => $_value) { if (is_int($_key)) { $_paramsArray[] = "$_key=>$_value"; - } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) { - $_value = str_replace("'","^#^",$_value); + } elseif ($this->compiler->template->caching && in_array($_key,$compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag][2])) { + $_value = str_replace("'","^#^",$_value); $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^"; } else { $_paramsArray[] = "'$_key'=>$_value"; - } - } - $_params = 'array(' . implode(",", $_paramsArray) . ')'; - $function = $tag_info[0]; + } + } + $_params = 'array(' . implode(",", $_paramsArray) . ')'; + $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag][0]; // compile code if (!is_array($function)) { $output = "\n"; @@ -72,10 +59,9 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna $output = "smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n"; } else { $output = "\n"; - } + } return $output; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_special_variable.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_special_variable.php index f9adcec86..5d6ae8015 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_special_variable.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_special_variable.php @@ -1,26 +1,22 @@ smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) { $compiler->trigger_template_error("(secure mode) super globals not permitted"); break; - } + } $compiled_ref = '$_COOKIE'; break; @@ -55,15 +51,15 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) { $compiler->trigger_template_error("(secure mode) super globals not permitted"); break; - } + } $compiled_ref = '$_'.strtoupper($variable); break; case 'template': - return 'basename($_smarty_tpl->source->filepath)'; + return 'basename($_smarty_tpl->getTemplateFilepath())'; case 'current_dir': - return 'dirname($_smarty_tpl->source->filepath)'; + return 'dirname($_smarty_tpl->getTemplateFilepath())'; case 'version': $_version = Smarty::SMARTY_VERSION; @@ -73,7 +69,7 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_constants) { $compiler->trigger_template_error("(secure mode) constants not permitted"); break; - } + } return '@' . trim($_index[1], "'"); case 'config': @@ -89,16 +85,15 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C default: $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid'); break; - } + } if (isset($_index[1])) { array_shift($_index); foreach ($_index as $_ind) { $compiled_ref = $compiled_ref . "[$_ind]"; - } - } + } + } return $compiled_ref; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_rdelim.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_rdelim.php index 807c7e2b9..6436bfd16 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_rdelim.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_rdelim.php @@ -1,8 +1,9 @@ getAttributes($compiler, $args); + $this->compiler = $compiler; + $_attr = $this->_get_attributes($args); if ($_attr['nocache'] === true) { - $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); + $this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno); } // this tag does not return compiled code - $compiler->has_code = true; - return $compiler->smarty->right_delimiter; - } - + $this->compiler->has_code = true; + return $this->compiler->smarty->right_delimiter; + } } ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_section.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_section.php index ccb7673d8..0768b026e 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_section.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_section.php @@ -1,65 +1,45 @@ compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); - $this->openTag($compiler, 'section', array('section', $compiler->nocache)); + $this->_open_tag('section', array('section',$this->compiler->nocache)); // maybe nocache because of nocache variables - $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; + $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; $output = "tpl_vars['smarty']->value['section'][$section_name])) unset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]);\n"; + + $output .= "unset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]);\n"; $section_props = "\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]"; foreach ($_attr as $attr_name => $attr_value) { @@ -88,8 +68,8 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase { case 'step': $output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n"; break; - } - } + } + } if (!isset($_attr['show'])) $output .= "{$section_props}['show'] = true;\n"; @@ -109,14 +89,14 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase { $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n"; else { $output .= "if ({$section_props}['start'] < 0)\n" . " {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . " {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n"; - } + } $output .= "if ({$section_props}['show']) {\n"; if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) { $output .= " {$section_props}['total'] = {$section_props}['loop'];\n"; } else { $output .= " {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n"; - } + } $output .= " if ({$section_props}['total'] == 0)\n" . " {$section_props}['show'] = false;\n" . "} else\n" . " {$section_props}['total'] = 0;\n"; $output .= "if ({$section_props}['show']):\n"; @@ -132,72 +112,62 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase { $output .= "?>"; return $output; - } - -} + } +} /** - * Smarty Internal Plugin Compile Sectionelse Class - * - * @package Smarty - * @subpackage Compiler - */ +* Smarty Internal Plugin Compile Sectionelse Class +*/ class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase { - /** * Compiles code for the {sectionelse} tag - * - * @param array $args array with attributes from parser + * + * @param array $args array with attributes from parser * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) { + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); - list($openTag, $nocache) = $this->closeTag($compiler, array('section')); - $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache)); + list($_open_tag, $nocache) = $this->_close_tag(array('section')); + $this->_open_tag('sectionelse',array('sectionelse', $nocache)); return ""; - } - -} + } +} /** * Smarty Internal Plugin Compile Sectionclose Class - * - * @package Smarty - * @subpackage Compiler */ class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase { - /** * Compiles code for the {/section} tag - * - * @param array $args array with attributes from parser + * + * @param array $args array with attributes from parser * @param object $compiler compiler object * @return string compiled code */ public function compile($args, $compiler) { + $this->compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); + $_attr = $this->_get_attributes($args); // must endblock be nocache? - if ($compiler->nocache) { - $compiler->tag_nocache = true; + if ($this->compiler->nocache) { + $this->compiler->tag_nocache = true; } - list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('section', 'sectionelse')); + list($_open_tag, $this->compiler->nocache) = $this->_close_tag(array('section', 'sectionelse')); - if ($openTag == 'sectionelse') { + if ($_open_tag == 'sectionelse') return ""; - } else { + else return ""; - } - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_while.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_while.php index 46b6e2696..7e87a2291 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_while.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_while.php @@ -1,90 +1,82 @@ compiler = $compiler; // check and get attributes - $_attr = $this->getAttributes($compiler, $args); - $this->openTag($compiler, 'while', $compiler->nocache); + $_attr = $this->_get_attributes($args); + $this->_open_tag('while', $this->compiler->nocache); // maybe nocache because of nocache variables - $compiler->nocache = $compiler->nocache | $compiler->tag_nocache; + $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; if (is_array($parameter['if condition'])) { - if ($compiler->nocache) { - $_nocache = ',true'; - // create nocache var to make it know for further compiling - if (is_array($parameter['if condition']['var'])) { - $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true); - } else { - $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true); - } - } else { - $_nocache = ''; - } + if ($this->compiler->nocache) { + $_nocache = ',true'; + // create nocache var to make it know for further compiling + if (is_array($parameter['if condition']['var'])) { + $this->compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true); + } else { + $this->compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true); + } + } else { + $_nocache = ''; + } if (is_array($parameter['if condition']['var'])) { - $_output = "tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n"; - $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>"; + $_output = "tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n"; + $_output .= "while (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>"; } else { - $_output = "tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});"; - $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>"; - } + $_output = "tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(\$_smarty_tpl->getVariable(".$parameter['if condition']['var'].",null,true,false)->value{$_nocache});"; + $_output .= "while (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>"; + } return $_output; } else { return ""; - } - } - -} + } + } +} /** - * Smarty Internal Plugin Compile Whileclose Class - * - * @package Smarty - * @subpackage Compiler - */ +* Smarty Internal Plugin Compile Whileclose Class +*/ class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase { - /** - * Compiles code for the {/while} tag - * - * @param array $args array with attributes from parser - * @param object $compiler compiler object - * @return string compiled code - */ + * Compiles code for the {/while} tag + * + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * @return string compiled code + */ public function compile($args, $compiler) { + $this->compiler = $compiler; // must endblock be nocache? - if ($compiler->nocache) { - $compiler->tag_nocache = true; + if ($this->compiler->nocache) { + $this->compiler->tag_nocache = true; } - $compiler->nocache = $this->closeTag($compiler, array('while')); + $this->compiler->nocache = $this->_close_tag(array('while')); return ""; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compilebase.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compilebase.php index 5fb56f371..6418acceb 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_compilebase.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compilebase.php @@ -1,78 +1,55 @@ $mixed) { // shorthand ? if (!is_array($mixed)) { // option flag ? if (in_array(trim($mixed, '\'"'), $this->option_flags)) { - $_indexed_attr[trim($mixed, '\'"')] = true; + $_indexed_attr[trim($mixed, '\'"')] = true; // shorthand attribute ? } else if (isset($this->shorttag_order[$key])) { $_indexed_attr[$this->shorttag_order[$key]] = $mixed; } else { // too many shorthands - $compiler->trigger_template_error('too many shorthand attributes', $compiler->lex->taglineno); - } + $this->compiler->trigger_template_error('too many shorthand attributes', $this->compiler->lex->taglineno); + } // named attribute } else { - $kv = each($mixed); + $kv = each($mixed); // option flag? if (in_array($kv['key'], $this->option_flags)) { if (is_bool($kv['value'])) { @@ -82,95 +59,92 @@ abstract class Smarty_Internal_CompileBase { $_indexed_attr[$kv['key']] = true; } else { $_indexed_attr[$kv['key']] = false; - } + } } else if (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) { if ($kv['value'] == 1) { $_indexed_attr[$kv['key']] = true; } else { $_indexed_attr[$kv['key']] = false; - } + } } else { - $compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $compiler->lex->taglineno); - } + $this->compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $this->compiler->lex->taglineno); + } // must be named attribute } else { - reset($mixed); + reset($mixed); $_indexed_attr[key($mixed)] = $mixed[key($mixed)]; - } - } - } + } + } + } // check if all required attributes present foreach ($this->required_attributes as $attr) { if (!array_key_exists($attr, $_indexed_attr)) { - $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $compiler->lex->taglineno); - } - } + $this->compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $this->compiler->lex->taglineno); + } + } // check for unallowed attributes if ($this->optional_attributes != array('_any')) { $tmp_array = array_merge($this->required_attributes, $this->optional_attributes, $this->option_flags); foreach ($_indexed_attr as $key => $dummy) { if (!in_array($key, $tmp_array) && $key !== 0) { - $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", $compiler->lex->taglineno); - } - } - } + $this->compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", $this->compiler->lex->taglineno); + } + } + } // default 'false' for all option flags not set foreach ($this->option_flags as $flag) { if (!isset($_indexed_attr[$flag])) { $_indexed_attr[$flag] = false; - } - } + } + } return $_indexed_attr; - } + } /** * Push opening tag name on stack - * + * * Optionally additional data can be saved on stack - * - * @param object $compiler compiler object - * @param string $openTag the opening tag's name - * @param mixed $data optional data saved + * + * @param string $open_tag the opening tag's name + * @param anytype $data optional data which shall be saved on stack */ - public function openTag($compiler, $openTag, $data = null) + function _open_tag($open_tag, $data = null) { - array_push($compiler->_tag_stack, array($openTag, $data)); - } + array_push($this->compiler->_tag_stack, array($open_tag, $data)); + } /** * Pop closing tag - * + * * Raise an error if this stack-top doesn't match with expected opening tags - * - * @param object $compiler compiler object - * @param array|string $expectedTag the expected opening tag names - * @return mixed any type the opening tag's name or saved data + * + * @param array $ |string $expected_tag the expected opening tag names + * @return anytype the opening tag's name or saved data */ - public function closeTag($compiler, $expectedTag) + function _close_tag($expected_tag) { - if (count($compiler->_tag_stack) > 0) { + if (count($this->compiler->_tag_stack) > 0) { // get stacked info - list($_openTag, $_data) = array_pop($compiler->_tag_stack); + list($_open_tag, $_data) = array_pop($this->compiler->_tag_stack); // open tag must match with the expected ones - if (in_array($_openTag, (array) $expectedTag)) { + if (in_array($_open_tag, (array)$expected_tag)) { if (is_null($_data)) { // return opening tag - return $_openTag; + return $_open_tag; } else { // return restored data return $_data; - } - } + } + } // wrong nesting of tags - $compiler->trigger_template_error("unclosed {" . $_openTag . "} tag"); + $this->compiler->trigger_template_error("unclosed {" . $_open_tag . "} tag"); return; - } + } // wrong nesting of tags - $compiler->trigger_template_error("unexpected closing tag", $compiler->lex->taglineno); + $this->compiler->trigger_template_error("unexpected closing tag", $this->compiler->lex->taglineno); return; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_config.php b/gosa-core/include/smarty/sysplugins/smarty_internal_config.php index a309ec9ff..535551233 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_config.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_config.php @@ -1,159 +1,193 @@ data = $data; + $this->smarty = $smarty; + $this->config_resource = $config_resource; + $this->config_resource_type = null; + $this->config_resource_name = null; + $this->config_filepath = null; + $this->config_timestamp = null; + $this->config_source = null; + $this->compiled_config = null; + $this->compiled_filepath = null; + $this->compiled_timestamp = null; + $this->mustCompile = null; + $this->compiler_object = null; + // parse config resource name + if (!$this->parseConfigResourceName ($config_resource)) { + throw new SmartyException ("Unable to parse config resource '{$config_resource}'"); + } + } + + public function getConfigFilepath () + { + return $this->config_filepath === null ? + $this->config_filepath = $this->buildConfigFilepath() : + $this->config_filepath; + } + + public function getTimestamp () + { + return $this->config_timestamp === null ? + $this->config_timestamp = filemtime($this->getConfigFilepath()) : + $this->config_timestamp; + } + + private function parseConfigResourceName($config_resource) + { + if (empty($config_resource)) + return false; + if (strpos($config_resource, ':') === false) { + // no resource given, use default + $this->config_resource_type = $this->smarty->default_config_type; + $this->config_resource_name = $config_resource; + } else { + // get type and name from path + list($this->config_resource_type, $this->config_resource_name) = explode(':', $config_resource, 2); + if (strlen($this->config_resource_type) == 1) { + // 1 char is not resource type, but part of filepath + $this->config_resource_type = $this->smarty->default_config_type; + $this->config_resource_name = $config_resource; + } else { + $this->config_resource_type = strtolower($this->config_resource_type); + } + } + return true; + } + + /* + * get system filepath to config */ - public $mustCompile = null; + public function buildConfigFilepath () + { + foreach((array)$this->smarty->config_dir as $_config_dir) { + if (strpos('/\\', substr($_config_dir, -1)) === false) { + $_config_dir .= DS; + } + + $_filepath = $_config_dir . $this->config_resource_name; + if (file_exists($_filepath)) + return $_filepath; + } + // check for absolute path + if (file_exists($this->config_resource_name)) + return $this->config_resource_name; + // no tpl file found + throw new SmartyException("Unable to load config file \"{$this->config_resource_name}\""); + return false; + } /** - * Config file compiler object - * - * @var Smarty_Internal_Config_File_Compiler object + * Read config file source + * + * @return string content of source file */ - public $compiler_object = null; - /** - * Constructor of config file object - * - * @param string $config_resource config file resource name - * @param Smarty $smarty Smarty instance - * @param object $data object for config vars storage + * Returns the template source code + * + * The template source is being read by the actual resource handler + * + * @return string the template source */ - public function __construct($config_resource, $smarty, $data = null) + public function getConfigSource () { - $this->data = $data; - $this->smarty = $smarty; - $this->config_resource = $config_resource; - } + if ($this->config_source === null) { + if ($this->readConfigSource($this) === false) { + throw new SmartyException("Unable to load config file \"{$this->config_resource_name}\""); + } + } + return $this->config_source; + } + public function readConfigSource() + { + // read source file + if (file_exists($this->getConfigFilepath())) { + $this->config_source = file_get_contents($this->getConfigFilepath()); + return true; + } else { + return false; + } + } /** * Returns the compiled filepath - * + * * @return string the compiled filepath */ - public function getCompiledFilepath() + public function getCompiledFilepath () { return $this->compiled_filepath === null ? - ($this->compiled_filepath = $this->buildCompiledFilepath()) : - $this->compiled_filepath; - } - - /** - * Get file path. - * - * @return string - */ + ($this->compiled_filepath = $this->buildCompiledFilepath()) : + $this->compiled_filepath; + } public function buildCompiledFilepath() { $_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null; - $_flag = (int) $this->smarty->config_read_hidden + (int) $this->smarty->config_booleanize * 2 - + (int) $this->smarty->config_overwrite * 4; - $_filepath = sha1($this->source->name . $_flag); + $_flag = (int)$this->smarty->config_read_hidden + (int)$this->smarty->config_booleanize * 2 + + (int)$this->smarty->config_overwrite * 4; + $_filepath = sha1($this->config_resource_name . $_flag); // if use_sub_dirs, break file into directories if ($this->smarty->use_sub_dirs) { $_filepath = substr($_filepath, 0, 2) . DS - . substr($_filepath, 2, 2) . DS - . substr($_filepath, 4, 2) . DS - . $_filepath; - } + . substr($_filepath, 2, 2) . DS + . substr($_filepath, 4, 2) . DS + . $_filepath; + } $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^'; if (isset($_compile_id)) { $_filepath = $_compile_id . $_compile_dir_sep . $_filepath; - } - $_compile_dir = $this->smarty->getCompileDir(); - return $_compile_dir . $_filepath . '.' . basename($this->source->name) . '.config' . '.php'; - } - + } + $_compile_dir = $this->smarty->compile_dir; + if (substr($_compile_dir, -1) != DS) { + $_compile_dir .= DS; + } + return $_compile_dir . $_filepath . '.' . basename($this->config_resource_name) . '.config' . '.php'; + } /** * Returns the timpestamp of the compiled file - * + * * @return integer the file timestamp */ - public function getCompiledTimestamp() + public function getCompiledTimestamp () { - return $this->compiled_timestamp === null - ? ($this->compiled_timestamp = (file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false) - : $this->compiled_timestamp; - } - + return $this->compiled_timestamp === null ? + ($this->compiled_timestamp = (file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false) : + $this->compiled_timestamp; + } /** - * Returns if the current config file must be compiled - * + * Returns if the current config file must be compiled + * * It does compare the timestamps of config source and the compiled config and checks the force compile configuration - * + * * @return boolean true if the file must be compiled */ - public function mustCompile() + public function mustCompile () { return $this->mustCompile === null ? - $this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp () === false || $this->smarty->compile_check && $this->getCompiledTimestamp () < $this->source->timestamp): - $this->mustCompile; - } - + $this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp () === false || $this->smarty->compile_check && $this->getCompiledTimestamp () < $this->getTimestamp ()): + $this->mustCompile; + } /** - * Returns the compiled config file - * + * Returns the compiled config file + * * It checks if the config file must be compiled or just read the compiled version - * + * * @return string the compiled config file */ - public function getCompiledConfig() + public function getCompiledConfig () { if ($this->compiled_config === null) { // see if template needs compiling. @@ -161,143 +195,96 @@ class Smarty_Internal_Config { $this->compileConfigSource(); } else { $this->compiled_config = file_get_contents($this->getCompiledFilepath()); - } - } + } + } return $this->compiled_config; - } + } /** * Compiles the config files - * - * @throws Exception */ - public function compileConfigSource() - { + public function compileConfigSource () + { // compile template if (!is_object($this->compiler_object)) { // load compiler $this->compiler_object = new Smarty_Internal_Config_File_Compiler($this->smarty); - } + } // compile locking if ($this->smarty->compile_locking) { if ($saved_timestamp = $this->getCompiledTimestamp()) { touch($this->getCompiledFilepath()); - } - } + } + } // call compiler try { $this->compiler_object->compileSource($this); - } catch (Exception $e) { + } + catch (Exception $e) { // restore old timestamp in case of error if ($this->smarty->compile_locking && $saved_timestamp) { touch($this->getCompiledFilepath(), $saved_timestamp); - } + } throw $e; - } + } // compiling succeded // write compiled template Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->getCompiledConfig(), $this->smarty); - } + } - /** + /* * load config variables - * - * @param mixed $sections array of section names, single section or null - * @param object $scope global,parent or local - */ - public function loadConfigVars($sections = null, $scope = 'local') + * + * @param mixed $sections array of section names, single section or null + * @param object $scope global,parent or local + */ + public function loadConfigVars ($sections = null, $scope = 'local') { if ($this->data instanceof Smarty_Internal_Template) { - $this->data->properties['file_dependency'][sha1($this->source->filepath)] = array($this->source->filepath, $this->source->timestamp, 'file'); - } + $this->data->properties['file_dependency'][sha1($this->getConfigFilepath())] = array($this->getConfigFilepath(), $this->getTimestamp(),'file'); + } if ($this->mustCompile()) { $this->compileConfigSource(); } // pointer to scope if ($scope == 'local') { - $scope_ptr = $this->data; + $scope_ptr = $this->data; } elseif ($scope == 'parent') { - if (isset($this->data->parent)) { - $scope_ptr = $this->data->parent; - } else { - $scope_ptr = $this->data; - } + if (isset($this->data->parent)) { + $scope_ptr = $this->data->parent; + } else { + $scope_ptr = $this->data; + } } elseif ($scope == 'root' || $scope == 'global') { - $scope_ptr = $this->data; - while (isset($scope_ptr->parent)) { - $scope_ptr = $scope_ptr->parent; - } + $scope_ptr = $this->data; + while (isset($scope_ptr->parent)) { + $scope_ptr = $scope_ptr->parent; + } } $_config_vars = array(); - include($this->getCompiledFilepath()); + include($this->getCompiledFilepath ()); // copy global config vars foreach ($_config_vars['vars'] as $variable => $value) { if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) { $scope_ptr->config_vars[$variable] = $value; } else { - $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value); - } - } + $scope_ptr->config_vars[$variable] = array_merge((array)$scope_ptr->config_vars[$variable], (array)$value); + } + } // scan sections - if (!empty($sections)) { - $sections = array_flip((array) $sections); - foreach ($_config_vars['sections'] as $this_section => $dummy) { - if (isset($sections[$this_section])) { - foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) { - if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) { - $scope_ptr->config_vars[$variable] = $value; - } else { - $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value); - } - } - } - } - } - } - - /** - * set Smarty property in template context - * - * @param string $property_name property name - * @param mixed $value value - * @throws SmartyException if $property_name is not valid - */ - public function __set($property_name, $value) - { - switch ($property_name) { - case 'source': - case 'compiled': - $this->$property_name = $value; - return; - } - - throw new SmartyException("invalid config property '$property_name'."); - } - - /** - * get Smarty property in template context - * - * @param string $property_name property name - * @throws SmartyException if $property_name is not valid - */ - public function __get($property_name) - { - switch ($property_name) { - case 'source': - if (empty($this->config_resource)) { - throw new SmartyException("Unable to parse resource name \"{$this->config_resource}\""); - } - $this->source = Smarty_Resource::config($this); - return $this->source; - - case 'compiled': - $this->compiled = $this->source->getCompiled($this); - return $this->compiled; + if(!empty($sections)) { + foreach ($_config_vars['sections'] as $this_section => $dummy) { + if (in_array($this_section, (array)$sections)) { + foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) { + if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) { + $scope_ptr->config_vars[$variable] = $value; + } else { + $scope_ptr->config_vars[$variable] = array_merge((array)$scope_ptr->config_vars[$variable], (array)$value); + } + } + } + } } - - throw new SmartyException("config attribute '$property_name' does not exist."); - } - -} - + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_config_file_compiler.php b/gosa-core/include/smarty/sysplugins/smarty_internal_config_file_compiler.php index b16a6940d..e9dfbdb02 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_config_file_compiler.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_config_file_compiler.php @@ -1,123 +1,86 @@ smarty = $smarty; + $this->smarty = $smarty; + // get required plugins + $this->smarty->loadPlugin('Smarty_Internal_Configfilelexer'); + $this->smarty->loadPlugin('Smarty_Internal_Configfileparser'); $this->config_data['sections'] = array(); $this->config_data['vars'] = array(); - } + } /** - * Method to compile a Smarty template. - * - * @param Smarty_Internal_Config $config config object + * Methode to compile a Smarty template + * + * @param $template template object to compile * @return bool true if compiling succeeded, false if it failed */ - public function compileSource(Smarty_Internal_Config $config) + public function compileSource($config) { /* here is where the compiling takes place. Smarty - tags in the templates are replaces with PHP code, - then written to compiled files. */ - $this->config = $config; + tags in the templates are replaces with PHP code, + then written to compiled files. */ + $this->config = $config; // get config file source - $_content = $config->source->content . "\n"; + $_content = $config->getConfigSource() . "\n"; // on empty template just return if ($_content == '') { return true; - } + } // init the lexer/parser to compile the config file $lex = new Smarty_Internal_Configfilelexer($_content, $this->smarty); $parser = new Smarty_Internal_Configfileparser($lex, $this); - if ($this->smarty->_parserdebug) $parser->PrintTrace(); + if (isset($this->smarty->_parserdebug)) $parser->PrintTrace(); // get tokens from lexer and parse them while ($lex->yylex()) { - if ($this->smarty->_parserdebug) echo "
Parsing {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n"; + if (isset($this->smarty->_parserdebug)) echo "
Parsing {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n"; $parser->doParse($lex->token, $lex->value); - } + } // finish parsing process $parser->doParse(0, 0); $config->compiled_config = 'config_data, true) . '; ?>'; - } - + } /** * display compiler error messages without dying - * + * * If parameter $args is empty it is a parser detected syntax error. * In this case the parser is called to obtain information about exspected tokens. - * + * * If parameter $args contains a string this is used as error message - * - * @param string $args individual error message or null + * + * @todo output exact position of parse error in source line + * @param $args string individual error message or null */ public function trigger_config_file_error($args = null) { $this->lex = Smarty_Internal_Configfilelexer::instance(); - $this->parser = Smarty_Internal_Configfileparser::instance(); + $this->parser = Smarty_Internal_Configfileparser::instance(); // get template source line which has error $line = $this->lex->line; if (isset($args)) { // $line--; - } + } $match = preg_split("/\n/", $this->lex->data); - $error_text = "Syntax error in config file '{$this->config->source->filepath}' on line {$line} '{$match[$line-1]}' "; + $error_text = "Syntax error in config file '{$this->config->getConfigFilepath()}' on line {$line} '{$match[$line-1]}' "; if (isset($args)) { // individual error message $error_text .= $args; @@ -131,14 +94,13 @@ class Smarty_Internal_Config_File_Compiler { } else { // otherwise internal token name $expect[] = $this->parser->yyTokenName[$token]; - } - } + } + } // output parser error message $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect); - } + } throw new SmartyCompilerException($error_text); - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_configfilelexer.php b/gosa-core/include/smarty/sysplugins/smarty_internal_configfilelexer.php index aad90af8b..86143bcfe 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_configfilelexer.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_configfilelexer.php @@ -32,8 +32,7 @@ class Smarty_Internal_Configfilelexer $this->counter = 0; $this->line = 1; $this->smarty = $smarty; - $this->mbstring_overload = ini_get('mbstring.func_overload') & 2; - } + } public static function &instance($new_instance = null) { static $instance = null; @@ -85,15 +84,15 @@ class Smarty_Internal_Configfilelexer if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)/iS"; + $yy_global_pattern = "/^(#)|^(\\[)|^(\\])|^(=)|^([ \t\r]+)|^(\n)|^([0-9]*[a-zA-Z_]\\w*)/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, + 'an empty string. Input "' . substr($this->data, $this->counter, 5) . '... state START'); } next($yymatches); // skip global match @@ -192,15 +191,15 @@ class Smarty_Internal_Configfilelexer if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G(\"\"\"(\\w+|[^\"]|\\\\\"|\"{1,2}[^\"])*\"\"\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS"; + $yy_global_pattern = "/^([ \t\r]+)|^(\\d+\\.\\d+(?=[ \t\r]*[\n#]))|^(\\d+(?=[ \t\r]*[\n#]))|^('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#]))|^(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#]))|^(\"\"\"([^\"]|\\\\\"|\"{1,2}[^\"])*\"\"\"(?=[ \t\r]*[\n#]))|^([a-zA-Z]+(?=[ \t\r]*[\n#]))|^([^\n]+?(?=[ \t\r]*\n))|^(\n)/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, + 'an empty string. Input "' . substr($this->data, $this->counter, 5) . '... state VALUE'); } next($yymatches); // skip global match @@ -313,15 +312,15 @@ class Smarty_Internal_Configfilelexer if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS"; + $yy_global_pattern = "/^([^\n]+?(?=[ \t\r]*\n))/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, + 'an empty string. Input "' . substr($this->data, $this->counter, 5) . '... state NAKED_STRING_VALUE'); } next($yymatches); // skip global match @@ -382,15 +381,15 @@ class Smarty_Internal_Configfilelexer if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS"; + $yy_global_pattern = "/^([ \t\r]+)|^([^\n]+?(?=[ \t\r]*\n))|^(\n)/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, + 'an empty string. Input "' . substr($this->data, $this->counter, 5) . '... state COMMENT'); } next($yymatches); // skip global match @@ -460,15 +459,15 @@ class Smarty_Internal_Configfilelexer if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS"; + $yy_global_pattern = "/^(\\.)|^(.*?(?=[\.=[\]\r\n]))/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, + 'an empty string. Input "' . substr($this->data, $this->counter, 5) . '... state SECTION'); } next($yymatches); // skip global match diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_configfileparser.php b/gosa-core/include/smarty/sysplugins/smarty_internal_configfileparser.php index 8824603c8..0b5a57343 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_configfileparser.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_configfileparser.php @@ -96,9 +96,9 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser function __construct($lex, $compiler) { // set instance object - self::instance($this); + self::instance($this); $this->lex = $lex; - $this->smarty = $compiler->smarty; + $this->smarty = $compiler->smarty; $this->compiler = $compiler; } public static function &instance($new_instance = null) @@ -163,7 +163,7 @@ class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser private function add_global_vars(Array $vars) { if (!isset($this->compiler->config_data['vars'])) { - $this->compiler->config_data['vars'] = Array(); + $this->compiler->config_data['vars'] = Array(); } foreach ($vars as $var) { $this->set_var($var, $this->compiler->config_data); @@ -296,14 +296,14 @@ static public $yy_action = array( public $yyerrcnt; /* Shifts left before out of the error */ public $yystack = array(); /* The parser's stack */ - public $yyTokenName = array( - '$', 'OPENB', 'SECTION', 'CLOSEB', - 'DOT', 'ID', 'EQUAL', 'FLOAT', + public $yyTokenName = array( + '$', 'OPENB', 'SECTION', 'CLOSEB', + 'DOT', 'ID', 'EQUAL', 'FLOAT', 'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', 'TRIPPLE_DOUBLE_QUOTED_STRING', 'NAKED_STRING', 'NEWLINE', 'COMMENTSTART', - 'error', 'start', 'global_vars', 'sections', - 'var_list', 'section', 'newline', 'var', - 'value', + 'error', 'start', 'global_vars', 'sections', + 'var_list', 'section', 'newline', 'var', + 'value', ); static public $yyRuleName = array( @@ -517,7 +517,7 @@ static public $yy_action = array( function yy_find_shift_action($iLookAhead) { $stateno = $this->yystack[$this->yyidx]->stateno; - + /* if ($this->yyidx < 0) return self::YY_NO_ACTION; */ if (!isset(self::$yy_shift_ofst[$stateno])) { // no shift actions @@ -652,91 +652,57 @@ static public $yy_action = array( 16 => 16, ); #line 132 "smarty_internal_configfileparser.y" - function yy_r0(){ - $this->_retvalue = null; - } -#line 654 "smarty_internal_configfileparser.php" -#line 137 "smarty_internal_configfileparser.y" - function yy_r1(){ - $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null; - } -#line 659 "smarty_internal_configfileparser.php" -#line 150 "smarty_internal_configfileparser.y" - function yy_r4(){ - $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); - $this->_retvalue = null; - } -#line 665 "smarty_internal_configfileparser.php" -#line 155 "smarty_internal_configfileparser.y" - function yy_r5(){ - if ($this->smarty->config_read_hidden) { - $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); - } - $this->_retvalue = null; - } + function yy_r0(){ $this->_retvalue = null; } +#line 652 "smarty_internal_configfileparser.php" +#line 135 "smarty_internal_configfileparser.y" + function yy_r1(){ $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null; } +#line 655 "smarty_internal_configfileparser.php" +#line 141 "smarty_internal_configfileparser.y" + function yy_r4(){ $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null; } +#line 658 "smarty_internal_configfileparser.php" +#line 142 "smarty_internal_configfileparser.y" + function yy_r5(){ if ($this->smarty->config_read_hidden) { $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor); } $this->_retvalue = null; } +#line 661 "smarty_internal_configfileparser.php" +#line 145 "smarty_internal_configfileparser.y" + function yy_r6(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; } +#line 664 "smarty_internal_configfileparser.php" +#line 146 "smarty_internal_configfileparser.y" + function yy_r7(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor)); } +#line 667 "smarty_internal_configfileparser.php" +#line 147 "smarty_internal_configfileparser.y" + function yy_r8(){ $this->_retvalue = Array(); } +#line 670 "smarty_internal_configfileparser.php" +#line 151 "smarty_internal_configfileparser.y" + function yy_r9(){ $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor); } #line 673 "smarty_internal_configfileparser.php" -#line 163 "smarty_internal_configfileparser.y" - function yy_r6(){ - $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; - } -#line 678 "smarty_internal_configfileparser.php" -#line 167 "smarty_internal_configfileparser.y" - function yy_r7(){ - $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor)); - } -#line 683 "smarty_internal_configfileparser.php" -#line 171 "smarty_internal_configfileparser.y" - function yy_r8(){ - $this->_retvalue = Array(); - } +#line 153 "smarty_internal_configfileparser.y" + function yy_r10(){ $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor; } +#line 676 "smarty_internal_configfileparser.php" +#line 154 "smarty_internal_configfileparser.y" + function yy_r11(){ $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor; } +#line 679 "smarty_internal_configfileparser.php" +#line 155 "smarty_internal_configfileparser.y" + function yy_r12(){ $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor); } +#line 682 "smarty_internal_configfileparser.php" +#line 156 "smarty_internal_configfileparser.y" + function yy_r13(){ $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor); } +#line 685 "smarty_internal_configfileparser.php" +#line 157 "smarty_internal_configfileparser.y" + function yy_r14(){ $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); } #line 688 "smarty_internal_configfileparser.php" -#line 177 "smarty_internal_configfileparser.y" - function yy_r9(){ - $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor); - } -#line 693 "smarty_internal_configfileparser.php" -#line 182 "smarty_internal_configfileparser.y" - function yy_r10(){ - $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor; - } -#line 698 "smarty_internal_configfileparser.php" -#line 186 "smarty_internal_configfileparser.y" - function yy_r11(){ - $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor; - } -#line 703 "smarty_internal_configfileparser.php" -#line 190 "smarty_internal_configfileparser.y" - function yy_r12(){ - $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor); - } -#line 708 "smarty_internal_configfileparser.php" -#line 194 "smarty_internal_configfileparser.y" - function yy_r13(){ - $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor); - } -#line 713 "smarty_internal_configfileparser.php" -#line 198 "smarty_internal_configfileparser.y" - function yy_r14(){ - $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); - } -#line 718 "smarty_internal_configfileparser.php" -#line 202 "smarty_internal_configfileparser.y" - function yy_r15(){ - $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); - } -#line 723 "smarty_internal_configfileparser.php" -#line 206 "smarty_internal_configfileparser.y" - function yy_r16(){ - $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; - } -#line 728 "smarty_internal_configfileparser.php" +#line 158 "smarty_internal_configfileparser.y" + function yy_r15(){ $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + 0]->minor); } +#line 691 "smarty_internal_configfileparser.php" +#line 159 "smarty_internal_configfileparser.y" + function yy_r16(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } +#line 694 "smarty_internal_configfileparser.php" private $_retvalue; function yy_reduce($yyruleno) { $yymsp = $this->yystack[$this->yyidx]; - if (self::$yyTraceFILE && $yyruleno >= 0 + if (self::$yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) { fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n", self::$yyTracePrompt, $yyruleno, @@ -791,7 +757,7 @@ static public $yy_action = array( $this->internalError = true; $this->yymajor = $yymajor; $this->compiler->trigger_config_file_error(); -#line 791 "smarty_internal_configfileparser.php" +#line 757 "smarty_internal_configfileparser.php" } function yy_accept() @@ -808,13 +774,13 @@ static public $yy_action = array( $this->internalError = false; $this->retvalue = $this->_retvalue; //echo $this->retvalue."\n\n"; -#line 809 "smarty_internal_configfileparser.php" +#line 775 "smarty_internal_configfileparser.php" } function doParse($yymajor, $yytokenvalue) { $yyerrorhit = 0; /* True if yymajor has invoked an error */ - + if ($this->yyidx === null || $this->yyidx < 0) { $this->yyidx = 0; $this->yyerrcnt = -1; @@ -825,12 +791,12 @@ static public $yy_action = array( array_push($this->yystack, $x); } $yyendofinput = ($yymajor==0); - + if (self::$yyTraceFILE) { fprintf(self::$yyTraceFILE, "%sInput %s\n", self::$yyTracePrompt, $this->yyTokenName[$yymajor]); } - + do { $yyact = $this->yy_find_shift_action($yymajor); if ($yymajor < self::YYERRORSYMBOL && @@ -897,7 +863,7 @@ static public $yy_action = array( } else { $this->yy_accept(); $yymajor = self::YYNOCODE; - } + } } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0); } } diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_data.php b/gosa-core/include/smarty/sysplugins/smarty_internal_data.php index 5baf3b76d..167262694 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_data.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_data.php @@ -1,55 +1,29 @@ tpl_vars[$tpl_var] = new Smarty_variable($value, $nocache); } } - - return $this; } - /** * assigns a global Smarty variable * * @param string $varname the global variable name - * @param mixed $value the value to assign + * @param mixed $value the value to assign * @param boolean $nocache if true any output of this variable will be not cached - * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function assignGlobal($varname, $value = null, $nocache = false) { if ($varname != '') { Smarty::$global_tpl_vars[$varname] = new Smarty_variable($value, $nocache); } - - return $this; } /** * assigns values to template variables by reference @@ -90,7 +58,6 @@ class Smarty_Internal_Data { * @param string $tpl_var the template variable name * @param mixed $ &$value the referenced value to assign * @param boolean $nocache if true any output of this variable will be not cached - * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function assignByRef($tpl_var, &$value, $nocache = false) { @@ -98,18 +65,27 @@ class Smarty_Internal_Data { $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache); $this->tpl_vars[$tpl_var]->value = &$value; } - - return $this; } + /** + * wrapper function for Smarty 2 BC + * + * @param string $tpl_var the template variable name + * @param mixed $ &$value the referenced value to assign + */ + public function assign_by_ref($tpl_var, &$value) + { + if($this->smarty->deprecation_notices) + trigger_error("function call 'assign_by_ref' is unknown or deprecated, use 'assignByRef'", E_USER_NOTICE); + $this->assignByRef($tpl_var, $value); + } /** * appends values to template variables * - * @param array|string $tpl_var the template variable name(s) - * @param mixed $value the value to append - * @param boolean $merge flag if array elements shall be merged + * @param array $ |string $tpl_var the template variable name(s) + * @param mixed $value the value to append + * @param boolean $merge flag if array elements shall be merged * @param boolean $nocache if true any output of this variable will be not cached - * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function append($tpl_var, $value = null, $merge = false, $nocache = false) { @@ -159,17 +135,14 @@ class Smarty_Internal_Data { } } } - - return $this; } /** * appends values to template variables by reference * * @param string $tpl_var the template variable name - * @param mixed &$value the referenced value to append - * @param boolean $merge flag if array elements shall be merged - * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining + * @param mixed $ &$value the referenced value to append + * @param boolean $merge flag if array elements shall be merged */ public function appendByRef($tpl_var, &$value, $merge = false) { @@ -177,7 +150,7 @@ class Smarty_Internal_Data { if (!isset($this->tpl_vars[$tpl_var])) { $this->tpl_vars[$tpl_var] = new Smarty_variable(); } - if (!is_array($this->tpl_vars[$tpl_var]->value)) { + if (!@is_array($this->tpl_vars[$tpl_var]->value)) { settype($this->tpl_vars[$tpl_var]->value, 'array'); } if ($merge && is_array($value)) { @@ -188,19 +161,27 @@ class Smarty_Internal_Data { $this->tpl_vars[$tpl_var]->value[] = &$value; } } - - return $this; } + /** + * + * @param string $tpl_var the template variable name + * @param mixed $ &$value the referenced value to append + * @param boolean $merge flag if array elements shall be merged + */ + public function append_by_ref($tpl_var, &$value, $merge = false) + { + if($this->smarty->deprecation_notices) + trigger_error("function call 'append_by_ref' is unknown or deprecated, use 'appendByRef'", E_USER_NOTICE); + $this->appendByRef($tpl_var, $value, $merge); + } /** * Returns a single or all template variables * - * @param string $varname variable name or null - * @param string $_ptr optional pointer to data object - * @param boolean $search_parents include parent templates? + * @param string $varname variable name or null * @return string variable value or or array of variables */ - public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true) + function getTemplateVars($varname = null, $_ptr = null, $search_parents = true) { if (isset($varname)) { $_var = $this->getVariable($varname, $_ptr, $search_parents, false); @@ -240,8 +221,7 @@ class Smarty_Internal_Data { /** * clear the given assigned template variable. * - * @param string|array $tpl_var the template variable(s) to clear - * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining + * @param string $ |array $tpl_var the template variable(s) to clear */ public function clearAssign($tpl_var) { @@ -252,51 +232,45 @@ class Smarty_Internal_Data { } else { unset($this->tpl_vars[$tpl_var]); } - - return $this; } /** * clear all the assigned template variables. - * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ public function clearAllAssign() { $this->tpl_vars = array(); - return $this; } /** * load a config file, optionally load just selected sections * * @param string $config_file filename - * @param mixed $sections array of section names, single section or null - * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining + * @param mixed $sections array of section names, single section or null */ public function configLoad($config_file, $sections = null) { // load Config class $config = new Smarty_Internal_Config($config_file, $this->smarty, $this); $config->loadConfigVars($sections); - return $this; } /** * gets the object of a Smarty variable * - * @param string $variable the name of the Smarty variable - * @param object $_ptr optional pointer to data object + * @param string $variable the name of the Smarty variable + * @param object $_ptr optional pointer to data object * @param boolean $search_parents search also in parent data * @return object the object of the variable */ - public function getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true) + public function getVariable($_variable, $_ptr = null, $search_parents = true, $error_enable = true) { if ($_ptr === null) { $_ptr = $this; } while ($_ptr !== null) { - if (isset($_ptr->tpl_vars[$variable])) { + if (isset($_ptr->tpl_vars[$_variable])) { // found it, return it - return $_ptr->tpl_vars[$variable]; + return $_ptr->tpl_vars[$_variable]; } // not found, try at parent if ($search_parents) { @@ -305,39 +279,44 @@ class Smarty_Internal_Data { $_ptr = null; } } - if (isset(Smarty::$global_tpl_vars[$variable])) { + if (isset(Smarty::$global_tpl_vars[$_variable])) { // found it, return it - return Smarty::$global_tpl_vars[$variable]; + return Smarty::$global_tpl_vars[$_variable]; } if ($this->smarty->error_unassigned && $error_enable) { - // force a notice - $x = $$variable; + throw new SmartyException('Undefined Smarty variable "' . $_variable . '"'); + } else { + if ($error_enable) { + // force a notice + $x = $$_variable; + } + return new Undefined_Smarty_Variable; } - return new Undefined_Smarty_Variable; } - /** * gets a config variable * * @param string $variable the name of the config variable * @return mixed the value of the config variable */ - public function getConfigVariable($variable, $error_enable = true) + public function getConfigVariable($_variable) { $_ptr = $this; while ($_ptr !== null) { - if (isset($_ptr->config_vars[$variable])) { + if (isset($_ptr->config_vars[$_variable])) { // found it, return it - return $_ptr->config_vars[$variable]; + return $_ptr->config_vars[$_variable]; } // not found, try at parent $_ptr = $_ptr->parent; } - if ($this->smarty->error_unassigned && $error_enable) { - // force a notice - $x = $$variable; + if ($this->smarty->error_unassigned) { + throw new SmartyException('Undefined config variable "' . $_variable . '"'); + } else { + // force a notice + $x = $$_variable; + return null; } - return null; } /** @@ -349,8 +328,7 @@ class Smarty_Internal_Data { public function getStreamVariable($variable) { $_result = ''; - $fp = fopen($variable, 'r+'); - if ($fp) { + if ($fp = fopen($variable, 'r+')) { while (!feof($fp) && ($current_line = fgets($fp)) !== false ) { $_result .= $current_line; } @@ -371,27 +349,28 @@ class Smarty_Internal_Data { * @param string $varname variable name or null * @return string variable value or or array of variables */ - public function getConfigVars($varname = null, $search_parents = true) + function getConfigVars($varname = null, $search_parents = true) { + // var_dump($this); $_ptr = $this; $var_array = array(); while ($_ptr !== null) { - if (isset($varname)) { - if (isset($_ptr->config_vars[$varname])) { - return $_ptr->config_vars[$varname]; + if (isset($varname)) { + if (isset($_ptr->config_vars[$varname])) { + return $_ptr->config_vars[$varname]; } } else { - $var_array = array_merge($_ptr->config_vars, $var_array); - } + $var_array = array_merge($_ptr->config_vars, $var_array); + } // not found, try at parent if ($search_parents) { $_ptr = $_ptr->parent; } else { $_ptr = null; } - } + } if (isset($varname)) { - return ''; + return ''; } else { return $var_array; } @@ -401,16 +380,16 @@ class Smarty_Internal_Data { * Deassigns a single or all config variables * * @param string $varname variable name or null - * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining */ - public function clearConfig($varname = null) + function clearConfig($varname = null) { if (isset($varname)) { unset($this->config_vars[$varname]); + return; } else { $this->config_vars = array(); + return; } - return $this; } } @@ -420,23 +399,19 @@ class Smarty_Internal_Data { * * The Smarty data object will hold Smarty variables in the current scope * - * @package Smarty - * @subpackage Template + * @param object $parent tpl_vars next higher level of Smarty variables */ class Smarty_Data extends Smarty_Internal_Data { - - /** - * Smarty object - * - * @var Smarty - */ + // array of variable objects + public $tpl_vars = array(); + // back pointer to parent object + public $parent = null; + // config vars + public $config_vars = array(); + // Smarty object public $smarty = null; - /** * create Smarty data object - * - * @param Smarty|array $_parent parent template - * @param Smarty $smarty global smarty instance */ public function __construct ($_parent = null, $smarty = null) { @@ -453,81 +428,45 @@ class Smarty_Data extends Smarty_Internal_Data { throw new SmartyException("Wrong type for template variables"); } } - } - /** * class for the Smarty variable object * * This class defines the Smarty variable object - * - * @package Smarty - * @subpackage Template */ class Smarty_Variable { - - /** - * template variable - * - * @var mixed - */ - public $value = null; - /** - * if true any output of this variable will be not cached - * - * @var boolean - */ - public $nocache = false; - /** - * the scope the variable will have (local,parent or root) - * - * @var int - */ - public $scope = Smarty::SCOPE_LOCAL; - + // template variable + public $value; + public $nocache; + public $scope; /** * create Smarty variable object * - * @param mixed $value the value to assign + * @param mixed $value the value to assign * @param boolean $nocache if true any output of this variable will be not cached - * @param int $scope the scope the variable will have (local,parent or root) + * @param boolean $scope the scope the variable will have (local,parent or root) */ - public function __construct($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL) + public function __construct ($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL) { $this->value = $value; $this->nocache = $nocache; $this->scope = $scope; } - /** - * <> String conversion - * - * @return string - */ - public function __toString() + public function __toString () { - return (string) $this->value; + return $this->value; } - } /** * class for undefined variable object * * This class defines an object for undefined variable handling - * - * @package Smarty - * @subpackage Template */ class Undefined_Smarty_Variable { - - /** - * Returns FALSE for 'nocache' and NULL otherwise. - * - * @param string $name - * @return bool - */ - public function __get($name) + // return always false + public function __get ($name) { if ($name == 'nocache') { return false; @@ -535,17 +474,6 @@ class Undefined_Smarty_Variable { return null; } } - - /** - * Always returns an empty string. - * - * @return string - */ - public function __toString() - { - return ""; - } - } ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_debug.php b/gosa-core/include/smarty/sysplugins/smarty_internal_debug.php index 2aea13f30..e605ca8b6 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_debug.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_debug.php @@ -1,206 +1,169 @@ smarty; - } - $_assigned_vars = $ptr->tpl_vars; - ksort($_assigned_vars); - $_config_vars = $ptr->config_vars; - ksort($_config_vars); - $smarty->registered_filters = array(); - $smarty->autoload_filters = array(); - $smarty->default_modifiers = array(); - $smarty->force_compile = false; - $smarty->left_delimiter = '{'; - $smarty->right_delimiter = '}'; - $smarty->debugging = false; - $smarty->force_compile = false; - $_template = new Smarty_Internal_Template($smarty->debug_tpl, $smarty); - $_template->caching = false; - $_template->disableSecurity(); - $_template->cache_id = null; - $_template->compile_id = null; - if ($obj instanceof Smarty_Internal_Template) { - $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name); - } - if ($obj instanceof Smarty) { - $_template->assign('template_data', self::$template_data); - } else { - $_template->assign('template_data', null); - } - $_template->assign('assigned_vars', $_assigned_vars); - $_template->assign('config_vars', $_config_vars); - $_template->assign('execution_time', microtime(true) - $smarty->start_time); - echo $_template->fetch(); - } + /** + * End logging of compile time + */ + public static function end_render($template) + { + $key = self::get_key($template); + self::$template_data[$key]['render_time'] += microtime(true) - self::$template_data[$key]['start_time']; + } - /** - * Recursively gets variables from all template/data scopes - * - * @param Smarty_Internal_Template|Smarty_Data $obj object to debug - * @return StdClass - */ - public static function get_debug_vars($obj) - { - $config_vars = $obj->config_vars; - $tpl_vars = array(); - foreach ($obj->tpl_vars as $key => $var) { - $tpl_vars[$key] = clone $var; - if ($obj instanceof Smarty_Internal_Template) { - $tpl_vars[$key]->scope = $obj->source->type . ':' . $obj->source->name; - } elseif ($obj instanceof Smarty_Data) { - $tpl_vars[$key]->scope = 'Data object'; - } else { - $tpl_vars[$key]->scope = 'Smarty root'; - } - } + /** + * Start logging of cache time + */ + public static function start_cache($template) + { + $key = self::get_key($template); + self::$template_data[$key]['start_time'] = microtime(true); + } - if (isset($obj->parent)) { - $parent = self::get_debug_vars($obj->parent); - $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars); - $config_vars = array_merge($parent->config_vars, $config_vars); - } else { - foreach (Smarty::$global_tpl_vars as $name => $var) { - if (!array_key_exists($name, $tpl_vars)) { - $clone = clone $var; - $clone->scope = 'Global'; - $tpl_vars[$name] = $clone; - } - } - } - return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars); - } + /** + * End logging of cache time + */ + public static function end_cache($template) + { + $key = self::get_key($template); + self::$template_data[$key]['cache_time'] += microtime(true) - self::$template_data[$key]['start_time']; + } + /** + * Opens a window for the Smarty Debugging Consol and display the data + */ + public static function display_debug($obj) + { + // prepare information of assigned variables + $ptr = self::get_debug_vars($obj); + if ($obj instanceof Smarty) { + $smarty = clone $obj; + } else { + $smarty = clone $obj->smarty; + } + $_assigned_vars = $ptr->tpl_vars; + ksort($_assigned_vars); + $_config_vars = $ptr->config_vars; + ksort($_config_vars); + $smarty->left_delimiter = '{'; + $smarty->right_delimiter = '}'; + $smarty->registered_filters = array(); + $smarty->autoload_filters = array(); + $smarty->default_modifiers = array(); + $_template = new Smarty_Internal_Template ($smarty->debug_tpl, $smarty); + $_template->caching = false; + $_template->force_compile = false; + $_template->disableSecurity(); + $_template->cache_id = null; + $_template->compile_id = null; + if ($obj instanceof Smarty_Internal_Template) { + $_template->assign('template_name',$obj->resource_type.':'.$obj->resource_name); + } + if ($obj instanceof Smarty) { + $_template->assign('template_data', self::$template_data); + } else { + $_template->assign('template_data', null); + } + $_template->assign('assigned_vars', $_assigned_vars); + $_template->assign('config_vars', $_config_vars); + $_template->assign('execution_time', microtime(true) - $smarty->start_time); + echo $_template->getRenderedTemplate(); + } + /* + * Recursively gets variables from all template/data scopes + */ + public static function get_debug_vars($obj) + { + $config_vars = $obj->config_vars; + $tpl_vars = array(); + foreach ($obj->tpl_vars as $key => $var) { + $tpl_vars[$key] = clone $var; + if ($obj instanceof Smarty_Internal_Template) { + $tpl_vars[$key]->scope = $obj->resource_type.':'.$obj->resource_name; + } elseif ($obj instanceof Smarty_Data) { + $tpl_vars[$key]->scope = 'Data object'; + } else { + $tpl_vars[$key]->scope = 'Smarty root'; + } + } - /** - * Return key into $template_data for template - * - * @param object $template template object - * @return string key into $template_data - */ - private static function get_key($template) - { - static $_is_stringy = array('string' => true, 'eval' => true); - // calculate Uid if not already done - if ($template->source->uid == '') { - $template->source->filepath; - } - $key = $template->source->uid; - if (isset(self::$template_data[$key])) { - return $key; - } else { - if (isset($_is_stringy[$template->source->type])) { - self::$template_data[$key]['name'] = '\''.substr($template->source->name,0,25).'...\''; - } else { - self::$template_data[$key]['name'] = $template->source->filepath; - } - self::$template_data[$key]['compile_time'] = 0; - self::$template_data[$key]['render_time'] = 0; - self::$template_data[$key]['cache_time'] = 0; - return $key; - } - } + if (isset($obj->parent)) { + $parent = self::get_debug_vars($obj->parent); + $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars); + $config_vars = array_merge($parent->config_vars, $config_vars); + } else { + foreach (Smarty::$global_tpl_vars as $name => $var) { + if (!array_key_exists($name, $tpl_vars)) { + $clone = clone $var; + $clone->scope = 'Global'; + $tpl_vars[$name] = $clone; + } + } + } + return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars); + } + /** + * get_key + */ + static function get_key($template) + { + // calculate Uid if not already done + if ($template->templateUid == '') { + $template->getTemplateFilepath(); + } + $key = $template->templateUid; + if (isset(self::$template_data[$key])) { + return $key; + } else { + self::$template_data[$key]['name'] = $template->getTemplateFilepath(); + self::$template_data[$key]['compile_time'] = 0; + self::$template_data[$key]['render_time'] = 0; + self::$template_data[$key]['cache_time'] = 0; + return $key; + } + } } ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_filter_handler.php b/gosa-core/include/smarty/sysplugins/smarty_internal_filter_handler.php index c9370e1ac..fbd884602 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_filter_handler.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_filter_handler.php @@ -1,70 +1,67 @@ smarty->autoload_filters[$type])) { - foreach ((array)$template->smarty->autoload_filters[$type] as $name) { - $plugin_name = "Smarty_{$type}filter_{$name}"; - if ($template->smarty->loadPlugin($plugin_name)) { - if (function_exists($plugin_name)) { - // use loaded Smarty2 style plugin - $output = $plugin_name($output, $template); - } elseif (class_exists($plugin_name, false)) { - // loaded class of filter plugin - $output = call_user_func(array($plugin_name, 'execute'), $output, $template); - } - } else { - // nothing found, throw exception - throw new SmartyException("Unable to load filter {$plugin_name}"); - } - } - } - // loop over registerd filters of specified type - if (!empty($template->smarty->registered_filters[$type])) { - foreach ($template->smarty->registered_filters[$type] as $key => $name) { - if (is_array($template->smarty->registered_filters[$type][$key])) { - $output = call_user_func($template->smarty->registered_filters[$type][$key], $output, $template); - } else { - $output = $template->smarty->registered_filters[$type][$key]($output, $template); - } - } - } + if ($type != 'variable' || ($template->smarty->variable_filter && $flag !== false) || $flag === true) { + // loop over autoload filters of specified type + if (!empty($template->smarty->autoload_filters[$type])) { + foreach ((array)$template->smarty->autoload_filters[$type] as $name) { + $plugin_name = "Smarty_{$type}filter_{$name}"; + if ($template->smarty->loadPlugin($plugin_name)) { + if (function_exists($plugin_name)) { + // use loaded Smarty2 style plugin + $output = $plugin_name($output, $template); + } elseif (class_exists($plugin_name, false)) { + // loaded class of filter plugin + $output = call_user_func(array($plugin_name, 'execute'), $output, $template); + } + } else { + // nothing found, throw exception + throw new SmartyException("Unable to load filter {$plugin_name}"); + } + } + } + // loop over registerd filters of specified type + if (!empty($template->smarty->registered_filters[$type])) { + foreach ($template->smarty->registered_filters[$type] as $key => $name) { + if (is_array($template->smarty->registered_filters[$type][$key])) { + $output = call_user_func($template->smarty->registered_filters[$type][$key], $output, $template); + } else { + $output = $template->smarty->registered_filters[$type][$key]($output, $template); + } + } + } + } // return filtered output return $output; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_function_call_handler.php b/gosa-core/include/smarty/sysplugins/smarty_internal_function_call_handler.php index 8be744c94..928f04471 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_function_call_handler.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_function_call_handler.php @@ -9,38 +9,24 @@ /** * This class does call function defined with the {function} tag - * - * @package Smarty - * @subpackage PluginsInternal */ -class Smarty_Internal_Function_Call_Handler { - - /** - * This function handles calls to template functions defined by {function} - * It does create a PHP function at the first call - * - * @param string $_name template function name - * @param Smarty_Internal_Template $_template template object - * @param array $_params Smarty variables passed as call paramter - * @param string $_hash nocache hash value - * @param bool $_nocache nocache flag - */ - public static function call($_name, Smarty_Internal_Template $_template, $_params, $_hash, $_nocache) +class Smarty_Internal_Function_Call_Handler extends Smarty_Internal_Template { + static function call ($_name, $_template, $_params, $_hash, $_nocache) { if ($_nocache) { $_function = "smarty_template_function_{$_name}_nocache"; + $_template->smarty->template_functions[$_name]['called_nocache'] = true; } else { $_function = "smarty_template_function_{$_hash}_{$_name}"; } if (!is_callable($_function)) { $_code = "function {$_function}(\$_smarty_tpl,\$params) { \$saved_tpl_vars = \$_smarty_tpl->tpl_vars; - foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}; + foreach (\$_smarty_tpl->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}; foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>"; if ($_nocache) { $_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!", "!\\\'!"), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']); - $_template->smarty->template_functions[$_name]['called_nocache'] = true; } else { $_code .= preg_replace("/{$_template->smarty->template_functions[$_name]['nocache_hash']}/", $_template->properties['nocache_hash'], $_template->smarty->template_functions[$_name]['compiled']); } @@ -49,7 +35,6 @@ class Smarty_Internal_Function_Call_Handler { } $_function($_template, $_params); } - } ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_get_include_path.php b/gosa-core/include/smarty/sysplugins/smarty_internal_get_include_path.php index 7a9739e92..b9f193162 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_get_include_path.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_get_include_path.php @@ -1,43 +1,44 @@ \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_nocache_insert.php b/gosa-core/include/smarty/sysplugins/smarty_internal_nocache_insert.php index 741efe334..76e97816e 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_nocache_insert.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_nocache_insert.php @@ -1,53 +1,49 @@ assign('{$_assign}' , {$_function} (" . var_export($_attr, true) . ",\$_smarty_tpl), true);?>"; } else { $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>"; - } + } $_tpl = $_template; while ($_tpl->parent instanceof Smarty_Internal_Template) { $_tpl = $_tpl->parent; - } + } return "/*%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/"; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_parsetree.php b/gosa-core/include/smarty/sysplugins/smarty_internal_parsetree.php index c9fb1f762..d3bcb22db 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_parsetree.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_parsetree.php @@ -1,160 +1,84 @@ parser = $parser; $this->data = $data; $this->saved_block_nesting = $parser->block_nesting_level; - } + } - /** - * Return buffer content - * - * @return string content - */ public function to_smarty_php() { return $this->data; - } + } - /** - * Return complied code that loads the evaluated outout of buffer content into a temporary variable - * - * @return string template code - */ public function assign_to_var() { $var = sprintf('$_tmp%d', ++$this->parser->prefix_number); - $this->parser->compiler->prefix_code[] = sprintf('%s', $this->data, $var); + $this->parser->compiler->prefix_code[] = sprintf('%s', + $this->data, $var); return $var; - } - -} + } +} /** * Code fragment inside a tag. - * - * @package Smarty - * @subpackage Compiler - * @ignore */ class _smarty_code extends _smarty_parsetree { - - - /** - * Create parse tree buffer for code fragment - * - * @param object $parser parser object - * @param string $data content - */ - public function __construct($parser, $data) + public $parser; + public $data; + function __construct($parser, $data) { $this->parser = $parser; $this->data = $data; - } + } - /** - * Return buffer content in parentheses - * - * @return string content - */ public function to_smarty_php() { return sprintf("(%s)", $this->data); - } - -} + } +} /** * Double quoted string inside a tag. - * - * @package Smarty - * @subpackage Compiler - * @ignore */ class _smarty_doublequoted extends _smarty_parsetree { - - /** - * Create parse tree buffer for double quoted string subtrees - * - * @param object $parser parser object - * @param _smarty_parsetree $subtree parsetree buffer - */ - public function __construct($parser, _smarty_parsetree $subtree) + public $parser; + public $subtrees = Array(); + function __construct($parser, _smarty_parsetree $subtree) { $this->parser = $parser; $this->subtrees[] = $subtree; if ($subtree instanceof _smarty_tag) { $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack); - } - } + } + } - /** - * Append buffer to subtree - * - * @param _smarty_parsetree $subtree parsetree buffer - */ - public function append_subtree(_smarty_parsetree $subtree) + function append_subtree(_smarty_parsetree $subtree) { - $last_subtree = count($this->subtrees) - 1; + $last_subtree = count($this->subtrees)-1; if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof _smarty_tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) { if ($subtree instanceof _smarty_code) { $this->subtrees[$last_subtree]->data .= 'data . ';?>'; @@ -162,119 +86,70 @@ class _smarty_doublequoted extends _smarty_parsetree { $this->subtrees[$last_subtree]->data .= 'data . '";?>'; } else { $this->subtrees[$last_subtree]->data .= $subtree->data; - } + } } else { $this->subtrees[] = $subtree; - } + } if ($subtree instanceof _smarty_tag) { $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack); - } - } + } + } - /** - * Merge subtree buffer content together - * - * @return string compiled template code - */ public function to_smarty_php() { $code = ''; foreach ($this->subtrees as $subtree) { if ($code !== "") { $code .= "."; - } + } if ($subtree instanceof _smarty_tag) { $more_php = $subtree->assign_to_var(); } else { $more_php = $subtree->to_smarty_php(); - } + } $code .= $more_php; if (!$subtree instanceof _smarty_dq_content) { $this->parser->compiler->has_variable_string = true; - } - } + } + } return $code; - } - -} + } +} /** * Raw chars as part of a double quoted string. - * - * @package Smarty - * @subpackage Compiler - * @ignore */ class _smarty_dq_content extends _smarty_parsetree { - - - /** - * Create parse tree buffer with string content - * - * @param object $parser parser object - * @param string $data string section - */ - public function __construct($parser, $data) + public $data; + function __construct($parser, $data) { $this->parser = $parser; $this->data = $data; - } + } - /** - * Return content as double quoted string - * - * @return string doubled quoted string - */ public function to_smarty_php() { return '"' . $this->data . '"'; - } - -} + } +} /** * Template element - * - * @package Smarty - * @subpackage Compiler - * @ignore */ class _smarty_template_buffer extends _smarty_parsetree { - - /** - * Array of template elements - * - * @var array - */ public $subtrees = Array(); - - /** - * Create root of parse tree for template elements - * - * @param object $parser parse object - */ - public function __construct($parser) + function __construct($parser) { $this->parser = $parser; - } + } - /** - * Append buffer to subtree - * - * @param _smarty_parsetree $subtree - */ - public function append_subtree(_smarty_parsetree $subtree) + function append_subtree(_smarty_parsetree $subtree) { $this->subtrees[] = $subtree; - } + } - /** - * Sanitize and merge subtree buffers together - * - * @return string template code content - */ public function to_smarty_php() { $code = ''; @@ -283,113 +158,79 @@ class _smarty_template_buffer extends _smarty_parsetree { if ($this->subtrees[$key] instanceof _smarty_linebreak && $this->subtrees[$key + 1] instanceof _smarty_tag && $this->subtrees[$key + 1]->data == '' && $this->subtrees[$key + 2] instanceof _smarty_linebreak) { $key = $key + 1; continue; - } + } if (substr($this->subtrees[$key]->data, -1) == '<' && $this->subtrees[$key + 1]->data == '' && substr($this->subtrees[$key + 2]->data, -1) == '?') { $key = $key + 2; continue; - } - } + } + } if (substr($code, -1) == '<') { $subtree = $this->subtrees[$key]->to_smarty_php(); if (substr($subtree, 0, 1) == '?') { - $code = substr($code, 0, strlen($code) - 1) . '<?' . substr($subtree, 1); + $code = substr($code, 0, strlen($code)-1) . '<?' . substr($subtree, 1); } elseif ($this->parser->asp_tags && substr($subtree, 0, 1) == '%') { - $code = substr($code, 0, strlen($code) - 1) . '<%' . substr($subtree, 1); - } else { + $code = substr($code, 0, strlen($code)-1) . '<%' . substr($subtree, 1); + } else { $code .= $subtree; - } + } continue; - } + } if ($this->parser->asp_tags && substr($code, -1) == '%') { $subtree = $this->subtrees[$key]->to_smarty_php(); if (substr($subtree, 0, 1) == '>') { - $code = substr($code, 0, strlen($code) - 1) . '%>' . substr($subtree, 1); - } else { + $code = substr($code, 0, strlen($code)-1) . '%>' . substr($subtree, 1); + } else { $code .= $subtree; - } + } continue; - } + } if (substr($code, -1) == '?') { $subtree = $this->subtrees[$key]->to_smarty_php(); if (substr($subtree, 0, 1) == '>') { - $code = substr($code, 0, strlen($code) - 1) . '?>' . substr($subtree, 1); - } else { + $code = substr($code, 0, strlen($code)-1) . '?>' . substr($subtree, 1); + } else { $code .= $subtree; - } + } continue; - } + } $code .= $this->subtrees[$key]->to_smarty_php(); - } + } return $code; - } - + } } /** * template text - * - * @package Smarty - * @subpackage Compiler - * @ignore */ class _smarty_text extends _smarty_parsetree { - - - /** - * Create template text buffer - * - * @param object $parser parser object - * @param string $data text - */ - public function __construct($parser, $data) + public $data; + function __construct($parser, $data) { $this->parser = $parser; $this->data = $data; - } + } - /** - * Return buffer content - * - * @return strint text - */ public function to_smarty_php() { return $this->data; - } - -} + } +} /** * template linebreaks - * - * @package Smarty - * @subpackage Compiler - * @ignore */ class _smarty_linebreak extends _smarty_parsetree { - - /** - * Create buffer with linebreak content - * - * @param object $parser parser object - * @param string $data linebreak string - */ - public function __construct($parser, $data) + public $data; + function __construct($parser, $data) { $this->parser = $parser; $this->data = $data; - } + } - /** - * Return linebrak - * - * @return string linebreak - */ public function to_smarty_php() { return $this->data; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_eval.php b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_eval.php index cf2ec3e1c..c4a75f585 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_eval.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_eval.php @@ -1,94 +1,89 @@ smarty = $smarty; + } + // classes used for compiling Smarty templates from file resource + public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler'; + public $template_lexer_class = 'Smarty_Internal_Templatelexer'; + public $template_parser_class = 'Smarty_Internal_Templateparser'; + // properties + public $usesCompiler = true; + public $isEvaluated = true; /** - * populate Source Object with meta data from Resource - * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * @return void + * Return flag if template source is existing + * + * @return boolean true */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function isExisting($template) { - $source->uid = $source->filepath = sha1($source->name); - $source->timestamp = false; - $source->exists = true; - } + return true; + } /** - * Load template's source from $resource_name into current template object - * - * @uses decode() to decode base64 and urlencoded template_resources - * @param Smarty_Template_Source $source source object - * @return string template source + * Get filepath to template source + * + * @param object $_template template object + * @return string return 'string' as template source is not a file */ - public function getContent(Smarty_Template_Source $source) - { - return $this->decode($source->name); - } - + public function getTemplateFilepath($_template) + { + // no filepath for evaluated strings + // return "string" for compiler error messages + return 'eval:'; + } + /** - * decode base64 and urlencode - * - * @param string $string template_resource to decode - * @return string decoded template_resource + * Get timestamp to template source + * + * @param object $_template template object + * @return boolean false as string resources have no timestamp */ - protected function decode($string) - { - // decode if specified - if (($pos = strpos($string, ':')) !== false) { - if (!strncmp($string, 'base64', 6)) { - return base64_decode(substr($string, 7)); - } elseif (!strncmp($string, 'urlencode', 9)) { - return urldecode(substr($string, 10)); - } - } - - return $string; - } - + public function getTemplateTimestamp($_template) + { + // evaluated strings must always be compiled and have no timestamp + return false; + } + /** - * modify resource_name according to resource handlers specifications - * - * @param Smarty $smarty Smarty instance - * @param string $resource_name resource_name to make unique - * @return string unique resource name + * Retuen template source from resource name + * + * @param object $_template template object + * @return string content of template source */ - protected function buildUniqueResourceName(Smarty $smarty, $resource_name) - { - return get_class($this) . '#' .$this->decode($resource_name); - } + public function getTemplateSource($_template) + { + // return template string + $_template->template_source = $_template->resource_name; + return true; + } /** - * Determine basename for compiled filename - * - * @param Smarty_Template_Source $source source object - * @return string resource's basename + * Get filepath to compiled template + * + * @param object $_template template object + * @return boolean return false as compiled template is not stored */ - protected function getBasename(Smarty_Template_Source $source) - { - return ''; - } - -} - + public function getCompiledFilepath($_template) + { + // no filepath for strings + return false; + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_extends.php b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_extends.php index 53ea3ebcf..7f972c691 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_extends.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_extends.php @@ -1,148 +1,176 @@ smarty = $smarty; + $this->_rdl = preg_quote($smarty->right_delimiter); + $this->_ldl = preg_quote($smarty->left_delimiter); + } + // classes used for compiling Smarty templates from file resource + public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler'; + public $template_lexer_class = 'Smarty_Internal_Templatelexer'; + public $template_parser_class = 'Smarty_Internal_Templateparser'; + // properties + public $usesCompiler = true; + public $isEvaluated = false; + public $allFilepaths = array(); /** - * populate Source Object with meta data from Resource - * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + * Return flag if template source is existing + * + * @param object $_template template object + * @return boolean result + */ + public function isExisting($_template) { - $uid = ''; - $sources = array(); - $components = explode('|', $source->name); - $exists = true; - foreach ($components as $component) { - $s = Smarty_Resource::source(null, $source->smarty, $component); - if ($s->type == 'php') { - throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type"); - } - $sources[$s->uid] = $s; - $uid .= $s->filepath; - if ($_template && $_template->smarty->compile_check) { - $exists == $exists && $s->exists; - } + $_template->getTemplateFilepath(); + foreach ($this->allFilepaths as $_filepath) { + if ($_filepath === false) { + return false; + } } - $source->components = $sources; - $source->filepath = $s->filepath; - $source->uid = sha1($uid); - if ($_template && $_template->smarty->compile_check) { - $source->timestamp = $s->timestamp; - $source->exists = $exists; - } - // need the template at getContent() - $source->template = $_template; - } - + return true; + } /** - * populate Source Object with timestamp and exists from Resource - * - * @param Smarty_Template_Source $source source object - */ - public function populateTimestamp(Smarty_Template_Source $source) + * Get filepath to template source + * + * @param object $_template template object + * @return string filepath to template source file + */ + public function getTemplateFilepath($_template) { - $source->exists = true; - foreach ($source->components as $s) { - $source->exists == $source->exists && $s->exists; - } - $source->timestamp = $s->timestamp; - } + $sha1String = ''; + $_files = explode('|', $_template->resource_name); + foreach ($_files as $_file) { + $_filepath = $_template->buildTemplateFilepath ($_file); + if ($_filepath !== false) { + if (is_object($_template->smarty->security_policy)) { + $_template->smarty->security_policy->isTrustedResourceDir($_filepath); + } + } + $sha1String .= $_filepath; + $this->allFilepaths[$_file] = $_filepath; + } + $_template->templateUid = sha1($sha1String); + return $_filepath; + } /** - * Load template's source from files into current template object - * - * @param Smarty_Template_Source $source source object - * @return string template source - * @throws SmartyException if source cannot be loaded - */ - public function getContent(Smarty_Template_Source $source) + * Get timestamp to template source + * + * @param object $_template template object + * @return integer timestamp of template source file + */ + public function getTemplateTimestamp($_template) { - if (!$source->exists) { - throw new SmartyException("Unable to read template {$source->type} '{$source->name}'"); - } + return filemtime($_template->getTemplateFilepath()); + } - $_rdl = preg_quote($source->smarty->right_delimiter); - $_ldl = preg_quote($source->smarty->left_delimiter); - $_components = array_reverse($source->components); - $_first = reset($_components); - $_last = end($_components); - - foreach ($_components as $_component) { - // register dependency - if ($_component != $_first) { - $source->template->properties['file_dependency'][$_component->uid] = array($_component->filepath, $_component->timestamp, $_component->type); - } - - // read content - $source->filepath = $_component->filepath; - $_content = $_component->content; - - // extend sources - if ($_component != $_last) { - if (preg_match_all("!({$_ldl}block\s(.+?){$_rdl})!", $_content, $_open) != - preg_match_all("!({$_ldl}/block{$_rdl})!", $_content, $_close)) { - throw new SmartyException("unmatched {block} {/block} pairs in template {$_component->type} '{$_component->name}'"); - } - preg_match_all("!{$_ldl}block\s(.+?){$_rdl}|{$_ldl}/block{$_rdl}|{$_ldl}\*([\S\s]*?)\*{$_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE); + /** + * Read template source from file + * + * @param object $_template template object + * @return string content of template source file + */ + public function getTemplateSource($_template) + { + $this->template = $_template; + $_files = array_reverse($this->allFilepaths); + $_first = reset($_files); + $_last = end($_files); + foreach ($_files as $_file => $_filepath) { + if ($_filepath === false) { + throw new SmartyException("Unable to load template 'file : {$_file}'"); + } + // read template file + if ($_filepath != $_first) { + $_template->properties['file_dependency'][sha1($_filepath)] = array($_filepath, filemtime($_filepath),'file'); + } + $_template->template_filepath = $_filepath; + $_content = file_get_contents($_filepath); + if ($_filepath != $_last) { + if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $_open) != + preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $_close)) { + throw new SmartyException("unmatched {block} {/block} pairs in file '$_filepath'"); + } + preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE); $_result_count = count($_result[0]); $_start = 0; - while ($_start+1 < $_result_count) { + while ($_start < $_result_count) { $_end = 0; $_level = 1; - if (substr($_result[0][$_start][0],0,strlen($source->smarty->left_delimiter)+1) == $source->smarty->left_delimiter.'*') { - $_start++; - continue; - } while ($_level != 0) { $_end++; - if (substr($_result[0][$_start + $_end][0],0,strlen($source->smarty->left_delimiter)+1) == $source->smarty->left_delimiter.'*') { - continue; - } if (!strpos($_result[0][$_start + $_end][0], '/')) { $_level++; } else { $_level--; - } - } - $_block_content = str_replace($source->smarty->left_delimiter . '$smarty.block.parent' . $source->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%', substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))); - Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $source->template, $_component->filepath); + } + } + $_block_content = str_replace($this->smarty->left_delimiter . '$smarty.block.parent' . $this->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%', + substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))); + Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $_template, $_filepath); $_start = $_start + $_end + 1; - } + } } else { - return $_content; - } - } + $_template->template_source = $_content; + return true; + } + } } + /** - * Determine basename for compiled filename - * - * @param Smarty_Template_Source $source source object - * @return string resource's basename - */ - public function getBasename(Smarty_Template_Source $source) + * Get filepath to compiled template + * + * @param object $_template template object + * @return string return path to compiled template + */ + public function getCompiledFilepath($_template) { - return str_replace(':', '.', basename($source->filepath)); - } - -} + $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null; + $_files = explode('|', $_template->resource_name); + // calculate Uid if not already done + if ($_template->templateUid == '') { + $_template->getTemplateFilepath(); + } + $_filepath = $_template->templateUid; + // if use_sub_dirs, break file into directories + if ($_template->smarty->use_sub_dirs) { + $_filepath = substr($_filepath, 0, 2) . DS + . substr($_filepath, 2, 2) . DS + . substr($_filepath, 4, 2) . DS + . $_filepath; + } + $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^'; + if (isset($_compile_id)) { + $_filepath = $_compile_id . $_compile_dir_sep . $_filepath; + } + if ($_template->caching) { + $_cache = '.cache'; + } else { + $_cache = ''; + } + $_compile_dir = $_template->smarty->compile_dir; + if (substr($_compile_dir, -1) != DS) { + $_compile_dir .= DS; + } + return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_files[count($_files)-1]) . $_cache . '.php'; + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_file.php b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_file.php index 48b391d20..79decc599 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_file.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_file.php @@ -1,90 +1,128 @@ smarty = $smarty; + } + // classes used for compiling Smarty templates from file resource + public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler'; + public $template_lexer_class = 'Smarty_Internal_Templatelexer'; + public $template_parser_class = 'Smarty_Internal_Templateparser'; + // properties + public $usesCompiler = true; + public $isEvaluated = false; /** - * populate Source Object with meta data from Resource - * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object + * Return flag if template source is existing + * + * @return boolean true */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function isExisting($template) { - $source->filepath = $this->buildFilepath($source, $_template); + if ($template->getTemplateFilepath() === false) { + return false; + } else { + return true; + } + } - if ($source->filepath !== false) { - if (is_object($source->smarty->security_policy)) { - $source->smarty->security_policy->isTrustedResourceDir($source->filepath); - } + /** + * Get filepath to template source + * + * @param object $_template template object + * @return string filepath to template source file + */ + public function getTemplateFilepath($_template) + { + $_filepath = $_template->buildTemplateFilepath (); - $source->uid = sha1($source->filepath); - if ($source->smarty->compile_check && !isset($source->timestamp)) { - $source->timestamp = @filemtime($source->filepath); - $source->exists = !!$source->timestamp; - } - } - } + if ($_filepath !== false) { + if (is_object($_template->smarty->security_policy)) { + $_template->smarty->security_policy->isTrustedResourceDir($_filepath); + } + } + $_template->templateUid = sha1($_filepath); + return $_filepath; + } /** - * populate Source Object with timestamp and exists from Resource - * - * @param Smarty_Template_Source $source source object + * Get timestamp to template source + * + * @param object $_template template object + * @return integer timestamp of template source file */ - public function populateTimestamp(Smarty_Template_Source $source) + public function getTemplateTimestamp($_template) { - $source->timestamp = @filemtime($source->filepath); - $source->exists = !!$source->timestamp; - } + return filemtime($_template->getTemplateFilepath()); + } /** - * Load template's source from file into current template object - * - * @param Smarty_Template_Source $source source object - * @return string template source - * @throws SmartyException if source cannot be loaded + * Read template source from file + * + * @param object $_template template object + * @return string content of template source file */ - public function getContent(Smarty_Template_Source $source) - { - if ($source->timestamp) { - return file_get_contents($source->filepath); - } - if ($source instanceof Smarty_Config_Source) { - throw new SmartyException("Unable to read config {$source->type} '{$source->name}'"); - } - throw new SmartyException("Unable to read template {$source->type} '{$source->name}'"); - } + public function getTemplateSource($_template) + { + // read template file + if (file_exists($_tfp = $_template->getTemplateFilepath())) { + $_template->template_source = file_get_contents($_tfp); + return true; + } else { + return false; + } + } /** - * Determine basename for compiled filename - * - * @param Smarty_Template_Source $source source object - * @return string resource's basename + * Get filepath to compiled template + * + * @param object $_template template object + * @return string return path to compiled template */ - public function getBasename(Smarty_Template_Source $source) + public function getCompiledFilepath($_template) { - $_file = $source->name; - if (($_pos = strpos($_file, ']')) !== false) { - $_file = substr($_file, $_pos + 1); - } - return basename($_file); - } - -} + $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null; + // calculate Uid if not already done + if ($_template->templateUid == '') { + $_template->getTemplateFilepath(); + } + $_filepath = $_template->templateUid; + // if use_sub_dirs, break file into directories + if ($_template->smarty->use_sub_dirs) { + $_filepath = substr($_filepath, 0, 2) . DS + . substr($_filepath, 2, 2) . DS + . substr($_filepath, 4, 2) . DS + . $_filepath; + } + $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^'; + if (isset($_compile_id)) { + $_filepath = $_compile_id . $_compile_dir_sep . $_filepath; + } + if ($_template->caching) { + $_cache = '.cache'; + } else { + $_cache = ''; + } + $_compile_dir = $_template->smarty->compile_dir; + if (strpos('/\\', substr($_compile_dir, -1)) === false) { + $_compile_dir .= DS; + } + return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_template->resource_name) . $_cache . '.php'; + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_php.php b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_php.php index 7cd8baeec..16c77446e 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_php.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_php.php @@ -2,113 +2,126 @@ /** * Smarty Internal Plugin Resource PHP - * + * * Implements the file system as resource for PHP templates - * + * * @package Smarty * @subpackage TemplateResources - * @author Uwe Tews - * @author Rodney Rehm + * @author Uwe Tews */ -class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled { + +/** + * Smarty Internal Plugin Resource PHP + */ +class Smarty_Internal_Resource_PHP { /** - * container for short_open_tag directive's value before executing PHP templates - * @var string + * Class constructor, enable short open tags */ - protected $short_open_tag; + public function __construct($smarty) + { + $this->smarty = $smarty; + ini_set('short_open_tag', '1'); + } + // properties + public $usesCompiler = false; + public $isEvaluated = false; /** - * Create a new PHP Resource - * + * Return flag if template source is existing + * + * @return boolean true */ - public function __construct() + public function isExisting($template) { - $this->short_open_tag = ini_get( 'short_open_tag' ); - } + if ($template->getTemplateFilepath() === false) { + return false; + } else { + return true; + } + } /** - * populate Source Object with meta data from Resource - * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * @return void + * Get filepath to template source + * + * @param object $_template template object + * @return string filepath to template source file */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function getTemplateFilepath($_template) { - $source->filepath = $this->buildFilepath($source, $_template); - - if ($source->filepath !== false) { - if (is_object($source->smarty->security_policy)) { - $source->smarty->security_policy->isTrustedResourceDir($source->filepath); - } + $_filepath = $_template->buildTemplateFilepath (); - $source->uid = sha1($source->filepath); - if ($source->smarty->compile_check) { - $source->timestamp = @filemtime($source->filepath); - $source->exists = !!$source->timestamp; - } - } - } + if (is_object($_template->smarty->security_policy)) { + $_template->smarty->security_policy->isTrustedResourceDir($_filepath); + } + $_template->templateUid = sha1($_filepath); + return $_filepath; + } /** - * populate Source Object with timestamp and exists from Resource - * - * @param Smarty_Template_Source $source source object - * @return void + * Get timestamp to template source + * + * @param object $_template template object + * @return integer timestamp of template source file */ - public function populateTimestamp(Smarty_Template_Source $source) + public function getTemplateTimestamp($_template) { - $source->timestamp = @filemtime($source->filepath); - $source->exists = !!$source->timestamp; - } + return filemtime($_template->getTemplateFilepath()); + } /** - * Load template's source from file into current template object - * - * @param Smarty_Template_Source $source source object - * @return string template source - * @throws SmartyException if source cannot be loaded + * Read template source from file + * + * @param object $_template template object + * @return string content of template source file */ - public function getContent(Smarty_Template_Source $source) + public function getTemplateSource($_template) { - if ($source->timestamp) { - return ''; - } - throw new SmartyException("Unable to read template {$source->type} '{$source->name}'"); - } + if (file_exists($_tfp = $_template->getTemplateFilepath())) { + $_template->template_source = file_get_contents($_tfp); + return true; + } else { + return false; + } + } /** - * Render and output the template (without using the compiler) - * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * @return void - * @throws SmartyException if template cannot be loaded or allow_php_templates is disabled + * Get filepath to compiled template + * + * @param object $_template template object + * @return boolean return false as compiled template is not stored */ - public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template) - { - $_smarty_template = $_template; + public function getCompiledFilepath($_template) + { + // no filepath for PHP templates + return false; + } - if (!$source->smarty->allow_php_templates) { + /** + * renders the PHP template + */ + public function renderUncompiled($_smarty_template) + { + if (!$this->smarty->allow_php_templates) { throw new SmartyException("PHP templates are disabled"); - } - if (!$source->exists) { - if ($_template->parent instanceof Smarty_Internal_Template) { - $parent_resource = " in '{$_template->parent->template_resource}'"; - } else { - $parent_resource = ''; - } - throw new SmartyException("Unable to load template {$source->type} '{$source->name}'{$parent_resource}"); - } - + } + if ($this->getTemplateFilepath($_smarty_template) === false) { + throw new SmartyException("Unable to load template \"{$_smarty_template->resource_type} : {$_smarty_template->resource_name}\""); + } // prepare variables - extract($_template->getTemplateVars()); - - // include PHP template with short open tags enabled - ini_set( 'short_open_tag', '1' ); - include($source->filepath); - ini_set( 'short_open_tag', $this->short_open_tag ); - } -} + $_smarty_ptr = $_smarty_template; + do { + foreach ($_smarty_ptr->tpl_vars as $_smarty_var => $_smarty_var_object) { + if (isset($_smarty_var_object->value)) { + $$_smarty_var = $_smarty_var_object->value; + } + } + $_smarty_ptr = $_smarty_ptr->parent; + } while ($_smarty_ptr != null); + unset ($_smarty_var, $_smarty_var_object, $_smarty_ptr); + // include PHP template + include($this->getTemplateFilepath($_smarty_template)); + return; + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_registered.php b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_registered.php index 44497b922..467da11a8 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_registered.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_registered.php @@ -1,95 +1,143 @@ filepath = $source->type . ':' . $source->name; - $source->uid = sha1($source->filepath); - if ($source->smarty->compile_check) { - $source->timestamp = $this->getTemplateTimestamp($source); - $source->exists = !!$source->timestamp; + $this->smarty = $template->smarty; + if (isset($resource_type)) { + $template->smarty->registerResource($resource_type, + array("smarty_resource_{$resource_type}_source", + "smarty_resource_{$resource_type}_timestamp", + "smarty_resource_{$resource_type}_secure", + "smarty_resource_{$resource_type}_trusted")); } - } + } + // classes used for compiling Smarty templates from file resource + public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler'; + public $template_lexer_class = 'Smarty_Internal_Templatelexer'; + public $template_parser_class = 'Smarty_Internal_Templateparser'; + // properties + public $usesCompiler = true; + public $isEvaluated = false; /** - * populate Source Object with timestamp and exists from Resource - * - * @param Smarty_Template_Source $source source object - * @return void + * Return flag if template source is existing + * + * @return boolean true */ - public function populateTimestamp(Smarty_Template_Source $source) + public function isExisting($_template) { - $source->timestamp = $this->getTemplateTimestamp($source); - $source->exists = !!$source->timestamp; - } + if (is_integer($_template->getTemplateTimestamp())) { + return true; + } else { + return false; + } + } + /** + * Get filepath to template source + * + * @param object $_template template object + * @return string return 'string' as template source is not a file + */ + public function getTemplateFilepath($_template) + { + $_filepath = $_template->resource_type .':'.$_template->resource_name; + $_template->templateUid = sha1($_filepath); + return $_filepath; + } /** - * Get timestamp (epoch) the template source was modified - * - * @param Smarty_Template_Source $source source object - * @return integer|boolean timestamp (epoch) the template was modified, false if resources has no timestamp + * Get timestamp of template source + * + * @param object $_template template object + * @return int timestamp */ - public function getTemplateTimestamp(Smarty_Template_Source $source) - { + public function getTemplateTimestamp($_template) + { // return timestamp $time_stamp = false; - call_user_func_array($source->smarty->registered_resources[$source->type][0][1], array($source->name, &$time_stamp, $source->smarty)); - return is_numeric($time_stamp) ? (int) $time_stamp : $time_stamp; + call_user_func_array($this->smarty->registered_resources[$_template->resource_type][0][1], + array($_template->resource_name, &$time_stamp, $this->smarty)); + return is_numeric($time_stamp) ? (int)$time_stamp : $time_stamp; } + + /** + * Get timestamp of template source by type and name + * + * @param object $_template template object + * @return int timestamp + */ + public function getTemplateTimestampTypeName($_resource_type, $_resource_name) + { + // return timestamp + $time_stamp = false; + call_user_func_array($this->smarty->registered_resources[$_resource_type][0][1], + array($_resource_name, &$time_stamp, $this->smarty)); + return is_numeric($time_stamp) ? (int)$time_stamp : $time_stamp; + } /** - * Load template's source by invoking the registered callback into current template object - * - * @param Smarty_Template_Source $source source object - * @return string template source - * @throws SmartyException if source cannot be loaded + * Retuen template source from resource name + * + * @param object $_template template object + * @return string content of template source */ - public function getContent(Smarty_Template_Source $source) - { + public function getTemplateSource($_template) + { // return template string - $t = call_user_func_array($source->smarty->registered_resources[$source->type][0][0], array($source->name, &$source->content, $source->smarty)); - if (is_bool($t) && !$t) { - throw new SmartyException("Unable to read template {$source->type} '{$source->name}'"); - } - return $source->content; - } + return call_user_func_array($this->smarty->registered_resources[$_template->resource_type][0][0], + array($_template->resource_name, &$_template->template_source, $this->smarty)); + } /** - * Determine basename for compiled filename - * - * @param Smarty_Template_Source $source source object - * @return string resource's basename + * Get filepath to compiled template + * + * @param object $_template template object + * @return boolean return false as compiled template is not stored */ - protected function getBasename(Smarty_Template_Source $source) - { - return basename($source->name); - } - -} + public function getCompiledFilepath($_template) + { + $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!','_',$_template->compile_id) : null; + // calculate Uid if not already done + if ($_template->templateUid == '') { + $_template->getTemplateFilepath(); + } + $_filepath = $_template->templateUid; + // if use_sub_dirs, break file into directories + if ($_template->smarty->use_sub_dirs) { + $_filepath = substr($_filepath, 0, 2) . DS + . substr($_filepath, 2, 2) . DS + . substr($_filepath, 4, 2) . DS + . $_filepath; + } + $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^'; + if (isset($_compile_id)) { + $_filepath = $_compile_id . $_compile_dir_sep . $_filepath; + } + if ($_template->caching) { + $_cache = '.cache'; + } else { + $_cache = ''; + } + $_compile_dir = $_template->smarty->compile_dir; + if (strpos('/\\', substr($_compile_dir, -1)) === false) { + $_compile_dir .= DS; + } + return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_template->resource_name) . $_cache . '.php'; + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_stream.php b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_stream.php index 85698c232..1878002bf 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_stream.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_stream.php @@ -1,75 +1,100 @@ smarty = $smarty; + } + // classes used for compiling Smarty templates from file resource + public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler'; + public $template_lexer_class = 'Smarty_Internal_Templatelexer'; + public $template_parser_class = 'Smarty_Internal_Templateparser'; + // properties + public $usesCompiler = true; + public $isEvaluated = true; + + /** + * Return flag if template source is existing + * + * @return boolean true + */ + public function isExisting($template) + { + if ($template->getTemplateSource() == '') { + return false; + } else { + return true; + } + } + /** + * Get filepath to template source + * + * @param object $_template template object + * @return string return 'string' as template source is not a file + */ + public function getTemplateFilepath($_template) + { + // no filepath for strings + // return resource name for compiler error messages + return str_replace(':', '://', $_template->template_resource); + } /** - * populate Source Object with meta data from Resource - * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * @return void - */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + * Get timestamp to template source + * + * @param object $_template template object + * @return boolean false as string resources have no timestamp + */ + public function getTemplateTimestamp($_template) { - $source->filepath = str_replace(':', '://', $source->resource); - $source->uid = false; - $source->content = $this->getContent($source); - $source->timestamp = false; - $source->exists = !!$source->content; + // strings must always be compiled and have no timestamp + return false; } /** - * Load template's source from stream into current template object - * - * @param Smarty_Template_Source $source source object - * @return string template source - * @throws SmartyException if source cannot be loaded - */ - public function getContent(Smarty_Template_Source $source) + * Retuen template source from resource name + * + * @param object $_template template object + * @return string content of template source + */ + public function getTemplateSource($_template) { - $t = ''; - // the availability of the stream has already been checked in Smarty_Resource::fetch() - $fp = fopen($source->filepath, 'r+'); - if ($fp) { - while (!feof($fp) && ($current_line = fgets($fp)) !== false) { - $t .= $current_line; + // return template string + $_template->template_source = ''; + if ($fp = fopen(str_replace(':', '://', $_template->template_resource),'r+')) { + while (!feof($fp) && ($current_line = fgets($fp)) !== false ) { + $_template->template_source .= $current_line; } fclose($fp); - return $t; + return true; } else { return false; } } - + /** - * modify resource_name according to resource handlers specifications - * - * @param Smarty $smarty Smarty instance - * @param string $resource_name resource_name to make unique - * @return string unique resource name - */ - protected function buildUniqueResourceName(Smarty $smarty, $resource_name) + * Get filepath to compiled template + * + * @param object $_template template object + * @return boolean return false as compiled template is not stored + */ + public function getCompiledFilepath($_template) { - return get_class($this) . '#' . $resource_name; + // no filepath for strings + return false; } } diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_string.php b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_string.php index 9571337b0..9368f0406 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_string.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_string.php @@ -1,96 +1,133 @@ smarty = $smarty; + } + // classes used for compiling Smarty templates from file resource + public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler'; + public $template_lexer_class = 'Smarty_Internal_Templatelexer'; + public $template_parser_class = 'Smarty_Internal_Templateparser'; + // properties + public $usesCompiler = true; + public $isEvaluated = false; /** - * populate Source Object with meta data from Resource - * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * @return void + * Return flag if template source is existing + * + * @return boolean true */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function isExisting($template) { - $source->uid = $source->filepath = sha1($source->name); - $source->timestamp = 0; - $source->exists = true; - } + return true; + } /** - * Load template's source from $resource_name into current template object - * - * @uses decode() to decode base64 and urlencoded template_resources - * @param Smarty_Template_Source $source source object - * @return string template source + * Get filepath to template source + * + * @param object $_template template object + * @return string return 'string' as template source is not a file */ - public function getContent(Smarty_Template_Source $source) - { - return $this->decode($source->name); - } - + public function getTemplateFilepath($_template) + { + $_template->templateUid = sha1($_template->resource_name); + // no filepath for strings + // return "string" for compiler error messages + return 'string:'; + } + /** - * decode base64 and urlencode - * - * @param string $string template_resource to decode - * @return string decoded template_resource + * Get timestamp to template source + * + * @param object $_template template object + * @return boolean false as string resources have no timestamp */ - protected function decode($string) - { - // decode if specified - if (($pos = strpos($string, ':')) !== false) { - if (!strncmp($string, 'base64', 6)) { - return base64_decode(substr($string, 7)); - } elseif (!strncmp($string, 'urlencode', 9)) { - return urldecode(substr($string, 10)); - } + public function getTemplateTimestamp($_template) + { + if ($this->isEvaluated) { + //must always be compiled and have no timestamp + return false; + } else { + return 0; } - - return $string; - } - + } + /** - * modify resource_name according to resource handlers specifications - * - * @param Smarty $smarty Smarty instance - * @param string $resource_name resource_name to make unique - * @return string unique resource name + * Get timestamp of template source by type and name + * + * @param object $_template template object + * @return int timestamp (always 0) */ - protected function buildUniqueResourceName(Smarty $smarty, $resource_name) - { - return get_class($this) . '#' .$this->decode($resource_name); - } + public function getTemplateTimestampTypeName($_resource_type, $_resource_name) + { + // return timestamp 0 + return 0; + } + /** - * Determine basename for compiled filename - * - * Always returns an empty string. - * - * @param Smarty_Template_Source $source source object - * @return string resource's basename + * Retuen template source from resource name + * + * @param object $_template template object + * @return string content of template source */ - protected function getBasename(Smarty_Template_Source $source) - { - return ''; - } + public function getTemplateSource($_template) + { + // return template string + $_template->template_source = $_template->resource_name; + return true; + } -} + /** + * Get filepath to compiled template + * + * @param object $_template template object + * @return boolean return false as compiled template is not stored + */ + public function getCompiledFilepath($_template) + { + $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null; + // calculate Uid if not already done + if ($_template->templateUid == '') { + $_template->getTemplateFilepath(); + } + $_filepath = $_template->templateUid; + // if use_sub_dirs, break file into directories + if ($_template->smarty->use_sub_dirs) { + $_filepath = substr($_filepath, 0, 2) . DS + . substr($_filepath, 2, 2) . DS + . substr($_filepath, 4, 2) . DS + . $_filepath; + } + $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^'; + if (isset($_compile_id)) { + $_filepath = $_compile_id . $_compile_dir_sep . $_filepath; + } + if ($_template->caching) { + $_cache = '.cache'; + } else { + $_cache = ''; + } + $_compile_dir = $_template->smarty->compile_dir; + if (strpos('/\\', substr($_compile_dir, -1)) === false) { + $_compile_dir .= DS; + } + return $_compile_dir . $_filepath . '.' . $_template->resource_type . $_cache . '.php'; + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php b/gosa-core/include/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php index 1ec1aa430..dcc89c673 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php @@ -1,127 +1,72 @@ smarty = $smarty; - parent::__construct(); + parent::__construct(); // get required plugins $this->lexer_class = $lexer_class; $this->parser_class = $parser_class; - } + } /** * Methode to compile a Smarty template - * - * @param mixed $_content template source + * + * @param $_content template source * @return bool true if compiling succeeded, false if it failed */ protected function doCompile($_content) { /* here is where the compiling takes place. Smarty - tags in the templates are replaces with PHP code, - then written to compiled files. */ + tags in the templates are replaces with PHP code, + then written to compiled files. */ // init the lexer/parser to compile the template $this->lex = new $this->lexer_class($_content, $this); $this->parser = new $this->parser_class($this->lex, $this); - if ($this->smarty->_parserdebug) - $this->parser->PrintTrace(); + if (isset($this->smarty->_parserdebug)) $this->parser->PrintTrace(); // get tokens from lexer and parse them while ($this->lex->yylex() && !$this->abort_and_recompile) { - if ($this->smarty->_parserdebug) { - echo "
Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token " .
-                    htmlentities($this->lex->value) . "
"; - } + if (isset($this->smarty->_parserdebug)) echo "
Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token " . htmlentities($this->lex->value) . "
"; $this->parser->doParse($this->lex->token, $this->lex->value); - } + } if ($this->abort_and_recompile) { // exit here on abort return false; - } + } // finish parsing process - $this->parser->doParse(0, 0); + $this->parser->doParse(0, 0); // check for unclosed tags if (count($this->_tag_stack) > 0) { // get stacked info - list($openTag, $_data) = array_pop($this->_tag_stack); - $this->trigger_template_error("unclosed {" . $openTag . "} tag"); - } + list($_open_tag, $_data) = array_pop($this->_tag_stack); + $this->trigger_template_error("unclosed {" . $_open_tag . "} tag"); + } // return compiled code // return str_replace(array("? >\nparser->retvalue); return $this->parser->retvalue; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_template.php b/gosa-core/include/smarty/sysplugins/smarty_internal_template.php index a69eb0490..4ddf2986b 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_template.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_template.php @@ -1,117 +1,87 @@ array(), + public $write_compiled_code = true; + // Rendered content + public $rendered_content = null; + // Cache file + private $cached_filepath = null; + public $cached_timestamp = null; + private $isCached = null; +// private $cache_resource_object = null; + private $cacheFileChecked = false; + // template variables + public $tpl_vars = array(); + public $parent = null; + public $config_vars = array(); + // storage for plugin + public $plugin_data = array(); + // special properties + public $properties = array ('file_dependency' => array(), 'nocache_hash' => '', 'function' => array()); - /** - * required plugins - * @var array - */ + // required plugins public $required_plugins = array('compiled' => array(), 'nocache' => array()); - /** - * Global smarty instance - * @var Smarty - */ + public $saved_modifier = null; public $smarty = null; - /** - * blocks for template inheritance - * @var array - */ + // blocks for template inheritance public $block_data = array(); - /** - * variable filters - * @var array - */ - public $variable_filters = array(); - /** - * optional log of tag/attributes - * @var array - */ + public $wrapper = null; + // optional log of tag/attributes public $used_tags = array(); - /** - * internal flag to allow relative path in child template blocks - * @var bool - */ - public $allow_relative_path = false; - /** - * internal capture runtime stack - * @var array - */ - public $_capture_stack = array(); - /** * Create template data object * * Some of the global Smarty settings copied to template scope * It load the required template resources and cacher plugins * - * @param string $template_resource template resource string - * @param Smarty $smarty Smarty instance - * @param Smarty_Internal_Template $_parent back pointer to parent object with variables or null - * @param mixed $_cache_id cache id or null - * @param mixed $_compile_id compile id or null - * @param bool $_caching use caching? - * @param int $_cache_lifetime cache life-time in seconds + * @param string $template_resource template resource string + * @param object $_parent back pointer to parent object with variables or null + * @param mixed $_cache_id cache id or null + * @param mixed $_compile_id compile id or null */ public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null) { @@ -120,16 +90,81 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase { $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id; $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id; $this->caching = $_caching === null ? $this->smarty->caching : $_caching; - if ($this->caching === true) - $this->caching = Smarty::CACHING_LIFETIME_CURRENT; - $this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime; + if ($this->caching === true) $this->caching = Smarty::CACHING_LIFETIME_CURRENT; + $this->cache_lifetime = $_cache_lifetime === null ?$this->smarty->cache_lifetime : $_cache_lifetime; $this->parent = $_parent; + // dummy local smarty variable + $this->tpl_vars['smarty'] = new Smarty_Variable; // Template resource $this->template_resource = $template_resource; // copy block data of template inheritance if ($this->parent instanceof Smarty_Internal_Template) { - $this->block_data = $this->parent->block_data; + $this->block_data = $this->parent->block_data; } + + } + + /** + * Returns the template filepath + * + * The template filepath is determined by the actual resource handler + * + * @return string the template filepath + */ + public function getTemplateFilepath () + { + return $this->template_filepath === null ? + $this->template_filepath = $this->resource_object->getTemplateFilepath($this) : + $this->template_filepath; + } + + /** + * Returns the timpestamp of the template source + * + * The template timestamp is determined by the actual resource handler + * + * @return integer the template timestamp + */ + public function getTemplateTimestamp () + { + return $this->template_timestamp === null ? + $this->template_timestamp = $this->resource_object->getTemplateTimestamp($this) : + $this->template_timestamp; + } + + /** + * Returns the template source code + * + * The template source is being read by the actual resource handler + * + * @return string the template source + */ + public function getTemplateSource () + { + if ($this->template_source === null) { + if (!$this->resource_object->getTemplateSource($this)) { + throw new SmartyException("Unable to read template {$this->resource_type} '{$this->resource_name}'"); + } + } + return $this->template_source; + } + + /** + * Returns if the template is existing + * + * The status is determined by the actual resource handler + * + * @return boolean true if the template exists + */ + public function isExisting ($error = false) + { + if ($this->isExisting === null) { + $this->isExisting = $this->resource_object->isExisting($this); + } + if (!$this->isExisting && $error) { + throw new SmartyException("Unable to load template {$this->resource_type} '{$this->resource_name}'"); + } + return $this->isExisting; } /** @@ -139,201 +174,609 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase { * * @return boolean true if the template must be compiled */ - public function mustCompile() + public function mustCompile () { - if (!$this->source->exists) { - if ($this->parent instanceof Smarty_Internal_Template) { - $parent_resource = " in '$this->parent->template_resource}'"; - } else { - $parent_resource = ''; - } - throw new SmartyException("Unable to load template {$this->source->type} '{$this->source->name}'{$parent_resource}"); - } + $this->isExisting(true); if ($this->mustCompile === null) { - $this->mustCompile = (!$this->source->uncompiled && ($this->smarty->force_compile || $this->source->recompiled || $this->compiled->timestamp === false || - ($this->smarty->compile_check && $this->compiled->timestamp < $this->source->timestamp))); + $this->mustCompile = ($this->resource_object->usesCompiler && ($this->smarty->force_compile || $this->resource_object->isEvaluated || $this->getCompiledTimestamp () === false || + // ($this->smarty->compile_check && $this->getCompiledTimestamp () !== $this->getTemplateTimestamp ()))); + ($this->smarty->compile_check && $this->getCompiledTimestamp () < $this->getTemplateTimestamp ()))); } return $this->mustCompile; } + /** + * Returns the compiled template filepath + * + * @return string the template filepath + */ + public function getCompiledFilepath () + { + return $this->compiled_filepath === null ? + ($this->compiled_filepath = !$this->resource_object->isEvaluated ? $this->resource_object->getCompiledFilepath($this) : false) : + $this->compiled_filepath; + } + + /** + * Returns the timpestamp of the compiled template + * + * @return integer the template timestamp + */ + public function getCompiledTimestamp () + { + return $this->compiled_timestamp === null ? + ($this->compiled_timestamp = (!$this->resource_object->isEvaluated && file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false) : + $this->compiled_timestamp; + } + + /** + * Returns the compiled template + * + * It checks if the template must be compiled or just read from the template resource + * + * @return string the compiled template + */ + public function getCompiledTemplate () + { + if ($this->compiled_template === null) { + // see if template needs compiling. + if ($this->mustCompile()) { + $this->compileTemplateSource(); + } else { + if ($this->compiled_template === null) { + $this->compiled_template = !$this->resource_object->isEvaluated && $this->resource_object->usesCompiler ? file_get_contents($this->getCompiledFilepath()) : false; + } + } + } + return $this->compiled_template; + } + /** * Compiles the template * * If the template is not evaluated the compiled template is saved on disk */ - public function compileTemplateSource() + public function compileTemplateSource () { - if (!$this->source->recompiled) { + if (!$this->resource_object->isEvaluated) { $this->properties['file_dependency'] = array(); - if ($this->source->components) { - // uses real resource for file dependency - $source = end($this->source->components); - $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $source->type); - } else { - $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $this->source->type); - } + $this->properties['file_dependency'][$this->templateUid] = array($this->getTemplateFilepath(), $this->getTemplateTimestamp(),$this->resource_type); } if ($this->smarty->debugging) { Smarty_Internal_Debug::start_compile($this); } + // compile template + if (!is_object($this->compiler_object)) { + // load compiler + $this->smarty->loadPlugin($this->resource_object->compiler_class); + $this->compiler_object = new $this->resource_object->compiler_class($this->resource_object->template_lexer_class, $this->resource_object->template_parser_class, $this->smarty); + } // compile locking - if ($this->smarty->compile_locking && !$this->source->recompiled) { - if ($saved_timestamp = $this->compiled->timestamp) { - touch($this->compiled->filepath); + if ($this->smarty->compile_locking && !$this->resource_object->isEvaluated) { + if ($saved_timestamp = $this->getCompiledTimestamp()) { + touch($this->getCompiledFilepath()); } } // call compiler try { - $code = $this->compiler->compileTemplate($this); - } catch (Exception $e) { + $this->compiler_object->compileTemplate($this); + } + catch (Exception $e) { // restore old timestamp in case of error - if ($this->smarty->compile_locking && !$this->source->recompiled && $saved_timestamp) { - touch($this->compiled->filepath, $saved_timestamp); + if ($this->smarty->compile_locking && !$this->resource_object->isEvaluated && $saved_timestamp) { + touch($this->getCompiledFilepath(), $saved_timestamp); } throw $e; } // compiling succeded - if (!$this->source->recompiled && $this->compiler->write_compiled_code) { + if (!$this->resource_object->isEvaluated && $this->write_compiled_code) { // write compiled template - $_filepath = $this->compiled->filepath; - if ($_filepath === false) - throw new SmartyException('getCompiledFilepath() did not return a destination to save the compiled template to'); - Smarty_Internal_Write_File::writeFile($_filepath, $code, $this->smarty); - $this->compiled->exists = true; - $this->compiled->isCompiled = true; + Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->compiled_template, $this->smarty); } if ($this->smarty->debugging) { Smarty_Internal_Debug::end_compile($this); } - // release compiler object to free memory - unset($this->compiler); + // release objects to free memory + Smarty_Internal_TemplateCompilerBase::$_tag_objects = array(); + unset($this->compiler_object->parser->root_buffer, + $this->compiler_object->parser->current_buffer, + $this->compiler_object->parser, + $this->compiler_object->lex, + $this->compiler_object->template + ); + $this->compiler_object = null; } /** - * Writes the cached template output + * Returns the filepath of the cached template output + * + * The filepath is determined by the actual cache resource * - * @return bool + * @return string the cache filepath */ - public function writeCachedContent($content) + public function getCachedFilepath () { - if ($this->source->recompiled || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) { + return $this->cached_filepath === null ? + $this->cached_filepath = ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) ? false : $this->cache_resource_object->getCachedFilepath($this) : + $this->cached_filepath; + } + + /** + * Returns the timpestamp of the cached template output + * + * The timestamp is determined by the actual cache resource + * + * @return integer the template timestamp + */ + public function getCachedTimestamp () + { + return $this->cached_timestamp === null ? + $this->cached_timestamp = ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) ? false : $this->cache_resource_object->getCachedTimestamp($this) : + $this->cached_timestamp; + } + + /** + * Returns the cached template output + * + * @return string |booelan the template content or false if the file does not exist + */ + public function getCachedContent () + { + return $this->rendered_content === null ? + $this->rendered_content = ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) ? false : $this->cache_resource_object->getCachedContents($this) : + $this->rendered_content; + } + + /** + * Writes the cached template output + */ + public function writeCachedContent ($content) + { + if ($this->resource_object->isEvaluated || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) { // don't write cache file return false; } $this->properties['cache_lifetime'] = $this->cache_lifetime; - $this->properties['unifunc'] = 'content_' . uniqid(); - $content = $this->createTemplateCodeFrame($content, true); - $_smarty_tpl = $this; - eval("?>" . $content); - $this->cached->valid = true; - $this->cached->processed = true; - return $this->cached->write($this, $content); + return $this->cache_resource_object->writeCachedContent($this, $this->createPropertyHeader(true) .$content); } /** - * Template code runtime function to get subtemplate content + * Checks of a valid version redered HTML output is in the cache + * + * If the cache is valid the contents is stored in the 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 integer $caching cache mode - * @param integer $cache_lifetime life time of cache data - * @param array $vars optional variables to assign - * @param int $parent_scope scope in which {include} should execute - * @returns string template content + * @return boolean true if cache is valid */ - public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope) + public function isCached ($template = null, $cache_id = null, $compile_id = null, $parent = null) { - // already in template cache? - $unique_template_name = Smarty_Resource::getUniqueTemplateName($this->smarty, $template); - $_templateId = sha1($unique_template_name . $cache_id . $compile_id); - if (isset($this->smarty->template_objects[$_templateId])) { - // clone cached template object because of possible recursive call - $tpl = clone $this->smarty->template_objects[$_templateId]; - $tpl->parent = $this; - $tpl->caching = $caching; - $tpl->cache_lifetime = $cache_lifetime; - } else { - $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime); - } - // get variables from calling scope - if ($parent_scope == Smarty::SCOPE_LOCAL) { - $tpl->tpl_vars = $this->tpl_vars; - } elseif ($parent_scope == Smarty::SCOPE_PARENT) { - $tpl->tpl_vars = &$this->tpl_vars; - } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) { - $tpl->tpl_vars = &Smarty::$global_tpl_vars; - } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) { - $tpl->tpl_vars = &$this->tpl_vars; + if ($template === null) { + $no_render = true; + } elseif ($template === false) { + $no_render = false; + } else { + if ($parent === null) { + $parent = $this; + } + $this->smarty->isCached ($template, $cache_id, $compile_id, $parent); + } + if ($this->isCached === null) { + $this->isCached = false; + if (($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED) && !$this->resource_object->isEvaluated) { + $cachedTimestamp = $this->getCachedTimestamp(); + if ($cachedTimestamp === false || $this->smarty->force_compile || $this->smarty->force_cache) { + return $this->isCached; + } + if ($this->caching === Smarty::CACHING_LIFETIME_SAVED || ($this->caching == Smarty::CACHING_LIFETIME_CURRENT && (time() <= ($cachedTimestamp + $this->cache_lifetime) || $this->cache_lifetime < 0))) { + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_cache($this); + } + $this->rendered_content = $this->cache_resource_object->getCachedContents($this, $no_render); + if ($this->smarty->debugging) { + Smarty_Internal_Debug::end_cache($this); + } + if ($this->cacheFileChecked) { + $this->isCached = true; + return $this->isCached; + } + $this->cacheFileChecked = true; + if ($this->caching === Smarty::CACHING_LIFETIME_SAVED && $this->properties['cache_lifetime'] >= 0 && (time() > ($this->getCachedTimestamp() + $this->properties['cache_lifetime']))) { + $this->tpl_vars = array(); + $this->tpl_vars['smarty'] = new Smarty_Variable; + $this->rendered_content = null; + return $this->isCached; + } + if (!empty($this->properties['file_dependency']) && $this->smarty->compile_check) { + $resource_type = null; + $resource_name = null; + foreach ($this->properties['file_dependency'] as $_file_to_check) { + If ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'extends' || $_file_to_check[2] == 'php') { + $mtime = filemtime($_file_to_check[0]); + } else { + $this->getResourceTypeName($_file_to_check[0], $resource_type, $resource_name); + $resource_handler = $this->loadTemplateResourceHandler($resource_type); + $mtime = $resource_handler->getTemplateTimestampTypeName($resource_type, $resource_name); + } + // If ($mtime > $this->getCachedTimestamp()) { + If ($mtime > $_file_to_check[1]) { + $this->tpl_vars = array(); + $this->tpl_vars['smarty'] = new Smarty_Variable; + $this->rendered_content = null; + return $this->isCached; + } + } + } + $this->isCached = true; + } + } + } + return $this->isCached; + } + + /** + * Render the output using the compiled template or the PHP template source + * + * The rendering process is accomplished by just including the PHP files. + * The only exceptions are evaluated templates (string template). Their code has + * to be evaluated + */ + public function renderTemplate () + { + if ($this->resource_object->usesCompiler) { + if ($this->mustCompile() && $this->compiled_template === null) { + $this->compileTemplateSource(); + } + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_render($this); + } + $_smarty_tpl = $this; + ob_start(); + if ($this->resource_object->isEvaluated) { + eval("?>" . $this->compiled_template); + } else { + include($this->getCompiledFilepath ()); + // check file dependencies at compiled code + if ($this->smarty->compile_check) { + if (!empty($this->properties['file_dependency'])) { + $this->mustCompile = false; + $resource_type = null; + $resource_name = null; + foreach ($this->properties['file_dependency'] as $_file_to_check) { + If ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'extends' || $_file_to_check[2] == 'php') { + $mtime = filemtime($_file_to_check[0]); + } else { + $this->getResourceTypeName($_file_to_check[0], $resource_type, $resource_name); + $resource_handler = $this->loadTemplateResourceHandler($resource_type); + $mtime = $resource_handler->getTemplateTimestampTypeName($resource_type, $resource_name); + } + // If ($mtime != $_file_to_check[1]) { + If ($mtime > $_file_to_check[1]) { + $this->mustCompile = true; + break; + } + } + if ($this->mustCompile) { + // recompile and render again + ob_get_clean(); + $this->compileTemplateSource(); + ob_start(); + include($this->getCompiledFilepath ()); + } + } + } + } } else { - $tpl->tpl_vars = &$scope_ptr->tpl_vars; + if (is_callable(array($this->resource_object, 'renderUncompiled'))) { + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_render($this); + } + ob_start(); + $this->resource_object->renderUncompiled($this); + } else { + throw new SmartyException("Resource '$this->resource_type' must have 'renderUncompiled' methode"); + } + } + $this->rendered_content = ob_get_clean(); + if (!$this->resource_object->isEvaluated && empty($this->properties['file_dependency'][$this->templateUid])) { + $this->properties['file_dependency'][$this->templateUid] = array($this->getTemplateFilepath(), $this->getTemplateTimestamp(),$this->resource_type); } - $tpl->config_vars = $this->config_vars; - if (!empty($data)) { - // set up variable values - foreach ($data as $_key => $_val) { - $tpl->tpl_vars[$_key] = new Smarty_variable($_val); + if ($this->parent instanceof Smarty_Internal_Template) { + $this->parent->properties['file_dependency'] = array_merge($this->parent->properties['file_dependency'], $this->properties['file_dependency']); + foreach($this->required_plugins as $code => $tmp1) { + foreach($tmp1 as $name => $tmp) { + foreach($tmp as $type => $data) { + $this->parent->required_plugins[$code][$name][$type] = $data; + } + } + } + } + if ($this->smarty->debugging) { + Smarty_Internal_Debug::end_render($this); + } + // write to cache when nessecary + if (!$this->resource_object->isEvaluated && ($this->caching == Smarty::CACHING_LIFETIME_SAVED || $this->caching == Smarty::CACHING_LIFETIME_CURRENT)) { + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_cache($this); + } + $this->properties['has_nocache_code'] = false; + // get text between non-cached items + $cache_split = preg_split("!/\*%%SmartyNocache:{$this->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$this->properties['nocache_hash']}%%\*/!s", $this->rendered_content); + // get non-cached items + preg_match_all("!/\*%%SmartyNocache:{$this->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$this->properties['nocache_hash']}%%\*/!s", $this->rendered_content, $cache_parts); + $output = ''; + // loop over items, stitch back together + foreach($cache_split as $curr_idx => $curr_split) { + // escape PHP tags in template content + $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '', $curr_split); + if (isset($cache_parts[0][$curr_idx])) { + $this->properties['has_nocache_code'] = true; + // remove nocache tags from cache output + $output .= preg_replace("!/\*/?%%SmartyNocache:{$this->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]); + } + } + if (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output'])) { + $output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $this); + } + // rendering (must be done before writing cache file because of {function} nocache handling) + $_smarty_tpl = $this; + ob_start(); + eval("?>" . $output); + $this->rendered_content = ob_get_clean(); + // write cache file content + $this->writeCachedContent(''. $output. ''); + if ($this->smarty->debugging) { + Smarty_Internal_Debug::end_cache($this); + } + } else { + // var_dump('renderTemplate', $this->has_nocache_code, $this->template_resource, $this->properties['nocache_hash'], $this->parent->properties['nocache_hash'], $this->rendered_content); + if ($this->has_nocache_code && !empty($this->properties['nocache_hash']) && !empty($this->parent->properties['nocache_hash'])) { + // replace nocache_hash + $this->rendered_content = preg_replace("/{$this->properties['nocache_hash']}/", $this->parent->properties['nocache_hash'], $this->rendered_content); + $this->parent->has_nocache_code = $this->has_nocache_code; } } - return $tpl->fetch(null, null, null, null, false, false, true); } /** - * Template code runtime function to set up an inline subtemplate + * Returns the rendered HTML output + * + * If the cache is valid the cached content is used, otherwise + * the output is rendered from the compiled template or PHP template source * - * @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 integer $caching cache mode - * @param integer $cache_lifetime life time of cache data - * @param array $vars optional variables to assign - * @param int $parent_scope scope in which {include} should execute - * @param string $hash nocache hash code - * @returns string template content + * @return string rendered HTML output */ - public function setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash) + public function getRenderedTemplate () { - $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime); - $tpl->properties['nocache_hash'] = $hash; - // get variables from calling scope - if ($parent_scope == Smarty::SCOPE_LOCAL ) { - $tpl->tpl_vars = $this->tpl_vars; - } elseif ($parent_scope == Smarty::SCOPE_PARENT) { - $tpl->tpl_vars = &$this->tpl_vars; - } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) { - $tpl->tpl_vars = &Smarty::$global_tpl_vars; - } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) { - $tpl->tpl_vars = &$this->tpl_vars; - } else { - $tpl->tpl_vars = &$scope_ptr->tpl_vars; + // disable caching for evaluated code + if ($this->resource_object->isEvaluated) { + $this->caching = false; + } + // checks if template exists + $this->isExisting(true); + // read from cache or render + if ($this->rendered_content === null) { + if ($this->isCached) { + if ($this->smarty->debugging) { + Smarty_Internal_Debug::start_cache($this); + } + $this->rendered_content = $this->cache_resource_object->getCachedContents($this, false); + if ($this->smarty->debugging) { + Smarty_Internal_Debug::end_cache($this); + } + } + if ($this->isCached === null) { + $this->isCached(false); + } + if (!$this->isCached) { + // render template (not loaded and not in cache) + $this->renderTemplate(); + } + } + $this->updateParentVariables(); + $this->isCached = null; + return $this->rendered_content; + } + + /** + * Parse a template resource in its name and type + * Load required resource handler + * + * @param string $template_resource template resource specification + * @param string $resource_type return resource type + * @param string $resource_name return resource name + * @param object $resource_handler return resource handler object + */ + public function parseResourceName($template_resource, &$resource_type, &$resource_name, &$resource_handler) + { + if (empty($template_resource)) + return false; + $this->getResourceTypeName($template_resource, $resource_type, $resource_name); + $resource_handler = $this->loadTemplateResourceHandler($resource_type); + // cache template object under a unique ID + // do not cache eval resources + if ($resource_type != 'eval') { + $this->smarty->template_objects[sha1($this->template_resource . $this->cache_id . $this->compile_id)] = $this; + } + return true; + } + + /** + * get system filepath to template + */ + public function buildTemplateFilepath ($file = null) + { + if ($file == null) { + $file = $this->resource_name; + } + // relative file name? + if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) { + foreach((array)$this->smarty->template_dir as $_template_dir) { + if (strpos('/\\', substr($_template_dir, -1)) === false) { + $_template_dir .= DS; + } + $_filepath = $_template_dir . $file; + if (file_exists($_filepath)) { + return $_filepath; + } + if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) { + // try PHP include_path + if (($_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath)) !== false) { + return $_filepath; + } + } + } + } + // try absolute filepath + if (file_exists($file)) return $file; + // no tpl file found + if (!empty($this->smarty->default_template_handler_func)) { + if (!is_callable($this->smarty->default_template_handler_func)) { + throw new SmartyException("Default template handler not callable"); + } else { + $_return = call_user_func_array($this->smarty->default_template_handler_func, + array($this->resource_type, $this->resource_name, &$this->template_source, &$this->template_timestamp, $this)); + if (is_string($_return)) { + return $_return; + } elseif ($_return === true) { + return $file; + } + } } - $tpl->config_vars = $this->config_vars; - if (!empty($data)) { - // set up variable values - foreach ($data as $_key => $_val) { - $tpl->tpl_vars[$_key] = new Smarty_variable($_val); + return false; + } + + /** + * Update Smarty variables in other scopes + */ + public function updateParentVariables ($scope = Smarty::SCOPE_LOCAL) + { + $has_root = false; + foreach ($this->tpl_vars as $_key => $_variable) { + $_variable_scope = $this->tpl_vars[$_key]->scope; + if (($scope == Smarty::SCOPE_LOCAL && $_variable_scope == Smarty::SCOPE_LOCAL) || $_key == 'smarty') { + continue; + } + if (isset($this->parent) && ($scope == Smarty::SCOPE_PARENT || $_variable_scope == Smarty::SCOPE_PARENT)) { + if (isset($this->parent->tpl_vars[$_key])) { + // variable is already defined in parent, copy value + $this->parent->tpl_vars[$_key]->value = $this->tpl_vars[$_key]->value; + } else { + // create variable in parent + $this->parent->tpl_vars[$_key] = clone $_variable; + $this->parent->tpl_vars[$_key]->scope = Smarty::SCOPE_LOCAL; + } + } + if ($scope == Smarty::SCOPE_ROOT || $_variable_scope == Smarty::SCOPE_ROOT) { + if ($this->parent == null) { + continue; + } + if (!$has_root) { + // find root + $root_ptr = $this; + while ($root_ptr->parent != null) { + $root_ptr = $root_ptr->parent; + $has_root = true; + } + } + if (isset($root_ptr->tpl_vars[$_key])) { + // variable is already defined in root, copy value + $root_ptr->tpl_vars[$_key]->value = $this->tpl_vars[$_key]->value; + } else { + // create variable in root + $root_ptr->tpl_vars[$_key] = clone $_variable; + $root_ptr->tpl_vars[$_key]->scope = Smarty::SCOPE_LOCAL; + } + } + if ($scope == Smarty::SCOPE_GLOBAL || $_variable_scope == Smarty::SCOPE_GLOBAL) { + if (isset(Smarty::$global_tpl_vars[$_key])) { + // variable is already defined in root, copy value + Smarty::$global_tpl_vars[$_key]->value = $this->tpl_vars[$_key]->value; + } else { + // create global variable + Smarty::$global_tpl_vars[$_key] = clone $_variable; + } + Smarty::$global_tpl_vars[$_key]->scope = Smarty::SCOPE_LOCAL; } } - return $tpl; } + /** + * Split a template resource in its name and type + * + * @param string $template_resource template resource specification + * @param string $resource_type return resource type + * @param string $resource_name return resource name + */ + protected function getResourceTypeName ($template_resource, &$resource_type, &$resource_name) + { + if (strpos($template_resource, ':') === false) { + // no resource given, use default + $resource_type = $this->smarty->default_resource_type; + $resource_name = $template_resource; + } else { + // get type and name from path + list($resource_type, $resource_name) = explode(':', $template_resource, 2); + if (strlen($resource_type) == 1) { + // 1 char is not resource type, but part of filepath + $resource_type = 'file'; + $resource_name = $template_resource; + } + } + } /** - * Create code frame for compiled and cached templates + * Load template resource handler by type * - * @param string $content optional template content - * @param bool $cache flag for cache file - * @return string + * @param string $resource_type template resource type + * @return object resource handler object */ - public function createTemplateCodeFrame($content = '', $cache = false) + protected function loadTemplateResourceHandler ($resource_type) + { + // try registered resource + if (isset($this->smarty->registered_resources[$resource_type])) { + return new Smarty_Internal_Resource_Registered($this); + } else { + // try sysplugins dir + if (in_array($resource_type, array('file', 'string', 'extends', 'php', 'stream', 'eval'))) { + $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($resource_type); + return new $_resource_class($this->smarty); + } else { + // try plugins dir + $_resource_class = 'Smarty_Resource_' . ucfirst($resource_type); + if ($this->smarty->loadPlugin($_resource_class)) { + if (class_exists($_resource_class, false)) { + return new $_resource_class($this->smarty); + } else { + return new Smarty_Internal_Resource_Registered($this, $resource_type); + } + } else { + // try streams + $_known_stream = stream_get_wrappers(); + if (in_array($resource_type, $_known_stream)) { + // is known stream + if (is_object($this->smarty->security_policy)) { + $this->smarty->security_policy->isTrustedStream($resource_type); + } + return new Smarty_Internal_Resource_Stream($this->smarty); + } else { + throw new SmartyException('Unkown resource type \'' . $resource_type . '\''); + } + } + } + } + } + + /** + * Create property header + */ + public function createPropertyHeader ($cache = false) { $plugins_string = ''; // include code for plugins if (!$cache) { if (!empty($this->required_plugins['compiled'])) { $plugins_string = 'required_plugins['compiled'] as $tmp) { - foreach ($tmp as $data) { + foreach($this->required_plugins['compiled'] as $tmp) { + foreach($tmp as $data) { $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n"; } } @@ -341,9 +784,9 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase { } if (!empty($this->required_plugins['nocache'])) { $this->has_nocache_code = true; - $plugins_string .= "properties['nocache_hash']}%%*/smarty; "; - foreach ($this->required_plugins['nocache'] as $tmp) { - foreach ($tmp as $data) { + $plugins_string .= "properties['nocache_hash']}%%*/required_plugins['nocache'] as $tmp) { + foreach($tmp as $data) { $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n"; } } @@ -352,12 +795,9 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase { } // build property code $this->properties['has_nocache_code'] = $this->has_nocache_code; - $output = ''; - if (!$this->source->recompiled) { - $output = "properties['nocache_hash']}%%*/"; - if ($this->smarty->direct_access_security) { - $output .= "if(!defined('SMARTY_DIR')) exit('no direct access allowed');\n"; - } + $properties_string = "properties['nocache_hash']}%%*/" ; + if ($this->smarty->direct_access_security) { + $properties_string .= "if(!defined('SMARTY_DIR')) exit('no direct access allowed');\n"; } if ($cache) { // remove compiled code of{function} definition @@ -366,48 +806,20 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase { // copy code of {function} tags called in nocache mode foreach ($this->smarty->template_functions as $name => $function_data) { if (isset($function_data['called_nocache'])) { - foreach ($function_data['called_functions'] as $func_name) { - $this->smarty->template_functions[$func_name]['called_nocache'] = true; - } - } - } - foreach ($this->smarty->template_functions as $name => $function_data) { - if (isset($function_data['called_nocache'])) { - unset($function_data['called_nocache'], $function_data['called_functions'], $this->smarty->template_functions[$name]['called_nocache']); + unset($function_data['called_nocache'], $this->smarty->template_functions[$name]['called_nocache']); $this->properties['function'][$name] = $function_data; } } } } - $this->properties['version'] = Smarty::SMARTY_VERSION; - if (!isset($this->properties['unifunc'])) { - $this->properties['unifunc'] = 'content_' . uniqid(); - } - if (!$this->source->recompiled) { - $output .= "\$_valid = \$_smarty_tpl->decodeProperties(" . var_export($this->properties, true) . ',' . ($cache ? 'true' : 'false') . "); /*/%%SmartyHeaderCode%%*/?>\n"; - } - if (!$this->source->recompiled) { - $output .= 'properties['unifunc'] . '\')) {function ' . $this->properties['unifunc'] . '($_smarty_tpl) {?>'; - } - $output .= $plugins_string; - $output .= $content; - if (!$this->source->recompiled) { - $output .= ''; - } - return $output; + $properties_string .= "\$_smarty_tpl->decodeProperties(" . var_export($this->properties, true) . "); /*/%%SmartyHeaderCode%%*/?>\n"; + return $properties_string . $plugins_string; } /** - * This function is executed automatically when a compiled or cached template file is included - * - * - Decode saved properties from compiled template and cache files - * - Check if compiled or cache file is valid - * - * @param array $properties special template properties - * @param bool $cache flag if called from cache file - * @return bool flag if compiled or cache file is valid + * Decode saved properties from compiled template and cache files */ - public function decodeProperties($properties, $cache = false) + public function decodeProperties ($properties) { $this->has_nocache_code = $properties['has_nocache_code']; $this->properties['nocache_hash'] = $properties['nocache_hash']; @@ -421,114 +833,31 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase { $this->properties['function'] = array_merge($this->properties['function'], $properties['function']); $this->smarty->template_functions = array_merge($this->smarty->template_functions, $properties['function']); } - $this->properties['version'] = (isset($properties['version'])) ? $properties['version'] : ''; - $this->properties['unifunc'] = $properties['unifunc']; - // check file dependencies at compiled code - $is_valid = true; - if ($this->properties['version'] != Smarty::SMARTY_VERSION) { - $is_valid = false; - } else if (((!$cache && $this->smarty->compile_check && empty($this->compiled->_properties) && !$this->compiled->isCompiled) || $cache && ($this->smarty->compile_check === true || $this->smarty->compile_check === Smarty::COMPILECHECK_ON)) && !empty($this->properties['file_dependency'])) { - foreach ($this->properties['file_dependency'] as $_file_to_check) { - if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'php') { - if ($this->source->filepath == $_file_to_check[0] && isset($this->source->timestamp)) { - // do not recheck current template - $mtime = $this->source->timestamp; - } else { - // file and php types can be checked without loading the respective resource handlers - $mtime = filemtime($_file_to_check[0]); - } - } elseif ($_file_to_check[2] == 'string') { - continue; - } else { - $source = Smarty_Resource::source(null, $this->smarty, $_file_to_check[0]); - $mtime = $source->timestamp; - } - if ($mtime > $_file_to_check[1]) { - $is_valid = false; - break; - } - } - } - if ($cache) { - $this->cached->valid = $is_valid; - } else { - $this->mustCompile = !$is_valid; - } - // store data in reusable Smarty_Template_Compiled - if (!$cache) { - $this->compiled->_properties = $properties; - } - return $is_valid; } /** - * Template code runtime function to create a local Smarty variable for array assignments - * - * @param string $tpl_var tempate variable name - * @param bool $nocache cache mode of variable - * @param int $scope scope of variable + * creates a local Smarty variable for array assignments */ public function createLocalArrayVariable($tpl_var, $nocache = false, $scope = Smarty::SCOPE_LOCAL) { if (!isset($this->tpl_vars[$tpl_var])) { - $this->tpl_vars[$tpl_var] = new Smarty_variable(array(), $nocache, $scope); - } else { - $this->tpl_vars[$tpl_var] = clone $this->tpl_vars[$tpl_var]; - if ($scope != Smarty::SCOPE_LOCAL) { - $this->tpl_vars[$tpl_var]->scope = $scope; - } - if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) { - settype($this->tpl_vars[$tpl_var]->value, 'array'); - } - } - } - - /** - * Template code runtime function to get pointer to template variable array of requested scope - * - * @param int $scope requested variable scope - * @return array array of template variables - */ - public function &getScope($scope) - { - if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) { - return $this->parent->tpl_vars; - } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) { - $ptr = $this->parent; - while (!empty($ptr->parent)) { - $ptr = $ptr->parent; + $tpl_var_inst = $this->getVariable($tpl_var, null, true, false); + if ($tpl_var_inst instanceof Undefined_Smarty_Variable) { + $this->tpl_vars[$tpl_var] = new Smarty_variable(array(), $nocache, $scope); + } else { + $this->tpl_vars[$tpl_var] = clone $tpl_var_inst; + if ($scope != Smarty::SCOPE_LOCAL) { + $this->tpl_vars[$tpl_var]->scope = $scope; + } } - return $ptr->tpl_vars; - } elseif ($scope == Smarty::SCOPE_GLOBAL) { - return Smarty::$global_tpl_vars; } - $null = null; - return $null; - } - - /** - * Get parent or root of template parent chain - * - * @param int $scope pqrent or root scope - * @return mixed object - */ - public function getScopePointer($scope) - { - if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) { - return $this->parent; - } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) { - $ptr = $this->parent; - while (!empty($ptr->parent)) { - $ptr = $ptr->parent; - } - return $ptr; + if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) { + settype($this->tpl_vars[$tpl_var]->value, 'array'); } - return null; } /** * [util function] counts an array, arrayaccess/traversable or PDOStatement object - * * @param mixed $value * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 for empty elements */ @@ -536,12 +865,11 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase { { if (is_array($value) === true || $value instanceof Countable) { return count($value); - } elseif ($value instanceof IteratorAggregate) { - // Note: getIterator() returns a Traversable, not an Iterator - // thus rewind() and valid() methods may not be present - return iterator_count($value->getIterator()); } elseif ($value instanceof Iterator) { - return iterator_count($value); + $value->rewind(); + if ($value->valid()) { + return iterator_count($value); + } } elseif ($value instanceof PDOStatement) { return $value->rowCount(); } elseif ($value instanceof Traversable) { @@ -550,118 +878,125 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase { if ($value->offsetExists(0)) { return 1; } - } elseif (is_object($value)) { + } elseif (is_object($value)) { return count($value); - } - return 0; + } + return 0; } /** - * runtime error not matching capture tags - * + * wrapper for fetch */ - public function capture_error() + public function fetch ($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false) { - throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\""); + if ($template == null) { + return $this->smarty->fetch($this); + } else { + if (!isset($parent)) { + $parent = $this; + } + return $this->smarty->fetch($template, $cache_id, $compile_id, $parent, $display); + } + } - - /** - * Empty cache for this template - * - * @param integer $exp_time expiration time - * @return integer number of cache files deleted - */ - public function clearCache($exp_time=null) + + /** + * wrapper for display + */ + public function display ($template = null, $cache_id = null, $compile_id = null, $parent = null) { - Smarty_CacheResource::invalidLoadedCache($this->smarty); - return $this->cached->handler->clear($this->smarty, $this->template_name, $this->cache_id, $this->compile_id, $exp_time); + if ($template == null) { + return $this->smarty->display($this); + } else { + if (!isset($parent)) { + $parent = $this; + } + return $this->smarty->display($template, $cache_id, $compile_id, $parent); + } + } - - /** + + /** * set Smarty property in template context - * * @param string $property_name property name - * @param mixed $value value + * @param mixed $value value */ public function __set($property_name, $value) { - switch ($property_name) { - case 'source': - case 'compiled': - case 'cached': - case 'compiler': - $this->$property_name = $value; - return; - - // FIXME: routing of template -> smarty attributes - default: - if (property_exists($this->smarty, $property_name)) { - $this->smarty->$property_name = $value; - return; - } + if ($property_name == 'resource_object' || $property_name == 'cache_resource_object') { + $this->$property_name = $value; + } elseif (property_exists($this->smarty, $property_name)) { + $this->smarty->$property_name = $value; + } else { + throw new SmartyException("invalid template property '$property_name'."); } - - throw new SmartyException("invalid template property '$property_name'."); } /** * get Smarty property in template context - * * @param string $property_name property name */ public function __get($property_name) { - switch ($property_name) { - case 'source': - if (empty($this->template_resource)) { - throw new SmartyException("Unable to parse resource name \"{$this->template_resource}\""); - } - $this->source = Smarty_Resource::source($this); - // cache template object under a unique ID - // do not cache eval resources - if ($this->source->type != 'eval') { - $_templateId = sha1($this->source->unique_resource . $this->cache_id . $this->compile_id); - $this->smarty->template_objects[$_templateId] = $this; - } - return $this->source; - - case 'compiled': - $this->compiled = $this->source->getCompiled($this); - return $this->compiled; - - case 'cached': - if (!class_exists('Smarty_Template_Cached')) { - include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php'; - } - $this->cached = new Smarty_Template_Cached($this); - return $this->cached; - - case 'compiler': - $this->smarty->loadPlugin($this->source->compiler_class); - $this->compiler = new $this->source->compiler_class($this->source->template_lexer_class, $this->source->template_parser_class, $this->smarty); - return $this->compiler; - - // FIXME: routing of template -> smarty attributes - default: - if (property_exists($this->smarty, $property_name)) { - return $this->smarty->$property_name; - } + if ($property_name == 'resource_object') { + // load template resource + $this->resource_object = null; + if (!$this->parseResourceName ($this->template_resource, $this->resource_type, $this->resource_name, $this->resource_object)) { + throw new SmartyException ("Unable to parse resource name \"{$this->template_resource}\""); + } + return $this->resource_object; + } + if ($property_name == 'cache_resource_object') { + // load cache resource + $this->cache_resource_object = $this->loadCacheResource(); + return $this->cache_resource_object; + } + if (property_exists($this->smarty, $property_name)) { + return $this->smarty->$property_name; + } else { + throw new SmartyException("template property '$property_name' does not exist."); } - - throw new SmartyException("template property '$property_name' does not exist."); } + /** - * Template data object destrutor + * Takes unknown class methods and lazy loads sysplugin files for them + * class name format: Smarty_Method_MethodName + * plugin filename format: method.methodname.php * + * @param string $name unknown methode name + * @param array $args aurgument array */ - public function __destruct() + public function __call($name, $args) { - if ($this->smarty->cache_locking && isset($this->cached) && $this->cached->is_locked) { - $this->cached->handler->releaseLock($this->smarty, $this->cached); - } + static $camel_func; + if (!isset($camel_func)) + $camel_func = create_function('$c', 'return "_" . strtolower($c[1]);'); + // see if this is a set/get for a property + $first3 = strtolower(substr($name, 0, 3)); + if (in_array($first3, array('set', 'get')) && substr($name, 3, 1) !== '_') { + // try to keep case correct for future PHP 6.0 case-sensitive class methods + // lcfirst() not available < PHP 5.3.0, so improvise + $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4); + // convert camel case to underscored name + $property_name = preg_replace_callback('/([A-Z])/', $camel_func, $property_name); + if (property_exists($this, $property_name)) { + if ($first3 == 'get') + return $this->$property_name; + else + return $this->$property_name = $args[0]; + } + } + // Smarty Backward Compatible wrapper + if (strpos($name,'_') !== false) { + if (!isset($this->wrapper)) { + $this->wrapper = new Smarty_Internal_Wrapper($this); + } + return $this->wrapper->convert($name, $args); + } + // pass call to Smarty object + return call_user_func_array(array($this->smarty,$name),$args); } } - ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_templatecompilerbase.php b/gosa-core/include/smarty/sysplugins/smarty_internal_templatecompilerbase.php index cde968d09..32da800cc 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_templatecompilerbase.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_templatecompilerbase.php @@ -10,108 +10,19 @@ */ /** - * Main abstract compiler class - * - * @package Smarty - * @subpackage Compiler + * Main compiler class */ -abstract class Smarty_Internal_TemplateCompilerBase { - - /** - * hash for nocache sections - * - * @var mixed - */ +class Smarty_Internal_TemplateCompilerBase { + // hash for nocache sections private $nocache_hash = null; - /** - * suppress generation of nocache code - * - * @var bool - */ + // suppress generation of nocache code public $suppressNocacheProcessing = false; - /** - * suppress generation of merged template code - * - * @var bool - */ - public $suppressMergedTemplates = false; - /** - * compile tag objects - * - * @var array - */ - public static $_tag_objects = array(); - /** - * tag stack - * - * @var array - */ + // compile tag objects + static $_tag_objects = array(); + // tag stack public $_tag_stack = array(); - /** - * current template - * - * @var Smarty_Internal_Template - */ + // current template public $template = null; - /** - * merged templates - * - * @var array - */ - public $merged_templates = array(); - /** - * flag when compiling {block} - * - * @var bool - */ - public $inheritance = false; - /** - * plugins loaded by default plugin handler - * - * @var array - */ - public $default_handler_plugins = array(); - /** - * saved preprocessed modifier list - * - * @var mixed - */ - public $default_modifier_list = null; - /** - * force compilation of complete template as nocache - * @var boolean - */ - public $forceNocache = false; - /** - * suppress Smarty header code in compiled template - * @var bool - */ - public $suppressHeader = false; - /** - * suppress template property header code in compiled template - * @var bool - */ - public $suppressTemplatePropertyHeader = false; - /** - * flag if compiled template file shall we written - * @var bool - */ - public $write_compiled_code = true; - /** - * flag if currently a template function is compiled - * @var bool - */ - public $compiles_template_function = false; - /** - * called subfuntions from template function - * @var array - */ - public $called_functions = array(); - /** - * flags for used modifier plugins - * @var array - */ - public $modifier_plugins = array(); /** * Initialize compiler @@ -122,12 +33,12 @@ abstract class Smarty_Internal_TemplateCompilerBase { } /** - * Method to compile a Smarty template + * Methode to compile a Smarty template * - * @param Smarty_Internal_Template $template template object to compile + * @param $template template object to compile * @return bool true if compiling succeeded, false if it failed */ - public function compileTemplate(Smarty_Internal_Template $template) + public function compileTemplate($template) { if (empty($template->properties['nocache_hash'])) { $template->properties['nocache_hash'] = $this->nocache_hash; @@ -139,58 +50,47 @@ abstract class Smarty_Internal_TemplateCompilerBase { $this->tag_nocache = false; // save template object in compiler class $this->template = $template; - // reset has noche code flag - $this->template->has_nocache_code = false; - $this->smarty->_current_file = $saved_filepath = $this->template->source->filepath; + $this->smarty->_current_file = $saved_filepath = $this->template->getTemplateFilepath(); // template header code $template_header = ''; - if (!$this->suppressHeader) { + if (!$template->suppressHeader) { $template_header .= "template->source->filepath . "\" */ ?>\n"; + $template_header .= " compiled from \"" . $this->template->getTemplateFilepath() . "\" */ ?>\n"; } do { // flag for aborting current and start recompile $this->abort_and_recompile = false; // get template source - $_content = $template->source->content; + $_content = $template->getTemplateSource(); // run prefilter if required if (isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) { - $template->source->content = $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template); + $template->template_source = $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template); } // on empty template just return header if ($_content == '') { - if ($this->suppressTemplatePropertyHeader) { - $code = ''; + if ($template->suppressFileDependency) { + $template->compiled_template = ''; } else { - $code = $template_header . $template->createTemplateCodeFrame(); + $template->compiled_template = $template_header . $template->createPropertyHeader(); } - return $code; + return true; } // call compiler $_compiled_code = $this->doCompile($_content); } while ($this->abort_and_recompile); - $this->template->source->filepath = $saved_filepath; - // free memory - unset($this->parser->root_buffer, $this->parser->current_buffer, $this->parser, $this->lex, $this->template); - self::$_tag_objects = array(); + // restore original filepath which could have been modified by template inheritance + $this->template->template_filepath = $saved_filepath; // return compiled code to template object - $merged_code = ''; - if (!$this->suppressMergedTemplates) { - foreach ($this->merged_templates as $code) { - $merged_code .= $code; - } - } - if ($this->suppressTemplatePropertyHeader) { - $code = $_compiled_code . $merged_code; + if ($template->suppressFileDependency) { + $template->compiled_template = $_compiled_code; } else { - $code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code; + $template->compiled_template = $template_header . $template->createPropertyHeader() . $_compiled_code; } // run postfilter if required if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) { - $code = Smarty_Internal_Filter_Handler::runFilter('post', $code, $template); + $template->compiled_template = Smarty_Internal_Filter_Handler::runFilter('post', $template->compiled_template, $template); } - return $code; } /** @@ -199,9 +99,9 @@ abstract class Smarty_Internal_TemplateCompilerBase { * This is a call back from the lexer/parser * It executes the required compile plugin for the Smarty tag * - * @param string $tag tag name - * @param array $args array with tag attributes - * @param array $parameter array with compilation parameter + * @param string $tag tag name + * @param array $args array with tag attributes + * @param array $parameter array with compilation parameter * @return string compiled code */ public function compileTag($tag, $args, $parameter = array()) @@ -212,12 +112,12 @@ abstract class Smarty_Internal_TemplateCompilerBase { $this->has_output = false; // log tag/attributes if (isset($this->smarty->get_used_tags) && $this->smarty->get_used_tags) { - $this->template->used_tags[] = array($tag, $args); + $this->template->used_tags[] = array($tag,$args); } - // check nocache option flag + // check nocache option flag if (in_array("'nocache'",$args) || in_array(array('nocache'=>'true'),$args) - || in_array(array('nocache'=>'"true"'),$args) || in_array(array('nocache'=>"'true'"),$args)) { - $this->tag_nocache = true; + || in_array(array('nocache'=>'"true"'),$args) || in_array(array('nocache'=>"'true'"),$args)) { + $this->tag_nocache = true; } // compile the smarty tag (required compile classes to compile the tag are autoloaded) if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) { @@ -256,7 +156,7 @@ abstract class Smarty_Internal_TemplateCompilerBase { if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_methode'])) { $methode = $parameter['object_methode']; if (!in_array($methode, $this->smarty->registered_objects[$tag][3]) && - (empty($this->smarty->registered_objects[$tag][1]) || in_array($methode, $this->smarty->registered_objects[$tag][1]))) { + (empty($this->smarty->registered_objects[$tag][1]) || in_array($methode, $this->smarty->registered_objects[$tag][1]))) { return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $methode); } elseif (in_array($methode, $this->smarty->registered_objects[$tag][3])) { return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode); @@ -265,10 +165,10 @@ abstract class Smarty_Internal_TemplateCompilerBase { } } // check if tag is registered - foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $plugin_type) { - if (isset($this->smarty->registered_plugins[$plugin_type][$tag])) { + foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $type) { + if (isset($this->smarty->registered_plugins[$type][$tag])) { // if compiler function plugin call it now - if ($plugin_type == Smarty::PLUGIN_COMPILER) { + if ($type == Smarty::PLUGIN_COMPILER) { $new_args = array(); foreach ($args as $key => $mixed) { if (is_array($mixed)) { @@ -277,31 +177,30 @@ abstract class Smarty_Internal_TemplateCompilerBase { $new_args[$key] = $mixed; } } - if (!$this->smarty->registered_plugins[$plugin_type][$tag][1]) { + if (!$this->smarty->registered_plugins[$type][$tag][1]) { $this->tag_nocache = true; } - $function = $this->smarty->registered_plugins[$plugin_type][$tag][0]; + $function = $this->smarty->registered_plugins[$type][$tag][0]; if (!is_array($function)) { return $function($new_args, $this); } else if (is_object($function[0])) { - return $this->smarty->registered_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this); + return $this->smarty->registered_plugins[$type][$tag][0][0]->$function[1]($new_args, $this); } else { - return call_user_func_array($function, array($new_args, $this)); + return call_user_func_array($this->smarty->registered_plugins[$type][$tag][0], array($new_args, $this)); } } // compile registered function or block function - if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) { - return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag); + if ($type == Smarty::PLUGIN_FUNCTION || $type == Smarty::PLUGIN_BLOCK) { + return $this->callTagCompiler('private_registered_' . $type, $args, $parameter, $tag); } - } } // check plugins from plugins folder foreach ($this->smarty->plugin_search_order as $plugin_type) { - if ($plugin_type == Smarty::PLUGIN_BLOCK && $this->smarty->loadPlugin('smarty_compiler_' . $tag) && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))) { + if ($plugin_type == Smarty::PLUGIN_BLOCK && $this->smarty->loadPlugin('smarty_compiler_' . $tag)) { $plugin = 'smarty_compiler_' . $tag; if (is_callable($plugin)) { - // convert arguments format for old compiler plugins + // convert arguments format for old compiler plugins $new_args = array(); foreach ($args as $key => $mixed) { if (is_array($mixed)) { @@ -321,47 +220,7 @@ abstract class Smarty_Internal_TemplateCompilerBase { throw new SmartyException("Plugin \"{$tag}\" not callable"); } else { if ($function = $this->getPlugin($tag, $plugin_type)) { - if(!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) { - return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function); - } - } - } - } - if (is_callable($this->smarty->default_plugin_handler_func)) { - $found = false; - // look for already resolved tags - foreach ($this->smarty->plugin_search_order as $plugin_type) { - if (isset($this->default_handler_plugins[$plugin_type][$tag])) { - $found = true; - break; - } - } - if (!$found) { - // call default handler - foreach ($this->smarty->plugin_search_order as $plugin_type) { - if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) { - $found = true; - break; - } - } - } - if ($found) { - // if compiler function plugin call it now - if ($plugin_type == Smarty::PLUGIN_COMPILER) { - $new_args = array(); - foreach ($args as $mixed) { - $new_args = array_merge($new_args, $mixed); - } - $function = $this->default_handler_plugins[$plugin_type][$tag][0]; - if (!is_array($function)) { - return $function($new_args, $this); - } else if (is_object($function[0])) { - return $this->default_handler_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this); - } else { - return call_user_func_array($function, array($new_args, $this)); - } - } else { - return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag); + return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function); } } } @@ -378,7 +237,7 @@ abstract class Smarty_Internal_TemplateCompilerBase { } } // registered block tag ? - if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag]) || isset($this->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) { + if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) { return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag); } // block plugin? @@ -410,11 +269,11 @@ abstract class Smarty_Internal_TemplateCompilerBase { * class name format: Smarty_Internal_Compile_TagName * plugin filename format: Smarty_Internal_Tagname.php * - * @param string $tag tag name - * @param array $args list of tag attributes - * @param mixed $param1 optional parameter - * @param mixed $param2 optional parameter - * @param mixed $param3 optional parameter + * @param $tag string tag name + * @param $args array with tag attributes + * @param $param1 optional parameter + * @param $param2 optional parameter + * @param $param3 optional parameter * @return string compiled code */ public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null) @@ -427,13 +286,10 @@ abstract class Smarty_Internal_TemplateCompilerBase { // lazy load internal compiler plugin $class_name = 'Smarty_Internal_Compile_' . $tag; if ($this->smarty->loadPlugin($class_name)) { - // check if tag allowed by security - if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) { // use plugin if found self::$_tag_objects[$tag] = new $class_name; // compile this tag return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3); - } } // no internal compile plugin for this tag return false; @@ -442,48 +298,55 @@ abstract class Smarty_Internal_TemplateCompilerBase { /** * Check for plugins and return function name * - * @param string $pugin_name name of plugin or function - * @param string $plugin_type type of plugin + * @param $pugin_name string name of plugin or function + * @param $type string type of plugin * @return string call name of function */ - public function getPlugin($plugin_name, $plugin_type) + public function getPlugin($plugin_name, $type) { $function = null; if ($this->template->caching && ($this->nocache || $this->tag_nocache)) { - if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) { - $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function']; - } else if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) { - $this->template->required_plugins['nocache'][$plugin_name][$plugin_type] = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]; - $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function']; + if (isset($this->template->required_plugins['nocache'][$plugin_name][$type])) { + $function = $this->template->required_plugins['nocache'][$plugin_name][$type]['function']; + } else if (isset($this->template->required_plugins['compiled'][$plugin_name][$type])) { + $this->template->required_plugins['nocache'][$plugin_name][$type] = $this->template->required_plugins['compiled'][$plugin_name][$type]; + $function = $this->template->required_plugins['nocache'][$plugin_name][$type]['function']; } } else { - if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) { - $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function']; - } else if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) { - $this->template->required_plugins['compiled'][$plugin_name][$plugin_type] = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]; - $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function']; + if (isset($this->template->required_plugins['compiled'][$plugin_name][$type])) { + $function = $this->template->required_plugins['compiled'][$plugin_name][$type]['function']; + } else if (isset($this->template->required_plugins['nocache'][$plugin_name][$type])) { + $this->template->required_plugins['compiled'][$plugin_name][$type] = $this->template->required_plugins['nocache'][$plugin_name][$type]; + $function = $this->template->required_plugins['compiled'][$plugin_name][$type]['function']; } } if (isset($function)) { - if ($plugin_type == 'modifier') { - $this->modifier_plugins[$plugin_name] = true; + if ($type == 'modifier') { + $this->template->saved_modifier[$plugin_name] = true; } return $function; } // loop through plugin dirs and find the plugin - $function = 'smarty_' . $plugin_type . '_' . $plugin_name; - $file = $this->smarty->loadPlugin($function, false); - - if (is_string($file)) { + $function = 'smarty_' . $type . '_' . $plugin_name; + $found = false; + foreach((array)$this->smarty->plugins_dir as $_plugin_dir) { + $file = rtrim($_plugin_dir, '/\\') . DS . $type . '.' . $plugin_name . '.php'; + if (file_exists($file)) { + // require_once($file); + $found = true; + break; + } + } + if ($found) { if ($this->template->caching && ($this->nocache || $this->tag_nocache)) { - $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['file'] = $file; - $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'] = $function; + $this->template->required_plugins['nocache'][$plugin_name][$type]['file'] = $file; + $this->template->required_plugins['nocache'][$plugin_name][$type]['function'] = $function; } else { - $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['file'] = $file; - $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'] = $function; + $this->template->required_plugins['compiled'][$plugin_name][$type]['file'] = $file; + $this->template->required_plugins['compiled'][$plugin_name][$type]['function'] = $function; } - if ($plugin_type == 'modifier') { - $this->modifier_plugins[$plugin_name] = true; + if ($type == 'modifier') { + $this->template->saved_modifier[$plugin_name] = true; } return $function; } @@ -493,47 +356,6 @@ abstract class Smarty_Internal_TemplateCompilerBase { } return false; } - - /** - * Check for plugins by default plugin handler - * - * @param string $tag name of tag - * @param string $plugin_type type of plugin - * @return boolean true if found - */ - public function getPluginFromDefaultHandler($tag, $plugin_type) - { - $callback = null; - $script = null; - $result = call_user_func_array( - $this->smarty->default_plugin_handler_func, - array($tag, $plugin_type, $this->template, &$callback, &$script) - ); - if ($result) { - if ($script !== null) { - if (is_file($script)) { - if ($this->template->caching && ($this->nocache || $this->tag_nocache)) { - $this->template->required_plugins['nocache'][$tag][$plugin_type]['file'] = $script; - $this->template->required_plugins['nocache'][$tag][$plugin_type]['function'] = $callback; - } else { - $this->template->required_plugins['compiled'][$tag][$plugin_type]['file'] = $script; - $this->template->required_plugins['compiled'][$tag][$plugin_type]['function'] = $callback; - } - include_once $script; - } else { - throw new SmartyCompilerException("Plugin or modifer script file $script not found"); - } - } - if (is_callable($callback)) { - $this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array()); - return true; - } else { - throw new SmartyCompilerException("Function for plugin or modifier $tag not callable"); - } - } - return false; - } - /** * Inject inline code for nocache template sections * @@ -541,27 +363,30 @@ abstract class Smarty_Internal_TemplateCompilerBase { * If the content is compiled code and it should be not cached the code is injected * into the rendered output. * - * @param string $content content of template element + * @param string $content content of template element + * @param boolean $tag_nocache true if the parser detected a nocache situation * @param boolean $is_code true if content is compiled code * @return string content */ - public function processNocacheCode($content, $is_code) + public function processNocacheCode ($content, $is_code) { // If the template is not evaluated and we have a nocache section and or a nocache tag if ($is_code && !empty($content)) { // generate replacement code - if ((!($this->template->source->recompiled) || $this->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing && - ($this->nocache || $this->tag_nocache || $this->forceNocache == 2)) { + if ((!$this->template->resource_object->isEvaluated || $this->template->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing && + ($this->nocache || $this->tag_nocache || $this->template->forceNocache == 2)) { $this->template->has_nocache_code = true; $_output = str_replace("'", "\'", $content); - $_output = str_replace('\\\\', '\\\\\\\\', $_output); $_output = str_replace("^#^", "'", $_output); $_output = "nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n"; // make sure we include modifer plugins for nocache code - foreach ($this->modifier_plugins as $plugin_name => $dummy) { - if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) { - $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier']; + if (isset($this->template->saved_modifier)) { + foreach ($this->template->saved_modifier as $plugin_name => $dummy) { + if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) { + $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier']; + } } + $this->template->saved_modifier = null; } } else { $_output = $content; @@ -573,7 +398,6 @@ abstract class Smarty_Internal_TemplateCompilerBase { $this->tag_nocache = false; return $_output; } - /** * display compiler error messages without dying * @@ -582,9 +406,7 @@ abstract class Smarty_Internal_TemplateCompilerBase { * * If parameter $args contains a string this is used as error message * - * @param string $args individual error message or null - * @param string $line line-number - * @throws SmartyCompilerException when an unexpected token is found + * @param $args string individual error message or null */ public function trigger_template_error($args = null, $line = null) { @@ -593,7 +415,7 @@ abstract class Smarty_Internal_TemplateCompilerBase { $line = $this->lex->line; } $match = preg_split("/\n/", $this->lex->data); - $error_text = 'Syntax Error in template "' . $this->template->source->filepath . '" on line ' . $line . ' "' . htmlspecialchars(trim(preg_replace('![\t\r\n]+!',' ',$match[$line-1]))) . '" '; + $error_text = 'Syntax Error in template "' . $this->template->getTemplateFilepath() . '" on line ' . $line . ' "' . htmlspecialchars(trim(preg_replace('![\t\r\n]+!',' ',$match[$line-1]))) . '" '; if (isset($args)) { // individual error message $error_text .= $args; @@ -601,22 +423,21 @@ abstract class Smarty_Internal_TemplateCompilerBase { // expected token from parser $error_text .= ' - Unexpected "' . $this->lex->value.'"'; if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4 ) { - foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) { - $exp_token = $this->parser->yyTokenName[$token]; - if (isset($this->lex->smarty_token_names[$exp_token])) { - // token type from lexer - $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"'; - } else { - // otherwise internal token name - $expect[] = $this->parser->yyTokenName[$token]; - } - } - $error_text .= ', expected one of: ' . implode(' , ', $expect); - } + foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) { + $exp_token = $this->parser->yyTokenName[$token]; + if (isset($this->lex->smarty_token_names[$exp_token])) { + // token type from lexer + $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"'; + } else { + // otherwise internal token name + $expect[] = $this->parser->yyTokenName[$token]; + } + } + $error_text .= ', expected one of: ' . implode(' , ', $expect); + } } throw new SmartyCompilerException($error_text); } - } ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_templatelexer.php b/gosa-core/include/smarty/sysplugins/smarty_internal_templatelexer.php index 131153dac..09bd67a30 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_templatelexer.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_templatelexer.php @@ -71,6 +71,7 @@ class Smarty_Internal_Templatelexer 'LITERALEND' => 'Literal end', 'LDELSLASH' => 'closing tag', 'COMMENT' => 'comment', + 'LITERALEND' => 'literal close', 'AS' => 'as', 'TO' => 'to', ); @@ -89,7 +90,6 @@ class Smarty_Internal_Templatelexer $this->rdel = preg_quote($this->smarty->right_delimiter,'/'); $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter; $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter; - $this->mbstring_overload = ini_get('mbstring.func_overload') & 2; } @@ -142,23 +142,22 @@ class Smarty_Internal_Templatelexer 20 => 0, 21 => 0, 22 => 0, - 23 => 0, - 24 => 2, + 23 => 2, + 26 => 0, 27 => 0, - 28 => 0, ); if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G(".$this->ldel."[$]smarty\\.block\\.child".$this->rdel.")|\G(\\{\\})|\G(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|\G([\t ]*[\r\n]+[\t ]*)|\G(".$this->ldel."strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s*setfilter\\s+)|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G(([\S\s]*?)(?=([\t ]*[\r\n]+[\t ]*|".$this->ldel."|<\\?|\\?>|<%|%>)))|\G([\S\s]+)|\G(.)/iS"; + $yy_global_pattern = "/^(".$this->ldel."[$]smarty\\.block\\.child".$this->rdel.")|^(\\{\\})|^(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|^([\t ]*[\r\n]+[\t ]*)|^(".$this->ldel."strip".$this->rdel.")|^(".$this->ldel."\\s{1,}strip\\s{1,}".$this->rdel.")|^(".$this->ldel."\/strip".$this->rdel.")|^(".$this->ldel."\\s{1,}\/strip\\s{1,}".$this->rdel.")|^(".$this->ldel."\\s*literal\\s*".$this->rdel.")|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|^(".$this->ldel."\\s*for\\s+)|^(".$this->ldel."\\s*foreach(?![^\s]))|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|^(\\?>)|^(<%)|^(%>)|^(([\S\s]*?)(?=([\t ]*[\r\n]+[\t ]*|".$this->ldel."|<\\?|\\?>|<%|%>)))|^([\S\s]+)|^(.)/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, + 'an empty string. Input "' . substr($this->data, $this->counter, 5) . '... state TEXT'); } next($yymatches); // skip global match @@ -309,17 +308,6 @@ class Smarty_Internal_Templatelexer function yy_r1_16($yy_subpatterns) { - if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') { - $this->token = Smarty_Internal_Templateparser::TP_OTHER; - } else { - $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER; - $this->yypushstate(self::SMARTY); - $this->taglineno = $this->line; - } - } - function yy_r1_17($yy_subpatterns) - { - if ($this->smarty->auto_literal) { $this->token = Smarty_Internal_Templateparser::TP_OTHER; } else { @@ -328,21 +316,21 @@ class Smarty_Internal_Templatelexer $this->taglineno = $this->line; } } - function yy_r1_18($yy_subpatterns) + function yy_r1_17($yy_subpatterns) { $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH; $this->yypushstate(self::SMARTY); $this->taglineno = $this->line; } - function yy_r1_19($yy_subpatterns) + function yy_r1_18($yy_subpatterns) { $this->token = Smarty_Internal_Templateparser::TP_LDEL; $this->yypushstate(self::SMARTY); $this->taglineno = $this->line; } - function yy_r1_20($yy_subpatterns) + function yy_r1_19($yy_subpatterns) { if (in_array($this->value, Array('value = substr($this->value, 0, 2); } } - function yy_r1_21($yy_subpatterns) + function yy_r1_20($yy_subpatterns) { $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG; } - function yy_r1_22($yy_subpatterns) + function yy_r1_21($yy_subpatterns) { $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG; } - function yy_r1_23($yy_subpatterns) + function yy_r1_22($yy_subpatterns) { $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG; } - function yy_r1_24($yy_subpatterns) + function yy_r1_23($yy_subpatterns) { $this->token = Smarty_Internal_Templateparser::TP_OTHER; } - function yy_r1_27($yy_subpatterns) + function yy_r1_26($yy_subpatterns) { $this->token = Smarty_Internal_Templateparser::TP_OTHER; } - function yy_r1_28($yy_subpatterns) + function yy_r1_27($yy_subpatterns) { $this->token = Smarty_Internal_Templateparser::TP_OTHER; @@ -460,15 +448,15 @@ class Smarty_Internal_Templatelexer if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(".$this->rdel.")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(\\$)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(@)|\G(#)|\G(\")|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(\\s+)|\G(.)/iS"; + $yy_global_pattern = "/^('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|^(".$this->ldel."\\s*for\\s+)|^(".$this->ldel."\\s*foreach(?![^\s]))|^(".$this->ldel."\\s{1,})|^(\\s{1,}".$this->rdel.")|^(".$this->ldel."\/)|^(".$this->ldel.")|^(".$this->rdel.")|^(\\s+is\\s+in\\s+)|^(\\s+as\\s+)|^(\\s+to\\s+)|^(\\s+step\\s+)|^(\\s+instanceof\\s+)|^(\\s*===\\s*)|^(\\s*!==\\s*)|^(\\s*==\\s*|\\s+eq\\s+)|^(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|^(\\s*>=\\s*|\\s+(ge|gte)\\s+)|^(\\s*<=\\s*|\\s+(le|lte)\\s+)|^(\\s*>\\s*|\\s+gt\\s+)|^(\\s*<\\s*|\\s+lt\\s+)|^(\\s+mod\\s+)|^(!\\s*|not\\s+)|^(\\s*&&\\s*|\\s*and\\s+)|^(\\s*\\|\\|\\s*|\\s*or\\s+)|^(\\s*xor\\s+)|^(\\s+is\\s+odd\\s+by\\s+)|^(\\s+is\\s+not\\s+odd\\s+by\\s+)|^(\\s+is\\s+odd)|^(\\s+is\\s+not\\s+odd)|^(\\s+is\\s+even\\s+by\\s+)|^(\\s+is\\s+not\\s+even\\s+by\\s+)|^(\\s+is\\s+even)|^(\\s+is\\s+not\\s+even)|^(\\s+is\\s+div\\s+by\\s+)|^(\\s+is\\s+not\\s+div\\s+by\\s+)|^(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|^(\\(\\s*)|^(\\s*\\))|^(\\[\\s*)|^(\\s*\\])|^(\\s*->\\s*)|^(\\s*=>\\s*)|^(\\s*=\\s*)|^(\\+\\+|--)|^(\\s*(\\+|-)\\s*)|^(\\s*(\\*|\/|%)\\s*)|^(\\$)|^(\\s*;)|^(::)|^(\\s*:\\s*)|^(@)|^(#)|^(\")|^(`)|^(\\|)|^(\\.)|^(\\s*,\\s*)|^(\\s*&\\s*)|^(\\s*\\?\\s*)|^(0[xX][0-9a-fA-F]+)|^([0-9]*[a-zA-Z_]\\w*)|^(\\d+)|^(\\s+)|^(.)/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, + 'an empty string. Input "' . substr($this->data, $this->counter, 5) . '... state SMARTY'); } next($yymatches); // skip global match @@ -573,8 +561,8 @@ class Smarty_Internal_Templatelexer function yy_r2_8($yy_subpatterns) { - $this->token = Smarty_Internal_Templateparser::TP_RDEL; - $this->yypopstate(); + $this->token = Smarty_Internal_Templateparser::TP_RDEL; + $this->yypopstate(); } function yy_r2_9($yy_subpatterns) { @@ -902,15 +890,15 @@ class Smarty_Internal_Templatelexer if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*\/literal\\s*".$this->rdel.")|\G([\t ]*[\r\n]+[\t ]*)|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G(([\S\s]*?)(?=([\t ]*[\r\n]+[\t ]*|".$this->ldel."\/?literal".$this->rdel."|<\\?|<%)))|\G(.)/iS"; + $yy_global_pattern = "/^(".$this->ldel."\\s*literal\\s*".$this->rdel.")|^(".$this->ldel."\\s*\/literal\\s*".$this->rdel.")|^([\t ]*[\r\n]+[\t ]*)|^(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|^(\\?>)|^(<%)|^(%>)|^(([\S\s]*?)(?=([\t ]*[\r\n]+[\t ]*|".$this->ldel."\/?literal".$this->rdel."|<\\?|<%)))|^(.)/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, + 'an empty string. Input "' . substr($this->data, $this->counter, 5) . '... state LITERAL'); } next($yymatches); // skip global match @@ -1027,15 +1015,15 @@ class Smarty_Internal_Templatelexer if ($this->counter >= strlen($this->data)) { return false; // end of input } - $yy_global_pattern = "/\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|\G([\S\s]+)|\G(.)/iS"; + $yy_global_pattern = "/^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|^(".$this->ldel."\\s*for\\s+)|^(".$this->ldel."\\s*foreach(?![^\s]))|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(\")|^(`\\$)|^(\\$[0-9]*[a-zA-Z_]\\w*)|^(\\$)|^(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|^([\S\s]+)|^(.)/iS"; do { - if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) { + if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) { $yysubmatches = $yymatches; $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns if (!count($yymatches)) { throw new Exception('Error: lexing failed because a rule matched' . - ' an empty string. Input "' . substr($this->data, + 'an empty string. Input "' . substr($this->data, $this->counter, 5) . '... state DOUBLEQUOTEDSTRING'); } next($yymatches); // skip global match diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_templateparser.php b/gosa-core/include/smarty/sysplugins/smarty_internal_templateparser.php index 6dfdeeffe..18c35a87c 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_templateparser.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_templateparser.php @@ -88,9 +88,8 @@ class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php { #line 14 "smarty_internal_templateparser.y" - const Err1 = "Security error: Call to private object member not allowed"; - const Err2 = "Security error: Call to dynamic object member not allowed"; - const Err3 = "PHP in template not allowed. Use SmartyBC to enable it"; + const Err1 = "Security error: Call to private object member not allowed"; + const Err2 = "Security error: Call to dynamic object member not allowed"; // states whether the parse was successful or not public $successful = true; public $retvalue = 0; @@ -103,39 +102,30 @@ class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php $this->smarty = $this->compiler->smarty; $this->template = $this->compiler->template; $this->compiler->has_variable_string = false; - $this->compiler->prefix_code = array(); - $this->prefix_number = 0; - $this->block_nesting_level = 0; - if ($this->security = isset($this->smarty->security_policy)) { - $this->php_handling = $this->smarty->security_policy->php_handling; + $this->compiler->prefix_code = array(); + $this->prefix_number = 0; + $this->block_nesting_level = 0; + if ($this->security = isset($this->smarty->security_policy)) { + $this->php_handling = $this->smarty->security_policy->php_handling; } else { - $this->php_handling = $this->smarty->php_handling; + $this->php_handling = $this->smarty->php_handling; } - $this->is_xml = false; - $this->asp_tags = (ini_get('asp_tags') != '0'); - $this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this); + $this->is_xml = false; + $this->asp_tags = (ini_get('asp_tags') != '0'); + $this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this); } public static function escape_start_tag($tag_text) { - $tag = preg_replace('/\A<\?(.*)\z/', '<?\1', $tag_text, -1 , $count); //Escape tag - return $tag; + $tag = preg_replace('/\A<\?(.*)\z/', '<?\1', $tag_text, -1 , $count); //Escape tag + return $tag; } public static function escape_end_tag($tag_text) { - return '?>'; + return '?>'; } - public function compileVariable($variable) { - if (strpos($variable,'(') == 0) { - // not a variable variable - $var = trim($variable,'\''); - $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable($var, null, true, false)->nocache; - $this->template->properties['variables'][$var] = $this->compiler->tag_nocache|$this->compiler->nocache; - } -// return '(isset($_smarty_tpl->tpl_vars['. $variable .'])?$_smarty_tpl->tpl_vars['. $variable .']->value:$_smarty_tpl->getVariable('. $variable .')->value)'; - return '$_smarty_tpl->tpl_vars['. $variable .']->value'; - } -#line 131 "smarty_internal_templateparser.php" + +#line 121 "smarty_internal_templateparser.php" const TP_VERT = 1; const TP_COLON = 2; @@ -167,852 +157,899 @@ class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php const TP_SPACE = 28; const TP_AS = 29; const TP_APTR = 30; - const TP_LDELSETFILTER = 31; - const TP_SMARTYBLOCKCHILD = 32; - const TP_LDELSLASH = 33; - const TP_INTEGER = 34; - const TP_COMMA = 35; - const TP_OPENP = 36; - const TP_CLOSEP = 37; - const TP_MATH = 38; - const TP_UNIMATH = 39; - const TP_ANDSYM = 40; - const TP_ISIN = 41; - const TP_ISDIVBY = 42; - const TP_ISNOTDIVBY = 43; - const TP_ISEVEN = 44; - const TP_ISNOTEVEN = 45; - const TP_ISEVENBY = 46; - const TP_ISNOTEVENBY = 47; - const TP_ISODD = 48; - const TP_ISNOTODD = 49; - const TP_ISODDBY = 50; - const TP_ISNOTODDBY = 51; - const TP_INSTANCEOF = 52; - const TP_QMARK = 53; - const TP_NOT = 54; - const TP_TYPECAST = 55; - const TP_HEX = 56; - const TP_DOT = 57; - const TP_SINGLEQUOTESTRING = 58; - const TP_DOUBLECOLON = 59; - const TP_AT = 60; - const TP_HATCH = 61; - const TP_OPENB = 62; - const TP_CLOSEB = 63; - const TP_EQUALS = 64; - const TP_NOTEQUALS = 65; - const TP_GREATERTHAN = 66; - const TP_LESSTHAN = 67; - const TP_GREATEREQUAL = 68; - const TP_LESSEQUAL = 69; - const TP_IDENTITY = 70; - const TP_NONEIDENTITY = 71; - const TP_MOD = 72; - const TP_LAND = 73; - const TP_LOR = 74; - const TP_LXOR = 75; - const TP_QUOTE = 76; - const TP_BACKTICK = 77; - const TP_DOLLARID = 78; + const TP_SMARTYBLOCKCHILD = 31; + const TP_LDELSLASH = 32; + const TP_INTEGER = 33; + const TP_COMMA = 34; + const TP_OPENP = 35; + const TP_CLOSEP = 36; + const TP_MATH = 37; + const TP_UNIMATH = 38; + const TP_ANDSYM = 39; + const TP_ISIN = 40; + const TP_ISDIVBY = 41; + const TP_ISNOTDIVBY = 42; + const TP_ISEVEN = 43; + const TP_ISNOTEVEN = 44; + const TP_ISEVENBY = 45; + const TP_ISNOTEVENBY = 46; + const TP_ISODD = 47; + const TP_ISNOTODD = 48; + const TP_ISODDBY = 49; + const TP_ISNOTODDBY = 50; + const TP_INSTANCEOF = 51; + const TP_QMARK = 52; + const TP_NOT = 53; + const TP_TYPECAST = 54; + const TP_HEX = 55; + const TP_DOT = 56; + const TP_SINGLEQUOTESTRING = 57; + const TP_DOUBLECOLON = 58; + const TP_AT = 59; + const TP_HATCH = 60; + const TP_OPENB = 61; + const TP_CLOSEB = 62; + const TP_EQUALS = 63; + const TP_NOTEQUALS = 64; + const TP_GREATERTHAN = 65; + const TP_LESSTHAN = 66; + const TP_GREATEREQUAL = 67; + const TP_LESSEQUAL = 68; + const TP_IDENTITY = 69; + const TP_NONEIDENTITY = 70; + const TP_MOD = 71; + const TP_LAND = 72; + const TP_LOR = 73; + const TP_LXOR = 74; + const TP_QUOTE = 75; + const TP_BACKTICK = 76; + const TP_DOLLARID = 77; const YY_NO_ACTION = 590; const YY_ACCEPT_ACTION = 589; const YY_ERROR_ACTION = 588; - const YY_SZ_ACTTAB = 2393; + const YY_SZ_ACTTAB = 2637; static public $yy_action = array( - /* 0 */ 211, 316, 317, 319, 318, 315, 314, 310, 309, 311, - /* 10 */ 312, 313, 320, 189, 304, 161, 38, 589, 95, 265, - /* 20 */ 317, 319, 7, 106, 289, 37, 26, 30, 146, 283, - /* 30 */ 10, 285, 250, 286, 238, 280, 287, 49, 48, 46, - /* 40 */ 45, 20, 29, 365, 366, 28, 32, 373, 374, 15, - /* 50 */ 11, 328, 323, 322, 324, 327, 231, 211, 4, 189, - /* 60 */ 329, 332, 211, 382, 383, 384, 385, 381, 380, 376, - /* 70 */ 375, 377, 281, 378, 379, 211, 360, 450, 180, 251, - /* 80 */ 117, 144, 196, 74, 135, 260, 17, 451, 26, 30, - /* 90 */ 307, 283, 299, 361, 35, 158, 225, 368, 362, 451, - /* 100 */ 343, 30, 30, 226, 44, 203, 285, 4, 47, 203, - /* 110 */ 218, 259, 49, 48, 46, 45, 20, 29, 365, 366, - /* 120 */ 28, 32, 373, 374, 15, 11, 351, 108, 176, 334, - /* 130 */ 144, 193, 337, 23, 129, 134, 371, 289, 382, 383, - /* 140 */ 384, 385, 381, 380, 376, 375, 377, 281, 378, 379, - /* 150 */ 211, 360, 372, 26, 203, 142, 283, 31, 68, 122, - /* 160 */ 242, 26, 109, 353, 283, 346, 454, 299, 361, 25, - /* 170 */ 185, 225, 368, 362, 30, 343, 239, 30, 454, 289, - /* 180 */ 4, 41, 26, 143, 165, 283, 4, 49, 48, 46, - /* 190 */ 45, 20, 29, 365, 366, 28, 32, 373, 374, 15, - /* 200 */ 11, 101, 160, 144, 26, 208, 34, 283, 31, 144, - /* 210 */ 8, 289, 4, 382, 383, 384, 385, 381, 380, 376, - /* 220 */ 375, 377, 281, 378, 379, 211, 360, 227, 203, 357, - /* 230 */ 142, 197, 19, 73, 135, 144, 211, 302, 9, 158, - /* 240 */ 340, 26, 299, 361, 283, 158, 225, 368, 362, 228, - /* 250 */ 343, 294, 30, 6, 331, 235, 330, 221, 195, 337, - /* 260 */ 126, 240, 49, 48, 46, 45, 20, 29, 365, 366, - /* 270 */ 28, 32, 373, 374, 15, 11, 211, 16, 129, 244, - /* 280 */ 249, 219, 208, 192, 337, 302, 228, 8, 382, 383, - /* 290 */ 384, 385, 381, 380, 376, 375, 377, 281, 378, 379, - /* 300 */ 163, 211, 107, 188, 105, 40, 40, 266, 277, 289, - /* 310 */ 241, 232, 289, 49, 48, 46, 45, 20, 29, 365, - /* 320 */ 366, 28, 32, 373, 374, 15, 11, 211, 168, 203, - /* 330 */ 40, 2, 278, 167, 175, 244, 242, 289, 350, 382, - /* 340 */ 383, 384, 385, 381, 380, 376, 375, 377, 281, 378, - /* 350 */ 379, 191, 47, 184, 204, 234, 169, 198, 287, 386, - /* 360 */ 203, 203, 289, 124, 49, 48, 46, 45, 20, 29, - /* 370 */ 365, 366, 28, 32, 373, 374, 15, 11, 211, 204, - /* 380 */ 182, 26, 26, 26, 283, 212, 224, 118, 131, 289, - /* 390 */ 382, 383, 384, 385, 381, 380, 376, 375, 377, 281, - /* 400 */ 378, 379, 370, 172, 244, 270, 204, 130, 211, 164, - /* 410 */ 26, 287, 289, 229, 178, 49, 48, 46, 45, 20, - /* 420 */ 29, 365, 366, 28, 32, 373, 374, 15, 11, 204, - /* 430 */ 364, 298, 5, 26, 100, 30, 247, 148, 148, 99, - /* 440 */ 159, 382, 383, 384, 385, 381, 380, 376, 375, 377, - /* 450 */ 281, 378, 379, 211, 354, 370, 360, 174, 26, 369, - /* 460 */ 142, 283, 360, 73, 135, 158, 157, 123, 24, 155, - /* 470 */ 135, 30, 299, 361, 211, 190, 225, 368, 362, 272, - /* 480 */ 343, 252, 225, 368, 362, 343, 343, 222, 223, 306, - /* 490 */ 49, 48, 46, 45, 20, 29, 365, 366, 28, 32, - /* 500 */ 373, 374, 15, 11, 129, 43, 236, 9, 269, 258, - /* 510 */ 199, 133, 33, 14, 202, 103, 382, 383, 384, 385, - /* 520 */ 381, 380, 376, 375, 377, 281, 378, 379, 211, 360, - /* 530 */ 370, 170, 262, 142, 360, 36, 73, 135, 151, 141, - /* 540 */ 289, 245, 135, 276, 211, 299, 361, 211, 44, 225, - /* 550 */ 368, 362, 287, 343, 225, 368, 362, 119, 343, 295, - /* 560 */ 216, 267, 282, 296, 211, 49, 48, 46, 45, 20, - /* 570 */ 29, 365, 366, 28, 32, 373, 374, 15, 11, 284, - /* 580 */ 181, 223, 333, 138, 302, 236, 297, 6, 127, 289, - /* 590 */ 116, 382, 383, 384, 385, 381, 380, 376, 375, 377, - /* 600 */ 281, 378, 379, 211, 360, 370, 177, 94, 142, 303, - /* 610 */ 292, 54, 122, 139, 162, 289, 150, 261, 264, 293, - /* 620 */ 299, 361, 30, 289, 225, 368, 362, 287, 343, 30, - /* 630 */ 287, 30, 132, 300, 308, 287, 158, 211, 30, 334, - /* 640 */ 49, 48, 46, 45, 20, 29, 365, 366, 28, 32, - /* 650 */ 373, 374, 15, 11, 211, 204, 166, 12, 275, 287, - /* 660 */ 273, 248, 342, 98, 97, 113, 382, 383, 384, 385, - /* 670 */ 381, 380, 376, 375, 377, 281, 378, 379, 370, 370, - /* 680 */ 370, 110, 18, 321, 324, 324, 324, 324, 324, 324, - /* 690 */ 246, 49, 48, 46, 45, 20, 29, 365, 366, 28, - /* 700 */ 32, 373, 374, 15, 11, 211, 324, 324, 324, 324, - /* 710 */ 324, 324, 324, 324, 112, 136, 104, 382, 383, 384, - /* 720 */ 385, 381, 380, 376, 375, 377, 281, 378, 379, 370, - /* 730 */ 370, 370, 324, 324, 324, 324, 324, 324, 324, 324, - /* 740 */ 324, 256, 49, 48, 46, 45, 20, 29, 365, 366, - /* 750 */ 28, 32, 373, 374, 15, 11, 211, 324, 324, 324, - /* 760 */ 324, 324, 324, 324, 324, 324, 324, 324, 382, 383, - /* 770 */ 384, 385, 381, 380, 376, 375, 377, 281, 378, 379, - /* 780 */ 351, 324, 324, 30, 324, 324, 324, 324, 324, 324, - /* 790 */ 324, 324, 324, 49, 48, 46, 45, 20, 29, 365, - /* 800 */ 366, 28, 32, 373, 374, 15, 11, 211, 324, 324, - /* 810 */ 324, 324, 324, 324, 324, 324, 324, 355, 324, 382, - /* 820 */ 383, 384, 385, 381, 380, 376, 375, 377, 281, 378, - /* 830 */ 379, 324, 324, 324, 324, 324, 324, 324, 324, 324, - /* 840 */ 324, 324, 324, 324, 49, 48, 46, 45, 20, 29, - /* 850 */ 365, 366, 28, 32, 373, 374, 15, 11, 324, 324, - /* 860 */ 324, 324, 324, 324, 324, 324, 324, 324, 324, 257, - /* 870 */ 382, 383, 384, 385, 381, 380, 376, 375, 377, 281, - /* 880 */ 378, 379, 211, 324, 324, 324, 194, 360, 211, 288, - /* 890 */ 255, 145, 324, 352, 336, 135, 324, 200, 42, 22, - /* 900 */ 27, 30, 30, 341, 7, 106, 30, 225, 368, 362, - /* 910 */ 146, 343, 324, 203, 250, 286, 238, 324, 211, 49, - /* 920 */ 48, 46, 45, 20, 29, 365, 366, 28, 32, 373, - /* 930 */ 374, 15, 11, 305, 324, 324, 324, 324, 324, 47, - /* 940 */ 324, 324, 324, 324, 324, 382, 383, 384, 385, 381, - /* 950 */ 380, 376, 375, 377, 281, 378, 379, 211, 324, 359, - /* 960 */ 39, 349, 360, 326, 348, 291, 156, 324, 352, 344, - /* 970 */ 135, 324, 201, 42, 324, 30, 30, 30, 324, 7, - /* 980 */ 106, 30, 225, 368, 362, 146, 343, 324, 324, 250, - /* 990 */ 286, 238, 324, 324, 49, 48, 46, 45, 20, 29, - /* 1000 */ 365, 366, 28, 32, 373, 374, 15, 11, 211, 324, - /* 1010 */ 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, - /* 1020 */ 382, 383, 384, 385, 381, 380, 376, 375, 377, 281, - /* 1030 */ 378, 379, 324, 324, 358, 39, 349, 324, 324, 324, - /* 1040 */ 324, 324, 324, 324, 324, 49, 48, 46, 45, 20, - /* 1050 */ 29, 365, 366, 28, 32, 373, 374, 15, 11, 324, - /* 1060 */ 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, - /* 1070 */ 324, 382, 383, 384, 385, 381, 380, 376, 375, 377, - /* 1080 */ 281, 378, 379, 324, 49, 48, 46, 45, 20, 29, - /* 1090 */ 365, 366, 28, 32, 373, 374, 15, 11, 324, 324, - /* 1100 */ 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, - /* 1110 */ 382, 383, 384, 385, 381, 380, 376, 375, 377, 281, - /* 1120 */ 378, 379, 324, 324, 324, 324, 38, 324, 140, 207, - /* 1130 */ 324, 360, 7, 106, 290, 147, 324, 356, 146, 135, - /* 1140 */ 324, 324, 250, 286, 238, 230, 30, 13, 367, 30, - /* 1150 */ 51, 225, 368, 362, 324, 343, 360, 324, 324, 324, - /* 1160 */ 152, 324, 324, 324, 135, 50, 52, 301, 237, 363, - /* 1170 */ 324, 360, 105, 1, 254, 154, 225, 368, 362, 135, - /* 1180 */ 343, 324, 38, 324, 140, 214, 324, 96, 7, 106, - /* 1190 */ 279, 225, 368, 362, 146, 343, 347, 345, 250, 286, - /* 1200 */ 238, 230, 30, 13, 274, 324, 51, 338, 30, 30, - /* 1210 */ 360, 324, 324, 324, 121, 324, 30, 53, 135, 30, - /* 1220 */ 211, 50, 52, 301, 237, 363, 299, 361, 105, 1, - /* 1230 */ 225, 368, 362, 211, 343, 453, 324, 268, 38, 324, - /* 1240 */ 128, 214, 324, 96, 7, 106, 253, 453, 339, 30, - /* 1250 */ 146, 335, 233, 324, 250, 286, 238, 230, 30, 3, - /* 1260 */ 30, 324, 51, 30, 271, 324, 360, 324, 4, 324, - /* 1270 */ 142, 47, 324, 84, 135, 324, 30, 50, 52, 301, - /* 1280 */ 237, 363, 299, 361, 105, 1, 225, 368, 362, 324, - /* 1290 */ 343, 144, 324, 324, 38, 324, 125, 92, 324, 96, - /* 1300 */ 7, 106, 324, 324, 324, 324, 146, 324, 324, 324, - /* 1310 */ 250, 286, 238, 230, 324, 13, 324, 324, 51, 324, - /* 1320 */ 324, 324, 360, 324, 324, 324, 142, 324, 324, 89, - /* 1330 */ 135, 324, 211, 50, 52, 301, 237, 363, 299, 361, - /* 1340 */ 105, 1, 225, 368, 362, 324, 343, 456, 324, 324, - /* 1350 */ 38, 324, 126, 214, 324, 96, 7, 106, 324, 456, - /* 1360 */ 243, 324, 146, 324, 324, 324, 250, 286, 238, 230, - /* 1370 */ 324, 21, 324, 324, 51, 324, 324, 324, 360, 324, - /* 1380 */ 324, 324, 142, 47, 324, 87, 135, 324, 211, 50, - /* 1390 */ 52, 301, 237, 363, 299, 361, 105, 1, 225, 368, - /* 1400 */ 362, 324, 343, 456, 324, 324, 38, 324, 140, 210, - /* 1410 */ 324, 96, 7, 106, 324, 456, 324, 324, 146, 324, - /* 1420 */ 324, 324, 250, 286, 238, 230, 324, 13, 324, 324, - /* 1430 */ 51, 324, 324, 324, 360, 324, 324, 324, 142, 47, - /* 1440 */ 324, 63, 135, 324, 211, 50, 52, 301, 237, 363, - /* 1450 */ 299, 361, 105, 1, 225, 368, 362, 324, 343, 325, - /* 1460 */ 324, 324, 38, 324, 137, 214, 324, 96, 7, 106, - /* 1470 */ 324, 30, 324, 324, 146, 324, 324, 324, 250, 286, - /* 1480 */ 238, 230, 324, 13, 324, 324, 51, 324, 324, 324, - /* 1490 */ 360, 324, 324, 324, 142, 47, 324, 80, 135, 324, - /* 1500 */ 324, 50, 52, 301, 237, 363, 299, 361, 105, 1, - /* 1510 */ 225, 368, 362, 324, 343, 324, 324, 324, 38, 324, - /* 1520 */ 140, 206, 324, 96, 7, 106, 324, 324, 324, 324, - /* 1530 */ 146, 324, 324, 324, 250, 286, 238, 220, 324, 13, - /* 1540 */ 324, 324, 51, 324, 324, 324, 360, 324, 324, 324, - /* 1550 */ 114, 324, 324, 75, 135, 324, 324, 50, 52, 301, - /* 1560 */ 237, 363, 299, 361, 105, 1, 225, 368, 362, 324, - /* 1570 */ 343, 324, 324, 324, 38, 324, 140, 205, 324, 96, - /* 1580 */ 7, 106, 324, 324, 324, 324, 146, 324, 324, 324, - /* 1590 */ 250, 286, 238, 230, 324, 13, 324, 324, 51, 324, - /* 1600 */ 324, 324, 360, 324, 324, 324, 142, 324, 324, 77, - /* 1610 */ 135, 324, 324, 50, 52, 301, 237, 363, 299, 361, - /* 1620 */ 105, 1, 225, 368, 362, 324, 343, 324, 324, 324, - /* 1630 */ 38, 324, 140, 209, 324, 96, 7, 106, 324, 324, - /* 1640 */ 324, 324, 146, 324, 324, 324, 250, 286, 238, 230, - /* 1650 */ 324, 13, 324, 324, 51, 324, 324, 324, 360, 324, - /* 1660 */ 324, 324, 142, 324, 324, 85, 135, 324, 324, 50, - /* 1670 */ 52, 301, 237, 363, 299, 361, 105, 1, 225, 368, - /* 1680 */ 362, 324, 343, 324, 324, 324, 38, 324, 126, 213, - /* 1690 */ 324, 96, 7, 106, 324, 324, 324, 324, 146, 324, - /* 1700 */ 324, 324, 250, 286, 238, 230, 324, 21, 324, 324, - /* 1710 */ 51, 324, 324, 324, 360, 324, 324, 324, 142, 324, - /* 1720 */ 324, 71, 135, 324, 324, 50, 52, 301, 237, 363, - /* 1730 */ 299, 361, 105, 324, 225, 368, 362, 324, 343, 324, - /* 1740 */ 324, 324, 38, 324, 126, 214, 324, 96, 7, 106, - /* 1750 */ 324, 324, 324, 324, 146, 324, 324, 324, 250, 286, - /* 1760 */ 238, 230, 324, 21, 102, 186, 51, 324, 324, 324, - /* 1770 */ 324, 324, 324, 324, 289, 324, 324, 22, 27, 324, - /* 1780 */ 499, 50, 52, 301, 237, 363, 324, 499, 105, 499, - /* 1790 */ 499, 203, 499, 499, 324, 324, 324, 324, 324, 499, - /* 1800 */ 4, 499, 324, 96, 324, 324, 324, 324, 324, 324, - /* 1810 */ 324, 324, 324, 360, 324, 324, 499, 117, 324, 324, - /* 1820 */ 74, 135, 324, 144, 324, 324, 324, 499, 324, 299, - /* 1830 */ 361, 324, 324, 225, 368, 362, 324, 343, 360, 324, - /* 1840 */ 324, 499, 142, 324, 324, 66, 135, 324, 263, 324, - /* 1850 */ 324, 324, 324, 324, 299, 361, 324, 324, 225, 368, - /* 1860 */ 362, 324, 343, 324, 360, 324, 324, 324, 142, 324, - /* 1870 */ 324, 79, 135, 324, 360, 324, 324, 324, 149, 324, - /* 1880 */ 299, 361, 135, 360, 225, 368, 362, 142, 343, 324, - /* 1890 */ 81, 135, 324, 324, 225, 368, 362, 324, 343, 299, - /* 1900 */ 361, 324, 324, 225, 368, 362, 324, 343, 324, 324, - /* 1910 */ 324, 360, 324, 324, 324, 115, 324, 324, 83, 135, - /* 1920 */ 324, 324, 360, 324, 324, 324, 142, 299, 361, 72, - /* 1930 */ 135, 225, 368, 362, 324, 343, 324, 324, 299, 361, - /* 1940 */ 324, 324, 225, 368, 362, 324, 343, 324, 360, 324, - /* 1950 */ 324, 324, 142, 324, 324, 70, 135, 324, 360, 324, - /* 1960 */ 324, 324, 153, 324, 299, 361, 135, 360, 225, 368, - /* 1970 */ 362, 142, 343, 324, 68, 135, 324, 324, 225, 368, - /* 1980 */ 362, 324, 343, 299, 361, 324, 324, 225, 368, 362, - /* 1990 */ 324, 343, 324, 324, 324, 360, 324, 324, 324, 142, - /* 2000 */ 324, 324, 90, 135, 324, 324, 360, 324, 324, 324, - /* 2010 */ 142, 299, 361, 86, 135, 225, 368, 362, 324, 343, - /* 2020 */ 324, 324, 299, 361, 324, 324, 225, 368, 362, 324, - /* 2030 */ 343, 324, 360, 194, 183, 324, 142, 324, 324, 91, - /* 2040 */ 135, 324, 324, 289, 324, 324, 22, 27, 299, 361, - /* 2050 */ 324, 360, 225, 368, 362, 142, 343, 324, 61, 135, - /* 2060 */ 203, 324, 324, 324, 194, 171, 324, 299, 361, 324, - /* 2070 */ 324, 225, 368, 362, 289, 343, 324, 22, 27, 360, - /* 2080 */ 324, 324, 324, 142, 324, 324, 88, 135, 324, 324, - /* 2090 */ 360, 203, 324, 324, 142, 299, 361, 69, 135, 225, - /* 2100 */ 368, 362, 324, 343, 324, 324, 299, 361, 324, 324, - /* 2110 */ 225, 368, 362, 324, 343, 324, 360, 194, 179, 324, - /* 2120 */ 142, 324, 324, 76, 135, 324, 324, 289, 324, 324, - /* 2130 */ 22, 27, 299, 361, 324, 360, 225, 368, 362, 142, - /* 2140 */ 343, 324, 65, 135, 203, 324, 324, 324, 194, 187, - /* 2150 */ 324, 299, 361, 324, 324, 225, 368, 362, 289, 343, - /* 2160 */ 324, 22, 27, 360, 324, 324, 324, 111, 324, 324, - /* 2170 */ 64, 135, 324, 324, 360, 203, 324, 324, 142, 299, - /* 2180 */ 361, 62, 135, 225, 368, 362, 324, 343, 324, 324, - /* 2190 */ 299, 361, 324, 324, 225, 368, 362, 324, 343, 324, - /* 2200 */ 360, 194, 173, 324, 142, 324, 324, 82, 135, 324, - /* 2210 */ 324, 289, 324, 324, 22, 27, 299, 361, 324, 360, - /* 2220 */ 225, 368, 362, 142, 343, 324, 60, 135, 203, 324, - /* 2230 */ 324, 324, 324, 324, 324, 299, 361, 324, 324, 225, - /* 2240 */ 368, 362, 324, 343, 324, 324, 324, 360, 324, 324, - /* 2250 */ 324, 93, 324, 324, 57, 120, 324, 324, 360, 324, - /* 2260 */ 324, 324, 142, 299, 361, 58, 135, 225, 368, 362, - /* 2270 */ 324, 343, 324, 324, 299, 361, 324, 324, 225, 368, - /* 2280 */ 362, 324, 343, 324, 360, 324, 324, 324, 142, 324, - /* 2290 */ 324, 59, 135, 324, 324, 324, 324, 324, 324, 324, - /* 2300 */ 299, 361, 324, 360, 225, 368, 362, 93, 343, 324, - /* 2310 */ 55, 120, 324, 324, 324, 324, 324, 324, 324, 299, - /* 2320 */ 361, 324, 324, 215, 368, 362, 324, 343, 324, 324, - /* 2330 */ 324, 360, 324, 324, 324, 142, 324, 324, 56, 135, - /* 2340 */ 324, 324, 360, 324, 324, 324, 142, 299, 361, 78, - /* 2350 */ 135, 225, 368, 362, 324, 343, 324, 324, 299, 361, - /* 2360 */ 324, 324, 225, 368, 362, 324, 343, 324, 360, 324, - /* 2370 */ 324, 324, 142, 324, 324, 67, 135, 324, 324, 324, - /* 2380 */ 324, 324, 324, 324, 299, 361, 324, 324, 217, 368, - /* 2390 */ 362, 324, 343, + /* 0 */ 223, 300, 294, 293, 288, 287, 286, 290, 291, 301, + /* 10 */ 197, 13, 211, 40, 283, 373, 284, 8, 13, 7, + /* 20 */ 107, 283, 41, 203, 16, 147, 234, 16, 16, 276, + /* 30 */ 245, 589, 97, 296, 297, 299, 50, 46, 48, 45, + /* 40 */ 14, 28, 330, 352, 38, 32, 353, 371, 36, 34, + /* 50 */ 223, 311, 306, 307, 285, 303, 295, 297, 299, 197, + /* 60 */ 312, 316, 379, 359, 358, 357, 366, 319, 274, 270, + /* 70 */ 267, 255, 256, 258, 362, 35, 21, 16, 141, 169, + /* 80 */ 223, 199, 17, 3, 146, 337, 50, 46, 48, 45, + /* 90 */ 14, 28, 330, 352, 38, 32, 353, 371, 36, 34, + /* 100 */ 341, 109, 180, 25, 242, 161, 137, 206, 3, 26, + /* 110 */ 360, 259, 379, 359, 358, 357, 366, 319, 274, 270, + /* 120 */ 267, 255, 256, 258, 223, 304, 347, 206, 172, 142, + /* 130 */ 47, 137, 244, 75, 127, 454, 262, 259, 19, 356, + /* 140 */ 13, 329, 266, 283, 41, 343, 321, 454, 310, 104, + /* 150 */ 163, 16, 383, 203, 3, 217, 236, 237, 220, 259, + /* 160 */ 50, 46, 48, 45, 14, 28, 330, 352, 38, 32, + /* 170 */ 353, 371, 36, 34, 191, 206, 13, 137, 4, 283, + /* 180 */ 24, 200, 332, 259, 227, 263, 379, 359, 358, 357, + /* 190 */ 366, 319, 274, 270, 267, 255, 256, 258, 223, 304, + /* 200 */ 110, 162, 223, 142, 192, 332, 244, 75, 127, 451, + /* 210 */ 259, 13, 223, 260, 283, 329, 266, 384, 161, 343, + /* 220 */ 321, 451, 310, 108, 183, 16, 206, 268, 3, 216, + /* 230 */ 27, 246, 174, 259, 50, 46, 48, 45, 14, 28, + /* 240 */ 330, 352, 38, 32, 353, 371, 36, 34, 173, 206, + /* 250 */ 5, 137, 47, 13, 211, 227, 283, 259, 381, 8, + /* 260 */ 379, 359, 358, 357, 366, 319, 274, 270, 267, 255, + /* 270 */ 256, 258, 223, 304, 170, 181, 324, 142, 196, 332, + /* 280 */ 244, 66, 118, 238, 259, 13, 335, 204, 283, 329, + /* 290 */ 266, 39, 161, 343, 321, 281, 310, 243, 16, 232, + /* 300 */ 239, 3, 23, 23, 386, 365, 251, 231, 50, 46, + /* 310 */ 48, 45, 14, 28, 330, 352, 38, 32, 353, 371, + /* 320 */ 36, 34, 111, 326, 137, 23, 13, 376, 223, 283, + /* 330 */ 136, 198, 42, 161, 379, 359, 358, 357, 366, 319, + /* 340 */ 274, 270, 267, 255, 256, 258, 223, 304, 166, 188, + /* 350 */ 178, 142, 281, 298, 244, 75, 127, 259, 259, 13, + /* 360 */ 223, 368, 283, 329, 266, 16, 278, 343, 321, 281, + /* 370 */ 310, 136, 16, 203, 2, 272, 13, 215, 16, 252, + /* 380 */ 138, 247, 50, 46, 48, 45, 14, 28, 330, 352, + /* 390 */ 38, 32, 353, 371, 36, 34, 223, 177, 317, 223, + /* 400 */ 314, 190, 327, 236, 238, 248, 259, 148, 379, 359, + /* 410 */ 358, 357, 366, 319, 274, 270, 267, 255, 256, 258, + /* 420 */ 195, 310, 203, 106, 236, 261, 13, 206, 184, 218, + /* 430 */ 103, 250, 50, 46, 48, 45, 14, 28, 330, 352, + /* 440 */ 38, 32, 353, 371, 36, 34, 223, 22, 176, 47, + /* 450 */ 235, 362, 132, 13, 206, 320, 226, 259, 379, 359, + /* 460 */ 358, 357, 366, 319, 274, 270, 267, 255, 256, 258, + /* 470 */ 133, 322, 185, 203, 13, 223, 345, 230, 149, 241, + /* 480 */ 145, 259, 50, 46, 48, 45, 14, 28, 330, 352, + /* 490 */ 38, 32, 353, 371, 36, 34, 223, 203, 175, 134, + /* 500 */ 281, 354, 16, 121, 131, 37, 202, 119, 379, 359, + /* 510 */ 358, 357, 366, 319, 274, 270, 267, 255, 256, 258, + /* 520 */ 338, 171, 377, 96, 382, 385, 305, 31, 328, 149, + /* 530 */ 259, 367, 50, 46, 48, 45, 14, 28, 330, 352, + /* 540 */ 38, 32, 353, 371, 36, 34, 223, 224, 9, 374, + /* 550 */ 228, 140, 5, 129, 42, 139, 372, 370, 379, 359, + /* 560 */ 358, 357, 366, 319, 274, 270, 267, 255, 256, 258, + /* 570 */ 193, 309, 168, 279, 324, 12, 281, 20, 16, 44, + /* 580 */ 378, 135, 50, 46, 48, 45, 14, 28, 330, 352, + /* 590 */ 38, 32, 353, 371, 36, 34, 223, 112, 313, 323, + /* 600 */ 323, 323, 323, 323, 323, 323, 323, 99, 379, 359, + /* 610 */ 358, 357, 366, 319, 274, 270, 267, 255, 256, 258, + /* 620 */ 338, 348, 323, 16, 323, 323, 323, 323, 323, 323, + /* 630 */ 323, 323, 50, 46, 48, 45, 14, 28, 330, 352, + /* 640 */ 38, 32, 353, 371, 36, 34, 323, 323, 323, 323, + /* 650 */ 323, 323, 323, 323, 323, 323, 323, 323, 379, 359, + /* 660 */ 358, 357, 366, 319, 274, 270, 267, 255, 256, 258, + /* 670 */ 223, 223, 323, 304, 101, 165, 223, 142, 228, 323, + /* 680 */ 244, 53, 118, 126, 259, 11, 456, 29, 15, 329, + /* 690 */ 266, 456, 201, 343, 321, 30, 310, 323, 456, 233, + /* 700 */ 206, 323, 323, 456, 323, 223, 50, 46, 48, 45, + /* 710 */ 14, 28, 330, 352, 38, 32, 353, 371, 36, 34, + /* 720 */ 269, 47, 224, 323, 323, 323, 47, 323, 323, 323, + /* 730 */ 323, 323, 379, 359, 358, 357, 366, 319, 274, 270, + /* 740 */ 267, 255, 256, 258, 223, 323, 323, 323, 194, 186, + /* 750 */ 323, 257, 363, 289, 323, 325, 264, 254, 259, 205, + /* 760 */ 43, 29, 15, 16, 16, 16, 7, 107, 16, 16, + /* 770 */ 323, 323, 147, 323, 206, 323, 276, 245, 323, 323, + /* 780 */ 50, 46, 48, 45, 14, 28, 330, 352, 38, 32, + /* 790 */ 353, 371, 36, 34, 223, 323, 323, 323, 323, 323, + /* 800 */ 323, 323, 323, 323, 323, 124, 379, 359, 358, 357, + /* 810 */ 366, 319, 274, 270, 267, 255, 256, 258, 338, 323, + /* 820 */ 344, 18, 336, 323, 323, 323, 323, 323, 323, 323, + /* 830 */ 50, 46, 48, 45, 14, 28, 330, 352, 38, 32, + /* 840 */ 353, 371, 36, 34, 323, 323, 323, 323, 323, 323, + /* 850 */ 323, 323, 323, 323, 323, 369, 379, 359, 358, 357, + /* 860 */ 366, 319, 274, 270, 267, 255, 256, 258, 223, 304, + /* 870 */ 323, 164, 361, 142, 323, 339, 244, 80, 127, 167, + /* 880 */ 259, 342, 375, 275, 16, 329, 266, 16, 259, 343, + /* 890 */ 321, 281, 310, 16, 16, 323, 323, 323, 323, 281, + /* 900 */ 323, 323, 323, 323, 50, 46, 48, 45, 14, 28, + /* 910 */ 330, 352, 38, 32, 353, 371, 36, 34, 223, 323, + /* 920 */ 323, 323, 323, 323, 323, 323, 323, 323, 323, 117, + /* 930 */ 379, 359, 358, 357, 366, 319, 274, 270, 267, 255, + /* 940 */ 256, 258, 338, 323, 323, 323, 240, 323, 323, 323, + /* 950 */ 323, 323, 323, 323, 50, 46, 48, 45, 14, 28, + /* 960 */ 330, 352, 38, 32, 353, 371, 36, 34, 223, 323, + /* 970 */ 323, 323, 323, 323, 323, 323, 323, 323, 323, 102, + /* 980 */ 379, 359, 358, 357, 366, 319, 274, 270, 267, 255, + /* 990 */ 256, 258, 338, 323, 323, 323, 323, 323, 323, 323, + /* 1000 */ 323, 323, 323, 323, 50, 46, 48, 45, 14, 28, + /* 1010 */ 330, 352, 38, 32, 353, 371, 36, 34, 323, 335, + /* 1020 */ 323, 323, 323, 323, 323, 323, 161, 323, 323, 323, + /* 1030 */ 379, 359, 358, 357, 366, 319, 274, 270, 267, 255, + /* 1040 */ 256, 258, 50, 46, 48, 45, 14, 28, 330, 352, + /* 1050 */ 38, 32, 353, 371, 36, 34, 351, 323, 323, 323, + /* 1060 */ 323, 323, 323, 323, 136, 323, 223, 323, 379, 359, + /* 1070 */ 358, 357, 366, 319, 274, 270, 267, 255, 256, 258, + /* 1080 */ 150, 271, 160, 323, 40, 323, 143, 210, 323, 323, + /* 1090 */ 7, 107, 281, 302, 253, 338, 147, 323, 325, 323, + /* 1100 */ 276, 245, 229, 43, 33, 16, 16, 51, 323, 7, + /* 1110 */ 107, 323, 323, 323, 323, 147, 323, 323, 323, 276, + /* 1120 */ 245, 194, 52, 49, 380, 225, 349, 105, 323, 106, + /* 1130 */ 1, 355, 323, 223, 29, 15, 323, 280, 315, 40, + /* 1140 */ 338, 143, 214, 223, 98, 7, 107, 206, 453, 16, + /* 1150 */ 16, 147, 323, 323, 323, 276, 245, 229, 450, 33, + /* 1160 */ 453, 265, 51, 350, 18, 336, 362, 304, 323, 115, + /* 1170 */ 16, 152, 323, 16, 244, 323, 127, 52, 49, 380, + /* 1180 */ 225, 349, 338, 47, 106, 1, 323, 343, 321, 223, + /* 1190 */ 310, 318, 323, 323, 40, 323, 138, 214, 304, 98, + /* 1200 */ 7, 107, 159, 16, 346, 244, 147, 127, 249, 323, + /* 1210 */ 276, 245, 229, 340, 10, 273, 16, 51, 343, 321, + /* 1220 */ 323, 310, 304, 3, 323, 16, 153, 323, 323, 244, + /* 1230 */ 323, 127, 52, 49, 380, 225, 349, 323, 331, 106, + /* 1240 */ 1, 323, 343, 321, 223, 310, 137, 223, 277, 40, + /* 1250 */ 16, 128, 92, 223, 98, 7, 107, 323, 323, 450, + /* 1260 */ 16, 147, 282, 323, 292, 276, 245, 229, 308, 33, + /* 1270 */ 362, 16, 51, 323, 16, 16, 16, 304, 323, 144, + /* 1280 */ 16, 157, 323, 323, 244, 323, 127, 52, 49, 380, + /* 1290 */ 225, 349, 338, 323, 106, 1, 323, 343, 321, 100, + /* 1300 */ 310, 323, 323, 47, 40, 323, 143, 212, 323, 98, + /* 1310 */ 7, 107, 338, 323, 323, 323, 147, 323, 323, 323, + /* 1320 */ 276, 245, 229, 323, 33, 323, 323, 51, 323, 323, + /* 1330 */ 323, 323, 304, 323, 323, 323, 151, 323, 323, 244, + /* 1340 */ 323, 127, 52, 49, 380, 225, 349, 323, 323, 106, + /* 1350 */ 1, 323, 343, 321, 323, 310, 323, 323, 323, 40, + /* 1360 */ 323, 125, 214, 323, 98, 7, 107, 323, 323, 323, + /* 1370 */ 323, 147, 323, 323, 323, 276, 245, 229, 323, 33, + /* 1380 */ 323, 323, 51, 323, 323, 323, 323, 304, 323, 323, + /* 1390 */ 323, 155, 323, 323, 244, 323, 127, 52, 49, 380, + /* 1400 */ 225, 349, 323, 323, 106, 1, 323, 343, 321, 323, + /* 1410 */ 310, 323, 323, 323, 40, 323, 130, 214, 323, 98, + /* 1420 */ 7, 107, 323, 323, 323, 323, 147, 323, 323, 323, + /* 1430 */ 276, 245, 229, 323, 6, 323, 323, 51, 323, 323, + /* 1440 */ 323, 323, 304, 323, 323, 323, 154, 323, 323, 244, + /* 1450 */ 323, 127, 52, 49, 380, 225, 349, 323, 323, 106, + /* 1460 */ 1, 323, 343, 321, 323, 310, 323, 323, 323, 40, + /* 1470 */ 323, 143, 209, 323, 98, 7, 107, 323, 323, 323, + /* 1480 */ 323, 147, 323, 323, 323, 276, 245, 229, 323, 33, + /* 1490 */ 323, 323, 51, 323, 323, 323, 323, 304, 323, 323, + /* 1500 */ 323, 158, 323, 323, 244, 323, 127, 52, 49, 380, + /* 1510 */ 225, 349, 323, 323, 106, 1, 323, 343, 321, 323, + /* 1520 */ 310, 323, 323, 323, 40, 323, 143, 208, 323, 98, + /* 1530 */ 7, 107, 323, 323, 323, 323, 147, 323, 323, 323, + /* 1540 */ 276, 245, 222, 323, 33, 323, 323, 51, 323, 323, + /* 1550 */ 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, + /* 1560 */ 323, 323, 52, 49, 380, 225, 349, 323, 323, 106, + /* 1570 */ 1, 323, 323, 323, 323, 323, 323, 323, 323, 40, + /* 1580 */ 323, 143, 207, 323, 98, 7, 107, 323, 323, 323, + /* 1590 */ 323, 147, 323, 323, 323, 276, 245, 229, 323, 33, + /* 1600 */ 323, 323, 51, 323, 323, 323, 323, 323, 323, 323, + /* 1610 */ 323, 323, 323, 323, 323, 323, 323, 52, 49, 380, + /* 1620 */ 225, 349, 323, 323, 106, 1, 323, 323, 323, 323, + /* 1630 */ 323, 323, 323, 323, 40, 323, 138, 214, 323, 98, + /* 1640 */ 7, 107, 323, 323, 323, 323, 147, 323, 323, 323, + /* 1650 */ 276, 245, 229, 323, 10, 323, 323, 51, 323, 323, + /* 1660 */ 323, 323, 323, 323, 323, 323, 323, 194, 182, 323, + /* 1670 */ 323, 323, 52, 49, 380, 225, 349, 259, 323, 106, + /* 1680 */ 29, 15, 323, 323, 323, 323, 323, 323, 323, 40, + /* 1690 */ 323, 138, 213, 206, 98, 7, 107, 323, 323, 323, + /* 1700 */ 323, 147, 323, 323, 323, 276, 245, 229, 323, 10, + /* 1710 */ 323, 323, 51, 323, 323, 323, 323, 323, 323, 323, + /* 1720 */ 323, 323, 323, 323, 323, 323, 499, 52, 49, 380, + /* 1730 */ 225, 349, 323, 499, 106, 499, 499, 323, 499, 499, + /* 1740 */ 323, 323, 323, 323, 499, 3, 499, 323, 323, 98, + /* 1750 */ 323, 323, 323, 323, 323, 323, 323, 323, 304, 323, + /* 1760 */ 323, 499, 120, 323, 323, 244, 73, 127, 137, 323, + /* 1770 */ 323, 323, 499, 323, 329, 266, 323, 323, 343, 321, + /* 1780 */ 323, 310, 323, 323, 323, 323, 499, 323, 323, 323, + /* 1790 */ 304, 323, 219, 334, 120, 323, 323, 244, 73, 127, + /* 1800 */ 323, 323, 323, 323, 323, 323, 329, 266, 323, 323, + /* 1810 */ 343, 321, 304, 310, 323, 323, 114, 323, 323, 244, + /* 1820 */ 77, 127, 323, 323, 323, 333, 194, 187, 329, 266, + /* 1830 */ 323, 323, 343, 321, 323, 310, 259, 323, 323, 29, + /* 1840 */ 15, 304, 323, 323, 323, 142, 323, 323, 221, 68, + /* 1850 */ 127, 323, 206, 194, 179, 323, 323, 329, 266, 323, + /* 1860 */ 323, 343, 321, 259, 310, 323, 29, 15, 323, 304, + /* 1870 */ 323, 323, 323, 142, 323, 323, 244, 64, 127, 206, + /* 1880 */ 323, 194, 189, 323, 323, 329, 266, 323, 323, 343, + /* 1890 */ 321, 259, 310, 304, 29, 15, 323, 113, 323, 323, + /* 1900 */ 244, 62, 127, 323, 323, 323, 323, 206, 323, 329, + /* 1910 */ 266, 304, 323, 343, 321, 142, 310, 323, 244, 69, + /* 1920 */ 127, 323, 323, 323, 323, 323, 323, 329, 266, 323, + /* 1930 */ 323, 343, 321, 304, 310, 323, 323, 142, 323, 323, + /* 1940 */ 244, 88, 127, 323, 323, 323, 323, 323, 323, 329, + /* 1950 */ 266, 323, 323, 343, 321, 323, 310, 323, 323, 304, + /* 1960 */ 323, 323, 323, 142, 323, 323, 244, 90, 127, 323, + /* 1970 */ 323, 323, 323, 323, 323, 329, 266, 323, 323, 343, + /* 1980 */ 321, 323, 310, 304, 323, 323, 323, 116, 323, 323, + /* 1990 */ 244, 82, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2000 */ 266, 304, 323, 343, 321, 142, 310, 323, 244, 72, + /* 2010 */ 127, 323, 323, 323, 323, 323, 323, 329, 266, 323, + /* 2020 */ 323, 343, 321, 304, 310, 323, 323, 142, 323, 323, + /* 2030 */ 244, 63, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2040 */ 266, 323, 323, 343, 321, 323, 310, 323, 323, 304, + /* 2050 */ 323, 323, 323, 142, 323, 323, 244, 91, 127, 323, + /* 2060 */ 323, 323, 323, 323, 323, 329, 266, 323, 323, 343, + /* 2070 */ 321, 323, 310, 304, 323, 323, 323, 142, 323, 323, + /* 2080 */ 244, 60, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2090 */ 266, 304, 323, 343, 321, 142, 310, 323, 244, 89, + /* 2100 */ 127, 323, 323, 323, 323, 323, 323, 329, 266, 323, + /* 2110 */ 323, 343, 321, 304, 310, 323, 323, 142, 323, 323, + /* 2120 */ 244, 70, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2130 */ 266, 323, 323, 343, 321, 323, 310, 323, 323, 304, + /* 2140 */ 323, 323, 323, 142, 323, 323, 244, 78, 127, 323, + /* 2150 */ 323, 323, 323, 323, 323, 329, 266, 323, 323, 343, + /* 2160 */ 321, 323, 310, 304, 323, 323, 323, 142, 323, 323, + /* 2170 */ 244, 61, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2180 */ 266, 304, 323, 343, 321, 142, 310, 323, 244, 76, + /* 2190 */ 127, 323, 323, 323, 323, 323, 323, 329, 266, 323, + /* 2200 */ 323, 343, 321, 304, 310, 323, 323, 142, 323, 323, + /* 2210 */ 244, 74, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2220 */ 266, 323, 323, 343, 321, 323, 310, 323, 323, 304, + /* 2230 */ 323, 323, 323, 142, 323, 323, 244, 87, 127, 323, + /* 2240 */ 323, 323, 323, 323, 323, 329, 266, 323, 323, 343, + /* 2250 */ 321, 323, 310, 304, 323, 323, 323, 142, 323, 323, + /* 2260 */ 244, 67, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2270 */ 266, 304, 323, 343, 321, 142, 310, 323, 244, 83, + /* 2280 */ 127, 323, 323, 323, 323, 323, 323, 329, 266, 323, + /* 2290 */ 323, 343, 321, 304, 310, 323, 323, 142, 323, 323, + /* 2300 */ 244, 58, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2310 */ 266, 323, 323, 343, 321, 323, 310, 323, 323, 304, + /* 2320 */ 323, 323, 323, 94, 323, 323, 93, 59, 123, 323, + /* 2330 */ 323, 323, 323, 323, 323, 329, 266, 323, 323, 343, + /* 2340 */ 321, 323, 310, 304, 323, 323, 323, 142, 323, 323, + /* 2350 */ 244, 86, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2360 */ 266, 304, 323, 343, 321, 142, 310, 323, 244, 85, + /* 2370 */ 127, 323, 323, 323, 323, 323, 323, 329, 266, 323, + /* 2380 */ 323, 343, 321, 304, 310, 323, 323, 142, 323, 323, + /* 2390 */ 244, 57, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2400 */ 266, 323, 323, 343, 321, 323, 310, 323, 323, 304, + /* 2410 */ 323, 323, 323, 142, 323, 323, 244, 66, 127, 323, + /* 2420 */ 323, 323, 323, 323, 323, 329, 266, 323, 323, 343, + /* 2430 */ 321, 323, 310, 304, 323, 323, 323, 142, 323, 323, + /* 2440 */ 244, 79, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2450 */ 266, 304, 323, 343, 321, 142, 310, 323, 244, 65, + /* 2460 */ 127, 323, 323, 323, 323, 323, 323, 329, 266, 323, + /* 2470 */ 323, 343, 321, 304, 310, 323, 323, 142, 323, 323, + /* 2480 */ 244, 81, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2490 */ 266, 323, 323, 343, 321, 323, 310, 323, 323, 304, + /* 2500 */ 323, 323, 323, 94, 323, 323, 95, 56, 123, 323, + /* 2510 */ 323, 323, 323, 323, 323, 329, 266, 323, 323, 343, + /* 2520 */ 321, 323, 310, 304, 323, 323, 323, 142, 323, 323, + /* 2530 */ 244, 71, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2540 */ 266, 304, 323, 343, 321, 142, 310, 323, 244, 54, + /* 2550 */ 127, 323, 323, 323, 323, 323, 323, 329, 266, 323, + /* 2560 */ 323, 343, 321, 304, 310, 323, 323, 122, 323, 323, + /* 2570 */ 244, 55, 127, 323, 323, 323, 323, 323, 323, 329, + /* 2580 */ 266, 323, 323, 343, 321, 323, 310, 323, 323, 304, + /* 2590 */ 323, 323, 323, 142, 323, 323, 244, 84, 127, 323, + /* 2600 */ 323, 323, 323, 323, 323, 329, 266, 323, 323, 343, + /* 2610 */ 321, 323, 310, 304, 323, 323, 323, 156, 323, 323, + /* 2620 */ 244, 323, 127, 323, 323, 323, 323, 323, 323, 323, + /* 2630 */ 364, 323, 323, 343, 321, 323, 310, ); static public $yy_lookahead = array( - /* 0 */ 1, 82, 83, 84, 3, 4, 5, 6, 7, 8, - /* 10 */ 9, 10, 11, 12, 18, 89, 15, 80, 81, 82, - /* 20 */ 83, 84, 21, 22, 98, 26, 15, 28, 27, 18, - /* 30 */ 19, 116, 31, 32, 33, 24, 110, 38, 39, 40, + /* 0 */ 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, + /* 10 */ 12, 15, 56, 15, 18, 16, 16, 61, 15, 21, + /* 20 */ 22, 18, 19, 113, 28, 27, 30, 28, 28, 31, + /* 30 */ 32, 79, 80, 81, 82, 83, 37, 38, 39, 40, /* 40 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - /* 50 */ 51, 4, 5, 6, 7, 8, 60, 1, 36, 12, - /* 60 */ 13, 14, 1, 64, 65, 66, 67, 68, 69, 70, - /* 70 */ 71, 72, 73, 74, 75, 1, 83, 16, 88, 57, - /* 80 */ 87, 59, 88, 90, 91, 63, 30, 16, 15, 28, - /* 90 */ 16, 18, 99, 100, 19, 20, 103, 104, 105, 28, - /* 100 */ 107, 28, 28, 30, 2, 115, 116, 36, 52, 115, - /* 110 */ 117, 118, 38, 39, 40, 41, 42, 43, 44, 45, - /* 120 */ 46, 47, 48, 49, 50, 51, 83, 88, 89, 109, - /* 130 */ 59, 111, 112, 15, 59, 17, 18, 98, 64, 65, - /* 140 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - /* 150 */ 1, 83, 34, 15, 115, 87, 18, 19, 90, 91, - /* 160 */ 92, 15, 119, 120, 18, 16, 16, 99, 100, 19, - /* 170 */ 89, 103, 104, 105, 28, 107, 30, 28, 28, 98, - /* 180 */ 36, 15, 15, 17, 18, 18, 36, 38, 39, 40, - /* 190 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - /* 200 */ 51, 88, 89, 59, 15, 57, 30, 18, 19, 59, - /* 210 */ 62, 98, 36, 64, 65, 66, 67, 68, 69, 70, - /* 220 */ 71, 72, 73, 74, 75, 1, 83, 60, 115, 16, - /* 230 */ 87, 97, 15, 90, 91, 59, 1, 24, 19, 20, - /* 240 */ 16, 15, 99, 100, 18, 20, 103, 104, 105, 60, - /* 250 */ 107, 16, 28, 36, 84, 20, 86, 114, 111, 112, - /* 260 */ 17, 18, 38, 39, 40, 41, 42, 43, 44, 45, - /* 270 */ 46, 47, 48, 49, 50, 51, 1, 2, 59, 91, - /* 280 */ 92, 93, 57, 111, 112, 24, 60, 62, 64, 65, - /* 290 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - /* 300 */ 89, 1, 88, 89, 61, 35, 35, 37, 37, 98, - /* 310 */ 17, 18, 98, 38, 39, 40, 41, 42, 43, 44, - /* 320 */ 45, 46, 47, 48, 49, 50, 51, 1, 89, 115, - /* 330 */ 35, 35, 37, 88, 88, 91, 92, 98, 77, 64, - /* 340 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - /* 350 */ 75, 23, 52, 89, 115, 29, 108, 97, 110, 63, - /* 360 */ 115, 115, 98, 35, 38, 39, 40, 41, 42, 43, - /* 370 */ 44, 45, 46, 47, 48, 49, 50, 51, 1, 115, - /* 380 */ 89, 15, 15, 15, 18, 18, 18, 95, 17, 98, - /* 390 */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - /* 400 */ 74, 75, 110, 89, 91, 92, 115, 36, 1, 108, - /* 410 */ 15, 110, 98, 18, 108, 38, 39, 40, 41, 42, - /* 420 */ 43, 44, 45, 46, 47, 48, 49, 50, 51, 115, - /* 430 */ 106, 106, 36, 15, 97, 28, 18, 113, 113, 108, - /* 440 */ 95, 64, 65, 66, 67, 68, 69, 70, 71, 72, - /* 450 */ 73, 74, 75, 1, 77, 110, 83, 108, 15, 18, - /* 460 */ 87, 18, 83, 90, 91, 20, 87, 17, 19, 91, - /* 470 */ 91, 28, 99, 100, 1, 23, 103, 104, 105, 100, - /* 480 */ 107, 103, 103, 104, 105, 107, 107, 114, 2, 16, - /* 490 */ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - /* 500 */ 48, 49, 50, 51, 59, 19, 57, 19, 37, 61, - /* 510 */ 18, 17, 53, 2, 18, 95, 64, 65, 66, 67, - /* 520 */ 68, 69, 70, 71, 72, 73, 74, 75, 1, 83, - /* 530 */ 110, 89, 63, 87, 83, 25, 90, 91, 87, 17, - /* 540 */ 98, 18, 91, 16, 1, 99, 100, 1, 2, 103, - /* 550 */ 104, 105, 110, 107, 103, 104, 105, 18, 107, 16, - /* 560 */ 114, 61, 16, 34, 1, 38, 39, 40, 41, 42, - /* 570 */ 43, 44, 45, 46, 47, 48, 49, 50, 51, 16, - /* 580 */ 89, 2, 18, 17, 24, 57, 34, 36, 17, 98, - /* 590 */ 95, 64, 65, 66, 67, 68, 69, 70, 71, 72, - /* 600 */ 73, 74, 75, 1, 83, 110, 89, 18, 87, 18, - /* 610 */ 16, 90, 91, 92, 89, 98, 96, 16, 16, 16, - /* 620 */ 99, 100, 28, 98, 103, 104, 105, 110, 107, 28, - /* 630 */ 110, 28, 18, 18, 98, 110, 20, 1, 28, 109, - /* 640 */ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - /* 650 */ 48, 49, 50, 51, 1, 115, 108, 28, 113, 110, - /* 660 */ 28, 94, 112, 95, 95, 95, 64, 65, 66, 67, - /* 670 */ 68, 69, 70, 71, 72, 73, 74, 75, 110, 110, - /* 680 */ 110, 85, 94, 13, 121, 121, 121, 121, 121, 121, - /* 690 */ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, - /* 700 */ 47, 48, 49, 50, 51, 1, 121, 121, 121, 121, - /* 710 */ 121, 121, 121, 121, 95, 95, 95, 64, 65, 66, - /* 720 */ 67, 68, 69, 70, 71, 72, 73, 74, 75, 110, - /* 730 */ 110, 110, 121, 121, 121, 121, 121, 121, 121, 121, - /* 740 */ 121, 37, 38, 39, 40, 41, 42, 43, 44, 45, - /* 750 */ 46, 47, 48, 49, 50, 51, 1, 121, 121, 121, - /* 760 */ 121, 121, 121, 121, 121, 121, 121, 121, 64, 65, - /* 770 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - /* 780 */ 83, 121, 121, 28, 121, 121, 121, 121, 121, 121, - /* 790 */ 121, 121, 121, 38, 39, 40, 41, 42, 43, 44, - /* 800 */ 45, 46, 47, 48, 49, 50, 51, 1, 121, 121, - /* 810 */ 121, 121, 121, 121, 121, 121, 121, 120, 121, 64, - /* 820 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - /* 830 */ 75, 121, 121, 121, 121, 121, 121, 121, 121, 121, - /* 840 */ 121, 121, 121, 121, 38, 39, 40, 41, 42, 43, - /* 850 */ 44, 45, 46, 47, 48, 49, 50, 51, 121, 121, - /* 860 */ 121, 121, 121, 121, 121, 121, 121, 121, 121, 63, - /* 870 */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - /* 880 */ 74, 75, 1, 121, 121, 121, 88, 83, 1, 16, - /* 890 */ 16, 87, 121, 10, 16, 91, 121, 16, 15, 101, - /* 900 */ 102, 28, 28, 16, 21, 22, 28, 103, 104, 105, - /* 910 */ 27, 107, 121, 115, 31, 32, 33, 121, 1, 38, - /* 920 */ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - /* 930 */ 49, 50, 51, 16, 121, 121, 121, 121, 121, 52, - /* 940 */ 121, 121, 121, 121, 121, 64, 65, 66, 67, 68, - /* 950 */ 69, 70, 71, 72, 73, 74, 75, 1, 121, 76, - /* 960 */ 77, 78, 83, 16, 16, 16, 87, 121, 10, 16, - /* 970 */ 91, 121, 16, 15, 121, 28, 28, 28, 121, 21, - /* 980 */ 22, 28, 103, 104, 105, 27, 107, 121, 121, 31, - /* 990 */ 32, 33, 121, 121, 38, 39, 40, 41, 42, 43, - /* 1000 */ 44, 45, 46, 47, 48, 49, 50, 51, 1, 121, - /* 1010 */ 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - /* 1020 */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - /* 1030 */ 74, 75, 121, 121, 76, 77, 78, 121, 121, 121, - /* 1040 */ 121, 121, 121, 121, 121, 38, 39, 40, 41, 42, - /* 1050 */ 43, 44, 45, 46, 47, 48, 49, 50, 51, 121, - /* 1060 */ 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - /* 1070 */ 121, 64, 65, 66, 67, 68, 69, 70, 71, 72, - /* 1080 */ 73, 74, 75, 121, 38, 39, 40, 41, 42, 43, - /* 1090 */ 44, 45, 46, 47, 48, 49, 50, 51, 121, 121, - /* 1100 */ 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, - /* 1110 */ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - /* 1120 */ 74, 75, 121, 121, 121, 121, 15, 121, 17, 18, - /* 1130 */ 121, 83, 21, 22, 16, 87, 121, 16, 27, 91, - /* 1140 */ 121, 121, 31, 32, 33, 34, 28, 36, 100, 28, - /* 1150 */ 39, 103, 104, 105, 121, 107, 83, 121, 121, 121, - /* 1160 */ 87, 121, 121, 121, 91, 54, 55, 56, 57, 58, - /* 1170 */ 121, 83, 61, 62, 63, 87, 103, 104, 105, 91, - /* 1180 */ 107, 121, 15, 121, 17, 18, 121, 76, 21, 22, - /* 1190 */ 16, 103, 104, 105, 27, 107, 16, 16, 31, 32, - /* 1200 */ 33, 34, 28, 36, 16, 121, 39, 16, 28, 28, - /* 1210 */ 83, 121, 121, 121, 87, 121, 28, 90, 91, 28, - /* 1220 */ 1, 54, 55, 56, 57, 58, 99, 100, 61, 62, - /* 1230 */ 103, 104, 105, 1, 107, 16, 121, 16, 15, 121, - /* 1240 */ 17, 18, 121, 76, 21, 22, 16, 28, 16, 28, - /* 1250 */ 27, 16, 20, 121, 31, 32, 33, 34, 28, 36, - /* 1260 */ 28, 121, 39, 28, 16, 121, 83, 121, 36, 121, - /* 1270 */ 87, 52, 121, 90, 91, 121, 28, 54, 55, 56, - /* 1280 */ 57, 58, 99, 100, 61, 62, 103, 104, 105, 121, - /* 1290 */ 107, 59, 121, 121, 15, 121, 17, 18, 121, 76, - /* 1300 */ 21, 22, 121, 121, 121, 121, 27, 121, 121, 121, - /* 1310 */ 31, 32, 33, 34, 121, 36, 121, 121, 39, 121, - /* 1320 */ 121, 121, 83, 121, 121, 121, 87, 121, 121, 90, - /* 1330 */ 91, 121, 1, 54, 55, 56, 57, 58, 99, 100, - /* 1340 */ 61, 62, 103, 104, 105, 121, 107, 16, 121, 121, - /* 1350 */ 15, 121, 17, 18, 121, 76, 21, 22, 121, 28, - /* 1360 */ 29, 121, 27, 121, 121, 121, 31, 32, 33, 34, - /* 1370 */ 121, 36, 121, 121, 39, 121, 121, 121, 83, 121, - /* 1380 */ 121, 121, 87, 52, 121, 90, 91, 121, 1, 54, - /* 1390 */ 55, 56, 57, 58, 99, 100, 61, 62, 103, 104, - /* 1400 */ 105, 121, 107, 16, 121, 121, 15, 121, 17, 18, - /* 1410 */ 121, 76, 21, 22, 121, 28, 121, 121, 27, 121, - /* 1420 */ 121, 121, 31, 32, 33, 34, 121, 36, 121, 121, - /* 1430 */ 39, 121, 121, 121, 83, 121, 121, 121, 87, 52, - /* 1440 */ 121, 90, 91, 121, 1, 54, 55, 56, 57, 58, - /* 1450 */ 99, 100, 61, 62, 103, 104, 105, 121, 107, 16, - /* 1460 */ 121, 121, 15, 121, 17, 18, 121, 76, 21, 22, - /* 1470 */ 121, 28, 121, 121, 27, 121, 121, 121, 31, 32, - /* 1480 */ 33, 34, 121, 36, 121, 121, 39, 121, 121, 121, - /* 1490 */ 83, 121, 121, 121, 87, 52, 121, 90, 91, 121, - /* 1500 */ 121, 54, 55, 56, 57, 58, 99, 100, 61, 62, - /* 1510 */ 103, 104, 105, 121, 107, 121, 121, 121, 15, 121, - /* 1520 */ 17, 18, 121, 76, 21, 22, 121, 121, 121, 121, - /* 1530 */ 27, 121, 121, 121, 31, 32, 33, 34, 121, 36, - /* 1540 */ 121, 121, 39, 121, 121, 121, 83, 121, 121, 121, - /* 1550 */ 87, 121, 121, 90, 91, 121, 121, 54, 55, 56, - /* 1560 */ 57, 58, 99, 100, 61, 62, 103, 104, 105, 121, - /* 1570 */ 107, 121, 121, 121, 15, 121, 17, 18, 121, 76, - /* 1580 */ 21, 22, 121, 121, 121, 121, 27, 121, 121, 121, - /* 1590 */ 31, 32, 33, 34, 121, 36, 121, 121, 39, 121, - /* 1600 */ 121, 121, 83, 121, 121, 121, 87, 121, 121, 90, - /* 1610 */ 91, 121, 121, 54, 55, 56, 57, 58, 99, 100, - /* 1620 */ 61, 62, 103, 104, 105, 121, 107, 121, 121, 121, - /* 1630 */ 15, 121, 17, 18, 121, 76, 21, 22, 121, 121, - /* 1640 */ 121, 121, 27, 121, 121, 121, 31, 32, 33, 34, - /* 1650 */ 121, 36, 121, 121, 39, 121, 121, 121, 83, 121, - /* 1660 */ 121, 121, 87, 121, 121, 90, 91, 121, 121, 54, - /* 1670 */ 55, 56, 57, 58, 99, 100, 61, 62, 103, 104, - /* 1680 */ 105, 121, 107, 121, 121, 121, 15, 121, 17, 18, - /* 1690 */ 121, 76, 21, 22, 121, 121, 121, 121, 27, 121, - /* 1700 */ 121, 121, 31, 32, 33, 34, 121, 36, 121, 121, - /* 1710 */ 39, 121, 121, 121, 83, 121, 121, 121, 87, 121, - /* 1720 */ 121, 90, 91, 121, 121, 54, 55, 56, 57, 58, - /* 1730 */ 99, 100, 61, 121, 103, 104, 105, 121, 107, 121, - /* 1740 */ 121, 121, 15, 121, 17, 18, 121, 76, 21, 22, - /* 1750 */ 121, 121, 121, 121, 27, 121, 121, 121, 31, 32, - /* 1760 */ 33, 34, 121, 36, 88, 89, 39, 121, 121, 121, - /* 1770 */ 121, 121, 121, 121, 98, 121, 121, 101, 102, 121, - /* 1780 */ 16, 54, 55, 56, 57, 58, 121, 23, 61, 25, - /* 1790 */ 26, 115, 28, 29, 121, 121, 121, 121, 121, 35, - /* 1800 */ 36, 37, 121, 76, 121, 121, 121, 121, 121, 121, - /* 1810 */ 121, 121, 121, 83, 121, 121, 52, 87, 121, 121, - /* 1820 */ 90, 91, 121, 59, 121, 121, 121, 63, 121, 99, - /* 1830 */ 100, 121, 121, 103, 104, 105, 121, 107, 83, 121, - /* 1840 */ 121, 77, 87, 121, 121, 90, 91, 121, 118, 121, - /* 1850 */ 121, 121, 121, 121, 99, 100, 121, 121, 103, 104, - /* 1860 */ 105, 121, 107, 121, 83, 121, 121, 121, 87, 121, - /* 1870 */ 121, 90, 91, 121, 83, 121, 121, 121, 87, 121, - /* 1880 */ 99, 100, 91, 83, 103, 104, 105, 87, 107, 121, - /* 1890 */ 90, 91, 121, 121, 103, 104, 105, 121, 107, 99, - /* 1900 */ 100, 121, 121, 103, 104, 105, 121, 107, 121, 121, - /* 1910 */ 121, 83, 121, 121, 121, 87, 121, 121, 90, 91, - /* 1920 */ 121, 121, 83, 121, 121, 121, 87, 99, 100, 90, - /* 1930 */ 91, 103, 104, 105, 121, 107, 121, 121, 99, 100, - /* 1940 */ 121, 121, 103, 104, 105, 121, 107, 121, 83, 121, - /* 1950 */ 121, 121, 87, 121, 121, 90, 91, 121, 83, 121, - /* 1960 */ 121, 121, 87, 121, 99, 100, 91, 83, 103, 104, - /* 1970 */ 105, 87, 107, 121, 90, 91, 121, 121, 103, 104, - /* 1980 */ 105, 121, 107, 99, 100, 121, 121, 103, 104, 105, - /* 1990 */ 121, 107, 121, 121, 121, 83, 121, 121, 121, 87, - /* 2000 */ 121, 121, 90, 91, 121, 121, 83, 121, 121, 121, - /* 2010 */ 87, 99, 100, 90, 91, 103, 104, 105, 121, 107, - /* 2020 */ 121, 121, 99, 100, 121, 121, 103, 104, 105, 121, - /* 2030 */ 107, 121, 83, 88, 89, 121, 87, 121, 121, 90, - /* 2040 */ 91, 121, 121, 98, 121, 121, 101, 102, 99, 100, - /* 2050 */ 121, 83, 103, 104, 105, 87, 107, 121, 90, 91, - /* 2060 */ 115, 121, 121, 121, 88, 89, 121, 99, 100, 121, - /* 2070 */ 121, 103, 104, 105, 98, 107, 121, 101, 102, 83, - /* 2080 */ 121, 121, 121, 87, 121, 121, 90, 91, 121, 121, - /* 2090 */ 83, 115, 121, 121, 87, 99, 100, 90, 91, 103, - /* 2100 */ 104, 105, 121, 107, 121, 121, 99, 100, 121, 121, - /* 2110 */ 103, 104, 105, 121, 107, 121, 83, 88, 89, 121, - /* 2120 */ 87, 121, 121, 90, 91, 121, 121, 98, 121, 121, - /* 2130 */ 101, 102, 99, 100, 121, 83, 103, 104, 105, 87, - /* 2140 */ 107, 121, 90, 91, 115, 121, 121, 121, 88, 89, - /* 2150 */ 121, 99, 100, 121, 121, 103, 104, 105, 98, 107, - /* 2160 */ 121, 101, 102, 83, 121, 121, 121, 87, 121, 121, - /* 2170 */ 90, 91, 121, 121, 83, 115, 121, 121, 87, 99, - /* 2180 */ 100, 90, 91, 103, 104, 105, 121, 107, 121, 121, - /* 2190 */ 99, 100, 121, 121, 103, 104, 105, 121, 107, 121, - /* 2200 */ 83, 88, 89, 121, 87, 121, 121, 90, 91, 121, - /* 2210 */ 121, 98, 121, 121, 101, 102, 99, 100, 121, 83, - /* 2220 */ 103, 104, 105, 87, 107, 121, 90, 91, 115, 121, - /* 2230 */ 121, 121, 121, 121, 121, 99, 100, 121, 121, 103, - /* 2240 */ 104, 105, 121, 107, 121, 121, 121, 83, 121, 121, - /* 2250 */ 121, 87, 121, 121, 90, 91, 121, 121, 83, 121, - /* 2260 */ 121, 121, 87, 99, 100, 90, 91, 103, 104, 105, - /* 2270 */ 121, 107, 121, 121, 99, 100, 121, 121, 103, 104, - /* 2280 */ 105, 121, 107, 121, 83, 121, 121, 121, 87, 121, - /* 2290 */ 121, 90, 91, 121, 121, 121, 121, 121, 121, 121, - /* 2300 */ 99, 100, 121, 83, 103, 104, 105, 87, 107, 121, - /* 2310 */ 90, 91, 121, 121, 121, 121, 121, 121, 121, 99, - /* 2320 */ 100, 121, 121, 103, 104, 105, 121, 107, 121, 121, - /* 2330 */ 121, 83, 121, 121, 121, 87, 121, 121, 90, 91, - /* 2340 */ 121, 121, 83, 121, 121, 121, 87, 99, 100, 90, - /* 2350 */ 91, 103, 104, 105, 121, 107, 121, 121, 99, 100, - /* 2360 */ 121, 121, 103, 104, 105, 121, 107, 121, 83, 121, - /* 2370 */ 121, 121, 87, 121, 121, 90, 91, 121, 121, 121, - /* 2380 */ 121, 121, 121, 121, 99, 100, 121, 121, 103, 104, - /* 2390 */ 105, 121, 107, + /* 50 */ 1, 4, 5, 6, 7, 8, 81, 82, 83, 12, + /* 60 */ 13, 14, 63, 64, 65, 66, 67, 68, 69, 70, + /* 70 */ 71, 72, 73, 74, 24, 26, 15, 28, 17, 18, + /* 80 */ 1, 87, 15, 35, 17, 18, 37, 38, 39, 40, + /* 90 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + /* 100 */ 33, 87, 88, 30, 56, 20, 58, 113, 35, 30, + /* 110 */ 62, 97, 63, 64, 65, 66, 67, 68, 69, 70, + /* 120 */ 71, 72, 73, 74, 1, 82, 76, 113, 88, 86, + /* 130 */ 51, 58, 89, 90, 91, 16, 28, 97, 19, 16, + /* 140 */ 15, 98, 99, 18, 19, 102, 103, 28, 105, 87, + /* 150 */ 88, 28, 110, 113, 35, 112, 91, 92, 93, 97, + /* 160 */ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + /* 170 */ 47, 48, 49, 50, 88, 113, 15, 58, 35, 18, + /* 180 */ 19, 109, 110, 97, 59, 24, 63, 64, 65, 66, + /* 190 */ 67, 68, 69, 70, 71, 72, 73, 74, 1, 82, + /* 200 */ 87, 88, 1, 86, 109, 110, 89, 90, 91, 16, + /* 210 */ 97, 15, 1, 16, 18, 98, 99, 16, 20, 102, + /* 220 */ 103, 28, 105, 87, 88, 28, 113, 16, 35, 112, + /* 230 */ 15, 20, 106, 97, 37, 38, 39, 40, 41, 42, + /* 240 */ 43, 44, 45, 46, 47, 48, 49, 50, 88, 113, + /* 250 */ 35, 58, 51, 15, 56, 59, 18, 97, 18, 61, + /* 260 */ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + /* 270 */ 73, 74, 1, 82, 106, 88, 107, 86, 109, 110, + /* 280 */ 89, 90, 91, 92, 97, 15, 82, 16, 18, 98, + /* 290 */ 99, 19, 20, 102, 103, 108, 105, 59, 28, 59, + /* 300 */ 30, 35, 34, 34, 36, 36, 17, 18, 37, 38, + /* 310 */ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + /* 320 */ 49, 50, 118, 119, 58, 34, 15, 36, 1, 18, + /* 330 */ 58, 114, 19, 20, 63, 64, 65, 66, 67, 68, + /* 340 */ 69, 70, 71, 72, 73, 74, 1, 82, 88, 88, + /* 350 */ 106, 86, 108, 16, 89, 90, 91, 97, 97, 15, + /* 360 */ 1, 16, 18, 98, 99, 28, 16, 102, 103, 108, + /* 370 */ 105, 58, 28, 113, 34, 16, 15, 112, 28, 18, + /* 380 */ 17, 18, 37, 38, 39, 40, 41, 42, 43, 44, + /* 390 */ 45, 46, 47, 48, 49, 50, 1, 88, 83, 1, + /* 400 */ 85, 87, 62, 91, 92, 89, 97, 91, 63, 64, + /* 410 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + /* 420 */ 114, 105, 113, 60, 91, 92, 15, 113, 87, 18, + /* 430 */ 106, 36, 37, 38, 39, 40, 41, 42, 43, 44, + /* 440 */ 45, 46, 47, 48, 49, 50, 1, 2, 88, 51, + /* 450 */ 94, 24, 17, 15, 113, 18, 18, 97, 63, 64, + /* 460 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + /* 470 */ 35, 104, 88, 113, 15, 1, 18, 18, 111, 18, + /* 480 */ 17, 97, 37, 38, 39, 40, 41, 42, 43, 44, + /* 490 */ 45, 46, 47, 48, 49, 50, 1, 113, 106, 17, + /* 500 */ 108, 62, 28, 18, 18, 52, 18, 95, 63, 64, + /* 510 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + /* 520 */ 108, 88, 104, 18, 60, 60, 36, 25, 18, 111, + /* 530 */ 97, 36, 37, 38, 39, 40, 41, 42, 43, 44, + /* 540 */ 45, 46, 47, 48, 49, 50, 1, 56, 2, 33, + /* 550 */ 2, 17, 35, 17, 19, 17, 33, 18, 63, 64, + /* 560 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + /* 570 */ 23, 115, 106, 97, 107, 94, 108, 28, 28, 2, + /* 580 */ 111, 34, 37, 38, 39, 40, 41, 42, 43, 44, + /* 590 */ 45, 46, 47, 48, 49, 50, 1, 84, 13, 120, + /* 600 */ 120, 120, 120, 120, 120, 120, 120, 95, 63, 64, + /* 610 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + /* 620 */ 108, 76, 120, 28, 120, 120, 120, 120, 120, 120, + /* 630 */ 120, 120, 37, 38, 39, 40, 41, 42, 43, 44, + /* 640 */ 45, 46, 47, 48, 49, 50, 120, 120, 120, 120, + /* 650 */ 120, 120, 120, 120, 120, 120, 120, 120, 63, 64, + /* 660 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + /* 670 */ 1, 1, 120, 82, 87, 88, 1, 86, 2, 120, + /* 680 */ 89, 90, 91, 92, 97, 19, 16, 100, 101, 98, + /* 690 */ 99, 16, 23, 102, 103, 19, 105, 120, 28, 29, + /* 700 */ 113, 120, 120, 28, 120, 1, 37, 38, 39, 40, + /* 710 */ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + /* 720 */ 16, 51, 56, 120, 120, 120, 51, 120, 120, 120, + /* 730 */ 120, 120, 63, 64, 65, 66, 67, 68, 69, 70, + /* 740 */ 71, 72, 73, 74, 1, 120, 120, 120, 87, 88, + /* 750 */ 120, 16, 16, 16, 120, 10, 16, 16, 97, 16, + /* 760 */ 15, 100, 101, 28, 28, 28, 21, 22, 28, 28, + /* 770 */ 120, 120, 27, 120, 113, 120, 31, 32, 120, 120, + /* 780 */ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + /* 790 */ 47, 48, 49, 50, 1, 120, 120, 120, 120, 120, + /* 800 */ 120, 120, 120, 120, 120, 95, 63, 64, 65, 66, + /* 810 */ 67, 68, 69, 70, 71, 72, 73, 74, 108, 120, + /* 820 */ 75, 76, 77, 120, 120, 120, 120, 120, 120, 120, + /* 830 */ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + /* 840 */ 47, 48, 49, 50, 120, 120, 120, 120, 120, 120, + /* 850 */ 120, 120, 120, 120, 120, 62, 63, 64, 65, 66, + /* 860 */ 67, 68, 69, 70, 71, 72, 73, 74, 1, 82, + /* 870 */ 120, 88, 16, 86, 120, 16, 89, 90, 91, 88, + /* 880 */ 97, 16, 16, 16, 28, 98, 99, 28, 97, 102, + /* 890 */ 103, 108, 105, 28, 28, 120, 120, 120, 120, 108, + /* 900 */ 120, 120, 120, 120, 37, 38, 39, 40, 41, 42, + /* 910 */ 43, 44, 45, 46, 47, 48, 49, 50, 1, 120, + /* 920 */ 120, 120, 120, 120, 120, 120, 120, 120, 120, 95, + /* 930 */ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + /* 940 */ 73, 74, 108, 120, 120, 120, 29, 120, 120, 120, + /* 950 */ 120, 120, 120, 120, 37, 38, 39, 40, 41, 42, + /* 960 */ 43, 44, 45, 46, 47, 48, 49, 50, 1, 120, + /* 970 */ 120, 120, 120, 120, 120, 120, 120, 120, 120, 95, + /* 980 */ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + /* 990 */ 73, 74, 108, 120, 120, 120, 120, 120, 120, 120, + /* 1000 */ 120, 120, 120, 120, 37, 38, 39, 40, 41, 42, + /* 1010 */ 43, 44, 45, 46, 47, 48, 49, 50, 120, 82, + /* 1020 */ 120, 120, 120, 120, 120, 120, 20, 120, 120, 120, + /* 1030 */ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + /* 1040 */ 73, 74, 37, 38, 39, 40, 41, 42, 43, 44, + /* 1050 */ 45, 46, 47, 48, 49, 50, 119, 120, 120, 120, + /* 1060 */ 120, 120, 120, 120, 58, 120, 1, 120, 63, 64, + /* 1070 */ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + /* 1080 */ 96, 16, 95, 120, 15, 120, 17, 18, 120, 120, + /* 1090 */ 21, 22, 108, 16, 16, 108, 27, 120, 10, 120, + /* 1100 */ 31, 32, 33, 15, 35, 28, 28, 38, 120, 21, + /* 1110 */ 22, 120, 120, 120, 120, 27, 120, 120, 120, 31, + /* 1120 */ 32, 87, 53, 54, 55, 56, 57, 95, 120, 60, + /* 1130 */ 61, 62, 120, 1, 100, 101, 120, 16, 16, 15, + /* 1140 */ 108, 17, 18, 1, 75, 21, 22, 113, 16, 28, + /* 1150 */ 28, 27, 120, 120, 120, 31, 32, 33, 16, 35, + /* 1160 */ 28, 16, 38, 75, 76, 77, 24, 82, 120, 95, + /* 1170 */ 28, 86, 120, 28, 89, 120, 91, 53, 54, 55, + /* 1180 */ 56, 57, 108, 51, 60, 61, 120, 102, 103, 1, + /* 1190 */ 105, 16, 120, 120, 15, 120, 17, 18, 82, 75, + /* 1200 */ 21, 22, 86, 28, 16, 89, 27, 91, 20, 120, + /* 1210 */ 31, 32, 33, 16, 35, 99, 28, 38, 102, 103, + /* 1220 */ 120, 105, 82, 35, 120, 28, 86, 120, 120, 89, + /* 1230 */ 120, 91, 53, 54, 55, 56, 57, 120, 16, 60, + /* 1240 */ 61, 120, 102, 103, 1, 105, 58, 1, 16, 15, + /* 1250 */ 28, 17, 18, 1, 75, 21, 22, 120, 120, 16, + /* 1260 */ 28, 27, 16, 16, 16, 31, 32, 33, 16, 35, + /* 1270 */ 24, 28, 38, 120, 28, 28, 28, 82, 120, 95, + /* 1280 */ 28, 86, 120, 120, 89, 120, 91, 53, 54, 55, + /* 1290 */ 56, 57, 108, 120, 60, 61, 120, 102, 103, 95, + /* 1300 */ 105, 120, 120, 51, 15, 120, 17, 18, 120, 75, + /* 1310 */ 21, 22, 108, 120, 120, 120, 27, 120, 120, 120, + /* 1320 */ 31, 32, 33, 120, 35, 120, 120, 38, 120, 120, + /* 1330 */ 120, 120, 82, 120, 120, 120, 86, 120, 120, 89, + /* 1340 */ 120, 91, 53, 54, 55, 56, 57, 120, 120, 60, + /* 1350 */ 61, 120, 102, 103, 120, 105, 120, 120, 120, 15, + /* 1360 */ 120, 17, 18, 120, 75, 21, 22, 120, 120, 120, + /* 1370 */ 120, 27, 120, 120, 120, 31, 32, 33, 120, 35, + /* 1380 */ 120, 120, 38, 120, 120, 120, 120, 82, 120, 120, + /* 1390 */ 120, 86, 120, 120, 89, 120, 91, 53, 54, 55, + /* 1400 */ 56, 57, 120, 120, 60, 61, 120, 102, 103, 120, + /* 1410 */ 105, 120, 120, 120, 15, 120, 17, 18, 120, 75, + /* 1420 */ 21, 22, 120, 120, 120, 120, 27, 120, 120, 120, + /* 1430 */ 31, 32, 33, 120, 35, 120, 120, 38, 120, 120, + /* 1440 */ 120, 120, 82, 120, 120, 120, 86, 120, 120, 89, + /* 1450 */ 120, 91, 53, 54, 55, 56, 57, 120, 120, 60, + /* 1460 */ 61, 120, 102, 103, 120, 105, 120, 120, 120, 15, + /* 1470 */ 120, 17, 18, 120, 75, 21, 22, 120, 120, 120, + /* 1480 */ 120, 27, 120, 120, 120, 31, 32, 33, 120, 35, + /* 1490 */ 120, 120, 38, 120, 120, 120, 120, 82, 120, 120, + /* 1500 */ 120, 86, 120, 120, 89, 120, 91, 53, 54, 55, + /* 1510 */ 56, 57, 120, 120, 60, 61, 120, 102, 103, 120, + /* 1520 */ 105, 120, 120, 120, 15, 120, 17, 18, 120, 75, + /* 1530 */ 21, 22, 120, 120, 120, 120, 27, 120, 120, 120, + /* 1540 */ 31, 32, 33, 120, 35, 120, 120, 38, 120, 120, + /* 1550 */ 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, + /* 1560 */ 120, 120, 53, 54, 55, 56, 57, 120, 120, 60, + /* 1570 */ 61, 120, 120, 120, 120, 120, 120, 120, 120, 15, + /* 1580 */ 120, 17, 18, 120, 75, 21, 22, 120, 120, 120, + /* 1590 */ 120, 27, 120, 120, 120, 31, 32, 33, 120, 35, + /* 1600 */ 120, 120, 38, 120, 120, 120, 120, 120, 120, 120, + /* 1610 */ 120, 120, 120, 120, 120, 120, 120, 53, 54, 55, + /* 1620 */ 56, 57, 120, 120, 60, 61, 120, 120, 120, 120, + /* 1630 */ 120, 120, 120, 120, 15, 120, 17, 18, 120, 75, + /* 1640 */ 21, 22, 120, 120, 120, 120, 27, 120, 120, 120, + /* 1650 */ 31, 32, 33, 120, 35, 120, 120, 38, 120, 120, + /* 1660 */ 120, 120, 120, 120, 120, 120, 120, 87, 88, 120, + /* 1670 */ 120, 120, 53, 54, 55, 56, 57, 97, 120, 60, + /* 1680 */ 100, 101, 120, 120, 120, 120, 120, 120, 120, 15, + /* 1690 */ 120, 17, 18, 113, 75, 21, 22, 120, 120, 120, + /* 1700 */ 120, 27, 120, 120, 120, 31, 32, 33, 120, 35, + /* 1710 */ 120, 120, 38, 120, 120, 120, 120, 120, 120, 120, + /* 1720 */ 120, 120, 120, 120, 120, 120, 16, 53, 54, 55, + /* 1730 */ 56, 57, 120, 23, 60, 25, 26, 120, 28, 29, + /* 1740 */ 120, 120, 120, 120, 34, 35, 36, 120, 120, 75, + /* 1750 */ 120, 120, 120, 120, 120, 120, 120, 120, 82, 120, + /* 1760 */ 120, 51, 86, 120, 120, 89, 90, 91, 58, 120, + /* 1770 */ 120, 120, 62, 120, 98, 99, 120, 120, 102, 103, + /* 1780 */ 120, 105, 120, 120, 120, 120, 76, 120, 120, 120, + /* 1790 */ 82, 120, 116, 117, 86, 120, 120, 89, 90, 91, + /* 1800 */ 120, 120, 120, 120, 120, 120, 98, 99, 120, 120, + /* 1810 */ 102, 103, 82, 105, 120, 120, 86, 120, 120, 89, + /* 1820 */ 90, 91, 120, 120, 120, 117, 87, 88, 98, 99, + /* 1830 */ 120, 120, 102, 103, 120, 105, 97, 120, 120, 100, + /* 1840 */ 101, 82, 120, 120, 120, 86, 120, 120, 89, 90, + /* 1850 */ 91, 120, 113, 87, 88, 120, 120, 98, 99, 120, + /* 1860 */ 120, 102, 103, 97, 105, 120, 100, 101, 120, 82, + /* 1870 */ 120, 120, 120, 86, 120, 120, 89, 90, 91, 113, + /* 1880 */ 120, 87, 88, 120, 120, 98, 99, 120, 120, 102, + /* 1890 */ 103, 97, 105, 82, 100, 101, 120, 86, 120, 120, + /* 1900 */ 89, 90, 91, 120, 120, 120, 120, 113, 120, 98, + /* 1910 */ 99, 82, 120, 102, 103, 86, 105, 120, 89, 90, + /* 1920 */ 91, 120, 120, 120, 120, 120, 120, 98, 99, 120, + /* 1930 */ 120, 102, 103, 82, 105, 120, 120, 86, 120, 120, + /* 1940 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 1950 */ 99, 120, 120, 102, 103, 120, 105, 120, 120, 82, + /* 1960 */ 120, 120, 120, 86, 120, 120, 89, 90, 91, 120, + /* 1970 */ 120, 120, 120, 120, 120, 98, 99, 120, 120, 102, + /* 1980 */ 103, 120, 105, 82, 120, 120, 120, 86, 120, 120, + /* 1990 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2000 */ 99, 82, 120, 102, 103, 86, 105, 120, 89, 90, + /* 2010 */ 91, 120, 120, 120, 120, 120, 120, 98, 99, 120, + /* 2020 */ 120, 102, 103, 82, 105, 120, 120, 86, 120, 120, + /* 2030 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2040 */ 99, 120, 120, 102, 103, 120, 105, 120, 120, 82, + /* 2050 */ 120, 120, 120, 86, 120, 120, 89, 90, 91, 120, + /* 2060 */ 120, 120, 120, 120, 120, 98, 99, 120, 120, 102, + /* 2070 */ 103, 120, 105, 82, 120, 120, 120, 86, 120, 120, + /* 2080 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2090 */ 99, 82, 120, 102, 103, 86, 105, 120, 89, 90, + /* 2100 */ 91, 120, 120, 120, 120, 120, 120, 98, 99, 120, + /* 2110 */ 120, 102, 103, 82, 105, 120, 120, 86, 120, 120, + /* 2120 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2130 */ 99, 120, 120, 102, 103, 120, 105, 120, 120, 82, + /* 2140 */ 120, 120, 120, 86, 120, 120, 89, 90, 91, 120, + /* 2150 */ 120, 120, 120, 120, 120, 98, 99, 120, 120, 102, + /* 2160 */ 103, 120, 105, 82, 120, 120, 120, 86, 120, 120, + /* 2170 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2180 */ 99, 82, 120, 102, 103, 86, 105, 120, 89, 90, + /* 2190 */ 91, 120, 120, 120, 120, 120, 120, 98, 99, 120, + /* 2200 */ 120, 102, 103, 82, 105, 120, 120, 86, 120, 120, + /* 2210 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2220 */ 99, 120, 120, 102, 103, 120, 105, 120, 120, 82, + /* 2230 */ 120, 120, 120, 86, 120, 120, 89, 90, 91, 120, + /* 2240 */ 120, 120, 120, 120, 120, 98, 99, 120, 120, 102, + /* 2250 */ 103, 120, 105, 82, 120, 120, 120, 86, 120, 120, + /* 2260 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2270 */ 99, 82, 120, 102, 103, 86, 105, 120, 89, 90, + /* 2280 */ 91, 120, 120, 120, 120, 120, 120, 98, 99, 120, + /* 2290 */ 120, 102, 103, 82, 105, 120, 120, 86, 120, 120, + /* 2300 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2310 */ 99, 120, 120, 102, 103, 120, 105, 120, 120, 82, + /* 2320 */ 120, 120, 120, 86, 120, 120, 89, 90, 91, 120, + /* 2330 */ 120, 120, 120, 120, 120, 98, 99, 120, 120, 102, + /* 2340 */ 103, 120, 105, 82, 120, 120, 120, 86, 120, 120, + /* 2350 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2360 */ 99, 82, 120, 102, 103, 86, 105, 120, 89, 90, + /* 2370 */ 91, 120, 120, 120, 120, 120, 120, 98, 99, 120, + /* 2380 */ 120, 102, 103, 82, 105, 120, 120, 86, 120, 120, + /* 2390 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2400 */ 99, 120, 120, 102, 103, 120, 105, 120, 120, 82, + /* 2410 */ 120, 120, 120, 86, 120, 120, 89, 90, 91, 120, + /* 2420 */ 120, 120, 120, 120, 120, 98, 99, 120, 120, 102, + /* 2430 */ 103, 120, 105, 82, 120, 120, 120, 86, 120, 120, + /* 2440 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2450 */ 99, 82, 120, 102, 103, 86, 105, 120, 89, 90, + /* 2460 */ 91, 120, 120, 120, 120, 120, 120, 98, 99, 120, + /* 2470 */ 120, 102, 103, 82, 105, 120, 120, 86, 120, 120, + /* 2480 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2490 */ 99, 120, 120, 102, 103, 120, 105, 120, 120, 82, + /* 2500 */ 120, 120, 120, 86, 120, 120, 89, 90, 91, 120, + /* 2510 */ 120, 120, 120, 120, 120, 98, 99, 120, 120, 102, + /* 2520 */ 103, 120, 105, 82, 120, 120, 120, 86, 120, 120, + /* 2530 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2540 */ 99, 82, 120, 102, 103, 86, 105, 120, 89, 90, + /* 2550 */ 91, 120, 120, 120, 120, 120, 120, 98, 99, 120, + /* 2560 */ 120, 102, 103, 82, 105, 120, 120, 86, 120, 120, + /* 2570 */ 89, 90, 91, 120, 120, 120, 120, 120, 120, 98, + /* 2580 */ 99, 120, 120, 102, 103, 120, 105, 120, 120, 82, + /* 2590 */ 120, 120, 120, 86, 120, 120, 89, 90, 91, 120, + /* 2600 */ 120, 120, 120, 120, 120, 98, 99, 120, 120, 102, + /* 2610 */ 103, 120, 105, 82, 120, 120, 120, 86, 120, 120, + /* 2620 */ 89, 120, 91, 120, 120, 120, 120, 120, 120, 120, + /* 2630 */ 99, 120, 120, 102, 103, 120, 105, ); - const YY_SHIFT_USE_DFLT = -5; + const YY_SHIFT_USE_DFLT = -45; const YY_SHIFT_MAX = 252; static public $yy_shift_ofst = array( - /* 0 */ 1, 1391, 1391, 1223, 1167, 1167, 1167, 1223, 1111, 1167, - /* 10 */ 1167, 1167, 1503, 1167, 1559, 1167, 1167, 1167, 1167, 1167, - /* 20 */ 1167, 1167, 1167, 1167, 1167, 1615, 1167, 1167, 1167, 1167, - /* 30 */ 1503, 1167, 1167, 1447, 1167, 1167, 1167, 1167, 1279, 1167, - /* 40 */ 1167, 1167, 1279, 1167, 1335, 1335, 1727, 1671, 1727, 1727, - /* 50 */ 1727, 1727, 1727, 224, 74, 149, -1, 755, 755, 755, - /* 60 */ 956, 881, 806, 527, 326, 704, 275, 377, 653, 602, - /* 70 */ 452, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, - /* 80 */ 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, - /* 90 */ 1046, 1046, 1232, 1443, 407, 1, 958, 73, 146, 225, - /* 100 */ 546, 61, 61, 443, 443, 243, 371, 407, 407, 883, - /* 110 */ 47, 1331, 11, 189, 1387, 1219, 226, 56, 138, 235, - /* 120 */ 75, 887, 219, 366, 371, 367, 366, 366, 368, 293, - /* 130 */ 371, 366, 917, 366, 366, 445, 366, 418, 366, 1248, - /* 140 */ 368, 366, 300, 395, 293, 636, 629, 636, 616, 636, - /* 150 */ 610, 636, 636, 636, 636, 616, 636, -5, 166, 167, - /* 160 */ 601, 603, 873, 594, 148, 217, 148, 473, 947, 148, - /* 170 */ 874, 878, 948, 1235, 148, 543, 1191, 1221, 148, 1230, - /* 180 */ 563, 1188, 1121, 1118, 953, 949, 1181, 1174, 1180, 670, - /* 190 */ 632, 632, 616, 616, 636, 616, 636, 102, 102, 396, - /* 200 */ -5, -5, -5, -5, -5, 1764, 150, 22, 118, 71, - /* 210 */ 176, -4, 486, 144, 144, 213, 270, 261, 296, 328, - /* 220 */ 449, 271, 295, 615, 579, 560, 566, 441, 564, 396, - /* 230 */ 528, 591, 551, 589, 571, 614, 552, 529, 539, 494, - /* 240 */ 448, 492, 471, 450, 488, 469, 459, 511, 522, 510, - /* 250 */ 496, 523, 500, + /* 0 */ -2, 1289, 1289, 1124, 1124, 1124, 1399, 1399, 1069, 1564, + /* 10 */ 1124, 1124, 1124, 1124, 1124, 1124, 1509, 1124, 1124, 1454, + /* 20 */ 1509, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, + /* 30 */ 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1344, 1124, 1124, + /* 40 */ 1234, 1124, 1124, 1234, 1179, 1179, 1619, 1674, 1619, 1619, + /* 50 */ 1619, 1619, 1619, 197, 49, -1, 123, 595, 595, 595, + /* 60 */ 793, 867, 917, 495, 345, 271, 395, 445, 545, 743, + /* 70 */ 669, 967, 967, 967, 967, 967, 967, 967, 967, 967, + /* 80 */ 967, 967, 967, 967, 967, 967, 967, 967, 967, 967, + /* 90 */ 1005, 1005, 1188, 1142, 1252, 1246, 474, -2, 745, 270, + /* 100 */ -4, 1243, 344, 198, 1243, 344, 363, 435, 474, 474, + /* 110 */ 474, 1088, 47, 670, 1132, 161, 675, 125, 313, 3, + /* 120 */ 79, 211, 201, 272, 196, 361, 1248, 1006, 411, 311, + /* 130 */ 438, 1065, 311, 435, 311, 435, 289, 289, 311, 311, + /* 140 */ 311, 459, 398, 438, 311, 311, 311, 549, 85, 85, + /* 150 */ 550, 327, 327, 327, 327, 327, 327, 327, 327, -45, + /* 160 */ 238, 61, 350, 337, 0, 856, 736, 741, -44, 215, + /* 170 */ -44, 737, 740, 735, -44, -44, 1197, 1175, -44, 1222, + /* 180 */ 1247, 1232, 1145, 865, 359, 859, 866, 1122, 1121, 1077, + /* 190 */ 704, 1078, 85, 108, 327, 577, 85, 585, 577, 327, + /* 200 */ 85, 108, 143, -45, -45, -45, -45, 1710, 119, 193, + /* 210 */ 48, 67, 73, 266, 266, 268, 269, 291, 676, 340, + /* 220 */ 547, 50, 666, 240, 523, 516, 548, 437, 510, 491, + /* 230 */ 143, 517, 539, 538, 536, 534, 535, 502, 490, 463, + /* 240 */ 482, 439, 461, 458, 427, 485, 486, 465, 464, 505, + /* 250 */ 453, 488, 546, ); - const YY_REDUCE_USE_DFLT = -86; - const YY_REDUCE_MAX = 204; + const YY_REDUCE_USE_DFLT = -91; + const YY_REDUCE_MAX = 206; static public $yy_reduce_ofst = array( - /* 0 */ -63, -7, 1730, 68, 446, 373, 143, 521, 2091, 2117, - /* 10 */ 1800, 1407, 2080, 1884, 1912, 1575, 1949, 1923, 1865, 1968, - /* 20 */ 1996, 2052, 2033, 2007, 1839, 1828, 1351, 1295, 1183, 1239, - /* 30 */ 1463, 1519, 1781, 1755, 1631, 2175, 2248, 2201, 2164, 2285, - /* 40 */ 2259, 2136, 2220, 1127, 379, 1048, 451, 1073, 804, 879, - /* 50 */ 1875, 1791, 1088, 1976, 1945, 1676, 2060, 1676, 2113, 2029, - /* 60 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, - /* 70 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, - /* 80 */ 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, - /* 90 */ 798, 798, 39, 113, 214, -81, 43, 442, -74, 20, - /* 100 */ -10, 239, 264, 525, 517, 378, 188, 314, 291, 697, - /* 110 */ 170, -6, 520, 248, -6, -6, 248, -6, 248, 246, - /* 120 */ 172, -6, 172, 568, 313, 495, 495, 569, 570, 324, - /* 130 */ 244, 292, 245, 420, 345, 172, 301, 495, 621, 491, - /* 140 */ 495, 619, -6, 620, 325, -6, 211, -6, 147, -6, - /* 150 */ 81, -6, -6, -6, -6, 172, -6, -6, 545, 549, - /* 160 */ 536, 536, 536, 536, 530, 548, 530, 540, 536, 530, - /* 170 */ 536, 536, 536, 536, 530, 540, 536, 536, 530, 536, - /* 180 */ 540, 536, 536, 536, 536, 536, 536, 536, 536, 596, - /* 190 */ 567, 588, 550, 550, 540, 550, 540, -85, -85, 331, - /* 200 */ 306, 349, 337, 260, 134, + /* 0 */ -48, 1676, 1708, 117, 43, 265, 191, 591, 1991, 1967, + /* 10 */ 1941, 2009, 2031, 2081, 2057, 1919, 1901, 1787, 1759, 1730, + /* 20 */ 1811, 1829, 1877, 1851, 2099, 2121, 2391, 2369, 2351, 2441, + /* 30 */ 2481, 2459, 2507, 2327, 787, 2301, 2189, 2171, 2147, 2211, + /* 40 */ 2237, 2279, 2261, 2417, 1116, 2531, 1250, 1305, 1085, 1195, + /* 50 */ 1140, 1360, 1415, 1580, 1739, 661, 587, 1794, 1766, 587, + /* 60 */ 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, + /* 70 */ 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, + /* 80 */ 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, + /* 90 */ 1034, 1034, 14, 113, 62, 113, 136, -25, 204, 187, + /* 100 */ 783, 260, 261, 169, 309, 791, 316, 65, 360, 384, + /* 110 */ 40, 937, 315, -6, -6, 984, -6, 244, 95, 244, + /* 120 */ -6, 341, -6, 95, 244, 710, 433, 95, 710, 884, + /* 130 */ 834, 314, 412, 312, 512, 333, 367, 418, 710, 1204, + /* 140 */ 1074, 1184, -6, 710, 392, 1032, 987, 160, 95, 72, + /* 150 */ 86, -6, -6, -6, -6, -6, -6, -6, -6, -6, + /* 160 */ 468, 469, 476, 476, 476, 476, 476, 476, 467, 466, + /* 170 */ 467, 476, 476, 476, 467, 467, 476, 476, 467, 476, + /* 180 */ 476, 476, 476, 476, -90, 476, 476, 476, 476, 476, + /* 190 */ -90, 476, 42, 481, -90, 456, 42, 513, 456, -90, + /* 200 */ 42, 356, 324, 217, 126, 168, 306, ); static public $yyExpectedTokens = array( - /* 0 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 21, 22, 27, 31, 32, 33, ), - /* 1 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 2 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 3 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 4 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 5 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 6 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 7 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 8 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 63, 76, ), - /* 9 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 10 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 11 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 12 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 13 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 14 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 15 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 16 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 17 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 18 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 19 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 20 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 21 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 22 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 23 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 24 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 25 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 26 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 27 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 28 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 29 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 30 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 31 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 32 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 33 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 34 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 35 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 36 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 37 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 38 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 39 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 40 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 41 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 42 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 43 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 44 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 45 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 62, 76, ), - /* 46 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 76, ), - /* 47 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 76, ), - /* 48 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 76, ), - /* 49 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 76, ), - /* 50 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 76, ), - /* 51 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 76, ), - /* 52 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 34, 36, 39, 54, 55, 56, 57, 58, 61, 76, ), - /* 53 */ array(1, 16, 28, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 54 */ array(1, 16, 28, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 55 */ array(1, 16, 28, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 56 */ array(1, 26, 28, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 57 */ array(1, 28, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 58 */ array(1, 28, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 59 */ array(1, 28, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 60 */ array(1, 16, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 61 */ array(1, 16, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 62 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 63 */ array(1, 16, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 64 */ array(1, 29, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 65 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 66 */ array(1, 2, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 67 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 77, ), - /* 68 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 69 */ array(1, 16, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 70 */ array(1, 23, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 71 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 72 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 73 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 74 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 75 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 76 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 77 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 78 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 79 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 80 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 81 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 82 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 83 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 84 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 85 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 86 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 87 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 88 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 89 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 90 */ array(38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 91 */ array(38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, ), - /* 92 */ array(1, 16, 20, 28, 36, 59, ), - /* 93 */ array(1, 16, 28, 52, ), - /* 94 */ array(1, 28, ), - /* 95 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 21, 22, 27, 31, 32, 33, ), - /* 96 */ array(10, 15, 21, 22, 27, 31, 32, 33, 76, 77, 78, ), - /* 97 */ array(15, 18, 28, 30, ), - /* 98 */ array(15, 18, 28, 30, ), - /* 99 */ array(20, 57, 62, ), - /* 100 */ array(1, 2, 16, ), + /* 0 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 21, 22, 27, 31, 32, ), + /* 1 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 2 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 3 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 4 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 5 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 6 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 7 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 8 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 62, 75, ), + /* 9 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 10 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 11 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 12 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 13 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 14 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 15 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 16 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 17 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 18 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 19 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 20 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 21 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 22 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 23 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 24 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 25 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 26 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 27 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 28 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 29 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 30 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 31 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 32 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 33 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 34 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 35 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 36 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 37 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 38 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 39 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 40 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 41 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 42 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 43 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 44 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 45 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 61, 75, ), + /* 46 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ), + /* 47 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ), + /* 48 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ), + /* 49 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ), + /* 50 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ), + /* 51 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ), + /* 52 */ array(15, 17, 18, 21, 22, 27, 31, 32, 33, 35, 38, 53, 54, 55, 56, 57, 60, 75, ), + /* 53 */ array(1, 16, 28, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 54 */ array(1, 26, 28, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 55 */ array(1, 16, 28, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 56 */ array(1, 16, 28, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 57 */ array(1, 28, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 58 */ array(1, 28, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 59 */ array(1, 28, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 60 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 61 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 62 */ array(1, 29, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 63 */ array(1, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 64 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 65 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 66 */ array(1, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 67 */ array(1, 2, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 68 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 76, ), + /* 69 */ array(1, 16, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 70 */ array(1, 23, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 71 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 72 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 73 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 74 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 75 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 76 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 77 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 78 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 79 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 80 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 81 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 82 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 83 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 84 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 85 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 86 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 87 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 88 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 89 */ array(1, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 90 */ array(37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 91 */ array(37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, ), + /* 92 */ array(1, 16, 20, 28, 35, 58, ), + /* 93 */ array(1, 16, 24, 28, ), + /* 94 */ array(1, 16, 28, 51, ), + /* 95 */ array(1, 16, 24, 28, ), + /* 96 */ array(1, 28, ), + /* 97 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 21, 22, 27, 31, 32, ), + /* 98 */ array(10, 15, 21, 22, 27, 31, 32, 75, 76, 77, ), + /* 99 */ array(15, 18, 28, 30, ), + /* 100 */ array(15, 18, 28, 30, ), /* 101 */ array(1, 16, 28, ), - /* 102 */ array(1, 16, 28, ), - /* 103 */ array(15, 18, 28, ), - /* 104 */ array(15, 18, 28, ), - /* 105 */ array(17, 18, 61, ), - /* 106 */ array(17, 36, ), - /* 107 */ array(1, 28, ), + /* 102 */ array(15, 18, 28, ), + /* 103 */ array(20, 56, 61, ), + /* 104 */ array(1, 16, 28, ), + /* 105 */ array(15, 18, 28, ), + /* 106 */ array(17, 18, 60, ), + /* 107 */ array(17, 35, ), /* 108 */ array(1, 28, ), - /* 109 */ array(10, 15, 21, 22, 27, 31, 32, 33, 76, 77, 78, ), - /* 110 */ array(4, 5, 6, 7, 8, 12, 13, 14, ), - /* 111 */ array(1, 16, 28, 29, 52, ), - /* 112 */ array(15, 18, 19, 24, ), - /* 113 */ array(15, 18, 19, 60, ), - /* 114 */ array(1, 16, 28, 52, ), - /* 115 */ array(1, 16, 28, 52, ), - /* 116 */ array(15, 18, 60, ), - /* 117 */ array(1, 30, 52, ), - /* 118 */ array(15, 18, 19, ), - /* 119 */ array(1, 16, 20, ), - /* 120 */ array(19, 20, 59, ), - /* 121 */ array(1, 16, 52, ), - /* 122 */ array(19, 20, 59, ), - /* 123 */ array(15, 18, ), - /* 124 */ array(17, 36, ), + /* 109 */ array(1, 28, ), + /* 110 */ array(1, 28, ), + /* 111 */ array(10, 15, 21, 22, 27, 31, 32, 75, 76, 77, ), + /* 112 */ array(4, 5, 6, 7, 8, 12, 13, 14, ), + /* 113 */ array(1, 16, 28, 29, 51, ), + /* 114 */ array(1, 16, 28, 51, ), + /* 115 */ array(15, 18, 19, 24, ), + /* 116 */ array(1, 16, 28, 51, ), + /* 117 */ array(15, 18, 19, 59, ), + /* 118 */ array(19, 20, 58, ), + /* 119 */ array(15, 18, 19, ), + /* 120 */ array(1, 30, 51, ), + /* 121 */ array(1, 16, 20, ), + /* 122 */ array(1, 16, 51, ), + /* 123 */ array(19, 20, 58, ), + /* 124 */ array(15, 18, 59, ), /* 125 */ array(15, 18, ), - /* 126 */ array(15, 18, ), - /* 127 */ array(15, 18, ), + /* 126 */ array(16, 28, ), + /* 127 */ array(20, 58, ), /* 128 */ array(15, 18, ), - /* 129 */ array(17, 18, ), - /* 130 */ array(17, 36, ), - /* 131 */ array(15, 18, ), - /* 132 */ array(1, 16, ), - /* 133 */ array(15, 18, ), + /* 129 */ array(15, 18, ), + /* 130 */ array(15, 18, ), + /* 131 */ array(1, 16, ), + /* 132 */ array(15, 18, ), + /* 133 */ array(17, 35, ), /* 134 */ array(15, 18, ), - /* 135 */ array(20, 59, ), - /* 136 */ array(15, 18, ), - /* 137 */ array(15, 18, ), + /* 135 */ array(17, 35, ), + /* 136 */ array(17, 18, ), + /* 137 */ array(17, 18, ), /* 138 */ array(15, 18, ), - /* 139 */ array(16, 28, ), + /* 139 */ array(15, 18, ), /* 140 */ array(15, 18, ), /* 141 */ array(15, 18, ), - /* 142 */ array(1, 52, ), + /* 142 */ array(1, 51, ), /* 143 */ array(15, 18, ), - /* 144 */ array(17, 18, ), - /* 145 */ array(1, ), - /* 146 */ array(28, ), - /* 147 */ array(1, ), + /* 144 */ array(15, 18, ), + /* 145 */ array(15, 18, ), + /* 146 */ array(15, 18, ), + /* 147 */ array(28, ), /* 148 */ array(20, ), - /* 149 */ array(1, ), + /* 149 */ array(20, ), /* 150 */ array(28, ), /* 151 */ array(1, ), /* 152 */ array(1, ), /* 153 */ array(1, ), /* 154 */ array(1, ), - /* 155 */ array(20, ), + /* 155 */ array(1, ), /* 156 */ array(1, ), - /* 157 */ array(), - /* 158 */ array(15, 17, 18, ), - /* 159 */ array(15, 18, 60, ), - /* 160 */ array(16, 28, ), - /* 161 */ array(16, 28, ), + /* 157 */ array(1, ), + /* 158 */ array(1, ), + /* 159 */ array(), + /* 160 */ array(15, 18, 59, ), + /* 161 */ array(15, 17, 18, ), /* 162 */ array(16, 28, ), /* 163 */ array(16, 28, ), - /* 164 */ array(57, 62, ), - /* 165 */ array(15, 36, ), - /* 166 */ array(57, 62, ), - /* 167 */ array(1, 16, ), - /* 168 */ array(16, 28, ), - /* 169 */ array(57, 62, ), - /* 170 */ array(16, 28, ), + /* 164 */ array(16, 28, ), + /* 165 */ array(16, 28, ), + /* 166 */ array(16, 28, ), + /* 167 */ array(16, 28, ), + /* 168 */ array(56, 61, ), + /* 169 */ array(15, 35, ), + /* 170 */ array(56, 61, ), /* 171 */ array(16, 28, ), /* 172 */ array(16, 28, ), /* 173 */ array(16, 28, ), - /* 174 */ array(57, 62, ), - /* 175 */ array(1, 16, ), + /* 174 */ array(56, 61, ), + /* 175 */ array(56, 61, ), /* 176 */ array(16, 28, ), /* 177 */ array(16, 28, ), - /* 178 */ array(57, 62, ), + /* 178 */ array(56, 61, ), /* 179 */ array(16, 28, ), - /* 180 */ array(1, 16, ), + /* 180 */ array(16, 28, ), /* 181 */ array(16, 28, ), /* 182 */ array(16, 28, ), /* 183 */ array(16, 28, ), - /* 184 */ array(16, 28, ), + /* 184 */ array(1, 16, ), /* 185 */ array(16, 28, ), /* 186 */ array(16, 28, ), /* 187 */ array(16, 28, ), /* 188 */ array(16, 28, ), - /* 189 */ array(13, ), - /* 190 */ array(28, ), - /* 191 */ array(28, ), + /* 189 */ array(16, 28, ), + /* 190 */ array(1, 16, ), + /* 191 */ array(16, 28, ), /* 192 */ array(20, ), - /* 193 */ array(20, ), + /* 193 */ array(28, ), /* 194 */ array(1, ), - /* 195 */ array(20, ), - /* 196 */ array(1, ), - /* 197 */ array(2, ), + /* 195 */ array(2, ), + /* 196 */ array(20, ), + /* 197 */ array(13, ), /* 198 */ array(2, ), - /* 199 */ array(36, ), - /* 200 */ array(), - /* 201 */ array(), - /* 202 */ array(), + /* 199 */ array(1, ), + /* 200 */ array(20, ), + /* 201 */ array(28, ), + /* 202 */ array(35, ), /* 203 */ array(), /* 204 */ array(), - /* 205 */ array(16, 23, 25, 26, 28, 29, 35, 36, 37, 52, 59, 63, 77, ), - /* 206 */ array(16, 19, 28, 36, 59, ), - /* 207 */ array(36, 57, 59, 63, ), - /* 208 */ array(15, 17, 18, 34, ), - /* 209 */ array(16, 28, 36, 59, ), - /* 210 */ array(30, 36, 59, ), - /* 211 */ array(18, 60, ), - /* 212 */ array(2, 19, ), - /* 213 */ array(36, 59, ), - /* 214 */ array(36, 59, ), - /* 215 */ array(16, 24, ), - /* 216 */ array(35, 37, ), - /* 217 */ array(24, 77, ), - /* 218 */ array(35, 63, ), - /* 219 */ array(23, 35, ), - /* 220 */ array(19, 57, ), - /* 221 */ array(35, 37, ), - /* 222 */ array(35, 37, ), - /* 223 */ array(18, ), - /* 224 */ array(2, ), - /* 225 */ array(24, ), - /* 226 */ array(17, ), + /* 205 */ array(), + /* 206 */ array(), + /* 207 */ array(16, 23, 25, 26, 28, 29, 34, 35, 36, 51, 58, 62, 76, ), + /* 208 */ array(16, 19, 28, 35, 58, ), + /* 209 */ array(16, 28, 35, 58, ), + /* 210 */ array(35, 56, 58, 62, ), + /* 211 */ array(15, 17, 18, 33, ), + /* 212 */ array(30, 35, 58, ), + /* 213 */ array(35, 58, ), + /* 214 */ array(35, 58, ), + /* 215 */ array(34, 36, ), + /* 216 */ array(34, 36, ), + /* 217 */ array(34, 36, ), + /* 218 */ array(2, 19, ), + /* 219 */ array(34, 62, ), + /* 220 */ array(23, 34, ), + /* 221 */ array(24, 76, ), + /* 222 */ array(19, 56, ), + /* 223 */ array(18, 59, ), + /* 224 */ array(33, ), + /* 225 */ array(33, ), + /* 226 */ array(2, ), /* 227 */ array(18, ), /* 228 */ array(18, ), - /* 229 */ array(36, ), - /* 230 */ array(57, ), - /* 231 */ array(18, ), - /* 232 */ array(36, ), - /* 233 */ array(18, ), + /* 229 */ array(56, ), + /* 230 */ array(35, ), + /* 231 */ array(35, ), + /* 232 */ array(18, ), + /* 233 */ array(17, ), /* 234 */ array(17, ), - /* 235 */ array(18, ), - /* 236 */ array(34, ), - /* 237 */ array(34, ), - /* 238 */ array(18, ), + /* 235 */ array(17, ), + /* 236 */ array(19, ), + /* 237 */ array(25, ), + /* 238 */ array(36, ), /* 239 */ array(17, ), - /* 240 */ array(61, ), - /* 241 */ array(18, ), - /* 242 */ array(37, ), - /* 243 */ array(17, ), - /* 244 */ array(19, ), - /* 245 */ array(63, ), - /* 246 */ array(53, ), - /* 247 */ array(2, ), - /* 248 */ array(17, ), - /* 249 */ array(25, ), - /* 250 */ array(18, ), + /* 240 */ array(17, ), + /* 241 */ array(62, ), + /* 242 */ array(18, ), + /* 243 */ array(18, ), + /* 244 */ array(24, ), + /* 245 */ array(18, ), + /* 246 */ array(18, ), + /* 247 */ array(60, ), + /* 248 */ array(60, ), + /* 249 */ array(18, ), + /* 250 */ array(52, ), /* 251 */ array(18, ), - /* 252 */ array(61, ), + /* 252 */ array(2, ), /* 253 */ array(), /* 254 */ array(), /* 255 */ array(), @@ -1149,51 +1186,51 @@ static public $yy_action = array( /* 386 */ array(), ); static public $yy_default = array( - /* 0 */ 390, 571, 588, 588, 542, 542, 542, 588, 588, 588, + /* 0 */ 390, 571, 588, 542, 542, 542, 588, 588, 588, 588, /* 10 */ 588, 588, 588, 588, 588, 588, 588, 588, 588, 588, /* 20 */ 588, 588, 588, 588, 588, 588, 588, 588, 588, 588, /* 30 */ 588, 588, 588, 588, 588, 588, 588, 588, 588, 588, /* 40 */ 588, 588, 588, 588, 588, 588, 588, 588, 588, 588, - /* 50 */ 588, 588, 588, 588, 588, 588, 450, 450, 450, 450, - /* 60 */ 588, 588, 588, 588, 455, 588, 588, 588, 588, 588, - /* 70 */ 588, 573, 457, 541, 574, 455, 471, 460, 540, 480, - /* 80 */ 484, 432, 461, 452, 479, 483, 572, 474, 475, 476, - /* 90 */ 487, 488, 499, 463, 450, 387, 588, 450, 450, 554, - /* 100 */ 588, 507, 470, 450, 450, 588, 588, 450, 450, 588, - /* 110 */ 588, 463, 588, 515, 463, 463, 515, 463, 515, 588, - /* 120 */ 508, 463, 508, 588, 588, 588, 588, 588, 588, 588, - /* 130 */ 588, 588, 588, 588, 588, 508, 515, 588, 588, 588, - /* 140 */ 588, 588, 463, 588, 588, 467, 450, 473, 551, 490, - /* 150 */ 450, 468, 486, 491, 492, 508, 466, 549, 588, 516, - /* 160 */ 588, 588, 588, 588, 533, 515, 532, 588, 588, 513, - /* 170 */ 588, 588, 588, 588, 534, 588, 588, 588, 535, 588, - /* 180 */ 588, 588, 588, 588, 588, 588, 588, 588, 588, 405, - /* 190 */ 587, 587, 529, 555, 470, 552, 507, 543, 544, 515, - /* 200 */ 515, 515, 548, 548, 548, 465, 499, 499, 588, 499, - /* 210 */ 499, 588, 527, 485, 499, 489, 588, 489, 588, 588, - /* 220 */ 495, 588, 588, 588, 527, 489, 588, 588, 588, 527, - /* 230 */ 495, 588, 553, 588, 588, 588, 497, 588, 588, 588, - /* 240 */ 588, 588, 588, 588, 588, 588, 501, 527, 588, 458, - /* 250 */ 588, 588, 588, 435, 524, 439, 501, 523, 511, 569, - /* 260 */ 521, 415, 522, 570, 520, 388, 537, 512, 440, 462, - /* 270 */ 459, 429, 550, 586, 430, 536, 528, 538, 539, 434, - /* 280 */ 433, 565, 441, 527, 442, 547, 443, 526, 438, 449, - /* 290 */ 428, 431, 436, 437, 444, 445, 498, 496, 504, 464, - /* 300 */ 465, 494, 493, 545, 546, 446, 447, 427, 448, 397, - /* 310 */ 396, 398, 399, 400, 395, 394, 389, 391, 392, 393, - /* 320 */ 401, 402, 411, 410, 412, 413, 414, 409, 408, 403, - /* 330 */ 404, 406, 407, 509, 514, 421, 420, 530, 422, 423, - /* 340 */ 419, 418, 531, 510, 416, 417, 583, 424, 426, 581, - /* 350 */ 579, 584, 585, 578, 580, 577, 425, 582, 575, 576, - /* 360 */ 506, 469, 503, 502, 505, 477, 478, 472, 500, 517, - /* 370 */ 525, 518, 519, 481, 482, 563, 562, 564, 566, 567, - /* 380 */ 561, 560, 556, 557, 558, 559, 568, + /* 50 */ 588, 588, 588, 588, 450, 588, 588, 450, 450, 450, + /* 60 */ 588, 588, 455, 588, 588, 588, 588, 588, 588, 588, + /* 70 */ 588, 471, 474, 574, 573, 541, 434, 452, 475, 476, + /* 80 */ 484, 572, 455, 483, 480, 460, 461, 479, 540, 457, + /* 90 */ 488, 487, 499, 489, 463, 489, 450, 387, 588, 450, + /* 100 */ 450, 470, 450, 554, 507, 450, 588, 588, 450, 450, + /* 110 */ 450, 588, 588, 463, 463, 588, 463, 515, 508, 515, + /* 120 */ 463, 588, 463, 508, 515, 588, 588, 508, 588, 588, + /* 130 */ 588, 588, 588, 588, 588, 588, 588, 588, 588, 588, + /* 140 */ 588, 588, 463, 588, 515, 588, 588, 450, 508, 551, + /* 150 */ 450, 467, 468, 466, 490, 486, 473, 492, 491, 549, + /* 160 */ 516, 588, 588, 588, 588, 588, 588, 588, 532, 515, + /* 170 */ 534, 588, 588, 588, 535, 533, 588, 588, 513, 588, + /* 180 */ 588, 588, 588, 588, 588, 588, 588, 588, 588, 588, + /* 190 */ 588, 588, 529, 587, 470, 544, 555, 405, 543, 507, + /* 200 */ 552, 587, 515, 548, 515, 515, 548, 465, 499, 499, + /* 210 */ 499, 588, 499, 485, 499, 588, 588, 588, 527, 588, + /* 220 */ 588, 489, 495, 588, 497, 588, 527, 588, 588, 495, + /* 230 */ 527, 553, 588, 588, 588, 588, 588, 458, 588, 588, + /* 240 */ 588, 588, 588, 588, 489, 588, 588, 588, 588, 588, + /* 250 */ 501, 588, 527, 433, 442, 565, 566, 438, 567, 449, + /* 260 */ 429, 459, 586, 435, 416, 430, 469, 564, 444, 447, + /* 270 */ 563, 446, 445, 550, 562, 528, 443, 441, 417, 448, + /* 280 */ 440, 526, 582, 527, 439, 412, 398, 397, 396, 432, + /* 290 */ 399, 400, 431, 395, 394, 389, 388, 391, 415, 393, + /* 300 */ 392, 401, 437, 409, 506, 462, 410, 411, 413, 547, + /* 310 */ 510, 408, 403, 402, 404, 436, 407, 406, 414, 561, + /* 320 */ 509, 503, 505, 424, 514, 585, 578, 568, 465, 464, + /* 330 */ 477, 423, 530, 570, 569, 584, 581, 518, 525, 427, + /* 340 */ 428, 519, 426, 500, 575, 517, 425, 579, 580, 502, + /* 350 */ 576, 577, 478, 481, 522, 524, 583, 559, 558, 557, + /* 360 */ 521, 419, 493, 418, 472, 537, 560, 501, 520, 523, + /* 370 */ 545, 482, 496, 421, 498, 422, 539, 504, 536, 556, + /* 380 */ 494, 546, 512, 531, 420, 511, 538, ); - const YYNOCODE = 122; + const YYNOCODE = 121; const YYSTACKDEPTH = 100; const YYNSTATE = 387; const YYNRULE = 201; - const YYERRORSYMBOL = 79; + const YYERRORSYMBOL = 78; const YYERRSYMDT = 'yy0'; const YYFALLBACK = 0; static public $yyFallback = array( @@ -1229,30 +1266,29 @@ static public $yy_action = array( 'RDEL', 'DOLLAR', 'ID', 'EQUAL', 'PTR', 'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO', 'STEP', 'LDELFOREACH', - 'SPACE', 'AS', 'APTR', 'LDELSETFILTER', - 'SMARTYBLOCKCHILD', 'LDELSLASH', 'INTEGER', 'COMMA', - 'OPENP', 'CLOSEP', 'MATH', 'UNIMATH', - 'ANDSYM', 'ISIN', 'ISDIVBY', 'ISNOTDIVBY', - 'ISEVEN', 'ISNOTEVEN', 'ISEVENBY', 'ISNOTEVENBY', - 'ISODD', 'ISNOTODD', 'ISODDBY', 'ISNOTODDBY', - 'INSTANCEOF', 'QMARK', 'NOT', 'TYPECAST', - 'HEX', 'DOT', 'SINGLEQUOTESTRING', 'DOUBLECOLON', - 'AT', 'HATCH', 'OPENB', 'CLOSEB', - 'EQUALS', 'NOTEQUALS', 'GREATERTHAN', 'LESSTHAN', - 'GREATEREQUAL', 'LESSEQUAL', 'IDENTITY', 'NONEIDENTITY', - 'MOD', 'LAND', 'LOR', 'LXOR', - 'QUOTE', 'BACKTICK', 'DOLLARID', 'error', - 'start', 'template', 'template_element', 'smartytag', - 'literal', 'literal_elements', 'literal_element', 'value', - 'modifierlist', 'attributes', 'expr', 'varindexed', + 'SPACE', 'AS', 'APTR', 'SMARTYBLOCKCHILD', + 'LDELSLASH', 'INTEGER', 'COMMA', 'OPENP', + 'CLOSEP', 'MATH', 'UNIMATH', 'ANDSYM', + 'ISIN', 'ISDIVBY', 'ISNOTDIVBY', 'ISEVEN', + 'ISNOTEVEN', 'ISEVENBY', 'ISNOTEVENBY', 'ISODD', + 'ISNOTODD', 'ISODDBY', 'ISNOTODDBY', 'INSTANCEOF', + 'QMARK', 'NOT', 'TYPECAST', 'HEX', + 'DOT', 'SINGLEQUOTESTRING', 'DOUBLECOLON', 'AT', + 'HATCH', 'OPENB', 'CLOSEB', 'EQUALS', + 'NOTEQUALS', 'GREATERTHAN', 'LESSTHAN', 'GREATEREQUAL', + 'LESSEQUAL', 'IDENTITY', 'NONEIDENTITY', 'MOD', + 'LAND', 'LOR', 'LXOR', 'QUOTE', + 'BACKTICK', 'DOLLARID', 'error', 'start', + 'template', 'template_element', 'smartytag', 'literal', + 'literal_elements', 'literal_element', 'value', 'modifierlist', + 'attributes', 'variable', 'expr', 'varindexed', 'statement', 'statements', 'optspace', 'varvar', - 'foraction', 'modparameters', 'attribute', 'ternary', - 'array', 'ifcond', 'lop', 'variable', - 'function', 'doublequoted_with_quotes', 'static_class_access', 'object', - 'arrayindex', 'indexdef', 'varvarele', 'objectchain', - 'objectelement', 'method', 'params', 'modifier', - 'modparameter', 'arrayelements', 'arrayelement', 'doublequoted', - 'doublequotedcontent', + 'foraction', 'attribute', 'ternary', 'array', + 'ifcond', 'lop', 'function', 'doublequoted_with_quotes', + 'static_class_access', 'object', 'arrayindex', 'indexdef', + 'varvarele', 'objectchain', 'objectelement', 'method', + 'params', 'modifier', 'modparameters', 'modparameter', + 'arrayelements', 'arrayelement', 'doublequoted', 'doublequotedcontent', ); static public $yyRuleName = array( @@ -1285,33 +1321,33 @@ static public $yy_action = array( /* 26 */ "smartytag ::= LDEL value RDEL", /* 27 */ "smartytag ::= LDEL value modifierlist attributes RDEL", /* 28 */ "smartytag ::= LDEL value attributes RDEL", - /* 29 */ "smartytag ::= LDEL expr modifierlist attributes RDEL", - /* 30 */ "smartytag ::= LDEL expr attributes RDEL", - /* 31 */ "smartytag ::= LDEL DOLLAR ID EQUAL value RDEL", - /* 32 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr RDEL", - /* 33 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes RDEL", - /* 34 */ "smartytag ::= LDEL varindexed EQUAL expr attributes RDEL", - /* 35 */ "smartytag ::= LDEL ID attributes RDEL", - /* 36 */ "smartytag ::= LDEL ID RDEL", - /* 37 */ "smartytag ::= LDEL ID PTR ID attributes RDEL", - /* 38 */ "smartytag ::= LDEL ID modifierlist attributes RDEL", - /* 39 */ "smartytag ::= LDEL ID PTR ID modifierlist attributes RDEL", - /* 40 */ "smartytag ::= LDELIF expr RDEL", - /* 41 */ "smartytag ::= LDELIF expr attributes RDEL", - /* 42 */ "smartytag ::= LDELIF statement RDEL", - /* 43 */ "smartytag ::= LDELIF statement attributes RDEL", - /* 44 */ "smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes RDEL", - /* 45 */ "foraction ::= EQUAL expr", - /* 46 */ "foraction ::= INCDEC", - /* 47 */ "smartytag ::= LDELFOR statement TO expr attributes RDEL", - /* 48 */ "smartytag ::= LDELFOR statement TO expr STEP expr attributes RDEL", - /* 49 */ "smartytag ::= LDELFOREACH attributes RDEL", - /* 50 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes RDEL", - /* 51 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL", - /* 52 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes RDEL", - /* 53 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL", - /* 54 */ "smartytag ::= LDELSETFILTER ID modparameters RDEL", - /* 55 */ "smartytag ::= LDELSETFILTER ID modparameters modifierlist RDEL", + /* 29 */ "smartytag ::= LDEL variable modifierlist attributes RDEL", + /* 30 */ "smartytag ::= LDEL variable attributes RDEL", + /* 31 */ "smartytag ::= LDEL expr modifierlist attributes RDEL", + /* 32 */ "smartytag ::= LDEL expr attributes RDEL", + /* 33 */ "smartytag ::= LDEL DOLLAR ID EQUAL value RDEL", + /* 34 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr RDEL", + /* 35 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes RDEL", + /* 36 */ "smartytag ::= LDEL varindexed EQUAL expr attributes RDEL", + /* 37 */ "smartytag ::= LDEL ID attributes RDEL", + /* 38 */ "smartytag ::= LDEL ID RDEL", + /* 39 */ "smartytag ::= LDEL ID PTR ID attributes RDEL", + /* 40 */ "smartytag ::= LDEL ID modifierlist attributes RDEL", + /* 41 */ "smartytag ::= LDEL ID PTR ID modifierlist attributes RDEL", + /* 42 */ "smartytag ::= LDELIF expr RDEL", + /* 43 */ "smartytag ::= LDELIF expr attributes RDEL", + /* 44 */ "smartytag ::= LDELIF statement RDEL", + /* 45 */ "smartytag ::= LDELIF statement attributes RDEL", + /* 46 */ "smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes RDEL", + /* 47 */ "foraction ::= EQUAL expr", + /* 48 */ "foraction ::= INCDEC", + /* 49 */ "smartytag ::= LDELFOR statement TO expr attributes RDEL", + /* 50 */ "smartytag ::= LDELFOR statement TO expr STEP expr attributes RDEL", + /* 51 */ "smartytag ::= LDELFOREACH attributes RDEL", + /* 52 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes RDEL", + /* 53 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL", + /* 54 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes RDEL", + /* 55 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL", /* 56 */ "smartytag ::= SMARTYBLOCKCHILD", /* 57 */ "smartytag ::= LDELSLASH ID RDEL", /* 58 */ "smartytag ::= LDELSLASH ID modifierlist RDEL", @@ -1712,11 +1748,11 @@ static public $yy_action = array( while ($this->yyidx >= 0) { $this->yy_pop_parser_stack(); } -#line 83 "smarty_internal_templateparser.y" +#line 73 "smarty_internal_templateparser.y" $this->internalError = true; $this->compiler->trigger_template_error("Stack overflow in template parser"); -#line 1715 "smarty_internal_templateparser.php" +#line 1751 "smarty_internal_templateparser.php" return; } $yytos = new TP_yyStackEntry; @@ -1737,77 +1773,77 @@ static public $yy_action = array( } static public $yyRuleInfo = array( + array( 'lhs' => 79, 'rhs' => 1 ), array( 'lhs' => 80, 'rhs' => 1 ), + array( 'lhs' => 80, 'rhs' => 2 ), + array( 'lhs' => 80, 'rhs' => 0 ), array( 'lhs' => 81, 'rhs' => 1 ), - array( 'lhs' => 81, 'rhs' => 2 ), - array( 'lhs' => 81, 'rhs' => 0 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 82, 'rhs' => 1 ), - array( 'lhs' => 84, 'rhs' => 2 ), - array( 'lhs' => 84, 'rhs' => 3 ), - array( 'lhs' => 85, 'rhs' => 2 ), - array( 'lhs' => 85, 'rhs' => 0 ), - array( 'lhs' => 86, 'rhs' => 1 ), - array( 'lhs' => 86, 'rhs' => 1 ), - array( 'lhs' => 86, 'rhs' => 1 ), - array( 'lhs' => 86, 'rhs' => 1 ), - array( 'lhs' => 86, 'rhs' => 1 ), - array( 'lhs' => 86, 'rhs' => 1 ), - array( 'lhs' => 86, 'rhs' => 1 ), - array( 'lhs' => 83, 'rhs' => 3 ), - array( 'lhs' => 83, 'rhs' => 5 ), - array( 'lhs' => 83, 'rhs' => 4 ), - array( 'lhs' => 83, 'rhs' => 5 ), - array( 'lhs' => 83, 'rhs' => 4 ), - array( 'lhs' => 83, 'rhs' => 6 ), - array( 'lhs' => 83, 'rhs' => 6 ), - array( 'lhs' => 83, 'rhs' => 7 ), - array( 'lhs' => 83, 'rhs' => 6 ), - array( 'lhs' => 83, 'rhs' => 4 ), - array( 'lhs' => 83, 'rhs' => 3 ), - array( 'lhs' => 83, 'rhs' => 6 ), - array( 'lhs' => 83, 'rhs' => 5 ), - array( 'lhs' => 83, 'rhs' => 7 ), - array( 'lhs' => 83, 'rhs' => 3 ), - array( 'lhs' => 83, 'rhs' => 4 ), + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 81, 'rhs' => 1 ), + array( 'lhs' => 83, 'rhs' => 2 ), array( 'lhs' => 83, 'rhs' => 3 ), - array( 'lhs' => 83, 'rhs' => 4 ), - array( 'lhs' => 83, 'rhs' => 12 ), + array( 'lhs' => 84, 'rhs' => 2 ), + array( 'lhs' => 84, 'rhs' => 0 ), + array( 'lhs' => 85, 'rhs' => 1 ), + array( 'lhs' => 85, 'rhs' => 1 ), + array( 'lhs' => 85, 'rhs' => 1 ), + array( 'lhs' => 85, 'rhs' => 1 ), + array( 'lhs' => 85, 'rhs' => 1 ), + array( 'lhs' => 85, 'rhs' => 1 ), + array( 'lhs' => 85, 'rhs' => 1 ), + array( 'lhs' => 82, 'rhs' => 3 ), + array( 'lhs' => 82, 'rhs' => 5 ), + array( 'lhs' => 82, 'rhs' => 4 ), + array( 'lhs' => 82, 'rhs' => 5 ), + array( 'lhs' => 82, 'rhs' => 4 ), + array( 'lhs' => 82, 'rhs' => 5 ), + array( 'lhs' => 82, 'rhs' => 4 ), + array( 'lhs' => 82, 'rhs' => 6 ), + array( 'lhs' => 82, 'rhs' => 6 ), + array( 'lhs' => 82, 'rhs' => 7 ), + array( 'lhs' => 82, 'rhs' => 6 ), + array( 'lhs' => 82, 'rhs' => 4 ), + array( 'lhs' => 82, 'rhs' => 3 ), + array( 'lhs' => 82, 'rhs' => 6 ), + array( 'lhs' => 82, 'rhs' => 5 ), + array( 'lhs' => 82, 'rhs' => 7 ), + array( 'lhs' => 82, 'rhs' => 3 ), + array( 'lhs' => 82, 'rhs' => 4 ), + array( 'lhs' => 82, 'rhs' => 3 ), + array( 'lhs' => 82, 'rhs' => 4 ), + array( 'lhs' => 82, 'rhs' => 12 ), array( 'lhs' => 96, 'rhs' => 2 ), array( 'lhs' => 96, 'rhs' => 1 ), - array( 'lhs' => 83, 'rhs' => 6 ), - array( 'lhs' => 83, 'rhs' => 8 ), - array( 'lhs' => 83, 'rhs' => 3 ), - array( 'lhs' => 83, 'rhs' => 8 ), - array( 'lhs' => 83, 'rhs' => 11 ), - array( 'lhs' => 83, 'rhs' => 8 ), - array( 'lhs' => 83, 'rhs' => 11 ), - array( 'lhs' => 83, 'rhs' => 4 ), - array( 'lhs' => 83, 'rhs' => 5 ), - array( 'lhs' => 83, 'rhs' => 1 ), - array( 'lhs' => 83, 'rhs' => 3 ), - array( 'lhs' => 83, 'rhs' => 4 ), - array( 'lhs' => 83, 'rhs' => 5 ), - array( 'lhs' => 83, 'rhs' => 6 ), - array( 'lhs' => 89, 'rhs' => 2 ), - array( 'lhs' => 89, 'rhs' => 1 ), - array( 'lhs' => 89, 'rhs' => 0 ), - array( 'lhs' => 98, 'rhs' => 4 ), - array( 'lhs' => 98, 'rhs' => 4 ), - array( 'lhs' => 98, 'rhs' => 4 ), - array( 'lhs' => 98, 'rhs' => 2 ), - array( 'lhs' => 98, 'rhs' => 2 ), - array( 'lhs' => 98, 'rhs' => 2 ), - array( 'lhs' => 98, 'rhs' => 4 ), + array( 'lhs' => 82, 'rhs' => 6 ), + array( 'lhs' => 82, 'rhs' => 8 ), + array( 'lhs' => 82, 'rhs' => 3 ), + array( 'lhs' => 82, 'rhs' => 8 ), + array( 'lhs' => 82, 'rhs' => 11 ), + array( 'lhs' => 82, 'rhs' => 8 ), + array( 'lhs' => 82, 'rhs' => 11 ), + array( 'lhs' => 82, 'rhs' => 1 ), + array( 'lhs' => 82, 'rhs' => 3 ), + array( 'lhs' => 82, 'rhs' => 4 ), + array( 'lhs' => 82, 'rhs' => 5 ), + array( 'lhs' => 82, 'rhs' => 6 ), + array( 'lhs' => 88, 'rhs' => 2 ), + array( 'lhs' => 88, 'rhs' => 1 ), + array( 'lhs' => 88, 'rhs' => 0 ), + array( 'lhs' => 97, 'rhs' => 4 ), + array( 'lhs' => 97, 'rhs' => 4 ), + array( 'lhs' => 97, 'rhs' => 4 ), + array( 'lhs' => 97, 'rhs' => 2 ), + array( 'lhs' => 97, 'rhs' => 2 ), + array( 'lhs' => 97, 'rhs' => 2 ), + array( 'lhs' => 97, 'rhs' => 4 ), array( 'lhs' => 93, 'rhs' => 1 ), array( 'lhs' => 93, 'rhs' => 3 ), array( 'lhs' => 92, 'rhs' => 4 ), @@ -1837,105 +1873,105 @@ static public $yy_action = array( array( 'lhs' => 90, 'rhs' => 3 ), array( 'lhs' => 90, 'rhs' => 3 ), array( 'lhs' => 90, 'rhs' => 3 ), - array( 'lhs' => 99, 'rhs' => 8 ), - array( 'lhs' => 99, 'rhs' => 7 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 2 ), - array( 'lhs' => 87, 'rhs' => 2 ), - array( 'lhs' => 87, 'rhs' => 2 ), - array( 'lhs' => 87, 'rhs' => 2 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 3 ), - array( 'lhs' => 87, 'rhs' => 2 ), - array( 'lhs' => 87, 'rhs' => 2 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 3 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 3 ), - array( 'lhs' => 87, 'rhs' => 3 ), - array( 'lhs' => 87, 'rhs' => 1 ), - array( 'lhs' => 87, 'rhs' => 2 ), - array( 'lhs' => 103, 'rhs' => 1 ), - array( 'lhs' => 103, 'rhs' => 4 ), - array( 'lhs' => 103, 'rhs' => 1 ), - array( 'lhs' => 103, 'rhs' => 3 ), - array( 'lhs' => 103, 'rhs' => 3 ), + array( 'lhs' => 98, 'rhs' => 8 ), + array( 'lhs' => 98, 'rhs' => 7 ), + array( 'lhs' => 86, 'rhs' => 1 ), + array( 'lhs' => 86, 'rhs' => 2 ), + array( 'lhs' => 86, 'rhs' => 2 ), + array( 'lhs' => 86, 'rhs' => 2 ), + array( 'lhs' => 86, 'rhs' => 2 ), + array( 'lhs' => 86, 'rhs' => 1 ), + array( 'lhs' => 86, 'rhs' => 1 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 2 ), + array( 'lhs' => 86, 'rhs' => 2 ), + array( 'lhs' => 86, 'rhs' => 1 ), + array( 'lhs' => 86, 'rhs' => 1 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 1 ), + array( 'lhs' => 86, 'rhs' => 1 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 3 ), + array( 'lhs' => 86, 'rhs' => 1 ), + array( 'lhs' => 86, 'rhs' => 2 ), + array( 'lhs' => 89, 'rhs' => 1 ), + array( 'lhs' => 89, 'rhs' => 4 ), + array( 'lhs' => 89, 'rhs' => 1 ), + array( 'lhs' => 89, 'rhs' => 3 ), + array( 'lhs' => 89, 'rhs' => 3 ), array( 'lhs' => 91, 'rhs' => 3 ), - array( 'lhs' => 108, 'rhs' => 2 ), - array( 'lhs' => 108, 'rhs' => 0 ), - array( 'lhs' => 109, 'rhs' => 3 ), - array( 'lhs' => 109, 'rhs' => 5 ), - array( 'lhs' => 109, 'rhs' => 2 ), - array( 'lhs' => 109, 'rhs' => 2 ), - array( 'lhs' => 109, 'rhs' => 4 ), - array( 'lhs' => 109, 'rhs' => 3 ), - array( 'lhs' => 109, 'rhs' => 5 ), - array( 'lhs' => 109, 'rhs' => 3 ), - array( 'lhs' => 109, 'rhs' => 2 ), + array( 'lhs' => 106, 'rhs' => 2 ), + array( 'lhs' => 106, 'rhs' => 0 ), + array( 'lhs' => 107, 'rhs' => 3 ), + array( 'lhs' => 107, 'rhs' => 5 ), + array( 'lhs' => 107, 'rhs' => 2 ), + array( 'lhs' => 107, 'rhs' => 2 ), + array( 'lhs' => 107, 'rhs' => 4 ), + array( 'lhs' => 107, 'rhs' => 3 ), + array( 'lhs' => 107, 'rhs' => 5 ), + array( 'lhs' => 107, 'rhs' => 3 ), + array( 'lhs' => 107, 'rhs' => 2 ), array( 'lhs' => 95, 'rhs' => 1 ), array( 'lhs' => 95, 'rhs' => 2 ), - array( 'lhs' => 110, 'rhs' => 1 ), + array( 'lhs' => 108, 'rhs' => 1 ), + array( 'lhs' => 108, 'rhs' => 3 ), + array( 'lhs' => 105, 'rhs' => 2 ), + array( 'lhs' => 109, 'rhs' => 1 ), + array( 'lhs' => 109, 'rhs' => 2 ), array( 'lhs' => 110, 'rhs' => 3 ), - array( 'lhs' => 107, 'rhs' => 2 ), - array( 'lhs' => 111, 'rhs' => 1 ), - array( 'lhs' => 111, 'rhs' => 2 ), + array( 'lhs' => 110, 'rhs' => 4 ), + array( 'lhs' => 110, 'rhs' => 5 ), + array( 'lhs' => 110, 'rhs' => 6 ), + array( 'lhs' => 110, 'rhs' => 2 ), + array( 'lhs' => 102, 'rhs' => 4 ), + array( 'lhs' => 111, 'rhs' => 4 ), + array( 'lhs' => 111, 'rhs' => 5 ), array( 'lhs' => 112, 'rhs' => 3 ), - array( 'lhs' => 112, 'rhs' => 4 ), - array( 'lhs' => 112, 'rhs' => 5 ), - array( 'lhs' => 112, 'rhs' => 6 ), - array( 'lhs' => 112, 'rhs' => 2 ), - array( 'lhs' => 104, 'rhs' => 4 ), - array( 'lhs' => 113, 'rhs' => 4 ), - array( 'lhs' => 113, 'rhs' => 5 ), - array( 'lhs' => 114, 'rhs' => 3 ), - array( 'lhs' => 114, 'rhs' => 1 ), + array( 'lhs' => 112, 'rhs' => 1 ), + array( 'lhs' => 112, 'rhs' => 0 ), + array( 'lhs' => 87, 'rhs' => 3 ), + array( 'lhs' => 87, 'rhs' => 2 ), + array( 'lhs' => 113, 'rhs' => 3 ), + array( 'lhs' => 113, 'rhs' => 2 ), + array( 'lhs' => 114, 'rhs' => 2 ), array( 'lhs' => 114, 'rhs' => 0 ), - array( 'lhs' => 88, 'rhs' => 3 ), - array( 'lhs' => 88, 'rhs' => 2 ), - array( 'lhs' => 115, 'rhs' => 3 ), array( 'lhs' => 115, 'rhs' => 2 ), - array( 'lhs' => 97, 'rhs' => 2 ), - array( 'lhs' => 97, 'rhs' => 0 ), - array( 'lhs' => 116, 'rhs' => 2 ), - array( 'lhs' => 116, 'rhs' => 2 ), - array( 'lhs' => 106, 'rhs' => 1 ), - array( 'lhs' => 106, 'rhs' => 2 ), - array( 'lhs' => 106, 'rhs' => 1 ), - array( 'lhs' => 106, 'rhs' => 3 ), - array( 'lhs' => 106, 'rhs' => 4 ), - array( 'lhs' => 101, 'rhs' => 1 ), - array( 'lhs' => 101, 'rhs' => 1 ), - array( 'lhs' => 101, 'rhs' => 1 ), - array( 'lhs' => 101, 'rhs' => 1 ), - array( 'lhs' => 101, 'rhs' => 1 ), - array( 'lhs' => 101, 'rhs' => 1 ), + array( 'lhs' => 115, 'rhs' => 2 ), + array( 'lhs' => 104, 'rhs' => 1 ), + array( 'lhs' => 104, 'rhs' => 2 ), + array( 'lhs' => 104, 'rhs' => 1 ), + array( 'lhs' => 104, 'rhs' => 3 ), + array( 'lhs' => 104, 'rhs' => 4 ), + array( 'lhs' => 100, 'rhs' => 1 ), + array( 'lhs' => 100, 'rhs' => 1 ), + array( 'lhs' => 100, 'rhs' => 1 ), + array( 'lhs' => 100, 'rhs' => 1 ), + array( 'lhs' => 100, 'rhs' => 1 ), + array( 'lhs' => 100, 'rhs' => 1 ), + array( 'lhs' => 100, 'rhs' => 1 ), + array( 'lhs' => 100, 'rhs' => 1 ), + array( 'lhs' => 100, 'rhs' => 1 ), array( 'lhs' => 101, 'rhs' => 1 ), array( 'lhs' => 101, 'rhs' => 1 ), array( 'lhs' => 101, 'rhs' => 1 ), - array( 'lhs' => 102, 'rhs' => 1 ), - array( 'lhs' => 102, 'rhs' => 1 ), - array( 'lhs' => 102, 'rhs' => 1 ), - array( 'lhs' => 100, 'rhs' => 3 ), - array( 'lhs' => 117, 'rhs' => 1 ), + array( 'lhs' => 99, 'rhs' => 3 ), + array( 'lhs' => 116, 'rhs' => 1 ), + array( 'lhs' => 116, 'rhs' => 3 ), + array( 'lhs' => 116, 'rhs' => 0 ), + array( 'lhs' => 117, 'rhs' => 3 ), array( 'lhs' => 117, 'rhs' => 3 ), - array( 'lhs' => 117, 'rhs' => 0 ), - array( 'lhs' => 118, 'rhs' => 3 ), - array( 'lhs' => 118, 'rhs' => 3 ), + array( 'lhs' => 117, 'rhs' => 1 ), + array( 'lhs' => 103, 'rhs' => 2 ), + array( 'lhs' => 103, 'rhs' => 3 ), + array( 'lhs' => 118, 'rhs' => 2 ), array( 'lhs' => 118, 'rhs' => 1 ), - array( 'lhs' => 105, 'rhs' => 2 ), - array( 'lhs' => 105, 'rhs' => 3 ), - array( 'lhs' => 119, 'rhs' => 2 ), + array( 'lhs' => 119, 'rhs' => 3 ), + array( 'lhs' => 119, 'rhs' => 3 ), + array( 'lhs' => 119, 'rhs' => 1 ), + array( 'lhs' => 119, 'rhs' => 3 ), + array( 'lhs' => 119, 'rhs' => 3 ), + array( 'lhs' => 119, 'rhs' => 1 ), array( 'lhs' => 119, 'rhs' => 1 ), - array( 'lhs' => 120, 'rhs' => 3 ), - array( 'lhs' => 120, 'rhs' => 3 ), - array( 'lhs' => 120, 'rhs' => 1 ), - array( 'lhs' => 120, 'rhs' => 3 ), - array( 'lhs' => 120, 'rhs' => 3 ), - array( 'lhs' => 120, 'rhs' => 1 ), - array( 'lhs' => 120, 'rhs' => 1 ), array( 'lhs' => 94, 'rhs' => 1 ), array( 'lhs' => 94, 'rhs' => 0 ), ); @@ -1957,23 +1993,16 @@ static public $yy_action = array( 14 => 14, 15 => 15, 18 => 15, - 200 => 15, 16 => 16, - 75 => 16, 17 => 17, 103 => 17, 105 => 17, 106 => 17, - 127 => 17, 165 => 17, 19 => 19, 20 => 19, - 46 => 19, - 68 => 19, - 69 => 19, 76 => 19, 77 => 19, - 82 => 19, 102 => 19, 107 => 19, 108 => 19, @@ -1981,12 +2010,8 @@ static public $yy_action = array( 115 => 19, 116 => 19, 123 => 19, - 138 => 19, 164 => 19, - 166 => 19, 182 => 19, - 187 => 19, - 199 => 19, 21 => 21, 22 => 21, 23 => 23, @@ -1994,13 +2019,13 @@ static public $yy_action = array( 25 => 25, 26 => 26, 27 => 27, + 29 => 27, 28 => 28, 30 => 28, - 29 => 29, + 32 => 28, 31 => 31, - 32 => 31, 33 => 33, - 34 => 34, + 34 => 33, 35 => 35, 36 => 36, 37 => 37, @@ -2008,12 +2033,17 @@ static public $yy_action = array( 39 => 39, 40 => 40, 41 => 41, - 43 => 41, 42 => 42, - 44 => 44, - 45 => 45, + 44 => 42, + 43 => 43, + 45 => 43, + 46 => 46, 47 => 47, 48 => 48, + 68 => 48, + 69 => 48, + 166 => 48, + 187 => 48, 49 => 49, 50 => 50, 51 => 51, @@ -2031,23 +2061,24 @@ static public $yy_action = array( 71 => 62, 154 => 62, 158 => 62, - 162 => 62, - 163 => 62, 63 => 63, 155 => 63, - 161 => 63, 64 => 64, 65 => 65, 66 => 65, - 70 => 65, 67 => 67, + 70 => 70, 72 => 72, 73 => 73, 74 => 73, + 75 => 75, 78 => 78, 79 => 79, 80 => 79, 81 => 79, + 82 => 82, + 138 => 82, + 199 => 82, 83 => 83, 120 => 83, 84 => 84, @@ -2082,8 +2113,8 @@ static public $yy_action = array( 124 => 124, 125 => 125, 126 => 126, + 127 => 127, 128 => 128, - 184 => 128, 129 => 129, 130 => 130, 131 => 131, @@ -2112,6 +2143,9 @@ static public $yy_action = array( 157 => 157, 159 => 159, 160 => 160, + 161 => 161, + 162 => 162, + 163 => 162, 167 => 167, 168 => 168, 169 => 169, @@ -2128,6 +2162,7 @@ static public $yy_action = array( 180 => 180, 181 => 181, 183 => 183, + 184 => 184, 185 => 185, 186 => 186, 188 => 188, @@ -2141,909 +2176,656 @@ static public $yy_action = array( 196 => 196, 197 => 197, 198 => 198, + 200 => 200, ); -#line 94 "smarty_internal_templateparser.y" - function yy_r0(){ - $this->_retvalue = $this->root_buffer->to_smarty_php(); - } -#line 2145 "smarty_internal_templateparser.php" +#line 84 "smarty_internal_templateparser.y" + function yy_r0(){ $this->_retvalue = $this->root_buffer->to_smarty_php(); } +#line 2179 "smarty_internal_templateparser.php" +#line 90 "smarty_internal_templateparser.y" + function yy_r1(){ $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor); } +#line 2182 "smarty_internal_templateparser.php" #line 102 "smarty_internal_templateparser.y" - function yy_r1(){ - $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor); - } -#line 2150 "smarty_internal_templateparser.php" -#line 118 "smarty_internal_templateparser.y" function yy_r4(){ - if ($this->compiler->has_code) { - $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array(); - $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode($tmp.$this->yystack[$this->yyidx + 0]->minor,true)); - } else { - $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor); - } - $this->compiler->has_variable_string = false; - $this->block_nesting_level = count($this->compiler->_tag_stack); - } -#line 2162 "smarty_internal_templateparser.php" -#line 130 "smarty_internal_templateparser.y" - function yy_r5(){ - $this->_retvalue = new _smarty_tag($this, ''); - } -#line 2167 "smarty_internal_templateparser.php" -#line 135 "smarty_internal_templateparser.y" - function yy_r6(){ - $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); - } -#line 2172 "smarty_internal_templateparser.php" -#line 140 "smarty_internal_templateparser.y" + if ($this->compiler->has_code) { + $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array(); + $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode($tmp.$this->yystack[$this->yyidx + 0]->minor,true)); + } else { + $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor); + } + $this->compiler->has_variable_string = false; + $this->block_nesting_level = count($this->compiler->_tag_stack); + } +#line 2194 "smarty_internal_templateparser.php" +#line 114 "smarty_internal_templateparser.y" + function yy_r5(){ $this->_retvalue = new _smarty_tag($this, ''); } +#line 2197 "smarty_internal_templateparser.php" +#line 117 "smarty_internal_templateparser.y" + function yy_r6(){ $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); } +#line 2200 "smarty_internal_templateparser.php" +#line 120 "smarty_internal_templateparser.y" function yy_r7(){ - if ($this->php_handling == Smarty::PHP_PASSTHRU) { - $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)); - } elseif ($this->php_handling == Smarty::PHP_QUOTE) { - $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES)); - } elseif ($this->php_handling == Smarty::PHP_ALLOW) { - if (!($this->smarty instanceof SmartyBC)) { - $this->compiler->trigger_template_error (self::Err3); - } - $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('php_handling == Smarty::PHP_REMOVE) { - $this->_retvalue = new _smarty_text($this, ''); - } - } -#line 2188 "smarty_internal_templateparser.php" -#line 156 "smarty_internal_templateparser.y" - function yy_r8(){ - if ($this->is_xml) { - $this->compiler->tag_nocache = true; - $this->is_xml = false; - $save = $this->template->has_nocache_code; - $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("';?>", $this->compiler, true)); - $this->template->has_nocache_code = $save; - } elseif ($this->php_handling == Smarty::PHP_PASSTHRU) { - $this->_retvalue = new _smarty_text($this, '?>'); - } elseif ($this->php_handling == Smarty::PHP_QUOTE) { - $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES)); - } elseif ($this->php_handling == Smarty::PHP_ALLOW) { - $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true)); - } elseif ($this->php_handling == Smarty::PHP_REMOVE) { - $this->_retvalue = new _smarty_text($this, ''); - } - } -#line 2207 "smarty_internal_templateparser.php" -#line 175 "smarty_internal_templateparser.y" - function yy_r9(){ - if ($this->php_handling == Smarty::PHP_PASSTHRU) { - $this->_retvalue = new _smarty_text($this, '<%'); - } elseif ($this->php_handling == Smarty::PHP_QUOTE) { - $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES)); - } elseif ($this->php_handling == Smarty::PHP_ALLOW) { - if ($this->asp_tags) { - if (!($this->smarty instanceof SmartyBC)) { - $this->compiler->trigger_template_error (self::Err3); - } - $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<%', true)); - } else { - $this->_retvalue = new _smarty_text($this, '<%'); - } - } elseif ($this->php_handling == Smarty::PHP_REMOVE) { - if ($this->asp_tags) { - $this->_retvalue = new _smarty_text($this, ''); - } else { - $this->_retvalue = new _smarty_text($this, '<%'); - } - } - } + if ($this->php_handling == Smarty::PHP_PASSTHRU) { + $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)); + } elseif ($this->php_handling == Smarty::PHP_QUOTE) { + $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES)); + }elseif ($this->php_handling == Smarty::PHP_ALLOW) { + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('php_handling == Smarty::PHP_REMOVE) { + $this->_retvalue = new _smarty_text($this, ''); + } + } +#line 2213 "smarty_internal_templateparser.php" +#line 132 "smarty_internal_templateparser.y" + function yy_r8(){if ($this->is_xml) { + $this->compiler->tag_nocache = true; + $this->is_xml = false; + $save = $this->template->has_nocache_code; + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("';?>", $this->compiler, true)); + $this->template->has_nocache_code = $save; + }elseif ($this->php_handling == Smarty::PHP_PASSTHRU) { + $this->_retvalue = new _smarty_text($this, '?>'); + } elseif ($this->php_handling == Smarty::PHP_QUOTE) { + $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES)); + }elseif ($this->php_handling == Smarty::PHP_ALLOW) { + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true)); + }elseif ($this->php_handling == Smarty::PHP_REMOVE) { + $this->_retvalue = new _smarty_text($this, ''); + } + } #line 2231 "smarty_internal_templateparser.php" -#line 199 "smarty_internal_templateparser.y" - function yy_r10(){ - if ($this->php_handling == Smarty::PHP_PASSTHRU) { - $this->_retvalue = new _smarty_text($this, '%>'); - } elseif ($this->php_handling == Smarty::PHP_QUOTE) { - $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES)); - } elseif ($this->php_handling == Smarty::PHP_ALLOW) { - if ($this->asp_tags) { - $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('%>', true)); - } else { - $this->_retvalue = new _smarty_text($this, '%>'); - } - } elseif ($this->php_handling == Smarty::PHP_REMOVE) { - if ($this->asp_tags) { - $this->_retvalue = new _smarty_text($this, ''); - } else { - $this->_retvalue = new _smarty_text($this, '%>'); - } - } - } +#line 150 "smarty_internal_templateparser.y" + function yy_r9(){ + if ($this->php_handling == Smarty::PHP_PASSTHRU) { + $this->_retvalue = new _smarty_text($this, '<%'); + } elseif ($this->php_handling == Smarty::PHP_QUOTE) { + $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES)); + }elseif ($this->php_handling == Smarty::PHP_ALLOW) { + if ($this->asp_tags) { + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<%', true)); + } else { + $this->_retvalue = new _smarty_text($this, '<%'); + } + }elseif ($this->php_handling == Smarty::PHP_REMOVE) { + if ($this->asp_tags) { + $this->_retvalue = new _smarty_text($this, ''); + } else { + $this->_retvalue = new _smarty_text($this, '<%'); + } + } + } #line 2252 "smarty_internal_templateparser.php" +#line 171 "smarty_internal_templateparser.y" + function yy_r10(){ + if ($this->php_handling == Smarty::PHP_PASSTHRU) { + $this->_retvalue = new _smarty_text($this, '%>'); + } elseif ($this->php_handling == Smarty::PHP_QUOTE) { + $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES)); + }elseif ($this->php_handling == Smarty::PHP_ALLOW) { + if ($this->asp_tags) { + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('%>', true)); + } else { + $this->_retvalue = new _smarty_text($this, '%>'); + } + }elseif ($this->php_handling == Smarty::PHP_REMOVE) { + if ($this->asp_tags) { + $this->_retvalue = new _smarty_text($this, ''); + } else { + $this->_retvalue = new _smarty_text($this, '%>'); + } + } + } +#line 2273 "smarty_internal_templateparser.php" +#line 191 "smarty_internal_templateparser.y" + function yy_r11(){if ($this->lex->strip) { + $this->_retvalue = new _smarty_text($this, preg_replace('![\$this->yystack[$this->yyidx + 0]->minor ]*[\r\n]+[\$this->yystack[$this->yyidx + 0]->minor ]*!', '', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor))); + } else { + $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)); + } + } +#line 2281 "smarty_internal_templateparser.php" +#line 199 "smarty_internal_templateparser.y" + function yy_r12(){ $this->compiler->tag_nocache = true; + $this->is_xml = true; + $save = $this->template->has_nocache_code; + $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("", $this->compiler, true)); + $this->template->has_nocache_code = $save; + } +#line 2289 "smarty_internal_templateparser.php" +#line 207 "smarty_internal_templateparser.y" + function yy_r13(){if ($this->lex->strip) { + $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor)); + } else { + $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); + } + } +#line 2297 "smarty_internal_templateparser.php" +#line 213 "smarty_internal_templateparser.y" + function yy_r14(){ + $this->_retvalue = new _smarty_linebreak($this, $this->yystack[$this->yyidx + 0]->minor); + } +#line 2302 "smarty_internal_templateparser.php" +#line 218 "smarty_internal_templateparser.y" + function yy_r15(){ $this->_retvalue = ''; } +#line 2305 "smarty_internal_templateparser.php" #line 219 "smarty_internal_templateparser.y" - function yy_r11(){ - if ($this->lex->strip) { - $this->_retvalue = new _smarty_text($this, preg_replace('![\$this->yystack[$this->yyidx + 0]->minor ]*[\r\n]+[\$this->yystack[$this->yyidx + 0]->minor ]*!', '', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor))); - } else { - $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)); - } - } -#line 2261 "smarty_internal_templateparser.php" + function yy_r16(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; } +#line 2308 "smarty_internal_templateparser.php" +#line 221 "smarty_internal_templateparser.y" + function yy_r17(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; } +#line 2311 "smarty_internal_templateparser.php" +#line 224 "smarty_internal_templateparser.y" + function yy_r19(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } +#line 2314 "smarty_internal_templateparser.php" +#line 226 "smarty_internal_templateparser.y" + function yy_r21(){ $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor); } +#line 2317 "smarty_internal_templateparser.php" #line 228 "smarty_internal_templateparser.y" - function yy_r12(){ - $this->compiler->tag_nocache = true; - $this->is_xml = true; - $save = $this->template->has_nocache_code; - $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("", $this->compiler, true)); - $this->template->has_nocache_code = $save; - } -#line 2270 "smarty_internal_templateparser.php" -#line 237 "smarty_internal_templateparser.y" - function yy_r13(){ - if ($this->lex->strip) { - $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor)); - } else { - $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor); - } - } -#line 2279 "smarty_internal_templateparser.php" -#line 245 "smarty_internal_templateparser.y" - function yy_r14(){ - $this->_retvalue = new _smarty_linebreak($this, $this->yystack[$this->yyidx + 0]->minor); - } -#line 2284 "smarty_internal_templateparser.php" -#line 250 "smarty_internal_templateparser.y" - function yy_r15(){ - $this->_retvalue = ''; - } -#line 2289 "smarty_internal_templateparser.php" + function yy_r23(){ $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor); } +#line 2320 "smarty_internal_templateparser.php" +#line 229 "smarty_internal_templateparser.y" + function yy_r24(){ $this->_retvalue = '<%'; } +#line 2323 "smarty_internal_templateparser.php" +#line 230 "smarty_internal_templateparser.y" + function yy_r25(){ $this->_retvalue = '%>'; } +#line 2326 "smarty_internal_templateparser.php" +#line 238 "smarty_internal_templateparser.y" + function yy_r26(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor)); } +#line 2329 "smarty_internal_templateparser.php" +#line 239 "smarty_internal_templateparser.y" + function yy_r27(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor)); } +#line 2332 "smarty_internal_templateparser.php" +#line 240 "smarty_internal_templateparser.y" + function yy_r28(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor)); } +#line 2335 "smarty_internal_templateparser.php" +#line 243 "smarty_internal_templateparser.y" + function yy_r31(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor,'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor)); } +#line 2338 "smarty_internal_templateparser.php" +#line 251 "smarty_internal_templateparser.y" + function yy_r33(){ $this->_retvalue = $this->compiler->compileTag('assign',array(array('value'=>$this->yystack[$this->yyidx + -1]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -3]->minor."'"))); } +#line 2341 "smarty_internal_templateparser.php" +#line 253 "smarty_internal_templateparser.y" + function yy_r35(){ $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -4]->minor."'")),$this->yystack[$this->yyidx + -1]->minor)); } +#line 2344 "smarty_internal_templateparser.php" #line 254 "smarty_internal_templateparser.y" - function yy_r16(){ - $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; - } -#line 2294 "smarty_internal_templateparser.php" -#line 258 "smarty_internal_templateparser.y" - function yy_r17(){ - $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2299 "smarty_internal_templateparser.php" -#line 266 "smarty_internal_templateparser.y" - function yy_r19(){ - $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; - } -#line 2304 "smarty_internal_templateparser.php" + function yy_r36(){ $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>$this->yystack[$this->yyidx + -4]->minor['var'])),$this->yystack[$this->yyidx + -1]->minor),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -4]->minor['smarty_internal_index'])); } +#line 2347 "smarty_internal_templateparser.php" +#line 256 "smarty_internal_templateparser.y" + function yy_r37(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + -1]->minor); } +#line 2350 "smarty_internal_templateparser.php" +#line 257 "smarty_internal_templateparser.y" + function yy_r38(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,array()); } +#line 2353 "smarty_internal_templateparser.php" +#line 259 "smarty_internal_templateparser.y" + function yy_r39(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor)); } +#line 2356 "smarty_internal_templateparser.php" +#line 261 "smarty_internal_templateparser.y" + function yy_r40(){ $this->_retvalue = ''.$this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + -1]->minor).'_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>'; + } +#line 2361 "smarty_internal_templateparser.php" +#line 265 "smarty_internal_templateparser.y" + function yy_r41(){ $this->_retvalue = ''.$this->compiler->compileTag($this->yystack[$this->yyidx + -5]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -3]->minor)).'_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>'; + } +#line 2366 "smarty_internal_templateparser.php" +#line 269 "smarty_internal_templateparser.y" + function yy_r42(){ $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length)); $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor)); } +#line 2369 "smarty_internal_templateparser.php" +#line 270 "smarty_internal_templateparser.y" + function yy_r43(){ $tag = trim(substr($this->yystack[$this->yyidx + -3]->minor,$this->lex->ldel_length)); $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + -1]->minor,array('if condition'=>$this->yystack[$this->yyidx + -2]->minor)); } +#line 2372 "smarty_internal_templateparser.php" #line 274 "smarty_internal_templateparser.y" - function yy_r21(){ - $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor); - } -#line 2309 "smarty_internal_templateparser.php" + function yy_r46(){ + $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -10]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -7]->minor),array('var'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),1); } +#line 2376 "smarty_internal_templateparser.php" +#line 277 "smarty_internal_templateparser.y" + function yy_r47(){ $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor; } +#line 2379 "smarty_internal_templateparser.php" +#line 278 "smarty_internal_templateparser.y" + function yy_r48(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } +#line 2382 "smarty_internal_templateparser.php" +#line 279 "smarty_internal_templateparser.y" + function yy_r49(){ $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -4]->minor),array('to'=>$this->yystack[$this->yyidx + -2]->minor))),0); } +#line 2385 "smarty_internal_templateparser.php" +#line 280 "smarty_internal_templateparser.y" + function yy_r50(){ $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('to'=>$this->yystack[$this->yyidx + -4]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),0); } +#line 2388 "smarty_internal_templateparser.php" #line 282 "smarty_internal_templateparser.y" - function yy_r23(){ - $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor); - } -#line 2314 "smarty_internal_templateparser.php" + function yy_r51(){ $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + -1]->minor); } +#line 2391 "smarty_internal_templateparser.php" +#line 284 "smarty_internal_templateparser.y" + function yy_r52(){ + $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor)))); } +#line 2395 "smarty_internal_templateparser.php" #line 286 "smarty_internal_templateparser.y" - function yy_r24(){ - $this->_retvalue = '<%'; - } -#line 2319 "smarty_internal_templateparser.php" + function yy_r53(){ + $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor)))); } +#line 2399 "smarty_internal_templateparser.php" +#line 288 "smarty_internal_templateparser.y" + function yy_r54(){ + $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor)))); } +#line 2403 "smarty_internal_templateparser.php" #line 290 "smarty_internal_templateparser.y" - function yy_r25(){ - $this->_retvalue = '%>'; - } -#line 2324 "smarty_internal_templateparser.php" + function yy_r55(){ + $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor)))); } +#line 2407 "smarty_internal_templateparser.php" +#line 294 "smarty_internal_templateparser.y" + function yy_r56(){ $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler); } +#line 2410 "smarty_internal_templateparser.php" +#line 298 "smarty_internal_templateparser.y" + function yy_r57(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array()); } +#line 2413 "smarty_internal_templateparser.php" #line 300 "smarty_internal_templateparser.y" - function yy_r26(){ - $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor)); - } -#line 2329 "smarty_internal_templateparser.php" + function yy_r58(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + -1]->minor)); + } +#line 2417 "smarty_internal_templateparser.php" +#line 303 "smarty_internal_templateparser.y" + function yy_r59(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor)); } +#line 2420 "smarty_internal_templateparser.php" #line 304 "smarty_internal_templateparser.y" - function yy_r27(){ - $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor)); - } -#line 2334 "smarty_internal_templateparser.php" -#line 308 "smarty_internal_templateparser.y" - function yy_r28(){ - $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor)); - } -#line 2339 "smarty_internal_templateparser.php" + function yy_r60(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + -1]->minor)); } +#line 2423 "smarty_internal_templateparser.php" +#line 310 "smarty_internal_templateparser.y" + function yy_r61(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor; } +#line 2426 "smarty_internal_templateparser.php" #line 312 "smarty_internal_templateparser.y" - function yy_r29(){ - $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor,'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor)); - } -#line 2344 "smarty_internal_templateparser.php" + function yy_r62(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); } +#line 2429 "smarty_internal_templateparser.php" +#line 314 "smarty_internal_templateparser.y" + function yy_r63(){ $this->_retvalue = array(); } +#line 2432 "smarty_internal_templateparser.php" +#line 317 "smarty_internal_templateparser.y" + function yy_r64(){ if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'true'); + } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'false'); + } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'null'); + } else + $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>"'".$this->yystack[$this->yyidx + 0]->minor."'"); } +#line 2442 "smarty_internal_templateparser.php" #line 325 "smarty_internal_templateparser.y" - function yy_r31(){ - $this->_retvalue = $this->compiler->compileTag('assign',array(array('value'=>$this->yystack[$this->yyidx + -1]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -3]->minor."'"))); - } -#line 2349 "smarty_internal_templateparser.php" -#line 333 "smarty_internal_templateparser.y" - function yy_r33(){ - $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -4]->minor."'")),$this->yystack[$this->yyidx + -1]->minor)); - } -#line 2354 "smarty_internal_templateparser.php" + function yy_r65(){ $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor); } +#line 2445 "smarty_internal_templateparser.php" +#line 327 "smarty_internal_templateparser.y" + function yy_r67(){ $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'"; } +#line 2448 "smarty_internal_templateparser.php" +#line 330 "smarty_internal_templateparser.y" + function yy_r70(){$this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor); } +#line 2451 "smarty_internal_templateparser.php" #line 337 "smarty_internal_templateparser.y" - function yy_r34(){ - $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>$this->yystack[$this->yyidx + -4]->minor['var'])),$this->yystack[$this->yyidx + -1]->minor),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -4]->minor['smarty_internal_index'])); - } -#line 2359 "smarty_internal_templateparser.php" -#line 342 "smarty_internal_templateparser.y" - function yy_r35(){ - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + -1]->minor); - } -#line 2364 "smarty_internal_templateparser.php" -#line 346 "smarty_internal_templateparser.y" - function yy_r36(){ - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,array()); - } -#line 2369 "smarty_internal_templateparser.php" -#line 351 "smarty_internal_templateparser.y" - function yy_r37(){ - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor)); - } -#line 2374 "smarty_internal_templateparser.php" -#line 356 "smarty_internal_templateparser.y" - function yy_r38(){ - $this->_retvalue = ''.$this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + -1]->minor).'_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>'; - } -#line 2380 "smarty_internal_templateparser.php" -#line 362 "smarty_internal_templateparser.y" - function yy_r39(){ - $this->_retvalue = ''.$this->compiler->compileTag($this->yystack[$this->yyidx + -5]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -3]->minor)).'_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>'; - } -#line 2386 "smarty_internal_templateparser.php" -#line 368 "smarty_internal_templateparser.y" - function yy_r40(){ - $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length)); - $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor)); - } -#line 2392 "smarty_internal_templateparser.php" -#line 373 "smarty_internal_templateparser.y" - function yy_r41(){ - $tag = trim(substr($this->yystack[$this->yyidx + -3]->minor,$this->lex->ldel_length)); - $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + -1]->minor,array('if condition'=>$this->yystack[$this->yyidx + -2]->minor)); - } -#line 2398 "smarty_internal_templateparser.php" -#line 378 "smarty_internal_templateparser.y" - function yy_r42(){ - $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length)); - $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor)); - } -#line 2404 "smarty_internal_templateparser.php" -#line 389 "smarty_internal_templateparser.y" - function yy_r44(){ - $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -10]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -7]->minor),array('var'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),1); - } -#line 2409 "smarty_internal_templateparser.php" -#line 393 "smarty_internal_templateparser.y" - function yy_r45(){ - $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2414 "smarty_internal_templateparser.php" -#line 401 "smarty_internal_templateparser.y" - function yy_r47(){ - $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -4]->minor),array('to'=>$this->yystack[$this->yyidx + -2]->minor))),0); - } -#line 2419 "smarty_internal_templateparser.php" -#line 405 "smarty_internal_templateparser.y" - function yy_r48(){ - $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('to'=>$this->yystack[$this->yyidx + -4]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),0); - } -#line 2424 "smarty_internal_templateparser.php" -#line 410 "smarty_internal_templateparser.y" - function yy_r49(){ - $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + -1]->minor); - } -#line 2429 "smarty_internal_templateparser.php" -#line 415 "smarty_internal_templateparser.y" - function yy_r50(){ - $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor)))); - } -#line 2434 "smarty_internal_templateparser.php" -#line 419 "smarty_internal_templateparser.y" - function yy_r51(){ - $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor)))); - } -#line 2439 "smarty_internal_templateparser.php" -#line 423 "smarty_internal_templateparser.y" - function yy_r52(){ - $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor)))); - } -#line 2444 "smarty_internal_templateparser.php" -#line 427 "smarty_internal_templateparser.y" - function yy_r53(){ - $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor)))); - } -#line 2449 "smarty_internal_templateparser.php" -#line 432 "smarty_internal_templateparser.y" - function yy_r54(){ - $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor)))); - } + function yy_r72(){ $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor; } #line 2454 "smarty_internal_templateparser.php" -#line 436 "smarty_internal_templateparser.y" - function yy_r55(){ - $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -3]->minor),$this->yystack[$this->yyidx + -2]->minor)),$this->yystack[$this->yyidx + -1]->minor))); - } -#line 2459 "smarty_internal_templateparser.php" -#line 441 "smarty_internal_templateparser.y" - function yy_r56(){ - $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler); - } -#line 2464 "smarty_internal_templateparser.php" -#line 447 "smarty_internal_templateparser.y" - function yy_r57(){ - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array()); - } +#line 339 "smarty_internal_templateparser.y" + function yy_r73(){ $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor); } +#line 2457 "smarty_internal_templateparser.php" +#line 341 "smarty_internal_templateparser.y" + function yy_r75(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; } +#line 2460 "smarty_internal_templateparser.php" +#line 352 "smarty_internal_templateparser.y" + function yy_r78(){$this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')'; } +#line 2463 "smarty_internal_templateparser.php" +#line 354 "smarty_internal_templateparser.y" + function yy_r79(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor; } +#line 2466 "smarty_internal_templateparser.php" +#line 360 "smarty_internal_templateparser.y" + function yy_r82(){$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } #line 2469 "smarty_internal_templateparser.php" -#line 451 "smarty_internal_templateparser.y" - function yy_r58(){ - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + -1]->minor)); - } -#line 2474 "smarty_internal_templateparser.php" -#line 456 "smarty_internal_templateparser.y" - function yy_r59(){ - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor)); - } -#line 2479 "smarty_internal_templateparser.php" -#line 460 "smarty_internal_templateparser.y" - function yy_r60(){ - $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + -1]->minor)); - } +#line 363 "smarty_internal_templateparser.y" + function yy_r83(){ $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor)); } +#line 2472 "smarty_internal_templateparser.php" +#line 367 "smarty_internal_templateparser.y" + function yy_r84(){$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; } +#line 2475 "smarty_internal_templateparser.php" +#line 368 "smarty_internal_templateparser.y" + function yy_r85(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')'; } +#line 2478 "smarty_internal_templateparser.php" +#line 369 "smarty_internal_templateparser.y" + function yy_r86(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')'; } +#line 2481 "smarty_internal_templateparser.php" +#line 371 "smarty_internal_templateparser.y" + function yy_r88(){$this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')'; } #line 2484 "smarty_internal_templateparser.php" -#line 468 "smarty_internal_templateparser.y" - function yy_r61(){ - $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; - $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor; - } +#line 372 "smarty_internal_templateparser.y" + function yy_r89(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')'; } +#line 2487 "smarty_internal_templateparser.php" +#line 373 "smarty_internal_templateparser.y" + function yy_r90(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')'; } #line 2490 "smarty_internal_templateparser.php" -#line 474 "smarty_internal_templateparser.y" - function yy_r62(){ - $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); - } -#line 2495 "smarty_internal_templateparser.php" -#line 479 "smarty_internal_templateparser.y" - function yy_r63(){ - $this->_retvalue = array(); - } -#line 2500 "smarty_internal_templateparser.php" -#line 484 "smarty_internal_templateparser.y" - function yy_r64(){ - if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'true'); - } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'false'); - } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'null'); - } else { - $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>"'".$this->yystack[$this->yyidx + 0]->minor."'"); - } - } -#line 2513 "smarty_internal_templateparser.php" -#line 496 "smarty_internal_templateparser.y" - function yy_r65(){ - $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor); - } -#line 2518 "smarty_internal_templateparser.php" -#line 504 "smarty_internal_templateparser.y" - function yy_r67(){ - $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'"; - } -#line 2523 "smarty_internal_templateparser.php" -#line 529 "smarty_internal_templateparser.y" - function yy_r72(){ - $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor; - $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor; - } -#line 2529 "smarty_internal_templateparser.php" -#line 534 "smarty_internal_templateparser.y" - function yy_r73(){ - $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor); - } -#line 2534 "smarty_internal_templateparser.php" -#line 562 "smarty_internal_templateparser.y" - function yy_r78(){ - $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')'; - } -#line 2539 "smarty_internal_templateparser.php" -#line 567 "smarty_internal_templateparser.y" - function yy_r79(){ - $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor; - } -#line 2544 "smarty_internal_templateparser.php" -#line 586 "smarty_internal_templateparser.y" - function yy_r83(){ - $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor)); - } +#line 374 "smarty_internal_templateparser.y" + function yy_r91(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')'; } +#line 2493 "smarty_internal_templateparser.php" +#line 375 "smarty_internal_templateparser.y" + function yy_r92(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')'; } +#line 2496 "smarty_internal_templateparser.php" +#line 376 "smarty_internal_templateparser.y" + function yy_r93(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')'; } +#line 2499 "smarty_internal_templateparser.php" +#line 382 "smarty_internal_templateparser.y" + function yy_r99(){$this->prefix_number++; $this->compiler->prefix_code[] = 'prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>'; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number; } +#line 2502 "smarty_internal_templateparser.php" +#line 388 "smarty_internal_templateparser.y" + function yy_r100(){ $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.' ? $_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'\')->value : '.$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable('$this->yystack[$this->yyidx + -2]->minor', null, true, false)->nocache; } +#line 2505 "smarty_internal_templateparser.php" +#line 389 "smarty_internal_templateparser.y" + function yy_r101(){ $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor; } +#line 2508 "smarty_internal_templateparser.php" +#line 396 "smarty_internal_templateparser.y" + function yy_r104(){ $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor; } +#line 2511 "smarty_internal_templateparser.php" +#line 402 "smarty_internal_templateparser.y" + function yy_r109(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor; } +#line 2514 "smarty_internal_templateparser.php" +#line 403 "smarty_internal_templateparser.y" + function yy_r110(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'; } +#line 2517 "smarty_internal_templateparser.php" +#line 404 "smarty_internal_templateparser.y" + function yy_r111(){ $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor; } +#line 2520 "smarty_internal_templateparser.php" +#line 406 "smarty_internal_templateparser.y" + function yy_r112(){ if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = 'true'; + } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = 'false'; + } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) { + $this->_retvalue = 'null'; + } else + $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'"; } +#line 2530 "smarty_internal_templateparser.php" +#line 417 "smarty_internal_templateparser.y" + function yy_r114(){ $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")"; } +#line 2533 "smarty_internal_templateparser.php" +#line 423 "smarty_internal_templateparser.y" + function yy_r117(){if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->minor, $this->compiler)) { + if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) { + $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor; + } else { + $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor; + } + } else { + $this->compiler->trigger_template_error ("static class '".$this->yystack[$this->yyidx + -2]->minor."' is undefined or not allowed by security setting"); + } + } +#line 2545 "smarty_internal_templateparser.php" +#line 433 "smarty_internal_templateparser.y" + function yy_r118(){ if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') { $this->_retvalue = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).'::'.$this->yystack[$this->yyidx + 0]->minor;} else { + $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].'::'.$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor['var'],"'"), null, true, false)->nocache;} } #line 2549 "smarty_internal_templateparser.php" -#line 592 "smarty_internal_templateparser.y" - function yy_r84(){ - $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2554 "smarty_internal_templateparser.php" -#line 596 "smarty_internal_templateparser.y" - function yy_r85(){ - $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')'; - } -#line 2559 "smarty_internal_templateparser.php" -#line 600 "smarty_internal_templateparser.y" - function yy_r86(){ - $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')'; - } -#line 2564 "smarty_internal_templateparser.php" -#line 608 "smarty_internal_templateparser.y" - function yy_r88(){ - $this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')'; - } +#line 436 "smarty_internal_templateparser.y" + function yy_r119(){ $this->prefix_number++; $this->compiler->prefix_code[] = ''.$this->yystack[$this->yyidx + 0]->minor.'prefix_number.'=ob_get_clean();?>'; $this->_retvalue = '$_tmp'.$this->prefix_number; } +#line 2552 "smarty_internal_templateparser.php" +#line 446 "smarty_internal_templateparser.y" + function yy_r121(){if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') { + $smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']); + $this->_retvalue = $smarty_var; + } else { + // used for array reset,next,prev,end,current + $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var']; + $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']; + if (isset($this->compiler->local_var[$this->yystack[$this->yyidx + 0]->minor['var']])) { + $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + 0]->minor['var'] .']->value'.$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']; + } else { + $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + 0]->minor['var'] .')->value'.$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']; + } + $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor['var'],"'"), null, true, false)->nocache; + } + } #line 2569 "smarty_internal_templateparser.php" -#line 612 "smarty_internal_templateparser.y" - function yy_r89(){ - $this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')'; - } -#line 2574 "smarty_internal_templateparser.php" -#line 616 "smarty_internal_templateparser.y" - function yy_r90(){ - $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')'; - } -#line 2579 "smarty_internal_templateparser.php" -#line 620 "smarty_internal_templateparser.y" - function yy_r91(){ - $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')'; - } -#line 2584 "smarty_internal_templateparser.php" -#line 624 "smarty_internal_templateparser.y" - function yy_r92(){ - $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')'; - } +#line 462 "smarty_internal_templateparser.y" + function yy_r122(){if (isset($this->compiler->local_var[$this->yystack[$this->yyidx + -2]->minor])) { + $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor; + } else { + $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor; + } + $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"), null, true, false)->nocache; } +#line 2577 "smarty_internal_templateparser.php" +#line 471 "smarty_internal_templateparser.y" + function yy_r124(){$this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')'; } +#line 2580 "smarty_internal_templateparser.php" +#line 472 "smarty_internal_templateparser.y" + function yy_r125(){$this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')'; } +#line 2583 "smarty_internal_templateparser.php" +#line 475 "smarty_internal_templateparser.y" + function yy_r126(){$this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor); } +#line 2586 "smarty_internal_templateparser.php" +#line 481 "smarty_internal_templateparser.y" + function yy_r127(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; } #line 2589 "smarty_internal_templateparser.php" -#line 628 "smarty_internal_templateparser.y" - function yy_r93(){ - $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')'; - } -#line 2594 "smarty_internal_templateparser.php" -#line 652 "smarty_internal_templateparser.y" - function yy_r99(){ - $this->prefix_number++; - $this->compiler->prefix_code[] = 'prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>'; - $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number; - } +#line 483 "smarty_internal_templateparser.y" + function yy_r128(){return; } +#line 2592 "smarty_internal_templateparser.php" +#line 487 "smarty_internal_templateparser.y" + function yy_r129(){ $this->_retvalue = '[$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + 0]->minor .')->value]'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable('$this->yystack[$this->yyidx + 0]->minor', null, true, false)->nocache; } +#line 2595 "smarty_internal_templateparser.php" +#line 488 "smarty_internal_templateparser.y" + function yy_r130(){ $this->_retvalue = '[$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor.']'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"), null, true, false)->nocache; } +#line 2598 "smarty_internal_templateparser.php" +#line 489 "smarty_internal_templateparser.y" + function yy_r131(){ $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']"; } #line 2601 "smarty_internal_templateparser.php" -#line 661 "smarty_internal_templateparser.y" - function yy_r100(){ - $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.' ? '. $this->compileVariable("'".$this->yystack[$this->yyidx + -2]->minor."'") . ' : '.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2606 "smarty_internal_templateparser.php" -#line 665 "smarty_internal_templateparser.y" - function yy_r101(){ - $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2611 "smarty_internal_templateparser.php" -#line 680 "smarty_internal_templateparser.y" - function yy_r104(){ - $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor; - } +#line 490 "smarty_internal_templateparser.y" + function yy_r132(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]"; } +#line 2604 "smarty_internal_templateparser.php" +#line 491 "smarty_internal_templateparser.y" + function yy_r133(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]"; } +#line 2607 "smarty_internal_templateparser.php" +#line 493 "smarty_internal_templateparser.y" + function yy_r134(){ $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']'; } +#line 2610 "smarty_internal_templateparser.php" +#line 494 "smarty_internal_templateparser.y" + function yy_r135(){ $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']'; } +#line 2613 "smarty_internal_templateparser.php" +#line 498 "smarty_internal_templateparser.y" + function yy_r137(){$this->_retvalue = '[]'; } #line 2616 "smarty_internal_templateparser.php" -#line 701 "smarty_internal_templateparser.y" - function yy_r109(){ - $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2621 "smarty_internal_templateparser.php" -#line 705 "smarty_internal_templateparser.y" - function yy_r110(){ - $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'; - } -#line 2626 "smarty_internal_templateparser.php" -#line 709 "smarty_internal_templateparser.y" - function yy_r111(){ - $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2631 "smarty_internal_templateparser.php" -#line 714 "smarty_internal_templateparser.y" - function yy_r112(){ - if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = 'true'; - } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = 'false'; - } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) { - $this->_retvalue = 'null'; - } else { - $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'"; - } - } -#line 2644 "smarty_internal_templateparser.php" -#line 732 "smarty_internal_templateparser.y" - function yy_r114(){ - $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")"; - } +#line 506 "smarty_internal_templateparser.y" + function yy_r139(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor; } +#line 2619 "smarty_internal_templateparser.php" +#line 508 "smarty_internal_templateparser.y" + function yy_r140(){$this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\''; } +#line 2622 "smarty_internal_templateparser.php" +#line 510 "smarty_internal_templateparser.y" + function yy_r141(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')'; } +#line 2625 "smarty_internal_templateparser.php" +#line 515 "smarty_internal_templateparser.y" + function yy_r142(){ if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') { $this->_retvalue = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;} else { + $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -1]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -1]->minor['var'],"'"), null, true, false)->nocache;} } +#line 2629 "smarty_internal_templateparser.php" +#line 518 "smarty_internal_templateparser.y" + function yy_r143(){$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; } +#line 2632 "smarty_internal_templateparser.php" +#line 520 "smarty_internal_templateparser.y" + function yy_r144(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; } +#line 2635 "smarty_internal_templateparser.php" +#line 522 "smarty_internal_templateparser.y" + function yy_r145(){if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) == '_') { + $this->compiler->trigger_template_error (self::Err1); + } + $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; + } +#line 2642 "smarty_internal_templateparser.php" +#line 527 "smarty_internal_templateparser.y" + function yy_r146(){if ($this->security) { + $this->compiler->trigger_template_error (self::Err2); + } + $this->_retvalue = '->{$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -1]->minor .')->value'.$this->yystack[$this->yyidx + 0]->minor.'}'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -1]->minor,"'"), null, true, false)->nocache; + } #line 2649 "smarty_internal_templateparser.php" -#line 747 "smarty_internal_templateparser.y" - function yy_r117(){ - if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->minor, $this->compiler)) { - if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) { - $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor; - } else { - $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor; - } - } else { - $this->compiler->trigger_template_error ("static class '".$this->yystack[$this->yyidx + -2]->minor."' is undefined or not allowed by security setting"); - } - } -#line 2662 "smarty_internal_templateparser.php" -#line 759 "smarty_internal_templateparser.y" - function yy_r118(){ - if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') { - $this->_retvalue = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).'::'.$this->yystack[$this->yyidx + 0]->minor; - } else { - $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].'::'.$this->yystack[$this->yyidx + 0]->minor; - } - } -#line 2671 "smarty_internal_templateparser.php" -#line 768 "smarty_internal_templateparser.y" - function yy_r119(){ - $this->prefix_number++; - $this->compiler->prefix_code[] = ''.$this->yystack[$this->yyidx + 0]->minor.'prefix_number.'=ob_get_clean();?>'; - $this->_retvalue = '$_tmp'.$this->prefix_number; - } -#line 2678 "smarty_internal_templateparser.php" -#line 783 "smarty_internal_templateparser.y" - function yy_r121(){ - if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') { - $smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']); - $this->_retvalue = $smarty_var; - } else { - // used for array reset,next,prev,end,current - $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var']; - $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']; - $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']; - } - } -#line 2691 "smarty_internal_templateparser.php" -#line 796 "smarty_internal_templateparser.y" - function yy_r122(){ - $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2696 "smarty_internal_templateparser.php" -#line 806 "smarty_internal_templateparser.y" - function yy_r124(){ - $this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')'; - } +#line 532 "smarty_internal_templateparser.y" + function yy_r147(){if ($this->security) { + $this->compiler->trigger_template_error (self::Err2); + } + $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}'; + } +#line 2656 "smarty_internal_templateparser.php" +#line 537 "smarty_internal_templateparser.y" + function yy_r148(){if ($this->security) { + $this->compiler->trigger_template_error (self::Err2); + } + $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}'; + } +#line 2663 "smarty_internal_templateparser.php" +#line 543 "smarty_internal_templateparser.y" + function yy_r149(){ $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor; } +#line 2666 "smarty_internal_templateparser.php" +#line 549 "smarty_internal_templateparser.y" + function yy_r150(){if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) { + if (strcasecmp($this->yystack[$this->yyidx + -3]->minor,'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'array') === 0 || is_callable($this->yystack[$this->yyidx + -3]->minor)) { + $func_name = strtolower($this->yystack[$this->yyidx + -3]->minor); + if ($func_name == 'isset') { + if (count($this->yystack[$this->yyidx + -1]->minor) == 0) { + $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"'); + } + $isset_par=str_replace("')->value","',null,true,false)->value",implode(',',$this->yystack[$this->yyidx + -1]->minor)); + $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $isset_par .")"; + } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){ + if (count($this->yystack[$this->yyidx + -1]->minor) != 1) { + $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"'); + } + if ($func_name == 'empty') { + $this->_retvalue = $func_name.'('.str_replace("')->value","',null,true,false)->value",$this->yystack[$this->yyidx + -1]->minor[0]).')'; + } else { + $this->_retvalue = $func_name.'('.$this->yystack[$this->yyidx + -1]->minor[0].')'; + } + } else { + $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")"; + } + } else { + $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\""); + } + } + } +#line 2694 "smarty_internal_templateparser.php" +#line 579 "smarty_internal_templateparser.y" + function yy_r151(){if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) == '_') { + $this->compiler->trigger_template_error (self::Err1); + } + $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")"; + } #line 2701 "smarty_internal_templateparser.php" -#line 810 "smarty_internal_templateparser.y" - function yy_r125(){ - $this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')'; - } -#line 2706 "smarty_internal_templateparser.php" -#line 814 "smarty_internal_templateparser.y" - function yy_r126(){ - $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor); - } +#line 584 "smarty_internal_templateparser.y" + function yy_r152(){if ($this->security) { + $this->compiler->trigger_template_error (self::Err2); + } + $this->prefix_number++; $this->compiler->prefix_code[] = 'prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -3]->minor .'\')->value;?>'; $this->_retvalue = '$_tmp'.$this->prefix_number.'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')'; + } +#line 2708 "smarty_internal_templateparser.php" +#line 592 "smarty_internal_templateparser.y" + function yy_r153(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor)); } #line 2711 "smarty_internal_templateparser.php" -#line 827 "smarty_internal_templateparser.y" - function yy_r128(){ - return; - } -#line 2716 "smarty_internal_templateparser.php" -#line 833 "smarty_internal_templateparser.y" - function yy_r129(){ - $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + 0]->minor).']'; - } -#line 2721 "smarty_internal_templateparser.php" -#line 837 "smarty_internal_templateparser.y" - function yy_r130(){ - $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']'; - } +#line 601 "smarty_internal_templateparser.y" + function yy_r156(){$this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor))); } +#line 2714 "smarty_internal_templateparser.php" +#line 602 "smarty_internal_templateparser.y" + function yy_r157(){$this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)); } +#line 2717 "smarty_internal_templateparser.php" +#line 605 "smarty_internal_templateparser.y" + function yy_r159(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); } +#line 2720 "smarty_internal_templateparser.php" +#line 610 "smarty_internal_templateparser.y" + function yy_r160(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor); } +#line 2723 "smarty_internal_templateparser.php" +#line 612 "smarty_internal_templateparser.y" + function yy_r161(){$this->_retvalue = array(); } #line 2726 "smarty_internal_templateparser.php" -#line 841 "smarty_internal_templateparser.y" - function yy_r131(){ - $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']"; - } -#line 2731 "smarty_internal_templateparser.php" -#line 845 "smarty_internal_templateparser.y" - function yy_r132(){ - $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]"; - } -#line 2736 "smarty_internal_templateparser.php" -#line 849 "smarty_internal_templateparser.y" - function yy_r133(){ - $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]"; - } +#line 614 "smarty_internal_templateparser.y" + function yy_r162(){$this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); } +#line 2729 "smarty_internal_templateparser.php" +#line 624 "smarty_internal_templateparser.y" + function yy_r167(){ $this->_retvalue = '$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; } +#line 2732 "smarty_internal_templateparser.php" +#line 626 "smarty_internal_templateparser.y" + function yy_r168(){ $this->_retvalue = '$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; } +#line 2735 "smarty_internal_templateparser.php" +#line 635 "smarty_internal_templateparser.y" + function yy_r169(){$this->_retvalue = '=='; } +#line 2738 "smarty_internal_templateparser.php" +#line 636 "smarty_internal_templateparser.y" + function yy_r170(){$this->_retvalue = '!='; } #line 2741 "smarty_internal_templateparser.php" -#line 854 "smarty_internal_templateparser.y" - function yy_r134(){ - $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']'; - } -#line 2746 "smarty_internal_templateparser.php" -#line 858 "smarty_internal_templateparser.y" - function yy_r135(){ - $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']'; - } -#line 2751 "smarty_internal_templateparser.php" -#line 868 "smarty_internal_templateparser.y" - function yy_r137(){ - $this->_retvalue = '[]'; - } +#line 637 "smarty_internal_templateparser.y" + function yy_r171(){$this->_retvalue = '>'; } +#line 2744 "smarty_internal_templateparser.php" +#line 638 "smarty_internal_templateparser.y" + function yy_r172(){$this->_retvalue = '<'; } +#line 2747 "smarty_internal_templateparser.php" +#line 639 "smarty_internal_templateparser.y" + function yy_r173(){$this->_retvalue = '>='; } +#line 2750 "smarty_internal_templateparser.php" +#line 640 "smarty_internal_templateparser.y" + function yy_r174(){$this->_retvalue = '<='; } +#line 2753 "smarty_internal_templateparser.php" +#line 641 "smarty_internal_templateparser.y" + function yy_r175(){$this->_retvalue = '==='; } #line 2756 "smarty_internal_templateparser.php" -#line 881 "smarty_internal_templateparser.y" - function yy_r139(){ - $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2761 "smarty_internal_templateparser.php" -#line 886 "smarty_internal_templateparser.y" - function yy_r140(){ - $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\''; - } -#line 2766 "smarty_internal_templateparser.php" -#line 891 "smarty_internal_templateparser.y" - function yy_r141(){ - $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')'; - } +#line 642 "smarty_internal_templateparser.y" + function yy_r176(){$this->_retvalue = '!=='; } +#line 2759 "smarty_internal_templateparser.php" +#line 643 "smarty_internal_templateparser.y" + function yy_r177(){$this->_retvalue = '%'; } +#line 2762 "smarty_internal_templateparser.php" +#line 645 "smarty_internal_templateparser.y" + function yy_r178(){$this->_retvalue = '&&'; } +#line 2765 "smarty_internal_templateparser.php" +#line 646 "smarty_internal_templateparser.y" + function yy_r179(){$this->_retvalue = '||'; } +#line 2768 "smarty_internal_templateparser.php" +#line 647 "smarty_internal_templateparser.y" + function yy_r180(){$this->_retvalue = ' XOR '; } #line 2771 "smarty_internal_templateparser.php" -#line 898 "smarty_internal_templateparser.y" - function yy_r142(){ - if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') { - $this->_retvalue = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor; - } else { - $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor; - } - } +#line 652 "smarty_internal_templateparser.y" + function yy_r181(){ $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')'; } +#line 2774 "smarty_internal_templateparser.php" +#line 654 "smarty_internal_templateparser.y" + function yy_r183(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor; } +#line 2777 "smarty_internal_templateparser.php" +#line 655 "smarty_internal_templateparser.y" + function yy_r184(){ return; } #line 2780 "smarty_internal_templateparser.php" -#line 907 "smarty_internal_templateparser.y" - function yy_r143(){ - $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor; - } -#line 2785 "smarty_internal_templateparser.php" -#line 912 "smarty_internal_templateparser.y" - function yy_r144(){ - $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2790 "smarty_internal_templateparser.php" -#line 917 "smarty_internal_templateparser.y" - function yy_r145(){ - if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) == '_') { - $this->compiler->trigger_template_error (self::Err1); - } - $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; - } +#line 656 "smarty_internal_templateparser.y" + function yy_r185(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor; } +#line 2783 "smarty_internal_templateparser.php" +#line 657 "smarty_internal_templateparser.y" + function yy_r186(){ $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor; } +#line 2786 "smarty_internal_templateparser.php" +#line 664 "smarty_internal_templateparser.y" + function yy_r188(){ $this->_retvalue = "''"; } +#line 2789 "smarty_internal_templateparser.php" +#line 665 "smarty_internal_templateparser.y" + function yy_r189(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php(); } +#line 2792 "smarty_internal_templateparser.php" +#line 667 "smarty_internal_templateparser.y" + function yy_r190(){ $this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; } +#line 2795 "smarty_internal_templateparser.php" +#line 668 "smarty_internal_templateparser.y" + function yy_r191(){ $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor); } #line 2798 "smarty_internal_templateparser.php" -#line 924 "smarty_internal_templateparser.y" - function yy_r146(){ - if ($this->security) { - $this->compiler->trigger_template_error (self::Err2); - } - $this->_retvalue = '->{'.$this->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}'; - } -#line 2806 "smarty_internal_templateparser.php" -#line 931 "smarty_internal_templateparser.y" - function yy_r147(){ - if ($this->security) { - $this->compiler->trigger_template_error (self::Err2); - } - $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}'; - } -#line 2814 "smarty_internal_templateparser.php" -#line 938 "smarty_internal_templateparser.y" - function yy_r148(){ - if ($this->security) { - $this->compiler->trigger_template_error (self::Err2); - } - $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}'; - } -#line 2822 "smarty_internal_templateparser.php" -#line 946 "smarty_internal_templateparser.y" - function yy_r149(){ - $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2827 "smarty_internal_templateparser.php" -#line 954 "smarty_internal_templateparser.y" - function yy_r150(){ - if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) { - if (strcasecmp($this->yystack[$this->yyidx + -3]->minor,'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'array') === 0 || is_callable($this->yystack[$this->yyidx + -3]->minor)) { - $func_name = strtolower($this->yystack[$this->yyidx + -3]->minor); - if ($func_name == 'isset') { - if (count($this->yystack[$this->yyidx + -1]->minor) == 0) { - $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"'); - } - $par = implode(',',$this->yystack[$this->yyidx + -1]->minor); - if (strncasecmp($par,'$_smarty_tpl->getConfigVariable',strlen('$_smarty_tpl->getConfigVariable')) === 0) { - $this->prefix_number++; - $this->compiler->prefix_code[] = 'prefix_number.'='.str_replace(')',', false)',$par).';?>'; - $isset_par = '$_tmp'.$this->prefix_number; - } else { - $isset_par=str_replace("')->value","',null,true,false)->value",$par); - } - $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $isset_par .")"; - } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){ - if (count($this->yystack[$this->yyidx + -1]->minor) != 1) { - $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"'); - } - if ($func_name == 'empty') { - $this->_retvalue = $func_name.'('.str_replace("')->value","',null,true,false)->value",$this->yystack[$this->yyidx + -1]->minor[0]).')'; - } else { - $this->_retvalue = $func_name.'('.$this->yystack[$this->yyidx + -1]->minor[0].')'; - } - } else { - $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")"; - } - } else { - $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\""); - } - } - } -#line 2863 "smarty_internal_templateparser.php" -#line 992 "smarty_internal_templateparser.y" - function yy_r151(){ - if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) == '_') { - $this->compiler->trigger_template_error (self::Err1); - } - $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")"; - } -#line 2871 "smarty_internal_templateparser.php" -#line 999 "smarty_internal_templateparser.y" - function yy_r152(){ - if ($this->security) { - $this->compiler->trigger_template_error (self::Err2); - } - $this->prefix_number++; - $this->compiler->prefix_code[] = 'prefix_number.'='.$this->compileVariable("'".$this->yystack[$this->yyidx + -3]->minor."'").';?>'; - $this->_retvalue = '$_tmp'.$this->prefix_number.'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')'; - } -#line 2881 "smarty_internal_templateparser.php" -#line 1010 "smarty_internal_templateparser.y" - function yy_r153(){ - $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor)); - } -#line 2886 "smarty_internal_templateparser.php" -#line 1027 "smarty_internal_templateparser.y" - function yy_r156(){ - $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor))); - } -#line 2891 "smarty_internal_templateparser.php" -#line 1031 "smarty_internal_templateparser.y" - function yy_r157(){ - $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)); - } -#line 2896 "smarty_internal_templateparser.php" -#line 1039 "smarty_internal_templateparser.y" - function yy_r159(){ - $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor); - } -#line 2901 "smarty_internal_templateparser.php" -#line 1047 "smarty_internal_templateparser.y" - function yy_r160(){ - $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor); - } -#line 2906 "smarty_internal_templateparser.php" -#line 1081 "smarty_internal_templateparser.y" - function yy_r167(){ - $this->_retvalue = '$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2911 "smarty_internal_templateparser.php" -#line 1086 "smarty_internal_templateparser.y" - function yy_r168(){ - $this->_retvalue = '$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2916 "smarty_internal_templateparser.php" -#line 1092 "smarty_internal_templateparser.y" - function yy_r169(){ - $this->_retvalue = '=='; - } -#line 2921 "smarty_internal_templateparser.php" -#line 1096 "smarty_internal_templateparser.y" - function yy_r170(){ - $this->_retvalue = '!='; - } -#line 2926 "smarty_internal_templateparser.php" -#line 1100 "smarty_internal_templateparser.y" - function yy_r171(){ - $this->_retvalue = '>'; - } -#line 2931 "smarty_internal_templateparser.php" -#line 1104 "smarty_internal_templateparser.y" - function yy_r172(){ - $this->_retvalue = '<'; - } -#line 2936 "smarty_internal_templateparser.php" -#line 1108 "smarty_internal_templateparser.y" - function yy_r173(){ - $this->_retvalue = '>='; - } -#line 2941 "smarty_internal_templateparser.php" -#line 1112 "smarty_internal_templateparser.y" - function yy_r174(){ - $this->_retvalue = '<='; - } -#line 2946 "smarty_internal_templateparser.php" -#line 1116 "smarty_internal_templateparser.y" - function yy_r175(){ - $this->_retvalue = '==='; - } -#line 2951 "smarty_internal_templateparser.php" -#line 1120 "smarty_internal_templateparser.y" - function yy_r176(){ - $this->_retvalue = '!=='; - } -#line 2956 "smarty_internal_templateparser.php" -#line 1124 "smarty_internal_templateparser.y" - function yy_r177(){ - $this->_retvalue = '%'; - } -#line 2961 "smarty_internal_templateparser.php" -#line 1128 "smarty_internal_templateparser.y" - function yy_r178(){ - $this->_retvalue = '&&'; - } -#line 2966 "smarty_internal_templateparser.php" -#line 1132 "smarty_internal_templateparser.y" - function yy_r179(){ - $this->_retvalue = '||'; - } -#line 2971 "smarty_internal_templateparser.php" -#line 1136 "smarty_internal_templateparser.y" - function yy_r180(){ - $this->_retvalue = ' XOR '; - } -#line 2976 "smarty_internal_templateparser.php" -#line 1143 "smarty_internal_templateparser.y" - function yy_r181(){ - $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')'; - } -#line 2981 "smarty_internal_templateparser.php" -#line 1151 "smarty_internal_templateparser.y" - function yy_r183(){ - $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2986 "smarty_internal_templateparser.php" -#line 1159 "smarty_internal_templateparser.y" - function yy_r185(){ - $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2991 "smarty_internal_templateparser.php" -#line 1163 "smarty_internal_templateparser.y" - function yy_r186(){ - $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor; - } -#line 2996 "smarty_internal_templateparser.php" -#line 1175 "smarty_internal_templateparser.y" - function yy_r188(){ - $this->_retvalue = "''"; - } -#line 3001 "smarty_internal_templateparser.php" -#line 1179 "smarty_internal_templateparser.y" - function yy_r189(){ - $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php(); - } -#line 3006 "smarty_internal_templateparser.php" -#line 1184 "smarty_internal_templateparser.y" - function yy_r190(){ - $this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor); - $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor; - } -#line 3012 "smarty_internal_templateparser.php" -#line 1189 "smarty_internal_templateparser.y" - function yy_r191(){ - $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor); - } -#line 3017 "smarty_internal_templateparser.php" -#line 1193 "smarty_internal_templateparser.y" - function yy_r192(){ - $this->_retvalue = new _smarty_code($this, $this->yystack[$this->yyidx + -1]->minor); - } -#line 3022 "smarty_internal_templateparser.php" -#line 1201 "smarty_internal_templateparser.y" - function yy_r194(){ - $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value'); - } -#line 3027 "smarty_internal_templateparser.php" -#line 1209 "smarty_internal_templateparser.y" - function yy_r196(){ - $this->_retvalue = new _smarty_code($this, '('.$this->yystack[$this->yyidx + -1]->minor.')'); - } -#line 3032 "smarty_internal_templateparser.php" -#line 1213 "smarty_internal_templateparser.y" +#line 670 "smarty_internal_templateparser.y" + function yy_r192(){ $this->_retvalue = new _smarty_code($this, $this->yystack[$this->yyidx + -1]->minor); } +#line 2801 "smarty_internal_templateparser.php" +#line 672 "smarty_internal_templateparser.y" + function yy_r194(){if (isset($this->compiler->local_var["'".substr($this->yystack[$this->yyidx + 0]->minor,1)."'"])) { + $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value'); + } else { + $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->getVariable(\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\')->value'); + } + $this->compiler->tag_nocache = $this->compiler->tag_nocache | $this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor,"'"), null, true, false)->nocache; + } +#line 2810 "smarty_internal_templateparser.php" +#line 680 "smarty_internal_templateparser.y" + function yy_r196(){ $this->_retvalue = new _smarty_code($this, '('.$this->yystack[$this->yyidx + -1]->minor.')'); } +#line 2813 "smarty_internal_templateparser.php" +#line 681 "smarty_internal_templateparser.y" function yy_r197(){ - $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor); - } -#line 3037 "smarty_internal_templateparser.php" -#line 1217 "smarty_internal_templateparser.y" - function yy_r198(){ - $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor); - } -#line 3042 "smarty_internal_templateparser.php" + $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor); + } +#line 2818 "smarty_internal_templateparser.php" +#line 684 "smarty_internal_templateparser.y" + function yy_r198(){ $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor); } +#line 2821 "smarty_internal_templateparser.php" +#line 691 "smarty_internal_templateparser.y" + function yy_r200(){$this->_retvalue = ''; } +#line 2824 "smarty_internal_templateparser.php" private $_retvalue; @@ -3100,12 +2882,12 @@ static public $yy_action = array( function yy_syntax_error($yymajor, $TOKEN) { -#line 76 "smarty_internal_templateparser.y" +#line 66 "smarty_internal_templateparser.y" $this->internalError = true; $this->yymajor = $yymajor; $this->compiler->trigger_template_error(); -#line 3105 "smarty_internal_templateparser.php" +#line 2887 "smarty_internal_templateparser.php" } function yy_accept() @@ -3116,13 +2898,13 @@ static public $yy_action = array( while ($this->yyidx >= 0) { $stack = $this->yy_pop_parser_stack(); } -#line 68 "smarty_internal_templateparser.y" +#line 58 "smarty_internal_templateparser.y" $this->successful = !$this->internalError; $this->internalError = false; $this->retvalue = $this->_retvalue; //echo $this->retvalue."\n\n"; -#line 3123 "smarty_internal_templateparser.php" +#line 2905 "smarty_internal_templateparser.php" } function doParse($yymajor, $yytokenvalue) diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_utility.php b/gosa-core/include/smarty/sysplugins/smarty_internal_utility.php index 2c184cd35..57046bcaf 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_utility.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_utility.php @@ -1,4 +1,5 @@ smarty = $smarty; } /** * Compile all template files * - * @param string $extension template file name extension - * @param bool $force_compile force all to recompile - * @param int $time_limit set maximum execution time - * @param int $max_errors set maximum allowed errors - * @param Smarty $smarty Smarty instance - * @return integer number of template files compiled + * @param string $extension file extension + * @param bool $force_compile force all to recompile + * @param int $time_limit + * @param int $max_errors + * @return integer number of template files recompiled */ - public static function compileAllTemplates($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty) + function compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null) { // switch off time limit if (function_exists('set_time_limit')) { @set_time_limit($time_limit); } - $smarty->force_compile = $force_compile; + $this->smarty->force_compile = $force_compile; $_count = 0; $_error_count = 0; // loop over array of template directories - foreach($smarty->getTemplateDir() as $_dir) { + foreach((array)$this->smarty->template_dir as $_dir) { + if (strpos('/\\', substr($_dir, -1)) === false) { + $_dir .= DS; + } $_compileDirs = new RecursiveDirectoryIterator($_dir); $_compile = new RecursiveIteratorIterator($_compileDirs); foreach ($_compile as $_fileinfo) { - if (substr($_fileinfo->getBasename(),0,1) == '.' || strpos($_fileinfo, '.svn') !== false) continue; + if (substr($_fileinfo->getBasename(),0,1) == '.') continue; $_file = $_fileinfo->getFilename(); if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue; if ($_fileinfo->getPath() == substr($_dir, 0, -1)) { @@ -84,7 +78,7 @@ class Smarty_Internal_Utility { flush(); $_start_time = microtime(true); try { - $_tpl = $smarty->createTemplate($_template_file,null,null,null,false); + $_tpl = $this->smarty->createTemplate($_template_file,null,null,null,false); if ($_tpl->mustCompile()) { $_tpl->compileTemplateSource(); echo ' compiled in ', microtime(true) - $_start_time, ' seconds'; @@ -98,8 +92,8 @@ class Smarty_Internal_Utility { echo 'Error: ', $e->getMessage(), "

"; $_error_count++; } - // free memory - $smarty->template_objects = array(); + // free memory + $this->smarty->template_objects = array(); $_tpl->smarty->template_objects = array(); $_tpl = null; if ($max_errors !== null && $_error_count == $max_errors) { @@ -114,28 +108,30 @@ class Smarty_Internal_Utility { /** * Compile all config files * - * @param string $extension config file name extension - * @param bool $force_compile force all to recompile - * @param int $time_limit set maximum execution time - * @param int $max_errors set maximum allowed errors - * @param Smarty $smarty Smarty instance - * @return integer number of config files compiled + * @param string $extension file extension + * @param bool $force_compile force all to recompile + * @param int $time_limit + * @param int $max_errors + * @return integer number of template files recompiled */ - public static function compileAllConfig($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty) + function compileAllConfig($extention = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null) { // switch off time limit if (function_exists('set_time_limit')) { @set_time_limit($time_limit); } - $smarty->force_compile = $force_compile; + $this->smarty->force_compile = $force_compile; $_count = 0; $_error_count = 0; // loop over array of template directories - foreach($smarty->getConfigDir() as $_dir) { + foreach((array)$this->smarty->config_dir as $_dir) { + if (strpos('/\\', substr($_dir, -1)) === false) { + $_dir .= DS; + } $_compileDirs = new RecursiveDirectoryIterator($_dir); $_compile = new RecursiveIteratorIterator($_compileDirs); foreach ($_compile as $_fileinfo) { - if (substr($_fileinfo->getBasename(),0,1) == '.' || strpos($_fileinfo, '.svn') !== false) continue; + if (substr($_fileinfo->getBasename(),0,1) == '.') continue; $_file = $_fileinfo->getFilename(); if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue; if ($_fileinfo->getPath() == substr($_dir, 0, -1)) { @@ -147,7 +143,7 @@ class Smarty_Internal_Utility { flush(); $_start_time = microtime(true); try { - $_config = new Smarty_Internal_Config($_config_file, $smarty); + $_config = new Smarty_Internal_Config($_config_file, $this->smarty); if ($_config->mustCompile()) { $_config->compileConfigSource(); echo ' compiled in ', microtime(true) - $_start_time, ' seconds'; @@ -173,626 +169,132 @@ class Smarty_Internal_Utility { /** * Delete compiled template file * - * @param string $resource_name template name - * @param string $compile_id compile id - * @param integer $exp_time expiration time - * @param Smarty $smarty Smarty instance + * @param string $resource_name template name + * @param string $compile_id compile id + * @param integer $exp_time expiration time * @return integer number of template files deleted */ - public static function clearCompiledTemplate($resource_name, $compile_id, $exp_time, Smarty $smarty) + function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) { - $_compile_dir = $smarty->getCompileDir(); $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null; - $_dir_sep = $smarty->use_sub_dirs ? DS : '^'; + $_dir_sep = $this->smarty->use_sub_dirs ? DS : '^'; if (isset($resource_name)) { - $_save_stat = $smarty->caching; - $smarty->caching = false; - $tpl = new $smarty->template_class($resource_name, $smarty); - $smarty->caching = $_save_stat; - - // remove from template cache - $tpl->source; // have the template registered before unset() - $_templateId = sha1($tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id); - unset($smarty->template_objects[$_templateId]); - - if ($tpl->source->exists) { - $_resource_part_1 = basename(str_replace('^', '/', $tpl->compiled->filepath)); - $_resource_part_1_length = strlen($_resource_part_1); - } else { - return 0; - } - - $_resource_part_2 = str_replace('.php','.cache.php',$_resource_part_1); - $_resource_part_2_length = strlen($_resource_part_2); + $_resource_part_1 = $resource_name . '.php'; + $_resource_part_2 = $resource_name . '.cache' . '.php'; } else { $_resource_part = ''; } - $_dir = $_compile_dir; - if ($smarty->use_sub_dirs && isset($_compile_id)) { + $_dir = $this->smarty->compile_dir; + if ($this->smarty->use_sub_dirs && isset($_compile_id)) { $_dir .= $_compile_id . $_dir_sep; } if (isset($_compile_id)) { - $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep; - $_compile_id_part_length = strlen($_compile_id_part); + $_compile_id_part = $this->smarty->compile_dir . $_compile_id . $_dir_sep; } $_count = 0; $_compileDirs = new RecursiveDirectoryIterator($_dir); $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST); foreach ($_compile as $_file) { - if (substr($_file->getBasename(), 0, 1) == '.' || strpos($_file, '.svn') !== false) - continue; - - $_filepath = (string) $_file; - + if (substr($_file->getBasename(),0,1) == '.') continue; if ($_file->isDir()) { if (!$_compile->isDot()) { // delete folder if empty @rmdir($_file->getPathname()); } } else { - $unlink = false; - if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) && !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) - && (!isset($resource_name) - || (isset($_filepath[$_resource_part_1_length]) - && substr_compare($_filepath, $_resource_part_1, -$_resource_part_1_length, $_resource_part_1_length) == 0) - || (isset($_filepath[$_resource_part_2_length]) - && substr_compare($_filepath, $_resource_part_2, -$_resource_part_2_length, $_resource_part_2_length) == 0))) { + if ((!isset($_compile_id) || (strlen((string)$_file) > strlen($_compile_id_part) && substr_compare((string)$_file, $_compile_id_part, 0, strlen($_compile_id_part)) == 0)) && + (!isset($resource_name) || (strlen((string)$_file) > strlen($_resource_part_1) && substr_compare((string)$_file, $_resource_part_1, - strlen($_resource_part_1), strlen($_resource_part_1)) == 0) || + (strlen((string)$_file) > strlen($_resource_part_2) && substr_compare((string)$_file, $_resource_part_2, - strlen($_resource_part_2), strlen($_resource_part_2)) == 0))) { if (isset($exp_time)) { - if (time() - @filemtime($_filepath) >= $exp_time) { - $unlink = true; + if (time() - @filemtime($_file) >= $exp_time) { + $_count += @unlink((string) $_file) ? 1 : 0; } } else { - $unlink = true; + $_count += @unlink((string) $_file) ? 1 : 0; } } - - if ($unlink && @unlink($_filepath)) { - $_count++; - } } } - // clear compiled cache - Smarty_Resource::$sources = array(); - Smarty_Resource::$compileds = array(); return $_count; } /** * Return array of tag/attributes of all tags used by an template * - * @param Smarty_Internal_Template $templae template object + * @param object $templae template object * @return array of tag/attributes */ - public static function getTags(Smarty_Internal_Template $template) + public static function getTags(Smarty_Internal_Template $template) + { + $template->smarty->get_used_tags = true; + $template->compileTemplateSource(); + return $template->used_tags; + } + + function testInstall() { - $template->smarty->get_used_tags = true; - $template->compileTemplateSource(); - return $template->used_tags; - } + echo "
\n";
 
+        echo "Smarty Installation test...\n";
 
-    /**
-     * diagnose Smarty setup
-     *
-     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
-     *
-     * @param Smarty $smarty  Smarty instance to test
-     * @param array  $errors array to push results into rather than outputting them
-     * @return bool status, true if everything is fine, false else
-     */
-    public static function testInstall(Smarty $smarty, &$errors=null)
-    {
-        $status = true;
+        echo "Testing template directory...\n";
 
-        if ($errors === null) {
-            echo "
\n";
-            echo "Smarty Installation test...\n";
-            echo "Testing template directory...\n";
+        foreach((array)$this->smarty->template_dir as $template_dir) {
+            if (!is_dir($template_dir))
+                echo "FAILED: $template_dir is not a directory.\n";
+            elseif (!is_readable($template_dir))
+                echo "FAILED: $template_dir is not readable.\n";
+            else
+                echo "$template_dir is OK.\n";
         }
 
-        // test if all registered template_dir are accessible
-        foreach($smarty->getTemplateDir() as $template_dir) {
-            $_template_dir = $template_dir;
-            $template_dir = realpath($template_dir);
-            // resolve include_path or fail existance
-            if (!$template_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
-                    // try PHP include_path
-                    if (($template_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_template_dir)) !== false) {
-                        if ($errors === null) {
-                            echo "$template_dir is OK.\n";
-                        }
-                        
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['template_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_template_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['template_dir'] = $message;
-                    }
-                    
-                    continue;
-                }
-            }
-            
-            if (!is_dir($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } elseif (!is_readable($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$template_dir is OK.\n";
-                }
-            }
+        echo "Testing compile directory...\n";
+
+        if (!is_dir($this->smarty->compile_dir))
+            echo "FAILED: {$this->smarty->compile_dir} is not a directory.\n";
+        elseif (!is_readable($this->smarty->compile_dir))
+            echo "FAILED: {$this->smarty->compile_dir} is not readable.\n";
+        elseif (!is_writable($this->smarty->compile_dir))
+            echo "FAILED: {$this->smarty->compile_dir} is not writable.\n";
+        else
+            echo "{$this->smarty->compile_dir} is OK.\n";
+
+        echo "Testing plugins directory...\n";
+
+        foreach((array)$this->smarty->plugins_dir as $plugin_dir) {
+            if (!is_dir($plugin_dir))
+                echo "FAILED: $plugin_dir is not a directory.\n";
+            elseif (!is_readable($plugin_dir))
+                echo "FAILED: $plugin_dir is not readable.\n";
+            else
+                echo "$plugin_dir is OK.\n";
         }
 
+        echo "Testing cache directory...\n";
 
-        if ($errors === null) {
-            echo "Testing compile directory...\n";
-        }
+        if (!is_dir($this->smarty->cache_dir))
+            echo "FAILED: {$this->smarty->cache_dir} is not a directory.\n";
+        elseif (!is_readable($this->smarty->cache_dir))
+            echo "FAILED: {$this->smarty->cache_dir} is not readable.\n";
+        elseif (!is_writable($this->smarty->cache_dir))
+            echo "FAILED: {$this->smarty->cache_dir} is not writable.\n";
+        else
+            echo "{$this->smarty->cache_dir} is OK.\n";
 
-        // test if registered compile_dir is accessible
-        $__compile_dir = $smarty->getCompileDir();
-        $_compile_dir = realpath($__compile_dir);
-        if (!$_compile_dir) {
-            $status = false;
-            $message = "FAILED: {$__compile_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_dir($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_readable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_writable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_compile_dir} is OK.\n";
-            }
-        }
+        echo "Testing configs directory...\n";
 
+        if (!is_dir($this->smarty->config_dir))
+            echo "FAILED: {$this->smarty->config_dir} is not a directory.\n";
+        elseif (!is_readable($this->smarty->config_dir))
+            echo "FAILED: {$this->smarty->config_dir} is not readable.\n";
+        else
+            echo "{$this->smarty->config_dir} is OK.\n";
 
-        if ($errors === null) {
-            echo "Testing plugins directory...\n";
-        }
+        echo "Tests complete.\n";
 
-        // test if all registered plugins_dir are accessible
-        // and if core plugins directory is still registered
-        $_core_plugins_dir = realpath(dirname(__FILE__) .'/../plugins');
-        $_core_plugins_available = false;
-        foreach($smarty->getPluginsDir() as $plugin_dir) {
-            $_plugin_dir = $plugin_dir;
-            $plugin_dir = realpath($plugin_dir);
-            // resolve include_path or fail existance
-            if (!$plugin_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if (($plugin_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_plugin_dir)) !== false) {
-                        if ($errors === null) {
-                            echo "$plugin_dir is OK.\n";
-                        }
-                        
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['plugins_dir'] = $message;
-                        }
+        echo "
\n";
 
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_plugin_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['plugins_dir'] = $message;
-                    }
-                    
-                    continue;
-                }
-            }
-            
-            if (!is_dir($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif (!is_readable($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
-                $_core_plugins_available = true;
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            }
-        }
-        if (!$_core_plugins_available) {
-            $status = false;
-            $message = "WARNING: Smarty's own libs/plugins is not available";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } elseif (!isset($errors['plugins_dir'])) {
-                $errors['plugins_dir'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing cache directory...\n";
-        }
-
-        
-        // test if all registered cache_dir is accessible
-        $__cache_dir = $smarty->getCacheDir();
-        $_cache_dir = realpath($__cache_dir);
-        if (!$_cache_dir) {
-            $status = false;
-            $message = "FAILED: {$__cache_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_dir($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_readable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_writable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_cache_dir} is OK.\n";
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing configs directory...\n";
-        }
-
-        // test if all registered config_dir are accessible
-        foreach($smarty->getConfigDir() as $config_dir) {
-            $_config_dir = $config_dir;
-            $config_dir = realpath($config_dir);
-            // resolve include_path or fail existance
-            if (!$config_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
-                    // try PHP include_path
-                    if (($config_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_config_dir)) !== false) {
-                        if ($errors === null) {
-                            echo "$config_dir is OK.\n";
-                        }
-                        
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['config_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_config_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['config_dir'] = $message;
-                    }
-                    
-                    continue;
-                }
-            }
-            
-            if (!is_dir($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } elseif (!is_readable($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$config_dir is OK.\n";
-                }
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing sysplugin files...\n";
-        }
-        // test if sysplugins are available
-        $source = SMARTY_SYSPLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "smarty_cacheresource.php" => true,
-                "smarty_cacheresource_custom.php" => true,
-                "smarty_cacheresource_keyvaluestore.php" => true,
-                "smarty_config_source.php" => true,
-                "smarty_internal_cacheresource_file.php" => true,
-                "smarty_internal_compile_append.php" => true,
-                "smarty_internal_compile_assign.php" => true,
-                "smarty_internal_compile_block.php" => true,
-                "smarty_internal_compile_break.php" => true,
-                "smarty_internal_compile_call.php" => true,
-                "smarty_internal_compile_capture.php" => true,
-                "smarty_internal_compile_config_load.php" => true,
-                "smarty_internal_compile_continue.php" => true,
-                "smarty_internal_compile_debug.php" => true,
-                "smarty_internal_compile_eval.php" => true,
-                "smarty_internal_compile_extends.php" => true,
-                "smarty_internal_compile_for.php" => true,
-                "smarty_internal_compile_foreach.php" => true,
-                "smarty_internal_compile_function.php" => true,
-                "smarty_internal_compile_if.php" => true,
-                "smarty_internal_compile_include.php" => true,
-                "smarty_internal_compile_include_php.php" => true,
-                "smarty_internal_compile_insert.php" => true,
-                "smarty_internal_compile_ldelim.php" => true,
-                "smarty_internal_compile_nocache.php" => true,
-                "smarty_internal_compile_private_block_plugin.php" => true,
-                "smarty_internal_compile_private_function_plugin.php" => true,
-                "smarty_internal_compile_private_modifier.php" => true,
-                "smarty_internal_compile_private_object_block_function.php" => true,
-                "smarty_internal_compile_private_object_function.php" => true,
-                "smarty_internal_compile_private_print_expression.php" => true,
-                "smarty_internal_compile_private_registered_block.php" => true,
-                "smarty_internal_compile_private_registered_function.php" => true,
-                "smarty_internal_compile_private_special_variable.php" => true,
-                "smarty_internal_compile_rdelim.php" => true,
-                "smarty_internal_compile_section.php" => true,
-                "smarty_internal_compile_setfilter.php" => true,
-                "smarty_internal_compile_while.php" => true,
-                "smarty_internal_compilebase.php" => true,
-                "smarty_internal_config.php" => true,
-                "smarty_internal_config_file_compiler.php" => true,
-                "smarty_internal_configfilelexer.php" => true,
-                "smarty_internal_configfileparser.php" => true,
-                "smarty_internal_data.php" => true,
-                "smarty_internal_debug.php" => true,
-                "smarty_internal_filter_handler.php" => true,
-                "smarty_internal_function_call_handler.php" => true,
-                "smarty_internal_get_include_path.php" => true,
-                "smarty_internal_nocache_insert.php" => true,
-                "smarty_internal_parsetree.php" => true,
-                "smarty_internal_resource_eval.php" => true,
-                "smarty_internal_resource_extends.php" => true,
-                "smarty_internal_resource_file.php" => true,
-                "smarty_internal_resource_registered.php" => true,
-                "smarty_internal_resource_stream.php" => true,
-                "smarty_internal_resource_string.php" => true,
-                "smarty_internal_smartytemplatecompiler.php" => true,
-                "smarty_internal_template.php" => true,
-                "smarty_internal_templatebase.php" => true,
-                "smarty_internal_templatecompilerbase.php" => true,
-                "smarty_internal_templatelexer.php" => true,
-                "smarty_internal_templateparser.php" => true,
-                "smarty_internal_utility.php" => true,
-                "smarty_internal_write_file.php" => true,
-                "smarty_resource.php" => true,
-                "smarty_resource_custom.php" => true,
-                "smarty_resource_recompiled.php" => true,
-                "smarty_resource_uncompiled.php" => true,
-                "smarty_security.php" => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/sysplugins: ". join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['sysplugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: ". SMARTY_SYSPLUGINS_DIR .' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['sysplugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing plugin files...\n";
-        }
-        // test if core plugins are available
-        $source = SMARTY_PLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "block.textformat.php" => true,
-                "function.counter.php" => true,
-                "function.cycle.php" => true,
-                "function.fetch.php" => true,
-                "function.html_checkboxes.php" => true,
-                "function.html_image.php" => true,
-                "function.html_options.php" => true,
-                "function.html_radios.php" => true,
-                "function.html_select_date.php" => true,
-                "function.html_select_time.php" => true,
-                "function.html_table.php" => true,
-                "function.mailto.php" => true,
-                "function.math.php" => true,
-                "modifier.capitalize.php" => true,
-                "modifier.date_format.php" => true,
-                "modifier.debug_print_var.php" => true,
-                "modifier.escape.php" => true,
-                "modifier.regex_replace.php" => true,
-                "modifier.replace.php" => true,
-                "modifier.spacify.php" => true,
-                "modifier.truncate.php" => true,
-                "modifiercompiler.cat.php" => true,
-                "modifiercompiler.count_characters.php" => true,
-                "modifiercompiler.count_paragraphs.php" => true,
-                "modifiercompiler.count_sentences.php" => true,
-                "modifiercompiler.count_words.php" => true,
-                "modifiercompiler.default.php" => true,
-                "modifiercompiler.escape.php" => true,
-                "modifiercompiler.from_charset.php" => true,
-                "modifiercompiler.indent.php" => true,
-                "modifiercompiler.lower.php" => true,
-                "modifiercompiler.noprint.php" => true,
-                "modifiercompiler.string_format.php" => true,
-                "modifiercompiler.strip.php" => true,
-                "modifiercompiler.strip_tags.php" => true,
-                "modifiercompiler.to_charset.php" => true,
-                "modifiercompiler.unescape.php" => true,
-                "modifiercompiler.upper.php" => true,
-                "modifiercompiler.wordwrap.php" => true,
-                "outputfilter.trimwhitespace.php" => true,
-                "shared.escape_special_chars.php" => true,
-                "shared.literal_compiler_param.php" => true,
-                "shared.make_timestamp.php" => true,
-                "shared.mb_str_replace.php" => true,
-                "shared.mb_unicode.php" => true,
-                "shared.mb_wordwrap.php" => true,
-                "variablefilter.htmlspecialchars.php" => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/plugins: ". join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: ". SMARTY_PLUGINS_DIR .' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['plugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Tests complete.\n";
-            echo "
\n"; - } - - return $status; + return true; } - } - ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_wrapper.php b/gosa-core/include/smarty/sysplugins/smarty_internal_wrapper.php index f45153c34..303e2f928 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_wrapper.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_wrapper.php @@ -4,29 +4,29 @@ * Project: Smarty: the PHP compiling template engine * File: smarty_internal_wrapper.php * SVN: $Id: $ - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * * For questions, help, comments, discussion, etc., please join the * Smarty mailing list. Send a blank e-mail to * smarty-discussion-subscribe@googlegroups.com - * + * * @link http://www.smarty.net/ * @copyright 2008 New Digital Group, Inc. - * @author Monte Ohrt - * @author Uwe Tews + * @author Monte Ohrt + * @author Uwe Tews * @package Smarty * @subpackage PluginsInternal * @version 3-SVN$Rev: 3286 $ @@ -37,17 +37,17 @@ */ class Smarty_Internal_Wrapper { - + protected $smarty; function __construct($smarty) { $this->smarty = $smarty; } - + /** * Converts smarty2-style function call to smarty 3-style function call * This is expensive, be sure to port your code to Smarty 3! - * + * * @param string $name Smarty 2 function name * @param array $args Smarty 2 function args */ @@ -95,6 +95,8 @@ class Smarty_Internal_Wrapper { return call_user_func_array(array($this->smarty,'clearAllCache'),$args); case 'cache': return call_user_func_array(array($this->smarty,'clearCache'),$args); + case 'config': + return call_user_func_array(array($this->smarty,'clearConfig'),$args); case 'compiled_template': return call_user_func_array(array($this->smarty,'clearCompiledTemplate'),$args); } diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_write_file.php b/gosa-core/include/smarty/sysplugins/smarty_internal_write_file.php index aae600ee1..4e34335fb 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_internal_write_file.php +++ b/gosa-core/include/smarty/sysplugins/smarty_internal_write_file.php @@ -1,70 +1,56 @@ _file_perms !== null) { - $old_umask = umask(0); - } - - $_dirpath = dirname($_filepath); + $old_umask = umask(0); + $_dirpath = dirname($_filepath); // if subdirs, create dir structure if ($_dirpath !== '.' && !file_exists($_dirpath)) { - mkdir($_dirpath, $smarty->_dir_perms === null ? 0777 : $smarty->_dir_perms, true); - } - + mkdir($_dirpath, $smarty->_dir_perms, true); + } // write to tmp file, then move to overt file lock race condition - $_tmp_file = $_dirpath . DS . uniqid('wrt'); - if (!file_put_contents($_tmp_file, $_contents)) { - error_reporting($_error_reporting); + $_tmp_file = tempnam($_dirpath, 'wrt'); + + if (!($fd = @fopen($_tmp_file, 'wb'))) { + $_tmp_file = $_dirpath . DS . uniqid('wrt'); + if (!($fd = @fopen($_tmp_file, 'wb'))) { throw new SmartyException("unable to write file {$_tmp_file}"); return false; - } + } + } - // remove original file - unlink($_filepath); + fwrite($fd, $_contents); + fclose($fd); + // remove original file + if (file_exists($_filepath)) + @unlink($_filepath); // rename tmp file - $success = rename($_tmp_file, $_filepath); - if (!$success) { - error_reporting($_error_reporting); - throw new SmartyException("unable to write file {$_filepath}"); - return false; - } - - if ($smarty->_file_perms !== null) { - // set file permissions - chmod($_filepath, $smarty->_file_perms); - umask($old_umask); - } - error_reporting($_error_reporting); + rename($_tmp_file, $_filepath); + // set file permissions + chmod($_filepath, $smarty->_file_perms); + umask($old_umask); return true; - } - -} + } +} ?> \ No newline at end of file diff --git a/gosa-core/include/smarty/sysplugins/smarty_security.php b/gosa-core/include/smarty/sysplugins/smarty_security.php index 3d4f3189c..cd066fb4e 100644 --- a/gosa-core/include/smarty/sysplugins/smarty_security.php +++ b/gosa-core/include/smarty/sysplugins/smarty_security.php @@ -1,26 +1,16 @@ " tags in templates. * possible values: @@ -30,398 +20,210 @@ class Smarty_Security { *
  • Smarty::PHP_REMOVE -> remove php tags
    • *
  • Smarty::PHP_ALLOW -> execute php tags
    • * - * - * @var integer + * + * @var integer */ public $php_handling = Smarty::PHP_PASSTHRU; + /** * This is the list of template directories that are considered secure. * $template_dir is in this list implicitly. - * - * @var array + * + * @var array */ public $secure_dir = array(); + + /** * This is an array of directories where trusted php scripts reside. * {@link $security} is disabled during their inclusion/execution. - * - * @var array + * + * @var array */ public $trusted_dir = array(); + + /** * This is an array of trusted static classes. * * If empty access to all static classes is allowed. * If set to 'none' none is allowed. - * @var array + * @var array */ public $static_classes = array(); + /** * This is an array of trusted PHP functions. * * If empty all functions are allowed. * To disable all PHP functions set $php_functions = null. - * @var array + * @var array */ - public $php_functions = array( - 'isset', 'empty', - 'count', 'sizeof', - 'in_array', 'is_array', - 'time', - 'nl2br', - ); + public $php_functions = array('isset', 'empty', + 'count', 'sizeof','in_array', 'is_array','time','nl2br'); + /** * This is an array of trusted PHP modifers. * * If empty all modifiers are allowed. * To disable all modifier set $modifiers = null. - * @var array - */ - public $php_modifiers = array( - 'escape', - 'count' - ); - /** - * This is an array of allowed tags. - * - * If empty no restriction by allowed_tags. - * @var array - */ - public $allowed_tags = array(); - /** - * This is an array of disabled tags. - * - * If empty no restriction by disabled_tags. - * @var array - */ - public $disabled_tags = array(); - /** - * This is an array of allowed modifier plugins. - * - * If empty no restriction by allowed_modifiers. - * @var array + * @var array */ - public $allowed_modifiers = array(); - /** - * This is an array of disabled modifier plugins. - * - * If empty no restriction by disabled_modifiers. - * @var array - */ - public $disabled_modifiers = array(); + public $php_modifiers = array('escape','count'); + /** * This is an array of trusted streams. * * If empty all streams are allowed. * To disable all streams set $streams = null. - * @var array + * @var array */ public $streams = array('file'); /** * + flag if constants can be accessed from template - * @var boolean */ public $allow_constants = true; /** * + flag if super globals can be accessed from template - * @var boolean */ public $allow_super_globals = true; - - /** - * Cache for $resource_dir lookups - * @var array - */ - protected $_resource_dir = null; - /** - * Cache for $template_dir lookups - * @var array - */ - protected $_template_dir = null; - /** - * Cache for $config_dir lookups - * @var array - */ - protected $_config_dir = null; /** - * Cache for $secure_dir lookups - * @var array - */ - protected $_secure_dir = null; - /** - * Cache for $php_resource_dir lookups - * @var array - */ - protected $_php_resource_dir = null; - /** - * Cache for $trusted_dir lookups - * @var array - */ - protected $_trusted_dir = null; - - - /** - * @param Smarty $smarty + * + flag if the {php} and {include_php} tag can be executed */ + public $allow_php_tag = false; + public function __construct($smarty) { - $this->smarty = $smarty; - } - + $this->smarty = $smarty; + } /** * Check if PHP function is trusted. - * - * @param string $function_name + * + * @param string $function_name * @param object $compiler compiler object * @return boolean true if function is trusted - * @throws SmartyCompilerException if php function is not trusted */ - public function isTrustedPhpFunction($function_name, $compiler) + function isTrustedPhpFunction($function_name, $compiler) { if (isset($this->php_functions) && (empty($this->php_functions) || in_array($function_name, $this->php_functions))) { return true; - } - - $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting"); - return false; // should not, but who knows what happens to the compiler in the future? - } + } else { + $compiler->trigger_template_error ("PHP function '{$function_name}' not allowed by security setting"); + return false; + } + } /** * Check if static class is trusted. - * - * @param string $class_name + * + * @param string $class_name * @param object $compiler compiler object * @return boolean true if class is trusted - * @throws SmartyCompilerException if static class is not trusted */ - public function isTrustedStaticClass($class_name, $compiler) + function isTrustedStaticClass($class_name, $compiler) { if (isset($this->static_classes) && (empty($this->static_classes) || in_array($class_name, $this->static_classes))) { return true; - } - - $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting"); - return false; // should not, but who knows what happens to the compiler in the future? - } - - /** - * Check if PHP modifier is trusted. - * - * @param string $modifier_name + } else { + $compiler->trigger_template_error ("access to static class '{$class_name}' not allowed by security setting"); + return false; + } + } + /** + * Check if modifier is trusted. + * + * @param string $modifier_name * @param object $compiler compiler object * @return boolean true if modifier is trusted - * @throws SmartyCompilerException if modifier is not trusted */ - public function isTrustedPhpModifier($modifier_name, $compiler) + function isTrustedModifier($modifier_name, $compiler) { if (isset($this->php_modifiers) && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))) { return true; - } - - $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting"); - return false; // should not, but who knows what happens to the compiler in the future? - } - - /** - * Check if tag is trusted. - * - * @param string $tag_name - * @param object $compiler compiler object - * @return boolean true if tag is trusted - * @throws SmartyCompilerException if modifier is not trusted - */ - public function isTrustedTag($tag_name, $compiler) - { - // check for internal always required tags - if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin', 'private_object_block_function', - 'private_object_function', 'private_registered_function', 'private_registered_block', 'private_special_variable', 'private_print_expression', 'private_modifier'))) { - return true; - } - // check security settings - if (empty($this->allowed_tags)) { - if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) { - return true; - } else { - $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", $compiler->lex->taglineno); - } - } else if (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) { - return true; - } else { - $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", $compiler->lex->taglineno); - } - return false; // should not, but who knows what happens to the compiler in the future? - } - - /** - * Check if modifier plugin is trusted. - * - * @param string $modifier_name - * @param object $compiler compiler object - * @return boolean true if tag is trusted - * @throws SmartyCompilerException if modifier is not trusted - */ - public function isTrustedModifier($modifier_name, $compiler) - { - // check for internal always allowed modifier - if (in_array($modifier_name, array('default'))) { - return true; - } - // check security settings - if (empty($this->allowed_modifiers)) { - if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) { - return true; - } else { - $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", $compiler->lex->taglineno); - } - } else if (in_array($modifier_name, $this->allowed_modifiers) && !in_array($modifier_name, $this->disabled_modifiers)) { - return true; } else { - $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", $compiler->lex->taglineno); - } - return false; // should not, but who knows what happens to the compiler in the future? - } - + $compiler->trigger_template_error ("modifier '{$modifier_name}' not allowed by security setting"); + return false; + } + } /** * Check if stream is trusted. - * - * @param string $stream_name + * + * @param string $stream_name + * @param object $compiler compiler object * @return boolean true if stream is trusted - * @throws SmartyException if stream is not trusted */ - public function isTrustedStream($stream_name) + function isTrustedStream($stream_name) { if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) { return true; - } - - throw new SmartyException("stream '{$stream_name}' not allowed by security setting"); - } + } else { + throw new SmartyException ("stream '{$stream_name}' not allowed by security setting"); + return false; + } + } /** * Check if directory of file resource is trusted. - * - * @param string $filepath + * + * @param string $filepath + * @param object $compiler compiler object * @return boolean true if directory is trusted - * @throws SmartyException if directory is not trusted */ - public function isTrustedResourceDir($filepath) + function isTrustedResourceDir($filepath) { - $_template = false; - $_config = false; - $_secure = false; - - $_template_dir = $this->smarty->getTemplateDir(); - $_config_dir = $this->smarty->getConfigDir(); - - // check if index is outdated - if ((!$this->_template_dir || $this->_template_dir !== $_template_dir) - || (!$this->_config_dir || $this->_config_dir !== $_config_dir) - || (!empty($this->secure_dir) && (!$this->_secure_dir || $this->_secure_dir !== $this->secure_dir)) - ) { - $this->_resource_dir = array(); - $_template = true; - $_config = true; - $_secure = !empty($this->secure_dir); - } - - // rebuild template dir index - if ($_template) { - $this->_template_dir = $_template_dir; - foreach ($_template_dir as $directory) { - $directory = realpath($directory); - $this->_resource_dir[$directory] = true; - } - } - - // rebuild config dir index - if ($_config) { - $this->_config_dir = $_config_dir; - foreach ($_config_dir as $directory) { - $directory = realpath($directory); - $this->_resource_dir[$directory] = true; - } - } - - // rebuild secure dir index - if ($_secure) { - $this->_secure_dir = $this->secure_dir; - foreach ((array) $this->secure_dir as $directory) { - $directory = realpath($directory); - $this->_resource_dir[$directory] = true; - } - } - - $_filepath = realpath($filepath); - $directory = dirname($_filepath); - $_directory = array(); - while (true) { - // remember the directory to add it to _resource_dir in case we're successful - $_directory[] = $directory; - // test if the directory is trusted - if (isset($this->_resource_dir[$directory])) { - // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups - $this->_resource_dir = array_merge($this->_resource_dir, $_directory); - return true; - } - // abort if we've reached root - if (($pos = strrpos($directory, DS)) === false || !isset($directory[1])) { - break; - } - // bubble up one level - $directory = substr($directory, 0, $pos); - } - - // give up - throw new SmartyException("directory '{$_filepath}' not allowed by security setting"); - } - + $_rp = realpath($filepath); + if (isset($this->smarty->template_dir)) { + foreach ((array)$this->smarty->template_dir as $curr_dir) { + if (($_cd = realpath($curr_dir)) !== false && + strncmp($_rp, $_cd, strlen($_cd)) == 0 && + (strlen($_rp) == strlen($_cd) || substr($_rp, strlen($_cd), 1) == DS)) { + return true; + } + } + } + if (!empty($this->smarty->security_policy->secure_dir)) { + foreach ((array)$this->smarty->security_policy->secure_dir as $curr_dir) { + if (($_cd = realpath($curr_dir)) !== false) { + if ($_cd == $_rp) { + return true; + } elseif (strncmp($_rp, $_cd, strlen($_cd)) == 0 && + (strlen($_rp) == strlen($_cd) || substr($_rp, strlen($_cd), 1) == DS)) { + return true; + } + } + } + } + + throw new SmartyException ("directory '{$_rp}' not allowed by security setting"); + return false; + } + /** * Check if directory of file resource is trusted. - * - * @param string $filepath + * + * @param string $filepath + * @param object $compiler compiler object * @return boolean true if directory is trusted - * @throws SmartyException if PHP directory is not trusted */ - public function isTrustedPHPDir($filepath) + function isTrustedPHPDir($filepath) { - if (empty($this->trusted_dir)) { - throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)"); - } - - // check if index is outdated - if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) { - $this->_php_resource_dir = array(); - - $this->_trusted_dir = $this->trusted_dir; - foreach ((array) $this->trusted_dir as $directory) { - $directory = realpath($directory); - $this->_php_resource_dir[$directory] = true; - } - } - - $_filepath = realpath($filepath); - $directory = dirname($_filepath); - $_directory = array(); - while (true) { - // remember the directory to add it to _resource_dir in case we're successful - $_directory[] = $directory; - // test if the directory is trusted - if (isset($this->_php_resource_dir[$directory])) { - // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups - $this->_php_resource_dir = array_merge($this->_php_resource_dir, $_directory); - return true; - } - // abort if we've reached root - if (($pos = strrpos($directory, DS)) === false || !isset($directory[2])) { - break; - } - // bubble up one level - $directory = substr($directory, 0, $pos); - } - - throw new SmartyException("directory '{$_filepath}' not allowed by security setting"); - } - -} + $_rp = realpath($filepath); + if (!empty($this->trusted_dir)) { + foreach ((array)$this->trusted_dir as $curr_dir) { + if (($_cd = realpath($curr_dir)) !== false) { + if ($_cd == $_rp) { + return true; + } elseif (strncmp($_rp, $_cd, strlen($_cd)) == 0 && + substr($_rp, strlen($_cd), 1) == DS) { + return true; + } + } + } + } + + throw new SmartyException ("directory '{$_rp}' not allowed by security setting"); + return false; + } +} ?> \ No newline at end of file -- 2.30.2