codysnider / tt-rss

classes/backend.php

Indentation +96 added lines, -96 removed lines

@@ -1,101 +1,101 @@
 <?php
 class Backend extends Handler {
-	public function loading() {
-		header("Content-type: text/html");
-		print __("Loading, please wait...")." ".
-			"<img src='images/indicator_tiny.gif'>";
-	}
-
-	public function digestTest() {
-		if (isset($_SESSION['uid'])) {
-			header("Content-type: text/html");
-
-			$rv = Digest::prepare_headlines_digest($_SESSION['uid'], 1, 1000);
-
-			print "<h1>HTML</h1>";
-			print $rv[0];
-			print "<h1>Plain text</h1>";
-			print "<pre>".$rv[3]."</pre>";
-		} else {
-			print error_json(6);
-		}
-	}
-
-	public function help() {
-		$topic = clean_filename($_REQUEST["topic"]); // only one for now
-
-		if ($topic == "main") {
-			$info = get_hotkeys_info();
-			$imap = get_hotkeys_map();
-			$omap = array();
-
-			foreach ($imap[1] as $sequence => $action) {
-				if (!isset($omap[$action])) {
-				    $omap[$action] = array();
-				}
-
-				array_push($omap[$action], $sequence);
-			}
-
-			print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>";
-
-			$cur_section = "";
-			foreach ($info as $section => $hotkeys) {
-
-				if ($cur_section) {
-				    print "<li>&nbsp;</li>";
-				}
-				print "<li><h3>" . $section . "</h3></li>";
-				$cur_section = $section;
-
-				foreach ($hotkeys as $action => $description) {
-
-					if (is_array($omap[$action])) {
-						foreach ($omap[$action] as $sequence) {
-							if (strpos($sequence, "|") !== false) {
-								$sequence = substr($sequence,
-									strpos($sequence, "|") + 1,
-									strlen($sequence));
-							} else {
-								$keys = explode(" ", $sequence);
-
-								for ($i = 0; $i < count($keys); $i++) {
-									if (strlen($keys[$i]) > 1) {
-										$tmp = '';
-										foreach (str_split($keys[$i]) as $c) {
-											switch ($c) {
-												case '*':
-													$tmp .= __('Shift').'+';
-													break;
-												case '^':
-													$tmp .= __('Ctrl').'+';
-													break;
-												default:
-													$tmp .= $c;
-											}
-										}
-										$keys[$i] = $tmp;
-									}
-								}
-								$sequence = join(" ", $keys);
-							}
-
-							print "<li>";
-							print "<div class='hk'><code>$sequence</code></div>";
-							print "<div class='desc'>$description</div>";
-							print "</li>";
-						}
-					}
-				}
-			}
-
-			print "</ul>";
-		}
-
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button'
+    public function loading() {
+        header("Content-type: text/html");
+        print __("Loading, please wait...")." ".
+            "<img src='images/indicator_tiny.gif'>";
+    }
+
+    public function digestTest() {
+        if (isset($_SESSION['uid'])) {
+            header("Content-type: text/html");
+
+            $rv = Digest::prepare_headlines_digest($_SESSION['uid'], 1, 1000);
+
+            print "<h1>HTML</h1>";
+            print $rv[0];
+            print "<h1>Plain text</h1>";
+            print "<pre>".$rv[3]."</pre>";
+        } else {
+            print error_json(6);
+        }
+    }
+
+    public function help() {
+        $topic = clean_filename($_REQUEST["topic"]); // only one for now
+
+        if ($topic == "main") {
+            $info = get_hotkeys_info();
+            $imap = get_hotkeys_map();
+            $omap = array();
+
+            foreach ($imap[1] as $sequence => $action) {
+                if (!isset($omap[$action])) {
+                    $omap[$action] = array();
+                }
+
+                array_push($omap[$action], $sequence);
+            }
+
+            print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>";
+
+            $cur_section = "";
+            foreach ($info as $section => $hotkeys) {
+
+                if ($cur_section) {
+                    print "<li>&nbsp;</li>";
+                }
+                print "<li><h3>" . $section . "</h3></li>";
+                $cur_section = $section;
+
+                foreach ($hotkeys as $action => $description) {
+
+                    if (is_array($omap[$action])) {
+                        foreach ($omap[$action] as $sequence) {
+                            if (strpos($sequence, "|") !== false) {
+                                $sequence = substr($sequence,
+                                    strpos($sequence, "|") + 1,
+                                    strlen($sequence));
+                            } else {
+                                $keys = explode(" ", $sequence);
+
+                                for ($i = 0; $i < count($keys); $i++) {
+                                    if (strlen($keys[$i]) > 1) {
+                                        $tmp = '';
+                                        foreach (str_split($keys[$i]) as $c) {
+                                            switch ($c) {
+                                                case '*':
+                                                    $tmp .= __('Shift').'+';
+                                                    break;
+                                                case '^':
+                                                    $tmp .= __('Ctrl').'+';
+                                                    break;
+                                                default:
+                                                    $tmp .= $c;
+                                            }
+                                        }
+                                        $keys[$i] = $tmp;
+                                    }
+                                }
+                                $sequence = join(" ", $keys);
+                            }
+
+                            print "<li>";
+                            print "<div class='hk'><code>$sequence</code></div>";
+                            print "<div class='desc'>$description</div>";
+                            print "</li>";
+                        }
+                    }
+                }
+            }
+
+            print "</ul>";
+        }
+
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"return dijit.byId('helpDlg').hide()\">".__('Close this window')."</button>";
-		print "</footer>";
+        print "</footer>";
 
-	}
+    }
 }

classes/handler/public.php

Indentation +737 added lines, -737 removed lines

@@ -1,336 +1,336 @@ 
 <?php
 class Handler_Public extends Handler {
 
-	private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
-		$limit, $offset, $search,
-		$view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
+    private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
+        $limit, $offset, $search,
+        $view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
 
-		require_once "lib/MiniTemplator.class.php";
+        require_once "lib/MiniTemplator.class.php";
 
-		$note_style = "background-color : #fff7d5;
+        $note_style = "background-color : #fff7d5;
 			border-width : 1px; ".
-			"padding : 5px; border-style : dashed; border-color : #e7d796;".
-			"margin-bottom : 1em; color : #9a8c59;";
-
-		if (!$limit) {
-		    $limit = 60;
-		}
-
-		$date_sort_field = "date_entered DESC, updated DESC";
-
-		if ($feed == -2 && !$is_cat) {
-			$date_sort_field = "last_published DESC";
-		} else if ($feed == -1 && !$is_cat) {
-			$date_sort_field = "last_marked DESC";
-		}
-
-		switch ($order) {
-		case "title":
-			$date_sort_field = "ttrss_entries.title, date_entered, updated";
-			break;
-		case "date_reverse":
-			$date_sort_field = "date_entered, updated";
-			break;
-		case "feed_dates":
-			$date_sort_field = "updated DESC";
-			break;
-		}
-
-		$params = array(
-			"owner_uid" => $owner_uid,
-			"feed" => $feed,
-			"limit" => $limit,
-			"view_mode" => $view_mode,
-			"cat_view" => $is_cat,
-			"search" => $search,
-			"override_order" => $date_sort_field,
-			"include_children" => true,
-			"ignore_vfeed_group" => true,
-			"offset" => $offset,
-			"start_ts" => $start_ts
-		);
-
-		if (!$is_cat && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX && $feed > LABEL_BASE_INDEX) {
-
-			$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
-
-			$tmppluginhost = new PluginHost();
-			$tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
-			$tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
-			$tmppluginhost->load_data();
-
-			$handler = $tmppluginhost->get_feed_handler(
-				PluginHost::feed_to_pfeed_id($feed));
-
-			if ($handler) {
-				$qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed), $params);
-			}
-
-		} else {
-			$qfh_ret = Feeds::queryFeedHeadlines($params);
-		}
-
-		$result = $qfh_ret[0];
-		$feed_title = htmlspecialchars($qfh_ret[1]);
-		$feed_site_url = $qfh_ret[2];
-		/* $last_error = $qfh_ret[3]; */
-
-		$feed_self_url = get_self_url_prefix().
-			"/public.php?op=rss&id=$feed&key=".
-			Feeds::get_feed_access_key($feed, false, $owner_uid);
-
-		if (!$feed_site_url) {
-		    $feed_site_url = get_self_url_prefix();
-		}
-
-		if ($format == 'atom') {
-			$tpl = new MiniTemplator;
-
-			$tpl->readTemplateFromFile("templates/generated_feed.txt");
-
-			$tpl->setVariable('FEED_TITLE', $feed_title, true);
-			$tpl->setVariable('VERSION', get_version(), true);
-			$tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url), true);
-
-			$tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
-			while ($line = $result->fetch()) {
-
-				$line["content_preview"] = sanitize(truncate_string(strip_tags($line["content"]), 100, '...'));
-
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-					$line = $p->hook_query_headlines($line);
-				}
+            "padding : 5px; border-style : dashed; border-color : #e7d796;".
+            "margin-bottom : 1em; color : #9a8c59;";
+
+        if (!$limit) {
+            $limit = 60;
+        }
+
+        $date_sort_field = "date_entered DESC, updated DESC";
+
+        if ($feed == -2 && !$is_cat) {
+            $date_sort_field = "last_published DESC";
+        } else if ($feed == -1 && !$is_cat) {
+            $date_sort_field = "last_marked DESC";
+        }
+
+        switch ($order) {
+        case "title":
+            $date_sort_field = "ttrss_entries.title, date_entered, updated";
+            break;
+        case "date_reverse":
+            $date_sort_field = "date_entered, updated";
+            break;
+        case "feed_dates":
+            $date_sort_field = "updated DESC";
+            break;
+        }
+
+        $params = array(
+            "owner_uid" => $owner_uid,
+            "feed" => $feed,
+            "limit" => $limit,
+            "view_mode" => $view_mode,
+            "cat_view" => $is_cat,
+            "search" => $search,
+            "override_order" => $date_sort_field,
+            "include_children" => true,
+            "ignore_vfeed_group" => true,
+            "offset" => $offset,
+            "start_ts" => $start_ts
+        );
+
+        if (!$is_cat && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX && $feed > LABEL_BASE_INDEX) {
+
+            $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
+
+            $tmppluginhost = new PluginHost();
+            $tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+            $tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
+            $tmppluginhost->load_data();
+
+            $handler = $tmppluginhost->get_feed_handler(
+                PluginHost::feed_to_pfeed_id($feed));
+
+            if ($handler) {
+                $qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed), $params);
+            }
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
-					$line = $p->hook_article_export_feed($line, $feed, $is_cat);
-				}
+        } else {
+            $qfh_ret = Feeds::queryFeedHeadlines($params);
+        }
 
-				$tpl->setVariable('ARTICLE_ID',
-					htmlspecialchars($orig_guid ? $line['link'] : $this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
-				$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
-				$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
-				$tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
+        $result = $qfh_ret[0];
+        $feed_title = htmlspecialchars($qfh_ret[1]);
+        $feed_site_url = $qfh_ret[2];
+        /* $last_error = $qfh_ret[3]; */
 
-				$content = sanitize($line["content"], false, $owner_uid,
-					$feed_site_url, false, $line["id"]);
+        $feed_self_url = get_self_url_prefix().
+            "/public.php?op=rss&id=$feed&key=".
+            Feeds::get_feed_access_key($feed, false, $owner_uid);
 
-				if ($line['note']) {
-					$content = "<div style=\"$note_style\">Article note: ".$line['note']."</div>".
-						$content;
-					$tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
-				}
+        if (!$feed_site_url) {
+            $feed_site_url = get_self_url_prefix();
+        }
 
-				$tpl->setVariable('ARTICLE_CONTENT', $content, true);
+        if ($format == 'atom') {
+            $tpl = new MiniTemplator;
 
-				$tpl->setVariable('ARTICLE_UPDATED_ATOM',
-					date('c', strtotime($line["updated"])), true);
-				$tpl->setVariable('ARTICLE_UPDATED_RFC822',
-					date(DATE_RFC822, strtotime($line["updated"])), true);
+            $tpl->readTemplateFromFile("templates/generated_feed.txt");
 
-				$tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
+            $tpl->setVariable('FEED_TITLE', $feed_title, true);
+            $tpl->setVariable('VERSION', get_version(), true);
+            $tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url), true);
 
-				$tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
-				$tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
+            $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
+            while ($line = $result->fetch()) {
 
-				$tags = Article::get_article_tags($line["id"], $owner_uid);
+                $line["content_preview"] = sanitize(truncate_string(strip_tags($line["content"]), 100, '...'));
 
-				foreach ($tags as $tag) {
-					$tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
-					$tpl->addBlock('category');
-				}
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                    $line = $p->hook_query_headlines($line);
+                }
 
-				$enclosures = Article::get_article_enclosures($line["id"]);
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
+                    $line = $p->hook_article_export_feed($line, $feed, $is_cat);
+                }
 
-				if (count($enclosures) > 0) {
-					foreach ($enclosures as $e) {
-						$type = htmlspecialchars($e['content_type']);
-						$url = htmlspecialchars($e['content_url']);
-						$length = $e['duration'] ? $e['duration'] : 1;
+                $tpl->setVariable('ARTICLE_ID',
+                    htmlspecialchars($orig_guid ? $line['link'] : $this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
+                $tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
+                $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
+                $tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
 
-						$tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url, true);
-						$tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type, true);
-						$tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length, true);
+                $content = sanitize($line["content"], false, $owner_uid,
+                    $feed_site_url, false, $line["id"]);
 
-						$tpl->addBlock('enclosure');
-					}
-				} else {
-					$tpl->setVariable('ARTICLE_ENCLOSURE_URL', null, true);
-					$tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', null, true);
-					$tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', null, true);
-				}
+                if ($line['note']) {
+                    $content = "<div style=\"$note_style\">Article note: ".$line['note']."</div>".
+                        $content;
+                    $tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
+                }
 
-				list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $feed_site_url);
+                $tpl->setVariable('ARTICLE_CONTENT', $content, true);
 
-				$tpl->setVariable('ARTICLE_OG_IMAGE', $og_image, true);
+                $tpl->setVariable('ARTICLE_UPDATED_ATOM',
+                    date('c', strtotime($line["updated"])), true);
+                $tpl->setVariable('ARTICLE_UPDATED_RFC822',
+                    date(DATE_RFC822, strtotime($line["updated"])), true);
 
-				$tpl->addBlock('entry');
-			}
+                $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
 
-			$tmp = "";
+                $tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
+                $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
 
-			$tpl->addBlock('feed');
-			$tpl->generateOutputToString($tmp);
+                $tags = Article::get_article_tags($line["id"], $owner_uid);
 
-			if (@!clean($_REQUEST["noxml"])) {
-				header("Content-Type: text/xml; charset=utf-8");
-			} else {
-				header("Content-Type: text/plain; charset=utf-8");
-			}
+                foreach ($tags as $tag) {
+                    $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
+                    $tpl->addBlock('category');
+                }
 
-			print $tmp;
-		} else if ($format == 'json') {
+                $enclosures = Article::get_article_enclosures($line["id"]);
 
-			$feed = array();
+                if (count($enclosures) > 0) {
+                    foreach ($enclosures as $e) {
+                        $type = htmlspecialchars($e['content_type']);
+                        $url = htmlspecialchars($e['content_url']);
+                        $length = $e['duration'] ? $e['duration'] : 1;
 
-			$feed['title'] = $feed_title;
-			$feed['feed_url'] = $feed_self_url;
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url, true);
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type, true);
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length, true);
 
-			$feed['self_url'] = get_self_url_prefix();
+                        $tpl->addBlock('enclosure');
+                    }
+                } else {
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_URL', null, true);
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', null, true);
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', null, true);
+                }
 
-			$feed['articles'] = array();
+                list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $feed_site_url);
 
-			while ($line = $result->fetch()) {
+                $tpl->setVariable('ARTICLE_OG_IMAGE', $og_image, true);
 
-				$line["content_preview"] = sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...'));
+                $tpl->addBlock('entry');
+            }
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-					$line = $p->hook_query_headlines($line, 100);
-				}
+            $tmp = "";
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
-					$line = $p->hook_article_export_feed($line, $feed, $is_cat);
-				}
+            $tpl->addBlock('feed');
+            $tpl->generateOutputToString($tmp);
 
-				$article = array();
+            if (@!clean($_REQUEST["noxml"])) {
+                header("Content-Type: text/xml; charset=utf-8");
+            } else {
+                header("Content-Type: text/plain; charset=utf-8");
+            }
 
-				$article['id'] = $line['link'];
-				$article['link'] = $line['link'];
-				$article['title'] = $line['title'];
-				$article['excerpt'] = $line["content_preview"];
-				$article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
-				$article['updated'] = date('c', strtotime($line["updated"]));
+            print $tmp;
+        } else if ($format == 'json') {
 
-				if ($line['note']) {
-				    $article['note'] = $line['note'];
-				}
-				if ($article['author']) {
-				    $article['author'] = $line['author'];
-				}
+            $feed = array();
 
-				$tags = Article::get_article_tags($line["id"], $owner_uid);
+            $feed['title'] = $feed_title;
+            $feed['feed_url'] = $feed_self_url;
 
-				if (count($tags) > 0) {
-					$article['tags'] = array();
+            $feed['self_url'] = get_self_url_prefix();
 
-					foreach ($tags as $tag) {
-						array_push($article['tags'], $tag);
-					}
-				}
+            $feed['articles'] = array();
 
-				$enclosures = Article::get_article_enclosures($line["id"]);
+            while ($line = $result->fetch()) {
 
-				if (count($enclosures) > 0) {
-					$article['enclosures'] = array();
+                $line["content_preview"] = sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...'));
 
-					foreach ($enclosures as $e) {
-						$type = $e['content_type'];
-						$url = $e['content_url'];
-						$length = $e['duration'];
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                    $line = $p->hook_query_headlines($line, 100);
+                }
 
-						array_push($article['enclosures'], array("url" => $url, "type" => $type, "length" => $length));
-					}
-				}
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
+                    $line = $p->hook_article_export_feed($line, $feed, $is_cat);
+                }
+
+                $article = array();
+
+                $article['id'] = $line['link'];
+                $article['link'] = $line['link'];
+                $article['title'] = $line['title'];
+                $article['excerpt'] = $line["content_preview"];
+                $article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
+                $article['updated'] = date('c', strtotime($line["updated"]));
+
+                if ($line['note']) {
+                    $article['note'] = $line['note'];
+                }
+                if ($article['author']) {
+                    $article['author'] = $line['author'];
+                }
+
+                $tags = Article::get_article_tags($line["id"], $owner_uid);
+
+                if (count($tags) > 0) {
+                    $article['tags'] = array();
+
+                    foreach ($tags as $tag) {
+                        array_push($article['tags'], $tag);
+                    }
+                }
+
+                $enclosures = Article::get_article_enclosures($line["id"]);
+
+                if (count($enclosures) > 0) {
+                    $article['enclosures'] = array();
 
-				array_push($feed['articles'], $article);
-			}
+                    foreach ($enclosures as $e) {
+                        $type = $e['content_type'];
+                        $url = $e['content_url'];
+                        $length = $e['duration'];
 
-			header("Content-Type: text/json; charset=utf-8");
-			print json_encode($feed);
+                        array_push($article['enclosures'], array("url" => $url, "type" => $type, "length" => $length));
+                    }
+                }
 
-		} else {
-			header("Content-Type: text/plain; charset=utf-8");
-			print json_encode(array("error" => array("message" => "Unknown format")));
-		}
-	}
+                array_push($feed['articles'], $article);
+            }
 
