codysnider / tt-rss

classes/handler/protected.php

Indentation +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@
 <?php
 class Handler_Protected extends Handler {
 
-	public function before($method) {
-		return parent::before($method) && $_SESSION['uid'];
-	}
+    public function before($method) {
+        return parent::before($method) && $_SESSION['uid'];
+    }
 }

classes/handler/public.php

Indentation +716 added lines, -716 removed lines

@@ -1,329 +1,329 @@ 
 <?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();
 
-				array_push($feed['articles'], $article);
-			}
+                    foreach ($tags as $tag) {
+                        array_push($article['tags'], $tag);
+                    }
+                }
+
+                $enclosures = Article::get_article_enclosures($line["id"]);
 
-			header("Content-Type: text/json; charset=utf-8");
-			print json_encode($feed);
+                if (count($enclosures) > 0) {
+                    $article['enclosures'] = array();
 
-		} else {
-			header("Content-Type: text/plain; charset=utf-8");
-			print json_encode(array("error" => array("message" => "Unknown format")));
-		}
-	}
+                    foreach ($enclosures as $e) {
+                        $type = $e['content_type'];
+                        $url = $e['content_url'];
+                        $length = $e['duration'];
 
-	public function getUnread() {
-		$login = clean($_REQUEST["login"]);
-		$fresh = clean($_REQUEST["fresh"]) == "1";
+                        array_push($article['enclosures'], array("url" => $url, "type" => $type, "length" => $length));
+                    }
+                }
+
+                array_push($feed['articles'], $article);
+            }
 
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
-		$sth->execute([$login]);
+            header("Content-Type: text/json; charset=utf-8");
+            print json_encode($feed);
 
-		if ($row = $sth->fetch()) {
-			$uid = $row["id"];
+        } else {
+            header("Content-Type: text/plain; charset=utf-8");
+            print json_encode(array("error" => array("message" => "Unknown format")));
+        }
+    }
 
-			print Feeds::getGlobalUnread($uid);
+    public function getUnread() {
+        $login = clean($_REQUEST["login"]);
+        $fresh = clean($_REQUEST["fresh"]) == "1";
 
-			if ($fresh) {
-				print ";";
-				print Feeds::getFeedArticles(-3, false, true, $uid);
-			}
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
+        $sth->execute([$login]);
+
+        if ($row = $sth->fetch()) {
+            $uid = $row["id"];
+
+            print Feeds::getGlobalUnread($uid);
+
+            if ($fresh) {
+                print ";";
+                print Feeds::getFeedArticles(-3, false, true, $uid);
+            }
 
-		} else {
-			print "-1;User not found";
-		}
-	}
+        } else {
+            print "-1;User not found";
+        }
+    }
 
-	public function getProfiles() {
-		$login = clean($_REQUEST["login"]);
-		$rv = [];
+    public function getProfiles() {
+        $login = clean($_REQUEST["login"]);
+        $rv = [];
 
-		if ($login) {
-			$sth = $this->pdo->prepare("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
+        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,
@@ -337,26 +337,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");
 
@@ -371,13 +371,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>";
 
@@ -390,132 +390,132 @@ 
             $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]);
+            $sth->execute([$key, $feed]);
 
-			if ($row = $sth->fetch())
-				$owner_id = $row["owner_uid"];
-		}
+            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');
-		}
-	}
+        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 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 housekeepingTask() {
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
+    }
 
-	public function globalUpdateFeeds() {
-		RPC::updaterandomfeed_real();
+    public function globalUpdateFeeds() {
+        RPC::updaterandomfeed_real();
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
-	}
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
+    }
 
-	public function sharepopup() {
-		if (SINGLE_USER_MODE) {
-			login_sequence();
-		}
+    public function sharepopup() {
+        if (SINGLE_USER_MODE) {
+            login_sequence();
+        }
 
-		header('Content-Type: text/html; charset=utf-8');
-		?>
+        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">
@@ -537,29 +537,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">
@@ -599,12 +599,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">
 
@@ -636,90 +636,90 @@ 
 
 			</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">
@@ -738,8 +738,8 @@ 
 			<div class='content'>
 			<?php
 
-			if (!$feed_url) {
-				?>
+            if (!$feed_url) {
+                ?>
 				<form method="post">
 					<input type="hidden" name="op" value="subscribe">
 					<fieldset>
@@ -754,101 +754,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);
-
-						print "<option value=\"$url\">$name</option>";
-					}
+            } 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 "</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>
@@ -857,11 +857,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'>
@@ -876,52 +876,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'>
 
@@ -935,10 +935,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>
@@ -950,109 +950,109 @@ 
 				</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>
@@ -1062,11 +1062,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; }
@@ -1093,139 +1093,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/feedenclosure.php

Indentation +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@
 <?php
 class FeedEnclosure {
-	public $link;
-	public $type;
-	public $length;
-	public $title;
-	public $height;
-	public $width;
+    public $link;
+    public $type;
+    public $length;
+    public $title;
+    public $height;
+    public $width;
 }
 

classes/feedparser.php

Indentation +224 added lines, -224 removed lines

@@ -1,233 +1,233 @@
 <?php
 class FeedParser {
-	private $doc;
-	private $error;
-	private $libxml_errors = array();
-	private $items;
-	private $link;
-	private $title;
-	private $type;
-	private $xpath;
-
-	const FEED_RDF = 0;
-	const FEED_RSS = 1;
-	const FEED_ATOM = 2;
-
-	public function __construct($data) {
-		libxml_use_internal_errors(true);
-		libxml_clear_errors();
-		$this->doc = new DOMDocument();
-		$this->doc->loadXML($data);
-
-		mb_substitute_character("none");
-
-		$error = libxml_get_last_error();
-
-		if ($error) {
-			foreach (libxml_get_errors() as $error) {
-				if ($error->level == LIBXML_ERR_FATAL) {
-					if(!isset($this->error)) //currently only the first error is reported
-						$this->error = $this->format_error($error);
-					$this->libxml_errors [] = $this->format_error($error);
-				}
-			}
-		}
-		libxml_clear_errors();
-
-		$this->items = array();
-	}
-
-	public function init() {
-		$xpath = new DOMXPath($this->doc);
-		$xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
-		$xpath->registerNamespace('atom03', 'http://purl.org/atom/ns#');
-		$xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/');
-		$xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
-		$xpath->registerNamespace('slash', 'http://purl.org/rss/1.0/modules/slash/');
-		$xpath->registerNamespace('dc', 'http://purl.org/dc/elements/1.1/');
-		$xpath->registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
-		$xpath->registerNamespace('thread', 'http://purl.org/syndication/thread/1.0');
-
-		$this->xpath = $xpath;
-
-		$root = $xpath->query("(//atom03:feed|//atom:feed|//channel|//rdf:rdf|//rdf:RDF)");
-
-		if ($root && $root->length > 0) {
-			$root = $root->item(0);
-
-			if ($root) {
-				switch (mb_strtolower($root->tagName)) {
-				case "rdf:rdf":
-					$this->type = $this::FEED_RDF;
-					break;
-				case "channel":
-					$this->type = $this::FEED_RSS;
-					break;
-				case "feed":
-				case "atom:feed":
-					$this->type = $this::FEED_ATOM;
-					break;
-				default:
-					if( !isset($this->error) ){
-						$this->error = "Unknown/unsupported feed type";
-					}
-					return;
-				}
-			}
-
-			switch ($this->type) {
-			case $this::FEED_ATOM:
-
-				$title = $xpath->query("//atom:feed/atom:title")->item(0);
-
-				if (!$title)
-					$title = $xpath->query("//atom03:feed/atom03:title")->item(0);
-
-
-				if ($title) {
-					$this->title = $title->nodeValue;
-				}
-
-				$link = $xpath->query("//atom:feed/atom:link[not(@rel)]")->item(0);
-
-				if (!$link)
-					$link = $xpath->query("//atom:feed/atom:link[@rel='alternate']")->item(0);
-
-				if (!$link)
-					$link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
-
-				if (!$link)
-					$link = $xpath->query("//atom03:feed/atom03:link[@rel='alternate']")->item(0);
-
-				if ($link && $link->hasAttributes()) {
-					$this->link = $link->getAttribute("href");
-				}
-
-				$articles = $xpath->query("//atom:entry");
-
-				if (!$articles || $articles->length == 0)
-					$articles = $xpath->query("//atom03:entry");
-
-				foreach ($articles as $article) {
-					array_push($this->items, new FeedItem_Atom($article, $this->doc, $this->xpath));
-				}
-
-				break;
-			case $this::FEED_RSS:
-				$title = $xpath->query("//channel/title")->item(0);
-
-				if ($title) {
-					$this->title = $title->nodeValue;
-				}
-
-				$link = $xpath->query("//channel/link")->item(0);
-
-				if ($link) {
-					if ($link->getAttribute("href"))
-						$this->link = $link->getAttribute("href");
-					else if ($link->nodeValue)
-						$this->link = $link->nodeValue;
-				}
-
-				$articles = $xpath->query("//channel/item");
-
-				foreach ($articles as $article) {
-					array_push($this->items, new FeedItem_RSS($article, $this->doc, $this->xpath));
-				}
-
-				break;
-			case $this::FEED_RDF:
-				$xpath->registerNamespace('rssfake', 'http://purl.org/rss/1.0/');
-
-				$title = $xpath->query("//rssfake:channel/rssfake:title")->item(0);
-
-				if ($title) {
-					$this->title = $title->nodeValue;
-				}
-
-				$link = $xpath->query("//rssfake:channel/rssfake:link")->item(0);
-
-				if ($link) {
-					$this->link = $link->nodeValue;
-				}
-
-				$articles = $xpath->query("//rssfake:item");
-
-				foreach ($articles as $article) {
-					array_push($this->items, new FeedItem_RSS($article, $this->doc, $this->xpath));
-				}
-
-				break;
-
-			}
-
-			if ($this->title) $this->title = trim($this->title);
-			if ($this->link) $this->link = trim($this->link);
+    private $doc;
+    private $error;
+    private $libxml_errors = array();
+    private $items;
+    private $link;
+    private $title;
+    private $type;
+    private $xpath;
+
+    const FEED_RDF = 0;
+    const FEED_RSS = 1;
+    const FEED_ATOM = 2;
+
+    public function __construct($data) {
+        libxml_use_internal_errors(true);
+        libxml_clear_errors();
+        $this->doc = new DOMDocument();
+        $this->doc->loadXML($data);
+
+        mb_substitute_character("none");
+
+        $error = libxml_get_last_error();
+
+        if ($error) {
+            foreach (libxml_get_errors() as $error) {
+                if ($error->level == LIBXML_ERR_FATAL) {
+                    if(!isset($this->error)) //currently only the first error is reported
+                        $this->error = $this->format_error($error);
+                    $this->libxml_errors [] = $this->format_error($error);
+                }
+            }
+        }
+        libxml_clear_errors();
+
+        $this->items = array();
+    }
+
+    public function init() {
+        $xpath = new DOMXPath($this->doc);
+        $xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+        $xpath->registerNamespace('atom03', 'http://purl.org/atom/ns#');
+        $xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/');
+        $xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+        $xpath->registerNamespace('slash', 'http://purl.org/rss/1.0/modules/slash/');
+        $xpath->registerNamespace('dc', 'http://purl.org/dc/elements/1.1/');
+        $xpath->registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
+        $xpath->registerNamespace('thread', 'http://purl.org/syndication/thread/1.0');
+
+        $this->xpath = $xpath;
+
+        $root = $xpath->query("(//atom03:feed|//atom:feed|//channel|//rdf:rdf|//rdf:RDF)");
+
+        if ($root && $root->length > 0) {
+            $root = $root->item(0);
+
+            if ($root) {
+                switch (mb_strtolower($root->tagName)) {
+                case "rdf:rdf":
+                    $this->type = $this::FEED_RDF;
+                    break;
+                case "channel":
+                    $this->type = $this::FEED_RSS;
+                    break;
+                case "feed":
+                case "atom:feed":
+                    $this->type = $this::FEED_ATOM;
+                    break;
+                default:
+                    if( !isset($this->error) ){
+                        $this->error = "Unknown/unsupported feed type";
+                    }
+                    return;
+                }
+            }
+
+            switch ($this->type) {
+            case $this::FEED_ATOM:
+
+                $title = $xpath->query("//atom:feed/atom:title")->item(0);
+
+                if (!$title)
+                    $title = $xpath->query("//atom03:feed/atom03:title")->item(0);
+
+
+                if ($title) {
+                    $this->title = $title->nodeValue;
+                }
+
+                $link = $xpath->query("//atom:feed/atom:link[not(@rel)]")->item(0);
+
+                if (!$link)
+                    $link = $xpath->query("//atom:feed/atom:link[@rel='alternate']")->item(0);
+
+                if (!$link)
+                    $link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
+
+                if (!$link)
+                    $link = $xpath->query("//atom03:feed/atom03:link[@rel='alternate']")->item(0);
+
+                if ($link && $link->hasAttributes()) {
+                    $this->link = $link->getAttribute("href");
+                }
+
+                $articles = $xpath->query("//atom:entry");
+
+                if (!$articles || $articles->length == 0)
+                    $articles = $xpath->query("//atom03:entry");
+
+                foreach ($articles as $article) {
+                    array_push($this->items, new FeedItem_Atom($article, $this->doc, $this->xpath));
+                }
+
+                break;
+            case $this::FEED_RSS:
+                $title = $xpath->query("//channel/title")->item(0);
+
+                if ($title) {
+                    $this->title = $title->nodeValue;
+                }
+
+                $link = $xpath->query("//channel/link")->item(0);
+
+                if ($link) {
+                    if ($link->getAttribute("href"))
+                        $this->link = $link->getAttribute("href");
+                    else if ($link->nodeValue)
+                        $this->link = $link->nodeValue;
+                }
+
+                $articles = $xpath->query("//channel/item");
+
+                foreach ($articles as $article) {
+                    array_push($this->items, new FeedItem_RSS($article, $this->doc, $this->xpath));
+                }
+
+                break;
+            case $this::FEED_RDF:
+                $xpath->registerNamespace('rssfake', 'http://purl.org/rss/1.0/');
+
+                $title = $xpath->query("//rssfake:channel/rssfake:title")->item(0);
+
+                if ($title) {
+                    $this->title = $title->nodeValue;
+                }
+
+                $link = $xpath->query("//rssfake:channel/rssfake:link")->item(0);
+
+                if ($link) {
+                    $this->link = $link->nodeValue;
+                }
+
+                $articles = $xpath->query("//rssfake:item");
+
+                foreach ($articles as $article) {
+                    array_push($this->items, new FeedItem_RSS($article, $this->doc, $this->xpath));
+                }
+
+                break;
+
+            }
+
+            if ($this->title) $this->title = trim($this->title);
+            if ($this->link) $this->link = trim($this->link);
 
-		} else {
-			if( !isset($this->error) ){
-				$this->error = "Unknown/unsupported feed type";
-			}
-			return;
-		}
-	}
+        } else {
+            if( !isset($this->error) ){
+                $this->error = "Unknown/unsupported feed type";
+            }
+            return;
+        }
+    }
 
-	public function format_error($error) {
-		if ($error) {
-			return sprintf("LibXML error %s at line %d (column %d): %s",
-				$error->code, $error->line, $error->column,
-				$error->message);
-		} else {
-			return "";
-		}
-	}
+    public function format_error($error) {
+        if ($error) {
+            return sprintf("LibXML error %s at line %d (column %d): %s",
+                $error->code, $error->line, $error->column,
+                $error->message);
+        } else {
+            return "";
+        }
+    }
 
-	// libxml may have invalid unicode data in error messages
-	public function error() {
-		return UConverter::transcode($this->error, 'UTF-8', 'UTF-8');
-	}
+    // libxml may have invalid unicode data in error messages
+    public function error() {
+        return UConverter::transcode($this->error, 'UTF-8', 'UTF-8');
+    }
 
-	// WARNING: may return invalid unicode data
-	public function errors() {
-		return $this->libxml_errors;
-	}
+    // WARNING: may return invalid unicode data
+    public function errors() {
+        return $this->libxml_errors;
+    }
 
-	public function get_link() {
-		return clean($this->link);
-	}
+    public function get_link() {
+        return clean($this->link);
+    }
 
-	public function get_title() {
-		return clean($this->title);
-	}
-
-	public function get_items() {
-		return $this->items;
-	}
-
-	public function get_links($rel) {
-		$rv = array();
-
-		switch ($this->type) {
-		case $this::FEED_ATOM:
-			$links = $this->xpath->query("//atom:feed/atom:link");
-
-			foreach ($links as $link) {
-				if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
-					array_push($rv, clean(trim($link->getAttribute('href'))));
-				}
-			}
-			break;
-		case $this::FEED_RSS:
-			$links = $this->xpath->query("//atom:link");
-
-			foreach ($links as $link) {
-				if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
-					array_push($rv, clean(trim($link->getAttribute('href'))));
-				}
-			}
-			break;
-		}
-
-		return $rv;
-	}
+    public function get_title() {
+        return clean($this->title);
+    }
+
+    public function get_items() {
+        return $this->items;
+    }
+
+    public function get_links($rel) {
+        $rv = array();
+
+        switch ($this->type) {
+        case $this::FEED_ATOM:
+            $links = $this->xpath->query("//atom:feed/atom:link");
+
+            foreach ($links as $link) {
+                if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
+                    array_push($rv, clean(trim($link->getAttribute('href'))));
+                }
+            }
+            break;
+        case $this::FEED_RSS:
+            $links = $this->xpath->query("//atom:link");
+
+            foreach ($links as $link) {
+                if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
+                    array_push($rv, clean(trim($link->getAttribute('href'))));
+                }
+            }
+            break;
+        }
+
+        return $rv;
+    }
 }

classes/iauthmodule.php

Indentation +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
 interface IAuthModule {
-	public function authenticate($login, $password); // + optional third parameter: $service
+    public function authenticate($login, $password); // + optional third parameter: $service
 }

classes/dbupdater.php

Indentation +78 added lines, -78 removed lines

@@ -2,83 +2,83 @@
 
 class DbUpdater {
 
-	private $pdo;
-	private $db_type;
-	private $need_version;
-
-	public function __construct($db_type, $need_version) {
-		$this->pdo = Db::pdo();
-		$this->db_type = $db_type;
-		$this->need_version = (int) $need_version;
-	}
-
-	public function getSchemaVersion() {
-		$row = $this->pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
-		return (int) $row['schema_version'];
-	}
-
-	public function isUpdateRequired() {
-		return $this->getSchemaVersion() < $this->need_version;
-	}
-
-	public function getSchemaLines($version) {
-		$filename = "schema/versions/".$this->db_type."/$version.sql";
-
-		if (file_exists($filename)) {
-			return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename)));
-		} else {
-			user_error("DB Updater: schema file for version $version is not found.");
-			return false;
-		}
-	}
-
-	public function performUpdateTo($version, $html_output = true) {
-		if ($this->getSchemaVersion() == $version - 1) {
-
-			$lines = $this->getSchemaLines($version);
-
-			if (is_array($lines)) {
-
-				$this->pdo->beginTransaction();
-
-				foreach ($lines as $line) {
-					if (strpos($line, "--") !== 0 && $line) {
-
-						if ($html_output)
-							print "<pre>$line</pre>";
-						else
-							Debug::log("> $line");
-
-						try {
-							$this->pdo->query($line); // PDO returns errors as exceptions now
-						} catch (PDOException $e) {
-							if ($html_output) {
-								print "<div class='text-error'>Error: " . $e->getMessage() . "</div>";
-							} else {
-								Debug::log("Error: " . $e->getMessage());
-							}
-
-							$this->pdo->rollBack();
-							return false;
-						}
-					}
-				}
-
-				$db_version = $this->getSchemaVersion();
-
-				if ($db_version == $version) {
-					$this->pdo->commit();
-					return true;
-				} else {
-					$this->pdo->rollBack();
-					return false;
-				}
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
+    private $pdo;
+    private $db_type;
+    private $need_version;
+
+    public function __construct($db_type, $need_version) {
+        $this->pdo = Db::pdo();
+        $this->db_type = $db_type;
+        $this->need_version = (int) $need_version;
+    }
+
+    public function getSchemaVersion() {
+        $row = $this->pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
+        return (int) $row['schema_version'];
+    }
+
+    public function isUpdateRequired() {
+        return $this->getSchemaVersion() < $this->need_version;
+    }
+
+    public function getSchemaLines($version) {
+        $filename = "schema/versions/".$this->db_type."/$version.sql";
+
+        if (file_exists($filename)) {
+            return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename)));
+        } else {
+            user_error("DB Updater: schema file for version $version is not found.");
+            return false;
+        }
+    }
+
+    public function performUpdateTo($version, $html_output = true) {
+        if ($this->getSchemaVersion() == $version - 1) {
+
+            $lines = $this->getSchemaLines($version);
+
+            if (is_array($lines)) {
+
+                $this->pdo->beginTransaction();
+
+                foreach ($lines as $line) {
+                    if (strpos($line, "--") !== 0 && $line) {
+
+                        if ($html_output)
+                            print "<pre>$line</pre>";
+                        else
+                            Debug::log("> $line");
+
+                        try {
+                            $this->pdo->query($line); // PDO returns errors as exceptions now
+                        } catch (PDOException $e) {
+                            if ($html_output) {
+                                print "<div class='text-error'>Error: " . $e->getMessage() . "</div>";
+                            } else {
+                                Debug::log("Error: " . $e->getMessage());
+                            }
+
+                            $this->pdo->rollBack();
+                            return false;
+                        }
+                    }
+                }
+
+                $db_version = $this->getSchemaVersion();
+
+                if ($db_version == $version) {
+                    $this->pdo->commit();
+                    return true;
+                } else {
+                    $this->pdo->rollBack();
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 
 }

classes/pluginhandler.php

Indentation +18 added lines, -18 removed lines

@@ -1,23 +1,23 @@
 <?php
 class PluginHandler extends Handler_Protected {
-	public function csrf_ignore($method) {
-		return true;
-	}
+    public function csrf_ignore($method) {
+        return true;
+    }
 
-	public function catchall($method) {
-		$plugin_name = clean($_REQUEST["plugin"]);
-		$plugin = PluginHost::getInstance()->get_plugin($plugin_name);
+    public function catchall($method) {
+        $plugin_name = clean($_REQUEST["plugin"]);
+        $plugin = PluginHost::getInstance()->get_plugin($plugin_name);
 
-		if ($plugin) {
-			if (method_exists($plugin, $method)) {
-				$plugin->$method();
-			} else {
-				user_error("PluginHandler: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
-				print error_json(13);
-			}
-		} else {
-			user_error("PluginHandler: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
-			print error_json(14);
-		}
-	}
+        if ($plugin) {
+            if (method_exists($plugin, $method)) {
+                $plugin->$method();
+            } else {
+                user_error("PluginHandler: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
+                print error_json(13);
+            }
+        } else {
+            user_error("PluginHandler: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
+            print error_json(14);
+        }
+    }
 }

classes/db.php

Indentation +82 added lines, -82 removed lines

@@ -2,115 +2,115 @@
 class Db
 {
 
-	/* @var Db $instance */
-	private static $instance;
+    /* @var Db $instance */
+    private static $instance;
 
-	/* @var IDb $adapter */
-	private $adapter;
+    /* @var IDb $adapter */
+    private $adapter;
 
-	private $link;
+    private $link;
 
-	/* @var PDO $pdo */
-	private $pdo;
+    /* @var PDO $pdo */
+    private $pdo;
 
-	private function __clone() {
-		//
-	}
+    private function __clone() {
+        //
+    }
 
-	private function legacy_connect() {
+    private function legacy_connect() {
 
-		user_error("Legacy connect requested to " . DB_TYPE, E_USER_NOTICE);
+        user_error("Legacy connect requested to " . DB_TYPE, E_USER_NOTICE);
 
-		$er = error_reporting(E_ALL);
+        $er = error_reporting(E_ALL);
 
-		switch (DB_TYPE) {
-			case "mysql":
-				$this->adapter = new Db_Mysqli();
-				break;
-			case "pgsql":
-				$this->adapter = new Db_Pgsql();
-				break;
-			default:
-				die("Unknown DB_TYPE: " . DB_TYPE);
-		}
+        switch (DB_TYPE) {
+            case "mysql":
+                $this->adapter = new Db_Mysqli();
+                break;
+            case "pgsql":
+                $this->adapter = new Db_Pgsql();
+                break;
+            default:
+                die("Unknown DB_TYPE: " . DB_TYPE);
+        }
 
-		if (!$this->adapter) {
-			print("Error initializing database adapter for " . DB_TYPE);
-			exit(100);
-		}
+        if (!$this->adapter) {
+            print("Error initializing database adapter for " . DB_TYPE);
+            exit(100);
+        }
 
-		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
+        $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
 
-		if (!$this->link) {
-			print("Error connecting through adapter: " . $this->adapter->last_error());
-			exit(101);
-		}
+        if (!$this->link) {
+            print("Error connecting through adapter: " . $this->adapter->last_error());
+            exit(101);
+        }
 
-		error_reporting($er);
-	}
+        error_reporting($er);
+    }
 
-	// this really shouldn't be used unless a separate PDO connection is needed
-	// normal usage is Db::pdo()->prepare(...) etc
-	public function pdo_connect() {
+    // this really shouldn't be used unless a separate PDO connection is needed
+    // normal usage is Db::pdo()->prepare(...) etc
+    public function pdo_connect() {
 
-		$db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : '';
-		$db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
+        $db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : '';
+        $db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
 
-		try {
-			$pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port,
-				DB_USER,
-				DB_PASS);
-		} catch (Exception $e) {
-			print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>";
-			exit(101);
-		}
+        try {
+            $pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port,
+                DB_USER,
+                DB_PASS);
+        } catch (Exception $e) {
+            print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>";
+            exit(101);
+        }
 
-		$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
-		if (DB_TYPE == "pgsql") {
+        if (DB_TYPE == "pgsql") {
 
-			$pdo->query("set client_encoding = 'UTF-8'");
-			$pdo->query("set datestyle = 'ISO, european'");
-			$pdo->query("set TIME ZONE 0");
-			$pdo->query("set cpu_tuple_cost = 0.5");
+            $pdo->query("set client_encoding = 'UTF-8'");
+            $pdo->query("set datestyle = 'ISO, european'");
+            $pdo->query("set TIME ZONE 0");
+            $pdo->query("set cpu_tuple_cost = 0.5");
 
-		} else if (DB_TYPE == "mysql") {
-			$pdo->query("SET time_zone = '+0:0'");
+        } else if (DB_TYPE == "mysql") {
+            $pdo->query("SET time_zone = '+0:0'");
 
-			if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-				$pdo->query("SET NAMES " . MYSQL_CHARSET);
-			}
-		}
+            if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                $pdo->query("SET NAMES " . MYSQL_CHARSET);
+            }
+        }
 
-		return $pdo;
-	}
+        return $pdo;
+    }
 
-	public static function instance() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function instance() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
-	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function get() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		if (!self::$instance->adapter) {
-			self::$instance->legacy_connect();
-		}
+        if (!self::$instance->adapter) {
+            self::$instance->legacy_connect();
+        }
 
-		return self::$instance->adapter;
-	}
+        return self::$instance->adapter;
+    }
 
-	public static function pdo() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function pdo() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		if (!self::$instance->pdo) {
-			self::$instance->pdo = self::$instance->pdo_connect();
-		}
+        if (!self::$instance->pdo) {
+            self::$instance->pdo = self::$instance->pdo_connect();
+        }
 
-		return self::$instance->pdo;
-	}
+        return self::$instance->pdo;
+    }
 }

