From 6c31a4b58708c60be5641570179d6a3f788868e0 Mon Sep 17 00:00:00 2001 From: Josh Sherman Date: Thu, 24 Apr 2008 16:10:25 +0000 Subject: [PATCH] Moved Smarty to the contrib directory git-svn-id: http://svn.cleancode.org/svn/pickles@16 4d10bc64-7434-11dc-a737-d2d0f8310089 --- classes/Controller.php | 7 ++- .../smarty}/Config_File.class.php | 0 {smarty => contrib/smarty}/Smarty.class.php | 0 .../smarty}/Smarty_Compiler.class.php | 0 {smarty => contrib/smarty}/debug.tpl | 0 .../core.assemble_plugin_filepath.php | 0 .../core.assign_smarty_interface.php | 0 .../internals/core.create_dir_structure.php | 0 .../internals/core.display_debug_console.php | 0 .../internals/core.get_include_path.php | 0 .../smarty}/internals/core.get_microtime.php | 0 .../internals/core.get_php_resource.php | 0 .../smarty}/internals/core.is_secure.php | 0 .../smarty}/internals/core.is_trusted.php | 0 .../smarty}/internals/core.load_plugins.php | 0 .../internals/core.load_resource_plugin.php | 0 .../internals/core.process_cached_inserts.php | 0 .../core.process_compiled_include.php | 0 .../internals/core.read_cache_file.php | 0 .../smarty}/internals/core.rm_auto.php | 0 .../smarty}/internals/core.rmdir.php | 0 .../internals/core.run_insert_handler.php | 0 .../internals/core.smarty_include_php.php | 0 .../internals/core.write_cache_file.php | 0 .../internals/core.write_compiled_include.php | 0 .../core.write_compiled_resource.php | 0 .../smarty}/internals/core.write_file.php | 0 .../smarty}/plugins/block.textformat.php | 0 .../smarty}/plugins/compiler.assign.php | 0 .../plugins/function.assign_debug_info.php | 0 .../smarty}/plugins/function.config_load.php | 0 .../smarty}/plugins/function.counter.php | 0 .../smarty}/plugins/function.cycle.php | 0 .../smarty}/plugins/function.debug.php | 0 .../smarty}/plugins/function.eval.php | 0 .../smarty}/plugins/function.fetch.php | 0 .../plugins/function.html_checkboxes.php | 0 .../smarty}/plugins/function.html_image.php | 0 .../smarty}/plugins/function.html_options.php | 0 .../smarty}/plugins/function.html_radios.php | 0 .../plugins/function.html_select_date.php | 0 .../plugins/function.html_select_time.php | 0 .../smarty}/plugins/function.html_table.php | 0 .../smarty}/plugins/function.mailto.php | 0 .../smarty}/plugins/function.math.php | 0 .../smarty}/plugins/function.popup.php | 0 .../smarty}/plugins/function.popup_init.php | 0 .../smarty}/plugins/modifier.capitalize.php | 0 .../smarty}/plugins/modifier.cat.php | 0 .../plugins/modifier.count_characters.php | 0 .../plugins/modifier.count_paragraphs.php | 0 .../plugins/modifier.count_sentences.php | 0 .../smarty}/plugins/modifier.count_words.php | 0 .../smarty}/plugins/modifier.date_format.php | 0 .../plugins/modifier.debug_print_var.php | 0 .../smarty}/plugins/modifier.default.php | 0 .../smarty}/plugins/modifier.escape.php | 0 .../smarty}/plugins/modifier.indent.php | 0 .../smarty}/plugins/modifier.lower.php | 0 .../smarty}/plugins/modifier.nl2br.php | 0 .../plugins/modifier.regex_replace.php | 0 .../smarty}/plugins/modifier.replace.php | 0 .../smarty}/plugins/modifier.spacify.php | 0 .../plugins/modifier.string_format.php | 0 .../smarty}/plugins/modifier.strip.php | 0 .../smarty}/plugins/modifier.strip_tags.php | 0 .../smarty}/plugins/modifier.truncate.php | 0 .../smarty}/plugins/modifier.upper.php | 0 .../smarty}/plugins/modifier.wordwrap.php | 0 .../plugins/outputfilter.trimwhitespace.php | 0 .../plugins/shared.escape_special_chars.php | 0 .../smarty}/plugins/shared.make_timestamp.php | 0 jLib.php | 13 +++-- static/js/pngfix.js | 48 +++++++++++++++++++ 74 files changed, 63 insertions(+), 5 deletions(-) rename {smarty => contrib/smarty}/Config_File.class.php (100%) rename {smarty => contrib/smarty}/Smarty.class.php (100%) rename {smarty => contrib/smarty}/Smarty_Compiler.class.php (100%) rename {smarty => contrib/smarty}/debug.tpl (100%) rename {smarty => contrib/smarty}/internals/core.assemble_plugin_filepath.php (100%) rename {smarty => contrib/smarty}/internals/core.assign_smarty_interface.php (100%) rename {smarty => contrib/smarty}/internals/core.create_dir_structure.php (100%) rename {smarty => contrib/smarty}/internals/core.display_debug_console.php (100%) rename {smarty => contrib/smarty}/internals/core.get_include_path.php (100%) rename {smarty => contrib/smarty}/internals/core.get_microtime.php (100%) rename {smarty => contrib/smarty}/internals/core.get_php_resource.php (100%) rename {smarty => contrib/smarty}/internals/core.is_secure.php (100%) rename {smarty => contrib/smarty}/internals/core.is_trusted.php (100%) rename {smarty => contrib/smarty}/internals/core.load_plugins.php (100%) rename {smarty => contrib/smarty}/internals/core.load_resource_plugin.php (100%) rename {smarty => contrib/smarty}/internals/core.process_cached_inserts.php (100%) rename {smarty => contrib/smarty}/internals/core.process_compiled_include.php (100%) rename {smarty => contrib/smarty}/internals/core.read_cache_file.php (100%) rename {smarty => contrib/smarty}/internals/core.rm_auto.php (100%) rename {smarty => contrib/smarty}/internals/core.rmdir.php (100%) rename {smarty => contrib/smarty}/internals/core.run_insert_handler.php (100%) rename {smarty => contrib/smarty}/internals/core.smarty_include_php.php (100%) rename {smarty => contrib/smarty}/internals/core.write_cache_file.php (100%) rename {smarty => contrib/smarty}/internals/core.write_compiled_include.php (100%) rename {smarty => contrib/smarty}/internals/core.write_compiled_resource.php (100%) rename {smarty => contrib/smarty}/internals/core.write_file.php (100%) rename {smarty => contrib/smarty}/plugins/block.textformat.php (100%) rename {smarty => contrib/smarty}/plugins/compiler.assign.php (100%) rename {smarty => contrib/smarty}/plugins/function.assign_debug_info.php (100%) rename {smarty => contrib/smarty}/plugins/function.config_load.php (100%) rename {smarty => contrib/smarty}/plugins/function.counter.php (100%) rename {smarty => contrib/smarty}/plugins/function.cycle.php (100%) rename {smarty => contrib/smarty}/plugins/function.debug.php (100%) rename {smarty => contrib/smarty}/plugins/function.eval.php (100%) rename {smarty => contrib/smarty}/plugins/function.fetch.php (100%) rename {smarty => contrib/smarty}/plugins/function.html_checkboxes.php (100%) rename {smarty => contrib/smarty}/plugins/function.html_image.php (100%) rename {smarty => contrib/smarty}/plugins/function.html_options.php (100%) rename {smarty => contrib/smarty}/plugins/function.html_radios.php (100%) rename {smarty => contrib/smarty}/plugins/function.html_select_date.php (100%) rename {smarty => contrib/smarty}/plugins/function.html_select_time.php (100%) rename {smarty => contrib/smarty}/plugins/function.html_table.php (100%) rename {smarty => contrib/smarty}/plugins/function.mailto.php (100%) rename {smarty => contrib/smarty}/plugins/function.math.php (100%) rename {smarty => contrib/smarty}/plugins/function.popup.php (100%) rename {smarty => contrib/smarty}/plugins/function.popup_init.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.capitalize.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.cat.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.count_characters.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.count_paragraphs.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.count_sentences.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.count_words.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.date_format.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.debug_print_var.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.default.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.escape.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.indent.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.lower.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.nl2br.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.regex_replace.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.replace.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.spacify.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.string_format.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.strip.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.strip_tags.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.truncate.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.upper.php (100%) rename {smarty => contrib/smarty}/plugins/modifier.wordwrap.php (100%) rename {smarty => contrib/smarty}/plugins/outputfilter.trimwhitespace.php (100%) rename {smarty => contrib/smarty}/plugins/shared.escape_special_chars.php (100%) rename {smarty => contrib/smarty}/plugins/shared.make_timestamp.php (100%) create mode 100644 static/js/pngfix.js diff --git a/classes/Controller.php b/classes/Controller.php index dce145c..924ba40 100644 --- a/classes/Controller.php +++ b/classes/Controller.php @@ -6,8 +6,11 @@ class Controller { global $smarty; $sections = Config::get('sections'); - - if (isset($_REQUEST['section']) && in_array($_REQUEST['section'], array_keys($sections))) { + + if ( + isset($_REQUEST['section']) && in_array($_REQUEST['section'], array_keys($sections)) + || file_exists('../logic/' . $_REQUEST['section'] . ($_REQUEST['action'] ? '.' . $_REQUEST['action'] : null) . '.php') + ) { $section = $_REQUEST['section']; if (isset($_REQUEST['action'])) { diff --git a/smarty/Config_File.class.php b/contrib/smarty/Config_File.class.php similarity index 100% rename from smarty/Config_File.class.php rename to contrib/smarty/Config_File.class.php diff --git a/smarty/Smarty.class.php b/contrib/smarty/Smarty.class.php similarity index 100% rename from smarty/Smarty.class.php rename to contrib/smarty/Smarty.class.php diff --git a/smarty/Smarty_Compiler.class.php b/contrib/smarty/Smarty_Compiler.class.php similarity index 100% rename from smarty/Smarty_Compiler.class.php rename to contrib/smarty/Smarty_Compiler.class.php diff --git a/smarty/debug.tpl b/contrib/smarty/debug.tpl similarity index 100% rename from smarty/debug.tpl rename to contrib/smarty/debug.tpl diff --git a/smarty/internals/core.assemble_plugin_filepath.php b/contrib/smarty/internals/core.assemble_plugin_filepath.php similarity index 100% rename from smarty/internals/core.assemble_plugin_filepath.php rename to contrib/smarty/internals/core.assemble_plugin_filepath.php diff --git a/smarty/internals/core.assign_smarty_interface.php b/contrib/smarty/internals/core.assign_smarty_interface.php similarity index 100% rename from smarty/internals/core.assign_smarty_interface.php rename to contrib/smarty/internals/core.assign_smarty_interface.php diff --git a/smarty/internals/core.create_dir_structure.php b/contrib/smarty/internals/core.create_dir_structure.php similarity index 100% rename from smarty/internals/core.create_dir_structure.php rename to contrib/smarty/internals/core.create_dir_structure.php diff --git a/smarty/internals/core.display_debug_console.php b/contrib/smarty/internals/core.display_debug_console.php similarity index 100% rename from smarty/internals/core.display_debug_console.php rename to contrib/smarty/internals/core.display_debug_console.php diff --git a/smarty/internals/core.get_include_path.php b/contrib/smarty/internals/core.get_include_path.php similarity index 100% rename from smarty/internals/core.get_include_path.php rename to contrib/smarty/internals/core.get_include_path.php diff --git a/smarty/internals/core.get_microtime.php b/contrib/smarty/internals/core.get_microtime.php similarity index 100% rename from smarty/internals/core.get_microtime.php rename to contrib/smarty/internals/core.get_microtime.php diff --git a/smarty/internals/core.get_php_resource.php b/contrib/smarty/internals/core.get_php_resource.php similarity index 100% rename from smarty/internals/core.get_php_resource.php rename to contrib/smarty/internals/core.get_php_resource.php diff --git a/smarty/internals/core.is_secure.php b/contrib/smarty/internals/core.is_secure.php similarity index 100% rename from smarty/internals/core.is_secure.php rename to contrib/smarty/internals/core.is_secure.php diff --git a/smarty/internals/core.is_trusted.php b/contrib/smarty/internals/core.is_trusted.php similarity index 100% rename from smarty/internals/core.is_trusted.php rename to contrib/smarty/internals/core.is_trusted.php diff --git a/smarty/internals/core.load_plugins.php b/contrib/smarty/internals/core.load_plugins.php similarity index 100% rename from smarty/internals/core.load_plugins.php rename to contrib/smarty/internals/core.load_plugins.php diff --git a/smarty/internals/core.load_resource_plugin.php b/contrib/smarty/internals/core.load_resource_plugin.php similarity index 100% rename from smarty/internals/core.load_resource_plugin.php rename to contrib/smarty/internals/core.load_resource_plugin.php diff --git a/smarty/internals/core.process_cached_inserts.php b/contrib/smarty/internals/core.process_cached_inserts.php similarity index 100% rename from smarty/internals/core.process_cached_inserts.php rename to contrib/smarty/internals/core.process_cached_inserts.php diff --git a/smarty/internals/core.process_compiled_include.php b/contrib/smarty/internals/core.process_compiled_include.php similarity index 100% rename from smarty/internals/core.process_compiled_include.php rename to contrib/smarty/internals/core.process_compiled_include.php diff --git a/smarty/internals/core.read_cache_file.php b/contrib/smarty/internals/core.read_cache_file.php similarity index 100% rename from smarty/internals/core.read_cache_file.php rename to contrib/smarty/internals/core.read_cache_file.php diff --git a/smarty/internals/core.rm_auto.php b/contrib/smarty/internals/core.rm_auto.php similarity index 100% rename from smarty/internals/core.rm_auto.php rename to contrib/smarty/internals/core.rm_auto.php diff --git a/smarty/internals/core.rmdir.php b/contrib/smarty/internals/core.rmdir.php similarity index 100% rename from smarty/internals/core.rmdir.php rename to contrib/smarty/internals/core.rmdir.php diff --git a/smarty/internals/core.run_insert_handler.php b/contrib/smarty/internals/core.run_insert_handler.php similarity index 100% rename from smarty/internals/core.run_insert_handler.php rename to contrib/smarty/internals/core.run_insert_handler.php diff --git a/smarty/internals/core.smarty_include_php.php b/contrib/smarty/internals/core.smarty_include_php.php similarity index 100% rename from smarty/internals/core.smarty_include_php.php rename to contrib/smarty/internals/core.smarty_include_php.php diff --git a/smarty/internals/core.write_cache_file.php b/contrib/smarty/internals/core.write_cache_file.php similarity index 100% rename from smarty/internals/core.write_cache_file.php rename to contrib/smarty/internals/core.write_cache_file.php diff --git a/smarty/internals/core.write_compiled_include.php b/contrib/smarty/internals/core.write_compiled_include.php similarity index 100% rename from smarty/internals/core.write_compiled_include.php rename to contrib/smarty/internals/core.write_compiled_include.php diff --git a/smarty/internals/core.write_compiled_resource.php b/contrib/smarty/internals/core.write_compiled_resource.php similarity index 100% rename from smarty/internals/core.write_compiled_resource.php rename to contrib/smarty/internals/core.write_compiled_resource.php diff --git a/smarty/internals/core.write_file.php b/contrib/smarty/internals/core.write_file.php similarity index 100% rename from smarty/internals/core.write_file.php rename to contrib/smarty/internals/core.write_file.php diff --git a/smarty/plugins/block.textformat.php b/contrib/smarty/plugins/block.textformat.php similarity index 100% rename from smarty/plugins/block.textformat.php rename to contrib/smarty/plugins/block.textformat.php diff --git a/smarty/plugins/compiler.assign.php b/contrib/smarty/plugins/compiler.assign.php similarity index 100% rename from smarty/plugins/compiler.assign.php rename to contrib/smarty/plugins/compiler.assign.php diff --git a/smarty/plugins/function.assign_debug_info.php b/contrib/smarty/plugins/function.assign_debug_info.php similarity index 100% rename from smarty/plugins/function.assign_debug_info.php rename to contrib/smarty/plugins/function.assign_debug_info.php diff --git a/smarty/plugins/function.config_load.php b/contrib/smarty/plugins/function.config_load.php similarity index 100% rename from smarty/plugins/function.config_load.php rename to contrib/smarty/plugins/function.config_load.php diff --git a/smarty/plugins/function.counter.php b/contrib/smarty/plugins/function.counter.php similarity index 100% rename from smarty/plugins/function.counter.php rename to contrib/smarty/plugins/function.counter.php diff --git a/smarty/plugins/function.cycle.php b/contrib/smarty/plugins/function.cycle.php similarity index 100% rename from smarty/plugins/function.cycle.php rename to contrib/smarty/plugins/function.cycle.php diff --git a/smarty/plugins/function.debug.php b/contrib/smarty/plugins/function.debug.php similarity index 100% rename from smarty/plugins/function.debug.php rename to contrib/smarty/plugins/function.debug.php diff --git a/smarty/plugins/function.eval.php b/contrib/smarty/plugins/function.eval.php similarity index 100% rename from smarty/plugins/function.eval.php rename to contrib/smarty/plugins/function.eval.php diff --git a/smarty/plugins/function.fetch.php b/contrib/smarty/plugins/function.fetch.php similarity index 100% rename from smarty/plugins/function.fetch.php rename to contrib/smarty/plugins/function.fetch.php diff --git a/smarty/plugins/function.html_checkboxes.php b/contrib/smarty/plugins/function.html_checkboxes.php similarity index 100% rename from smarty/plugins/function.html_checkboxes.php rename to contrib/smarty/plugins/function.html_checkboxes.php diff --git a/smarty/plugins/function.html_image.php b/contrib/smarty/plugins/function.html_image.php similarity index 100% rename from smarty/plugins/function.html_image.php rename to contrib/smarty/plugins/function.html_image.php diff --git a/smarty/plugins/function.html_options.php b/contrib/smarty/plugins/function.html_options.php similarity index 100% rename from smarty/plugins/function.html_options.php rename to contrib/smarty/plugins/function.html_options.php diff --git a/smarty/plugins/function.html_radios.php b/contrib/smarty/plugins/function.html_radios.php similarity index 100% rename from smarty/plugins/function.html_radios.php rename to contrib/smarty/plugins/function.html_radios.php diff --git a/smarty/plugins/function.html_select_date.php b/contrib/smarty/plugins/function.html_select_date.php similarity index 100% rename from smarty/plugins/function.html_select_date.php rename to contrib/smarty/plugins/function.html_select_date.php diff --git a/smarty/plugins/function.html_select_time.php b/contrib/smarty/plugins/function.html_select_time.php similarity index 100% rename from smarty/plugins/function.html_select_time.php rename to contrib/smarty/plugins/function.html_select_time.php diff --git a/smarty/plugins/function.html_table.php b/contrib/smarty/plugins/function.html_table.php similarity index 100% rename from smarty/plugins/function.html_table.php rename to contrib/smarty/plugins/function.html_table.php diff --git a/smarty/plugins/function.mailto.php b/contrib/smarty/plugins/function.mailto.php similarity index 100% rename from smarty/plugins/function.mailto.php rename to contrib/smarty/plugins/function.mailto.php diff --git a/smarty/plugins/function.math.php b/contrib/smarty/plugins/function.math.php similarity index 100% rename from smarty/plugins/function.math.php rename to contrib/smarty/plugins/function.math.php diff --git a/smarty/plugins/function.popup.php b/contrib/smarty/plugins/function.popup.php similarity index 100% rename from smarty/plugins/function.popup.php rename to contrib/smarty/plugins/function.popup.php diff --git a/smarty/plugins/function.popup_init.php b/contrib/smarty/plugins/function.popup_init.php similarity index 100% rename from smarty/plugins/function.popup_init.php rename to contrib/smarty/plugins/function.popup_init.php diff --git a/smarty/plugins/modifier.capitalize.php b/contrib/smarty/plugins/modifier.capitalize.php similarity index 100% rename from smarty/plugins/modifier.capitalize.php rename to contrib/smarty/plugins/modifier.capitalize.php diff --git a/smarty/plugins/modifier.cat.php b/contrib/smarty/plugins/modifier.cat.php similarity index 100% rename from smarty/plugins/modifier.cat.php rename to contrib/smarty/plugins/modifier.cat.php diff --git a/smarty/plugins/modifier.count_characters.php b/contrib/smarty/plugins/modifier.count_characters.php similarity index 100% rename from smarty/plugins/modifier.count_characters.php rename to contrib/smarty/plugins/modifier.count_characters.php diff --git a/smarty/plugins/modifier.count_paragraphs.php b/contrib/smarty/plugins/modifier.count_paragraphs.php similarity index 100% rename from smarty/plugins/modifier.count_paragraphs.php rename to contrib/smarty/plugins/modifier.count_paragraphs.php diff --git a/smarty/plugins/modifier.count_sentences.php b/contrib/smarty/plugins/modifier.count_sentences.php similarity index 100% rename from smarty/plugins/modifier.count_sentences.php rename to contrib/smarty/plugins/modifier.count_sentences.php diff --git a/smarty/plugins/modifier.count_words.php b/contrib/smarty/plugins/modifier.count_words.php similarity index 100% rename from smarty/plugins/modifier.count_words.php rename to contrib/smarty/plugins/modifier.count_words.php diff --git a/smarty/plugins/modifier.date_format.php b/contrib/smarty/plugins/modifier.date_format.php similarity index 100% rename from smarty/plugins/modifier.date_format.php rename to contrib/smarty/plugins/modifier.date_format.php diff --git a/smarty/plugins/modifier.debug_print_var.php b/contrib/smarty/plugins/modifier.debug_print_var.php similarity index 100% rename from smarty/plugins/modifier.debug_print_var.php rename to contrib/smarty/plugins/modifier.debug_print_var.php diff --git a/smarty/plugins/modifier.default.php b/contrib/smarty/plugins/modifier.default.php similarity index 100% rename from smarty/plugins/modifier.default.php rename to contrib/smarty/plugins/modifier.default.php diff --git a/smarty/plugins/modifier.escape.php b/contrib/smarty/plugins/modifier.escape.php similarity index 100% rename from smarty/plugins/modifier.escape.php rename to contrib/smarty/plugins/modifier.escape.php diff --git a/smarty/plugins/modifier.indent.php b/contrib/smarty/plugins/modifier.indent.php similarity index 100% rename from smarty/plugins/modifier.indent.php rename to contrib/smarty/plugins/modifier.indent.php diff --git a/smarty/plugins/modifier.lower.php b/contrib/smarty/plugins/modifier.lower.php similarity index 100% rename from smarty/plugins/modifier.lower.php rename to contrib/smarty/plugins/modifier.lower.php diff --git a/smarty/plugins/modifier.nl2br.php b/contrib/smarty/plugins/modifier.nl2br.php similarity index 100% rename from smarty/plugins/modifier.nl2br.php rename to contrib/smarty/plugins/modifier.nl2br.php diff --git a/smarty/plugins/modifier.regex_replace.php b/contrib/smarty/plugins/modifier.regex_replace.php similarity index 100% rename from smarty/plugins/modifier.regex_replace.php rename to contrib/smarty/plugins/modifier.regex_replace.php diff --git a/smarty/plugins/modifier.replace.php b/contrib/smarty/plugins/modifier.replace.php similarity index 100% rename from smarty/plugins/modifier.replace.php rename to contrib/smarty/plugins/modifier.replace.php diff --git a/smarty/plugins/modifier.spacify.php b/contrib/smarty/plugins/modifier.spacify.php similarity index 100% rename from smarty/plugins/modifier.spacify.php rename to contrib/smarty/plugins/modifier.spacify.php diff --git a/smarty/plugins/modifier.string_format.php b/contrib/smarty/plugins/modifier.string_format.php similarity index 100% rename from smarty/plugins/modifier.string_format.php rename to contrib/smarty/plugins/modifier.string_format.php diff --git a/smarty/plugins/modifier.strip.php b/contrib/smarty/plugins/modifier.strip.php similarity index 100% rename from smarty/plugins/modifier.strip.php rename to contrib/smarty/plugins/modifier.strip.php diff --git a/smarty/plugins/modifier.strip_tags.php b/contrib/smarty/plugins/modifier.strip_tags.php similarity index 100% rename from smarty/plugins/modifier.strip_tags.php rename to contrib/smarty/plugins/modifier.strip_tags.php diff --git a/smarty/plugins/modifier.truncate.php b/contrib/smarty/plugins/modifier.truncate.php similarity index 100% rename from smarty/plugins/modifier.truncate.php rename to contrib/smarty/plugins/modifier.truncate.php diff --git a/smarty/plugins/modifier.upper.php b/contrib/smarty/plugins/modifier.upper.php similarity index 100% rename from smarty/plugins/modifier.upper.php rename to contrib/smarty/plugins/modifier.upper.php diff --git a/smarty/plugins/modifier.wordwrap.php b/contrib/smarty/plugins/modifier.wordwrap.php similarity index 100% rename from smarty/plugins/modifier.wordwrap.php rename to contrib/smarty/plugins/modifier.wordwrap.php diff --git a/smarty/plugins/outputfilter.trimwhitespace.php b/contrib/smarty/plugins/outputfilter.trimwhitespace.php similarity index 100% rename from smarty/plugins/outputfilter.trimwhitespace.php rename to contrib/smarty/plugins/outputfilter.trimwhitespace.php diff --git a/smarty/plugins/shared.escape_special_chars.php b/contrib/smarty/plugins/shared.escape_special_chars.php similarity index 100% rename from smarty/plugins/shared.escape_special_chars.php rename to contrib/smarty/plugins/shared.escape_special_chars.php diff --git a/smarty/plugins/shared.make_timestamp.php b/contrib/smarty/plugins/shared.make_timestamp.php similarity index 100% rename from smarty/plugins/shared.make_timestamp.php rename to contrib/smarty/plugins/shared.make_timestamp.php diff --git a/jLib.php b/jLib.php index 44d1dc1..cc87d1e 100755 --- a/jLib.php +++ b/jLib.php @@ -18,9 +18,16 @@ if (stripos($_SERVER['REQUEST_URI'], '?PHPSESSID=') !== false) { ini_set('arg_separator.output', '&'); ini_set('url_rewriter.tags', 'a=href,area=href,frame=src,input=src,fieldset='); +// Strips the subdomain before loading the configuration file +$config_array = split('\.', $_SERVER['SERVER_NAME']); +if (count($config_array) == 3) { + $subless_server = $config_array[1] . '.' . $config_array[2]; +} + +// Do some prep work if we're working locally if (strpos($_SERVER['SERVER_NAME'], '.localhost')) { foreach (array('com', 'net', 'org') as $tld) { - $config = str_replace('.localhost', '.' . $tld, $_SERVER['SERVER_NAME']); + $config = str_replace('.localhost', '.' . $tld, $config); if (Config::check($config)) { $_SERVER['SERVER_NAME'] = $config; @@ -29,7 +36,7 @@ if (strpos($_SERVER['SERVER_NAME'], '.localhost')) { } } -Config::load($_SERVER['SERVER_NAME']); +Config::load($subless_server ? $subless_server : $_SERVER['SERVER_NAME']); // Generic "site down" message if (Config::getDisable()) { @@ -42,7 +49,7 @@ if (Config::getSession() && !isset($_SESSION)) { // Smarty default stuff if (Config::getSmarty()) { - require_once 'smarty/Smarty.class.php'; + require_once 'contrib/smarty/Smarty.class.php'; $smarty = new Smarty(); diff --git a/static/js/pngfix.js b/static/js/pngfix.js new file mode 100644 index 0000000..740f8fe --- /dev/null +++ b/static/js/pngfix.js @@ -0,0 +1,48 @@ +/* + +Correctly handle PNG transparency in Win IE 5.5 & 6. +http://homepage.ntlworld.com/bobosola. Updated 18-Jan-2006. + +Use in with DEFER keyword wrapped in conditional comments: + + +@history 2008-03-15 Changed sizingMethod from 'scaled' to 'none' to fix a scaling issue + ---------- Added code to readd the style as to not fuck up my intended display + ---------- Added a catch for the image container (contained images shouldn't be transparent anyway) + ---------- Reformatted the code cause the original coder was a slob + +*/ + +var arVersion = navigator.appVersion.split("MSIE") +var version = parseFloat(arVersion[1]) + +if ((version >= 5.5) && (document.body.filters)) { + for (var i=0; i" + + img.outerHTML = strNewHTML + i = i-1 + } + } + } +}