From 94b80e892b3b767ef4f63e203e337f29df55e5e6 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews" Date: Tue, 3 Nov 2009 20:38:38 +0000 Subject: [PATCH] - renamed function names of autoloaded Smarty methods to Smarty_Method_.... - new security_class property (default is Smarty_Security) --- change_log.txt | 2 + libs/Smarty.class.php | 61 ++++++++----------- .../smarty_internal_cacheresource_file.php | 4 +- libs/sysplugins/smarty_internal_config.php | 2 +- .../smarty_internal_resource_extend.php | 2 +- .../smarty_internal_resource_file.php | 2 +- .../smarty_internal_resource_registered.php | 2 +- ...smarty_internal_smartytemplatecompiler.php | 2 - .../smarty_method__get_filter_name.php | 2 +- .../smarty_method_addpluginsdir.php | 2 +- .../smarty_method_clear_all_assign.php | 2 +- .../smarty_method_clear_all_cache.php | 2 +- .../sysplugins/smarty_method_clear_assign.php | 2 +- libs/sysplugins/smarty_method_clear_cache.php | 2 +- .../smarty_method_clear_compiled_tpl.php | 6 +- .../sysplugins/smarty_method_clear_config.php | 2 +- .../smarty_method_compile_directory.php | 2 +- libs/sysplugins/smarty_method_config_load.php | 2 +- .../smarty_method_disablecachemodifycheck.php | 4 +- .../smarty_method_disablecaching.php | 4 +- .../smarty_method_disablecompilecheck.php | 4 +- .../smarty_method_disableconfigbooleanize.php | 4 +- .../smarty_method_disableconfigoverwrite.php | 4 +- .../smarty_method_disableconfigreadhidden.php | 4 +- .../smarty_method_disabledebugging.php | 4 +- .../smarty_method_disabledebuggingurlctrl.php | 4 +- .../smarty_method_disabledefaulttimezone.php | 4 +- .../smarty_method_disableforcecompile.php | 4 +- .../smarty_method_disablevariablefilter.php | 4 +- .../smarty_method_enablecachemodifycheck.php | 4 +- .../smarty_method_enablecompilecheck.php | 4 +- .../smarty_method_enableconfigbooleanize.php | 4 +- .../smarty_method_enableconfigoverwrite.php | 4 +- .../smarty_method_enableconfigreadhidden.php | 4 +- .../smarty_method_enabledebugging.php | 4 +- .../smarty_method_enabledebuggingurlctrl.php | 4 +- .../smarty_method_enabledefaulttimezone.php | 4 +- .../smarty_method_enableforcecompile.php | 4 +- .../smarty_method_enablevariablefilter.php | 4 +- .../smarty_method_get_config_vars.php | 2 +- libs/sysplugins/smarty_method_get_global.php | 2 +- .../smarty_method_get_registered_object.php | 2 +- .../smarty_method_get_template_vars.php | 2 +- libs/sysplugins/smarty_method_getcachedir.php | 4 +- .../smarty_method_getcachelifetime.php | 4 +- .../smarty_method_getcompiledir.php | 4 +- .../sysplugins/smarty_method_getconfigdir.php | 4 +- .../smarty_method_getdebugtemplate.php | 4 +- .../smarty_method_getpluginsdir.php | 4 +- .../smarty_method_gettemplatedir.php | 4 +- .../smarty_method_getvariablefilter.php | 4 +- .../smarty_method_iscachemodifycheck.php | 4 +- libs/sysplugins/smarty_method_iscaching.php | 4 +- .../smarty_method_iscompilecheck.php | 4 +- .../smarty_method_isconfigbooleanize.php | 4 +- .../smarty_method_isconfigoverwrite.php | 4 +- .../smarty_method_isconfigreadhidden.php | 4 +- libs/sysplugins/smarty_method_isdebugging.php | 4 +- .../smarty_method_isdebuggingurlctrl.php | 4 +- .../smarty_method_isdefaulttimezone.php | 4 +- .../smarty_method_isforcecompile.php | 4 +- libs/sysplugins/smarty_method_load_filter.php | 2 +- .../smarty_method_register_block.php | 2 +- ...arty_method_register_compiler_function.php | 2 +- .../smarty_method_register_function.php | 2 +- .../smarty_method_register_modifier.php | 2 +- .../smarty_method_register_object.php | 2 +- .../smarty_method_register_outputfilter.php | 2 +- .../smarty_method_register_postfilter.php | 2 +- .../smarty_method_register_prefilter.php | 2 +- .../smarty_method_register_resource.php | 2 +- .../smarty_method_register_variablefilter.php | 2 +- ...ty_method_registerdefaultpluginhandler.php | 4 +- ..._method_registerdefaulttemplatehandler.php | 4 +- .../sysplugins/smarty_method_setconfigdir.php | 4 +- .../smarty_method_setdebugtemplate.php | 4 +- .../smarty_method_setpluginsdir.php | 4 +- .../smarty_method_template_exists.php | 2 +- libs/sysplugins/smarty_method_test.php | 2 +- .../smarty_method_unregister_block.php | 2 +- ...ty_method_unregister_compiler_function.php | 2 +- .../smarty_method_unregister_function.php | 2 +- .../smarty_method_unregister_modifier.php | 2 +- .../smarty_method_unregister_object.php | 2 +- .../smarty_method_unregister_outputfilter.php | 2 +- .../smarty_method_unregister_postfilter.php | 2 +- .../smarty_method_unregister_prefilter.php | 2 +- .../smarty_method_unregister_resource.php | 2 +- ...marty_method_unregister_variablefilter.php | 2 +- .../smarty_security.php} | 2 +- 90 files changed, 162 insertions(+), 171 deletions(-) rename libs/{Security.class.php => sysplugins/smarty_security.php} (94%) diff --git a/change_log.txt b/change_log.txt index 1b80daa8..83634586 100644 --- a/change_log.txt +++ b/change_log.txt @@ -2,6 +2,8 @@ - fixed parser error on objects with special smarty vars - fixed file dependency for {incude} inside {block} tag - fixed not compiling on non existing compiled templates when compile_check = false +- renamed function names of autoloaded Smarty methods to Smarty_Method_.... +- new security_class property (default is Smarty_Security) 11/02/2009 - added neq,lte,gte,mod as aliases to if conditions diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index c65b0d24..ade4c455 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -90,10 +90,10 @@ define('SMARTY_PHP_ALLOW', 3); //-> escape tags as entities spl_autoload_extensions('.php,.inc'); if (set_include_path(SMARTY_SYSPLUGINS_DIR . PATH_SEPARATOR . get_include_path()) !== false) { $spl_funcs = spl_autoload_functions(); - if($spl_funcs === false) - spl_autoload_register(); - elseif(!in_array('spl_autoload',$spl_funcs)) - spl_autoload_register('spl_autoload'); + if ($spl_funcs === false) + spl_autoload_register(); + elseif (!in_array('spl_autoload', $spl_funcs)) + spl_autoload_register('spl_autoload'); } else { spl_autoload_register('smartyAutoload'); } @@ -102,7 +102,7 @@ if (set_include_path(SMARTY_SYSPLUGINS_DIR . PATH_SEPARATOR . get_include_path() */ class Smarty extends Smarty_Internal_TemplateBase { // smarty version - public static $_version = 'Smarty3-SVN$Rev: 3286 $'; + public static $_version = 'Smarty3-SVN$Rev: 3286 $'; // auto literal on delimiters with whitspace public $auto_literal = true; // display error on not assigned variables @@ -125,8 +125,6 @@ class Smarty extends Smarty_Internal_TemplateBase { public $compile_check = true; // use sub dirs for compiled/cached files? public $use_sub_dirs = false; - // php file extention - public $php_ext = '.php'; // compile_error? public $compile_error = false; // caching enabled @@ -145,6 +143,7 @@ class Smarty extends Smarty_Internal_TemplateBase { public $left_delimiter = "{"; public $right_delimiter = "}"; // security + public $security_class = 'Smarty_Security'; public $php_handling = SMARTY_PHP_PASSTHRU; public $allow_php_tag = false; public $allow_php_templates = false; @@ -162,7 +161,7 @@ class Smarty extends Smarty_Internal_TemplateBase { // config var settings public $config_overwrite = true; //Controls whether variables with the same name overwrite each other. public $config_booleanize = true; //Controls whether config values of on/true/yes and off/false/no get converted to boolean - public $config_read_hidden = true; //Controls whether hidden config sections/vars are read from the file. + public $config_read_hidden = true; //Controls whether hidden config sections/vars are read from the file. // config vars public $config_vars = array(); // assigned tpl vars @@ -216,7 +215,7 @@ class Smarty extends Smarty_Internal_TemplateBase { // default file permissions public $_file_perms = 0644; // default dir permissions - public $_dir_perms = 0771; + public $_dir_perms = 0771; // smarty object reference public $smarty = null; @@ -352,25 +351,16 @@ class Smarty extends Smarty_Internal_TemplateBase { } /** - * Load the plugin with security definition and enables security - * - * @param string $security_policy plugin to load + * Loads security class and enables security */ - public function enableSecurity($security_policy_file = null) + public function enableSecurity() { - if (!isset($security_policy_file)) { - $security_policy_file = SMARTY_DIR . 'Security.class.php'; - } - if (file_exists($security_policy_file)) { - require_once($security_policy_file); - if (!class_exists('Smarty_Security_Policy')) { - throw new Exception("Security policy must define class 'Smarty_Security_Policy'"); - } - $this->security_policy = new Smarty_Security_Policy; + if (isset($this->security_class)) { + $this->security_policy = new $this->security_class; $this->security_handler = new Smarty_Internal_Security_Handler($this); $this->security = true; } else { - throw new Exception("Security policy {$security_policy_file} not found"); + throw new Exception('Property security_class is not defined'); } } @@ -459,15 +449,15 @@ class Smarty extends Smarty_Internal_TemplateBase { } // if type is "internal", get plugin from sysplugins if ($_name_parts[1] == 'internal') { - if (file_exists(SMARTY_SYSPLUGINS_DIR . $_plugin_name . $this->php_ext)) { - require_once(SMARTY_SYSPLUGINS_DIR . $_plugin_name . $this->php_ext); + if (file_exists(SMARTY_SYSPLUGINS_DIR . $_plugin_name . '.php')) { + require_once(SMARTY_SYSPLUGINS_DIR . $_plugin_name . '.php'); return true; } else { return false; } } // plugin filename is expected to be: [type].[name].php - $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}{$this->php_ext}"; + $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php"; // loop through plugin dirs and find the plugin foreach((array)$this->plugins_dir as $_plugin_dir) { if (strpos('/\\', substr($_plugin_dir, -1)) === false) { @@ -526,17 +516,18 @@ class Smarty extends Smarty_Internal_TemplateBase { */ public function __call($name, $args) { - if ($name == 'Smarty') { + $name = strtolower($name); + if ($name == 'smarty') { throw new Exception('Please use parent::__construct() to call parent constuctor'); - } - if (!is_callable($name)) { - $_plugin_filename = strtolower('smarty_method_' . $name . $this->php_ext); - if (!file_exists(SMARTY_SYSPLUGINS_DIR . $_plugin_filename)) { - throw new Exception('Undefined Smarty method "'. $name .'"'); - } - require_once(SMARTY_SYSPLUGINS_DIR . $_plugin_filename); } - return call_user_func_array($name, array_merge(array($this), $args)); + $function_name = 'smarty_method_' . $name; + if (!is_callable($function_name)) { + if (!file_exists(SMARTY_SYSPLUGINS_DIR . $function_name . '.php')) { + throw new Exception('Undefined Smarty method "' . $name . '"'); + } + require_once(SMARTY_SYSPLUGINS_DIR . $function_name . '.php'); + } + return call_user_func_array($function_name, array_merge(array($this), $args)); } } diff --git a/libs/sysplugins/smarty_internal_cacheresource_file.php b/libs/sysplugins/smarty_internal_cacheresource_file.php index 691de7ee..4e88b692 100644 --- a/libs/sysplugins/smarty_internal_cacheresource_file.php +++ b/libs/sysplugins/smarty_internal_cacheresource_file.php @@ -93,7 +93,7 @@ class Smarty_Internal_CacheResource_File { { $_dir_sep = $this->smarty->use_sub_dirs ? DS : '^'; if (isset($resource_name)) { - $_resource_part = (string)abs(crc32($resource_name)) . '.' . $resource_name . $this->smarty->php_ext; + $_resource_part = (string)abs(crc32($resource_name)) . '.' . $resource_name . '.php'; } else { $_resource_part = null; } @@ -173,7 +173,7 @@ class Smarty_Internal_CacheResource_File { $_cache_dir .= DS; } - return $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_files[count($_files)-1]) . $this->smarty->php_ext; + return $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_files[count($_files)-1]) . '.php'; } } diff --git a/libs/sysplugins/smarty_internal_config.php b/libs/sysplugins/smarty_internal_config.php index 90d94bd2..412582b9 100644 --- a/libs/sysplugins/smarty_internal_config.php +++ b/libs/sysplugins/smarty_internal_config.php @@ -146,7 +146,7 @@ class Smarty_Internal_Config { if (substr($_compile_dir, -1) != DS) { $_compile_dir .= DS; } - return $_compile_dir . $_filepath . '.' . basename($this->config_resource_name) . '.config' . $this->smarty->php_ext; + return $_compile_dir . $_filepath . '.' . basename($this->config_resource_name) . '.config' . '.php'; } /** * Returns the timpestamp of the compiled file diff --git a/libs/sysplugins/smarty_internal_resource_extend.php b/libs/sysplugins/smarty_internal_resource_extend.php index 7fe30f30..36878deb 100644 --- a/libs/sysplugins/smarty_internal_resource_extend.php +++ b/libs/sysplugins/smarty_internal_resource_extend.php @@ -189,7 +189,7 @@ class Smarty_Internal_Resource_Extend { if (substr($_compile_dir, -1) != DS) { $_compile_dir .= DS; } - return $_compile_dir . $_filepath . '.' . basename($_files[count($_files)-1]) . $_cache . $template->smarty->php_ext; + return $_compile_dir . $_filepath . '.' . basename($_files[count($_files)-1]) . $_cache . '.php'; } } diff --git a/libs/sysplugins/smarty_internal_resource_file.php b/libs/sysplugins/smarty_internal_resource_file.php index 678c36f7..194d6cb9 100644 --- a/libs/sysplugins/smarty_internal_resource_file.php +++ b/libs/sysplugins/smarty_internal_resource_file.php @@ -133,7 +133,7 @@ class Smarty_Internal_Resource_File { if (strpos('/\\', substr($_compile_dir, -1)) === false) { $_compile_dir .= DS; } - return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_template->resource_name). $_cache . $_template->smarty->php_ext; + return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_template->resource_name). $_cache . '.php'; } } diff --git a/libs/sysplugins/smarty_internal_resource_registered.php b/libs/sysplugins/smarty_internal_resource_registered.php index 78c84840..07558d2d 100644 --- a/libs/sysplugins/smarty_internal_resource_registered.php +++ b/libs/sysplugins/smarty_internal_resource_registered.php @@ -145,7 +145,7 @@ class Smarty_Internal_Resource_Registered { if (strpos('/\\', substr($_compile_dir, -1)) === false) { $_compile_dir .= DS; } - return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_template->resource_name) . $_cache . $_template->smarty->php_ext; + return $_compile_dir . $_filepath . '.' . $_template->resource_type . '.' . basename($_template->resource_name) . $_cache . '.php'; } } diff --git a/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/libs/sysplugins/smarty_internal_smartytemplatecompiler.php index b6268c05..c8d81c55 100644 --- a/libs/sysplugins/smarty_internal_smartytemplatecompiler.php +++ b/libs/sysplugins/smarty_internal_smartytemplatecompiler.php @@ -21,8 +21,6 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom $this->smarty = $smarty; parent::__construct(); // get required plugins -// $this->smarty->loadPlugin($lexer_class); -// $this->smarty->loadPlugin($parser_class); $this->lexer_class = $lexer_class; $this->parser_class = $parser_class; } diff --git a/libs/sysplugins/smarty_method__get_filter_name.php b/libs/sysplugins/smarty_method__get_filter_name.php index bfde37cc..9bc18fbc 100644 --- a/libs/sysplugins/smarty_method__get_filter_name.php +++ b/libs/sysplugins/smarty_method__get_filter_name.php @@ -16,7 +16,7 @@ * @param object $smarty * @param callback $function */ -function _get_filter_name($smarty, $function) +function Smarty_Method__get_filter_name($smarty, $function) { if (is_array($function)) { $_class_name = (is_object($function[0]) ? diff --git a/libs/sysplugins/smarty_method_addpluginsdir.php b/libs/sysplugins/smarty_method_addpluginsdir.php index 008183de..24eb1137 100644 --- a/libs/sysplugins/smarty_method_addpluginsdir.php +++ b/libs/sysplugins/smarty_method_addpluginsdir.php @@ -17,7 +17,7 @@ * @param string $ |array $ plugins folder * @return */ -function AddPluginsDir($smarty, $plugins_dir) +function Smarty_Method_AddPluginsDir($smarty, $plugins_dir) { $smarty->plugins_dir = array_merge((array)$smarty->plugins_dir, (array)$plugins_dir); $smarty->plugins_dir = array_unique($smarty->plugins_dir); diff --git a/libs/sysplugins/smarty_method_clear_all_assign.php b/libs/sysplugins/smarty_method_clear_all_assign.php index 42a914fd..9809f03e 100644 --- a/libs/sysplugins/smarty_method_clear_all_assign.php +++ b/libs/sysplugins/smarty_method_clear_all_assign.php @@ -16,7 +16,7 @@ * @param object $smarty * @param object $data_object object which holds tpl_vars */ -function clear_all_assign($smarty, $data_object = null) +function Smarty_Method_Clear_All_Assign($smarty, $data_object = null) { if (isset($data_object)) { $ptr = $data_object; diff --git a/libs/sysplugins/smarty_method_clear_all_cache.php b/libs/sysplugins/smarty_method_clear_all_cache.php index 890f23b1..ca7dd014 100644 --- a/libs/sysplugins/smarty_method_clear_all_cache.php +++ b/libs/sysplugins/smarty_method_clear_all_cache.php @@ -18,7 +18,7 @@ * @param string $type resource type * @return integer number of cache files deleted */ -function clear_all_cache($smarty, $exp_time = null, $type = 'file') +function Smarty_Method_Clear_All_Cache($smarty, $exp_time = null, $type = 'file') { // load cache resource if (!isset($smarty->cache_resource_objects[$type])) { diff --git a/libs/sysplugins/smarty_method_clear_assign.php b/libs/sysplugins/smarty_method_clear_assign.php index e4dabd29..1f1fe0bd 100644 --- a/libs/sysplugins/smarty_method_clear_assign.php +++ b/libs/sysplugins/smarty_method_clear_assign.php @@ -17,7 +17,7 @@ * @param string $ |array $varname variable name or array of variable names * @param object $data_object object which holds tpl_vars */ -function clear_assign($smarty, $varname, $data_object = null) +function Smarty_Method_Clear_Assign($smarty, $varname, $data_object = null) { foreach ((array)$varname as $variable) { if (isset($data_object)) { diff --git a/libs/sysplugins/smarty_method_clear_cache.php b/libs/sysplugins/smarty_method_clear_cache.php index 52e17920..c84edd01 100644 --- a/libs/sysplugins/smarty_method_clear_cache.php +++ b/libs/sysplugins/smarty_method_clear_cache.php @@ -21,7 +21,7 @@ * @param string $type resource type * @return integer number of cache files deleted */ -function clear_cache($smarty, $template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = 'file') +function Smarty_Method_Clear_Cache($smarty, $template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = 'file') { // load cache resource $_cache_resource_class = 'Smarty_Internal_CacheResource_' . $type; diff --git a/libs/sysplugins/smarty_method_clear_compiled_tpl.php b/libs/sysplugins/smarty_method_clear_compiled_tpl.php index 39f4e2ce..2105d6c6 100644 --- a/libs/sysplugins/smarty_method_clear_compiled_tpl.php +++ b/libs/sysplugins/smarty_method_clear_compiled_tpl.php @@ -18,12 +18,12 @@ * @param integer $exp_time expiration time * @return integer number of template files deleted */ -function clear_compiled_tpl($smarty, $resource_name = null, $compile_id = null, $exp_time = null) +function Smarty_Method_Clear_Compiled_Tpl($smarty, $resource_name = null, $compile_id = null, $exp_time = null) { $_dir_sep = $smarty->use_sub_dirs ? DS : '^'; if (isset($resource_name)) { - $_resource_part_1 = $resource_name . $smarty->php_ext; - $_resource_part_2 = $resource_name . '.cache' . $smarty->php_ext; + $_resource_part_1 = $resource_name . '.php'; + $_resource_part_2 = $resource_name . '.cache' . '.php'; } else { $_resource_part = ''; } diff --git a/libs/sysplugins/smarty_method_clear_config.php b/libs/sysplugins/smarty_method_clear_config.php index 6a4644d1..3c752e05 100644 --- a/libs/sysplugins/smarty_method_clear_config.php +++ b/libs/sysplugins/smarty_method_clear_config.php @@ -16,7 +16,7 @@ * @param object $smarty * @param string $varname variable name or null */ -function clear_config($smarty, $varname = null) +function Smarty_Method_Clear_Config($smarty, $varname = null) { if (isset($varname)) { unset($smarty->config_vars[$varname]); diff --git a/libs/sysplugins/smarty_method_compile_directory.php b/libs/sysplugins/smarty_method_compile_directory.php index 103d30d2..48ffff75 100644 --- a/libs/sysplugins/smarty_method_compile_directory.php +++ b/libs/sysplugins/smarty_method_compile_directory.php @@ -16,7 +16,7 @@ * @param string $dir_name name of directories * @return integer number of template files deleted */ -function compile_directory($smarty, $extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null) +function Smarty_Method_Compile_Directory($smarty, $extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null) { function _get_time() { diff --git a/libs/sysplugins/smarty_method_config_load.php b/libs/sysplugins/smarty_method_config_load.php index c0aa5cce..bea6e741 100644 --- a/libs/sysplugins/smarty_method_config_load.php +++ b/libs/sysplugins/smarty_method_config_load.php @@ -17,7 +17,7 @@ * @param string $config_file filename * @param mixed $sections array of section names, single section or null */ -function config_load($smarty, $config_file, $sections = null) +function Smarty_Method_Config_Load($smarty, $config_file, $sections = null) { // load Config class $config = new Smarty_Internal_Config($config_file, $smarty); diff --git a/libs/sysplugins/smarty_method_disablecachemodifycheck.php b/libs/sysplugins/smarty_method_disablecachemodifycheck.php index d6197dfd..aac8fabb 100644 --- a/libs/sysplugins/smarty_method_disablecachemodifycheck.php +++ b/libs/sysplugins/smarty_method_disablecachemodifycheck.php @@ -1,7 +1,7 @@ cache_modified_check = false; return ; diff --git a/libs/sysplugins/smarty_method_disablecaching.php b/libs/sysplugins/smarty_method_disablecaching.php index ba80d605..ba5097af 100644 --- a/libs/sysplugins/smarty_method_disablecaching.php +++ b/libs/sysplugins/smarty_method_disablecaching.php @@ -1,7 +1,7 @@ smarty->caching = false; return; diff --git a/libs/sysplugins/smarty_method_disablecompilecheck.php b/libs/sysplugins/smarty_method_disablecompilecheck.php index c2a33cb8..f18514ff 100644 --- a/libs/sysplugins/smarty_method_disablecompilecheck.php +++ b/libs/sysplugins/smarty_method_disablecompilecheck.php @@ -1,7 +1,7 @@ compile_check = false; return; diff --git a/libs/sysplugins/smarty_method_disableconfigbooleanize.php b/libs/sysplugins/smarty_method_disableconfigbooleanize.php index bae9c537..fa7a434b 100644 --- a/libs/sysplugins/smarty_method_disableconfigbooleanize.php +++ b/libs/sysplugins/smarty_method_disableconfigbooleanize.php @@ -1,7 +1,7 @@ smarty->config_booleanize = false; return; diff --git a/libs/sysplugins/smarty_method_disableconfigoverwrite.php b/libs/sysplugins/smarty_method_disableconfigoverwrite.php index 7eed9b4f..d37cea4c 100644 --- a/libs/sysplugins/smarty_method_disableconfigoverwrite.php +++ b/libs/sysplugins/smarty_method_disableconfigoverwrite.php @@ -1,7 +1,7 @@ config_overwrite = false; return ; diff --git a/libs/sysplugins/smarty_method_disableconfigreadhidden.php b/libs/sysplugins/smarty_method_disableconfigreadhidden.php index a74a9e7f..e5001d60 100644 --- a/libs/sysplugins/smarty_method_disableconfigreadhidden.php +++ b/libs/sysplugins/smarty_method_disableconfigreadhidden.php @@ -1,7 +1,7 @@ smarty->config_read_hidden = false; return; diff --git a/libs/sysplugins/smarty_method_disabledebugging.php b/libs/sysplugins/smarty_method_disabledebugging.php index 752351cf..3cfccd78 100644 --- a/libs/sysplugins/smarty_method_disabledebugging.php +++ b/libs/sysplugins/smarty_method_disabledebugging.php @@ -1,7 +1,7 @@ debugging = false; return; diff --git a/libs/sysplugins/smarty_method_disabledebuggingurlctrl.php b/libs/sysplugins/smarty_method_disabledebuggingurlctrl.php index 37d56966..fa149dbd 100644 --- a/libs/sysplugins/smarty_method_disabledebuggingurlctrl.php +++ b/libs/sysplugins/smarty_method_disabledebuggingurlctrl.php @@ -1,7 +1,7 @@ debugging_ctrl = 'none'; return; diff --git a/libs/sysplugins/smarty_method_disabledefaulttimezone.php b/libs/sysplugins/smarty_method_disabledefaulttimezone.php index d989141f..3aef9cb5 100644 --- a/libs/sysplugins/smarty_method_disabledefaulttimezone.php +++ b/libs/sysplugins/smarty_method_disabledefaulttimezone.php @@ -1,7 +1,7 @@ set_timezone = false; return; diff --git a/libs/sysplugins/smarty_method_disableforcecompile.php b/libs/sysplugins/smarty_method_disableforcecompile.php index 710497e7..7dab1679 100644 --- a/libs/sysplugins/smarty_method_disableforcecompile.php +++ b/libs/sysplugins/smarty_method_disableforcecompile.php @@ -1,7 +1,7 @@ force_compile = false; return; diff --git a/libs/sysplugins/smarty_method_disablevariablefilter.php b/libs/sysplugins/smarty_method_disablevariablefilter.php index d3b74378..173bdfe8 100644 --- a/libs/sysplugins/smarty_method_disablevariablefilter.php +++ b/libs/sysplugins/smarty_method_disablevariablefilter.php @@ -1,7 +1,7 @@ variable_filter = false; return; diff --git a/libs/sysplugins/smarty_method_enablecachemodifycheck.php b/libs/sysplugins/smarty_method_enablecachemodifycheck.php index b1bb97fa..31dbbeb4 100644 --- a/libs/sysplugins/smarty_method_enablecachemodifycheck.php +++ b/libs/sysplugins/smarty_method_enablecachemodifycheck.php @@ -1,7 +1,7 @@ cache_modified_check = true; return; diff --git a/libs/sysplugins/smarty_method_enablecompilecheck.php b/libs/sysplugins/smarty_method_enablecompilecheck.php index 178c7e13..23cd2837 100644 --- a/libs/sysplugins/smarty_method_enablecompilecheck.php +++ b/libs/sysplugins/smarty_method_enablecompilecheck.php @@ -1,7 +1,7 @@ compile_check = true; return; diff --git a/libs/sysplugins/smarty_method_enableconfigbooleanize.php b/libs/sysplugins/smarty_method_enableconfigbooleanize.php index df765ee7..ab7bd146 100644 --- a/libs/sysplugins/smarty_method_enableconfigbooleanize.php +++ b/libs/sysplugins/smarty_method_enableconfigbooleanize.php @@ -1,7 +1,7 @@ config_booleanize = true; return; diff --git a/libs/sysplugins/smarty_method_enableconfigoverwrite.php b/libs/sysplugins/smarty_method_enableconfigoverwrite.php index 319baecf..7f0cc716 100644 --- a/libs/sysplugins/smarty_method_enableconfigoverwrite.php +++ b/libs/sysplugins/smarty_method_enableconfigoverwrite.php @@ -1,7 +1,7 @@ config_overwrite = true; return; diff --git a/libs/sysplugins/smarty_method_enableconfigreadhidden.php b/libs/sysplugins/smarty_method_enableconfigreadhidden.php index c9d0cdf3..982d0fd6 100644 --- a/libs/sysplugins/smarty_method_enableconfigreadhidden.php +++ b/libs/sysplugins/smarty_method_enableconfigreadhidden.php @@ -1,7 +1,7 @@ smarty->config_read_hidden = true; return; diff --git a/libs/sysplugins/smarty_method_enabledebugging.php b/libs/sysplugins/smarty_method_enabledebugging.php index e988f296..3f3cc90c 100644 --- a/libs/sysplugins/smarty_method_enabledebugging.php +++ b/libs/sysplugins/smarty_method_enabledebugging.php @@ -1,7 +1,7 @@ smarty->debugging = true; return; diff --git a/libs/sysplugins/smarty_method_enabledebuggingurlctrl.php b/libs/sysplugins/smarty_method_enabledebuggingurlctrl.php index 535db4b6..07432701 100644 --- a/libs/sysplugins/smarty_method_enabledebuggingurlctrl.php +++ b/libs/sysplugins/smarty_method_enabledebuggingurlctrl.php @@ -1,7 +1,7 @@ debugging_ctrl = 'URL'; return; diff --git a/libs/sysplugins/smarty_method_enabledefaulttimezone.php b/libs/sysplugins/smarty_method_enabledefaulttimezone.php index 0f3a25ad..e5a7f273 100644 --- a/libs/sysplugins/smarty_method_enabledefaulttimezone.php +++ b/libs/sysplugins/smarty_method_enabledefaulttimezone.php @@ -1,7 +1,7 @@ smarty->set_timezone = true; return; diff --git a/libs/sysplugins/smarty_method_enableforcecompile.php b/libs/sysplugins/smarty_method_enableforcecompile.php index 25d678d5..f78fc917 100644 --- a/libs/sysplugins/smarty_method_enableforcecompile.php +++ b/libs/sysplugins/smarty_method_enableforcecompile.php @@ -1,7 +1,7 @@ force_compile = true; return; diff --git a/libs/sysplugins/smarty_method_enablevariablefilter.php b/libs/sysplugins/smarty_method_enablevariablefilter.php index 0b5f9a3f..6abe9231 100644 --- a/libs/sysplugins/smarty_method_enablevariablefilter.php +++ b/libs/sysplugins/smarty_method_enablevariablefilter.php @@ -1,7 +1,7 @@ variable_filter = true; return; diff --git a/libs/sysplugins/smarty_method_get_config_vars.php b/libs/sysplugins/smarty_method_get_config_vars.php index f6cc4662..9bbf4b58 100644 --- a/libs/sysplugins/smarty_method_get_config_vars.php +++ b/libs/sysplugins/smarty_method_get_config_vars.php @@ -20,7 +20,7 @@ * @param string $varname variable name or null * @return string variable value or or array of variables */ -function Get_Config_Vars($smarty, $varname = null) +function Smarty_Method_Get_Config_Vars($smarty, $varname = null) { if (isset($varname)) { if (isset($smarty->config_vars[$varname])) { diff --git a/libs/sysplugins/smarty_method_get_global.php b/libs/sysplugins/smarty_method_get_global.php index 410ea184..539e0822 100644 --- a/libs/sysplugins/smarty_method_get_global.php +++ b/libs/sysplugins/smarty_method_get_global.php @@ -17,7 +17,7 @@ * @param string $varname variable name or null * @return string variable value or or array of variables */ -function get_global($smarty, $varname = null) +function Smarty_Method_Get_Global($smarty, $varname = null) { if (isset($varname)) { if (isset($smarty->global_tpl_vars[$varname])) { diff --git a/libs/sysplugins/smarty_method_get_registered_object.php b/libs/sysplugins/smarty_method_get_registered_object.php index a704df06..147a1f35 100644 --- a/libs/sysplugins/smarty_method_get_registered_object.php +++ b/libs/sysplugins/smarty_method_get_registered_object.php @@ -20,7 +20,7 @@ * @param string $name * @return object */ -function get_registered_object($smarty, $name) +function Smarty_Method_Get_Registered_Object($smarty, $name) { if (!isset($smarty->registered_objects[$name])) throw new Exception("'$name' is not a registered object"); diff --git a/libs/sysplugins/smarty_method_get_template_vars.php b/libs/sysplugins/smarty_method_get_template_vars.php index 5851f92b..9bfdbd86 100644 --- a/libs/sysplugins/smarty_method_get_template_vars.php +++ b/libs/sysplugins/smarty_method_get_template_vars.php @@ -20,7 +20,7 @@ * @param string $varname variable name or null * @return string variable value or or array of variables */ -function get_template_vars($smarty, $varname = null, $_ptr = null, $search_parents = true) +function Smarty_Method_Get_Template_Vars($smarty, $varname = null, $_ptr = null, $search_parents = true) { if (isset($varname)) { $_var = $smarty->getVariable($varname, $_ptr, $search_parents); diff --git a/libs/sysplugins/smarty_method_getcachedir.php b/libs/sysplugins/smarty_method_getcachedir.php index 29e88f22..47ed8776 100644 --- a/libs/sysplugins/smarty_method_getcachedir.php +++ b/libs/sysplugins/smarty_method_getcachedir.php @@ -1,7 +1,7 @@ smarty->cache_dir; } diff --git a/libs/sysplugins/smarty_method_getcachelifetime.php b/libs/sysplugins/smarty_method_getcachelifetime.php index a05796fa..0db4fc76 100644 --- a/libs/sysplugins/smarty_method_getcachelifetime.php +++ b/libs/sysplugins/smarty_method_getcachelifetime.php @@ -1,7 +1,7 @@ cache_lifetime; } diff --git a/libs/sysplugins/smarty_method_getcompiledir.php b/libs/sysplugins/smarty_method_getcompiledir.php index 5a9da46f..929da274 100644 --- a/libs/sysplugins/smarty_method_getcompiledir.php +++ b/libs/sysplugins/smarty_method_getcompiledir.php @@ -1,7 +1,7 @@ smarty->compile_dir; } diff --git a/libs/sysplugins/smarty_method_getconfigdir.php b/libs/sysplugins/smarty_method_getconfigdir.php index 76244115..79e55b6e 100644 --- a/libs/sysplugins/smarty_method_getconfigdir.php +++ b/libs/sysplugins/smarty_method_getconfigdir.php @@ -1,7 +1,7 @@ config_dir; } diff --git a/libs/sysplugins/smarty_method_getdebugtemplate.php b/libs/sysplugins/smarty_method_getdebugtemplate.php index dcc422e3..81091695 100644 --- a/libs/sysplugins/smarty_method_getdebugtemplate.php +++ b/libs/sysplugins/smarty_method_getdebugtemplate.php @@ -1,7 +1,7 @@ debug_tpl; } diff --git a/libs/sysplugins/smarty_method_getpluginsdir.php b/libs/sysplugins/smarty_method_getpluginsdir.php index 3abed526..6fa98a3f 100644 --- a/libs/sysplugins/smarty_method_getpluginsdir.php +++ b/libs/sysplugins/smarty_method_getpluginsdir.php @@ -1,7 +1,7 @@ plugins_dir; } diff --git a/libs/sysplugins/smarty_method_gettemplatedir.php b/libs/sysplugins/smarty_method_gettemplatedir.php index 6d59a7d0..2fa1df88 100644 --- a/libs/sysplugins/smarty_method_gettemplatedir.php +++ b/libs/sysplugins/smarty_method_gettemplatedir.php @@ -1,7 +1,7 @@ template_dir; } diff --git a/libs/sysplugins/smarty_method_getvariablefilter.php b/libs/sysplugins/smarty_method_getvariablefilter.php index f6ce1293..9d7d0c4e 100644 --- a/libs/sysplugins/smarty_method_getvariablefilter.php +++ b/libs/sysplugins/smarty_method_getvariablefilter.php @@ -1,7 +1,7 @@ variable_filter; } diff --git a/libs/sysplugins/smarty_method_iscachemodifycheck.php b/libs/sysplugins/smarty_method_iscachemodifycheck.php index f9976a8d..4e93b17a 100644 --- a/libs/sysplugins/smarty_method_iscachemodifycheck.php +++ b/libs/sysplugins/smarty_method_iscachemodifycheck.php @@ -1,7 +1,7 @@ cache_modified_check; } diff --git a/libs/sysplugins/smarty_method_iscaching.php b/libs/sysplugins/smarty_method_iscaching.php index bebfb58a..e27bd0ac 100644 --- a/libs/sysplugins/smarty_method_iscaching.php +++ b/libs/sysplugins/smarty_method_iscaching.php @@ -1,7 +1,7 @@ caching; } diff --git a/libs/sysplugins/smarty_method_iscompilecheck.php b/libs/sysplugins/smarty_method_iscompilecheck.php index 297ddb52..904ad4ca 100644 --- a/libs/sysplugins/smarty_method_iscompilecheck.php +++ b/libs/sysplugins/smarty_method_iscompilecheck.php @@ -1,7 +1,7 @@ compile_check; } diff --git a/libs/sysplugins/smarty_method_isconfigbooleanize.php b/libs/sysplugins/smarty_method_isconfigbooleanize.php index d6f95fa9..605474ba 100644 --- a/libs/sysplugins/smarty_method_isconfigbooleanize.php +++ b/libs/sysplugins/smarty_method_isconfigbooleanize.php @@ -1,7 +1,7 @@ config_booleanize; } diff --git a/libs/sysplugins/smarty_method_isconfigoverwrite.php b/libs/sysplugins/smarty_method_isconfigoverwrite.php index 28931cd3..fb10f0ea 100644 --- a/libs/sysplugins/smarty_method_isconfigoverwrite.php +++ b/libs/sysplugins/smarty_method_isconfigoverwrite.php @@ -1,7 +1,7 @@ config_overwrite; } diff --git a/libs/sysplugins/smarty_method_isconfigreadhidden.php b/libs/sysplugins/smarty_method_isconfigreadhidden.php index 47c6c771..e13c84d0 100644 --- a/libs/sysplugins/smarty_method_isconfigreadhidden.php +++ b/libs/sysplugins/smarty_method_isconfigreadhidden.php @@ -1,7 +1,7 @@ config_read_hidden; } diff --git a/libs/sysplugins/smarty_method_isdebugging.php b/libs/sysplugins/smarty_method_isdebugging.php index 277c11df..9d36eb41 100644 --- a/libs/sysplugins/smarty_method_isdebugging.php +++ b/libs/sysplugins/smarty_method_isdebugging.php @@ -1,7 +1,7 @@ debugging; } diff --git a/libs/sysplugins/smarty_method_isdebuggingurlctrl.php b/libs/sysplugins/smarty_method_isdebuggingurlctrl.php index de551fb3..5487cd19 100644 --- a/libs/sysplugins/smarty_method_isdebuggingurlctrl.php +++ b/libs/sysplugins/smarty_method_isdebuggingurlctrl.php @@ -1,7 +1,7 @@ debugging_ctrl != 'none'; } diff --git a/libs/sysplugins/smarty_method_isdefaulttimezone.php b/libs/sysplugins/smarty_method_isdefaulttimezone.php index 92839c40..dd221177 100644 --- a/libs/sysplugins/smarty_method_isdefaulttimezone.php +++ b/libs/sysplugins/smarty_method_isdefaulttimezone.php @@ -1,7 +1,7 @@ set_timezone = false; } diff --git a/libs/sysplugins/smarty_method_isforcecompile.php b/libs/sysplugins/smarty_method_isforcecompile.php index 28c6d4ac..94c62a01 100644 --- a/libs/sysplugins/smarty_method_isforcecompile.php +++ b/libs/sysplugins/smarty_method_isforcecompile.php @@ -1,7 +1,7 @@ force_compile; } diff --git a/libs/sysplugins/smarty_method_load_filter.php b/libs/sysplugins/smarty_method_load_filter.php index 9d58ccdb..cb82ea1d 100644 --- a/libs/sysplugins/smarty_method_load_filter.php +++ b/libs/sysplugins/smarty_method_load_filter.php @@ -16,7 +16,7 @@ * @param string $type filter type * @param string $name filter name */ -function load_filter($smarty, $type, $name) +function Smarty_Method_Load_Filter($smarty, $type, $name) { $_plugin = "smarty_{$type}filter_{$name}"; $_filter_name = $_plugin; diff --git a/libs/sysplugins/smarty_method_register_block.php b/libs/sysplugins/smarty_method_register_block.php index 16bcbfae..c2bf1cbd 100644 --- a/libs/sysplugins/smarty_method_register_block.php +++ b/libs/sysplugins/smarty_method_register_block.php @@ -21,7 +21,7 @@ * @param string $block_impl PHP function to register * @param boolean $cacheable if true (default) this fuction is cachable */ -function register_block($smarty, $block_tag, $block_impl, $cacheable = true, $cache_attr = array()) +function Smarty_Method_Register_Block($smarty, $block_tag, $block_impl, $cacheable = true, $cache_attr = array()) { if (isset($smarty->registered_plugins[$block_tag])) { throw new Exception("Plugin tag \"{$block_tag}\" already registered"); diff --git a/libs/sysplugins/smarty_method_register_compiler_function.php b/libs/sysplugins/smarty_method_register_compiler_function.php index d84cb4bd..5d747441 100644 --- a/libs/sysplugins/smarty_method_register_compiler_function.php +++ b/libs/sysplugins/smarty_method_register_compiler_function.php @@ -20,7 +20,7 @@ * @param string $compiler_tag of template function * @param string $compiler_impl name of PHP function to register */ -function register_compiler_function($smarty, $compiler_tag, $compiler_impl, $cacheable = true) +function Smarty_Method_Register_Compiler_Function($smarty, $compiler_tag, $compiler_impl, $cacheable = true) { if (isset($smarty->registered_plugins[$compiler_tag])) { throw new Exception("Plugin tag \"{$compiler_tag}\" already registered"); diff --git a/libs/sysplugins/smarty_method_register_function.php b/libs/sysplugins/smarty_method_register_function.php index 27eae98c..ceb80487 100644 --- a/libs/sysplugins/smarty_method_register_function.php +++ b/libs/sysplugins/smarty_method_register_function.php @@ -18,7 +18,7 @@ * @param string $function_impl the name of the PHP function to register * @param boolean $cacheable if true (default) this fuction is cachable */ -function register_function($smarty, $function_tag, $function_impl, $cacheable = true, $cache_attr = array()) +function Smarty_Method_Register_Function($smarty, $function_tag, $function_impl, $cacheable = true, $cache_attr = array()) { if (isset($smarty->registered_plugins[$function_tag])) { throw new Exception("Plugin tag \"{$function_tag}\" already registered"); diff --git a/libs/sysplugins/smarty_method_register_modifier.php b/libs/sysplugins/smarty_method_register_modifier.php index e89e4e08..7d9986c7 100644 --- a/libs/sysplugins/smarty_method_register_modifier.php +++ b/libs/sysplugins/smarty_method_register_modifier.php @@ -17,7 +17,7 @@ * @param string $modifier name of template modifier * @param string $modifier_impl name of PHP function to register */ -function register_modifier($smarty, $modifier, $modifier_impl) +function Smarty_Method_Register_Modifier($smarty, $modifier, $modifier_impl) { if (isset($smarty->registered_plugins[$modifier])) { throw new Exception("Plugin \"{$modifier}\" already registered"); diff --git a/libs/sysplugins/smarty_method_register_object.php b/libs/sysplugins/smarty_method_register_object.php index 2ea88371..a4d0e607 100644 --- a/libs/sysplugins/smarty_method_register_object.php +++ b/libs/sysplugins/smarty_method_register_object.php @@ -20,7 +20,7 @@ * @param boolean $smarty_args smarty argument format, else traditional * @param null $ |array $block_functs list of methods that are block format */ -function register_object($smarty, $object, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array()) +function Smarty_Method_Register_Object($smarty, $object, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array()) { // test if allowed methodes callable if (!empty($allowed)) { diff --git a/libs/sysplugins/smarty_method_register_outputfilter.php b/libs/sysplugins/smarty_method_register_outputfilter.php index f6bfd73f..46012640 100644 --- a/libs/sysplugins/smarty_method_register_outputfilter.php +++ b/libs/sysplugins/smarty_method_register_outputfilter.php @@ -17,7 +17,7 @@ * @param object $smarty * @param callback $function */ -function register_outputfilter($smarty, $function) +function Smarty_Method_Register_Outputfilter($smarty, $function) { $smarty->registered_filters['output'][$smarty->_get_filter_name($function)] = $function; } diff --git a/libs/sysplugins/smarty_method_register_postfilter.php b/libs/sysplugins/smarty_method_register_postfilter.php index fe3aaef8..1d8c2e77 100644 --- a/libs/sysplugins/smarty_method_register_postfilter.php +++ b/libs/sysplugins/smarty_method_register_postfilter.php @@ -17,7 +17,7 @@ * @param object $smarty * @param callback $function */ -function register_postfilter($smarty, $function) +function Smarty_Method_Register_Postfilter($smarty, $function) { $smarty->registered_filters['post'][$smarty->_get_filter_name($function)] = $function; } diff --git a/libs/sysplugins/smarty_method_register_prefilter.php b/libs/sysplugins/smarty_method_register_prefilter.php index 073e75fe..781700d0 100644 --- a/libs/sysplugins/smarty_method_register_prefilter.php +++ b/libs/sysplugins/smarty_method_register_prefilter.php @@ -17,7 +17,7 @@ * @param object $smarty * @param callback $function */ -function register_prefilter($smarty, $function) +function Smarty_Method_Register_Prefilter($smarty, $function) { $smarty->registered_filters['pre'][$smarty->_get_filter_name($function)] = $function; } diff --git a/libs/sysplugins/smarty_method_register_resource.php b/libs/sysplugins/smarty_method_register_resource.php index a1725612..09f5e891 100644 --- a/libs/sysplugins/smarty_method_register_resource.php +++ b/libs/sysplugins/smarty_method_register_resource.php @@ -17,7 +17,7 @@ * @param string $type name of resource * @param array $functions array of functions to handle resource */ -function register_resource($smarty, $type, $functions) +function Smarty_Method_Register_Resource($smarty, $type, $functions) { if (count($functions) == 4) { $smarty->_plugins['resource'][$type] = diff --git a/libs/sysplugins/smarty_method_register_variablefilter.php b/libs/sysplugins/smarty_method_register_variablefilter.php index 3dd4689d..3052d34b 100644 --- a/libs/sysplugins/smarty_method_register_variablefilter.php +++ b/libs/sysplugins/smarty_method_register_variablefilter.php @@ -17,7 +17,7 @@ * @param object $smarty * @param callback $function */ -function register_variablefilter($smarty, $function) +function Smarty_Method_Register_Variablefilter($smarty, $function) { $smarty->registered_filters['variable'][$smarty->_get_filter_name($function)] = $function; } diff --git a/libs/sysplugins/smarty_method_registerdefaultpluginhandler.php b/libs/sysplugins/smarty_method_registerdefaultpluginhandler.php index 9fe38e50..fe1e25b5 100644 --- a/libs/sysplugins/smarty_method_registerdefaultpluginhandler.php +++ b/libs/sysplugins/smarty_method_registerdefaultpluginhandler.php @@ -1,7 +1,7 @@ default_plugin_handler_func = $plugin; diff --git a/libs/sysplugins/smarty_method_registerdefaulttemplatehandler.php b/libs/sysplugins/smarty_method_registerdefaulttemplatehandler.php index 92c440ce..1b716afe 100644 --- a/libs/sysplugins/smarty_method_registerdefaulttemplatehandler.php +++ b/libs/sysplugins/smarty_method_registerdefaulttemplatehandler.php @@ -1,7 +1,7 @@ default_template_handler_func = $function; diff --git a/libs/sysplugins/smarty_method_setconfigdir.php b/libs/sysplugins/smarty_method_setconfigdir.php index 2c549f90..6e501f6a 100644 --- a/libs/sysplugins/smarty_method_setconfigdir.php +++ b/libs/sysplugins/smarty_method_setconfigdir.php @@ -1,7 +1,7 @@ smarty->config_dir = $config_dir; return; diff --git a/libs/sysplugins/smarty_method_setdebugtemplate.php b/libs/sysplugins/smarty_method_setdebugtemplate.php index 149efe7f..4e9cc1fa 100644 --- a/libs/sysplugins/smarty_method_setdebugtemplate.php +++ b/libs/sysplugins/smarty_method_setdebugtemplate.php @@ -1,7 +1,7 @@ debug_tpl = $debug_tpl; return; diff --git a/libs/sysplugins/smarty_method_setpluginsdir.php b/libs/sysplugins/smarty_method_setpluginsdir.php index 7f4379fe..57ed8f2d 100644 --- a/libs/sysplugins/smarty_method_setpluginsdir.php +++ b/libs/sysplugins/smarty_method_setpluginsdir.php @@ -1,7 +1,7 @@ plugins_dir = (array)$plugins_dir; return; diff --git a/libs/sysplugins/smarty_method_template_exists.php b/libs/sysplugins/smarty_method_template_exists.php index 107b4fcb..8ece1ae1 100644 --- a/libs/sysplugins/smarty_method_template_exists.php +++ b/libs/sysplugins/smarty_method_template_exists.php @@ -20,7 +20,7 @@ * @param string $resource_name template name * @return boolean status */ -function template_exists($smarty, $resource_name) +function Smarty_Method_Template_Exists($smarty, $resource_name) { // create template object $tpl = new $smarty->template_class($resource_name, $smarty); diff --git a/libs/sysplugins/smarty_method_test.php b/libs/sysplugins/smarty_method_test.php index ae7cc493..53f8594c 100644 --- a/libs/sysplugins/smarty_method_test.php +++ b/libs/sysplugins/smarty_method_test.php @@ -8,7 +8,7 @@ * @subpackage plugins */ -function test($smarty) +function Smarty_Method_Test($smarty) { echo "
\n";
 
diff --git a/libs/sysplugins/smarty_method_unregister_block.php b/libs/sysplugins/smarty_method_unregister_block.php
index 9e747bdf..2b6867a5 100644
--- a/libs/sysplugins/smarty_method_unregister_block.php
+++ b/libs/sysplugins/smarty_method_unregister_block.php
@@ -19,7 +19,7 @@
 * 
 * @param string $block_tag name of template function
 */
-function unregister_block($smarty, $block_tag)
+function  Smarty_Method_Unregister_Block($smarty, $block_tag)
 {
     if (isset($smarty->registered_plugins[$block_tag]) && $smarty->registered_plugins[$block_tag][0] == 'block') {
         unset($smarty->registered_plugins[$block_tag]);
diff --git a/libs/sysplugins/smarty_method_unregister_compiler_function.php b/libs/sysplugins/smarty_method_unregister_compiler_function.php
index 516a4d5d..3769b030 100644
--- a/libs/sysplugins/smarty_method_unregister_compiler_function.php
+++ b/libs/sysplugins/smarty_method_unregister_compiler_function.php
@@ -19,7 +19,7 @@
 * 
 * @param string $compiler_tag name of template function
 */
-function unregister_compiler_function($smarty, $compiler_tag)
+function  Smarty_Method_Unregister_Compiler_Function($smarty, $compiler_tag)
 {
     if (isset($smarty->registered_plugins[$compiler_tag]) && $smarty->registered_plugins[$compiler_tag][0] == 'compiler') {
         unset($smarty->registered_plugins[$compiler_tag]);
diff --git a/libs/sysplugins/smarty_method_unregister_function.php b/libs/sysplugins/smarty_method_unregister_function.php
index 6fe411b9..99c0d43a 100644
--- a/libs/sysplugins/smarty_method_unregister_function.php
+++ b/libs/sysplugins/smarty_method_unregister_function.php
@@ -19,7 +19,7 @@
 * 
 * @param string $function_tag name of template function
 */
-function unregister_function($smarty, $function_tag)
+function  Smarty_Method_Unregister_Function($smarty, $function_tag)
 {
     if (isset($smarty->registered_plugins[$function_tag]) && $smarty->registered_plugins[$function_tag][0] == 'function') {
         unset($smarty->registered_plugins[$function_tag]);
diff --git a/libs/sysplugins/smarty_method_unregister_modifier.php b/libs/sysplugins/smarty_method_unregister_modifier.php
index c86e7974..84c78fca 100644
--- a/libs/sysplugins/smarty_method_unregister_modifier.php
+++ b/libs/sysplugins/smarty_method_unregister_modifier.php
@@ -19,7 +19,7 @@
 * 
 * @param string $modifier name of template modifier
 */
-function unregister_modifier($smarty, $modifier)
+function  Smarty_Method_Unregister_Modifier($smarty, $modifier)
 {
     if (isset($smarty->registered_plugins[$modifier]) && $smarty->registered_plugins[$modifier][0] == 'modifier') {
         unset($smarty->registered_plugins[$modifier]);
diff --git a/libs/sysplugins/smarty_method_unregister_object.php b/libs/sysplugins/smarty_method_unregister_object.php
index 83f1e012..0be5c25c 100644
--- a/libs/sysplugins/smarty_method_unregister_object.php
+++ b/libs/sysplugins/smarty_method_unregister_object.php
@@ -20,7 +20,7 @@
     * 
     * @param string $object name of template object
     */
-     function unregister_object($smarty, $object)
+     function  Smarty_Method_Unregister_Object($smarty, $object)
     {
         unset($smarty->registered_objects[$object]);
     } 
diff --git a/libs/sysplugins/smarty_method_unregister_outputfilter.php b/libs/sysplugins/smarty_method_unregister_outputfilter.php
index c43a2d51..b71a7792 100644
--- a/libs/sysplugins/smarty_method_unregister_outputfilter.php
+++ b/libs/sysplugins/smarty_method_unregister_outputfilter.php
@@ -20,7 +20,7 @@
 * 
 * @param callback $function 
 */
-function unregister_outputfilter($smarty, $function)
+function  Smarty_Method_Unregister_Outputfilter($smarty, $function)
 {
     unset($smarty->registered_filters['output'][$smarty->_get_filter_name($function)]);
 } 
diff --git a/libs/sysplugins/smarty_method_unregister_postfilter.php b/libs/sysplugins/smarty_method_unregister_postfilter.php
index 91677d94..17aa49bb 100644
--- a/libs/sysplugins/smarty_method_unregister_postfilter.php
+++ b/libs/sysplugins/smarty_method_unregister_postfilter.php
@@ -19,7 +19,7 @@
 * 
 * @param callback $function 
 */
-function unregister_postfilter($smarty, $function)
+function  Smarty_Method_Unregister_Postfilter($smarty, $function)
 {
     unset($smarty->registered_filters['post'][$smarty->_get_filter_name($function)]);
 } 
diff --git a/libs/sysplugins/smarty_method_unregister_prefilter.php b/libs/sysplugins/smarty_method_unregister_prefilter.php
index cc54121c..b77eaf65 100644
--- a/libs/sysplugins/smarty_method_unregister_prefilter.php
+++ b/libs/sysplugins/smarty_method_unregister_prefilter.php
@@ -19,7 +19,7 @@
 * 
 * @param callback $function 
 */
-function unregister_prefilter($smarty, $function)
+function  Smarty_Method_Unregister_Prefilter($smarty, $function)
 {
     unset($smarty->registered_filters['pre'][$smarty->_get_filter_name($function)]);
 } 
diff --git a/libs/sysplugins/smarty_method_unregister_resource.php b/libs/sysplugins/smarty_method_unregister_resource.php
index 14c2e182..b17875ac 100644
--- a/libs/sysplugins/smarty_method_unregister_resource.php
+++ b/libs/sysplugins/smarty_method_unregister_resource.php
@@ -19,7 +19,7 @@
 * 
 * @param string $type name of resource
 */
-function Unregister_Resource($smarty, $type)
+function  Smarty_Method_Unregister_Resource($smarty, $type)
 {
     unset($smarty->plugins['resource'][$type]);
 } 
diff --git a/libs/sysplugins/smarty_method_unregister_variablefilter.php b/libs/sysplugins/smarty_method_unregister_variablefilter.php
index 0a3ecc5f..032943ba 100644
--- a/libs/sysplugins/smarty_method_unregister_variablefilter.php
+++ b/libs/sysplugins/smarty_method_unregister_variablefilter.php
@@ -19,7 +19,7 @@
 * 
 * @param callback $function 
 */
-function unregister_variablefilter($smarty, $function)
+function  Smarty_Method_Unregister_Variablefilter($smarty, $function)
 {
     unset($smarty->registered_filters['variable'][$smarty->_get_filter_name($function)]);
 } 
diff --git a/libs/Security.class.php b/libs/sysplugins/smarty_security.php
similarity index 94%
rename from libs/Security.class.php
rename to libs/sysplugins/smarty_security.php
index 135cdf31..adb368f0 100644
--- a/libs/Security.class.php
+++ b/libs/sysplugins/smarty_security.php
@@ -10,7 +10,7 @@
 /**
 * This class does contain the security settings
 */
-class Smarty_Security_Policy {
+class Smarty_Security {
     /**
     * This determines how Smarty handles "" tags in templates.
     * possible values: