valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add new option: ENABLE_TAGWALL

This commit is contained in:
Andrew Dolgov 2007-10-10 08:29:43 +01:00
parent 4148e809d3
commit dff94f6369
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config.php-dist
View File

@ -163,7 +163,14 @@
// These two options enable SMTP authentication when sending // These two options enable SMTP authentication when sending
// digests. Require DIGEST_SMTP_HOST. // digests. Require DIGEST_SMTP_HOST.
define('CONFIG_VERSION', 9); 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 // Expected config version. Please update this option in config.php
// if necessary (after migrating all new options from this file). // if necessary (after migrating all new options from this file).

23
functions.php
View File

@ -73,11 +73,13 @@
require_once 'magpierss/rss_utils.inc'; require_once 'magpierss/rss_utils.inc';
} }
include_once "tw/tw-config.php"; if (ENABLE_TAGWALL) {
include_once "tw/tw.php"; include_once "tw/tw-config.php";
include_once TW_SETUP . "paranoya.php"; include_once "tw/tw.php";
include_once TW_SETUP . "paranoya.php";
$tw_parser = new twParser(); $tw_parser = new twParser();
}
function _debug($msg) { function _debug($msg) {
$ts = strftime("%H:%M:%S", time()); $ts = strftime("%H:%M:%S", time());
@ -3169,10 +3171,17 @@
$res = $str; $res = $str;
if (get_pref($link, "STRIP_UNSAFE_TAGS") || $force_strip_tags) { if (get_pref($link, "STRIP_UNSAFE_TAGS") || $force_strip_tags) {
global $tw_parser;
global $tw_paranoya_setup;
$res = $tw_parser->strip_tags($res, $tw_paranoya_setup); 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, "<p><a><i><em><b><strong><blockquote><br><img><div><span>");
}
// $res = preg_replace("/\r\n|\n|\r/", "", $res); // $res = preg_replace("/\r\n|\n|\r/", "", $res);
// $res = strip_tags_long($res, "<p><a><i><em><b><strong><blockquote><br><img><div><span>"); // $res = strip_tags_long($res, "<p><a><i><em><b><strong><blockquote><br><img><div><span>");

2
sanity_check.php
View File

@ -1,7 +1,7 @@
<?php <?php
require_once "functions.php"; require_once "functions.php";
define('EXPECTED_CONFIG_VERSION', 9); define('EXPECTED_CONFIG_VERSION', 10);
define('SCHEMA_VERSION', 23); define('SCHEMA_VERSION', 23);
if (!file_exists("config.php")) { if (!file_exists("config.php")) {