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

rename sanitize_rss to sanitize

This commit is contained in:
Andrew Dolgov 2011-12-13 16:08:08 +04:00
parent 2c08214a7f
commit 183ff16c7c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/rpc.php
View File

@ -507,7 +507,7 @@ class RPC extends Protected_Handler {
FROM ttrss_entries, ttrss_user_entries FROM ttrss_entries, ttrss_user_entries
WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']); WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']);
$content = sanitize_rss($this->link, db_fetch_result($result, 0, "content")); $content = sanitize($this->link, db_fetch_result($result, 0, "content"));
$title = strip_tags(db_fetch_result($result, 0, "title")); $title = strip_tags(db_fetch_result($result, 0, "title"));
$article_url = htmlspecialchars(db_fetch_result($result, 0, "link")); $article_url = htmlspecialchars(db_fetch_result($result, 0, "link"));
$marked = sql_bool_to_bool(db_fetch_result($result, 0, "marked")); $marked = sql_bool_to_bool(db_fetch_result($result, 0, "marked"));
@ -706,7 +706,7 @@ class RPC extends Protected_Handler {
if (db_num_rows($result) != 0) { if (db_num_rows($result) != 0) {
$line = db_fetch_assoc($result); $line = db_fetch_assoc($result);
$article_content = sanitize_rss($this->link, $line["content"], $article_content = sanitize($this->link, $line["content"],
false, false, $line['site_url']); false, false, $line['site_url']);
array_push($rv, array_push($rv,

8
include/functions.php
View File

@ -2577,7 +2577,7 @@
$tpl->setVariable('ARTICLE_EXCERPT', $tpl->setVariable('ARTICLE_EXCERPT',
truncate_string(strip_tags($line["content_preview"]), 100, '...')); truncate_string(strip_tags($line["content_preview"]), 100, '...'));
$content = sanitize_rss($link, $line["content_preview"], false, $owner_uid); $content = sanitize($link, $line["content_preview"], false, $owner_uid);
if ($line['note']) { if ($line['note']) {
$content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" . $content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
@ -2640,7 +2640,7 @@
} }
} }
function sanitize_rss($link, $str, $force_strip_tags = false, $owner = false, $site_url = false) { function sanitize($link, $str, $force_strip_tags = false, $owner = false, $site_url = false) {
global $purifier; global $purifier;
if (!$owner) $owner = $_SESSION["uid"]; if (!$owner) $owner = $_SESSION["uid"];
@ -3749,7 +3749,7 @@
$rv['content'] .= "<div class=\"postContent\">"; $rv['content'] .= "<div class=\"postContent\">";
$article_content = sanitize_rss($link, $line["content"], false, false, $article_content = sanitize($link, $line["content"], false, false,
$feed_site_url); $feed_site_url);
$rv['content'] .= $article_content; $rv['content'] .= $article_content;
@ -4245,7 +4245,7 @@
$feed_site_url = $line["site_url"]; $feed_site_url = $line["site_url"];
$article_content = sanitize_rss($link, $line["content_preview"], $article_content = sanitize($link, $line["content_preview"],
false, false, $feed_site_url); false, false, $feed_site_url);
$reply['content'] .= "<div id=\"POSTNOTE-$id\">"; $reply['content'] .= "<div id=\"POSTNOTE-$id\">";

2
mobile/mobile-functions.php
View File

@ -506,7 +506,7 @@
// print "</fieldset>"; // print "</fieldset>";
$content = sanitize_rss($link, $line["content"]); $content = sanitize($link, $line["content"]);
$content = preg_replace("/href=/i", "target=\"_blank\" href=", $content); $content = preg_replace("/href=/i", "target=\"_blank\" href=", $content);
if (!mobile_get_pref($link, "SHOW_IMAGES")) { if (!mobile_get_pref($link, "SHOW_IMAGES")) {