-	public function getUnread() {
-		$login = clean($_REQUEST["login"]);
-		$fresh = clean($_REQUEST["fresh"]) == "1";
+            header("Content-Type: text/json; charset=utf-8");
+            print json_encode($feed);
 
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
-		$sth->execute([$login]);
+        } else {
+            header("Content-Type: text/plain; charset=utf-8");
+            print json_encode(array("error" => array("message" => "Unknown format")));
+        }
+    }
 
-		if ($row = $sth->fetch()) {
-			$uid = $row["id"];
+    public function getUnread() {
+        $login = clean($_REQUEST["login"]);
+        $fresh = clean($_REQUEST["fresh"]) == "1";
 
-			print Feeds::getGlobalUnread($uid);
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
+        $sth->execute([$login]);
 
-			if ($fresh) {
-				print ";";
-				print Feeds::getFeedArticles(-3, false, true, $uid);
-			}
+        if ($row = $sth->fetch()) {
+            $uid = $row["id"];
 
-		} else {
-			print "-1;User not found";
-		}
-	}
+            print Feeds::getGlobalUnread($uid);
 
-	public function getProfiles() {
-		$login = clean($_REQUEST["login"]);
-		$rv = [];
+            if ($fresh) {
+                print ";";
+                print Feeds::getFeedArticles(-3, false, true, $uid);
+            }
 
-		if ($login) {
-			$sth = $this->pdo->prepare("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
+        } else {
+            print "-1;User not found";
+        }
+    }
+
+    public function getProfiles() {
+        $login = clean($_REQUEST["login"]);
+        $rv = [];
+
+        if ($login) {
+            $sth = $this->pdo->prepare("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
 			WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = ? ORDER BY title");
-			$sth->execute([$login]);
+            $sth->execute([$login]);
 
-			$rv = [["value" => 0, "label" => __("Default profile")]];
+            $rv = [["value" => 0, "label" => __("Default profile")]];
 
-			while ($line = $sth->fetch()) {
-				$id = $line["id"];
-				$title = $line["title"];
+            while ($line = $sth->fetch()) {
+                $id = $line["id"];
+                $title = $line["title"];
 
-				array_push($rv, ["label" => $title, "value" => $id]);
-			}
-	    }
+                array_push($rv, ["label" => $title, "value" => $id]);
+            }
+        }
 
-		print json_encode($rv);
-	}
+        print json_encode($rv);
+    }
 
-	public function logout() {
-		logout_user();
-		header("Location: index.php");
-	}
+    public function logout() {
+        logout_user();
+        header("Location: index.php");
+    }
 
-	public function share() {
-		$uuid = clean($_REQUEST["key"]);
+    public function share() {
+        $uuid = clean($_REQUEST["key"]);
 
-		if ($uuid) {
-			$sth = $this->pdo->prepare("SELECT ref_id, owner_uid
+        if ($uuid) {
+            $sth = $this->pdo->prepare("SELECT ref_id, owner_uid
 						FROM ttrss_user_entries WHERE uuid = ?");
-			$sth->execute([$uuid]);
+            $sth->execute([$uuid]);
 
-			if ($row = $sth->fetch()) {
-				header("Content-Type: text/html");
+            if ($row = $sth->fetch()) {
+                header("Content-Type: text/html");
 
-				$id = $row["ref_id"];
-				$owner_uid = $row["owner_uid"];
+                $id = $row["ref_id"];
+                $owner_uid = $row["owner_uid"];
 
-				print $this->format_article($id, $owner_uid);
+                print $this->format_article($id, $owner_uid);
 
-				return;
-			}
-		}
+                return;
+            }
+        }
 
-		header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
-		print "Article not found.";
-	}
+        header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+        print "Article not found.";
+    }
 
-	private function format_article($id, $owner_uid) {
+    private function format_article($id, $owner_uid) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id,title,link,content,feed_id,comments,int_id,lang,
+        $sth = $pdo->prepare("SELECT id,title,link,content,feed_id,comments,int_id,lang,
 			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 			(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
 			(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,
@@ -344,26 +344,26 @@ 
 			note
 			FROM ttrss_entries,ttrss_user_entries
 			WHERE	id = ? AND ref_id = id AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		$rv = '';
+        $rv = '';
 
-		if ($line = $sth->fetch()) {
+        if ($line = $sth->fetch()) {
 
-			$line["tags"] = Article::get_article_tags($id, $owner_uid, $line["tag_cache"]);
-			unset($line["tag_cache"]);
+            $line["tags"] = Article::get_article_tags($id, $owner_uid, $line["tag_cache"]);
+            unset($line["tag_cache"]);
 
-			$line["content"] = sanitize($line["content"],
-				$line['hide_images'],
-				$owner_uid, $line["site_url"], false, $line["id"]);
+            $line["content"] = sanitize($line["content"],
+                $line['hide_images'],
+                $owner_uid, $line["site_url"], false, $line["id"]);
 
-			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
-				$line = $p->hook_render_article($line);
-			}
+            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
+                $line = $p->hook_render_article($line);
+            }
 
-			$line['content'] = DiskCache::rewriteUrls($line['content']);
+            $line['content'] = DiskCache::rewriteUrls($line['content']);
 
-			$enclosures = Article::get_article_enclosures($line["id"]);
+            $enclosures = Article::get_article_enclosures($line["id"]);
 
             header("Content-Type: text/html");
 
@@ -378,13 +378,13 @@ 
             $rv .= "<meta property='og:title' content=\"".htmlspecialchars(html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401))."\"/>\n";
             $rv .= "<meta property='og:description' content=\"".
                 htmlspecialchars(
-                	truncate_string(
-                		preg_replace("/[\r\n\t]/", "",
-							preg_replace("/ {1,}/", " ",
-								strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
-							)
-					), 500, "...")
-				)."\"/>\n";
+                    truncate_string(
+                        preg_replace("/[\r\n\t]/", "",
+                            preg_replace("/ {1,}/", " ",
+                                strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
+                            )
+                    ), 500, "...")
+                )."\"/>\n";
 
             $rv .= "</head>";
 
@@ -397,135 +397,135 @@ 
             $rv .= "<body class='flat ttrss_utility ttrss_zoom'>";
             $rv .= "<div class='container'>";
 
-			if ($line["link"]) {
-				$rv .= "<h1><a target='_blank' rel='noopener noreferrer'
+            if ($line["link"]) {
+                $rv .= "<h1><a target='_blank' rel='noopener noreferrer'
 					title=\"".htmlspecialchars($line['title'])."\"
 					href=\"" .htmlspecialchars($line["link"])."\">".$line["title"]."</a></h1>";
-			} else {
-				$rv .= "<h1>".$line["title"]."</h1>";
-			}
+            } else {
+                $rv .= "<h1>".$line["title"]."</h1>";
+            }
 
-			$rv .= "<div class='content post'>";
+            $rv .= "<div class='content post'>";
 
-			/* header */
+            /* header */
 
-			$rv .= "<div class='header'>";
-			$rv .= "<div class='row'>"; # row
+            $rv .= "<div class='header'>";
+            $rv .= "<div class='row'>"; # row
 
-			//$entry_author = $line["author"] ? " - " . $line["author"] : "";
-			$parsed_updated = make_local_datetime($line["updated"], true,
-				$owner_uid, true);
+            //$entry_author = $line["author"] ? " - " . $line["author"] : "";
+            $parsed_updated = make_local_datetime($line["updated"], true,
+                $owner_uid, true);
 
-			$rv .= "<div>".$line['author']."</div>";
+            $rv .= "<div>".$line['author']."</div>";
             $rv .= "<div>$parsed_updated</div>";
 
-			$rv .= "</div>"; # row
+            $rv .= "</div>"; # row
 
-			$rv .= "</div>"; # header
+            $rv .= "</div>"; # header
 
-			/* content */
+            /* content */
 
-			$lang = $line['lang'] ? $line['lang'] : "en";
-			$rv .= "<div class='content' lang='$lang'>";
+            $lang = $line['lang'] ? $line['lang'] : "en";
+            $rv .= "<div class='content' lang='$lang'>";
 
-			/* content body */
+            /* content body */
 
-			$rv .= $line["content"];
+            $rv .= $line["content"];
 
             $rv .= Article::format_article_enclosures($id,
                 $line["always_display_enclosures"],
                 $line["content"],
                 $line["hide_images"]);
 
-			$rv .= "</div>"; # content
+            $rv .= "</div>"; # content
 
-			$rv .= "</div>"; # post
+            $rv .= "</div>"; # post
 
-		}
+        }
 
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE) as $p) {
-			$rv = $p->hook_format_article($rv, $line, true);
-		}
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE) as $p) {
+            $rv = $p->hook_format_article($rv, $line, true);
+        }
 
-		return $rv;
+        return $rv;
 
-	}
+    }
 
-	public function rss() {
-		$feed = clean($_REQUEST["id"]);
-		$key = clean($_REQUEST["key"]);
-		$is_cat = clean($_REQUEST["is_cat"]);
-		$limit = (int) clean($_REQUEST["limit"]);
-		$offset = (int) clean($_REQUEST["offset"]);
+    public function rss() {
+        $feed = clean($_REQUEST["id"]);
+        $key = clean($_REQUEST["key"]);
+        $is_cat = clean($_REQUEST["is_cat"]);
+        $limit = (int) clean($_REQUEST["limit"]);
+        $offset = (int) clean($_REQUEST["offset"]);
 
-		$search = clean($_REQUEST["q"]);
-		$view_mode = clean($_REQUEST["view-mode"]);
-		$order = clean($_REQUEST["order"]);
-		$start_ts = clean($_REQUEST["ts"]);
+        $search = clean($_REQUEST["q"]);
+        $view_mode = clean($_REQUEST["view-mode"]);
+        $order = clean($_REQUEST["order"]);
+        $start_ts = clean($_REQUEST["ts"]);
 
-		$format = clean($_REQUEST['format']);
-		$orig_guid = clean($_REQUEST["orig_guid"]);
+        $format = clean($_REQUEST['format']);
+        $orig_guid = clean($_REQUEST["orig_guid"]);
 
-		if (!$format) {
-		    $format = 'atom';
-		}
+        if (!$format) {
+            $format = 'atom';
+        }
 
-		if (SINGLE_USER_MODE) {
-			authenticate_user("admin", null);
-		}
+        if (SINGLE_USER_MODE) {
+            authenticate_user("admin", null);
+        }
 
-		$owner_id = false;
+        $owner_id = false;
 
-		if ($key) {
-			$sth = $this->pdo->prepare("SELECT owner_uid FROM
+        if ($key) {
+            $sth = $this->pdo->prepare("SELECT owner_uid FROM
 				ttrss_access_keys WHERE access_key = ? AND feed_id = ?");
-			$sth->execute([$key, $feed]);
-
-			if ($row = $sth->fetch()) {
-							$owner_id = $row["owner_uid"];
-			}
-		}
-
-		if ($owner_id) {
-			$this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
-				$offset, $search, $view_mode, $format, $order, $orig_guid, $start_ts);
-		} else {
-			header('HTTP/1.1 403 Forbidden');
-		}
-	}
-
-	public function updateTask() {
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
-	}
-
-	public function housekeepingTask() {
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
-	}
-
-	public function globalUpdateFeeds() {
-		RPC::updaterandomfeed_real();
-
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
-	}
-
-	public function sharepopup() {
-		if (SINGLE_USER_MODE) {
-			login_sequence();
-		}
-
-		header('Content-Type: text/html; charset=utf-8');
-		?>
+            $sth->execute([$key, $feed]);
+
+            if ($row = $sth->fetch()) {
+                            $owner_id = $row["owner_uid"];
+            }
+        }
+
+        if ($owner_id) {
+            $this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
+                $offset, $search, $view_mode, $format, $order, $orig_guid, $start_ts);
+        } else {
+            header('HTTP/1.1 403 Forbidden');
+        }
+    }
+
+    public function updateTask() {
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
+    }
+
+    public function housekeepingTask() {
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
+    }
+
+    public function globalUpdateFeeds() {
+        RPC::updaterandomfeed_real();
+
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
+    }
+
+    public function sharepopup() {
+        if (SINGLE_USER_MODE) {
+            login_sequence();
+        }
+
+        header('Content-Type: text/html; charset=utf-8');
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
 			<title><?php echo __("Share with Tiny Tiny RSS") ?></title>
 			<?php
-			echo stylesheet_tag("css/default.css");
-			echo javascript_tag("lib/prototype.js");
-			echo javascript_tag("lib/dojo/dojo.js");
-			echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls")
-			?>
+            echo stylesheet_tag("css/default.css");
+            echo javascript_tag("lib/prototype.js");
+            echo javascript_tag("lib/dojo/dojo.js");
+            echo javascript_tag("lib/dojo/tt-rss-layer.js");
+            echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls")
+            ?>
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
@@ -547,29 +547,29 @@ 
 
 		<?php
 
-		$action = clean($_REQUEST["action"]);
+        $action = clean($_REQUEST["action"]);
 
-		if ($_SESSION["uid"]) {
+        if ($_SESSION["uid"]) {
 
-			if ($action == 'share') {
+            if ($action == 'share') {
 
-				$title = strip_tags(clean($_REQUEST["title"]));
-				$url = strip_tags(clean($_REQUEST["url"]));
-				$content = strip_tags(clean($_REQUEST["content"]));
-				$labels = strip_tags(clean($_REQUEST["labels"]));
+                $title = strip_tags(clean($_REQUEST["title"]));
+                $url = strip_tags(clean($_REQUEST["url"]));
+                $content = strip_tags(clean($_REQUEST["content"]));
+                $labels = strip_tags(clean($_REQUEST["labels"]));
 
-				Article::create_published_article($title, $url, $content, $labels,
-					$_SESSION["uid"]);
+                Article::create_published_article($title, $url, $content, $labels,
+                    $_SESSION["uid"]);
 
-				print "<script type='text/javascript'>";
-				print "window.close();";
-				print "</script>";
+                print "<script type='text/javascript'>";
+                print "window.close();";
+                print "</script>";
 
-			} else {
-				$title = htmlspecialchars(clean($_REQUEST["title"]));
-				$url = htmlspecialchars(clean($_REQUEST["url"]));
+            } else {
+                $title = htmlspecialchars(clean($_REQUEST["title"]));
+                $url = htmlspecialchars(clean($_REQUEST["url"]));
 
-				?>
+                ?>
 				<form id='share_form' name='share_form'>
 
 					<input type="hidden" name="op" value="sharepopup">
@@ -609,12 +609,12 @@ 
 				</form>
 				<?php
 
-			}
+            }
 
-		} else {
+        } else {
 
-			$return = urlencode(make_self_url());
-			print_error("Not logged in"); ?>
+            $return = urlencode(make_self_url());
+            print_error("Not logged in"); ?>
 
 			<form action="public.php?return=<?php echo $return ?>" method="post">
 
@@ -646,91 +646,91 @@ 
 
 			</form>
 			<?php
-		}
+        }
 
-		print "</div></body></html>";
-	}
+        print "</div></body></html>";
+    }
 
-	public function login() {
-		if (!SINGLE_USER_MODE) {
+    public function login() {
+        if (!SINGLE_USER_MODE) {
 
-			$login = clean($_POST["login"]);
-			$password = clean($_POST["password"]);
-			$remember_me = clean($_POST["remember_me"]);
+            $login = clean($_POST["login"]);
+            $password = clean($_POST["password"]);
+            $remember_me = clean($_POST["remember_me"]);
 
-			if ($remember_me) {
-				session_set_cookie_params(SESSION_COOKIE_LIFETIME);
-			} else {
-				session_set_cookie_params(0);
-			}
+            if ($remember_me) {
+                session_set_cookie_params(SESSION_COOKIE_LIFETIME);
+            } else {
+                session_set_cookie_params(0);
+            }
 
-			if (authenticate_user($login, $password)) {
-				$_POST["password"] = "";
+            if (authenticate_user($login, $password)) {
+                $_POST["password"] = "";
 
-				if (get_schema_version() >= 120) {
-					$_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
-				}
+                if (get_schema_version() >= 120) {
+                    $_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
+                }
 
-				$_SESSION["ref_schema_version"] = get_schema_version(true);
-				$_SESSION["bw_limit"] = !!clean($_POST["bw_limit"]);
+                $_SESSION["ref_schema_version"] = get_schema_version(true);
+                $_SESSION["bw_limit"] = !!clean($_POST["bw_limit"]);
 
-				if (clean($_POST["profile"])) {
+                if (clean($_POST["profile"])) {
 
-					$profile = (int) clean($_POST["profile"]);
+                    $profile = (int) clean($_POST["profile"]);
 
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
 						WHERE id = ? AND owner_uid = ?");
-					$sth->execute([$profile, $_SESSION['uid']]);
+                    $sth->execute([$profile, $_SESSION['uid']]);
 
-					if ($sth->fetch()) {
-						$_SESSION["profile"] = $profile;
- 					} else {
-					    $_SESSION["profile"] = null;
+                    if ($sth->fetch()) {
+                        $_SESSION["profile"] = $profile;
+                        } else {
+                        $_SESSION["profile"] = null;
                     }
-				}
-			} else {
+                }
+            } else {
 
-				// start an empty session to deliver login error message
-				@session_start();
+                // start an empty session to deliver login error message
+                @session_start();
 
-				if (!isset($_SESSION["login_error_msg"])) {
-									$_SESSION["login_error_msg"] = __("Incorrect username or password");
-				}
+                if (!isset($_SESSION["login_error_msg"])) {
+                                    $_SESSION["login_error_msg"] = __("Incorrect username or password");
+                }
 
-				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
-			}
+                user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
+            }
 
-			$return = clean($_REQUEST['return']);
+            $return = clean($_REQUEST['return']);
 
-			if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
-				header("Location: ".clean($_REQUEST['return']));
-			} else {
-				header("Location: ".get_self_url_prefix());
-			}
-		}
-	}
+            if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
+                header("Location: ".clean($_REQUEST['return']));
+            } else {
+                header("Location: ".get_self_url_prefix());
+            }
+        }
+    }
 
