From 6fc07742f8fca9d32db23243d374ea27e8ee4c1e Mon Sep 17 00:00:00 2001 From: rvelices Date: Thu, 20 Jun 2013 03:38:47 +0000 Subject: smarty 3 - first pass for tests git-svn-id: http://piwigo.org/svn/trunk@23384 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/themes/default/template/configuration.tpl | 10 +- include/functions.inc.php | 3 +- include/smarty/COPYING.lib | 615 +--- include/smarty/NEWS | 1067 ------- include/smarty/README | 618 +++- include/smarty/SMARTY_2_BC_NOTES.txt | 109 + include/smarty/SMARTY_3.0_BC_NOTES.txt | 24 + include/smarty/SMARTY_3.1_NOTES.txt | 306 ++ include/smarty/change_log.txt | 2153 +++++++++++++ include/smarty/libs/Config_File.class.php | 393 --- include/smarty/libs/Smarty.class.php | 2484 ++++++--------- include/smarty/libs/SmartyBC.class.php | 460 +++ include/smarty/libs/Smarty_Compiler.class.php | 2365 -------------- include/smarty/libs/debug.tpl | 78 +- .../internals/core.assemble_plugin_filepath.php | 67 - .../internals/core.assign_smarty_interface.php | 43 - .../libs/internals/core.create_dir_structure.php | 79 - .../libs/internals/core.display_debug_console.php | 61 - .../libs/internals/core.get_include_path.php | 44 - .../smarty/libs/internals/core.get_microtime.php | 23 - .../libs/internals/core.get_php_resource.php | 80 - include/smarty/libs/internals/core.is_secure.php | 59 - include/smarty/libs/internals/core.is_trusted.php | 47 - .../smarty/libs/internals/core.load_plugins.php | 125 - .../libs/internals/core.load_resource_plugin.php | 74 - .../libs/internals/core.process_cached_inserts.php | 71 - .../internals/core.process_compiled_include.php | 37 - .../smarty/libs/internals/core.read_cache_file.php | 101 - include/smarty/libs/internals/core.rm_auto.php | 71 - include/smarty/libs/internals/core.rmdir.php | 54 - .../libs/internals/core.run_insert_handler.php | 71 - .../libs/internals/core.smarty_include_php.php | 50 - .../libs/internals/core.write_cache_file.php | 96 - .../libs/internals/core.write_compiled_include.php | 91 - .../internals/core.write_compiled_resource.php | 35 - include/smarty/libs/internals/core.write_file.php | 54 - include/smarty/libs/plugins/block.textformat.php | 76 +- include/smarty/libs/plugins/compiler.assign.php | 40 - .../libs/plugins/function.assign_debug_info.php | 40 - .../smarty/libs/plugins/function.config_load.php | 142 - include/smarty/libs/plugins/function.counter.php | 18 +- include/smarty/libs/plugins/function.cycle.php | 66 +- include/smarty/libs/plugins/function.debug.php | 35 - include/smarty/libs/plugins/function.eval.php | 49 - include/smarty/libs/plugins/function.fetch.php | 345 +-- .../libs/plugins/function.html_checkboxes.php | 180 +- .../smarty/libs/plugins/function.html_image.php | 157 +- .../smarty/libs/plugins/function.html_options.php | 201 +- .../smarty/libs/plugins/function.html_radios.php | 209 +- .../libs/plugins/function.html_select_date.php | 537 ++-- .../libs/plugins/function.html_select_time.php | 430 ++- .../smarty/libs/plugins/function.html_table.php | 92 +- include/smarty/libs/plugins/function.mailto.php | 145 +- include/smarty/libs/plugins/function.math.php | 54 +- include/smarty/libs/plugins/function.popup.php | 119 - .../smarty/libs/plugins/function.popup_init.php | 40 - .../smarty/libs/plugins/modifier.capitalize.php | 76 +- include/smarty/libs/plugins/modifier.cat.php | 33 - .../libs/plugins/modifier.count_characters.php | 32 - .../libs/plugins/modifier.count_paragraphs.php | 29 - .../libs/plugins/modifier.count_sentences.php | 29 - .../smarty/libs/plugins/modifier.count_words.php | 33 - .../smarty/libs/plugins/modifier.date_format.php | 79 +- .../libs/plugins/modifier.debug_print_var.php | 79 +- include/smarty/libs/plugins/modifier.default.php | 32 - include/smarty/libs/plugins/modifier.escape.php | 175 +- include/smarty/libs/plugins/modifier.indent.php | 28 - include/smarty/libs/plugins/modifier.lower.php | 26 - include/smarty/libs/plugins/modifier.nl2br.php | 35 - .../smarty/libs/plugins/modifier.regex_replace.php | 41 +- include/smarty/libs/plugins/modifier.replace.php | 31 +- include/smarty/libs/plugins/modifier.spacify.php | 25 +- .../smarty/libs/plugins/modifier.string_format.php | 29 - include/smarty/libs/plugins/modifier.strip.php | 33 - .../smarty/libs/plugins/modifier.strip_tags.php | 32 - include/smarty/libs/plugins/modifier.truncate.php | 69 +- include/smarty/libs/plugins/modifier.upper.php | 26 - include/smarty/libs/plugins/modifier.wordwrap.php | 29 - .../smarty/libs/plugins/modifiercompiler.cat.php | 30 + .../plugins/modifiercompiler.count_characters.php | 33 + .../plugins/modifiercompiler.count_paragraphs.php | 28 + .../plugins/modifiercompiler.count_sentences.php | 28 + .../libs/plugins/modifiercompiler.count_words.php | 32 + .../libs/plugins/modifiercompiler.default.php | 35 + .../libs/plugins/modifiercompiler.escape.php | 125 + .../libs/plugins/modifiercompiler.from_charset.php | 34 + .../libs/plugins/modifiercompiler.indent.php | 32 + .../smarty/libs/plugins/modifiercompiler.lower.php | 31 + .../libs/plugins/modifiercompiler.noprint.php | 25 + .../plugins/modifiercompiler.string_format.php | 26 + .../smarty/libs/plugins/modifiercompiler.strip.php | 33 + .../libs/plugins/modifiercompiler.strip_tags.php | 33 + .../libs/plugins/modifiercompiler.to_charset.php | 34 + .../libs/plugins/modifiercompiler.unescape.php | 51 + .../smarty/libs/plugins/modifiercompiler.upper.php | 30 + .../libs/plugins/modifiercompiler.wordwrap.php | 46 + .../libs/plugins/outputfilter.trimwhitespace.php | 127 +- .../libs/plugins/shared.escape_special_chars.php | 68 +- .../libs/plugins/shared.literal_compiler_param.php | 33 + .../smarty/libs/plugins/shared.make_timestamp.php | 36 +- .../smarty/libs/plugins/shared.mb_str_replace.php | 55 + include/smarty/libs/plugins/shared.mb_unicode.php | 48 + include/smarty/libs/plugins/shared.mb_wordwrap.php | 83 + .../plugins/variablefilter.htmlspecialchars.php | 21 + .../libs/sysplugins/smarty_cacheresource.php | 381 +++ .../sysplugins/smarty_cacheresource_custom.php | 237 ++ .../smarty_cacheresource_keyvaluestore.php | 463 +++ .../libs/sysplugins/smarty_config_source.php | 95 + .../smarty_internal_cacheresource_file.php | 266 ++ .../sysplugins/smarty_internal_compile_append.php | 53 + .../sysplugins/smarty_internal_compile_assign.php | 88 + .../sysplugins/smarty_internal_compile_block.php | 282 ++ .../sysplugins/smarty_internal_compile_break.php | 77 + .../sysplugins/smarty_internal_compile_call.php | 130 + .../sysplugins/smarty_internal_compile_capture.php | 98 + .../smarty_internal_compile_config_load.php | 85 + .../smarty_internal_compile_continue.php | 78 + .../sysplugins/smarty_internal_compile_debug.php | 43 + .../sysplugins/smarty_internal_compile_eval.php | 73 + .../sysplugins/smarty_internal_compile_extends.php | 133 + .../sysplugins/smarty_internal_compile_for.php | 151 + .../sysplugins/smarty_internal_compile_foreach.php | 231 ++ .../smarty_internal_compile_function.php | 166 + .../libs/sysplugins/smarty_internal_compile_if.php | 207 ++ .../sysplugins/smarty_internal_compile_include.php | 215 ++ .../smarty_internal_compile_include_php.php | 108 + .../sysplugins/smarty_internal_compile_insert.php | 142 + .../sysplugins/smarty_internal_compile_ldelim.php | 41 + .../sysplugins/smarty_internal_compile_nocache.php | 73 + ...marty_internal_compile_private_block_plugin.php | 87 + ...ty_internal_compile_private_function_plugin.php | 73 + .../smarty_internal_compile_private_modifier.php | 140 + ...ernal_compile_private_object_block_function.php | 88 + ...ty_internal_compile_private_object_function.php | 79 + ...y_internal_compile_private_print_expression.php | 156 + ...y_internal_compile_private_registered_block.php | 113 + ...nternal_compile_private_registered_function.php | 81 + ...y_internal_compile_private_special_variable.php | 111 + .../sysplugins/smarty_internal_compile_rdelim.php | 41 + .../sysplugins/smarty_internal_compile_section.php | 203 ++ .../smarty_internal_compile_setfilter.php | 72 + .../sysplugins/smarty_internal_compile_while.php | 94 + .../sysplugins/smarty_internal_compilebase.php | 176 ++ .../libs/sysplugins/smarty_internal_config.php | 302 ++ .../smarty_internal_config_file_compiler.php | 144 + .../sysplugins/smarty_internal_configfilelexer.php | 622 ++++ .../smarty_internal_configfileparser.php | 921 ++++++ .../libs/sysplugins/smarty_internal_data.php | 556 ++++ .../libs/sysplugins/smarty_internal_debug.php | 206 ++ .../sysplugins/smarty_internal_filter_handler.php | 70 + .../smarty_internal_function_call_handler.php | 55 + .../smarty_internal_get_include_path.php | 48 + .../sysplugins/smarty_internal_nocache_insert.php | 53 + .../libs/sysplugins/smarty_internal_parsetree.php | 395 +++ .../sysplugins/smarty_internal_resource_eval.php | 94 + .../smarty_internal_resource_extends.php | 162 + .../sysplugins/smarty_internal_resource_file.php | 90 + .../sysplugins/smarty_internal_resource_php.php | 114 + .../smarty_internal_resource_registered.php | 95 + .../sysplugins/smarty_internal_resource_stream.php | 78 + .../sysplugins/smarty_internal_resource_string.php | 96 + .../smarty_internal_smartytemplatecompiler.php | 127 + .../libs/sysplugins/smarty_internal_template.php | 692 +++++ .../sysplugins/smarty_internal_templatebase.php | 811 +++++ .../smarty_internal_templatecompilerbase.php | 670 ++++ .../sysplugins/smarty_internal_templatelexer.php | 1203 ++++++++ .../sysplugins/smarty_internal_templateparser.php | 3254 ++++++++++++++++++++ .../libs/sysplugins/smarty_internal_utility.php | 830 +++++ .../libs/sysplugins/smarty_internal_write_file.php | 88 + include/smarty/libs/sysplugins/smarty_resource.php | 857 ++++++ .../libs/sysplugins/smarty_resource_custom.php | 96 + .../libs/sysplugins/smarty_resource_recompiled.php | 36 + .../libs/sysplugins/smarty_resource_uncompiled.php | 44 + include/smarty/libs/sysplugins/smarty_security.php | 459 +++ include/template.class.php | 43 +- themes/default/template/comment_list.tpl | 2 +- themes/default/template/index.tpl | 2 +- themes/default/template/menubar_categories.tpl | 2 +- themes/default/template/picture.tpl | 2 +- 179 files changed, 26459 insertions(+), 9541 deletions(-) delete mode 100644 include/smarty/NEWS create mode 100644 include/smarty/SMARTY_2_BC_NOTES.txt create mode 100644 include/smarty/SMARTY_3.0_BC_NOTES.txt create mode 100644 include/smarty/SMARTY_3.1_NOTES.txt create mode 100644 include/smarty/change_log.txt delete mode 100644 include/smarty/libs/Config_File.class.php create mode 100644 include/smarty/libs/SmartyBC.class.php delete mode 100644 include/smarty/libs/Smarty_Compiler.class.php delete mode 100644 include/smarty/libs/internals/core.assemble_plugin_filepath.php delete mode 100644 include/smarty/libs/internals/core.assign_smarty_interface.php delete mode 100644 include/smarty/libs/internals/core.create_dir_structure.php delete mode 100644 include/smarty/libs/internals/core.display_debug_console.php delete mode 100644 include/smarty/libs/internals/core.get_include_path.php delete mode 100644 include/smarty/libs/internals/core.get_microtime.php delete mode 100644 include/smarty/libs/internals/core.get_php_resource.php delete mode 100644 include/smarty/libs/internals/core.is_secure.php delete mode 100644 include/smarty/libs/internals/core.is_trusted.php delete mode 100644 include/smarty/libs/internals/core.load_plugins.php delete mode 100644 include/smarty/libs/internals/core.load_resource_plugin.php delete mode 100644 include/smarty/libs/internals/core.process_cached_inserts.php delete mode 100644 include/smarty/libs/internals/core.process_compiled_include.php delete mode 100644 include/smarty/libs/internals/core.read_cache_file.php delete mode 100644 include/smarty/libs/internals/core.rm_auto.php delete mode 100644 include/smarty/libs/internals/core.rmdir.php delete mode 100644 include/smarty/libs/internals/core.run_insert_handler.php delete mode 100644 include/smarty/libs/internals/core.smarty_include_php.php delete mode 100644 include/smarty/libs/internals/core.write_cache_file.php delete mode 100644 include/smarty/libs/internals/core.write_compiled_include.php delete mode 100644 include/smarty/libs/internals/core.write_compiled_resource.php delete mode 100644 include/smarty/libs/internals/core.write_file.php delete mode 100644 include/smarty/libs/plugins/compiler.assign.php delete mode 100644 include/smarty/libs/plugins/function.assign_debug_info.php delete mode 100644 include/smarty/libs/plugins/function.config_load.php delete mode 100644 include/smarty/libs/plugins/function.debug.php delete mode 100644 include/smarty/libs/plugins/function.eval.php delete mode 100644 include/smarty/libs/plugins/function.popup.php delete mode 100644 include/smarty/libs/plugins/function.popup_init.php delete mode 100644 include/smarty/libs/plugins/modifier.cat.php delete mode 100644 include/smarty/libs/plugins/modifier.count_characters.php delete mode 100644 include/smarty/libs/plugins/modifier.count_paragraphs.php delete mode 100644 include/smarty/libs/plugins/modifier.count_sentences.php delete mode 100644 include/smarty/libs/plugins/modifier.count_words.php delete mode 100644 include/smarty/libs/plugins/modifier.default.php delete mode 100644 include/smarty/libs/plugins/modifier.indent.php delete mode 100644 include/smarty/libs/plugins/modifier.lower.php delete mode 100644 include/smarty/libs/plugins/modifier.nl2br.php delete mode 100644 include/smarty/libs/plugins/modifier.string_format.php delete mode 100644 include/smarty/libs/plugins/modifier.strip.php delete mode 100644 include/smarty/libs/plugins/modifier.strip_tags.php delete mode 100644 include/smarty/libs/plugins/modifier.upper.php delete mode 100644 include/smarty/libs/plugins/modifier.wordwrap.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.cat.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.count_characters.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.count_paragraphs.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.count_sentences.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.count_words.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.default.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.escape.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.from_charset.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.indent.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.lower.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.noprint.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.string_format.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.strip.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.strip_tags.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.to_charset.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.unescape.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.upper.php create mode 100644 include/smarty/libs/plugins/modifiercompiler.wordwrap.php create mode 100644 include/smarty/libs/plugins/shared.literal_compiler_param.php create mode 100644 include/smarty/libs/plugins/shared.mb_str_replace.php create mode 100644 include/smarty/libs/plugins/shared.mb_unicode.php create mode 100644 include/smarty/libs/plugins/shared.mb_wordwrap.php create mode 100644 include/smarty/libs/plugins/variablefilter.htmlspecialchars.php create mode 100644 include/smarty/libs/sysplugins/smarty_cacheresource.php create mode 100644 include/smarty/libs/sysplugins/smarty_cacheresource_custom.php create mode 100644 include/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php create mode 100644 include/smarty/libs/sysplugins/smarty_config_source.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_append.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_assign.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_block.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_break.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_call.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_capture.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_config_load.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_continue.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_debug.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_eval.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_extends.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_for.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_foreach.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_function.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_if.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_include.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_include_php.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_insert.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_nocache.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_section.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compile_while.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_compilebase.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_config.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_configfilelexer.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_configfileparser.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_data.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_debug.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_filter_handler.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_get_include_path.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_nocache_insert.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_parsetree.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_resource_eval.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_resource_extends.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_resource_file.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_resource_php.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_resource_registered.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_resource_stream.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_resource_string.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_template.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_templatebase.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_templatelexer.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_templateparser.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_utility.php create mode 100644 include/smarty/libs/sysplugins/smarty_internal_write_file.php create mode 100644 include/smarty/libs/sysplugins/smarty_resource.php create mode 100644 include/smarty/libs/sysplugins/smarty_resource_custom.php create mode 100644 include/smarty/libs/sysplugins/smarty_resource_recompiled.php create mode 100644 include/smarty/libs/sysplugins/smarty_resource_uncompiled.php create mode 100644 include/smarty/libs/sysplugins/smarty_security.php diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl index 76bb83c0e..db0d62c63 100644 --- a/admin/themes/default/template/configuration.tpl +++ b/admin/themes/default/template/configuration.tpl @@ -105,22 +105,22 @@ jQuery(document).ready(function(){ {foreach from=$main.order_by item=order} - - {html_options options=$main.order_by_options selected=$order} {'delete'|@translate} {/foreach} - {if !$ORDER_BY_IS_CUSTOM} + {if !isset($ORDER_BY_IS_CUSTOM)} {'Add a criteria'|@translate} {else} {'You can\'t define a default photo order because you have a custom setting in your local configuration.'|@translate} {/if} -{if !$ORDER_BY_IS_CUSTOM} +{if !isset($ORDER_BY_IS_CUSTOM)} {footer_script require='jquery'} // counters for displaying of addFilter link fields = {$main.order_by|@count}; max_fields = Math.ceil({$main.order_by_options|@count}/2); @@ -383,7 +383,7 @@ jQuery(document).ready(function(){ {'Multiple Size'|@translate}
- +
diff --git a/include/functions.inc.php b/include/functions.inc.php index 027299e66..861d85064 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -32,7 +32,8 @@ include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' ); include_once( PHPWG_ROOT_PATH .'include/derivative_params.inc.php'); include_once( PHPWG_ROOT_PATH .'include/derivative_std_params.inc.php'); include_once( PHPWG_ROOT_PATH .'include/derivative.inc.php'); -require_once( PHPWG_ROOT_PATH .'include/smarty/libs/Smarty.class.php'); +//require_once( PHPWG_ROOT_PATH .'include/smarty/libs/Smarty.class.php'); +require_once( PHPWG_ROOT_PATH .'include/smarty/libs/SmartyBC.class.php'); include_once( PHPWG_ROOT_PATH .'include/template.class.php'); //----------------------------------------------------------- generic functions diff --git a/include/smarty/COPYING.lib b/include/smarty/COPYING.lib index 3b204400c..02bbb60bc 100644 --- a/include/smarty/COPYING.lib +++ b/include/smarty/COPYING.lib @@ -1,458 +1,165 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. \ No newline at end of file diff --git a/include/smarty/NEWS b/include/smarty/NEWS deleted file mode 100644 index cbab78f5a..000000000 --- a/include/smarty/NEWS +++ /dev/null @@ -1,1067 +0,0 @@ -Version 2.6.26 (June 18th, 2009) -------------------------------- -- revert super global access changes, and instead rely on - USE_SUPER_GLOBALS for security - -Version 2.6.25 (May 19th, 2009) -------------------------------- -- fix E_NOTICE when sessions are disabled (mohrt) - -Version 2.6.24 (May 16th, 2009) -------------------------------- -- fix problem introduced with super global changes (mohrt) - -Version 2.6.23 (May 13th, 2009) -------------------------------- -- strip backticks from {math} equations (mohrt) -- make PHP super globals read-only from template (mohrt) -- throw error when template exists but not readable (mohrt) - -Version 2.6.22 (Dec 17th, 2008) -------------------------------- - -- back out method chaining, bug in some versions of PCRE causes errors (mohrt) - -Version 2.6.21 (Dec 2nd, 2008) ------------------------------- - -- fix function injection security hole closed (U.Tews) -- fix pass expiration time at cache_handler_fuc call in core.write_cache_file.php (U.Tews) -- Update of compiler.class.php to allow method chaining for PHP4 and PHP5 (U.Tews) - -Version 2.6.20 (Feb 15th, 2008) -------------------------------- - -- fix cache tag bug when multiple cache tags on a page (mankyd, - mohrt) -- fix /e tag checking when using arrays with regex_replace - (mohrt) -- fix that function results can be used with condition like "is even" in - {if} tags (U.Tews) -- fix handling of non-empty 
-tags and empty !is", $source, $match);
-    $_textarea_blocks = $match[0];
-    $source = preg_replace("!]*?>.*?!is",
-                           '@@@SMARTY:TRIM:TEXTAREA@@@', $source);
+    // Unify Line-Breaks to \n
+    $source = preg_replace("/\015\012|\015|\012/", "\n", $source);
 
-    // remove all leading spaces, tabs and carriage returns NOT
-    // preceeded by a php close tag.
-    $source = trim(preg_replace('/((?)\n)[\s]+/m', '\1', $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);
 
-    // replace textarea blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $source);
+            $_offset += $_length - strlen($replace);
+            $_store++;
+        }
+    }
 
-    // replace pre blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:PRE@@@",$_pre_blocks, $source);
+    // Strip all HTML-Comments
+    // yes, even the ones in