From 7e1265ede7c82999d2def9e001422c41aa48afc0 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 24 Oct 2007 07:50:10 +0100 Subject: drop tagwall from trunk --- config.php-dist | 7 - functions.php | 20 +- tw/!CREDITS.TXT | 19 -- tw/!LICENSE.TXT | 340 ------------------------------ tw/error/FOO_error.php | 43 ---- tw/error/LINK_error.php | 94 --------- tw/error/__Template_error.php | 69 ------- tw/filter-setup/paranoya.php | 60 ------ tw/lang/TW_base.php | 471 ------------------------------------------ tw/lang/TW_lang.php | 183 ---------------- tw/localization/EN_errors.php | 57 ----- tw/output/HL_DEBUG_output.php | 74 ------- tw/output/HTML_output.php | 67 ------ tw/output/XHTML_output.php | 67 ------ tw/tw-config.php | 117 ----------- tw/tw-errors.php | 118 ----------- tw/tw-tags.php | 97 --------- tw/tw.php | 291 -------------------------- tw/tw_cache/TW_lang.php | 177 ---------------- 19 files changed, 2 insertions(+), 2369 deletions(-) delete mode 100644 tw/!CREDITS.TXT delete mode 100644 tw/!LICENSE.TXT delete mode 100644 tw/error/FOO_error.php delete mode 100644 tw/error/LINK_error.php delete mode 100644 tw/error/__Template_error.php delete mode 100644 tw/filter-setup/paranoya.php delete mode 100644 tw/lang/TW_base.php delete mode 100644 tw/lang/TW_lang.php delete mode 100644 tw/localization/EN_errors.php delete mode 100644 tw/output/HL_DEBUG_output.php delete mode 100644 tw/output/HTML_output.php delete mode 100644 tw/output/XHTML_output.php delete mode 100644 tw/tw-config.php delete mode 100644 tw/tw-errors.php delete mode 100644 tw/tw-tags.php delete mode 100644 tw/tw.php delete mode 100644 tw/tw_cache/TW_lang.php diff --git a/config.php-dist b/config.php-dist index b93143711..05ec08ea6 100644 --- a/config.php-dist +++ b/config.php-dist @@ -163,13 +163,6 @@ // These two options enable SMTP authentication when sending // digests. Require DIGEST_SMTP_HOST. - define('ENABLE_TAGWALL', true); - // Disable this if you are having troubles with Tagwall library which - // is used to strip potentially unsafe content from RSS articles. When - // disabled, simpler version of processing will be used when needed. - // Try disabling when having problems with showing articles and/or - // loading feeds. - define('CONFIG_VERSION', 10); // Expected config version. Please update this option in config.php // if necessary (after migrating all new options from this file). diff --git a/functions.php b/functions.php index 7de4ed1b5..15f6843b9 100644 --- a/functions.php +++ b/functions.php @@ -73,14 +73,6 @@ require_once 'magpierss/rss_utils.inc'; } - if (ENABLE_TAGWALL) { - include_once "tw/tw-config.php"; - include_once "tw/tw.php"; - include_once TW_SETUP . "paranoya.php"; - - $tw_parser = new twParser(); - } - function _debug($msg) { $ts = strftime("%H:%M:%S", time()); print "[$ts] $msg\n"; @@ -3172,16 +3164,8 @@ if (get_pref($link, "STRIP_UNSAFE_TAGS") || $force_strip_tags) { - if (ENABLE_TAGWALL) { - global $tw_parser; - global $tw_paranoya_setup; - - $res = $tw_parser->strip_tags($res, $tw_paranoya_setup); - } else { - - $res = strip_tags_long($res, "


"); - - } + $res = strip_tags_long($res, + "