-	public function subscribe() {
-		if (SINGLE_USER_MODE) {
-			login_sequence();
-		}
+    public function subscribe() {
+        if (SINGLE_USER_MODE) {
+            login_sequence();
+        }
 
-		if ($_SESSION["uid"]) {
+        if ($_SESSION["uid"]) {
 
-			$feed_url = trim(clean($_REQUEST["feed_url"]));
+            $feed_url = trim(clean($_REQUEST["feed_url"]));
 
-			header('Content-Type: text/html; charset=utf-8');
-			?>
+            header('Content-Type: text/html; charset=utf-8');
+            ?>
 			<!DOCTYPE html>
 			<html>
 			<head>
 				<title>Tiny Tiny RSS</title>
 				<?php
-					echo stylesheet_tag("css/default.css");
-					echo javascript_tag("lib/prototype.js");
-					echo javascript_tag("lib/dojo/dojo.js");
-					echo javascript_tag("lib/dojo/tt-rss-layer.js");
-				?>
+                    echo stylesheet_tag("css/default.css");
+                    echo javascript_tag("lib/prototype.js");
+                    echo javascript_tag("lib/dojo/dojo.js");
+                    echo javascript_tag("lib/dojo/tt-rss-layer.js");
+                ?>
 				<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 				<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 				<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
@@ -749,8 +749,8 @@ 
 			<div class='content'>
 			<?php
 
-			if (!$feed_url) {
-				?>
+            if (!$feed_url) {
+                ?>
 				<form method="post">
 					<input type="hidden" name="op" value="subscribe">
 					<fieldset>
@@ -765,101 +765,101 @@ 
 					<a href="index.php"><?php echo __("Return to Tiny Tiny RSS") ?></a>
 				</form>
 				<?php
-			} else {
-
-				$rc = Feeds::subscribe_to_feed($feed_url);
-				$feed_urls = false;
-
-				switch ($rc['code']) {
-					case 0:
-						print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 1:
-						print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 2:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
-						break;
-					case 3:
-						print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
-						break;
-					case 4:
-						$feed_urls = $rc["feeds"];
-						break;
-					case 5:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
-						break;
-				}
-
-				if ($feed_urls) {
-
-					print "<form action='public.php'>";
-					print "<input type='hidden' name='op' value='subscribe'>";
-
-					print "<fieldset>";
-					print "<label style='display : inline'>".__("Multiple feed URLs found:")."</label>";
-					print "<select name='feed_url' dojoType='dijit.form.Select'>";
-
-					foreach ($feed_urls as $url => $name) {
-						$url = htmlspecialchars($url);
-						$name = htmlspecialchars($name);
+            } else {
+
+                $rc = Feeds::subscribe_to_feed($feed_url);
+                $feed_urls = false;
+
+                switch ($rc['code']) {
+                    case 0:
+                        print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
+                        break;
+                    case 1:
+                        print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
+                        break;
+                    case 2:
+                        print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
+                        break;
+                    case 3:
+                        print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
+                        break;
+                    case 4:
+                        $feed_urls = $rc["feeds"];
+                        break;
+                    case 5:
+                        print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
+                        break;
+                }
+
+                if ($feed_urls) {
+
+                    print "<form action='public.php'>";
+                    print "<input type='hidden' name='op' value='subscribe'>";
+
+                    print "<fieldset>";
+                    print "<label style='display : inline'>".__("Multiple feed URLs found:")."</label>";
+                    print "<select name='feed_url' dojoType='dijit.form.Select'>";
+
+                    foreach ($feed_urls as $url => $name) {
+                        $url = htmlspecialchars($url);
+                        $name = htmlspecialchars($name);
+
+                        print "<option value=\"$url\">$name</option>";
+                    }
 
-						print "<option value=\"$url\">$name</option>";
-					}
+                    print "</select>";
+                    print "</fieldset>";
 
-					print "</select>";
-					print "</fieldset>";
+                    print "<button class='alt-primary' dojoType='dijit.form.Button' type='submit'>".__("Subscribe to selected feed")."</button>";
+                    print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-					print "<button class='alt-primary' dojoType='dijit.form.Button' type='submit'>".__("Subscribe to selected feed")."</button>";
-					print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    print "</form>";
+                }
 
-					print "</form>";
-				}
+                $tp_uri = get_self_url_prefix()."/prefs.php";
 
-				$tp_uri = get_self_url_prefix()."/prefs.php";
-
-				if ($rc['code'] <= 2) {
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                if ($rc['code'] <= 2) {
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 					feed_url = ? AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
-					$row = $sth->fetch();
+                    $sth->execute([$feed_url, $_SESSION['uid']]);
+                    $row = $sth->fetch();
 
-					$feed_id = $row["id"];
-				} else {
-					$feed_id = 0;
-				}
+                    $feed_id = $row["id"];
+                } else {
+                    $feed_id = 0;
+                }
 
-				if ($feed_id) {
-					print "<form method='GET' action=\"$tp_uri\">
+                if ($feed_id) {
+                    print "<form method='GET' action=\"$tp_uri\">
 					<input type='hidden' name='tab' value='feedConfig'>
 					<input type='hidden' name='method' value='editfeed'>
 					<input type='hidden' name='methodparam' value='$feed_id'>
 					<button dojoType='dijit.form.Button' class='alt-info' type='submit'>".__("Edit subscription options")."</button>
 					<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
 					</form>";
-				}
-			}
+                }
+            }
 
-			print "</div></div></body></html>";
+            print "</div></div></body></html>";
 
-		} else {
-			render_login_form();
-		}
-	}
+        } else {
+            render_login_form();
+        }
+    }
 
-	public function index() {
-		header("Content-Type: text/plain");
-		print error_json(13);
-	}
+    public function index() {
+        header("Content-Type: text/plain");
+        print error_json(13);
+    }
 
