summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rwxr-xr-xclasses/feeditem/atom.php20
-rwxr-xr-xclasses/feeditem/common.php54
-rwxr-xr-xclasses/feeditem/rss.php28
-rw-r--r--classes/feedparser.php8
-rwxr-xr-xclasses/feeds.php1
-rwxr-xr-xclasses/handler/public.php2
-rw-r--r--classes/pref/prefs.php4
-rwxr-xr-xclasses/rpc.php7
-rwxr-xr-xclasses/rssutils.php10
9 files changed, 69 insertions, 65 deletions
diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 2bae0752c..a962b59f2 100755
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -8,7 +8,7 @@ class FeedItem_Atom extends FeedItem_Common {
if ($id) {
return $id->nodeValue;
} else {
- return $this->get_link();
+ return clean($this->get_link());
}
}
@@ -44,9 +44,9 @@ class FeedItem_Atom extends FeedItem_Common {
$base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
if ($base)
- return rewrite_relative_url($base, trim($link->getAttribute("href")));
+ return rewrite_relative_url($base, clean(trim($link->getAttribute("href"))));
else
- return trim($link->getAttribute("href"));
+ return clean(trim($link->getAttribute("href")));
}
}
@@ -56,7 +56,7 @@ class FeedItem_Atom extends FeedItem_Common {
$title = $this->elem->getElementsByTagName("title")->item(0);
if ($title) {
- return trim($title->nodeValue);
+ return clean(trim($title->nodeValue));
}
}
@@ -113,7 +113,7 @@ class FeedItem_Atom extends FeedItem_Common {
$categories = $this->xpath->query("dc:subject", $this->elem);
foreach ($categories as $cat) {
- array_push($cats, trim($cat->nodeValue));
+ array_push($cats, clean(trim($cat->nodeValue)));
}
return $cats;
@@ -129,9 +129,9 @@ class FeedItem_Atom extends FeedItem_Common {
if ($link->getAttribute("rel") == "enclosure") {
$enc = new FeedEnclosure();
- $enc->type = $link->getAttribute("type");
- $enc->link = $link->getAttribute("href");
- $enc->length = $link->getAttribute("length");
+ $enc->type = clean($link->getAttribute("type"));
+ $enc->link = clean($link->getAttribute("href"));
+ $enc->length = clean($link->getAttribute("length"));
array_push($encs, $enc);
}
@@ -147,12 +147,12 @@ class FeedItem_Atom extends FeedItem_Common {
$lang = $this->elem->getAttributeNS(self::NS_XML, "lang");
if (!empty($lang)) {
- return $lang;
+ return clean($lang);
} else {
// Fall back to the language declared on the feed, if any.
foreach ($this->doc->childNodes as $child) {
if (method_exists($child, "getAttributeNS")) {
- return $child->getAttributeNS(self::NS_XML, "lang");
+ return clean($child->getAttributeNS(self::NS_XML, "lang"));
}
}
}
diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php
index 46822b7c2..de8d3aefa 100755
--- a/classes/feeditem/common.php
+++ b/classes/feeditem/common.php
@@ -31,20 +31,20 @@ abstract class FeedItem_Common extends FeedItem {
if ($author) {
$name = $author->getElementsByTagName("name")->item(0);
- if ($name) return $name->nodeValue;
+ if ($name) return clean($name->nodeValue);
$email = $author->getElementsByTagName("email")->item(0);
- if ($email) return $email->nodeValue;
+ if ($email) return clean($email->nodeValue);
if ($author->nodeValue)
- return $author->nodeValue;
+ return clean($author->nodeValue);
}
$author = $this->xpath->query("dc:creator", $this->elem)->item(0);
if ($author) {
- return $author->nodeValue;
+ return clean($author->nodeValue);
}
}
@@ -53,15 +53,15 @@ abstract class FeedItem_Common extends FeedItem {
//might give a wrong result if a default namespace was declared (possible with XPath 2.0)
$com_url = $this->xpath->query("comments", $this->elem)->item(0);
- if($com_url)
- return $com_url->nodeValue;
+ if ($com_url)
+ return clean($com_url->nodeValue);
//Atom Threading Extension (RFC 4685) stuff. Could be used in RSS feeds, so it's in common.
//'text/html' for type is too restrictive?
$com_url = $this->xpath->query("atom:link[@rel='replies' and contains(@type,'text/html')]/@href", $this->elem)->item(0);
- if($com_url)
- return $com_url->nodeValue;
+ if ($com_url)
+ return clean($com_url->nodeValue);
}
function get_comments_count() {
@@ -70,7 +70,7 @@ abstract class FeedItem_Common extends FeedItem {
$comments = $this->xpath->query($query, $this->elem)->item(0);
if ($comments) {
- return $comments->nodeValue;
+ return clean($comments->nodeValue);
}
}
@@ -83,19 +83,19 @@ abstract class FeedItem_Common extends FeedItem {
foreach ($enclosures as $enclosure) {
$enc = new FeedEnclosure();
- $enc->type = $enclosure->getAttribute("type");
- $enc->link = $enclosure->getAttribute("url");
- $enc->length = $enclosure->getAttribute("length");
- $enc->height = $enclosure->getAttribute("height");
- $enc->width = $enclosure->getAttribute("width");
+ $enc->type = clean($enclosure->getAttribute("type"));
+ $enc->link = clean($enclosure->getAttribute("url"));
+ $enc->length = clean($enclosure->getAttribute("length"));
+ $enc->height = clean($enclosure->getAttribute("height"));
+ $enc->width = clean($enclosure->getAttribute("width"));
- $medium = $enclosure->getAttribute("medium");
+ $medium = clean($enclosure->getAttribute("medium"));
if (!$enc->type && $medium) {
$enc->type = strtolower("$medium/generic");
}
$desc = $this->xpath->query("media:description", $enclosure)->item(0);
- if ($desc) $enc->title = strip_tags($desc->nodeValue);
+ if ($desc) $enc->title = clean($desc->nodeValue);
array_push($encs, $enc);
}
@@ -108,23 +108,23 @@ abstract class FeedItem_Common extends FeedItem {
$content = $this->xpath->query("media:content", $enclosure)->item(0);
if ($content) {
- $enc->type = $content->getAttribute("type");
- $enc->link = $content->getAttribute("url");
- $enc->length = $content->getAttribute("length");
- $enc->height = $content->getAttribute("height");
- $enc->width = $content->getAttribute("width");
+ $enc->type = clean($content->getAttribute("type"));
+ $enc->link = clean($content->getAttribute("url"));
+ $enc->length = clean($content->getAttribute("length"));
+ $enc->height = clean($content->getAttribute("height"));
+ $enc->width = clean($content->getAttribute("width"));
- $medium = $content->getAttribute("medium");
+ $medium = clean($content->getAttribute("medium"));
if (!$enc->type && $medium) {
$enc->type = strtolower("$medium/generic");
}
$desc = $this->xpath->query("media:description", $content)->item(0);
if ($desc) {
- $enc->title = strip_tags($desc->nodeValue);
+ $enc->title = clean($desc->nodeValue);
} else {
$desc = $this->xpath->query("media:description", $enclosure)->item(0);
- if ($desc) $enc->title = strip_tags($desc->nodeValue);
+ if ($desc) $enc->title = clean($desc->nodeValue);
}
array_push($encs, $enc);
@@ -137,9 +137,9 @@ abstract class FeedItem_Common extends FeedItem {
$enc = new FeedEnclosure();
$enc->type = "image/generic";
- $enc->link = $enclosure->getAttribute("url");
- $enc->height = $enclosure->getAttribute("height");
- $enc->width = $enclosure->getAttribute("width");
+ $enc->link = clean($enclosure->getAttribute("url"));
+ $enc->height = clean($enclosure->getAttribute("height"));
+ $enc->width = clean($enclosure->getAttribute("width"));
array_push($encs, $enc);
}
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index 6bb272117..916c73ec4 100755
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -4,9 +4,9 @@ class FeedItem_RSS extends FeedItem_Common {
$id = $this->elem->getElementsByTagName("guid")->item(0);
if ($id) {
- return $id->nodeValue;
+ return clean($id->nodeValue);
} else {
- return $this->get_link();
+ return clean($this->get_link());
}
}
@@ -33,20 +33,20 @@ class FeedItem_RSS extends FeedItem_Common {
|| $link->getAttribute("rel") == "alternate"
|| $link->getAttribute("rel") == "standout")) {
- return trim($link->getAttribute("href"));
+ return clean(trim($link->getAttribute("href")));
}
}
$link = $this->elem->getElementsByTagName("guid")->item(0);
if ($link && $link->hasAttributes() && $link->getAttribute("isPermaLink") == "true") {
- return trim($link->nodeValue);
+ return clean(trim($link->nodeValue));
}
$link = $this->elem->getElementsByTagName("link")->item(0);
if ($link) {
- return trim($link->nodeValue);
+ return clean(trim($link->nodeValue));
}
}
@@ -54,7 +54,7 @@ class FeedItem_RSS extends FeedItem_Common {
$title = $this->xpath->query("title", $this->elem)->item(0);
if ($title) {
- return trim($title->nodeValue);
+ return clean(trim($title->nodeValue));
}
// if the document has a default namespace then querying for
@@ -62,7 +62,7 @@ class FeedItem_RSS extends FeedItem_Common {
$title = $this->elem->getElementsByTagName("title")->item(0);
if ($title) {
- return trim($title->nodeValue);
+ return clean(trim($title->nodeValue));
}
}
@@ -106,7 +106,7 @@ class FeedItem_RSS extends FeedItem_Common {
$categories = $this->xpath->query("dc:subject", $this->elem);
foreach ($categories as $cat) {
- array_push($cats, trim($cat->nodeValue));
+ array_push($cats, clean(trim($cat->nodeValue)));
}
return $cats;
@@ -120,11 +120,11 @@ class FeedItem_RSS extends FeedItem_Common {
foreach ($enclosures as $enclosure) {
$enc = new FeedEnclosure();
- $enc->type = $enclosure->getAttribute("type");
- $enc->link = $enclosure->getAttribute("url");
- $enc->length = $enclosure->getAttribute("length");
- $enc->height = $enclosure->getAttribute("height");
- $enc->width = $enclosure->getAttribute("width");
+ $enc->type = clean($enclosure->getAttribute("type"));
+ $enc->link = clean($enclosure->getAttribute("url"));
+ $enc->length = clean($enclosure->getAttribute("length"));
+ $enc->height = clean($enclosure->getAttribute("height"));
+ $enc->width = clean($enclosure->getAttribute("width"));
array_push($encs, $enc);
}
@@ -141,7 +141,7 @@ class FeedItem_RSS extends FeedItem_Common {
return "";
}
- return $languages[0]->textContent;
+ return clean($languages[0]->textContent);
}
}
diff --git a/classes/feedparser.php b/classes/feedparser.php
index a5e406149..dc67e204e 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -246,11 +246,11 @@ class FeedParser {
}
function get_link() {
- return $this->link;
+ return clean($this->link);
}
function get_title() {
- return $this->title;
+ return clean($this->title);
}
function get_items() {
@@ -266,7 +266,7 @@ class FeedParser {
foreach ($links as $link) {
if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
- array_push($rv, trim($link->getAttribute('href')));
+ array_push($rv, clean(trim($link->getAttribute('href'))));
}
}
break;
@@ -275,7 +275,7 @@ class FeedParser {
foreach ($links as $link) {
if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
- array_push($rv, trim($link->getAttribute('href')));
+ array_push($rv, clean(trim($link->getAttribute('href'))));
}
}
break;
diff --git a/classes/feeds.php b/classes/feeds.php
index 489ffd3c4..023fba81a 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1805,6 +1805,7 @@ class Feeds extends Handler_Protected {
feed_id,
orig_feed_id,
marked,
+ published,
num_comments,
comments,
int_id,
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 3a0b328ff..274936c33 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -846,7 +846,7 @@ class Handler_Public extends Handler {
print "<form method=\"GET\" style='display: inline'
action=\"$tp_uri\">
<input type=\"hidden\" name=\"tab\" value=\"feedConfig\">
- <input type=\"hidden\" name=\"method\" value=\"editFeed\">
+ <input type=\"hidden\" name=\"method\" value=\"editfeed\">
<input type=\"hidden\" name=\"methodparam\" value=\"$feed_id\">
<input type=\"submit\" value=\"".__("Edit subscription options")."\">
</form>";
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 5388bd905..98bd99a04 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -735,7 +735,7 @@ class Pref_Prefs extends Handler_Protected {
<td width='10%'>".__('Author')."</td></tr>";
$system_enabled = array_map("trim", explode(",", PLUGINS));
- $user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS", $_SESSION['uid'])));
+ $user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
$tmppluginhost = new PluginHost();
$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true);
@@ -973,7 +973,7 @@ class Pref_Prefs extends Handler_Protected {
else
$plugins = "";
- set_pref("_ENABLED_PLUGINS", $plugins, $_SESSION["uid"]);
+ set_pref("_ENABLED_PLUGINS", $plugins);
}
function clearplugindata() {
diff --git a/classes/rpc.php b/classes/rpc.php
index b2184d8ec..7220e10ea 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -424,7 +424,10 @@ class RPC extends Handler_Protected {
Feeds::catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
- print json_encode(array("message" => "UPDATE_COUNTERS"));
+ // return counters here synchronously so that frontend can figure out next unread feed properly
+ print json_encode(['counters' => Counters::getAllCounters()]);
+
+ //print json_encode(array("message" => "UPDATE_COUNTERS"));
}
function setpanelmode() {
@@ -620,4 +623,4 @@ class RPC extends Handler_Protected {
print json_encode($rv);
}
-} \ No newline at end of file
+}
diff --git a/classes/rssutils.php b/classes/rssutils.php
index 553d04561..a1ba95d66 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -263,8 +263,8 @@ class RSSUtils {
if (!$rss->error()) {
$basic_info = array(
- 'title' => mb_substr($rss->get_title(), 0, 199),
- 'site_url' => mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245)
+ 'title' => mb_substr(clean($rss->get_title()), 0, 199),
+ 'site_url' => mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245)
);
}
}
@@ -499,10 +499,10 @@ class RSSUtils {
return false;
}
- $site_url = mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245);
+ $site_url = mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245);
Debug::log("site_url: $site_url", Debug::$LOG_VERBOSE);
- Debug::log("feed_title: " . $rss->get_title(), Debug::$LOG_VERBOSE);
+ Debug::log("feed_title: " . clean($rss->get_title()), Debug::$LOG_VERBOSE);
if ($favicon_needs_check || $force_refetch) {
@@ -609,7 +609,7 @@ class RSSUtils {
$entry_title = strip_tags($item->get_title());
- $entry_link = rewrite_relative_url($site_url, $item->get_link());
+ $entry_link = rewrite_relative_url($site_url, clean($item->get_link()));
$entry_language = mb_substr(trim($item->get_language()), 0, 2);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 16:57:34 +0000