classes/pref/labels.php

Indentation +180 added lines, -180 removed lines

@@ -1,286 +1,286 @@ 
 <?php
 class Pref_Labels extends Handler_Protected {
 
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("index", "getlabeltree", "edit");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("index", "getlabeltree", "edit");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public function edit() {
-		$label_id = clean($_REQUEST['id']);
+    public function edit() {
+        $label_id = clean($_REQUEST['id']);
 
-		$sth = $this->pdo->prepare("SELECT * FROM ttrss_labels2 WHERE
+        $sth = $this->pdo->prepare("SELECT * FROM ttrss_labels2 WHERE
 			id = ? AND owner_uid = ?");
-		$sth->execute([$label_id, $_SESSION['uid']]);
+        $sth->execute([$label_id, $_SESSION['uid']]);
 
-		if ($line = $sth->fetch()) {
+        if ($line = $sth->fetch()) {
 
-			print_hidden("id", "$label_id");
-			print_hidden("op", "pref-labels");
-			print_hidden("method", "save");
+            print_hidden("id", "$label_id");
+            print_hidden("op", "pref-labels");
+            print_hidden("method", "save");
 
-			print "<form onsubmit='return false;'>";
+            print "<form onsubmit='return false;'>";
 
-			print "<header>".__("Caption")."</header>";
+            print "<header>".__("Caption")."</header>";
 
-			print "<section>";
+            print "<section>";
 
-			$fg_color = $line['fg_color'];
-			$bg_color = $line['bg_color'] ? $line['bg_color'] : '#fff7d5';
+            $fg_color = $line['fg_color'];
+            $bg_color = $line['bg_color'] ? $line['bg_color'] : '#fff7d5';
 
-			print "<input style='font-size : 16px; color : $fg_color; background : $bg_color; transition : background 0.1s linear'
+            print "<input style='font-size : 16px; color : $fg_color; background : $bg_color; transition : background 0.1s linear'
 				id='labelEdit_caption' name='caption' dojoType='dijit.form.ValidationTextBox'
 				required='true' value=\"".htmlspecialchars($line['caption'])."\">";
 
-			print "</section>";
+            print "</section>";
 
-			print "<header>" . __("Colors") . "</header>";
-			print "<section>";
+            print "<header>" . __("Colors") . "</header>";
+            print "<section>";
 
-			print "<table>";
-			print "<tr><th style='text-align : left'>".__("Foreground:")."</th><th style='text-align : left'>".__("Background:")."</th></tr>";
-			print "<tr><td style='padding-right : 10px'>";
+            print "<table>";
+            print "<tr><th style='text-align : left'>".__("Foreground:")."</th><th style='text-align : left'>".__("Background:")."</th></tr>";
+            print "<tr><td style='padding-right : 10px'>";
 
-			print "<input dojoType='dijit.form.TextBox'
+            print "<input dojoType='dijit.form.TextBox'
 				style='display : none' id='labelEdit_fgColor'
 				name='fg_color' value='$fg_color'>";
-			print "<input dojoType='dijit.form.TextBox'
+            print "<input dojoType='dijit.form.TextBox'
 				style='display : none' id='labelEdit_bgColor'
 				name='bg_color' value='$bg_color'>";
 
-			print "<div dojoType='dijit.ColorPalette'>
+            print "<div dojoType='dijit.ColorPalette'>
 			<script type='dojo/method' event='onChange' args='fg_color'>
 				dijit.byId('labelEdit_fgColor').attr('value', fg_color);
 				dijit.byId('labelEdit_caption').domNode.setStyle({color: fg_color});
 			</script>
 			</div>";
 
-			print "</td><td>";
+            print "</td><td>";
 
-			print "<div dojoType='dijit.ColorPalette'>
+            print "<div dojoType='dijit.ColorPalette'>
 			<script type='dojo/method' event='onChange' args='bg_color'>
 				dijit.byId('labelEdit_bgColor').attr('value', bg_color);
 				dijit.byId('labelEdit_caption').domNode.setStyle({backgroundColor: bg_color});
 			</script>
 			</div>";
 
-			print "</td></tr></table>";
-			print "</section>";
+            print "</td></tr></table>";
+            print "</section>";
 
-			print "<footer>";
-			print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"dijit.byId('labelEditDlg').execute()\">".
-				__('Save')."</button>";
-			print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('labelEditDlg').hide()\">".
-				__('Cancel')."</button>";
-			print "</footer>";
+            print "<footer>";
+            print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"dijit.byId('labelEditDlg').execute()\">".
+                __('Save')."</button>";
+            print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('labelEditDlg').hide()\">".
+                __('Cancel')."</button>";
+            print "</footer>";
 
-			print "</form>";
-		}
-	}
+            print "</form>";
+        }
+    }
 
-	public function getlabeltree() {
-		$root = array();
-		$root['id'] = 'root';
-		$root['name'] = __('Labels');
-		$root['items'] = array();
+    public function getlabeltree() {
+        $root = array();
+        $root['id'] = 'root';
+        $root['name'] = __('Labels');
+        $root['items'] = array();
 
-		$sth = $this->pdo->prepare("SELECT *
+        $sth = $this->pdo->prepare("SELECT *
 			FROM ttrss_labels2
 			WHERE owner_uid = ?
 			ORDER BY caption");
-		$sth->execute([$_SESSION['uid']]);
-
-		while ($line = $sth->fetch()) {
-			$label = array();
-			$label['id'] = 'LABEL:' . $line['id'];
-			$label['bare_id'] = $line['id'];
-			$label['name'] = $line['caption'];
-			$label['fg_color'] = $line['fg_color'];
-			$label['bg_color'] = $line['bg_color'];
-			$label['type'] = 'label';
-			$label['checkbox'] = false;
-
-			array_push($root['items'], $label);
-		}
-
-		$fl = array();
-		$fl['identifier'] = 'id';
-		$fl['label'] = 'name';
-		$fl['items'] = array($root);
-
-		print json_encode($fl);
-		return;
-	}
-
-	public function colorset() {
-		$kind = clean($_REQUEST["kind"]);
-		$ids = explode(',', clean($_REQUEST["ids"]));
-		$color = clean($_REQUEST["color"]);
-		$fg = clean($_REQUEST["fg"]);
-		$bg = clean($_REQUEST["bg"]);
-
-		foreach ($ids as $id) {
-
-			if ($kind == "fg" || $kind == "bg") {
-				$sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
+        $sth->execute([$_SESSION['uid']]);
+
+        while ($line = $sth->fetch()) {
+            $label = array();
+            $label['id'] = 'LABEL:' . $line['id'];
+            $label['bare_id'] = $line['id'];
+            $label['name'] = $line['caption'];
+            $label['fg_color'] = $line['fg_color'];
+            $label['bg_color'] = $line['bg_color'];
+            $label['type'] = 'label';
+            $label['checkbox'] = false;
+
+            array_push($root['items'], $label);
+        }
+
+        $fl = array();
+        $fl['identifier'] = 'id';
+        $fl['label'] = 'name';
+        $fl['items'] = array($root);
+
+        print json_encode($fl);
+        return;
+    }
+
+    public function colorset() {
+        $kind = clean($_REQUEST["kind"]);
+        $ids = explode(',', clean($_REQUEST["ids"]));
+        $color = clean($_REQUEST["color"]);
+        $fg = clean($_REQUEST["fg"]);
+        $bg = clean($_REQUEST["bg"]);
+
+        foreach ($ids as $id) {
+
+            if ($kind == "fg" || $kind == "bg") {
+                $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
 					${kind}_color = ? WHERE id = ?
 					AND owner_uid = ?");
 
-				$sth->execute([$color, $id, $_SESSION['uid']]);
+                $sth->execute([$color, $id, $_SESSION['uid']]);
 
-			} else {
+            } else {
 
-				$sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
+                $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
 					fg_color = ?, bg_color = ? WHERE id = ?
 					AND owner_uid = ?");
 
-				$sth->execute([$fg, $bg, $id, $_SESSION['uid']]);
-			}
+                $sth->execute([$fg, $bg, $id, $_SESSION['uid']]);
+            }
 
-			/* Remove cached data */
+            /* Remove cached data */
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = ''
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = ''
 				WHERE owner_uid = ?");
-			$sth->execute([$_SESSION['uid']]);
-		}
-	}
+            $sth->execute([$_SESSION['uid']]);
+        }
+    }
 
-	public function colorreset() {
-		$ids = explode(',', clean($_REQUEST["ids"]));
+    public function colorreset() {
+        $ids = explode(',', clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
+        foreach ($ids as $id) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
 				fg_color = '', bg_color = '' WHERE id = ?
 				AND owner_uid = ?");
-			$sth->execute([$id, $_SESSION['uid']]);
+            $sth->execute([$id, $_SESSION['uid']]);
 
-			/* Remove cached data */
+            /* Remove cached data */
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = ''
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET label_cache = ''
 				WHERE owner_uid = ?");
-			$sth->execute([$_SESSION['uid']]);
-		}
-	}
+            $sth->execute([$_SESSION['uid']]);
+        }
+    }
 
-	public function save() {
+    public function save() {
 
-		$id = clean($_REQUEST["id"]);
-		$caption = trim(clean($_REQUEST["caption"]));
+        $id = clean($_REQUEST["id"]);
+        $caption = trim(clean($_REQUEST["caption"]));
 
-		$this->pdo->beginTransaction();
+        $this->pdo->beginTransaction();
 
-		$sth = $this->pdo->prepare("SELECT caption FROM ttrss_labels2
+        $sth = $this->pdo->prepare("SELECT caption FROM ttrss_labels2
 			WHERE id = ? AND owner_uid = ?");
-		$sth->execute([$id, $_SESSION['uid']]);
+        $sth->execute([$id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$old_caption = $row["caption"];
+        if ($row = $sth->fetch()) {
+            $old_caption = $row["caption"];
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_labels2
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_labels2
 				WHERE caption = ? AND owner_uid = ?");
-			$sth->execute([$caption, $_SESSION['uid']]);
+            $sth->execute([$caption, $_SESSION['uid']]);
 
-			if (!$sth->fetch()) {
-				if ($caption) {
-					$sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
+            if (!$sth->fetch()) {
+                if ($caption) {
+                    $sth = $this->pdo->prepare("UPDATE ttrss_labels2 SET
 						caption = ? WHERE id = ? AND
 						owner_uid = ?");
-					$sth->execute([$caption, $id, $_SESSION['uid']]);
+                    $sth->execute([$caption, $id, $_SESSION['uid']]);
 
-					/* Update filters that reference label being renamed */
+                    /* Update filters that reference label being renamed */
 
-					$sth = $this->pdo->prepare("UPDATE ttrss_filters2_actions SET
+                    $sth = $this->pdo->prepare("UPDATE ttrss_filters2_actions SET
 						action_param = ? WHERE action_param = ?
 						AND action_id = 7
 						AND filter_id IN (SELECT id FROM ttrss_filters2 WHERE owner_uid = ?)");
 
-					$sth->execute([$caption, $old_caption, $_SESSION['uid']]);
+                    $sth->execute([$caption, $old_caption, $_SESSION['uid']]);
 
-					print clean($_REQUEST["value"]);
-				} else {
-					print $old_caption;
-				}
-			} else {
-				print $old_caption;
-			}
-		}
+                    print clean($_REQUEST["value"]);
+                } else {
+                    print $old_caption;
+                }
+            } else {
+                print $old_caption;
+            }
+        }
 
-		$this->pdo->commit();
+        $this->pdo->commit();
 
-	}
+    }
 
-	public function remove() {
+    public function remove() {
 
-		$ids = explode(",", clean($_REQUEST["ids"]));
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			Labels::remove($id, $_SESSION["uid"]);
-		}
+        foreach ($ids as $id) {
+            Labels::remove($id, $_SESSION["uid"]);
+        }
 
-	}
+    }
 
-	public function add() {
-		$caption = clean($_REQUEST["caption"]);
-		$output = clean($_REQUEST["output"]);
+    public function add() {
+        $caption = clean($_REQUEST["caption"]);
+        $output = clean($_REQUEST["output"]);
 
-		if ($caption) {
+        if ($caption) {
 
-			if (Labels::create($caption)) {
-				if (!$output) {
-					print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption));
-				}
-			}
+            if (Labels::create($caption)) {
+                if (!$output) {
+                    print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption));
+                }
+            }
 
-			if ($output == "select") {
-				header("Content-Type: text/xml");
+            if ($output == "select") {
+                header("Content-Type: text/xml");
 
-				print "<rpc-reply><payload>";
+                print "<rpc-reply><payload>";
 
-				print_label_select("select_label",
-					$caption, "");
+                print_label_select("select_label",
+                    $caption, "");
 
-				print "</payload></rpc-reply>";
-			}
-		}
+                print "</payload></rpc-reply>";
+            }
+        }
 
-		return;
-	}
+        return;
+    }
 
-	public function index() {
+    public function index() {
 
-		print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>";
-		print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
-		print "<div dojoType='fox.Toolbar'>";
+        print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>";
+        print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
+        print "<div dojoType='fox.Toolbar'>";
 
-		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\"
+        print "<div dojoType='fox.form.DropDownButton'>".
+                "<span>" . __('Select')."</span>";
+        print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+        print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-		print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(false)\"
+        print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(false)\"
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-		print "</div></div>";
+        print "</div></div>";
 
-		print"<button dojoType=\"dijit.form.Button\" onclick=\"CommonDialogs.addLabel()\">".
-			__('Create label')."</button dojoType=\"dijit.form.Button\"> ";
+        print"<button dojoType=\"dijit.form.Button\" onclick=\"CommonDialogs.addLabel()\">".
+            __('Create label')."</button dojoType=\"dijit.form.Button\"> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').removeSelected()\">".
-			__('Remove')."</button dojoType=\"dijit.form.Button\"> ";
+        print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').removeSelected()\">".
+            __('Remove')."</button dojoType=\"dijit.form.Button\"> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').resetColors()\">".
-			__('Clear colors')."</button dojoType=\"dijit.form.Button\">";
+        print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').resetColors()\">".
+            __('Clear colors')."</button dojoType=\"dijit.form.Button\">";
 
 
-		print "</div>"; #toolbar
-		print "</div>"; #pane
-		print "<div style='padding : 0px' dojoType=\"dijit.layout.ContentPane\" region=\"center\">";
+        print "</div>"; #toolbar
+        print "</div>"; #pane
+        print "<div style='padding : 0px' dojoType=\"dijit.layout.ContentPane\" region=\"center\">";
 
-		print "<div id=\"labellistLoading\">
+        print "<div id=\"labellistLoading\">
 		<img src='images/indicator_tiny.gif'>".
-		 __("Loading, please wait...")."</div>";
+            __("Loading, please wait...")."</div>";
 
-		print "<div dojoType=\"dojo.data.ItemFileWriteStore\" jsId=\"labelStore\"
+        print "<div dojoType=\"dojo.data.ItemFileWriteStore\" jsId=\"labelStore\"
 			url=\"backend.php?op=pref-labels&method=getlabeltree\">
 		</div>
 		<div dojoType=\"lib.CheckBoxStoreModel\" jsId=\"labelModel\" store=\"labelStore\"
@@ -302,12 +302,12 @@ 
 		</script>
 		</div>";
 
-		print "</div>"; #pane
+        print "</div>"; #pane
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-			"hook_prefs_tab", "prefLabels");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+            "hook_prefs_tab", "prefLabels");
 
-		print "</div>"; #container
+        print "</div>"; #container
 
-	}
+    }
 }