-	public function forgotpass() {
-		startup_gettext();
-		session_start();
+    public function forgotpass() {
+        startup_gettext();
+        session_start();
 
-		@$hash = clean($_REQUEST["hash"]);
+        @$hash = clean($_REQUEST["hash"]);
 
-		header('Content-Type: text/html; charset=utf-8');
-		?>
+        header('Content-Type: text/html; charset=utf-8');
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
@@ -868,11 +868,11 @@ 
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 			<?php
-				echo stylesheet_tag("css/default.css");
-				echo javascript_tag("lib/prototype.js");
-				echo javascript_tag("lib/dojo/dojo.js");
-				echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			?>
+                echo stylesheet_tag("css/default.css");
+                echo javascript_tag("lib/prototype.js");
+                echo javascript_tag("lib/dojo/dojo.js");
+                echo javascript_tag("lib/dojo/tt-rss-layer.js");
+            ?>
 		</head>
 		<body class='flat ttrss_utility'>
 		<div class='container'>
@@ -887,52 +887,52 @@ 
 		</script>
 		<?php
 
-		print "<h1>".__("Password recovery")."</h1>";
-		print "<div class='content'>";
+        print "<h1>".__("Password recovery")."</h1>";
+        print "<div class='content'>";
 
-		@$method = clean($_POST['method']);
+        @$method = clean($_POST['method']);
 
-		if ($hash) {
-			$login = clean($_REQUEST["login"]);
+        if ($hash) {
+            $login = clean($_REQUEST["login"]);
 
-			if ($login) {
-				$sth = $this->pdo->prepare("SELECT id, resetpass_token FROM ttrss_users
+            if ($login) {
+                $sth = $this->pdo->prepare("SELECT id, resetpass_token FROM ttrss_users
 					WHERE login = ?");
-				$sth->execute([$login]);
+                $sth->execute([$login]);
 
-				if ($row = $sth->fetch()) {
-					$id = $row["id"];
-					$resetpass_token_full = $row["resetpass_token"];
-					list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
+                if ($row = $sth->fetch()) {
+                    $id = $row["id"];
+                    $resetpass_token_full = $row["resetpass_token"];
+                    list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
 
-					if ($timestamp && $resetpass_token &&
-						$timestamp >= time() - 15 * 60 * 60 &&
-						$resetpass_token == $hash) {
+                    if ($timestamp && $resetpass_token &&
+                        $timestamp >= time() - 15 * 60 * 60 &&
+                        $resetpass_token == $hash) {
 
-							$sth = $this->pdo->prepare("UPDATE ttrss_users SET resetpass_token = NULL
+                            $sth = $this->pdo->prepare("UPDATE ttrss_users SET resetpass_token = NULL
 								WHERE id = ?");
-							$sth->execute([$id]);
+                            $sth->execute([$id]);
 
-							Pref_Users::resetUserPassword($id, true);
+                            Pref_Users::resetUserPassword($id, true);
 
-							print "<p>"."Completed."."</p>";
+                            print "<p>"."Completed."."</p>";
 
-					} else {
-						print_error("Some of the information provided is missing or incorrect.");
-					}
-				} else {
-					print_error("Some of the information provided is missing or incorrect.");
-				}
-			} else {
-				print_error("Some of the information provided is missing or incorrect.");
-			}
+                    } else {
+                        print_error("Some of the information provided is missing or incorrect.");
+                    }
+                } else {
+                    print_error("Some of the information provided is missing or incorrect.");
+                }
+            } else {
+                print_error("Some of the information provided is missing or incorrect.");
+            }
 
-			print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+            print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-		} else if (!$method) {
-			print_notice(__("You will need to provide valid account name and email. Password reset link will be sent to your email address."));
+        } else if (!$method) {
+            print_notice(__("You will need to provide valid account name and email. Password reset link will be sent to your email address."));
 
-			print "<form method='POST' action='public.php'>
+            print "<form method='POST' action='public.php'>
 				<input type='hidden' name='method' value='do'>
 				<input type='hidden' name='op' value='forgotpass'>
 
@@ -946,10 +946,10 @@ 
 				<input dojoType='dijit.form.TextBox' type='email' name='email' value='' required>
 				</fieldset>";
 
-			$_SESSION["pwdreset:testvalue1"] = rand(1, 10);
-			$_SESSION["pwdreset:testvalue2"] = rand(1, 10);
+            $_SESSION["pwdreset:testvalue1"] = rand(1, 10);
+            $_SESSION["pwdreset:testvalue2"] = rand(1, 10);
 
-			print "<fieldset>
+            print "<fieldset>
 				<label>".T_sprintf("How much is %d + %d:", $_SESSION["pwdreset:testvalue1"], $_SESSION["pwdreset:testvalue2"])."</label>
 				<input dojoType='dijit.form.TextBox' type='text' name='test' value='' required>
 				</fieldset>
@@ -961,111 +961,111 @@ 
 				</fieldset>
 
 				</form>";
-		} else if ($method == 'do') {
+        } else if ($method == 'do') {
 
-			$login = clean($_POST["login"]);
-			$email = clean($_POST["email"]);
-			$test = clean($_POST["test"]);
+            $login = clean($_POST["login"]);
+            $email = clean($_POST["email"]);
+            $test = clean($_POST["test"]);
 
-			if ($test != ($_SESSION["pwdreset:testvalue1"] + $_SESSION["pwdreset:testvalue2"]) || !$email || !$login) {
-				print_error(__('Some of the required form parameters are missing or incorrect.'));
+            if ($test != ($_SESSION["pwdreset:testvalue1"] + $_SESSION["pwdreset:testvalue2"]) || !$email || !$login) {
+                print_error(__('Some of the required form parameters are missing or incorrect.'));
 
-				print "<form method='GET' action='public.php'>
+                print "<form method='GET' action='public.php'>
 					<input type='hidden' name='op' value='forgotpass'>
 					<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".__("Go back")."</button>
 					</form>";
 
-			} else {
+            } else {
 
-				// prevent submitting this form multiple times
-				$_SESSION["pwdreset:testvalue1"] = rand(1, 1000);
-				$_SESSION["pwdreset:testvalue2"] = rand(1, 1000);
+                // prevent submitting this form multiple times
+                $_SESSION["pwdreset:testvalue1"] = rand(1, 1000);
+                $_SESSION["pwdreset:testvalue2"] = rand(1, 1000);
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_users
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_users
 					WHERE login = ? AND email = ?");
-				$sth->execute([$login, $email]);
+                $sth->execute([$login, $email]);
 
-				if ($row = $sth->fetch()) {
-					print_notice("Password reset instructions are being sent to your email address.");
+                if ($row = $sth->fetch()) {
+                    print_notice("Password reset instructions are being sent to your email address.");
 
-					$id = $row["id"];
+                    $id = $row["id"];
 
-					if ($id) {
-						$resetpass_token = sha1(get_random_bytes(128));
-						$resetpass_link = get_self_url_prefix()."/public.php?op=forgotpass&hash=".$resetpass_token.
-							"&login=".urlencode($login);
+                    if ($id) {
+                        $resetpass_token = sha1(get_random_bytes(128));
+                        $resetpass_link = get_self_url_prefix()."/public.php?op=forgotpass&hash=".$resetpass_token.
+                            "&login=".urlencode($login);
 
-						require_once "lib/MiniTemplator.class.php";
+                        require_once "lib/MiniTemplator.class.php";
 
-						$tpl = new MiniTemplator;
+                        $tpl = new MiniTemplator;
 
-						$tpl->readTemplateFromFile("templates/resetpass_link_template.txt");
+                        $tpl->readTemplateFromFile("templates/resetpass_link_template.txt");
 
-						$tpl->setVariable('LOGIN', $login);
-						$tpl->setVariable('RESETPASS_LINK', $resetpass_link);
-						$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+                        $tpl->setVariable('LOGIN', $login);
+                        $tpl->setVariable('RESETPASS_LINK', $resetpass_link);
+                        $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-						$tpl->addBlock('message');
+                        $tpl->addBlock('message');
 
-						$message = "";
+                        $message = "";
 
-						$tpl->generateOutputToString($message);
+                        $tpl->generateOutputToString($message);
 
-						$mailer = new Mailer();
+                        $mailer = new Mailer();
 
-						$rc = $mailer->mail(["to_name" => $login,
-							"to_address" => $email,
-							"subject" => __("[tt-rss] Password reset request"),
-							"message" => $message]);
+                        $rc = $mailer->mail(["to_name" => $login,
+                            "to_address" => $email,
+                            "subject" => __("[tt-rss] Password reset request"),
+                            "message" => $message]);
 
-						if (!$rc) {
-						    print_error($mailer->error());
-						}
+                        if (!$rc) {
+                            print_error($mailer->error());
+                        }
 
-						$resetpass_token_full = time().":".$resetpass_token;
+                        $resetpass_token_full = time().":".$resetpass_token;
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_users
+                        $sth = $this->pdo->prepare("UPDATE ttrss_users
 							SET resetpass_token = ?
 							WHERE login = ? AND email = ?");
 
-						$sth->execute([$resetpass_token_full, $login, $email]);
+                        $sth->execute([$resetpass_token_full, $login, $email]);
 
-					} else {
-						print_error("User ID not found.");
-					}
+                    } else {
+                        print_error("User ID not found.");
+                    }
 
-					print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-				} else {
-					print_error(__("Sorry, login and email combination not found."));
+                } else {
+                    print_error(__("Sorry, login and email combination not found."));
 
-					print "<form method='GET' action='public.php'>
+                    print "<form method='GET' action='public.php'>
 						<input type='hidden' name='op' value='forgotpass'>
 						<button dojoType='dijit.form.Button' type='submit'>".__("Go back")."</button>
 						</form>";
 
-				}
-			}
+                }
+            }
 
-		}
+        }
 
-		print "</div>";
-		print "</div>";
-		print "</body>";
-		print "</html>";
+        print "</div>";
+        print "</div>";
+        print "</body>";
+        print "</html>";
 
-	}
+    }
 
-	public function dbupdate() {
-		startup_gettext();
+    public function dbupdate() {
+        startup_gettext();
 
-		if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
-			$_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
-			render_login_form();
-			exit;
-		}
+        if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
+            $_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
+            render_login_form();
+            exit;
+        }
 
-		?>
+        ?>
 		<!DOCTYPE html>
 		<html>
 			<head>
@@ -1075,11 +1075,11 @@ 
 			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
 			<?php
-				echo stylesheet_tag("css/default.css");
-				echo javascript_tag("lib/prototype.js");
-				echo javascript_tag("lib/dojo/dojo.js");
-				echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			?>
+                echo stylesheet_tag("css/default.css");
+                echo javascript_tag("lib/prototype.js");
+                echo javascript_tag("lib/dojo/dojo.js");
+                echo javascript_tag("lib/dojo/tt-rss-layer.js");
+            ?>
 			<style type="text/css">
 				span.ok { color : #009000; font-weight : bold; }
 				span.err { color : #ff0000; font-weight : bold; }
@@ -1106,139 +1106,139 @@ 
 			<div class="content">
 
 			<?php
-				@$op = clean($_REQUEST["subop"]);
-				$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
+                @$op = clean($_REQUEST["subop"]);
+                $updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
 
-				if ($op == "performupdate") {
-					if ($updater->isUpdateRequired()) {
+                if ($op == "performupdate") {
+                    if ($updater->isUpdateRequired()) {
 
-						print "<h2>".T_sprintf("Performing updates to version %d", SCHEMA_VERSION)."</h2>";
+                        print "<h2>".T_sprintf("Performing updates to version %d", SCHEMA_VERSION)."</h2>";
 
-						for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
-							print "<ul>";
+                        for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+                            print "<ul>";
 
-							print "<li class='text-info'>".T_sprintf("Updating to version %d", $i)."</li>";
+                            print "<li class='text-info'>".T_sprintf("Updating to version %d", $i)."</li>";
 
-							print "<li>";
-							$result = $updater->performUpdateTo($i, true);
-							print "</li>";
+                            print "<li>";
+                            $result = $updater->performUpdateTo($i, true);
+                            print "</li>";
 
-							if (!$result) {
-								print "</ul>";
+                            if (!$result) {
+                                print "</ul>";
 
-								print_error("One of the updates failed. Either retry the process or perform updates manually.");
+                                print_error("One of the updates failed. Either retry the process or perform updates manually.");
 
-								print "<form method='POST'>
+                                print "<form method='POST'>
 									<input type='hidden' name='subop' value='performupdate'>
 									<button type='submit' dojoType='dijit.form.Button' class='alt-danger' onclick='return confirmOP()'>".__("Try again")."</button>
 									<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
 								</form>";
 
-								return;
-							} else {
-								print "<li class='text-success'>".__("Completed.")."</li>";
-								print "</ul>";
-							}
-						}
+                                return;
+                            } else {
+                                print "<li class='text-success'>".__("Completed.")."</li>";
+                                print "</ul>";
+                            }
+                        }
 
-						print_notice("Your Tiny Tiny RSS database is now updated to the latest version.");
+                        print_notice("Your Tiny Tiny RSS database is now updated to the latest version.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-					} else {
-						print_notice("Tiny Tiny RSS database is up to date.");
+                    } else {
+                        print_notice("Tiny Tiny RSS database is up to date.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
-					}
-				} else {
-					if ($updater->isUpdateRequired()) {
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    }
+                } else {
+                    if ($updater->isUpdateRequired()) {
 
-						print "<h2>".T_sprintf("Tiny Tiny RSS database needs update to the latest version (%d to %d).",
-							$updater->getSchemaVersion(), SCHEMA_VERSION)."</h2>";
+                        print "<h2>".T_sprintf("Tiny Tiny RSS database needs update to the latest version (%d to %d).",
+                            $updater->getSchemaVersion(), SCHEMA_VERSION)."</h2>";
 
-						if (DB_TYPE == "mysql") {
-							print_error("<strong>READ THIS:</strong> Due to MySQL limitations, your database is not completely protected while updating. ".
-								"Errors may put it in an inconsistent state requiring manual rollback. <strong>BACKUP YOUR DATABASE BEFORE CONTINUING.</strong>");
-						} else {
-							print_warning("Please backup your database before proceeding.");
-						}
+                        if (DB_TYPE == "mysql") {
+                            print_error("<strong>READ THIS:</strong> Due to MySQL limitations, your database is not completely protected while updating. ".
+                                "Errors may put it in an inconsistent state requiring manual rollback. <strong>BACKUP YOUR DATABASE BEFORE CONTINUING.</strong>");
+                        } else {
+                            print_warning("Please backup your database before proceeding.");
+                        }
 
-						print "<form method='POST'>
+                        print "<form method='POST'>
 							<input type='hidden' name='subop' value='performupdate'>
 							<button type='submit' dojoType='dijit.form.Button' class='alt-danger' onclick='return confirmOP()'>".__("Perform updates")."</button>
 						</form>";
 
-					} else {
+                    } else {
 
-						print_notice("Tiny Tiny RSS database is up to date.");
+                        print_notice("Tiny Tiny RSS database is up to date.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
-					}
-				}
-			?>
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    }
+                }
+            ?>
 
 			</div>
 			</div>
 			</body>
 			</html>
 		<?php
-	}
-
-	public function cached_url() {
-		list ($cache_dir, $filename) = explode("/", $_GET["file"], 2);
-
-		// we do not allow files with extensions at the moment
-		$filename = str_replace(".", "", $filename);
-
-		$cache = new DiskCache($cache_dir);
-
-		if ($cache->exists($filename)) {
-			$cache->send($filename);
-		} else {
-			header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
-			echo "File not found.";
-		}
-	}
-
-	private function make_article_tag_uri($id, $timestamp) {
-
-		$timestamp = date("Y-m-d", strtotime($timestamp));
-
-		return "tag:".parse_url(get_self_url_prefix(), PHP_URL_HOST).",$timestamp:/$id";
-	}
-
-	// this should be used very carefully because this endpoint is exposed to unauthenticated users
-	// plugin data is not loaded because there's no user context and owner_uid/session may or may not be available
-	// in general, don't do anything user-related in here and do not modify $_SESSION
-	public function pluginhandler() {
-		$host = new PluginHost();
-
-		$plugin_name = clean_filename($_REQUEST["plugin"]);
-		$method = clean($_REQUEST["pmethod"]);
-
-		$host->load($plugin_name, PluginHost::KIND_USER, 0);
-		$host->load_data();
-
-		$plugin = $host->get_plugin($plugin_name);
-
-		if ($plugin) {
-			if (method_exists($plugin, $method)) {
-				if ($plugin->is_public_method($method)) {
-					$plugin->$method();
-				} else {
-					user_error("PluginHandler[PUBLIC]: Requested private method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
-					header("Content-Type: text/json");
-					print error_json(6);
-				}
-			} else {
-				user_error("PluginHandler[PUBLIC]: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
-				header("Content-Type: text/json");
-				print error_json(13);
-			}
-		} else {
-			user_error("PluginHandler[PUBLIC]: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
-			header("Content-Type: text/json");
-			print error_json(14);
-		}
-	}
+    }
+
+    public function cached_url() {
+        list ($cache_dir, $filename) = explode("/", $_GET["file"], 2);
+
+        // we do not allow files with extensions at the moment
+        $filename = str_replace(".", "", $filename);
+
+        $cache = new DiskCache($cache_dir);
+
+        if ($cache->exists($filename)) {
+            $cache->send($filename);
+        } else {
+            header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+            echo "File not found.";
+        }
+    }
+
+    private function make_article_tag_uri($id, $timestamp) {
+
+        $timestamp = date("Y-m-d", strtotime($timestamp));
+
+        return "tag:".parse_url(get_self_url_prefix(), PHP_URL_HOST).",$timestamp:/$id";
+    }
+
+    // this should be used very carefully because this endpoint is exposed to unauthenticated users
+    // plugin data is not loaded because there's no user context and owner_uid/session may or may not be available
+    // in general, don't do anything user-related in here and do not modify $_SESSION
+    public function pluginhandler() {
+        $host = new PluginHost();
+
+        $plugin_name = clean_filename($_REQUEST["plugin"]);
+        $method = clean($_REQUEST["pmethod"]);
+
+        $host->load($plugin_name, PluginHost::KIND_USER, 0);
+        $host->load_data();
+
+        $plugin = $host->get_plugin($plugin_name);
+
+        if ($plugin) {
+            if (method_exists($plugin, $method)) {
+                if ($plugin->is_public_method($method)) {
+                    $plugin->$method();
+                } else {
+                    user_error("PluginHandler[PUBLIC]: Requested private method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
+                    header("Content-Type: text/json");
+                    print error_json(6);
+                }
+            } else {
+                user_error("PluginHandler[PUBLIC]: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
+                header("Content-Type: text/json");
+                print error_json(13);
+            }
+        } else {
+            user_error("PluginHandler[PUBLIC]: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
+            header("Content-Type: text/json");
+            print error_json(14);
+        }
+    }
 }

classes/ccache.php

Indentation +134 added lines, -134 removed lines

@@ -1,215 +1,215 @@
 <?php
 class CCache {
-	public static function zero_all($owner_uid) {
-		$pdo = Db::pdo();
+    public static function zero_all($owner_uid) {
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("UPDATE ttrss_counters_cache SET
+        $sth = $pdo->prepare("UPDATE ttrss_counters_cache SET
 			value = 0 WHERE owner_uid = ?");
-		$sth->execute([$owner_uid]);
+        $sth->execute([$owner_uid]);
 
-		$sth = $pdo->prepare("UPDATE ttrss_cat_counters_cache SET
+        $sth = $pdo->prepare("UPDATE ttrss_cat_counters_cache SET
 			value = 0 WHERE owner_uid = ?");
-		$sth->execute([$owner_uid]);
-	}
+        $sth->execute([$owner_uid]);
+    }
 
-	public static function remove($feed_id, $owner_uid, $is_cat = false) {
+    public static function remove($feed_id, $owner_uid, $is_cat = false) {
 
-		$feed_id = (int) $feed_id;
+        $feed_id = (int) $feed_id;
 
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
+        if (!$is_cat) {
+            $table = "ttrss_counters_cache";
+        } else {
+            $table = "ttrss_cat_counters_cache";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("DELETE FROM $table WHERE
+        $sth = $pdo->prepare("DELETE FROM $table WHERE
 			feed_id = ? AND owner_uid = ?");
-		$sth->execute([$feed_id, $owner_uid]);
+        $sth->execute([$feed_id, $owner_uid]);
 
-	}
+    }
 
-	public static function update_all($owner_uid) {
+    public static function update_all($owner_uid) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if (get_pref('ENABLE_FEED_CATS', $owner_uid)) {
+        if (get_pref('ENABLE_FEED_CATS', $owner_uid)) {
 
-			$sth = $pdo->prepare("SELECT feed_id FROM ttrss_cat_counters_cache
+            $sth = $pdo->prepare("SELECT feed_id FROM ttrss_cat_counters_cache
 				WHERE feed_id > 0 AND owner_uid = ?");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				CCache::update($line["feed_id"], $owner_uid, true);
-			}
+            while ($line = $sth->fetch()) {
+                CCache::update($line["feed_id"], $owner_uid, true);
+            }
 
-			/* We have to manually include category 0 */
+            /* We have to manually include category 0 */
 
-			CCache::update(0, $owner_uid, true);
+            CCache::update(0, $owner_uid, true);
 
-		} else {
-			$sth = $pdo->prepare("SELECT feed_id FROM ttrss_counters_cache
+        } else {
+            $sth = $pdo->prepare("SELECT feed_id FROM ttrss_counters_cache
 				WHERE feed_id > 0 AND owner_uid = ?");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				print CCache::update($line["feed_id"], $owner_uid);
+            while ($line = $sth->fetch()) {
+                print CCache::update($line["feed_id"], $owner_uid);
 
-			}
+            }
 
-		}
-	}
+        }
+    }
 
-	public static function find($feed_id, $owner_uid, $is_cat = false,
-						 $no_update = false) {
+    public static function find($feed_id, $owner_uid, $is_cat = false,
+                            $no_update = false) {
 
-		// "" (null) is valid and should be cast to 0 (uncategorized)
-		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id) {
-					return;
-		}
+        // "" (null) is valid and should be cast to 0 (uncategorized)
+        // everything else i.e. tags are not
+        if (!is_numeric($feed_id) && $feed_id) {
+                    return;
+        }
 
-		$feed_id = (int) $feed_id;
+        $feed_id = (int) $feed_id;
 
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
+        if (!$is_cat) {
+            $table = "ttrss_counters_cache";
+        } else {
+            $table = "ttrss_cat_counters_cache";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT value FROM $table
+        $sth = $pdo->prepare("SELECT value FROM $table
 			WHERE owner_uid = ? AND feed_id = ?
 			LIMIT 1");
 
-		$sth->execute([$owner_uid, $feed_id]);
+        $sth->execute([$owner_uid, $feed_id]);
 
-		if ($row = $sth->fetch()) {
-			return $row["value"];
-		} else {
-			if ($no_update) {
-				return -1;
-			} else {
-				return CCache::update($feed_id, $owner_uid, $is_cat);
-			}
-		}
+        if ($row = $sth->fetch()) {
+            return $row["value"];
+        } else {
+            if ($no_update) {
+                return -1;
+            } else {
+                return CCache::update($feed_id, $owner_uid, $is_cat);
+            }
+        }
 
-	}
+    }
 
-	public static function update($feed_id, $owner_uid, $is_cat = false,
-						   $update_pcat = true, $pcat_fast = false) {
+    public static function update($feed_id, $owner_uid, $is_cat = false,
+                            $update_pcat = true, $pcat_fast = false) {
 
-		// "" (null) is valid and should be cast to 0 (uncategorized)
-		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id) {
-					return;
-		}
+        // "" (null) is valid and should be cast to 0 (uncategorized)
+        // everything else i.e. tags are not
+        if (!is_numeric($feed_id) && $feed_id) {
+                    return;
+        }
 
-		$feed_id = (int) $feed_id;
+        $feed_id = (int) $feed_id;
 
-		$prev_unread = CCache::find($feed_id, $owner_uid, $is_cat, true);
+        $prev_unread = CCache::find($feed_id, $owner_uid, $is_cat, true);
 
-		/* When updating a label, all we need to do is recalculate feed counters
+        /* When updating a label, all we need to do is recalculate feed counters
 		 * because labels are not cached */
 
-		if ($feed_id < 0) {
-			CCache::update_all($owner_uid);
-			return;
-		}
+        if ($feed_id < 0) {
+            CCache::update_all($owner_uid);
+            return;
+        }
 
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
+        if (!$is_cat) {
+            $table = "ttrss_counters_cache";
+        } else {
+            $table = "ttrss_cat_counters_cache";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if ($is_cat && $feed_id >= 0) {
-			/* Recalculate counters for child feeds */
+        if ($is_cat && $feed_id >= 0) {
+            /* Recalculate counters for child feeds */
 
-			if (!$pcat_fast) {
-				$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
+            if (!$pcat_fast) {
+                $sth = $pdo->prepare("SELECT id FROM ttrss_feeds
 						WHERE owner_uid = :uid AND
 							(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL))");
-				$sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
+                $sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
 
-				while ($line = $sth->fetch()) {
-					CCache::update((int) $line["id"], $owner_uid, false, false);
-				}
-			}
+                while ($line = $sth->fetch()) {
+                    CCache::update((int) $line["id"], $owner_uid, false, false);
+                }
+            }
 
-			$sth = $pdo->prepare("SELECT SUM(value) AS sv
+            $sth = $pdo->prepare("SELECT SUM(value) AS sv
 				FROM ttrss_counters_cache, ttrss_feeds
 				WHERE ttrss_feeds.id = feed_id AND
 				(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL)) AND
 				ttrss_counters_cache.owner_uid = :uid AND
 				ttrss_feeds.owner_uid = :uid");
-			$sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
-			$row = $sth->fetch();
+            $sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
+            $row = $sth->fetch();
 
-			$unread = (int) $row["sv"];
+            $unread = (int) $row["sv"];
 
-		} else {
-			$unread = (int) Feeds::getFeedArticles($feed_id, $is_cat, true, $owner_uid);
-		}
+        } else {
+            $unread = (int) Feeds::getFeedArticles($feed_id, $is_cat, true, $owner_uid);
+        }
 
-		$tr_in_progress = false;
+        $tr_in_progress = false;
 
-		try {
-			$pdo->beginTransaction();
-		} catch (Exception $e) {
-			$tr_in_progress = true;
-		}
+        try {
+            $pdo->beginTransaction();
+        } catch (Exception $e) {
+            $tr_in_progress = true;
+        }
 
-		$sth = $pdo->prepare("SELECT feed_id FROM $table
+        $sth = $pdo->prepare("SELECT feed_id FROM $table
 			WHERE owner_uid = ? AND feed_id = ? LIMIT 1");
-		$sth->execute([$owner_uid, $feed_id]);
+        $sth->execute([$owner_uid, $feed_id]);
 
-		if ($sth->fetch()) {
+        if ($sth->fetch()) {
 
-			$sth = $pdo->prepare("update $table SET
+            $sth = $pdo->prepare("update $table SET
 				value = ?, updated = NOW() WHERE
 				feed_id = ? AND owner_uid = ?");
 
-			$sth->execute([$unread, $feed_id, $owner_uid]);
+            $sth->execute([$unread, $feed_id, $owner_uid]);
 
-		} else {
-			$sth = $pdo->prepare("INSERT INTO $table
+        } else {
+            $sth = $pdo->prepare("INSERT INTO $table
 				(feed_id, value, owner_uid, updated)
 				VALUES
 				(?, ?, ?, NOW())");
-			$sth->execute([$feed_id, $unread, $owner_uid]);
-		}
+            $sth->execute([$feed_id, $unread, $owner_uid]);
+        }
 
-		if (!$tr_in_progress) {
-		    $pdo->commit();
-		}
+        if (!$tr_in_progress) {
+            $pdo->commit();
+        }
 
-		if ($feed_id > 0 && $prev_unread != $unread) {
+        if ($feed_id > 0 && $prev_unread != $unread) {
 
-			if (!$is_cat) {
+            if (!$is_cat) {
 
-				/* Update parent category */
+                /* Update parent category */
 
-				if ($update_pcat) {
+                if ($update_pcat) {
 
-					$sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
+                    $sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
 						WHERE owner_uid = ? AND id = ?");
-					$sth->execute([$owner_uid, $feed_id]);
-
-					if ($row = $sth->fetch()) {
-						CCache::update((int) $row["cat_id"], $owner_uid, true, true, true);
-					}
-				}
-			}
-		} else if ($feed_id < 0) {
-			CCache::update_all($owner_uid);
-		}
-
-		return $unread;
-	}
+                    $sth->execute([$owner_uid, $feed_id]);
+
+                    if ($row = $sth->fetch()) {
+                        CCache::update((int) $row["cat_id"], $owner_uid, true, true, true);
+                    }
+                }
+            }
+        } else if ($feed_id < 0) {
+            CCache::update_all($owner_uid);
+        }
+
+        return $unread;
+    }
 
 }

classes/rpc.php

Indentation +396 added lines, -396 removed lines

@@ -1,444 +1,444 @@ 
 <?php
 class RPC extends Handler_Protected {
 
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("sanitycheck", "completelabels", "saveprofile");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("sanitycheck", "completelabels", "saveprofile");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public function setprofile() {
-		$_SESSION["profile"] = (int) clean($_REQUEST["id"]);
+    public function setprofile() {
+        $_SESSION["profile"] = (int) clean($_REQUEST["id"]);
 
-		// default value
-		if (!$_SESSION["profile"]) {
-		    $_SESSION["profile"] = null;
-		}
-	}
+        // default value
+        if (!$_SESSION["profile"]) {
+            $_SESSION["profile"] = null;
+        }
+    }
 
-	public function remprofiles() {
-		$ids = explode(",", trim(clean($_REQUEST["ids"])));
+    public function remprofiles() {
+        $ids = explode(",", trim(clean($_REQUEST["ids"])));
 
-		foreach ($ids as $id) {
-			if ($_SESSION["profile"] != $id) {
-				$sth = $this->pdo->prepare("DELETE FROM ttrss_settings_profiles WHERE id = ? AND
+        foreach ($ids as $id) {
+            if ($_SESSION["profile"] != $id) {
+                $sth = $this->pdo->prepare("DELETE FROM ttrss_settings_profiles WHERE id = ? AND
 							owner_uid = ?");
-				$sth->execute([$id, $_SESSION['uid']]);
-			}
-		}
-	}
+                $sth->execute([$id, $_SESSION['uid']]);
+            }
+        }
+    }
 
-	// Silent
-	public function addprofile() {
-		$title = trim(clean($_REQUEST["title"]));
+    // Silent
+    public function addprofile() {
+        $title = trim(clean($_REQUEST["title"]));
 
-		if ($title) {
-			$this->pdo->beginTransaction();
+        if ($title) {
+            $this->pdo->beginTransaction();
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
 				WHERE title = ? AND owner_uid = ?");
-			$sth->execute([$title, $_SESSION['uid']]);
+            $sth->execute([$title, $_SESSION['uid']]);
 
-			if (!$sth->fetch()) {
+            if (!$sth->fetch()) {
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_settings_profiles (title, owner_uid)
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_settings_profiles (title, owner_uid)
 							VALUES (?, ?)");
 
-				$sth->execute([$title, $_SESSION['uid']]);
+                $sth->execute([$title, $_SESSION['uid']]);
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles WHERE
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles WHERE
 					title = ? AND owner_uid = ?");
-				$sth->execute([$title, $_SESSION['uid']]);
+                $sth->execute([$title, $_SESSION['uid']]);
 
-				if ($row = $sth->fetch()) {
-					$profile_id = $row['id'];
+                if ($row = $sth->fetch()) {
+                    $profile_id = $row['id'];
 
-					if ($profile_id) {
-						initialize_user_prefs($_SESSION["uid"], $profile_id);
-					}
-				}
-			}
+                    if ($profile_id) {
+                        initialize_user_prefs($_SESSION["uid"], $profile_id);
+                    }
+                }
+            }
 
-			$this->pdo->commit();
-		}
-	}
+            $this->pdo->commit();
+        }
+    }
 
-	public function saveprofile() {
-		$id = clean($_REQUEST["id"]);
-		$title = trim(clean($_REQUEST["value"]));
+    public function saveprofile() {
+        $id = clean($_REQUEST["id"]);
+        $title = trim(clean($_REQUEST["value"]));
 
-		if ($id == 0) {
-			print __("Default profile");
-			return;
-		}
+        if ($id == 0) {
+            print __("Default profile");
+            return;
+        }
 
-		if ($title) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_settings_profiles
+        if ($title) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_settings_profiles
 				SET title = ? WHERE id = ? AND
 					owner_uid = ?");
 
-			$sth->execute([$title, $id, $_SESSION['uid']]);
-			print $title;
-		}
-	}
+            $sth->execute([$title, $id, $_SESSION['uid']]);
+            print $title;
+        }
+    }
 
-	// Silent
-	public function remarchive() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
+    // Silent
+    public function remarchive() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_archived_feeds WHERE
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_archived_feeds WHERE
 		  		(SELECT COUNT(*) FROM ttrss_user_entries
 					WHERE orig_feed_id = :id) = 0 AND
 						id = :id AND owner_uid = :uid");
 
-		foreach ($ids as $id) {
-			$sth->execute([":id" => $id, ":uid" => $_SESSION['uid']]);
-		}
-	}
+        foreach ($ids as $id) {
+            $sth->execute([":id" => $id, ":uid" => $_SESSION['uid']]);
+        }
+    }
 
-	public function addfeed() {
-		$feed = clean($_REQUEST['feed']);
-		$cat = clean($_REQUEST['cat']);
-		$need_auth = isset($_REQUEST['need_auth']);
-		$login = $need_auth ? clean($_REQUEST['login']) : '';
-		$pass = $need_auth ? trim(clean($_REQUEST['pass'])) : '';
+    public function addfeed() {
+        $feed = clean($_REQUEST['feed']);
+        $cat = clean($_REQUEST['cat']);
+        $need_auth = isset($_REQUEST['need_auth']);
+        $login = $need_auth ? clean($_REQUEST['login']) : '';
+        $pass = $need_auth ? trim(clean($_REQUEST['pass'])) : '';
 
-		$rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass);
+        $rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass);
 
-		print json_encode(array("result" => $rc));
-	}
+        print json_encode(array("result" => $rc));
+    }
 
-	public function togglepref() {
-		$key = clean($_REQUEST["key"]);
-		set_pref($key, !get_pref($key));
-		$value = get_pref($key);
+    public function togglepref() {
+        $key = clean($_REQUEST["key"]);
+        set_pref($key, !get_pref($key));
+        $value = get_pref($key);
 
-		print json_encode(array("param" =>$key, "value" => $value));
-	}
+        print json_encode(array("param" =>$key, "value" => $value));
+    }
 
-	public function setpref() {
-		// set_pref escapes input, so no need to double escape it here
-		$key = clean($_REQUEST['key']);
-		$value = $_REQUEST['value'];
+    public function setpref() {
+        // set_pref escapes input, so no need to double escape it here
+        $key = clean($_REQUEST['key']);
+        $value = $_REQUEST['value'];
 
-		set_pref($key, $value, false, $key != 'USER_STYLESHEET');
+        set_pref($key, $value, false, $key != 'USER_STYLESHEET');
 
-		print json_encode(array("param" =>$key, "value" => $value));
-	}
+        print json_encode(array("param" =>$key, "value" => $value));
+    }
 
-	public function mark() {
-		$mark = clean($_REQUEST["mark"]);
-		$id = clean($_REQUEST["id"]);
+    public function mark() {
+        $mark = clean($_REQUEST["mark"]);
+        $id = clean($_REQUEST["id"]);
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET marked = ?,
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET marked = ?,
 					last_marked = NOW()
 					WHERE ref_id = ? AND owner_uid = ?");
 
-		$sth->execute([$mark, $id, $_SESSION['uid']]);
+        $sth->execute([$mark, $id, $_SESSION['uid']]);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function delete() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$ids_qmarks = arr_qmarks($ids);
+    public function delete() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $ids_qmarks = arr_qmarks($ids);
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_user_entries
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_user_entries
 			WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
-		Article::purge_orphans();
+        Article::purge_orphans();
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function unarchive() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
+    public function unarchive() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			$this->pdo->beginTransaction();
+        foreach ($ids as $id) {
+            $this->pdo->beginTransaction();
 
-			$sth = $this->pdo->prepare("SELECT feed_url,site_url,title FROM ttrss_archived_feeds
+            $sth = $this->pdo->prepare("SELECT feed_url,site_url,title FROM ttrss_archived_feeds
 				WHERE id = (SELECT orig_feed_id FROM ttrss_user_entries WHERE ref_id = :id
 				AND owner_uid = :uid) AND owner_uid = :uid");
-			$sth->execute([":uid" => $_SESSION['uid'], ":id" => $id]);
+            $sth->execute([":uid" => $_SESSION['uid'], ":id" => $id]);
 
-			if ($row = $sth->fetch()) {
-				$feed_url = $row['feed_url'];
-				$site_url = $row['site_url'];
-				$title = $row['title'];
+            if ($row = $sth->fetch()) {
+                $feed_url = $row['feed_url'];
+                $site_url = $row['site_url'];
+                $title = $row['title'];
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
 					AND owner_uid = ?");
-				$sth->execute([$feed_url, $_SESSION['uid']]);
+                $sth->execute([$feed_url, $_SESSION['uid']]);
 
-				if ($row = $sth->fetch()) {
-					$feed_id = $row["id"];
-				} else {
-					if (!$title) {
-					    $title = '[Unknown]';
-					}
+                if ($row = $sth->fetch()) {
+                    $feed_id = $row["id"];
+                } else {
+                    if (!$title) {
+                        $title = '[Unknown]';
+                    }
 
-					$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                    $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
 							VALUES (?, ?, ?, ?, NULL, '', '', 0)");
-					$sth->execute([$_SESSION['uid'], $feed_url, $site_url, $title]);
+                    $sth->execute([$_SESSION['uid'], $feed_url, $site_url, $title]);
 
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
 						AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
+                    $sth->execute([$feed_url, $_SESSION['uid']]);
 
-					if ($row = $sth->fetch()) {
-						$feed_id = $row['id'];
-					}
-				}
+                    if ($row = $sth->fetch()) {
+                        $feed_id = $row['id'];
+                    }
+                }
 
-				if ($feed_id) {
-					$sth = $this->pdo->prepare("UPDATE ttrss_user_entries
+                if ($feed_id) {
+                    $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
 						SET feed_id = ?, orig_feed_id = NULL
 						WHERE ref_id = ? AND owner_uid = ?");
-					$sth->execute([$feed_id, $id, $_SESSION['uid']]);
-				}
-			}
+                    $sth->execute([$feed_id, $id, $_SESSION['uid']]);
+                }
+            }
 
-			$this->pdo->commit();
-		}
+            $this->pdo->commit();
+        }
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function archive() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
+    public function archive() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			$this->archive_article($id, $_SESSION["uid"]);
-		}
+        foreach ($ids as $id) {
+            $this->archive_article($id, $_SESSION["uid"]);
+        }
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	private function archive_article($id, $owner_uid) {
-		$this->pdo->beginTransaction();
+    private function archive_article($id, $owner_uid) {
+        $this->pdo->beginTransaction();
 
-		if (!$owner_uid) {
-		    $owner_uid = $_SESSION['uid'];
-		}
+        if (!$owner_uid) {
+            $owner_uid = $_SESSION['uid'];
+        }
 
-		$sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
+        $sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			/* prepare the archived table */
+            /* prepare the archived table */
 
-			$feed_id = (int) $row['feed_id'];
+            $feed_id = (int) $row['feed_id'];
 
-			if ($feed_id) {
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_archived_feeds
+            if ($feed_id) {
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_archived_feeds
 					WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$feed_id, $owner_uid]);
+                $sth->execute([$feed_id, $owner_uid]);
 
-				if ($row = $sth->fetch()) {
-					$new_feed_id = $row['id'];
-				} else {
-					$row = $this->pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds")->fetch();
-					$new_feed_id = (int) $row['id'] + 1;
+                if ($row = $sth->fetch()) {
+                    $new_feed_id = $row['id'];
+                } else {
+                    $row = $this->pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds")->fetch();
+                    $new_feed_id = (int) $row['id'] + 1;
 
-					$sth = $this->pdo->prepare("INSERT INTO ttrss_archived_feeds
+                    $sth = $this->pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
 							SELECT ?, owner_uid, title, feed_url, site_url, NOW() from ttrss_feeds
 							  	WHERE id = ?");
 
-					$sth->execute([$new_feed_id, $feed_id]);
-				}
+                    $sth->execute([$new_feed_id, $feed_id]);
+                }
 
-				$sth = $this->pdo->prepare("UPDATE ttrss_user_entries
+                $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
 					SET orig_feed_id = ?, feed_id = NULL
 					WHERE ref_id = ? AND owner_uid = ?");
-				$sth->execute([$new_feed_id, $id, $owner_uid]);
-			}
-		}
+                $sth->execute([$new_feed_id, $id, $owner_uid]);
+            }
+        }
 
-		$this->pdo->commit();
-	}
+        $this->pdo->commit();
+    }
 
-	public function publ() {
-		$pub = clean($_REQUEST["pub"]);
-		$id = clean($_REQUEST["id"]);
+    public function publ() {
+        $pub = clean($_REQUEST["pub"]);
+        $id = clean($_REQUEST["id"]);
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 			published = ?, last_published = NOW()
 			WHERE ref_id = ? AND owner_uid = ?");
 
-		$sth->execute([$pub, $id, $_SESSION['uid']]);
+        $sth->execute([$pub, $id, $_SESSION['uid']]);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function getAllCounters() {
-		@$seq = (int) $_REQUEST['seq'];
+    public function getAllCounters() {
+        @$seq = (int) $_REQUEST['seq'];
 
-		$reply = [
-			'counters' => Counters::getAllCounters(),
-			'seq' => $seq
-		];
+        $reply = [
+            'counters' => Counters::getAllCounters(),
+            'seq' => $seq
+        ];
 
-		if ($seq % 2 == 0) {
-					$reply['runtime-info'] = make_runtime_info();
-		}
+        if ($seq % 2 == 0) {
+                    $reply['runtime-info'] = make_runtime_info();
+        }
 
-		print json_encode($reply);
-	}
+        print json_encode($reply);
+    }
 
-	/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
-	public function catchupSelected() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int) clean($_REQUEST["cmode"]);
+    /* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
+    public function catchupSelected() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $cmode = (int) clean($_REQUEST["cmode"]);
 
-		Article::catchupArticlesById($ids, $cmode);
+        Article::catchupArticlesById($ids, $cmode);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
+    }
 
-	public function markSelected() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int) clean($_REQUEST["cmode"]);
+    public function markSelected() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $cmode = (int) clean($_REQUEST["cmode"]);
 
-		$this->markArticlesById($ids, $cmode);
+        $this->markArticlesById($ids, $cmode);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function publishSelected() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int) clean($_REQUEST["cmode"]);
+    public function publishSelected() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $cmode = (int) clean($_REQUEST["cmode"]);
 
-		$this->publishArticlesById($ids, $cmode);
+        $this->publishArticlesById($ids, $cmode);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function sanityCheck() {
-		$_SESSION["hasAudio"] = clean($_REQUEST["hasAudio"]) === "true";
-		$_SESSION["hasSandbox"] = clean($_REQUEST["hasSandbox"]) === "true";
-		$_SESSION["hasMp3"] = clean($_REQUEST["hasMp3"]) === "true";
-		$_SESSION["clientTzOffset"] = clean($_REQUEST["clientTzOffset"]);
+    public function sanityCheck() {
+        $_SESSION["hasAudio"] = clean($_REQUEST["hasAudio"]) === "true";
+        $_SESSION["hasSandbox"] = clean($_REQUEST["hasSandbox"]) === "true";
+        $_SESSION["hasMp3"] = clean($_REQUEST["hasMp3"]) === "true";
+        $_SESSION["clientTzOffset"] = clean($_REQUEST["clientTzOffset"]);
 
-		$reply = array();
+        $reply = array();
 
-		$reply['error'] = sanity_check();
+        $reply['error'] = sanity_check();
 
-		if ($reply['error']['code'] == 0) {
-			$reply['init-params'] = make_init_params();
-			$reply['runtime-info'] = make_runtime_info();
-		}
+        if ($reply['error']['code'] == 0) {
+            $reply['init-params'] = make_init_params();
+            $reply['runtime-info'] = make_runtime_info();
+        }
 
-		print json_encode($reply);
-	}
+        print json_encode($reply);
+    }
 
-	public function completeLabels() {
-		$search = clean($_REQUEST["search"]);
+    public function completeLabels() {
+        $search = clean($_REQUEST["search"]);
 
-		$sth = $this->pdo->prepare("SELECT DISTINCT caption FROM
+        $sth = $this->pdo->prepare("SELECT DISTINCT caption FROM
 				ttrss_labels2
 				WHERE owner_uid = ? AND
 				LOWER(caption) LIKE LOWER(?) ORDER BY caption
 				LIMIT 5");
-		$sth->execute([$_SESSION['uid'], "%$search%"]);
+        $sth->execute([$_SESSION['uid'], "%$search%"]);
 
-		print "<ul>";
-		while ($line = $sth->fetch()) {
-			print "<li>".$line["caption"]."</li>";
-		}
-		print "</ul>";
-	}
+        print "<ul>";
+        while ($line = $sth->fetch()) {
+            print "<li>".$line["caption"]."</li>";
+        }
+        print "</ul>";
+    }
 
-	// Silent
-	public function massSubscribe() {
+    // Silent
+    public function massSubscribe() {
 
-		$payload = json_decode(clean($_REQUEST["payload"]), false);
-		$mode = clean($_REQUEST["mode"]);
+        $payload = json_decode(clean($_REQUEST["payload"]), false);
+        $mode = clean($_REQUEST["mode"]);
 
-		if (!$payload || !is_array($payload)) {
-		    return;
-		}
+        if (!$payload || !is_array($payload)) {
+            return;
+        }
 
-		if ($mode == 1) {
-			foreach ($payload as $feed) {
+        if ($mode == 1) {
+            foreach ($payload as $feed) {
 
-				$title = $feed[0];
-				$feed_url = $feed[1];
+                $title = $feed[0];
+                $feed_url = $feed[1];
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 					feed_url = ? AND owner_uid = ?");
-				$sth->execute([$feed_url, $_SESSION['uid']]);
+                $sth->execute([$feed_url, $_SESSION['uid']]);
 
-				if (!$sth->fetch()) {
-					$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                if (!$sth->fetch()) {
+                    $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 									(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES (?, ?, ?, NULL, '')");
 
-					$sth->execute([$_SESSION['uid'], $feed_url, $title]);
-				}
-			}
-		} else if ($mode == 2) {
-			// feed archive
-			foreach ($payload as $id) {
-				$sth = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
+                    $sth->execute([$_SESSION['uid'], $feed_url, $title]);
+                }
+            }
+        } else if ($mode == 2) {
+            // feed archive
+            foreach ($payload as $id) {
+                $sth = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
 					WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$id, $_SESSION['uid']]);
+                $sth->execute([$id, $_SESSION['uid']]);
 
-				if ($row = $sth->fetch()) {
-					$site_url = $row['site_url'];
-					$feed_url = $row['feed_url'];
-					$title = $row['title'];
+                if ($row = $sth->fetch()) {
+                    $site_url = $row['site_url'];
+                    $feed_url = $row['feed_url'];
+                    $title = $row['title'];
 
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 						feed_url = ? AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
+                    $sth->execute([$feed_url, $_SESSION['uid']]);
 
-					if (!$sth->fetch()) {
-						$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                    if (!$sth->fetch()) {
+                        $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 								(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES (?, ?, ?, NULL, ?)");
 
-						$sth->execute([$_SESSION['uid'], $feed_url, $title, $site_url]);
-					}
-				}
-			}
-		}
-	}
+                        $sth->execute([$_SESSION['uid'], $feed_url, $title, $site_url]);
+                    }
+                }
+            }
+        }
+    }
 
-	public function catchupFeed() {
-		$feed_id = clean($_REQUEST['feed_id']);
-		$is_cat = clean($_REQUEST['is_cat']) == "true";
-		$mode = clean($_REQUEST['mode']);
-		$search_query = clean($_REQUEST['search_query']);
-		$search_lang = clean($_REQUEST['search_lang']);
+    public function catchupFeed() {
+        $feed_id = clean($_REQUEST['feed_id']);
+        $is_cat = clean($_REQUEST['is_cat']) == "true";
+        $mode = clean($_REQUEST['mode']);
+        $search_query = clean($_REQUEST['search_query']);
+        $search_lang = clean($_REQUEST['search_lang']);
 
-		Feeds::catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
+        Feeds::catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
 
-		// return counters here synchronously so that frontend can figure out next unread feed properly
-		print json_encode(['counters' => Counters::getAllCounters()]);
+        // 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"));
-	}
+        //print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function setpanelmode() {
-		$wide = (int) clean($_REQUEST["wide"]);
+    public function setpanelmode() {
+        $wide = (int) clean($_REQUEST["wide"]);
 
-		setcookie("ttrss_widescreen", $wide,
-			time() + COOKIE_LIFETIME_LONG);
+        setcookie("ttrss_widescreen", $wide,
+            time() + COOKIE_LIFETIME_LONG);
 
-		print json_encode(array("wide" => $wide));
-	}
+        print json_encode(array("wide" => $wide));
+    }
 
-	public static function updaterandomfeed_real() {
+    public static function updaterandomfeed_real() {
 
-		// Test if the feed need a update (update interval exceded).
-		if (DB_TYPE == "pgsql") {
-			$update_limit_qpart = "AND ((
+        // Test if the feed need a update (update interval exceded).
+        if (DB_TYPE == "pgsql") {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
 				) OR (
@@ -446,8 +446,8 @@ 
 					AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
 				) OR ttrss_feeds.last_updated IS NULL
 				OR last_updated = '1970-01-01 00:00:00')";
-		} else {
-			$update_limit_qpart = "AND ((
+        } else {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
 				) OR (
@@ -455,28 +455,28 @@ 
 					AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
 				) OR ttrss_feeds.last_updated IS NULL
 				OR last_updated = '1970-01-01 00:00:00')";
-		}
+        }
 
-		// Test if feed is currently being updated by another process.
-		if (DB_TYPE == "pgsql") {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '5 minutes')";
-		} else {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))";
-		}
+        // Test if feed is currently being updated by another process.
+        if (DB_TYPE == "pgsql") {
+            $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '5 minutes')";
+        } else {
+            $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))";
+        }
 
-		$random_qpart = sql_random_function();
+        $random_qpart = sql_random_function();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		// we could be invoked from public.php with no active session
-		if ($_SESSION["uid"]) {
-			$owner_check_qpart = "AND ttrss_feeds.owner_uid = ".$pdo->quote($_SESSION["uid"]);
-		} else {
-			$owner_check_qpart = "";
-		}
+        // we could be invoked from public.php with no active session
+        if ($_SESSION["uid"]) {
+            $owner_check_qpart = "AND ttrss_feeds.owner_uid = ".$pdo->quote($_SESSION["uid"]);
+        } else {
+            $owner_check_qpart = "";
+        }
 
-		// We search for feed needing update.
-		$res = $pdo->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
+        // We search for feed needing update.
+        $res = $pdo->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -488,139 +488,139 @@ 
 				$updstart_thresh_qpart
 			ORDER BY $random_qpart LIMIT 30");
 
-		$num_updated = 0;
+        $num_updated = 0;
 
-		$tstart = time();
+        $tstart = time();
 
-		while ($line = $res->fetch()) {
-			$feed_id = $line["id"];
+        while ($line = $res->fetch()) {
+            $feed_id = $line["id"];
 
-			if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
-				RSSUtils::update_rss_feed($feed_id, true);
-				++$num_updated;
-			} else {
-				break;
-			}
-		}
+            if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
+                RSSUtils::update_rss_feed($feed_id, true);
+                ++$num_updated;
+            } else {
+                break;
+            }
+        }
 
-		// Purge orphans and cleanup tags
-		Article::purge_orphans();
-		//cleanup_tags(14, 50000);
+        // Purge orphans and cleanup tags
+        Article::purge_orphans();
+        //cleanup_tags(14, 50000);
 
-		if ($num_updated > 0) {
-			print json_encode(array("message" => "UPDATE_COUNTERS",
-				"num_updated" => $num_updated));
-		} else {
-			print json_encode(array("message" => "NOTHING_TO_UPDATE"));
-		}
+        if ($num_updated > 0) {
+            print json_encode(array("message" => "UPDATE_COUNTERS",
+                "num_updated" => $num_updated));
+        } else {
+            print json_encode(array("message" => "NOTHING_TO_UPDATE"));
+        }
 
-	}
+    }
 
-	public function updaterandomfeed() {
-		RPC::updaterandomfeed_real();
-	}
+    public function updaterandomfeed() {
+        RPC::updaterandomfeed_real();
+    }
 
-	private function markArticlesById($ids, $cmode) {
+    private function markArticlesById($ids, $cmode) {
 
-		$ids_qmarks = arr_qmarks($ids);
+        $ids_qmarks = arr_qmarks($ids);
 
-		if ($cmode == 0) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        if ($cmode == 0) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				marked = false, last_marked = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else if ($cmode == 1) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else if ($cmode == 1) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				marked = true, last_marked = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				marked = NOT marked,last_marked = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		}
+        }
 
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
-	}
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
+    }
 
-	private function publishArticlesById($ids, $cmode) {
+    private function publishArticlesById($ids, $cmode) {
 
-		$ids_qmarks = arr_qmarks($ids);
+        $ids_qmarks = arr_qmarks($ids);
 
-		if ($cmode == 0) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        if ($cmode == 0) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				published = false, last_published = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else if ($cmode == 1) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else if ($cmode == 1) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				published = true, last_published = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				published = NOT published,last_published = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		}
+        }
 
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
-	}
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
+    }
 
-	public function getlinktitlebyid() {
-		$id = clean($_REQUEST['id']);
+    public function getlinktitlebyid() {
+        $id = clean($_REQUEST['id']);
 
-		$sth = $this->pdo->prepare("SELECT link, title FROM ttrss_entries, ttrss_user_entries
+        $sth = $this->pdo->prepare("SELECT link, title FROM ttrss_entries, ttrss_user_entries
 			WHERE ref_id = ? AND ref_id = id AND owner_uid = ?");
-		$sth->execute([$id, $_SESSION['uid']]);
+        $sth->execute([$id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$link = $row['link'];
-			$title = $row['title'];
+        if ($row = $sth->fetch()) {
+            $link = $row['link'];
+            $title = $row['title'];
 
-			echo json_encode(array("link" => $link, "title" => $title));
-		} else {
-			echo json_encode(array("error" => "ARTICLE_NOT_FOUND"));
-		}
-	}
+            echo json_encode(array("link" => $link, "title" => $title));
+        } else {
+            echo json_encode(array("error" => "ARTICLE_NOT_FOUND"));
+        }
+    }
 
-	public function log() {
-		$msg = clean($_REQUEST['msg']);
-		$file = clean_filename($_REQUEST['file']);
-		$line = (int) clean($_REQUEST['line']);
-		$context = clean($_REQUEST['context']);
+    public function log() {
+        $msg = clean($_REQUEST['msg']);
+        $file = clean_filename($_REQUEST['file']);
+        $line = (int) clean($_REQUEST['line']);
+        $context = clean($_REQUEST['context']);
 
-		if ($msg) {
-			Logger::get()->log_error(E_USER_WARNING,
-				$msg, 'client-js:'.$file, $line, $context);
+        if ($msg) {
+            Logger::get()->log_error(E_USER_WARNING,
+                $msg, 'client-js:'.$file, $line, $context);
 
-			echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
-		} else {
-			echo json_encode(array("error" => "MESSAGE_NOT_FOUND"));
-		}
+            echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
+        } else {
+            echo json_encode(array("error" => "MESSAGE_NOT_FOUND"));
+        }
 
-	}
+    }
 
-	public function checkforupdates() {
-		$rv = [];
+    public function checkforupdates() {
+        $rv = [];
 
-		$git_timestamp = false;
-		$git_commit = false;
+        $git_timestamp = false;
+        $git_commit = false;
 
-		get_version($git_commit, $git_timestamp);
+        get_version($git_commit, $git_timestamp);
 
-		if (CHECK_FOR_UPDATES && $_SESSION["access_level"] >= 10 && $git_timestamp) {
-			$content = @fetch_file_contents(["url" => "https://srv.tt-rss.org/version.json"]);
+        if (CHECK_FOR_UPDATES && $_SESSION["access_level"] >= 10 && $git_timestamp) {
+            $content = @fetch_file_contents(["url" => "https://srv.tt-rss.org/version.json"]);
 
-			if ($content) {
-				$content = json_decode($content, true);
+            if ($content) {
+                $content = json_decode($content, true);
 
-				if ($content && isset($content["changeset"])) {
-					if ($git_timestamp < (int) $content["changeset"]["timestamp"] &&
-						$git_commit != $content["changeset"]["id"]) {
+                if ($content && isset($content["changeset"])) {
+                    if ($git_timestamp < (int) $content["changeset"]["timestamp"] &&
+                        $git_commit != $content["changeset"]["id"]) {
 
-						$rv = $content["changeset"];
-					}
-				}
-			}
-		}
+                        $rv = $content["changeset"];
+                    }
+                }
+            }
+        }
 
-		print json_encode($rv);
-	}
+        print json_encode($rv);
+    }
 
 }

classes/logger/syslog.php

Indentation +24 added lines, -24 removed lines

@@ -1,33 +1,33 @@
 <?php
 class Logger_Syslog {
 
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public function log_error($errno, $errstr, $file, $line, $context) {
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function log_error($errno, $errstr, $file, $line, $context) {
 
-		switch ($errno) {
-		case E_ERROR:
-		case E_PARSE:
-		case E_CORE_ERROR:
-		case E_COMPILE_ERROR:
-		case E_USER_ERROR:
-			$priority = LOG_ERR;
-			break;
-		case E_WARNING:
-		case E_CORE_WARNING:
-		case E_COMPILE_WARNING:
-		case E_USER_WARNING:
-			$priority = LOG_WARNING;
-			break;
-		default:
-			$priority = LOG_INFO;
-		}
+        switch ($errno) {
+        case E_ERROR:
+        case E_PARSE:
+        case E_CORE_ERROR:
+        case E_COMPILE_ERROR:
+        case E_USER_ERROR:
+            $priority = LOG_ERR;
+            break;
+        case E_WARNING:
+        case E_CORE_WARNING:
+        case E_COMPILE_WARNING:
+        case E_USER_WARNING:
+            $priority = LOG_WARNING;
+            break;
+        default:
+            $priority = LOG_INFO;
+        }
 
-		$errname = Logger::$errornames[$errno]." ($errno)";
+        $errname = Logger::$errornames[$errno]." ($errno)";
 
-		syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
+        syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
 
-	}
+    }
 
 }

classes/logger/sql.php

Indentation +29 added lines, -29 removed lines

@@ -1,47 +1,47 @@
 <?php
 class Logger_SQL {
 
-	private $pdo;
+    private $pdo;
 
-	public function log_error($errno, $errstr, $file, $line, $context) {
+    public function log_error($errno, $errstr, $file, $line, $context) {
 
-		// separate PDO connection object is used for logging
-		if (!$this->pdo) {
-		    $this->pdo = Db::instance()->pdo_connect();
-		}
+        // separate PDO connection object is used for logging
+        if (!$this->pdo) {
+            $this->pdo = Db::instance()->pdo_connect();
+        }
 
-		if ($this->pdo && get_schema_version() > 117) {
+        if ($this->pdo && get_schema_version() > 117) {
 
-			$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : null;
+            $owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : null;
 
-			// limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge
-			$context = mb_substr($context, 0, 8192);
+            // limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge
+            $context = mb_substr($context, 0, 8192);
 
-			$server_params = [
-				"IP" => "REMOTE_ADDR",
-				"Request URI" => "REQUEST_URI",
-				"User agent" => "HTTP_USER_AGENT",
-			];
+            $server_params = [
+                "IP" => "REMOTE_ADDR",
+                "Request URI" => "REQUEST_URI",
+                "User agent" => "HTTP_USER_AGENT",
+            ];
 
-			foreach ($server_params as $n => $p) {
-				if (isset($_SERVER[$p]))
-					$context .= "\n$n: ".$_SERVER[$p];
-			}
+            foreach ($server_params as $n => $p) {
+                if (isset($_SERVER[$p]))
+                    $context .= "\n$n: ".$_SERVER[$p];
+            }
 
-			// passed error message may contain invalid unicode characters, failing to insert an error here
-			// would break the execution entirely by generating an actual fatal error instead of a E_WARNING etc
-			$errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8');
-			$context = UConverter::transcode($context, 'UTF-8', 'UTF-8');
+            // passed error message may contain invalid unicode characters, failing to insert an error here
+            // would break the execution entirely by generating an actual fatal error instead of a E_WARNING etc
+            $errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8');
+            $context = UConverter::transcode($context, 'UTF-8', 'UTF-8');
 
-			$sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
+            $sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
 				(errno, errstr, filename, lineno, context, owner_uid, created_at) VALUES
 				(?, ?, ?, ?, ?, ?, NOW())");
-			$sth->execute([$errno, $errstr, $file, $line, $context, $owner_uid]);
+            $sth->execute([$errno, $errstr, $file, $line, $context, $owner_uid]);
 
-			return $sth->rowCount();
-		}
+            return $sth->rowCount();
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 }

classes/pluginhost.php

Indentation +516 added lines, -516 removed lines

@@ -1,545 +1,545 @@
 <?php
 class PluginHost {
-	private $pdo;
-	private $hooks = array();
-	private $plugins = array();
-	private $handlers = array();
-	private $commands = array();
-	private $storage = array();
-	private $feeds = array();
-	private $api_methods = array();
-	private $plugin_actions = array();
-	private $owner_uid;
-	private $last_registered;
-	private static $instance;
-
-	const API_VERSION = 2;
-
-	// Hooks marked with *1 are run in global context and available
-	// to plugins loaded in config.php only
-
-	const HOOK_ARTICLE_BUTTON = 1;
-	const HOOK_ARTICLE_FILTER = 2;
-	const HOOK_PREFS_TAB = 3;
-	const HOOK_PREFS_TAB_SECTION = 4;
-	const HOOK_PREFS_TABS = 5;
-	const HOOK_FEED_PARSED = 6;
-	const HOOK_UPDATE_TASK = 7; // *1
-	const HOOK_AUTH_USER = 8;
-	const HOOK_HOTKEY_MAP = 9;
-	const HOOK_RENDER_ARTICLE = 10;
-	const HOOK_RENDER_ARTICLE_CDM = 11;
-	const HOOK_FEED_FETCHED = 12;
-	const HOOK_SANITIZE = 13;
-	const HOOK_RENDER_ARTICLE_API = 14;
-	const HOOK_TOOLBAR_BUTTON = 15;
-	const HOOK_ACTION_ITEM = 16;
-	const HOOK_HEADLINE_TOOLBAR_BUTTON = 17;
-	const HOOK_HOTKEY_INFO = 18;
-	const HOOK_ARTICLE_LEFT_BUTTON = 19;
-	const HOOK_PREFS_EDIT_FEED = 20;
-	const HOOK_PREFS_SAVE_FEED = 21;
-	const HOOK_FETCH_FEED = 22;
-	const HOOK_QUERY_HEADLINES = 23;
-	const HOOK_HOUSE_KEEPING = 24; // *1
-	const HOOK_SEARCH = 25;
-	const HOOK_FORMAT_ENCLOSURES = 26;
-	const HOOK_SUBSCRIBE_FEED = 27;
-	const HOOK_HEADLINES_BEFORE = 28;
-	const HOOK_RENDER_ENCLOSURE = 29;
-	const HOOK_ARTICLE_FILTER_ACTION = 30;
-	const HOOK_ARTICLE_EXPORT_FEED = 31;
-	const HOOK_MAIN_TOOLBAR_BUTTON = 32;
-	const HOOK_ENCLOSURE_ENTRY = 33;
-	const HOOK_FORMAT_ARTICLE = 34;
-	const HOOK_FORMAT_ARTICLE_CDM = 35; /* RIP */
-	const HOOK_FEED_BASIC_INFO = 36;
-	const HOOK_SEND_LOCAL_FILE = 37;
-	const HOOK_UNSUBSCRIBE_FEED = 38;
-	const HOOK_SEND_MAIL = 39;
-	const HOOK_FILTER_TRIGGERED = 40;
-	const HOOK_GET_FULL_TEXT = 41;
-	const HOOK_ARTICLE_IMAGE = 42;
-	const HOOK_FEED_TREE = 43;
-	const HOOK_IFRAME_WHITELISTED = 44;
-
-	const KIND_ALL = 1;
-	const KIND_SYSTEM = 2;
-	const KIND_USER = 3;
-
-	public static function object_to_domain($plugin) {
-		return strtolower(get_class($plugin));
-	}
-
-	public function __construct() {
-		$this->pdo = Db::pdo();
-
-		$this->storage = array();
-	}
-
-	private function __clone() {
-		//
-	}
-
-	public static function getInstance() {
-		if (self::$instance == null) {
-					self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	private function register_plugin($name, $plugin) {
-		//array_push($this->plugins, $plugin);
-		$this->plugins[$name] = $plugin;
-	}
-
-	// needed for compatibility with API 1
-	public function get_link() {
-		return false;
-	}
-
-	public function get_dbh() {
-		return Db::get();
-	}
-
-	public function get_pdo() {
-		return $this->pdo;
-	}
-
-	public function get_plugin_names() {
-		$names = array();
-
-		foreach ($this->plugins as $p) {
-			array_push($names, get_class($p));
-		}
-
-		return $names;
-	}
-
-	public function get_plugins() {
-		return $this->plugins;
-	}
-
-	public function get_plugin($name) {
-		return $this->plugins[strtolower($name)];
-	}
-
-	public function run_hooks($type, $method, $args) {
-		foreach ($this->get_hooks($type) as $hook) {
-			$hook->$method($args);
-		}
-	}
-
-	public function add_hook($type, $sender, $priority = 50) {
-		$priority = (int) $priority;
-
-		if (!is_array($this->hooks[$type])) {
-			$this->hooks[$type] = [];
-		}
-
-		if (!is_array($this->hooks[$type][$priority])) {
-			$this->hooks[$type][$priority] = [];
-		}
-
-		array_push($this->hooks[$type][$priority], $sender);
-		ksort($this->hooks[$type]);
-	}
-
-	public function del_hook($type, $sender) {
-		if (is_array($this->hooks[$type])) {
-			foreach (array_keys($this->hooks[$type]) as $prio) {
-				$key = array_search($sender, $this->hooks[$type][$prio]);
-
-				if ($key !== false) {
-					unset($this->hooks[$type][$prio][$key]);
-				}
-			}
-		}
-	}
-
-	public function get_hooks($type) {
-		if (isset($this->hooks[$type])) {
-			$tmp = [];
-
-			foreach (array_keys($this->hooks[$type]) as $prio) {
-				$tmp = array_merge($tmp, $this->hooks[$type][$prio]);
-			}
-
-			return $tmp;
-		} else {
-			return [];
-		}
-	}
-	public function load_all($kind, $owner_uid = false, $skip_init = false) {
-
-		$plugins = array_merge(glob("plugins/*"), glob("plugins.local/*"));
-		$plugins = array_filter($plugins, "is_dir");
-		$plugins = array_map("basename", $plugins);
-
-		asort($plugins);
-
-		$this->load(join(",", $plugins), $kind, $owner_uid, $skip_init);
-	}
-
-	public function load($classlist, $kind, $owner_uid = false, $skip_init = false) {
-		$plugins = explode(",", $classlist);
-
-		$this->owner_uid = (int) $owner_uid;
-
-		foreach ($plugins as $class) {
-			$class = trim($class);
-			$class_file = strtolower(clean_filename($class));
-
-			if (!is_dir(__DIR__."/../plugins/$class_file") &&
-					!is_dir(__DIR__."/../plugins.local/$class_file")) {
-			    continue;
-			}
-
-			// try system plugin directory first
-			$file = __DIR__."/../plugins/$class_file/init.php";
-			$vendor_dir = __DIR__."/../plugins/$class_file/vendor";
-
-			if (!file_exists($file)) {
-				$file = __DIR__."/../plugins.local/$class_file/init.php";
-				$vendor_dir = __DIR__."/../plugins.local/$class_file/vendor";
-			}
-
-			if (!isset($this->plugins[$class])) {
-				if (file_exists($file)) {
-				    require_once $file;
-				}
-
-				if (class_exists($class) && is_subclass_of($class, "Plugin")) {
-
-					// register plugin autoloader if necessary, for namespaced classes ONLY
-					// layout corresponds to tt-rss main /vendor/author/Package/Class.php
-
-					if (file_exists($vendor_dir)) {
-						spl_autoload_register(function($class) use ($vendor_dir) {
-
-							if (strpos($class, '\\') !== false) {
-								list ($namespace, $class_name) = explode('\\', $class, 2);
-
-								if ($namespace && $class_name) {
-									$class_file = "$vendor_dir/$namespace/".str_replace('\\', '/', $class_name).".php";
-
-									if (file_exists($class_file)) {
-																			require_once $class_file;
-									}
-								}
-							}
-						});
-					}
-
-					$plugin = new $class($this);
-
-					$plugin_api = $plugin->api_version();
-
-					if ($plugin_api < PluginHost::API_VERSION) {
-						user_error("plugin $class is not compatible with current API version (need: ".PluginHost::API_VERSION.", got: $plugin_api)", E_USER_WARNING);
-						continue;
-					}
-
-					if (file_exists(dirname($file)."/locale")) {
-						_bindtextdomain($class, dirname($file)."/locale");
-						_bind_textdomain_codeset($class, "UTF-8");
-					}
-
-					$this->last_registered = $class;
-
-					switch ($kind) {
-					case $this::KIND_SYSTEM:
-						if ($this->is_system($plugin)) {
-							if (!$skip_init) {
-							    $plugin->init($this);
-							}
-							$this->register_plugin($class, $plugin);
-						}
-						break;
-					case $this::KIND_USER:
-						if (!$this->is_system($plugin)) {
-							if (!$skip_init) {
-							    $plugin->init($this);
-							}
-							$this->register_plugin($class, $plugin);
-						}
-						break;
-					case $this::KIND_ALL:
-						if (!$skip_init) {
-						    $plugin->init($this);
-						}
-						$this->register_plugin($class, $plugin);
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	public function is_system($plugin) {
-		$about = $plugin->about();
-
-		return @$about[3];
-	}
-
-	// only system plugins are allowed to modify routing
-	public function add_handler($handler, $method, $sender) {
-		$handler = str_replace("-", "_", strtolower($handler));
-		$method = strtolower($method);
-
-		if ($this->is_system($sender)) {
-			if (!is_array($this->handlers[$handler])) {
-				$this->handlers[$handler] = array();
-			}
-
-			$this->handlers[$handler][$method] = $sender;
-		}
-	}
-
-	public function del_handler($handler, $method, $sender) {
-		$handler = str_replace("-", "_", strtolower($handler));
-		$method = strtolower($method);
-
-		if ($this->is_system($sender)) {
-			unset($this->handlers[$handler][$method]);
-		}
-	}
-
-	public function lookup_handler($handler, $method) {
-		$handler = str_replace("-", "_", strtolower($handler));
-		$method = strtolower($method);
-
-		if (is_array($this->handlers[$handler])) {
-			if (isset($this->handlers[$handler]["*"])) {
-				return $this->handlers[$handler]["*"];
-			} else {
-				return $this->handlers[$handler][$method];
-			}
-		}
-
-		return false;
-	}
-
-	public function add_command($command, $description, $sender, $suffix = "", $arghelp = "") {
-		$command = str_replace("-", "_", strtolower($command));
-
-		$this->commands[$command] = array("description" => $description,
-			"suffix" => $suffix,
-			"arghelp" => $arghelp,
-			"class" => $sender);
-	}
-
-	public function del_command($command) {
-		$command = "-".strtolower($command);
-
-		unset($this->commands[$command]);
-	}
-
-	public function lookup_command($command) {
-		$command = "-".strtolower($command);
-
-		if (is_array($this->commands[$command])) {
-			return $this->commands[$command]["class"];
-		} else {
-			return false;
-		}
-	}
-
-	public function get_commands() {
-		return $this->commands;
-	}
-
-	public function run_commands($args) {
-		foreach ($this->get_commands() as $command => $data) {
-			if (isset($args[$command])) {
-				$command = str_replace("-", "", $command);
-				$data["class"]->$command($args);
-			}
-		}
-	}
-
-	public function load_data() {
-		if ($this->owner_uid) {
-			$sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage
+    private $pdo;
+    private $hooks = array();
+    private $plugins = array();
+    private $handlers = array();
+    private $commands = array();
+    private $storage = array();
+    private $feeds = array();
+    private $api_methods = array();
+    private $plugin_actions = array();
+    private $owner_uid;
+    private $last_registered;
+    private static $instance;
+
+    const API_VERSION = 2;
+
+    // Hooks marked with *1 are run in global context and available
+    // to plugins loaded in config.php only
+
+    const HOOK_ARTICLE_BUTTON = 1;
+    const HOOK_ARTICLE_FILTER = 2;
+    const HOOK_PREFS_TAB = 3;
+    const HOOK_PREFS_TAB_SECTION = 4;
+    const HOOK_PREFS_TABS = 5;
+    const HOOK_FEED_PARSED = 6;
+    const HOOK_UPDATE_TASK = 7; // *1
+    const HOOK_AUTH_USER = 8;
+    const HOOK_HOTKEY_MAP = 9;
+    const HOOK_RENDER_ARTICLE = 10;
+    const HOOK_RENDER_ARTICLE_CDM = 11;
+    const HOOK_FEED_FETCHED = 12;
+    const HOOK_SANITIZE = 13;
+    const HOOK_RENDER_ARTICLE_API = 14;
+    const HOOK_TOOLBAR_BUTTON = 15;
+    const HOOK_ACTION_ITEM = 16;
+    const HOOK_HEADLINE_TOOLBAR_BUTTON = 17;
+    const HOOK_HOTKEY_INFO = 18;
+    const HOOK_ARTICLE_LEFT_BUTTON = 19;
+    const HOOK_PREFS_EDIT_FEED = 20;
+    const HOOK_PREFS_SAVE_FEED = 21;
+    const HOOK_FETCH_FEED = 22;
+    const HOOK_QUERY_HEADLINES = 23;
+    const HOOK_HOUSE_KEEPING = 24; // *1
+    const HOOK_SEARCH = 25;
+    const HOOK_FORMAT_ENCLOSURES = 26;
+    const HOOK_SUBSCRIBE_FEED = 27;
+    const HOOK_HEADLINES_BEFORE = 28;
+    const HOOK_RENDER_ENCLOSURE = 29;
+    const HOOK_ARTICLE_FILTER_ACTION = 30;
+    const HOOK_ARTICLE_EXPORT_FEED = 31;
+    const HOOK_MAIN_TOOLBAR_BUTTON = 32;
+    const HOOK_ENCLOSURE_ENTRY = 33;
+    const HOOK_FORMAT_ARTICLE = 34;
+    const HOOK_FORMAT_ARTICLE_CDM = 35; /* RIP */
+    const HOOK_FEED_BASIC_INFO = 36;
+    const HOOK_SEND_LOCAL_FILE = 37;
+    const HOOK_UNSUBSCRIBE_FEED = 38;
+    const HOOK_SEND_MAIL = 39;
+    const HOOK_FILTER_TRIGGERED = 40;
+    const HOOK_GET_FULL_TEXT = 41;
+    const HOOK_ARTICLE_IMAGE = 42;
+    const HOOK_FEED_TREE = 43;
+    const HOOK_IFRAME_WHITELISTED = 44;
+
+    const KIND_ALL = 1;
+    const KIND_SYSTEM = 2;
+    const KIND_USER = 3;
+
+    public static function object_to_domain($plugin) {
+        return strtolower(get_class($plugin));
+    }
+
+    public function __construct() {
+        $this->pdo = Db::pdo();
+
+        $this->storage = array();
+    }
+
+    private function __clone() {
+        //
+    }
+
+    public static function getInstance() {
+        if (self::$instance == null) {
+                    self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    private function register_plugin($name, $plugin) {
+        //array_push($this->plugins, $plugin);
+        $this->plugins[$name] = $plugin;
+    }
+
+    // needed for compatibility with API 1
+    public function get_link() {
+        return false;
+    }
+
+    public function get_dbh() {
+        return Db::get();
+    }
+
+    public function get_pdo() {
+        return $this->pdo;
+    }
+
+    public function get_plugin_names() {
+        $names = array();
+
+        foreach ($this->plugins as $p) {
+            array_push($names, get_class($p));
+        }
+
+        return $names;
+    }
+
+    public function get_plugins() {
+        return $this->plugins;
+    }
+
+    public function get_plugin($name) {
+        return $this->plugins[strtolower($name)];
+    }
+
+    public function run_hooks($type, $method, $args) {
+        foreach ($this->get_hooks($type) as $hook) {
+            $hook->$method($args);
+        }
+    }
+
+    public function add_hook($type, $sender, $priority = 50) {
+        $priority = (int) $priority;
+
+        if (!is_array($this->hooks[$type])) {
+            $this->hooks[$type] = [];
+        }
+
+        if (!is_array($this->hooks[$type][$priority])) {
+            $this->hooks[$type][$priority] = [];
+        }
+
+        array_push($this->hooks[$type][$priority], $sender);
+        ksort($this->hooks[$type]);
+    }
+
+    public function del_hook($type, $sender) {
+        if (is_array($this->hooks[$type])) {
+            foreach (array_keys($this->hooks[$type]) as $prio) {
+                $key = array_search($sender, $this->hooks[$type][$prio]);
+
+                if ($key !== false) {
+                    unset($this->hooks[$type][$prio][$key]);
+                }
+            }
+        }
+    }
+
+    public function get_hooks($type) {
+        if (isset($this->hooks[$type])) {
+            $tmp = [];
+
+            foreach (array_keys($this->hooks[$type]) as $prio) {
+                $tmp = array_merge($tmp, $this->hooks[$type][$prio]);
+            }
+
+            return $tmp;
+        } else {
+            return [];
+        }
+    }
+    public function load_all($kind, $owner_uid = false, $skip_init = false) {
+
+        $plugins = array_merge(glob("plugins/*"), glob("plugins.local/*"));
+        $plugins = array_filter($plugins, "is_dir");
+        $plugins = array_map("basename", $plugins);
+
+        asort($plugins);
+
+        $this->load(join(",", $plugins), $kind, $owner_uid, $skip_init);
+    }
+
+    public function load($classlist, $kind, $owner_uid = false, $skip_init = false) {
+        $plugins = explode(",", $classlist);
+
+        $this->owner_uid = (int) $owner_uid;
+
+        foreach ($plugins as $class) {
+            $class = trim($class);
+            $class_file = strtolower(clean_filename($class));
+
+            if (!is_dir(__DIR__."/../plugins/$class_file") &&
+                    !is_dir(__DIR__."/../plugins.local/$class_file")) {
+                continue;
+            }
+
+            // try system plugin directory first
+            $file = __DIR__."/../plugins/$class_file/init.php";
+            $vendor_dir = __DIR__."/../plugins/$class_file/vendor";
+
+            if (!file_exists($file)) {
+                $file = __DIR__."/../plugins.local/$class_file/init.php";
+                $vendor_dir = __DIR__."/../plugins.local/$class_file/vendor";
+            }
+
+            if (!isset($this->plugins[$class])) {
+                if (file_exists($file)) {
+                    require_once $file;
+                }
+
+                if (class_exists($class) && is_subclass_of($class, "Plugin")) {
+
+                    // register plugin autoloader if necessary, for namespaced classes ONLY
+                    // layout corresponds to tt-rss main /vendor/author/Package/Class.php
+
+                    if (file_exists($vendor_dir)) {
+                        spl_autoload_register(function($class) use ($vendor_dir) {
+
+                            if (strpos($class, '\\') !== false) {
+                                list ($namespace, $class_name) = explode('\\', $class, 2);
+
+                                if ($namespace && $class_name) {
+                                    $class_file = "$vendor_dir/$namespace/".str_replace('\\', '/', $class_name).".php";
+
+                                    if (file_exists($class_file)) {
+                                                                            require_once $class_file;
+                                    }
+                                }
+                            }
+                        });
+                    }
+
+                    $plugin = new $class($this);
+
+                    $plugin_api = $plugin->api_version();
+
+                    if ($plugin_api < PluginHost::API_VERSION) {
+                        user_error("plugin $class is not compatible with current API version (need: ".PluginHost::API_VERSION.", got: $plugin_api)", E_USER_WARNING);
+                        continue;
+                    }
+
+                    if (file_exists(dirname($file)."/locale")) {
+                        _bindtextdomain($class, dirname($file)."/locale");
+                        _bind_textdomain_codeset($class, "UTF-8");
+                    }
+
+                    $this->last_registered = $class;
+
+                    switch ($kind) {
+                    case $this::KIND_SYSTEM:
+                        if ($this->is_system($plugin)) {
+                            if (!$skip_init) {
+                                $plugin->init($this);
+                            }
+                            $this->register_plugin($class, $plugin);
+                        }
+                        break;
+                    case $this::KIND_USER:
+                        if (!$this->is_system($plugin)) {
+                            if (!$skip_init) {
+                                $plugin->init($this);
+                            }
+                            $this->register_plugin($class, $plugin);
+                        }
+                        break;
+                    case $this::KIND_ALL:
+                        if (!$skip_init) {
+                            $plugin->init($this);
+                        }
+                        $this->register_plugin($class, $plugin);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    public function is_system($plugin) {
+        $about = $plugin->about();
+
+        return @$about[3];
+    }
+
+    // only system plugins are allowed to modify routing
+    public function add_handler($handler, $method, $sender) {
+        $handler = str_replace("-", "_", strtolower($handler));
+        $method = strtolower($method);
+
+        if ($this->is_system($sender)) {
+            if (!is_array($this->handlers[$handler])) {
+                $this->handlers[$handler] = array();
+            }
+
+            $this->handlers[$handler][$method] = $sender;
+        }
+    }
+
+    public function del_handler($handler, $method, $sender) {
+        $handler = str_replace("-", "_", strtolower($handler));
+        $method = strtolower($method);
+
+        if ($this->is_system($sender)) {
+            unset($this->handlers[$handler][$method]);
+        }
+    }
+
+    public function lookup_handler($handler, $method) {
+        $handler = str_replace("-", "_", strtolower($handler));
+        $method = strtolower($method);
+
+        if (is_array($this->handlers[$handler])) {
+            if (isset($this->handlers[$handler]["*"])) {
+                return $this->handlers[$handler]["*"];
+            } else {
+                return $this->handlers[$handler][$method];
+            }
+        }
+
+        return false;
+    }
+
+    public function add_command($command, $description, $sender, $suffix = "", $arghelp = "") {
+        $command = str_replace("-", "_", strtolower($command));
+
+        $this->commands[$command] = array("description" => $description,
+            "suffix" => $suffix,
+            "arghelp" => $arghelp,
+            "class" => $sender);
+    }
+
+    public function del_command($command) {
+        $command = "-".strtolower($command);
+
+        unset($this->commands[$command]);
+    }
+
+    public function lookup_command($command) {
+        $command = "-".strtolower($command);
+
+        if (is_array($this->commands[$command])) {
+            return $this->commands[$command]["class"];
+        } else {
+            return false;
+        }
+    }
+
+    public function get_commands() {
+        return $this->commands;
+    }
+
+    public function run_commands($args) {
+        foreach ($this->get_commands() as $command => $data) {
+            if (isset($args[$command])) {
+                $command = str_replace("-", "", $command);
+                $data["class"]->$command($args);
+            }
+        }
+    }
+
+    public function load_data() {
+        if ($this->owner_uid) {
+            $sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage
 				WHERE owner_uid = ?");
-			$sth->execute([$this->owner_uid]);
+            $sth->execute([$this->owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				$this->storage[$line["name"]] = unserialize($line["content"]);
-			}
-		}
-	}
+            while ($line = $sth->fetch()) {
+                $this->storage[$line["name"]] = unserialize($line["content"]);
+            }
+        }
+    }
 
-	private function save_data($plugin) {
-		if ($this->owner_uid) {
-			$this->pdo->beginTransaction();
+    private function save_data($plugin) {
+        if ($this->owner_uid) {
+            $this->pdo->beginTransaction();
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_plugin_storage WHERE
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_plugin_storage WHERE
 				owner_uid= ? AND name = ?");
-			$sth->execute([$this->owner_uid, $plugin]);
+            $sth->execute([$this->owner_uid, $plugin]);
 
-			if (!isset($this->storage[$plugin])) {
-							$this->storage[$plugin] = array();
-			}
+            if (!isset($this->storage[$plugin])) {
+                            $this->storage[$plugin] = array();
+            }
 
-			$content = serialize($this->storage[$plugin]);
+            $content = serialize($this->storage[$plugin]);
 
-			if ($sth->fetch()) {
-				$sth = $this->pdo->prepare("UPDATE ttrss_plugin_storage SET content = ?
+            if ($sth->fetch()) {
+                $sth = $this->pdo->prepare("UPDATE ttrss_plugin_storage SET content = ?
 					WHERE owner_uid= ? AND name = ?");
-				$sth->execute([(string) $content, $this->owner_uid, $plugin]);
+                $sth->execute([(string) $content, $this->owner_uid, $plugin]);
 
-			} else {
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_plugin_storage
+            } else {
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_plugin_storage
 					(name,owner_uid,content) VALUES
 					(?, ?, ?)");
-				$sth->execute([$plugin, $this->owner_uid, (string) $content]);
-			}
+                $sth->execute([$plugin, $this->owner_uid, (string) $content]);
+            }
 
-			$this->pdo->commit();
-		}
-	}
+            $this->pdo->commit();
+        }
+    }
 
-	public function set($sender, $name, $value, $sync = true) {
-		$idx = get_class($sender);
+    public function set($sender, $name, $value, $sync = true) {
+        $idx = get_class($sender);
 
-		if (!isset($this->storage[$idx])) {
-					$this->storage[$idx] = array();
-		}
+        if (!isset($this->storage[$idx])) {
+                    $this->storage[$idx] = array();
+        }
 
-		$this->storage[$idx][$name] = $value;
+        $this->storage[$idx][$name] = $value;
 
-		if ($sync) {
-		    $this->save_data(get_class($sender));
-		}
-	}
+        if ($sync) {
+            $this->save_data(get_class($sender));
+        }
+    }
 
-	public function get($sender, $name, $default_value = false) {
-		$idx = get_class($sender);
+    public function get($sender, $name, $default_value = false) {
+        $idx = get_class($sender);
 
-		if (isset($this->storage[$idx][$name])) {
-			return $this->storage[$idx][$name];
-		} else {
-			return $default_value;
-		}
-	}
+        if (isset($this->storage[$idx][$name])) {
+            return $this->storage[$idx][$name];
+        } else {
+            return $default_value;
+        }
+    }
 
-	public function get_all($sender) {
-		$idx = get_class($sender);
+    public function get_all($sender) {
+        $idx = get_class($sender);
 
-		$data = $this->storage[$idx];
+        $data = $this->storage[$idx];
 
-		return $data ? $data : [];
-	}
+        return $data ? $data : [];
+    }
 
-	public function clear_data($sender) {
-		if ($this->owner_uid) {
-			$idx = get_class($sender);
+    public function clear_data($sender) {
+        if ($this->owner_uid) {
+            $idx = get_class($sender);
 
-			unset($this->storage[$idx]);
+            unset($this->storage[$idx]);
 
-			$sth = $this->pdo->prepare("DELETE FROM ttrss_plugin_storage WHERE name = ?
+            $sth = $this->pdo->prepare("DELETE FROM ttrss_plugin_storage WHERE name = ?
 				AND owner_uid = ?");
-			$sth->execute([$idx, $this->owner_uid]);
-		}
-	}
-
-	// Plugin feed functions are *EXPERIMENTAL*!
-
-	// cat_id: only -1 is supported (Special)
-	public function add_feed($cat_id, $title, $icon, $sender) {
-		if (!$this->feeds[$cat_id]) {
-		    $this->feeds[$cat_id] = array();
-		}
-
-		$id = count($this->feeds[$cat_id]);
-
-		array_push($this->feeds[$cat_id],
-			array('id' => $id, 'title' => $title, 'sender' => $sender, 'icon' => $icon));
-
-		return $id;
-	}
-
-	public function get_feeds($cat_id) {
-		return $this->feeds[$cat_id];
-	}
-
-	// convert feed_id (e.g. -129) to pfeed_id first
-	public function get_feed_handler($pfeed_id) {
-		foreach ($this->feeds as $cat) {
-			foreach ($cat as $feed) {
-				if ($feed['id'] == $pfeed_id) {
-					return $feed['sender'];
-				}
-			}
-		}
-	}
-
-	public static function pfeed_to_feed_id($label) {
-		return PLUGIN_FEED_BASE_INDEX - 1 - abs($label);
-	}
-
-	public static function feed_to_pfeed_id($feed) {
-		return PLUGIN_FEED_BASE_INDEX - 1 + abs($feed);
-	}
-
-	public function add_api_method($name, $sender) {
-		if ($this->is_system($sender)) {
-			$this->api_methods[strtolower($name)] = $sender;
-		}
-	}
-
-	public function get_api_method($name) {
-		return $this->api_methods[$name];
-	}
-
-	public function add_filter_action($sender, $action_name, $action_desc) {
-		$sender_class = get_class($sender);
-
-		if (!isset($this->plugin_actions[$sender_class])) {
-					$this->plugin_actions[$sender_class] = array();
-		}
-
-		array_push($this->plugin_actions[$sender_class],
-			array("action" => $action_name, "description" => $action_desc, "sender" => $sender));
-	}
-
-	public function get_filter_actions() {
-		return $this->plugin_actions;
-	}
-
-	public function get_owner_uid() {
-		return $this->owner_uid;
-	}
-
-	// handled by classes/pluginhandler.php, requires valid session
-	public function get_method_url($sender, $method, $params) {
-		return get_self_url_prefix()."/backend.php?".
-			http_build_query(
-				array_merge(
-					[
-						"op" => "pluginhandler",
-						"plugin" => strtolower(get_class($sender)),
-						"method" => $method
-					],
-					$params));
-	}
-
-	// WARNING: endpoint in public.php, exposed to unauthenticated users
-	public function get_public_method_url($sender, $method, $params) {
-		if ($sender->is_public_method($method)) {
-			return get_self_url_prefix()."/public.php?".
-				http_build_query(
-					array_merge(
-						[
-							"op" => "pluginhandler",
-							"plugin" => strtolower(get_class($sender)),
-							"pmethod" => $method
-						],
-						$params));
-		} else {
-			user_error("get_public_method_url: requested method '$method' of '".get_class($sender)."' is private.");
-		}
-	}
+            $sth->execute([$idx, $this->owner_uid]);
+        }
+    }
+
+    // Plugin feed functions are *EXPERIMENTAL*!
+
+    // cat_id: only -1 is supported (Special)
+    public function add_feed($cat_id, $title, $icon, $sender) {
+        if (!$this->feeds[$cat_id]) {
+            $this->feeds[$cat_id] = array();
+        }
+
+        $id = count($this->feeds[$cat_id]);
+
+        array_push($this->feeds[$cat_id],
+            array('id' => $id, 'title' => $title, 'sender' => $sender, 'icon' => $icon));
+
+        return $id;
+    }
+
+    public function get_feeds($cat_id) {
+        return $this->feeds[$cat_id];
+    }
+
+    // convert feed_id (e.g. -129) to pfeed_id first
+    public function get_feed_handler($pfeed_id) {
+        foreach ($this->feeds as $cat) {
+            foreach ($cat as $feed) {
+                if ($feed['id'] == $pfeed_id) {
+                    return $feed['sender'];
+                }
+            }
+        }
+    }
+
+    public static function pfeed_to_feed_id($label) {
+        return PLUGIN_FEED_BASE_INDEX - 1 - abs($label);
+    }
+
+    public static function feed_to_pfeed_id($feed) {
+        return PLUGIN_FEED_BASE_INDEX - 1 + abs($feed);
+    }
+
+    public function add_api_method($name, $sender) {
+        if ($this->is_system($sender)) {
+            $this->api_methods[strtolower($name)] = $sender;
+        }
+    }
+
+    public function get_api_method($name) {
+        return $this->api_methods[$name];
+    }
+
+    public function add_filter_action($sender, $action_name, $action_desc) {
+        $sender_class = get_class($sender);
+
+        if (!isset($this->plugin_actions[$sender_class])) {
+                    $this->plugin_actions[$sender_class] = array();
+        }
+
+        array_push($this->plugin_actions[$sender_class],
+            array("action" => $action_name, "description" => $action_desc, "sender" => $sender));
+    }
+
+    public function get_filter_actions() {
+        return $this->plugin_actions;
+    }
+
+    public function get_owner_uid() {
+        return $this->owner_uid;
+    }
+
+    // handled by classes/pluginhandler.php, requires valid session
+    public function get_method_url($sender, $method, $params) {
+        return get_self_url_prefix()."/backend.php?".
+            http_build_query(
+                array_merge(
+                    [
+                        "op" => "pluginhandler",
+                        "plugin" => strtolower(get_class($sender)),
+                        "method" => $method
+                    ],
+                    $params));
+    }
+
+    // WARNING: endpoint in public.php, exposed to unauthenticated users
+    public function get_public_method_url($sender, $method, $params) {
+        if ($sender->is_public_method($method)) {
+            return get_self_url_prefix()."/public.php?".
+                http_build_query(
+                    array_merge(
+                        [
+                            "op" => "pluginhandler",
+                            "plugin" => strtolower(get_class($sender)),
+                            "pmethod" => $method
+                        ],
+                        $params));
+        } else {
+            user_error("get_public_method_url: requested method '$method' of '".get_class($sender)."' is private.");
+        }
+    }
 }

classes/feeditem/atom.php

Indentation +147 added lines, -147 removed lines

@@ -1,162 +1,162 @@
 <?php
 class FeedItem_Atom extends FeedItem_Common {
-	const NS_XML = "http://www.w3.org/XML/1998/namespace";
+    const NS_XML = "http://www.w3.org/XML/1998/namespace";
 
-	public function get_id() {
-		$id = $this->elem->getElementsByTagName("id")->item(0);
-
-		if ($id) {
-			return $id->nodeValue;
-		} else {
-			return clean($this->get_link());
-		}
-	}
-
-	public function get_date() {
-		$updated = $this->elem->getElementsByTagName("updated")->item(0);
+    public function get_id() {
+        $id = $this->elem->getElementsByTagName("id")->item(0);
+
+        if ($id) {
+            return $id->nodeValue;
+        } else {
+            return clean($this->get_link());
+        }
+    }
+
+    public function get_date() {
+        $updated = $this->elem->getElementsByTagName("updated")->item(0);
 
-		if ($updated) {
-			return strtotime($updated->nodeValue);
-		}
+        if ($updated) {
+            return strtotime($updated->nodeValue);
+        }
 
-		$published = $this->elem->getElementsByTagName("published")->item(0);
+        $published = $this->elem->getElementsByTagName("published")->item(0);
 
-		if ($published) {
-			return strtotime($published->nodeValue);
-		}
+        if ($published) {
+            return strtotime($published->nodeValue);
+        }
 
-		$date = $this->xpath->query("dc:date", $this->elem)->item(0);
+        $date = $this->xpath->query("dc:date", $this->elem)->item(0);
 
-		if ($date) {
-			return strtotime($date->nodeValue);
-		}
-	}
+        if ($date) {
+            return strtotime($date->nodeValue);
+        }
+    }
 
 
-	public function get_link() {
-		$links = $this->elem->getElementsByTagName("link");
+    public function get_link() {
+        $links = $this->elem->getElementsByTagName("link");
 
-		foreach ($links as $link) {
-			if ($link && $link->hasAttribute("href") &&
-				(!$link->hasAttribute("rel")
-					|| $link->getAttribute("rel") == "alternate"
-					|| $link->getAttribute("rel") == "standout")) {
-				$base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
+        foreach ($links as $link) {
+            if ($link && $link->hasAttribute("href") &&
+                (!$link->hasAttribute("rel")
+                    || $link->getAttribute("rel") == "alternate"
+                    || $link->getAttribute("rel") == "standout")) {
+                $base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
 
-				if ($base) {
-									return rewrite_relative_url($base, clean(trim($link->getAttribute("href"))));
-				} else {
-									return clean(trim($link->getAttribute("href")));
-				}
+                if ($base) {
+                                    return rewrite_relative_url($base, clean(trim($link->getAttribute("href"))));
+                } else {
+                                    return clean(trim($link->getAttribute("href")));
+                }
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	public function get_title() {
-		$title = $this->elem->getElementsByTagName("title")->item(0);
-
-		if ($title) {
-			return clean(trim($title->nodeValue));
-		}
-	}
-
-	public function get_content() {
-		$content = $this->elem->getElementsByTagName("content")->item(0);
-
-		if ($content) {
-			if ($content->hasAttribute('type')) {
-				if ($content->getAttribute('type') == 'xhtml') {
-					for ($i = 0; $i < $content->childNodes->length; $i++) {
-						$child = $content->childNodes->item($i);
-
-						if ($child->hasChildNodes()) {
-							return $this->doc->saveHTML($child);
-						}
-					}
-				}
-			}
-
-			return $this->subtree_or_text($content);
-		}
-	}
-
-	public function get_description() {
-		$content = $this->elem->getElementsByTagName("summary")->item(0);
-
-		if ($content) {
-			if ($content->hasAttribute('type')) {
-				if ($content->getAttribute('type') == 'xhtml') {
-					for ($i = 0; $i < $content->childNodes->length; $i++) {
-						$child = $content->childNodes->item($i);
-
-						if ($child->hasChildNodes()) {
-							return $this->doc->saveHTML($child);
-						}
-					}
-				}
-			}
-
-			return $this->subtree_or_text($content);
-		}
-
-	}
-
-	public function get_categories() {
-		$categories = $this->elem->getElementsByTagName("category");
-		$cats = [];
-
-		foreach ($categories as $cat) {
-			if ($cat->hasAttribute("term")) {
-							array_push($cats, $cat->getAttribute("term"));
-			}
-		}
-
-		$categories = $this->xpath->query("dc:subject", $this->elem);
-
-		foreach ($categories as $cat) {
-			array_push($cats, $cat->nodeValue);
-		}
-
-		return $this->normalize_categories($cats);
-	}
-
-	public function get_enclosures() {
-		$links = $this->elem->getElementsByTagName("link");
-
-		$encs = array();
-
-		foreach ($links as $link) {
-			if ($link && $link->hasAttribute("href") && $link->hasAttribute("rel")) {
-				if ($link->getAttribute("rel") == "enclosure") {
-					$enc = new FeedEnclosure();
-
-					$enc->type = clean($link->getAttribute("type"));
-					$enc->link = clean($link->getAttribute("href"));
-					$enc->length = clean($link->getAttribute("length"));
-
-					array_push($encs, $enc);
-				}
-			}
-		}
-
-		$encs = array_merge($encs, parent::get_enclosures());
-
-		return $encs;
-	}
-
-	public function get_language() {
-		$lang = $this->elem->getAttributeNS(self::NS_XML, "lang");
-
-		if (!empty($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 clean($child->getAttributeNS(self::NS_XML, "lang"));
-				}
-			}
-		}
-	}
+    public function get_title() {
+        $title = $this->elem->getElementsByTagName("title")->item(0);
+
+        if ($title) {
+            return clean(trim($title->nodeValue));
+        }
+    }
+
+    public function get_content() {
+        $content = $this->elem->getElementsByTagName("content")->item(0);
+
+        if ($content) {
+            if ($content->hasAttribute('type')) {
+                if ($content->getAttribute('type') == 'xhtml') {
+                    for ($i = 0; $i < $content->childNodes->length; $i++) {
+                        $child = $content->childNodes->item($i);
+
+                        if ($child->hasChildNodes()) {
+                            return $this->doc->saveHTML($child);
+                        }
+                    }
+                }
+            }
+
+            return $this->subtree_or_text($content);
+        }
+    }
+
+    public function get_description() {
+        $content = $this->elem->getElementsByTagName("summary")->item(0);
+
+        if ($content) {
+            if ($content->hasAttribute('type')) {
+                if ($content->getAttribute('type') == 'xhtml') {
+                    for ($i = 0; $i < $content->childNodes->length; $i++) {
+                        $child = $content->childNodes->item($i);
+
+                        if ($child->hasChildNodes()) {
+                            return $this->doc->saveHTML($child);
+                        }
+                    }
+                }
+            }
+
+            return $this->subtree_or_text($content);
+        }
+
+    }
+
+    public function get_categories() {
+        $categories = $this->elem->getElementsByTagName("category");
+        $cats = [];
+
+        foreach ($categories as $cat) {
+            if ($cat->hasAttribute("term")) {
+                            array_push($cats, $cat->getAttribute("term"));
+            }
+        }
+
+        $categories = $this->xpath->query("dc:subject", $this->elem);
+
+        foreach ($categories as $cat) {
+            array_push($cats, $cat->nodeValue);
+        }
+
+        return $this->normalize_categories($cats);
+    }
+
+    public function get_enclosures() {
+        $links = $this->elem->getElementsByTagName("link");
+
+        $encs = array();
+
+        foreach ($links as $link) {
+            if ($link && $link->hasAttribute("href") && $link->hasAttribute("rel")) {
+                if ($link->getAttribute("rel") == "enclosure") {
+                    $enc = new FeedEnclosure();
+
+                    $enc->type = clean($link->getAttribute("type"));
+                    $enc->link = clean($link->getAttribute("href"));
+                    $enc->length = clean($link->getAttribute("length"));
+
+                    array_push($encs, $enc);
+                }
+            }
+        }
+
+        $encs = array_merge($encs, parent::get_enclosures());
+
+        return $encs;
+    }
+
+    public function get_language() {
+        $lang = $this->elem->getAttributeNS(self::NS_XML, "lang");
+
+        if (!empty($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 clean($child->getAttributeNS(self::NS_XML, "lang"));
+                }
+            }
+        }
+    }
 }

classes/feeditem/common.php

Indentation +166 added lines, -166 removed lines

@@ -1,209 +1,209 @@
 <?php
 abstract class FeedItem_Common extends FeedItem {
-	protected $elem;
-	protected $xpath;
-	protected $doc;
-
-	public function __construct($elem, $doc, $xpath) {
-		$this->elem = $elem;
-		$this->xpath = $xpath;
-		$this->doc = $doc;
-
-		try {
+    protected $elem;
+    protected $xpath;
+    protected $doc;
+
+    public function __construct($elem, $doc, $xpath) {
+        $this->elem = $elem;
+        $this->xpath = $xpath;
+        $this->doc = $doc;
+
+        try {
 
-			$source = $elem->getElementsByTagName("source")->item(0);
+            $source = $elem->getElementsByTagName("source")->item(0);
 
-			// we don't need <source> element
-			if ($source) {
-							$elem->removeChild($source);
-			}
-		} catch (DOMException $e) {
-			//
-		}
-	}
+            // we don't need <source> element
+            if ($source) {
+                            $elem->removeChild($source);
+            }
+        } catch (DOMException $e) {
+            //
+        }
+    }
 
-	public function get_element() {
-		return $this->elem;
-	}
+    public function get_element() {
+        return $this->elem;
+    }
 
-	public function get_author() {
-		$author = $this->elem->getElementsByTagName("author")->item(0);
+    public function get_author() {
+        $author = $this->elem->getElementsByTagName("author")->item(0);
 
-		if ($author) {
-			$name = $author->getElementsByTagName("name")->item(0);
+        if ($author) {
+            $name = $author->getElementsByTagName("name")->item(0);
 
-			if ($name) {
-			    return clean($name->nodeValue);
-			}
-
-			$email = $author->getElementsByTagName("email")->item(0);
-
-			if ($email) {
-			    return clean($email->nodeValue);
-			}
-
-			if ($author->nodeValue) {
-							return clean($author->nodeValue);
-			}
-		}
-
-		$author_elems = $this->xpath->query("dc:creator", $this->elem);
-		$authors = [];
-
-		foreach ($author_elems as $author) {
-			array_push($authors, clean($author->nodeValue));
-		}
-
-		return implode(", ", $authors);
-	}
-
-	public function get_comments_url() {
-		//RSS only. Use a query here to avoid namespace clashes (e.g. with slash).
-		//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 ($name) {
+                return clean($name->nodeValue);
+            }
+
+            $email = $author->getElementsByTagName("email")->item(0);
+
+            if ($email) {
+                return clean($email->nodeValue);
+            }
+
+            if ($author->nodeValue) {
+                            return clean($author->nodeValue);
+            }
+        }
+
+        $author_elems = $this->xpath->query("dc:creator", $this->elem);
+        $authors = [];
+
+        foreach ($author_elems as $author) {
+            array_push($authors, clean($author->nodeValue));
+        }
+
+        return implode(", ", $authors);
+    }
+
+    public function get_comments_url() {
+        //RSS only. Use a query here to avoid namespace clashes (e.g. with slash).
+        //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 clean($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 clean($com_url->nodeValue);
-		}
-	}
-
-	public function get_comments_count() {
-		//also query for ATE stuff here
-		$query = "slash:comments|thread:total|atom:link[@rel='replies']/@thread:count";
-		$comments = $this->xpath->query($query, $this->elem)->item(0);
-
-		if ($comments) {
-			return clean($comments->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 clean($com_url->nodeValue);
+        }
+    }
+
+    public function get_comments_count() {
+        //also query for ATE stuff here
+        $query = "slash:comments|thread:total|atom:link[@rel='replies']/@thread:count";
+        $comments = $this->xpath->query($query, $this->elem)->item(0);
+
+        if ($comments) {
+            return clean($comments->nodeValue);
+        }
+    }
 
-	// this is common for both Atom and RSS types and deals with various media: elements
-	public function get_enclosures() {
-		$encs = [];
+    // this is common for both Atom and RSS types and deals with various media: elements
+    public function get_enclosures() {
+        $encs = [];
 
-		$enclosures = $this->xpath->query("media:content", $this->elem);
+        $enclosures = $this->xpath->query("media:content", $this->elem);
 
-		foreach ($enclosures as $enclosure) {
-			$enc = new FeedEnclosure();
+        foreach ($enclosures as $enclosure) {
+            $enc = new FeedEnclosure();
 
-			$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"));
+            $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 = clean($enclosure->getAttribute("medium"));
-			if (!$enc->type && $medium) {
-				$enc->type = strtolower("$medium/generic");
-			}
+            $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 = clean($desc->nodeValue);
-			}
+            $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+            if ($desc) {
+                $enc->title = clean($desc->nodeValue);
+            }
 
-			array_push($encs, $enc);
-		}
+            array_push($encs, $enc);
+        }
 
-		$enclosures = $this->xpath->query("media:group", $this->elem);
+        $enclosures = $this->xpath->query("media:group", $this->elem);
 
-		foreach ($enclosures as $enclosure) {
-			$enc = new FeedEnclosure();
+        foreach ($enclosures as $enclosure) {
+            $enc = new FeedEnclosure();
 
-			$content = $this->xpath->query("media:content", $enclosure)->item(0);
+            $content = $this->xpath->query("media:content", $enclosure)->item(0);
 
-			if ($content) {
-				$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"));
+            if ($content) {
+                $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 = clean($content->getAttribute("medium"));
-				if (!$enc->type && $medium) {
-					$enc->type = strtolower("$medium/generic");
-				}
+                $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 = clean($desc->nodeValue);
-				} else {
-					$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-					if ($desc) {
-					    $enc->title = clean($desc->nodeValue);
-					}
-				}
+                $desc = $this->xpath->query("media:description", $content)->item(0);
+                if ($desc) {
+                    $enc->title = clean($desc->nodeValue);
+                } else {
+                    $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+                    if ($desc) {
+                        $enc->title = clean($desc->nodeValue);
+                    }
+                }
 
-				array_push($encs, $enc);
-			}
-		}
+                array_push($encs, $enc);
+            }
+        }
 
-		$enclosures = $this->xpath->query("media:thumbnail", $this->elem);
+        $enclosures = $this->xpath->query("media:thumbnail", $this->elem);
 
-		foreach ($enclosures as $enclosure) {
-			$enc = new FeedEnclosure();
+        foreach ($enclosures as $enclosure) {
+            $enc = new FeedEnclosure();
 
-			$enc->type = "image/generic";
-			$enc->link = clean($enclosure->getAttribute("url"));
-			$enc->height = clean($enclosure->getAttribute("height"));
-			$enc->width = clean($enclosure->getAttribute("width"));
+            $enc->type = "image/generic";
+            $enc->link = clean($enclosure->getAttribute("url"));
+            $enc->height = clean($enclosure->getAttribute("height"));
+            $enc->width = clean($enclosure->getAttribute("width"));
 
-			array_push($encs, $enc);
-		}
+            array_push($encs, $enc);
+        }
 
-		return $encs;
-	}
+        return $encs;
+    }
 
-	public function count_children($node) {
-		return $node->getElementsByTagName("*")->length;
-	}
+    public function count_children($node) {
+        return $node->getElementsByTagName("*")->length;
+    }
 
-	public function subtree_or_text($node) {
-		if ($this->count_children($node) == 0) {
-			return $node->nodeValue;
-		} else {
-			return $node->c14n();
-		}
-	}
+    public function subtree_or_text($node) {
+        if ($this->count_children($node) == 0) {
+            return $node->nodeValue;
+        } else {
+            return $node->c14n();
+        }
+    }
 
-	public static function normalize_categories($cats) {
+    public static function normalize_categories($cats) {
 
-		$tmp = [];
+        $tmp = [];
 
-		foreach ($cats as $rawcat) {
-			$tmp = array_merge($tmp, explode(",", $rawcat));
-		}
+        foreach ($cats as $rawcat) {
+            $tmp = array_merge($tmp, explode(",", $rawcat));
+        }
 
-		$tmp = array_map(function($srccat) {
-			$cat = clean(trim(mb_strtolower($srccat)));
+        $tmp = array_map(function($srccat) {
+            $cat = clean(trim(mb_strtolower($srccat)));
 
-			// we don't support numeric tags
-			if (is_numeric($cat))
-				$cat = 't:'.$cat;
+            // we don't support numeric tags
+            if (is_numeric($cat))
+                $cat = 't:'.$cat;
 
-			$cat = preg_replace('/[,\'\"]/', "", $cat);
+            $cat = preg_replace('/[,\'\"]/', "", $cat);
 
-			if (DB_TYPE == "mysql") {
-				$cat = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $cat);
-			}
+            if (DB_TYPE == "mysql") {
+                $cat = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $cat);
+            }
 
-			if (mb_strlen($cat) > 250) {
-							$cat = mb_substr($cat, 0, 250);
-			}
+            if (mb_strlen($cat) > 250) {
+                            $cat = mb_substr($cat, 0, 250);
+            }
 
-			return $cat;
-		}, $tmp);
+            return $cat;
+        }, $tmp);
 
-		asort($tmp);
+        asort($tmp);
 
-		return array_unique($tmp);
-	}
+        return array_unique($tmp);
+    }
 }