codysnider / tt-rss

classes/mailer.php

Indentation +38 added lines, -38 removed lines

@@ -1,55 +1,55 @@
 <?php
 class Mailer {
-	// TODO: support HTML mail (i.e. MIME messages)
+    // TODO: support HTML mail (i.e. MIME messages)
 
-	private $last_error = "Unable to send mail: check local configuration.";
+    private $last_error = "Unable to send mail: check local configuration.";
 
-	public function mail($params) {
+    public function mail($params) {
 
-		$to_name = $params["to_name"];
-		$to_address = $params["to_address"];
-		$subject = $params["subject"];
-		$message = $params["message"];
-		$from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME;
-		$from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS;
+        $to_name = $params["to_name"];
+        $to_address = $params["to_address"];
+        $subject = $params["subject"];
+        $message = $params["message"];
+        $from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME;
+        $from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS;
 
-		$additional_headers = $params["headers"] ? $params["headers"] : [];
+        $additional_headers = $params["headers"] ? $params["headers"] : [];
 
-		$from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
-		$to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
+        $from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
+        $to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
 
-		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) {
-					Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
-		}
+        if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) {
+                    Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
+        }
 
-		// HOOK_SEND_MAIL plugin instructions:
-		// 1. return 1 or true if mail is handled
-		// 2. return -1 if there's been a fatal error and no further action is allowed
-		// 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function
-		// 4. set error message if needed via passed Mailer instance function set_error()
+        // HOOK_SEND_MAIL plugin instructions:
+        // 1. return 1 or true if mail is handled
+        // 2. return -1 if there's been a fatal error and no further action is allowed
+        // 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function
+        // 4. set error message if needed via passed Mailer instance function set_error()
 
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
-			$rc = $p->hook_send_mail($this, $params);
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
+            $rc = $p->hook_send_mail($this, $params);
 
-			if ($rc == 1) {
-							return $rc;
-			}
+            if ($rc == 1) {
+                            return $rc;
+            }
 
-			if ($rc == -1) {
-							return 0;
-			}
-		}
+            if ($rc == -1) {
+                            return 0;
+            }
+        }
 
-		$headers = ["From: $from_combined", "Content-Type: text/plain; charset=UTF-8"];
+        $headers = ["From: $from_combined", "Content-Type: text/plain; charset=UTF-8"];
 
-		return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
-	}
+        return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
+    }
 
-	public function set_error($message) {
-		$this->last_error = $message;
-	}
+    public function set_error($message) {
+        $this->last_error = $message;
+    }
 
-	public function error() {
-		return $this->last_error;
-	}
+    public function error() {
+        return $this->last_error;
+    }
 }

classes/dlg.php

Indentation +127 added lines, -127 removed lines

@@ -1,206 +1,206 @@
 <?php
 class Dlg extends Handler_Protected {
-	private $param;
+    private $param;
     private $params;
 
     function before($method) {
-		if (parent::before($method)) {
-			header("Content-Type: text/html"); # required for iframe
+        if (parent::before($method)) {
+            header("Content-Type: text/html"); # required for iframe
 
-			$this->param = $_REQUEST["param"];
-			return true;
-		}
-		return false;
-	}
+            $this->param = $_REQUEST["param"];
+            return true;
+        }
+        return false;
+    }
 
-	public function importOpml() {
-		print_notice("If you have imported labels and/or filters, you might need to reload preferences to see your new data.");
+    public function importOpml() {
+        print_notice("If you have imported labels and/or filters, you might need to reload preferences to see your new data.");
 
-		print "<div class='panel panel-scrollable'>";
+        print "<div class='panel panel-scrollable'>";
 
-		$opml = new Opml($_REQUEST);
+        $opml = new Opml($_REQUEST);
 
-		$opml->opml_import($_SESSION["uid"]);
+        $opml->opml_import($_SESSION["uid"]);
 
-		print "</div>";
+        print "</div>";
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button'
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('opmlImportDlg').execute()\">".
-			__('Close this window')."</button>";
-		print "</footer>";
+            __('Close this window')."</button>";
+        print "</footer>";
 
-		print "</div>";
+        print "</div>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function pubOPMLUrl() {
-		$url_path = Opml::opml_publish_url();
+    public function pubOPMLUrl() {
+        $url_path = Opml::opml_publish_url();
 
-		print "<header>".__("Your Public OPML URL is:")."</header>";
+        print "<header>".__("Your Public OPML URL is:")."</header>";
 
-		print "<section>";
+        print "<section>";
 
-		print "<div class='panel text-center'>";
-		print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>";
-		print "</div>";
+        print "<div class='panel text-center'>";
+        print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>";
+        print "</div>";
 
-		print "</section>";
+        print "</section>";
 
-		print "<footer class='text-center'>";
+        print "<footer class='text-center'>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return Helpers.OPML.changeKey()\">".
-			__('Generate new URL')."</button> ";
+        print "<button dojoType='dijit.form.Button' onclick=\"return Helpers.OPML.changeKey()\">".
+            __('Generate new URL')."</button> ";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
+        print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
+            __('Close this window')."</button>";
 
-		print "</footer>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function explainError() {
-		print "<div class=\"errorExplained\">";
+    public function explainError() {
+        print "<div class=\"errorExplained\">";
 
-		if ($this->param == 1) {
-			print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner.");
+        if ($this->param == 1) {
+            print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner.");
 
-			$stamp = (int) file_get_contents(LOCK_DIRECTORY."/update_daemon.stamp");
+            $stamp = (int) file_get_contents(LOCK_DIRECTORY."/update_daemon.stamp");
 
-			print "<p>".__("Last update:")." ".date("Y.m.d, G:i", $stamp);
+            print "<p>".__("Last update:")." ".date("Y.m.d, G:i", $stamp);
 
-		}
+        }
 
-		if ($this->param == 3) {
-			print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner.");
+        if ($this->param == 3) {
+            print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner.");
 
-			$stamp = (int) file_get_contents(LOCK_DIRECTORY."/update_daemon.stamp");
+            $stamp = (int) file_get_contents(LOCK_DIRECTORY."/update_daemon.stamp");
 
-			print "<p>".__("Last update:")." ".date("Y.m.d, G:i", $stamp);
+            print "<p>".__("Last update:")." ".date("Y.m.d, G:i", $stamp);
 
-		}
+        }
 
-		print "</div>";
+        print "</div>";
 
-		print "<footer class='text-center'>";
-		print "<button onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
-		print "</footer>";
+        print "<footer class='text-center'>";
+        print "<button onclick=\"return CommonDialogs.closeInfoBox()\">".
+            __('Close this window')."</button>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function printTagCloud() {
-		print "<div class='panel text-center'>";
+    public function printTagCloud() {
+        print "<div class='panel text-center'>";
 
-		// from here: http://www.roscripts.com/Create_tag_cloud-71.html
+        // from here: http://www.roscripts.com/Create_tag_cloud-71.html
 
-		$sth = $this->pdo->prepare("SELECT tag_name, COUNT(post_int_id) AS count
+        $sth = $this->pdo->prepare("SELECT tag_name, COUNT(post_int_id) AS count
 			FROM ttrss_tags WHERE owner_uid = ?
 			GROUP BY tag_name ORDER BY count DESC LIMIT 50");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		$tags = array();
+        $tags = array();
 
-		while ($line = $sth->fetch()) {
-			$tags[$line["tag_name"]] = $line["count"];
-		}
+        while ($line = $sth->fetch()) {
+            $tags[$line["tag_name"]] = $line["count"];
+        }
 
         if (count($tags) == 0) { return; }
 
-		ksort($tags);
+        ksort($tags);
 
-		$max_size = 32; // max font size in pixels
-		$min_size = 11; // min font size in pixels
+        $max_size = 32; // max font size in pixels
+        $min_size = 11; // min font size in pixels
 
-		// largest and smallest array values
-		$max_qty = max(array_values($tags));
-		$min_qty = min(array_values($tags));
+        // largest and smallest array values
+        $max_qty = max(array_values($tags));
+        $min_qty = min(array_values($tags));
 
-		// find the range of values
-		$spread = $max_qty - $min_qty;
-		if ($spread == 0) { // we don't want to divide by zero
-				$spread = 1;
-		}
+        // find the range of values
+        $spread = $max_qty - $min_qty;
+        if ($spread == 0) { // we don't want to divide by zero
+                $spread = 1;
+        }
 
-		// set the font-size increment
-		$step = ($max_size - $min_size) / ($spread);
+        // set the font-size increment
+        $step = ($max_size - $min_size) / ($spread);
 
-		// loop through the tag array
-		foreach ($tags as $key => $value) {
-			// calculate font-size
-			// find the $value in excess of $min_qty
-			// multiply by the font-size increment ($size)
-			// and add the $min_size set above
-			$size = round($min_size + (($value - $min_qty) * $step));
+        // loop through the tag array
+        foreach ($tags as $key => $value) {
+            // calculate font-size
+            // find the $value in excess of $min_qty
+            // multiply by the font-size increment ($size)
+            // and add the $min_size set above
+            $size = round($min_size + (($value - $min_qty) * $step));
 
-			$key_escaped = str_replace("'", "\\'", $key);
+            $key_escaped = str_replace("'", "\\'", $key);
 
-			echo "<a href=\"#\" onclick=\"Feeds.open({feed:'$key_escaped'}) \" style=\"font-size: ".
-				$size."px\" title=\"$value articles tagged with ".
-				$key.'">'.$key.'</a> ';
-		}
+            echo "<a href=\"#\" onclick=\"Feeds.open({feed:'$key_escaped'}) \" style=\"font-size: ".
+                $size."px\" title=\"$value articles tagged with ".
+                $key.'">'.$key.'</a> ';
+        }
 
 
 
-		print "</div>";
+        print "</div>";
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button'
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
-		print "</footer>";
+            __('Close this window')."</button>";
+        print "</footer>";
 
-	}
+    }
 
-	public function generatedFeed() {
+    public function generatedFeed() {
 
-		$this->params = explode(":", $this->param, 3);
-		$feed_id = $this->params[0];
-		$is_cat = (bool) $this->params[1];
+        $this->params = explode(":", $this->param, 3);
+        $feed_id = $this->params[0];
+        $is_cat = (bool) $this->params[1];
 
-		$key = Feeds::get_feed_access_key($feed_id, $is_cat);
+        $key = Feeds::get_feed_access_key($feed_id, $is_cat);
 
-		$url_path = htmlspecialchars($this->params[2])."&key=".$key;
+        $url_path = htmlspecialchars($this->params[2])."&key=".$key;
 
-		$feed_title = Feeds::getFeedTitle($feed_id, $is_cat);
+        $feed_title = Feeds::getFeedTitle($feed_id, $is_cat);
 
-		print "<header>".T_sprintf("%s can be accessed via the following secret URL:", $feed_title)."</header>";
+        print "<header>".T_sprintf("%s can be accessed via the following secret URL:", $feed_title)."</header>";
 
-		print "<section>";
-		print "<div class='panel text-center'>";
-		print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
-		print "</div>";
-		print "</section>";
+        print "<section>";
+        print "<div class='panel text-center'>";
+        print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
+        print "</div>";
+        print "</section>";
 
-		print "<footer>";
+        print "<footer>";
 
-		print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/GeneratedFeeds\")'>
+        print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/GeneratedFeeds\")'>
 			<i class='material-icons'>help</i> ".__("More info...")."</button>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.genUrlChangeKey('$feed_id', '$is_cat')\">".
-			__('Generate new URL')."</button> ";
+        print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.genUrlChangeKey('$feed_id', '$is_cat')\">".
+            __('Generate new URL')."</button> ";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
+        print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
+            __('Close this window')."</button>";
 
-		print "</footer>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function defaultPasswordWarning() {
+    public function defaultPasswordWarning() {
 
-    	print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
+        print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button' onclick=\"document.location.href = 'prefs.php'\">".
-			__('Open Preferences')."</button> ";
-		print "<button dojoType='dijit.form.Button'
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button' onclick=\"document.location.href = 'prefs.php'\">".
+            __('Open Preferences')."</button> ";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
-		print "</footeer>";
-	}
+            __('Close this window')."</button>";
+        print "</footeer>";
+    }
 }

classes/article.php

Indentation +565 added lines, -565 removed lines

@@ -1,641 +1,641 @@ 
 <?php
 class Article extends Handler_Protected {
 
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("redirect", "editarticletags");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("redirect", "editarticletags");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public function redirect() {
-		$id = clean($_REQUEST['id']);
+    public function redirect() {
+        $id = clean($_REQUEST['id']);
 
-		$sth = $this->pdo->prepare("SELECT link FROM ttrss_entries, ttrss_user_entries
+        $sth = $this->pdo->prepare("SELECT link FROM ttrss_entries, ttrss_user_entries
 						WHERE id = ? AND id = ref_id AND owner_uid = ?
 						LIMIT 1");
         $sth->execute([$id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$article_url = $row['link'];
-			$article_url = str_replace("\n", "", $article_url);
+        if ($row = $sth->fetch()) {
+            $article_url = $row['link'];
+            $article_url = str_replace("\n", "", $article_url);
 
-			header("Location: $article_url");
-			return;
+            header("Location: $article_url");
+            return;
 
-		} else {
-			print_error(__("Article not found."));
-		}
-	}
+        } else {
+            print_error(__("Article not found."));
+        }
+    }
 
-	public static function create_published_article($title, $url, $content, $labels_str,
-			$owner_uid) {
+    public static function create_published_article($title, $url, $content, $labels_str,
+            $owner_uid) {
 
-		$guid = 'SHA1:'.sha1("ttshared:".$url.$owner_uid); // include owner_uid to prevent global GUID clash
+        $guid = 'SHA1:'.sha1("ttshared:".$url.$owner_uid); // include owner_uid to prevent global GUID clash
 
-		if (!$content) {
-			$pluginhost = new PluginHost();
-			$pluginhost->load_all(PluginHost::KIND_ALL, $owner_uid);
-			$pluginhost->load_data();
+        if (!$content) {
+            $pluginhost = new PluginHost();
+            $pluginhost->load_all(PluginHost::KIND_ALL, $owner_uid);
+            $pluginhost->load_data();
 
-			foreach ($pluginhost->get_hooks(PluginHost::HOOK_GET_FULL_TEXT) as $p) {
-				$extracted_content = $p->hook_get_full_text($url);
+            foreach ($pluginhost->get_hooks(PluginHost::HOOK_GET_FULL_TEXT) as $p) {
+                $extracted_content = $p->hook_get_full_text($url);
 
-				if ($extracted_content) {
-					$content = $extracted_content;
-					break;
-				}
-			}
-		}
+                if ($extracted_content) {
+                    $content = $extracted_content;
+                    break;
+                }
+            }
+        }
 
-		$content_hash = sha1($content);
+        $content_hash = sha1($content);
 
-		if ($labels_str != "") {
-			$labels = explode(",", $labels_str);
-		} else {
-			$labels = array();
-		}
+        if ($labels_str != "") {
+            $labels = explode(",", $labels_str);
+        } else {
+            $labels = array();
+        }
 
-		$rc = false;
+        $rc = false;
 
-		if (!$title) {
-		    $title = $url;
-		}
-		if (!$title && !$url) {
-		    return false;
-		}
+        if (!$title) {
+            $title = $url;
+        }
+        if (!$title && !$url) {
+            return false;
+        }
 
-		if (filter_var($url, FILTER_VALIDATE_URL) === false) {
-		    return false;
-		}
+        if (filter_var($url, FILTER_VALIDATE_URL) === false) {
+            return false;
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$pdo->beginTransaction();
+        $pdo->beginTransaction();
 
-		// only check for our user data here, others might have shared this with different content etc
-		$sth = $pdo->prepare("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
+        // only check for our user data here, others might have shared this with different content etc
+        $sth = $pdo->prepare("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
 			guid = ? AND ref_id = id AND owner_uid = ? LIMIT 1");
-		$sth->execute([$guid, $owner_uid]);
+        $sth->execute([$guid, $owner_uid]);
 
-		if ($row = $sth->fetch()) {
-			$ref_id = $row['id'];
+        if ($row = $sth->fetch()) {
+            $ref_id = $row['id'];
 
-			$sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
+            $sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = ? AND owner_uid = ? LIMIT 1");
             $sth->execute([$ref_id, $owner_uid]);
 
-			if ($row = $sth->fetch()) {
-				$int_id = $row['int_id'];
+            if ($row = $sth->fetch()) {
+                $int_id = $row['int_id'];
 
-				$sth = $pdo->prepare("UPDATE ttrss_entries SET
+                $sth = $pdo->prepare("UPDATE ttrss_entries SET
 					content = ?, content_hash = ? WHERE id = ?");
-				$sth->execute([$content, $content_hash, $ref_id]);
+                $sth->execute([$content, $content_hash, $ref_id]);
 
-				if (DB_TYPE == "pgsql") {
-					$sth = $pdo->prepare("UPDATE ttrss_entries
+                if (DB_TYPE == "pgsql") {
+                    $sth = $pdo->prepare("UPDATE ttrss_entries
 					SET tsvector_combined = to_tsvector( :ts_content)
 					WHERE id = :id");
-					$params = [
-						":ts_content" => mb_substr(strip_tags($content), 0, 900000),
-						":id" => $ref_id];
-					$sth->execute($params);
-				}
+                    $params = [
+                        ":ts_content" => mb_substr(strip_tags($content), 0, 900000),
+                        ":id" => $ref_id];
+                    $sth->execute($params);
+                }
 
-				$sth = $pdo->prepare("UPDATE ttrss_user_entries SET published = true,
+                $sth = $pdo->prepare("UPDATE ttrss_user_entries SET published = true,
 						last_published = NOW() WHERE
 						int_id = ? AND owner_uid = ?");
-				$sth->execute([$int_id, $owner_uid]);
+                $sth->execute([$int_id, $owner_uid]);
 
-			} else {
+            } else {
 
-				$sth = $pdo->prepare("INSERT INTO ttrss_user_entries
+                $sth = $pdo->prepare("INSERT INTO ttrss_user_entries
 					(ref_id, uuid, feed_id, orig_feed_id, owner_uid, published, tag_cache, label_cache,
 						last_read, note, unread, last_published)
 					VALUES
 					(?, '', NULL, NULL, ?, true, '', '', NOW(), '', false, NOW())");
-				$sth->execute([$ref_id, $owner_uid]);
-			}
+                $sth->execute([$ref_id, $owner_uid]);
+            }
 
-			if (count($labels) != 0) {
-				foreach ($labels as $label) {
-					Labels::add_article($ref_id, trim($label), $owner_uid);
-				}
-			}
+            if (count($labels) != 0) {
+                foreach ($labels as $label) {
+                    Labels::add_article($ref_id, trim($label), $owner_uid);
+                }
+            }
 
-			$rc = true;
+            $rc = true;
 
-		} else {
-			$sth = $pdo->prepare("INSERT INTO ttrss_entries
+        } else {
+            $sth = $pdo->prepare("INSERT INTO ttrss_entries
 				(title, guid, link, updated, content, content_hash, date_entered, date_updated)
 				VALUES
 				(?, ?, ?, NOW(), ?, ?, NOW(), NOW())");
-			$sth->execute([$title, $guid, $url, $content, $content_hash]);
+            $sth->execute([$title, $guid, $url, $content, $content_hash]);
 
-			$sth = $pdo->prepare("SELECT id FROM ttrss_entries WHERE guid = ?");
-			$sth->execute([$guid]);
+            $sth = $pdo->prepare("SELECT id FROM ttrss_entries WHERE guid = ?");
+            $sth->execute([$guid]);
 
-			if ($row = $sth->fetch()) {
-				$ref_id = $row["id"];
-				if (DB_TYPE == "pgsql") {
-					$sth = $pdo->prepare("UPDATE ttrss_entries
+            if ($row = $sth->fetch()) {
+                $ref_id = $row["id"];
+                if (DB_TYPE == "pgsql") {
+                    $sth = $pdo->prepare("UPDATE ttrss_entries
 					SET tsvector_combined = to_tsvector( :ts_content)
 					WHERE id = :id");
-					$params = [
-						":ts_content" => mb_substr(strip_tags($content), 0, 900000),
-						":id" => $ref_id];
-					$sth->execute($params);
-				}
-				$sth = $pdo->prepare("INSERT INTO ttrss_user_entries
+                    $params = [
+                        ":ts_content" => mb_substr(strip_tags($content), 0, 900000),
+                        ":id" => $ref_id];
+                    $sth->execute($params);
+                }
+                $sth = $pdo->prepare("INSERT INTO ttrss_user_entries
 					(ref_id, uuid, feed_id, orig_feed_id, owner_uid, published, tag_cache, label_cache,
 						last_read, note, unread, last_published)
 					VALUES
 					(?, '', NULL, NULL, ?, true, '', '', NOW(), '', false, NOW())");
-				$sth->execute([$ref_id, $owner_uid]);
+                $sth->execute([$ref_id, $owner_uid]);
 
-				if (count($labels) != 0) {
-					foreach ($labels as $label) {
-						Labels::add_article($ref_id, trim($label), $owner_uid);
-					}
-				}
+                if (count($labels) != 0) {
+                    foreach ($labels as $label) {
+                        Labels::add_article($ref_id, trim($label), $owner_uid);
+                    }
+                }
 
-				$rc = true;
-			}
-		}
+                $rc = true;
+            }
+        }
 
-		$pdo->commit();
+        $pdo->commit();
 
-		return $rc;
-	}
+        return $rc;
+    }
 
-	public function editArticleTags() {
+    public function editArticleTags() {
 
-		$param = clean($_REQUEST['param']);
+        $param = clean($_REQUEST['param']);
 
-		$tags = Article::get_article_tags($param);
+        $tags = Article::get_article_tags($param);
 
-		$tags_str = join(", ", $tags);
+        $tags_str = join(", ", $tags);
 
-		print_hidden("id", "$param");
-		print_hidden("op", "article");
-		print_hidden("method", "setArticleTags");
+        print_hidden("id", "$param");
+        print_hidden("op", "article");
+        print_hidden("method", "setArticleTags");
 
-		print "<header class='horizontal'>".__("Tags for this article (separated by commas):")."</header>";
+        print "<header class='horizontal'>".__("Tags for this article (separated by commas):")."</header>";
 
-		print "<section>";
-		print "<textarea dojoType='dijit.form.SimpleTextarea' rows='4'
+        print "<section>";
+        print "<textarea dojoType='dijit.form.SimpleTextarea' rows='4'
 			style='height : 100px; font-size : 12px; width : 98%' id='tags_str'
 			name='tags_str'>$tags_str</textarea>
 		<div class='autocomplete' id='tags_choices'
 				style='display:none'></div>";
-		print "</section>";
+        print "</section>";
 
-		print "<footer>";
-		print "<button dojoType='dijit.form.Button'
+        print "<footer>";
+        print "<button dojoType='dijit.form.Button'
 			type='submit' class='alt-primary' onclick=\"dijit.byId('editTagsDlg').execute()\">".__('Save')."</button> ";
-		print "<button dojoType='dijit.form.Button'
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('editTagsDlg').hide()\">".__('Cancel')."</button>";
-		print "</footer>";
+        print "</footer>";
 
-	}
+    }
 
-	public function setScore() {
-		$ids = explode(",", clean($_REQUEST['id']));
-		$score = (int) clean($_REQUEST['score']);
+    public function setScore() {
+        $ids = explode(",", clean($_REQUEST['id']));
+        $score = (int) clean($_REQUEST['score']);
 
-		$ids_qmarks = arr_qmarks($ids);
+        $ids_qmarks = arr_qmarks($ids);
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 			score = ? WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
 
-		$sth->execute(array_merge([$score], $ids, [$_SESSION['uid']]));
+        $sth->execute(array_merge([$score], $ids, [$_SESSION['uid']]));
 
-		print json_encode(["id" => $ids, "score" => (int) $score]);
-	}
+        print json_encode(["id" => $ids, "score" => (int) $score]);
+    }
 
-	public function getScore() {
-		$id = clean($_REQUEST['id']);
+    public function getScore() {
+        $id = clean($_REQUEST['id']);
 
-		$sth = $this->pdo->prepare("SELECT score FROM ttrss_user_entries WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$id, $_SESSION['uid']]);
-		$row = $sth->fetch();
+        $sth = $this->pdo->prepare("SELECT score FROM ttrss_user_entries WHERE ref_id = ? AND owner_uid = ?");
+        $sth->execute([$id, $_SESSION['uid']]);
+        $row = $sth->fetch();
 
-		$score = $row['score'];
+        $score = $row['score'];
 
-		print json_encode(["id" => $id, "score" => (int) $score]);
-	}
+        print json_encode(["id" => $id, "score" => (int) $score]);
+    }
 
 
-	public function setArticleTags() {
+    public function setArticleTags() {
 
-		$id = clean($_REQUEST["id"]);
+        $id = clean($_REQUEST["id"]);
 
-		$tags_str = clean($_REQUEST["tags_str"]);
-		$tags = array_unique(trim_array(explode(",", $tags_str)));
+        $tags_str = clean($_REQUEST["tags_str"]);
+        $tags = array_unique(trim_array(explode(",", $tags_str)));
 
-		$this->pdo->beginTransaction();
+        $this->pdo->beginTransaction();
 
-		$sth = $this->pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
+        $sth = $this->pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = ? AND owner_uid = ? LIMIT 1");
-		$sth->execute([$id, $_SESSION['uid']]);
+        $sth->execute([$id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			$tags_to_cache = array();
+            $tags_to_cache = array();
 
-			$int_id = $row['int_id'];
+            $int_id = $row['int_id'];
 
-			$sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE
+            $sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE
 				post_int_id = ? AND owner_uid = ?");
-			$sth->execute([$int_id, $_SESSION['uid']]);
+            $sth->execute([$int_id, $_SESSION['uid']]);
 
-			$tags = FeedItem_Common::normalize_categories($tags);
+            $tags = FeedItem_Common::normalize_categories($tags);
 
-			foreach ($tags as $tag) {
-				if ($tag != '') {
-					$sth = $this->pdo->prepare("INSERT INTO ttrss_tags
+            foreach ($tags as $tag) {
+                if ($tag != '') {
+                    $sth = $this->pdo->prepare("INSERT INTO ttrss_tags
 								(post_int_id, owner_uid, tag_name)
 								VALUES (?, ?, ?)");
 
-					$sth->execute([$int_id, $_SESSION['uid'], $tag]);
-				}
+                    $sth->execute([$int_id, $_SESSION['uid'], $tag]);
+                }
 
-				array_push($tags_to_cache, $tag);
-			}
+                array_push($tags_to_cache, $tag);
+            }
 
-			/* update tag cache */
+            /* update tag cache */
 
-			$tags_str = join(",", $tags_to_cache);
+            $tags_str = join(",", $tags_to_cache);
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
 				SET tag_cache = ? WHERE ref_id = ? AND owner_uid = ?");
-			$sth->execute([$tags_str, $id, $_SESSION['uid']]);
-		}
+            $sth->execute([$tags_str, $id, $_SESSION['uid']]);
+        }
 
-		$this->pdo->commit();
+        $this->pdo->commit();
 
-		$tags = Article::get_article_tags($id);
-		$tags_str = $this->format_tags_string($tags);
-		$tags_str_full = join(", ", $tags);
+        $tags = Article::get_article_tags($id);
+        $tags_str = $this->format_tags_string($tags);
+        $tags_str_full = join(", ", $tags);
 
-		if (!$tags_str_full) {
-		    $tags_str_full = __("no tags");
-		}
+        if (!$tags_str_full) {
+            $tags_str_full = __("no tags");
+        }
 
-		print json_encode([
-			"id" => (int) $id,
-			"content" => $tags_str,
-			"content_full" => $tags_str_full
-		]);
-	}
+        print json_encode([
+            "id" => (int) $id,
+            "content" => $tags_str,
+            "content_full" => $tags_str_full
+        ]);
+    }
 
 
-	public function completeTags() {
-		$search = clean($_REQUEST["search"]);
+    public function completeTags() {
+        $search = clean($_REQUEST["search"]);
 
-		$sth = $this->pdo->prepare("SELECT DISTINCT tag_name FROM ttrss_tags
+        $sth = $this->pdo->prepare("SELECT DISTINCT tag_name FROM ttrss_tags
 				WHERE owner_uid = ? AND
 				tag_name LIKE ? ORDER BY tag_name
 				LIMIT 10");
 
-		$sth->execute([$_SESSION['uid'], "$search%"]);
+        $sth->execute([$_SESSION['uid'], "$search%"]);
 
-		print "<ul>";
-		while ($line = $sth->fetch()) {
-			print "<li>".$line["tag_name"]."</li>";
-		}
-		print "</ul>";
-	}
+        print "<ul>";
+        while ($line = $sth->fetch()) {
+            print "<li>".$line["tag_name"]."</li>";
+        }
+        print "</ul>";
+    }
 
-	public function assigntolabel() {
-		return $this->labelops(true);
-	}
+    public function assigntolabel() {
+        return $this->labelops(true);
+    }
 
-	public function removefromlabel() {
-		return $this->labelops(false);
-	}
+    public function removefromlabel() {
+        return $this->labelops(false);
+    }
 
-	private function labelops($assign) {
-		$reply = array();
+    private function labelops($assign) {
+        $reply = array();
 
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$label_id = clean($_REQUEST["lid"]);
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $label_id = clean($_REQUEST["lid"]);
 
-		$label = Labels::find_caption($label_id, $_SESSION["uid"]);
+        $label = Labels::find_caption($label_id, $_SESSION["uid"]);
 
-		$reply["info-for-headlines"] = array();
+        $reply["info-for-headlines"] = array();
 
-		if ($label) {
+        if ($label) {
 
-			foreach ($ids as $id) {
+            foreach ($ids as $id) {
 
-				if ($assign) {
-									Labels::add_article($id, $label, $_SESSION["uid"]);
-				} else {
-									Labels::remove_article($id, $label, $_SESSION["uid"]);
-				}
+                if ($assign) {
+                                    Labels::add_article($id, $label, $_SESSION["uid"]);
+                } else {
+                                    Labels::remove_article($id, $label, $_SESSION["uid"]);
+                }
 
-				$labels = $this->get_article_labels($id, $_SESSION["uid"]);
+                $labels = $this->get_article_labels($id, $_SESSION["uid"]);
 
-				array_push($reply["info-for-headlines"],
-				array("id" => $id, "labels" => $this->format_article_labels($labels)));
+                array_push($reply["info-for-headlines"],
+                array("id" => $id, "labels" => $this->format_article_labels($labels)));
 
-			}
-		}
+            }
+        }
 
-		$reply["message"] = "UPDATE_COUNTERS";
+        $reply["message"] = "UPDATE_COUNTERS";
 
-		print json_encode($reply);
-	}
+        print json_encode($reply);
+    }
 
-	public function getArticleFeed($id) {
-		$sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
+    public function getArticleFeed($id) {
+        $sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$id, $_SESSION['uid']]);
-
-		if ($row = $sth->fetch()) {
-			return $row["feed_id"];
-		} else {
-			return 0;
-		}
-	}
-
-	public static function format_article_enclosures($id, $always_display_enclosures,
-									   $article_content, $hide_images = false) {
-
-		$result = Article::get_article_enclosures($id);
-		$rv = '';
-
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ENCLOSURES) as $plugin) {
-			$retval = $plugin->hook_format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images);
-			if (is_array($retval)) {
-				$rv = $retval[0];
-				$result = $retval[1];
-			} else {
-				$rv = $retval;
-			}
-		}
-		unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below.
-
-		if ($rv === '' && !empty($result)) {
-			$entries_html = array();
-			$entries = array();
-			$entries_inline = array();
-
-			foreach ($result as $line) {
-
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ENCLOSURE_ENTRY) as $plugin) {
-					$line = $plugin->hook_enclosure_entry($line, $id);
-				}
-
-				$url = $line["content_url"];
-				$ctype = $line["content_type"];
-				$title = $line["title"];
-				$width = $line["width"];
-				$height = $line["height"];
-
-				if (!$ctype) {
-				    $ctype = __("unknown type");
-				}
-
-				//$filename = substr($url, strrpos($url, "/")+1);
-				$filename = basename($url);
-
-				$player = format_inline_player($url, $ctype);
-
-				if ($player) {
-				    array_push($entries_inline, $player);
-				}
+        $sth->execute([$id, $_SESSION['uid']]);
+
+        if ($row = $sth->fetch()) {
+            return $row["feed_id"];
+        } else {
+            return 0;
+        }
+    }
+
+    public static function format_article_enclosures($id, $always_display_enclosures,
+                                        $article_content, $hide_images = false) {
+
+        $result = Article::get_article_enclosures($id);
+        $rv = '';
+
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ENCLOSURES) as $plugin) {
+            $retval = $plugin->hook_format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images);
+            if (is_array($retval)) {
+                $rv = $retval[0];
+                $result = $retval[1];
+            } else {
+                $rv = $retval;
+            }
+        }
+        unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below.
+
+        if ($rv === '' && !empty($result)) {
+            $entries_html = array();
+            $entries = array();
+            $entries_inline = array();
+
+            foreach ($result as $line) {
+
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ENCLOSURE_ENTRY) as $plugin) {
+                    $line = $plugin->hook_enclosure_entry($line, $id);
+                }
+
+                $url = $line["content_url"];
+                $ctype = $line["content_type"];
+                $title = $line["title"];
+                $width = $line["width"];
+                $height = $line["height"];
+
+                if (!$ctype) {
+                    $ctype = __("unknown type");
+                }
+
+                //$filename = substr($url, strrpos($url, "/")+1);
+                $filename = basename($url);
+
+                $player = format_inline_player($url, $ctype);
+
+                if ($player) {
+                    array_push($entries_inline, $player);
+                }
 
 #				$entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\" rel=\"noopener noreferrer\">" .
 #					$filename . " (" . $ctype . ")" . "</a>";
 
-				$entry = "<div onclick=\"popupOpenUrl('".htmlspecialchars($url)."')\"
+                $entry = "<div onclick=\"popupOpenUrl('".htmlspecialchars($url)."')\"
 					dojoType=\"dijit.MenuItem\">$filename ($ctype)</div>";
 
-				array_push($entries_html, $entry);
+                array_push($entries_html, $entry);
 
-				$entry = array();
+                $entry = array();
 
-				$entry["type"] = $ctype;
-				$entry["filename"] = $filename;
-				$entry["url"] = $url;
-				$entry["title"] = $title;
-				$entry["width"] = $width;
-				$entry["height"] = $height;
+                $entry["type"] = $ctype;
+                $entry["filename"] = $filename;
+                $entry["url"] = $url;
+                $entry["title"] = $title;
+                $entry["width"] = $width;
+                $entry["height"] = $height;
 
-				array_push($entries, $entry);
-			}
+                array_push($entries, $entry);
+            }
 
-			if ($_SESSION['uid'] && !get_pref("STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
-				if ($always_display_enclosures ||
-					!preg_match("/<img/i", $article_content)) {
+            if ($_SESSION['uid'] && !get_pref("STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
+                if ($always_display_enclosures ||
+                    !preg_match("/<img/i", $article_content)) {
 
-					foreach ($entries as $entry) {
+                    foreach ($entries as $entry) {
 
-						foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ENCLOSURE) as $plugin) {
-													$retval = $plugin->hook_render_enclosure($entry, $hide_images);
-						}
+                        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ENCLOSURE) as $plugin) {
+                                                    $retval = $plugin->hook_render_enclosure($entry, $hide_images);
+                        }
 
 
-						if ($retval) {
-							$rv .= $retval;
-						} else {
+                        if ($retval) {
+                            $rv .= $retval;
+                        } else {
 
-							if (preg_match("/image/", $entry["type"])) {
+                            if (preg_match("/image/", $entry["type"])) {
 
-								if (!$hide_images) {
-									$encsize = '';
-									if ($entry['height'] > 0)
-										$encsize .= ' height="'.intval($entry['height']).'"';
-									if ($entry['width'] > 0)
-										$encsize .= ' width="'.intval($entry['width']).'"';
-									$rv .= "<p><img
+                                if (!$hide_images) {
+                                    $encsize = '';
+                                    if ($entry['height'] > 0)
+                                        $encsize .= ' height="'.intval($entry['height']).'"';
+                                    if ($entry['width'] > 0)
+                                        $encsize .= ' width="'.intval($entry['width']).'"';
+                                    $rv .= "<p><img
 										alt=\"".htmlspecialchars($entry["filename"])."\"
 										src=\"" .htmlspecialchars($entry["url"])."\"
 										" . $encsize." /></p>";
-								} else {
-									$rv .= "<p><a target=\"_blank\" rel=\"noopener noreferrer\"
+                                } else {
+                                    $rv .= "<p><a target=\"_blank\" rel=\"noopener noreferrer\"
 										href=\"".htmlspecialchars($entry["url"])."\"
 										>" .htmlspecialchars($entry["url"])."</a></p>";
-								}
-
-								if ($entry['title']) {
-									$rv .= "<div class=\"enclosure_title\">${entry['title']}</div>";
-								}
-							}
-						}
-					}
-				}
-			}
-
-			if (count($entries_inline) > 0) {
-				//$rv .= "<hr clear='both'/>";
-				foreach ($entries_inline as $entry) { $rv .= $entry; };
-				$rv .= "<br clear='both'/>";
-			}
-
-			$rv .= "<div class=\"attachments\" dojoType=\"fox.form.DropDownButton\">".
-				"<span>".__('Attachments')."</span>";
-
-			$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-
-			foreach ($entries as $entry) {
-				if ($entry["title"])
-					$title = " &mdash; ".truncate_string($entry["title"], 30);
-				else
-					$title = "";
-
-				if ($entry["filename"])
-					$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
-				else
-					$filename = "";
-
-				$rv .= "<div onclick='popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
+                                }
+
+                                if ($entry['title']) {
+                                    $rv .= "<div class=\"enclosure_title\">${entry['title']}</div>";
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (count($entries_inline) > 0) {
+                //$rv .= "<hr clear='both'/>";
+                foreach ($entries_inline as $entry) { $rv .= $entry; };
+                $rv .= "<br clear='both'/>";
+            }
+
+            $rv .= "<div class=\"attachments\" dojoType=\"fox.form.DropDownButton\">".
+                "<span>".__('Attachments')."</span>";
+
+            $rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+
+            foreach ($entries as $entry) {
+                if ($entry["title"])
+                    $title = " &mdash; ".truncate_string($entry["title"], 30);
+                else
+                    $title = "";
+
+                if ($entry["filename"])
+                    $filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
+                else
+                    $filename = "";
+
+                $rv .= "<div onclick='popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
 					dojoType=\"dijit.MenuItem\">".$filename.$title."</div>";
 
-			};
+            };
 
-			$rv .= "</div>";
-			$rv .= "</div>";
-		}
+            $rv .= "</div>";
+            $rv .= "</div>";
+        }
 
-		return $rv;
-	}
+        return $rv;
+    }
 
-	public static function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
+    public static function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
 
-		$a_id = $id;
+        $a_id = $id;
 
-		if (!$owner_uid) {
-		    $owner_uid = $_SESSION["uid"];
-		}
+        if (!$owner_uid) {
+            $owner_uid = $_SESSION["uid"];
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT DISTINCT tag_name,
+        $sth = $pdo->prepare("SELECT DISTINCT tag_name,
 			owner_uid as owner FROM	ttrss_tags
 			WHERE post_int_id = (SELECT int_id FROM ttrss_user_entries WHERE
 			ref_id = ? AND owner_uid = ? LIMIT 1) ORDER BY tag_name");
 
-		$tags = array();
+        $tags = array();
 
-		/* check cache first */
+        /* check cache first */
 
-		if ($tag_cache === false) {
-			$csth = $pdo->prepare("SELECT tag_cache FROM ttrss_user_entries
+        if ($tag_cache === false) {
+            $csth = $pdo->prepare("SELECT tag_cache FROM ttrss_user_entries
 				WHERE ref_id = ? AND owner_uid = ?");
-			$csth->execute([$id, $owner_uid]);
+            $csth->execute([$id, $owner_uid]);
 
-			if ($row = $csth->fetch()) {
-			    $tag_cache = $row["tag_cache"];
-			}
-		}
+            if ($row = $csth->fetch()) {
+                $tag_cache = $row["tag_cache"];
+            }
+        }
 
-		if ($tag_cache) {
-			$tags = explode(",", $tag_cache);
-		} else {
+        if ($tag_cache) {
+            $tags = explode(",", $tag_cache);
+        } else {
 
-			/* do it the hard way */
+            /* do it the hard way */
 
-			$sth->execute([$a_id, $owner_uid]);
+            $sth->execute([$a_id, $owner_uid]);
 
-			while ($tmp_line = $sth->fetch()) {
-				array_push($tags, $tmp_line["tag_name"]);
-			}
+            while ($tmp_line = $sth->fetch()) {
+                array_push($tags, $tmp_line["tag_name"]);
+            }
 
-			/* update the cache */
+            /* update the cache */
 
-			$tags_str = join(",", $tags);
+            $tags_str = join(",", $tags);
 
-			$sth = $pdo->prepare("UPDATE ttrss_user_entries
+            $sth = $pdo->prepare("UPDATE ttrss_user_entries
 				SET tag_cache = ? WHERE ref_id = ?
 				AND owner_uid = ?");
-			$sth->execute([$tags_str, $id, $owner_uid]);
-		}
+            $sth->execute([$tags_str, $id, $owner_uid]);
+        }
 
-		return $tags;
-	}
+        return $tags;
+    }
 
-	public static function format_tags_string($tags) {
-		if (!is_array($tags) || count($tags) == 0) {
-			return __("no tags");
-		} else {
-			$maxtags = min(5, count($tags));
-			$tags_str = "";
+    public static function format_tags_string($tags) {
+        if (!is_array($tags) || count($tags) == 0) {
+            return __("no tags");
+        } else {
+            $maxtags = min(5, count($tags));
+            $tags_str = "";
 
-			for ($i = 0; $i < $maxtags; $i++) {
-				$tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"Feeds.open({feed:'".$tags[$i]."'})\">".$tags[$i]."</a>, ";
-			}
+            for ($i = 0; $i < $maxtags; $i++) {
+                $tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"Feeds.open({feed:'".$tags[$i]."'})\">".$tags[$i]."</a>, ";
+            }
 
-			$tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str) - 2);
+            $tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str) - 2);
 
-			if (count($tags) > $maxtags) {
-							$tags_str .= ", &hellip;";
-			}
+            if (count($tags) > $maxtags) {
+                            $tags_str .= ", &hellip;";
+            }
 
-			return $tags_str;
-		}
-	}
+            return $tags_str;
+        }
+    }
 
-	public static function format_article_labels($labels) {
+    public static function format_article_labels($labels) {
 
-		if (!is_array($labels)) {
-		    return '';
-		}
+        if (!is_array($labels)) {
+            return '';
+        }
 
-		$labels_str = "";
+        $labels_str = "";
 
-		foreach ($labels as $l) {
-			$labels_str .= sprintf("<div class='label'
+        foreach ($labels as $l) {
+            $labels_str .= sprintf("<div class='label'
 				style='color : %s; background-color : %s'>%s</div>",
-				$l[2], $l[3], $l[1]);
-		}
+                $l[2], $l[3], $l[1]);
+        }
 
-		return $labels_str;
+        return $labels_str;
 
-	}
+    }
 
-	public static function format_article_note($id, $note, $allow_edit = true) {
+    public static function format_article_note($id, $note, $allow_edit = true) {
 
-		if ($allow_edit) {
-			$onclick = "onclick='Plugins.Note.edit($id)'";
-			$note_class = 'editable';
-		} else {
-			$onclick = '';
-			$note_class = '';
-		}
+        if ($allow_edit) {
+            $onclick = "onclick='Plugins.Note.edit($id)'";
+            $note_class = 'editable';
+        } else {
+            $onclick = '';
+            $note_class = '';
+        }
 
-		return "<div class='article-note $note_class'>
+        return "<div class='article-note $note_class'>
 			<i class='material-icons'>note</i>
 			<div $onclick class='body'>$note</div>
 			</div>";
-	}
+    }
 
-	public static function get_article_enclosures($id) {
+    public static function get_article_enclosures($id) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT * FROM ttrss_enclosures
+        $sth = $pdo->prepare("SELECT * FROM ttrss_enclosures
 			WHERE post_id = ? AND content_url != ''");
-		$sth->execute([$id]);
+        $sth->execute([$id]);
 
-		$rv = array();
+        $rv = array();
 
-		$cache = new DiskCache("images");
+        $cache = new DiskCache("images");
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			if ($cache->exists(sha1($line["content_url"]))) {
-				$line["content_url"] = $cache->getUrl(sha1($line["content_url"]));
-			}
+            if ($cache->exists(sha1($line["content_url"]))) {
+                $line["content_url"] = $cache->getUrl(sha1($line["content_url"]));
+            }
 
-			array_push($rv, $line);
-		}
+            array_push($rv, $line);
+        }
 
-		return $rv;
-	}
+        return $rv;
+    }
 
-	public static function purge_orphans() {
+    public static function purge_orphans() {
 
         // purge orphaned posts in main content table
 
@@ -655,180 +655,180 @@ 
         }
     }
 
-	public static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
+    public static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
 
-		if (!$owner_uid) {
-		    $owner_uid = $_SESSION["uid"];
-		}
+        if (!$owner_uid) {
+            $owner_uid = $_SESSION["uid"];
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$ids_qmarks = arr_qmarks($ids);
+        $ids_qmarks = arr_qmarks($ids);
 
-		if ($cmode == 1) {
-			$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
+        if ($cmode == 1) {
+            $sth = $pdo->prepare("UPDATE ttrss_user_entries SET
 				unread = true
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else if ($cmode == 2) {
-			$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
+        } else if ($cmode == 2) {
+            $sth = $pdo->prepare("UPDATE ttrss_user_entries SET
 				unread = NOT unread,last_read = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else {
-			$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
+        } else {
+            $sth = $pdo->prepare("UPDATE ttrss_user_entries SET
 				unread = false,last_read = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		}
+        }
 
-		$sth->execute(array_merge($ids, [$owner_uid]));
+        $sth->execute(array_merge($ids, [$owner_uid]));
 
-		/* update ccache */
+        /* update ccache */
 
-		$sth = $pdo->prepare("SELECT DISTINCT feed_id FROM ttrss_user_entries
+        $sth = $pdo->prepare("SELECT DISTINCT feed_id FROM ttrss_user_entries
 			WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		$sth->execute(array_merge($ids, [$owner_uid]));
+        $sth->execute(array_merge($ids, [$owner_uid]));
 
-		while ($line = $sth->fetch()) {
-			CCache::update($line["feed_id"], $owner_uid);
-		}
-	}
+        while ($line = $sth->fetch()) {
+            CCache::update($line["feed_id"], $owner_uid);
+        }
+    }
 
-	public static function getLastArticleId() {
-		$pdo = DB::pdo();
+    public static function getLastArticleId() {
+        $pdo = DB::pdo();
 
-		$sth = $pdo->prepare("SELECT ref_id AS id FROM ttrss_user_entries
+        $sth = $pdo->prepare("SELECT ref_id AS id FROM ttrss_user_entries
 			WHERE owner_uid = ? ORDER BY ref_id DESC LIMIT 1");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			return $row['id'];
-		} else {
-			return -1;
-		}
-	}
+        if ($row = $sth->fetch()) {
+            return $row['id'];
+        } else {
+            return -1;
+        }
+    }
 
-	public static function get_article_labels($id, $owner_uid = false) {
-		$rv = array();
+    public static function get_article_labels($id, $owner_uid = false) {
+        $rv = array();
 
-		if (!$owner_uid) {
-		    $owner_uid = $_SESSION["uid"];
-		}
+        if (!$owner_uid) {
+            $owner_uid = $_SESSION["uid"];
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT label_cache FROM
+        $sth = $pdo->prepare("SELECT label_cache FROM
 			ttrss_user_entries WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		if ($row = $sth->fetch()) {
-			$label_cache = $row["label_cache"];
+        if ($row = $sth->fetch()) {
+            $label_cache = $row["label_cache"];
 
-			if ($label_cache) {
-				$tmp = json_decode($label_cache, true);
+            if ($label_cache) {
+                $tmp = json_decode($label_cache, true);
 
-				if (!$tmp || $tmp["no-labels"] == 1) {
-									return $rv;
-				} else {
-									return $tmp;
-				}
-			}
-		}
+                if (!$tmp || $tmp["no-labels"] == 1) {
+                                    return $rv;
+                } else {
+                                    return $tmp;
+                }
+            }
+        }
 
-		$sth = $pdo->prepare("SELECT DISTINCT label_id,caption,fg_color,bg_color
+        $sth = $pdo->prepare("SELECT DISTINCT label_id,caption,fg_color,bg_color
 				FROM ttrss_labels2, ttrss_user_labels2
 			WHERE id = label_id
 				AND article_id = ?
 				AND owner_uid = ?
 			ORDER BY caption");
-		$sth->execute([$id, $owner_uid]);
-
-		while ($line = $sth->fetch()) {
-			$rk = array(Labels::label_to_feed_id($line["label_id"]),
-				$line["caption"], $line["fg_color"],
-				$line["bg_color"]);
-			array_push($rv, $rk);
-		}
-
-		if (count($rv) > 0) {
-					Labels::update_cache($owner_uid, $id, $rv);
-		} else {
-					Labels::update_cache($owner_uid, $id, array("no-labels" => 1));
-		}
-
-		return $rv;
-	}
-
-	public static function get_article_image($enclosures, $content, $site_url) {
-
-		$article_image = "";
-		$article_stream = "";
-
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_IMAGE) as $p) {
-			list ($article_image, $article_stream, $content) = $p->hook_article_image($enclosures, $content, $site_url);
-		}
-
-		if (!$article_image && !$article_stream) {
-			$tmpdoc = new DOMDocument();
-
-			if (@$tmpdoc->loadHTML('<?xml encoding="UTF-8">'.mb_substr($content, 0, 131070))) {
-				$tmpxpath = new DOMXPath($tmpdoc);
-				$elems = $tmpxpath->query('(//img[@src]|//video[@poster]|//iframe[contains(@src , "youtube.com/embed/")])');
-
-				foreach ($elems as $e) {
-					if ($e->nodeName == "iframe") {
-						$matches = [];
-						if (preg_match("/\/embed\/([\w-]+)/", $e->getAttribute("src"), $matches)) {
-							$article_image = "https://img.youtube.com/vi/".$matches[1]."/hqdefault.jpg";
-							$article_stream = "https://youtu.be/".$matches[1];
-							break;
-						}
-					} else if ($e->nodeName == "video") {
-						$article_image = $e->getAttribute("poster");
-
-						$src = $tmpxpath->query("//source[@src]", $e)->item(0);
-
-						if ($src) {
-							$article_stream = $src->getAttribute("src");
-						}
-
-						break;
-					} else if ($e->nodeName == 'img') {
-						if (mb_strpos($e->getAttribute("src"), "data:") !== 0) {
-							$article_image = $e->getAttribute("src");
-						}
-						break;
-					}
-				}
-			}
-
-			if (!$article_image) {
-							foreach ($enclosures as $enc) {
-					if (strpos($enc["content_type"], "image/") !== false) {
-						$article_image = $enc["content_url"];
-			}
-						break;
-					}
-				}
-
-			if ($article_image) {
-							$article_image = rewrite_relative_url($site_url, $article_image);
-			}
-
-			if ($article_stream) {
-							$article_stream = rewrite_relative_url($site_url, $article_stream);
-			}
-		}
-
-		$cache = new DiskCache("images");
-
-		if ($article_image && $cache->exists(sha1($article_image))) {
-					$article_image = $cache->getUrl(sha1($article_image));
-		}
-
-		if ($article_stream && $cache->exists(sha1($article_stream))) {
-					$article_stream = $cache->getUrl(sha1($article_stream));
-		}
-
-		return [$article_image, $article_stream];
-	}
+        $sth->execute([$id, $owner_uid]);
+
+        while ($line = $sth->fetch()) {
+            $rk = array(Labels::label_to_feed_id($line["label_id"]),
+                $line["caption"], $line["fg_color"],
+                $line["bg_color"]);
+            array_push($rv, $rk);
+        }
+
+        if (count($rv) > 0) {
+                    Labels::update_cache($owner_uid, $id, $rv);
+        } else {
+                    Labels::update_cache($owner_uid, $id, array("no-labels" => 1));
+        }
+
+        return $rv;
+    }
+
+    public static function get_article_image($enclosures, $content, $site_url) {
+
+        $article_image = "";
+        $article_stream = "";
+
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_IMAGE) as $p) {
+            list ($article_image, $article_stream, $content) = $p->hook_article_image($enclosures, $content, $site_url);
+        }
+
+        if (!$article_image && !$article_stream) {
+            $tmpdoc = new DOMDocument();
+
+            if (@$tmpdoc->loadHTML('<?xml encoding="UTF-8">'.mb_substr($content, 0, 131070))) {
+                $tmpxpath = new DOMXPath($tmpdoc);
+                $elems = $tmpxpath->query('(//img[@src]|//video[@poster]|//iframe[contains(@src , "youtube.com/embed/")])');
+
+                foreach ($elems as $e) {
+                    if ($e->nodeName == "iframe") {
+                        $matches = [];
+                        if (preg_match("/\/embed\/([\w-]+)/", $e->getAttribute("src"), $matches)) {
+                            $article_image = "https://img.youtube.com/vi/".$matches[1]."/hqdefault.jpg";
+                            $article_stream = "https://youtu.be/".$matches[1];
+                            break;
+                        }
+                    } else if ($e->nodeName == "video") {
+                        $article_image = $e->getAttribute("poster");
+
+                        $src = $tmpxpath->query("//source[@src]", $e)->item(0);
+
+                        if ($src) {
+                            $article_stream = $src->getAttribute("src");
+                        }
+
+                        break;
+                    } else if ($e->nodeName == 'img') {
+                        if (mb_strpos($e->getAttribute("src"), "data:") !== 0) {
+                            $article_image = $e->getAttribute("src");
+                        }
+                        break;
+                    }
+                }
+            }
+
+            if (!$article_image) {
+                            foreach ($enclosures as $enc) {
+                    if (strpos($enc["content_type"], "image/") !== false) {
+                        $article_image = $enc["content_url"];
+            }
+                        break;
+                    }
+                }
+
+            if ($article_image) {
+                            $article_image = rewrite_relative_url($site_url, $article_image);
+            }
+
+            if ($article_stream) {
+                            $article_stream = rewrite_relative_url($site_url, $article_stream);
+            }
+        }
+
+        $cache = new DiskCache("images");
+
+        if ($article_image && $cache->exists(sha1($article_image))) {
+                    $article_image = $cache->getUrl(sha1($article_image));
+        }
+
+        if ($article_stream && $cache->exists(sha1($article_stream))) {
+                    $article_stream = $cache->getUrl(sha1($article_stream));
+        }
+
+        return [$article_image, $article_stream];
+    }
 
 }

classes/auth/base.php

Indentation +34 added lines, -34 removed lines

@@ -1,50 +1,50 @@
 <?php
 class Auth_Base {
-	private $pdo;
+    private $pdo;
 
-	const AUTH_SERVICE_API = '_api';
+    const AUTH_SERVICE_API = '_api';
 
-	public function __construct() {
-		$this->pdo = Db::pdo();
-	}
+    public function __construct() {
+        $this->pdo = Db::pdo();
+    }
 
-	// Auto-creates specified user if allowed by system configuration
-	// Can be used instead of find_user_by_login() by external auth modules
-	public function auto_create_user($login, $password = false) {
-		if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
-			$user_id = $this->find_user_by_login($login);
+    // Auto-creates specified user if allowed by system configuration
+    // Can be used instead of find_user_by_login() by external auth modules
+    public function auto_create_user($login, $password = false) {
+        if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
+            $user_id = $this->find_user_by_login($login);
 
-			if (!$password) {
-			    $password = make_password();
-			}
+            if (!$password) {
+                $password = make_password();
+            }
 
-			if (!$user_id) {
-				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-				$pwd_hash = encrypt_password($password, $salt, true);
+            if (!$user_id) {
+                $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+                $pwd_hash = encrypt_password($password, $salt, true);
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_users
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_users
 						(login,access_level,last_login,created,pwd_hash,salt)
 						VALUES (?, 0, null, NOW(), ?,?)");
-				$sth->execute([$login, $pwd_hash, $salt]);
+                $sth->execute([$login, $pwd_hash, $salt]);
 
-				return $this->find_user_by_login($login);
+                return $this->find_user_by_login($login);
 
-			} else {
-				return $user_id;
-			}
-		}
+            } else {
+                return $user_id;
+            }
+        }
 
-		return $this->find_user_by_login($login);
-	}
+        return $this->find_user_by_login($login);
+    }
 
-	public function find_user_by_login($login) {
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
-		$sth->execute([$login]);
+    public function find_user_by_login($login) {
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
+        $sth->execute([$login]);
 
-		if ($row = $sth->fetch()) {
-			return $row["id"];
-		} else {
-			return false;
-		}
-	}
+        if ($row = $sth->fetch()) {
+            return $row["id"];
+        } else {
+            return false;
+        }
+    }
 }

classes/diskcache.php

Indentation +154 added lines, -154 removed lines

@@ -1,157 +1,157 @@
 <?php
 class DiskCache {
-	private $dir;
-
-	public function __construct($dir) {
-		$this->dir = CACHE_DIR."/".clean_filename($dir);
-	}
-
-	public function getDir() {
-		return $this->dir;
-	}
-
-	public function makeDir() {
-		if (!is_dir($this->dir)) {
-			return mkdir($this->dir);
-		}
-	}
-
-	public function isWritable($filename = "") {
-		if ($filename) {
-			if (file_exists($this->getFullPath($filename))) {
-							return is_writable($this->getFullPath($filename));
-			} else {
-							return is_writable($this->dir);
-			}
-		} else {
-			return is_writable($this->dir);
-		}
-	}
-
-	public function exists($filename) {
-		return file_exists($this->getFullPath($filename));
-	}
-
-	public function getSize($filename) {
-		if ($this->exists($filename)) {
-					return filesize($this->getFullPath($filename));
-		} else {
-					return -1;
-		}
-	}
-
-	public function getFullPath($filename) {
-		$filename = clean_filename($filename);
-
-		return $this->dir."/".$filename;
-	}
-
-	public function put($filename, $data) {
-		return file_put_contents($this->getFullPath($filename), $data);
-	}
-
-	public function touch($filename) {
-		return touch($this->getFullPath($filename));
-	}
-
-	public function get($filename) {
-		if ($this->exists($filename)) {
-					return file_get_contents($this->getFullPath($filename));
-		} else {
-					return null;
-		}
-	}
-
-	public function getMimeType($filename) {
-		if ($this->exists($filename)) {
-					return mime_content_type($this->getFullPath($filename));
-		} else {
-					return null;
-		}
-	}
-
-	public function send($filename) {
-		header("Content-Disposition: inline; filename=\"$filename\"");
-
-		return send_local_file($this->getFullPath($filename));
-	}
-
-	public function getUrl($filename) {
-		return get_self_url_prefix()."/public.php?op=cached_url&file=".basename($this->dir)."/".$filename;
-	}
-
-	// check for locally cached (media) URLs and rewrite to local versions
-	// this is called separately after sanitize() and plugin render article hooks to allow
-	// plugins work on original source URLs used before caching
-	static public function rewriteUrls($str)
-	{
-		$res = trim($str);
-		if (!$res) {
-		    return '';
-		}
-
-		$doc = new DOMDocument();
-		if ($doc->loadHTML('<?xml encoding="UTF-8">'.$res)) {
-			$xpath = new DOMXPath($doc);
-			$cache = new DiskCache("images");
-
-			$entries = $xpath->query('(//img[@src]|//picture/source[@src]|//video[@poster]|//video/source[@src]|//audio/source[@src])');
-
-			$need_saving = false;
-
-			foreach ($entries as $entry) {
-
-				if ($entry->hasAttribute('src') || $entry->hasAttribute('poster')) {
-
-					// should be already absolutized because this is called after sanitize()
-					$src = $entry->hasAttribute('poster') ? $entry->getAttribute('poster') : $entry->getAttribute('src');
-					$cached_filename = sha1($src);
-
-					if ($cache->exists($cached_filename)) {
-
-						$src = $cache->getUrl(sha1($src));
-
-						if ($entry->hasAttribute('poster')) {
-													$entry->setAttribute('poster', $src);
-						} else {
-							$entry->setAttribute('src', $src);
-							$entry->removeAttribute("srcset");
-						}
-
-						$need_saving = true;
-					}
-				}
-			}
-
-			if ($need_saving) {
-				$doc->removeChild($doc->firstChild); //remove doctype
-				$res = $doc->saveHTML();
-			}
-		}
-		return $res;
-	}
-
-	public static function expire() {
-		$dirs = array_filter(glob(CACHE_DIR."/*"), "is_dir");
-
-		foreach ($dirs as $cache_dir) {
-			$num_deleted = 0;
-
-			if (is_writable($cache_dir) && !file_exists("$cache_dir/.no-auto-expiry")) {
-				$files = glob("$cache_dir/*");
-
-				if ($files) {
-					foreach ($files as $file) {
-						if (time() - filemtime($file) > 86400 * CACHE_MAX_DAYS) {
-							unlink($file);
-
-							++$num_deleted;
-						}
-					}
-				}
-
-				Debug::log("expired $cache_dir: removed $num_deleted files.");
-			}
-		}
-	}
+    private $dir;
+
+    public function __construct($dir) {
+        $this->dir = CACHE_DIR."/".clean_filename($dir);
+    }
+
+    public function getDir() {
+        return $this->dir;
+    }
+
+    public function makeDir() {
+        if (!is_dir($this->dir)) {
+            return mkdir($this->dir);
+        }
+    }
+
+    public function isWritable($filename = "") {
+        if ($filename) {
+            if (file_exists($this->getFullPath($filename))) {
+                            return is_writable($this->getFullPath($filename));
+            } else {
+                            return is_writable($this->dir);
+            }
+        } else {
+            return is_writable($this->dir);
+        }
+    }
+
+    public function exists($filename) {
+        return file_exists($this->getFullPath($filename));
+    }
+
+    public function getSize($filename) {
+        if ($this->exists($filename)) {
+                    return filesize($this->getFullPath($filename));
+        } else {
+                    return -1;
+        }
+    }
+
+    public function getFullPath($filename) {
+        $filename = clean_filename($filename);
+
+        return $this->dir."/".$filename;
+    }
+
+    public function put($filename, $data) {
+        return file_put_contents($this->getFullPath($filename), $data);
+    }
+
+    public function touch($filename) {
+        return touch($this->getFullPath($filename));
+    }
+
+    public function get($filename) {
+        if ($this->exists($filename)) {
+                    return file_get_contents($this->getFullPath($filename));
+        } else {
+                    return null;
+        }
+    }
+
+    public function getMimeType($filename) {
+        if ($this->exists($filename)) {
+                    return mime_content_type($this->getFullPath($filename));
+        } else {
+                    return null;
+        }
+    }
+
+    public function send($filename) {
+        header("Content-Disposition: inline; filename=\"$filename\"");
+
+        return send_local_file($this->getFullPath($filename));
+    }
+
+    public function getUrl($filename) {
+        return get_self_url_prefix()."/public.php?op=cached_url&file=".basename($this->dir)."/".$filename;
+    }
+
+    // check for locally cached (media) URLs and rewrite to local versions
+    // this is called separately after sanitize() and plugin render article hooks to allow
+    // plugins work on original source URLs used before caching
+    static public function rewriteUrls($str)
+    {
+        $res = trim($str);
+        if (!$res) {
+            return '';
+        }
+
+        $doc = new DOMDocument();
+        if ($doc->loadHTML('<?xml encoding="UTF-8">'.$res)) {
+            $xpath = new DOMXPath($doc);
+            $cache = new DiskCache("images");
+
+            $entries = $xpath->query('(//img[@src]|//picture/source[@src]|//video[@poster]|//video/source[@src]|//audio/source[@src])');
+
+            $need_saving = false;
+
+            foreach ($entries as $entry) {
+
+                if ($entry->hasAttribute('src') || $entry->hasAttribute('poster')) {
+
+                    // should be already absolutized because this is called after sanitize()
+                    $src = $entry->hasAttribute('poster') ? $entry->getAttribute('poster') : $entry->getAttribute('src');
+                    $cached_filename = sha1($src);
+
+                    if ($cache->exists($cached_filename)) {
+
+                        $src = $cache->getUrl(sha1($src));
+
+                        if ($entry->hasAttribute('poster')) {
+                                                    $entry->setAttribute('poster', $src);
+                        } else {
+                            $entry->setAttribute('src', $src);
+                            $entry->removeAttribute("srcset");
+                        }
+
+                        $need_saving = true;
+                    }
+                }
+            }
+
+            if ($need_saving) {
+                $doc->removeChild($doc->firstChild); //remove doctype
+                $res = $doc->saveHTML();
+            }
+        }
+        return $res;
+    }
+
+    public static function expire() {
+        $dirs = array_filter(glob(CACHE_DIR."/*"), "is_dir");
+
+        foreach ($dirs as $cache_dir) {
+            $num_deleted = 0;
+
+            if (is_writable($cache_dir) && !file_exists("$cache_dir/.no-auto-expiry")) {
+                $files = glob("$cache_dir/*");
+
+                if ($files) {
+                    foreach ($files as $file) {
+                        if (time() - filemtime($file) > 86400 * CACHE_MAX_DAYS) {
+                            unlink($file);
+
+                            ++$num_deleted;
+                        }
+                    }
+                }
+
+                Debug::log("expired $cache_dir: removed $num_deleted files.");
+            }
+        }
+    }
 }

classes/opml.php

Indentation +430 added lines, -430 removed lines

@@ -1,28 +1,28 @@ 
 <?php
 class Opml extends Handler_Protected {
 
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("export", "import");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("export", "import");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public function export() {
-		$output_name = "tt-rss_".date("Y-m-d").".opml";
-		$include_settings = $_REQUEST["include_settings"] == "1";
-		$owner_uid = $_SESSION["uid"];
+    public function export() {
+        $output_name = "tt-rss_".date("Y-m-d").".opml";
+        $include_settings = $_REQUEST["include_settings"] == "1";
+        $owner_uid = $_SESSION["uid"];
 
-		$rc = $this->opml_export($output_name, $owner_uid, false, $include_settings);
+        $rc = $this->opml_export($output_name, $owner_uid, false, $include_settings);
 
-		return $rc;
-	}
+        return $rc;
+    }
 
-	public function import() {
-		$owner_uid = $_SESSION["uid"];
+    public function import() {
+        $owner_uid = $_SESSION["uid"];
 
-		header('Content-Type: text/html; charset=utf-8');
+        header('Content-Type: text/html; charset=utf-8');
 
-		print "<html>
+        print "<html>
 			<head>
 				".stylesheet_tag("css/default.css")."
 				<title>".__("OPML Utility")."</title>
@@ -31,184 +31,184 @@ 
 			<body class='claro ttrss_utility'>
 			<h1>".__('OPML Utility')."</h1><div class='content'>";
 
-		Feeds::add_feed_category("Imported feeds");
+        Feeds::add_feed_category("Imported feeds");
 
-		$this->opml_notice(__("Importing OPML..."));
+        $this->opml_notice(__("Importing OPML..."));
 
-		$this->opml_import($owner_uid);
+        $this->opml_import($owner_uid);
 
-		print "<br><form method=\"GET\" action=\"prefs.php\">
+        print "<br><form method=\"GET\" action=\"prefs.php\">
 			<input type=\"submit\" value=\"".__("Return to preferences")."\">
 			</form>";
 
-		print "</div></body></html>";
+        print "</div></body></html>";
 
 
-	}
+    }
 
-	// Export
+    // Export
 
-	private function opml_export_category($owner_uid, $cat_id, $hide_private_feeds = false, $include_settings = true) {
+    private function opml_export_category($owner_uid, $cat_id, $hide_private_feeds = false, $include_settings = true) {
 
-		$cat_id = (int) $cat_id;
+        $cat_id = (int) $cat_id;
 
-		if ($hide_private_feeds) {
-					$hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
-		} else {
-					$hide_qpart = "true";
-		}
+        if ($hide_private_feeds) {
+                    $hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
+        } else {
+                    $hide_qpart = "true";
+        }
 
-		$out = "";
+        $out = "";
 
-		$ttrss_specific_qpart = "";
+        $ttrss_specific_qpart = "";
 
-		if ($cat_id) {
-			$sth = $this->pdo->prepare("SELECT title,order_id
+        if ($cat_id) {
+            $sth = $this->pdo->prepare("SELECT title,order_id
 				FROM ttrss_feed_categories WHERE id = ?
 					AND owner_uid = ?");
-			$sth->execute([$cat_id, $owner_uid]);
-			$row = $sth->fetch();
-			$cat_title = htmlspecialchars($row['title']);
-
-			if ($include_settings) {
-				$order_id = (int) $row["order_id"];
-				$ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\"";
-			}
-		} else {
-			$cat_title = "";
-		}
-
-		if ($cat_title) {
-		    $out .= "<outline text=\"$cat_title\" $ttrss_specific_qpart>\n";
-		}
-
-		$sth = $this->pdo->prepare("SELECT id,title
+            $sth->execute([$cat_id, $owner_uid]);
+            $row = $sth->fetch();
+            $cat_title = htmlspecialchars($row['title']);
+
+            if ($include_settings) {
+                $order_id = (int) $row["order_id"];
+                $ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\"";
+            }
+        } else {
+            $cat_title = "";
+        }
+
+        if ($cat_title) {
+            $out .= "<outline text=\"$cat_title\" $ttrss_specific_qpart>\n";
+        }
+
+        $sth = $this->pdo->prepare("SELECT id,title
 			FROM ttrss_feed_categories WHERE
 				(parent_cat = :cat OR (:cat = 0 AND parent_cat IS NULL)) AND
 				owner_uid = :uid ORDER BY order_id, title");
 
-		$sth->execute([':cat' => $cat_id, ':uid' => $owner_uid]);
+        $sth->execute([':cat' => $cat_id, ':uid' => $owner_uid]);
 
-		while ($line = $sth->fetch()) {
-			$out .= $this->opml_export_category($owner_uid, $line["id"], $hide_private_feeds, $include_settings);
-		}
+        while ($line = $sth->fetch()) {
+            $out .= $this->opml_export_category($owner_uid, $line["id"], $hide_private_feeds, $include_settings);
+        }
 
-		$fsth = $this->pdo->prepare("select title, feed_url, site_url, update_interval, order_id
+        $fsth = $this->pdo->prepare("select title, feed_url, site_url, update_interval, order_id
 				FROM ttrss_feeds WHERE
 					(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL)) AND owner_uid = :uid AND $hide_qpart
 				ORDER BY order_id, title");
 
-		$fsth->execute([':cat' => $cat_id, ':uid' => $owner_uid]);
+        $fsth->execute([':cat' => $cat_id, ':uid' => $owner_uid]);
 
-		while ($fline = $fsth->fetch()) {
-			$title = htmlspecialchars($fline["title"]);
-			$url = htmlspecialchars($fline["feed_url"]);
-			$site_url = htmlspecialchars($fline["site_url"]);
+        while ($fline = $fsth->fetch()) {
+            $title = htmlspecialchars($fline["title"]);
+            $url = htmlspecialchars($fline["feed_url"]);
+            $site_url = htmlspecialchars($fline["site_url"]);
 
-			if ($include_settings) {
-				$update_interval = (int) $fline["update_interval"];
-				$order_id = (int) $fline["order_id"];
+            if ($include_settings) {
+                $update_interval = (int) $fline["update_interval"];
+                $order_id = (int) $fline["order_id"];
 
-				$ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\" ttrssUpdateInterval=\"$update_interval\"";
-			} else {
-				$ttrss_specific_qpart = "";
-			}
+                $ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\" ttrssUpdateInterval=\"$update_interval\"";
+            } else {
+                $ttrss_specific_qpart = "";
+            }
 
-			if ($site_url) {
-				$html_url_qpart = "htmlUrl=\"$site_url\"";
-			} else {
-				$html_url_qpart = "";
-			}
+            if ($site_url) {
+                $html_url_qpart = "htmlUrl=\"$site_url\"";
+            } else {
+                $html_url_qpart = "";
+            }
 
-			$out .= "<outline type=\"rss\" text=\"$title\" xmlUrl=\"$url\" $ttrss_specific_qpart $html_url_qpart/>\n";
-		}
+            $out .= "<outline type=\"rss\" text=\"$title\" xmlUrl=\"$url\" $ttrss_specific_qpart $html_url_qpart/>\n";
+        }
 
-		if ($cat_title) {
-		    $out .= "</outline>\n";
-		}
+        if ($cat_title) {
+            $out .= "</outline>\n";
+        }
 
-		return $out;
-	}
+        return $out;
+    }
 
-	public function opml_export($name, $owner_uid, $hide_private_feeds = false, $include_settings = true) {
-		if (!$owner_uid) {
-		    return;
-		}
+    public function opml_export($name, $owner_uid, $hide_private_feeds = false, $include_settings = true) {
+        if (!$owner_uid) {
+            return;
+        }
 
-		if (!isset($_REQUEST["debug"])) {
-			header("Content-type: application/xml+opml");
-			header("Content-Disposition: attachment; filename=".$name);
-		} else {
-			header("Content-type: text/xml");
-		}
+        if (!isset($_REQUEST["debug"])) {
+            header("Content-type: application/xml+opml");
+            header("Content-Disposition: attachment; filename=".$name);
+        } else {
+            header("Content-type: text/xml");
+        }
 
-		$out = "<?xml version=\"1.0\" encoding=\"utf-8\"?".">";
+        $out = "<?xml version=\"1.0\" encoding=\"utf-8\"?".">";
 
-		$out .= "<opml version=\"1.0\">";
-		$out .= "<head>
+        $out .= "<opml version=\"1.0\">";
+        $out .= "<head>
 			<dateCreated>" . date("r", time())."</dateCreated>
 			<title>Tiny Tiny RSS Feed Export</title>
 		</head>";
-		$out .= "<body>";
+        $out .= "<body>";
 
-		$out .= $this->opml_export_category($owner_uid, 0, $hide_private_feeds, $include_settings);
+        $out .= $this->opml_export_category($owner_uid, 0, $hide_private_feeds, $include_settings);
 
-		# export tt-rss settings
+        # export tt-rss settings
 
-		if ($include_settings) {
-			$out .= "<outline text=\"tt-rss-prefs\" schema-version=\"".SCHEMA_VERSION."\">";
+        if ($include_settings) {
+            $out .= "<outline text=\"tt-rss-prefs\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$sth = $this->pdo->prepare("SELECT pref_name, value FROM ttrss_user_prefs WHERE
+            $sth = $this->pdo->prepare("SELECT pref_name, value FROM ttrss_user_prefs WHERE
 			   profile IS NULL AND owner_uid = ? ORDER BY pref_name");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				$name = $line["pref_name"];
-				$value = htmlspecialchars($line["value"]);
+            while ($line = $sth->fetch()) {
+                $name = $line["pref_name"];
+                $value = htmlspecialchars($line["value"]);
 
-				$out .= "<outline pref-name=\"$name\" value=\"$value\"/>";
-			}
+                $out .= "<outline pref-name=\"$name\" value=\"$value\"/>";
+            }
 
-			$out .= "</outline>";
+            $out .= "</outline>";
 
-			$out .= "<outline text=\"tt-rss-labels\" schema-version=\"".SCHEMA_VERSION."\">";
+            $out .= "<outline text=\"tt-rss-labels\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$sth = $this->pdo->prepare("SELECT * FROM ttrss_labels2 WHERE
+            $sth = $this->pdo->prepare("SELECT * FROM ttrss_labels2 WHERE
 				owner_uid = ?");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				$name = htmlspecialchars($line['caption']);
-				$fg_color = htmlspecialchars($line['fg_color']);
-				$bg_color = htmlspecialchars($line['bg_color']);
+            while ($line = $sth->fetch()) {
+                $name = htmlspecialchars($line['caption']);
+                $fg_color = htmlspecialchars($line['fg_color']);
+                $bg_color = htmlspecialchars($line['bg_color']);
 
-				$out .= "<outline label-name=\"$name\" label-fg-color=\"$fg_color\" label-bg-color=\"$bg_color\"/>";
+                $out .= "<outline label-name=\"$name\" label-fg-color=\"$fg_color\" label-bg-color=\"$bg_color\"/>";
 
-			}
+            }
 
-			$out .= "</outline>";
+            $out .= "</outline>";
 
-			$out .= "<outline text=\"tt-rss-filters\" schema-version=\"".SCHEMA_VERSION."\">";
+            $out .= "<outline text=\"tt-rss-filters\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2
+            $sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2
 				WHERE owner_uid = ? ORDER BY id");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				$line["rules"] = array();
-				$line["actions"] = array();
+            while ($line = $sth->fetch()) {
+                $line["rules"] = array();
+                $line["actions"] = array();
 
-				$tmph = $this->pdo->prepare("SELECT * FROM ttrss_filters2_rules
+                $tmph = $this->pdo->prepare("SELECT * FROM ttrss_filters2_rules
 					WHERE filter_id = ?");
-				$tmph->execute([$line['id']]);
+                $tmph->execute([$line['id']]);
 
-				while ($tmp_line = $tmph->fetch(PDO::FETCH_ASSOC)) {
-					unset($tmp_line["id"]);
-					unset($tmp_line["filter_id"]);
+                while ($tmp_line = $tmph->fetch(PDO::FETCH_ASSOC)) {
+                    unset($tmp_line["id"]);
+                    unset($tmp_line["filter_id"]);
 
-					$cat_filter = $tmp_line["cat_filter"];
+                    $cat_filter = $tmp_line["cat_filter"];
 
-					if (!$tmp_line["match_on"]) {
+                    if (!$tmp_line["match_on"]) {
                         if ($cat_filter && $tmp_line["cat_id"] || $tmp_line["feed_id"]) {
                             $tmp_line["feed"] = Feeds::getFeedTitle(
                                 $cat_filter ? $tmp_line["cat_id"] : $tmp_line["feed_id"],
@@ -217,8 +217,8 @@ 
                             $tmp_line["feed"] = "";
                         }
                     } else {
-					    $match = [];
-					    foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
+                        $match = [];
+                        foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
 
                             if (strpos($feed_id, "CAT:") === 0) {
                                 $feed_id = (int) substr($feed_id, 4);
@@ -237,57 +237,57 @@ 
                         }
 
                         $tmp_line["match"] = $match;
-					    unset($tmp_line["match_on"]);
+                        unset($tmp_line["match_on"]);
                     }
 
-					unset($tmp_line["feed_id"]);
-					unset($tmp_line["cat_id"]);
+                    unset($tmp_line["feed_id"]);
+                    unset($tmp_line["cat_id"]);
 
-					array_push($line["rules"], $tmp_line);
-				}
+                    array_push($line["rules"], $tmp_line);
+                }
 
-				$tmph = $this->pdo->prepare("SELECT * FROM ttrss_filters2_actions
+                $tmph = $this->pdo->prepare("SELECT * FROM ttrss_filters2_actions
 					WHERE filter_id = ?");
-				$tmph->execute([$line['id']]);
+                $tmph->execute([$line['id']]);
 
-				while ($tmp_line = $tmph->fetch(PDO::FETCH_ASSOC)) {
-					unset($tmp_line["id"]);
-					unset($tmp_line["filter_id"]);
+                while ($tmp_line = $tmph->fetch(PDO::FETCH_ASSOC)) {
+                    unset($tmp_line["id"]);
+                    unset($tmp_line["filter_id"]);
 
-					array_push($line["actions"], $tmp_line);
-				}
+                    array_push($line["actions"], $tmp_line);
+                }
 
-				unset($line["id"]);
-				unset($line["owner_uid"]);
-				$filter = json_encode($line);
+                unset($line["id"]);
+                unset($line["owner_uid"]);
+                $filter = json_encode($line);
 
-				$out .= "<outline filter-type=\"2\"><![CDATA[$filter]]></outline>";
+                $out .= "<outline filter-type=\"2\"><![CDATA[$filter]]></outline>";
 
-			}
+            }
 
 
-			$out .= "</outline>";
-		}
+            $out .= "</outline>";
+        }
 
-		$out .= "</body></opml>";
+        $out .= "</body></opml>";
 
-		// Format output.
-		$doc = new DOMDocument();
-		$doc->formatOutput = true;
-		$doc->preserveWhiteSpace = false;
-		$doc->loadXML($out);
+        // Format output.
+        $doc = new DOMDocument();
+        $doc->formatOutput = true;
+        $doc->preserveWhiteSpace = false;
+        $doc->loadXML($out);
 
-		$xpath = new DOMXpath($doc);
-		$outlines = $xpath->query("//outline[@title]");
+        $xpath = new DOMXpath($doc);
+        $outlines = $xpath->query("//outline[@title]");
 
-		// cleanup empty categories
-		foreach ($outlines as $node) {
-			if ($node->getElementsByTagName('outline')->length == 0) {
-							$node->parentNode->removeChild($node);
-			}
-		}
+        // cleanup empty categories
+        foreach ($outlines as $node) {
+            if ($node->getElementsByTagName('outline')->length == 0) {
+                            $node->parentNode->removeChild($node);
+            }
+        }
 
-		$res = $doc->saveXML();
+        $res = $doc->saveXML();
 
 /*		// saveXML uses a two-space indent.  Change to tabs.
 		$res = preg_replace_callback('/^(?:  )+/mu',
@@ -296,140 +296,140 @@ 
 				'return str_repeat("\t", intval(strlen($matches[0])/2));'),
 			$res); */
 
-		print $res;
-	}
+        print $res;
+    }
 
-	// Import
+    // Import
 
-	private function opml_import_feed($node, $cat_id, $owner_uid) {
-		$attrs = $node->attributes;
+    private function opml_import_feed($node, $cat_id, $owner_uid) {
+        $attrs = $node->attributes;
 
-		$feed_title = mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250);
-		if (!$feed_title) {
-		    $feed_title = mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250);
-		}
+        $feed_title = mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250);
+        if (!$feed_title) {
+            $feed_title = mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250);
+        }
 
-		$feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
-		if (!$feed_url) {
-		    $feed_url = $attrs->getNamedItem('xmlURL')->nodeValue;
-		}
+        $feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
+        if (!$feed_url) {
+            $feed_url = $attrs->getNamedItem('xmlURL')->nodeValue;
+        }
 
-		$site_url = mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250);
+        $site_url = mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250);
 
-		if ($feed_url) {
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+        if ($feed_url) {
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 				feed_url = ? AND owner_uid = ?");
-			$sth->execute([$feed_url, $owner_uid]);
+            $sth->execute([$feed_url, $owner_uid]);
 
-			if (!$feed_title) {
-			    $feed_title = '[Unknown]';
-			}
+            if (!$feed_title) {
+                $feed_title = '[Unknown]';
+            }
 
-			if (!$sth->fetch()) {
-				#$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
-				$this->opml_notice(T_sprintf("Adding feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
+            if (!$sth->fetch()) {
+                #$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
+                $this->opml_notice(T_sprintf("Adding feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
 
-				if (!$cat_id) {
-				    $cat_id = null;
-				}
+                if (!$cat_id) {
+                    $cat_id = null;
+                }
 
-				$update_interval = (int) $attrs->getNamedItem('ttrssUpdateInterval')->nodeValue;
-				if (!$update_interval) {
-				    $update_interval = 0;
-				}
+                $update_interval = (int) $attrs->getNamedItem('ttrssUpdateInterval')->nodeValue;
+                if (!$update_interval) {
+                    $update_interval = 0;
+                }
 
-				$order_id = (int) $attrs->getNamedItem('ttrssSortOrder')->nodeValue;
-				if (!$order_id) {
-				    $order_id = 0;
-				}
+                $order_id = (int) $attrs->getNamedItem('ttrssSortOrder')->nodeValue;
+                if (!$order_id) {
+                    $order_id = 0;
+                }
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 					(title, feed_url, owner_uid, cat_id, site_url, order_id, update_interval) VALUES
 					(?, ?, ?, ?, ?, ?, ?)");
 
-				$sth->execute([$feed_title, $feed_url, $owner_uid, $cat_id, $site_url, $order_id, $update_interval]);
+                $sth->execute([$feed_title, $feed_url, $owner_uid, $cat_id, $site_url, $order_id, $update_interval]);
 
-			} else {
-				$this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
-			}
-		}
-	}
+            } else {
+                $this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
+            }
+        }
+    }
 
-	private function opml_import_label($node, $owner_uid) {
-		$attrs = $node->attributes;
-		$label_name = $attrs->getNamedItem('label-name')->nodeValue;
+    private function opml_import_label($node, $owner_uid) {
+        $attrs = $node->attributes;
+        $label_name = $attrs->getNamedItem('label-name')->nodeValue;
 
-		if ($label_name) {
-			$fg_color = $attrs->getNamedItem('label-fg-color')->nodeValue;
-			$bg_color = $attrs->getNamedItem('label-bg-color')->nodeValue;
+        if ($label_name) {
+            $fg_color = $attrs->getNamedItem('label-fg-color')->nodeValue;
+            $bg_color = $attrs->getNamedItem('label-bg-color')->nodeValue;
 
-			if (!Labels::find_id($label_name, $_SESSION['uid'])) {
-				$this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)));
-				Labels::create($label_name, $fg_color, $bg_color, $owner_uid);
-			} else {
-				$this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)));
-			}
-		}
-	}
+            if (!Labels::find_id($label_name, $_SESSION['uid'])) {
+                $this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)));
+                Labels::create($label_name, $fg_color, $bg_color, $owner_uid);
+            } else {
+                $this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)));
+            }
+        }
+    }
 
-	private function opml_import_preference($node) {
-		$attrs = $node->attributes;
-		$pref_name = $attrs->getNamedItem('pref-name')->nodeValue;
+    private function opml_import_preference($node) {
+        $attrs = $node->attributes;
+        $pref_name = $attrs->getNamedItem('pref-name')->nodeValue;
 
-		if ($pref_name) {
-			$pref_value = $attrs->getNamedItem('value')->nodeValue;
+        if ($pref_name) {
+            $pref_value = $attrs->getNamedItem('value')->nodeValue;
 
-			$this->opml_notice(T_sprintf("Setting preference key %s to %s",
-				$pref_name, $pref_value));
+            $this->opml_notice(T_sprintf("Setting preference key %s to %s",
+                $pref_name, $pref_value));
 
-			set_pref($pref_name, $pref_value);
-		}
-	}
+            set_pref($pref_name, $pref_value);
+        }
+    }
 
-	private function opml_import_filter($node) {
-		$attrs = $node->attributes;
+    private function opml_import_filter($node) {
+        $attrs = $node->attributes;
 
-		$filter_type = $attrs->getNamedItem('filter-type')->nodeValue;
+        $filter_type = $attrs->getNamedItem('filter-type')->nodeValue;
 
-		if ($filter_type == '2') {
-			$filter = json_decode($node->nodeValue, true);
+        if ($filter_type == '2') {
+            $filter = json_decode($node->nodeValue, true);
 
-			if ($filter) {
-				$match_any_rule = bool_to_sql_bool($filter["match_any_rule"]);
-				$enabled = bool_to_sql_bool($filter["enabled"]);
-				$inverse = bool_to_sql_bool($filter["inverse"]);
-				$title = $filter["title"];
+            if ($filter) {
+                $match_any_rule = bool_to_sql_bool($filter["match_any_rule"]);
+                $enabled = bool_to_sql_bool($filter["enabled"]);
+                $inverse = bool_to_sql_bool($filter["inverse"]);
+                $title = $filter["title"];
 
-				//print "F: $title, $inverse, $enabled, $match_any_rule";
+                //print "F: $title, $inverse, $enabled, $match_any_rule";
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_filters2 (match_any_rule,enabled,inverse,title,owner_uid)
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_filters2 (match_any_rule,enabled,inverse,title,owner_uid)
 					VALUES (?, ?, ?, ?, ?)");
 
-				$sth->execute([$match_any_rule, $enabled, $inverse, $title, $_SESSION['uid']]);
+                $sth->execute([$match_any_rule, $enabled, $inverse, $title, $_SESSION['uid']]);
 
-				$sth = $this->pdo->prepare("SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
+                $sth = $this->pdo->prepare("SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
 					owner_uid = ?");
-				$sth->execute([$_SESSION['uid']]);
+                $sth->execute([$_SESSION['uid']]);
 
-				$row = $sth->fetch();
-				$filter_id = $row['id'];
+                $row = $sth->fetch();
+                $filter_id = $row['id'];
 
-				if ($filter_id) {
-					$this->opml_notice(T_sprintf("Adding filter %s...", $title));
+                if ($filter_id) {
+                    $this->opml_notice(T_sprintf("Adding filter %s...", $title));
 
-					foreach ($filter["rules"] as $rule) {
-						$feed_id = null;
-						$cat_id = null;
+                    foreach ($filter["rules"] as $rule) {
+                        $feed_id = null;
+                        $cat_id = null;
 
-						if ($rule["match"]) {
+                        if ($rule["match"]) {
 
                             $match_on = [];
 
-						    foreach ($rule["match"] as $match) {
-						        list ($name, $is_cat, $is_id) = $match;
+                            foreach ($rule["match"] as $match) {
+                                list ($name, $is_cat, $is_id) = $match;
 
-						        if ($is_id) {
-						            array_push($match_on, ($is_cat ? "CAT:" : "").$name);
+                                if ($is_id) {
+                                    array_push($match_on, ($is_cat ? "CAT:" : "").$name);
                                 } else {
 
                                     if (!$is_cat) {
@@ -441,18 +441,18 @@ 
                                         if ($row = $tsth->fetch()) {
                                             $match_id = $row['id'];
 
-											array_push($match_on, $match_id);
+                                            array_push($match_on, $match_id);
                                         }
                                     } else {
                                         $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
                                     		WHERE title = ? AND owner_uid = ?");
-										$tsth->execute([$name, $_SESSION['uid']]);
+                                        $tsth->execute([$name, $_SESSION['uid']]);
 
-										if ($row = $tsth->fetch()) {
-											$match_id = $row['id'];
+                                        if ($row = $tsth->fetch()) {
+                                            $match_id = $row['id'];
 
-											array_push($match_on, "CAT:$match_id");
-										}
+                                            array_push($match_on, "CAT:$match_id");
+                                        }
                                     }
                                 }
                             }
@@ -480,14 +480,14 @@ 
                                     $feed_id = $row['id'];
                                 }
                             } else {
-								$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
+                                $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
                                     WHERE title = ? AND owner_uid = ?");
 
-								$tsth->execute([$rule['feed'], $_SESSION['uid']]);
+                                $tsth->execute([$rule['feed'], $_SESSION['uid']]);
 
-								if ($row = $tsth->fetch()) {
-									$feed_id = $row['id'];
-								}
+                                if ($row = $tsth->fetch()) {
+                                    $feed_id = $row['id'];
+                                }
                             }
 
                             $cat_filter = bool_to_sql_bool($rule["cat_filter"]);
@@ -501,180 +501,180 @@ 
                                 (?, ?, ?, ?, ?, ?, ?)");
                             $usth->execute([$feed_id, $cat_id, $filter_id, $filter_type, $reg_exp, $cat_filter, $inverse]);
                         }
-					}
+                    }
 
-					foreach ($filter["actions"] as $action) {
+                    foreach ($filter["actions"] as $action) {
 
-						$action_id = (int) $action["action_id"];
-						$action_param = $action["action_param"];
+                        $action_id = (int) $action["action_id"];
+                        $action_param = $action["action_param"];
 
-						$usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_actions
+                        $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_actions
 							(filter_id,action_id,action_param)
 							VALUES
 							(?, ?, ?)");
-						$usth->execute([$filter_id, $action_id, $action_param]);
-					}
-				}
-			}
-		}
-	}
-
-	private function opml_import_category($doc, $root_node, $owner_uid, $parent_id) {
-		$default_cat_id = (int) $this->get_feed_category('Imported feeds', false);
-
-		if ($root_node) {
-			$cat_title = mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250);
-
-			if (!$cat_title) {
-							$cat_title = mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250);
-			}
-
-			if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
-				$cat_id = $this->get_feed_category($cat_title, $parent_id);
-
-				if ($cat_id === false) {
-					$order_id = (int) $root_node->attributes->getNamedItem('ttrssSortOrder')->nodeValue;
-					if (!$order_id) {
-					    $order_id = 0;
-					}
-
-					Feeds::add_feed_category($cat_title, $parent_id, $order_id);
-					$cat_id = $this->get_feed_category($cat_title, $parent_id);
-				}
-
-			} else {
-				$cat_id = 0;
-			}
-
-			$outlines = $root_node->childNodes;
-
-		} else {
-			$xpath = new DOMXpath($doc);
-			$outlines = $xpath->query("//opml/body/outline");
-
-			$cat_id = 0;
-		}
-
-		#$this->opml_notice("[CAT] $cat_title id: $cat_id P_id: $parent_id");
-		$this->opml_notice(T_sprintf("Processing category: %s", $cat_title ? $cat_title : __("Uncategorized")));
-
-		foreach ($outlines as $node) {
-			if ($node->hasAttributes() && strtolower($node->tagName) == "outline") {
-				$attrs = $node->attributes;
-				$node_cat_title = $attrs->getNamedItem('text')->nodeValue;
-
-				if (!$node_cat_title) {
-									$node_cat_title = $attrs->getNamedItem('title')->nodeValue;
-				}
-
-				$node_feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
-
-				if ($node_cat_title && !$node_feed_url) {
-					$this->opml_import_category($doc, $node, $owner_uid, $cat_id);
-				} else {
-
-					if (!$cat_id) {
-						$dst_cat_id = $default_cat_id;
-					} else {
-						$dst_cat_id = $cat_id;
-					}
-
-					switch ($cat_title) {
-					case "tt-rss-prefs":
-						$this->opml_import_preference($node);
-						break;
-					case "tt-rss-labels":
-						$this->opml_import_label($node, $owner_uid);
-						break;
-					case "tt-rss-filters":
-						$this->opml_import_filter($node);
-						break;
-					default:
-						$this->opml_import_feed($node, $dst_cat_id, $owner_uid);
-					}
-				}
-			}
-		}
-	}
-
-	public function opml_import($owner_uid) {
-		if (!$owner_uid) {
-		    return;
-		}
-
-		$doc = false;
-
-		if ($_FILES['opml_file']['error'] != 0) {
-			print_error(T_sprintf("Upload failed with error code %d",
-				$_FILES['opml_file']['error']));
-			return;
-		}
-
-		if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR.'/upload', 'opml');
-
-			$result = move_uploaded_file($_FILES['opml_file']['tmp_name'],
-				$tmp_file);
-
-			if (!$result) {
-				print_error(__("Unable to move uploaded file."));
-				return;
-			}
-		} else {
-			print_error(__('Error: please upload OPML file.'));
-			return;
-		}
-
-		if (is_file($tmp_file)) {
-			$doc = new DOMDocument();
-			libxml_disable_entity_loader(false);
-			$doc->load($tmp_file);
-			libxml_disable_entity_loader(true);
-			unlink($tmp_file);
-		} else if (!$doc) {
-			print_error(__('Error: unable to find moved OPML file.'));
-			return;
-		}
-
-		if ($doc) {
-			$this->pdo->beginTransaction();
-			$this->opml_import_category($doc, false, $owner_uid, false);
-			$this->pdo->commit();
-		} else {
-			print_error(__('Error while parsing document.'));
-		}
-	}
-
-	private function opml_notice($msg) {
-		print "$msg<br/>";
-	}
-
-	public static function opml_publish_url() {
-
-		$url_path = get_self_url_prefix();
-		$url_path .= "/opml.php?op=publish&key=".
-			Feeds::get_feed_access_key('OPML:Publish', false, $_SESSION["uid"]);
-
-		return $url_path;
-	}
-
-	public function get_feed_category($feed_cat, $parent_cat_id = false) {
-
-		$parent_cat_id = (int) $parent_cat_id;
-
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
+                        $usth->execute([$filter_id, $action_id, $action_param]);
+                    }
+                }
+            }
+        }
+    }
+
+    private function opml_import_category($doc, $root_node, $owner_uid, $parent_id) {
+        $default_cat_id = (int) $this->get_feed_category('Imported feeds', false);
+
+        if ($root_node) {
+            $cat_title = mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250);
+
+            if (!$cat_title) {
+                            $cat_title = mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250);
+            }
+
+            if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
+                $cat_id = $this->get_feed_category($cat_title, $parent_id);
+
+                if ($cat_id === false) {
+                    $order_id = (int) $root_node->attributes->getNamedItem('ttrssSortOrder')->nodeValue;
+                    if (!$order_id) {
+                        $order_id = 0;
+                    }
+
+                    Feeds::add_feed_category($cat_title, $parent_id, $order_id);
+                    $cat_id = $this->get_feed_category($cat_title, $parent_id);
+                }
+
+            } else {
+                $cat_id = 0;
+            }
+
+            $outlines = $root_node->childNodes;
+
+        } else {
+            $xpath = new DOMXpath($doc);
+            $outlines = $xpath->query("//opml/body/outline");
+
+            $cat_id = 0;
+        }
+
+        #$this->opml_notice("[CAT] $cat_title id: $cat_id P_id: $parent_id");
+        $this->opml_notice(T_sprintf("Processing category: %s", $cat_title ? $cat_title : __("Uncategorized")));
+
+        foreach ($outlines as $node) {
+            if ($node->hasAttributes() && strtolower($node->tagName) == "outline") {
+                $attrs = $node->attributes;
+                $node_cat_title = $attrs->getNamedItem('text')->nodeValue;
+
+                if (!$node_cat_title) {
+                                    $node_cat_title = $attrs->getNamedItem('title')->nodeValue;
+                }
+
+                $node_feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
+
+                if ($node_cat_title && !$node_feed_url) {
+                    $this->opml_import_category($doc, $node, $owner_uid, $cat_id);
+                } else {
+
+                    if (!$cat_id) {
+                        $dst_cat_id = $default_cat_id;
+                    } else {
+                        $dst_cat_id = $cat_id;
+                    }
+
+                    switch ($cat_title) {
+                    case "tt-rss-prefs":
+                        $this->opml_import_preference($node);
+                        break;
+                    case "tt-rss-labels":
+                        $this->opml_import_label($node, $owner_uid);
+                        break;
+                    case "tt-rss-filters":
+                        $this->opml_import_filter($node);
+                        break;
+                    default:
+                        $this->opml_import_feed($node, $dst_cat_id, $owner_uid);
+                    }
+                }
+            }
+        }
+    }
+
+    public function opml_import($owner_uid) {
+        if (!$owner_uid) {
+            return;
+        }
+
+        $doc = false;
+
+        if ($_FILES['opml_file']['error'] != 0) {
+            print_error(T_sprintf("Upload failed with error code %d",
+                $_FILES['opml_file']['error']));
+            return;
+        }
+
+        if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) {
+            $tmp_file = tempnam(CACHE_DIR.'/upload', 'opml');
+
+            $result = move_uploaded_file($_FILES['opml_file']['tmp_name'],
+                $tmp_file);
+
+            if (!$result) {
+                print_error(__("Unable to move uploaded file."));
+                return;
+            }
+        } else {
+            print_error(__('Error: please upload OPML file.'));
+            return;
+        }
+
+        if (is_file($tmp_file)) {
+            $doc = new DOMDocument();
+            libxml_disable_entity_loader(false);
+            $doc->load($tmp_file);
+            libxml_disable_entity_loader(true);
+            unlink($tmp_file);
+        } else if (!$doc) {
+            print_error(__('Error: unable to find moved OPML file.'));
+            return;
+        }
+
+        if ($doc) {
+            $this->pdo->beginTransaction();
+            $this->opml_import_category($doc, false, $owner_uid, false);
+            $this->pdo->commit();
+        } else {
+            print_error(__('Error while parsing document.'));
+        }
+    }
+
+    private function opml_notice($msg) {
+        print "$msg<br/>";
+    }
+
+    public static function opml_publish_url() {
+
+        $url_path = get_self_url_prefix();
+        $url_path .= "/opml.php?op=publish&key=".
+            Feeds::get_feed_access_key('OPML:Publish', false, $_SESSION["uid"]);
+
+        return $url_path;
+    }
+
+    public function get_feed_category($feed_cat, $parent_cat_id = false) {
+
+        $parent_cat_id = (int) $parent_cat_id;
+
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
 			WHERE title = :title
 			AND (parent_cat = :parent OR (:parent = 0 AND parent_cat IS NULL))
 			AND owner_uid = :uid");
 
-		$sth->execute([':title' => $feed_cat, ':parent' => $parent_cat_id, ':uid' => $_SESSION['uid']]);
+        $sth->execute([':title' => $feed_cat, ':parent' => $parent_cat_id, ':uid' => $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			return $row['id'];
-		} else {
-			return false;
-		}
-	}
+        if ($row = $sth->fetch()) {
+            return $row['id'];
+        } else {
+            return false;
+        }
+    }
 
 
 }

classes/feedparser.php

Indentation +239 added lines, -239 removed lines

@@ -1,243 +1,243 @@
 <?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;
-		}
-	}
-
-	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');
-	}
-
-	// WARNING: may return invalid unicode data
-	public function errors() {
-		return $this->libxml_errors;
-	}
-
-	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;
-	}
+        } 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 "";
+        }
+    }
+
+    // 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;
+    }
+
+    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;
+    }
 }

classes/pref/feeds.php

Indentation +1167 added lines, -1167 removed lines

@@ -1,89 +1,89 @@ 
 <?php
 class Pref_Feeds extends Handler_Protected {
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("index", "getfeedtree", "add", "editcats", "editfeed",
-			"savefeedorder", "uploadicon", "feedswitherrors", "inactivefeeds",
-			"batchsubscribe");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("index", "getfeedtree", "add", "editcats", "editfeed",
+            "savefeedorder", "uploadicon", "feedswitherrors", "inactivefeeds",
+            "batchsubscribe");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public static function get_ts_languages() {
-		$rv = [];
+    public static function get_ts_languages() {
+        $rv = [];
 
-		if (DB_TYPE == "pgsql") {
-			$dbh = Db::pdo();
+        if (DB_TYPE == "pgsql") {
+            $dbh = Db::pdo();
 
-			$res = $dbh->query("SELECT cfgname FROM pg_ts_config");
+            $res = $dbh->query("SELECT cfgname FROM pg_ts_config");
 
-			while ($row = $res->fetch()) {
-				array_push($rv, ucfirst($row['cfgname']));
-			}
-		}
+            while ($row = $res->fetch()) {
+                array_push($rv, ucfirst($row['cfgname']));
+            }
+        }
 
-		return $rv;
-	}
+        return $rv;
+    }
 
-	public function batch_edit_cbox($elem, $label = false) {
-		print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\"
+    public function batch_edit_cbox($elem, $label = false) {
+        print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\"
 			onchange=\"dijit.byId('feedEditDlg').toggleField(this, '$elem', '$label')\">";
-	}
+    }
 
-	public function renamecat() {
-		$title = clean($_REQUEST['title']);
-		$id = clean($_REQUEST['id']);
+    public function renamecat() {
+        $title = clean($_REQUEST['title']);
+        $id = clean($_REQUEST['id']);
 
-		if ($title) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories SET
+        if ($title) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories SET
 				title = ? WHERE id = ? AND owner_uid = ?");
-			$sth->execute([$title, $id, $_SESSION['uid']]);
-		}
-	}
+            $sth->execute([$title, $id, $_SESSION['uid']]);
+        }
+    }
 
-	private function get_category_items($cat_id) {
+    private function get_category_items($cat_id) {
 
-		if (clean($_REQUEST['mode']) != 2) {
-					$search = $_SESSION["prefs_feed_search"];
-		} else {
-					$search = "";
-		}
+        if (clean($_REQUEST['mode']) != 2) {
+                    $search = $_SESSION["prefs_feed_search"];
+        } else {
+                    $search = "";
+        }
 
-		// first one is set by API
-		$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
-			(clean($_REQUEST['mode']) != 2 && !$search);
+        // first one is set by API
+        $show_empty_cats = clean($_REQUEST['force_show_empty']) ||
+            (clean($_REQUEST['mode']) != 2 && !$search);
 
-		$items = array();
+        $items = array();
 
-		$sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
+        $sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
 				WHERE owner_uid = ? AND parent_cat = ? ORDER BY order_id, title");
-		$sth->execute([$_SESSION['uid'], $cat_id]);
+        $sth->execute([$_SESSION['uid'], $cat_id]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$cat = array();
-			$cat['id'] = 'CAT:'.$line['id'];
-			$cat['bare_id'] = (int) $line['id'];
-			$cat['name'] = $line['title'];
-			$cat['items'] = array();
-			$cat['checkbox'] = false;
-			$cat['type'] = 'category';
-			$cat['unread'] = -1;
-			$cat['child_unread'] = -1;
-			$cat['auxcounter'] = -1;
-			$cat['parent_id'] = $cat_id;
+            $cat = array();
+            $cat['id'] = 'CAT:'.$line['id'];
+            $cat['bare_id'] = (int) $line['id'];
+            $cat['name'] = $line['title'];
+            $cat['items'] = array();
+            $cat['checkbox'] = false;
+            $cat['type'] = 'category';
+            $cat['unread'] = -1;
+            $cat['child_unread'] = -1;
+            $cat['auxcounter'] = -1;
+            $cat['parent_id'] = $cat_id;
 
-			$cat['items'] = $this->get_category_items($line['id']);
+            $cat['items'] = $this->get_category_items($line['id']);
 
-			$num_children = $this->calculate_children_count($cat);
-			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
+            $num_children = $this->calculate_children_count($cat);
+            $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
-			if ($num_children > 0 || $show_empty_cats) {
-							array_push($items, $cat);
-			}
+            if ($num_children > 0 || $show_empty_cats) {
+                            array_push($items, $cat);
+            }
 
-		}
+        }
 
-		$fsth = $this->pdo->prepare("SELECT id, title, last_error,
+        $fsth = $this->pdo->prepare("SELECT id, title, last_error,
 			".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 			FROM ttrss_feeds
 			WHERE cat_id = :cat AND
@@ -91,687 +91,687 @@ 
 			(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
 			ORDER BY order_id, title");
 
-		$fsth->execute([":cat" => $cat_id, ":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-		while ($feed_line = $fsth->fetch()) {
-			$feed = array();
-			$feed['id'] = 'FEED:'.$feed_line['id'];
-			$feed['bare_id'] = (int) $feed_line['id'];
-			$feed['auxcounter'] = -1;
-			$feed['name'] = $feed_line['title'];
-			$feed['checkbox'] = false;
-			$feed['unread'] = -1;
-			$feed['error'] = $feed_line['last_error'];
-			$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
-			$feed['param'] = make_local_datetime(
-				$feed_line['last_updated'], true);
-			$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
-
-			array_push($items, $feed);
-		}
-
-		return $items;
-	}
-
-	public function getfeedtree() {
-		print json_encode($this->makefeedtree());
-	}
-
-	public function makefeedtree() {
-
-		if (clean($_REQUEST['mode']) != 2) {
-					$search = $_SESSION["prefs_feed_search"];
-		} else {
-					$search = "";
-		}
-
-		$root = array();
-		$root['id'] = 'root';
-		$root['name'] = __('Feeds');
-		$root['items'] = array();
-		$root['type'] = 'category';
-
-		$enable_cats = get_pref('ENABLE_FEED_CATS');
-
-		if (clean($_REQUEST['mode']) == 2) {
-
-			if ($enable_cats) {
-				$cat = $this->feedlist_init_cat(-1);
-			} else {
-				$cat['items'] = array();
-			}
-
-			foreach (array(-4, -3, -1, -2, 0, -6) as $i) {
-				array_push($cat['items'], $this->feedlist_init_feed($i));
-			}
-
-			/* Plugin feeds for -1 */
-
-			$feeds = PluginHost::getInstance()->get_feeds(-1);
-
-			if ($feeds) {
-				foreach ($feeds as $feed) {
-					$feed_id = PluginHost::pfeed_to_feed_id($feed['id']);
-
-					$item = array();
-					$item['id'] = 'FEED:'.$feed_id;
-					$item['bare_id'] = (int) $feed_id;
-					$item['auxcounter'] = -1;
-					$item['name'] = $feed['title'];
-					$item['checkbox'] = false;
-					$item['error'] = '';
-					$item['icon'] = $feed['icon'];
-
-					$item['param'] = '';
-					$item['unread'] = -1;
-					$item['type'] = 'feed';
-
-					array_push($cat['items'], $item);
-				}
-			}
-
-			if ($enable_cats) {
-				array_push($root['items'], $cat);
-			} else {
-				$root['items'] = array_merge($root['items'], $cat['items']);
-			}
-
-			$sth = $this->pdo->prepare("SELECT * FROM
+        $fsth->execute([":cat" => $cat_id, ":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
+
+        while ($feed_line = $fsth->fetch()) {
+            $feed = array();
+            $feed['id'] = 'FEED:'.$feed_line['id'];
+            $feed['bare_id'] = (int) $feed_line['id'];
+            $feed['auxcounter'] = -1;
+            $feed['name'] = $feed_line['title'];
+            $feed['checkbox'] = false;
+            $feed['unread'] = -1;
+            $feed['error'] = $feed_line['last_error'];
+            $feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
+            $feed['param'] = make_local_datetime(
+                $feed_line['last_updated'], true);
+            $feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
+
+            array_push($items, $feed);
+        }
+
+        return $items;
+    }
+
+    public function getfeedtree() {
+        print json_encode($this->makefeedtree());
+    }
+
+    public function makefeedtree() {
+
+        if (clean($_REQUEST['mode']) != 2) {
+                    $search = $_SESSION["prefs_feed_search"];
+        } else {
+                    $search = "";
+        }
+
+        $root = array();
+        $root['id'] = 'root';
+        $root['name'] = __('Feeds');
+        $root['items'] = array();
+        $root['type'] = 'category';
+
+        $enable_cats = get_pref('ENABLE_FEED_CATS');
+
+        if (clean($_REQUEST['mode']) == 2) {
+
+            if ($enable_cats) {
+                $cat = $this->feedlist_init_cat(-1);
+            } else {
+                $cat['items'] = array();
+            }
+
+            foreach (array(-4, -3, -1, -2, 0, -6) as $i) {
+                array_push($cat['items'], $this->feedlist_init_feed($i));
+            }
+
+            /* Plugin feeds for -1 */
+
+            $feeds = PluginHost::getInstance()->get_feeds(-1);
+
+            if ($feeds) {
+                foreach ($feeds as $feed) {
+                    $feed_id = PluginHost::pfeed_to_feed_id($feed['id']);
+
+                    $item = array();
+                    $item['id'] = 'FEED:'.$feed_id;
+                    $item['bare_id'] = (int) $feed_id;
+                    $item['auxcounter'] = -1;
+                    $item['name'] = $feed['title'];
+                    $item['checkbox'] = false;
+                    $item['error'] = '';
+                    $item['icon'] = $feed['icon'];
+
+                    $item['param'] = '';
+                    $item['unread'] = -1;
+                    $item['type'] = 'feed';
+
+                    array_push($cat['items'], $item);
+                }
+            }
+
+            if ($enable_cats) {
+                array_push($root['items'], $cat);
+            } else {
+                $root['items'] = array_merge($root['items'], $cat['items']);
+            }
+
+            $sth = $this->pdo->prepare("SELECT * FROM
 				ttrss_labels2 WHERE owner_uid = ? ORDER by caption");
-			$sth->execute([$_SESSION['uid']]);
+            $sth->execute([$_SESSION['uid']]);
 
-			if (get_pref('ENABLE_FEED_CATS')) {
-				$cat = $this->feedlist_init_cat(-2);
-			} else {
-				$cat['items'] = array();
-			}
+            if (get_pref('ENABLE_FEED_CATS')) {
+                $cat = $this->feedlist_init_cat(-2);
+            } else {
+                $cat['items'] = array();
+            }
 
-			$num_labels = 0;
-			while ($line = $sth->fetch()) {
-				++$num_labels;
+            $num_labels = 0;
+            while ($line = $sth->fetch()) {
+                ++$num_labels;
 
-				$label_id = Labels::label_to_feed_id($line['id']);
+                $label_id = Labels::label_to_feed_id($line['id']);
 
-				$feed = $this->feedlist_init_feed($label_id, false, 0);
+                $feed = $this->feedlist_init_feed($label_id, false, 0);
 
-				$feed['fg_color'] = $line['fg_color'];
-				$feed['bg_color'] = $line['bg_color'];
+                $feed['fg_color'] = $line['fg_color'];
+                $feed['bg_color'] = $line['bg_color'];
 
-				array_push($cat['items'], $feed);
-			}
+                array_push($cat['items'], $feed);
+            }
 
-			if ($num_labels) {
-				if ($enable_cats) {
-					array_push($root['items'], $cat);
-				} else {
-					$root['items'] = array_merge($root['items'], $cat['items']);
-				}
-			}
-		}
+            if ($num_labels) {
+                if ($enable_cats) {
+                    array_push($root['items'], $cat);
+                } else {
+                    $root['items'] = array_merge($root['items'], $cat['items']);
+                }
+            }
+        }
 
-		if ($enable_cats) {
-			$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
-				(clean($_REQUEST['mode']) != 2 && !$search);
+        if ($enable_cats) {
+            $show_empty_cats = clean($_REQUEST['force_show_empty']) ||
+                (clean($_REQUEST['mode']) != 2 && !$search);
 
-			$sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
+            $sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
 				WHERE owner_uid = ? AND parent_cat IS NULL ORDER BY order_id, title");
-			$sth->execute([$_SESSION['uid']]);
-
-			while ($line = $sth->fetch()) {
-				$cat = array();
-				$cat['id'] = 'CAT:'.$line['id'];
-				$cat['bare_id'] = (int) $line['id'];
-				$cat['auxcounter'] = -1;
-				$cat['name'] = $line['title'];
-				$cat['items'] = array();
-				$cat['checkbox'] = false;
-				$cat['type'] = 'category';
-				$cat['unread'] = -1;
-				$cat['child_unread'] = -1;
-
-				$cat['items'] = $this->get_category_items($line['id']);
-
-				$num_children = $this->calculate_children_count($cat);
-				$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
-
-				if ($num_children > 0 || $show_empty_cats) {
-									array_push($root['items'], $cat);
-				}
-
-				$root['param'] += count($cat['items']);
-			}
-
-			/* Uncategorized is a special case */
-
-			$cat = array();
-			$cat['id'] = 'CAT:0';
-			$cat['bare_id'] = 0;
-			$cat['auxcounter'] = -1;
-			$cat['name'] = __("Uncategorized");
-			$cat['items'] = array();
-			$cat['type'] = 'category';
-			$cat['checkbox'] = false;
-			$cat['unread'] = -1;
-			$cat['child_unread'] = -1;
-
-			$fsth = $this->pdo->prepare("SELECT id, title,last_error,
+            $sth->execute([$_SESSION['uid']]);
+
+            while ($line = $sth->fetch()) {
+                $cat = array();
+                $cat['id'] = 'CAT:'.$line['id'];
+                $cat['bare_id'] = (int) $line['id'];
+                $cat['auxcounter'] = -1;
+                $cat['name'] = $line['title'];
+                $cat['items'] = array();
+                $cat['checkbox'] = false;
+                $cat['type'] = 'category';
+                $cat['unread'] = -1;
+                $cat['child_unread'] = -1;
+
+                $cat['items'] = $this->get_category_items($line['id']);
+
+                $num_children = $this->calculate_children_count($cat);
+                $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
+
+                if ($num_children > 0 || $show_empty_cats) {
+                                    array_push($root['items'], $cat);
+                }
+
+                $root['param'] += count($cat['items']);
+            }
+
+            /* Uncategorized is a special case */
+
+            $cat = array();
+            $cat['id'] = 'CAT:0';
+            $cat['bare_id'] = 0;
+            $cat['auxcounter'] = -1;
+            $cat['name'] = __("Uncategorized");
+            $cat['items'] = array();
+            $cat['type'] = 'category';
+            $cat['checkbox'] = false;
+            $cat['unread'] = -1;
+            $cat['child_unread'] = -1;
+
+            $fsth = $this->pdo->prepare("SELECT id, title,last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 				FROM ttrss_feeds
 				WHERE cat_id IS NULL AND
 				owner_uid = :uid AND
 				(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
 				ORDER BY order_id, title");
-			$fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-			while ($feed_line = $fsth->fetch()) {
-				$feed = array();
-				$feed['id'] = 'FEED:'.$feed_line['id'];
-				$feed['bare_id'] = (int) $feed_line['id'];
-				$feed['auxcounter'] = -1;
-				$feed['name'] = $feed_line['title'];
-				$feed['checkbox'] = false;
-				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
-				$feed['param'] = make_local_datetime(
-					$feed_line['last_updated'], true);
-				$feed['unread'] = -1;
-				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
-
-				array_push($cat['items'], $feed);
-			}
-
-			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
-
-			if (count($cat['items']) > 0 || $show_empty_cats) {
-							array_push($root['items'], $cat);
-			}
-
-			$num_children = $this->calculate_children_count($root);
-			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
-
-		} else {
-			$fsth = $this->pdo->prepare("SELECT id, title, last_error,
+            $fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
+
+            while ($feed_line = $fsth->fetch()) {
+                $feed = array();
+                $feed['id'] = 'FEED:'.$feed_line['id'];
+                $feed['bare_id'] = (int) $feed_line['id'];
+                $feed['auxcounter'] = -1;
+                $feed['name'] = $feed_line['title'];
+                $feed['checkbox'] = false;
+                $feed['error'] = $feed_line['last_error'];
+                $feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
+                $feed['param'] = make_local_datetime(
+                    $feed_line['last_updated'], true);
+                $feed['unread'] = -1;
+                $feed['type'] = 'feed';
+                $feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
+
+                array_push($cat['items'], $feed);
+            }
+
+            $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
+
+            if (count($cat['items']) > 0 || $show_empty_cats) {
+                            array_push($root['items'], $cat);
+            }
+
+            $num_children = $this->calculate_children_count($root);
+            $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
+
+        } else {
+            $fsth = $this->pdo->prepare("SELECT id, title, last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 				FROM ttrss_feeds
 				WHERE owner_uid = :uid AND
 				(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
 				ORDER BY order_id, title");
-			$fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-			while ($feed_line = $fsth->fetch()) {
-				$feed = array();
-				$feed['id'] = 'FEED:'.$feed_line['id'];
-				$feed['bare_id'] = (int) $feed_line['id'];
-				$feed['auxcounter'] = -1;
-				$feed['name'] = $feed_line['title'];
-				$feed['checkbox'] = false;
-				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
-				$feed['param'] = make_local_datetime(
-					$feed_line['last_updated'], true);
-				$feed['unread'] = -1;
-				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
-
-				array_push($root['items'], $feed);
-			}
-
-			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items']));
-		}
-
-		$fl = array();
-		$fl['identifier'] = 'id';
-		$fl['label'] = 'name';
-
-		if (clean($_REQUEST['mode']) != 2) {
-			$fl['items'] = array($root);
-		} else {
-			$fl['items'] = $root['items'];
-		}
-
-		return $fl;
-	}
-
-	public function catsortreset() {
-		$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+            $fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
+
+            while ($feed_line = $fsth->fetch()) {
+                $feed = array();
+                $feed['id'] = 'FEED:'.$feed_line['id'];
+                $feed['bare_id'] = (int) $feed_line['id'];
+                $feed['auxcounter'] = -1;
+                $feed['name'] = $feed_line['title'];
+                $feed['checkbox'] = false;
+                $feed['error'] = $feed_line['last_error'];
+                $feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
+                $feed['param'] = make_local_datetime(
+                    $feed_line['last_updated'], true);
+                $feed['unread'] = -1;
+                $feed['type'] = 'feed';
+                $feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
+
+                array_push($root['items'], $feed);
+            }
+
+            $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items']));
+        }
+
+        $fl = array();
+        $fl['identifier'] = 'id';
+        $fl['label'] = 'name';
+
+        if (clean($_REQUEST['mode']) != 2) {
+            $fl['items'] = array($root);
+        } else {
+            $fl['items'] = $root['items'];
+        }
+
+        return $fl;
+    }
+
+    public function catsortreset() {
+        $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 				SET order_id = 0 WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-	}
+        $sth->execute([$_SESSION['uid']]);
+    }
 
-	public function feedsortreset() {
-		$sth = $this->pdo->prepare("UPDATE ttrss_feeds
+    public function feedsortreset() {
+        $sth = $this->pdo->prepare("UPDATE ttrss_feeds
 				SET order_id = 0 WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-	}
+        $sth->execute([$_SESSION['uid']]);
+    }
 
-	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
+    private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
 
-		$prefix = "";
-		for ($i = 0; $i < $nest_level; $i++) {
-					$prefix .= "   ";
-		}
+        $prefix = "";
+        for ($i = 0; $i < $nest_level; $i++) {
+                    $prefix .= "   ";
+        }
 
-		Debug::log("$prefix C: $item_id P: $parent_id");
+        Debug::log("$prefix C: $item_id P: $parent_id");
 
-		$bare_item_id = substr($item_id, strpos($item_id, ':') + 1);
+        $bare_item_id = substr($item_id, strpos($item_id, ':') + 1);
 
-		if ($item_id != 'root') {
-			if ($parent_id && $parent_id != 'root') {
-				$parent_bare_id = substr($parent_id, strpos($parent_id, ':') + 1);
-				$parent_qpart = $parent_bare_id;
-			} else {
-				$parent_qpart = null;
-			}
+        if ($item_id != 'root') {
+            if ($parent_id && $parent_id != 'root') {
+                $parent_bare_id = substr($parent_id, strpos($parent_id, ':') + 1);
+                $parent_qpart = $parent_bare_id;
+            } else {
+                $parent_qpart = null;
+            }
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+            $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 				SET parent_cat = ? WHERE id = ? AND
 				owner_uid = ?");
-			$sth->execute([$parent_qpart, $bare_item_id, $_SESSION['uid']]);
-		}
+            $sth->execute([$parent_qpart, $bare_item_id, $_SESSION['uid']]);
+        }
 
-		$order_id = 1;
+        $order_id = 1;
 
-		$cat = $data_map[$item_id];
+        $cat = $data_map[$item_id];
 
-		if ($cat && is_array($cat)) {
-			foreach ($cat as $item) {
-				$id = $item['_reference'];
-				$bare_id = substr($id, strpos($id, ':') + 1);
+        if ($cat && is_array($cat)) {
+            foreach ($cat as $item) {
+                $id = $item['_reference'];
+                $bare_id = substr($id, strpos($id, ':') + 1);
 
-				Debug::log("$prefix [$order_id] $id/$bare_id");
+                Debug::log("$prefix [$order_id] $id/$bare_id");
 
-				if ($item['_reference']) {
+                if ($item['_reference']) {
 
-					if (strpos($id, "FEED") === 0) {
+                    if (strpos($id, "FEED") === 0) {
 
-						$cat_id = ($item_id != "root") ? $bare_item_id : null;
+                        $cat_id = ($item_id != "root") ? $bare_item_id : null;
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_feeds
+                        $sth = $this->pdo->prepare("UPDATE ttrss_feeds
 							SET order_id = ?, cat_id = ?
 							WHERE id = ? AND owner_uid = ?");
 
-						$sth->execute([$order_id, $cat_id ? $cat_id : null, $bare_id, $_SESSION['uid']]);
+                        $sth->execute([$order_id, $cat_id ? $cat_id : null, $bare_id, $_SESSION['uid']]);
 
-					} else if (strpos($id, "CAT:") === 0) {
-						$this->process_category_order($data_map, $item['_reference'], $item_id,
-							$nest_level + 1);
+                    } else if (strpos($id, "CAT:") === 0) {
+                        $this->process_category_order($data_map, $item['_reference'], $item_id,
+                            $nest_level + 1);
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+                        $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 								SET order_id = ? WHERE id = ? AND
 								owner_uid = ?");
-						$sth->execute([$order_id, $bare_id, $_SESSION['uid']]);
-					}
-				}
+                        $sth->execute([$order_id, $bare_id, $_SESSION['uid']]);
+                    }
+                }
 
-				++$order_id;
-			}
-		}
-	}
+                ++$order_id;
+            }
+        }
+    }
 
-	public function savefeedorder() {
-		$data = json_decode($_POST['payload'], true);
+    public function savefeedorder() {
+        $data = json_decode($_POST['payload'], true);
 
-		#file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
-		#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
+        #file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
+        #$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
 
-		if (!is_array($data['items'])) {
-					$data['items'] = json_decode($data['items'], true);
-		}
+        if (!is_array($data['items'])) {
+                    $data['items'] = json_decode($data['items'], true);
+        }
 
 #		print_r($data['items']);
 
-		if (is_array($data) && is_array($data['items'])) {
+        if (is_array($data) && is_array($data['items'])) {
 #			$cat_order_id = 0;
 
-			$data_map = array();
-			$root_item = false;
+            $data_map = array();
+            $root_item = false;
 
-			foreach ($data['items'] as $item) {
+            foreach ($data['items'] as $item) {
 
 #				if ($item['id'] != 'root') {
-					if (is_array($item['items'])) {
-						if (isset($item['items']['_reference'])) {
-							$data_map[$item['id']] = array($item['items']);
-						} else {
-							$data_map[$item['id']] = $item['items'];
-						}
-					}
-				if ($item['id'] == 'root') {
-					$root_item = $item['id'];
-				}
-			}
-
-			$this->process_category_order($data_map, $root_item);
-		}
-	}
-
-	public function removeicon() {
-		$feed_id = clean($_REQUEST["feed_id"]);
-
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
-		$sth->execute([$feed_id, $_SESSION['uid']]);
-
-		if ($sth->fetch()) {
-			@unlink(ICONS_DIR."/$feed_id.ico");
-
-			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?");
-			$sth->execute([$feed_id]);
-		}
-	}
-
-	public function uploadicon() {
-		header("Content-type: text/html");
-
-		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR.'/upload', 'icon');
-
-			$result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
-				$tmp_file);
-
-			if (!$result) {
-				return;
-			}
-		} else {
-			return;
-		}
+                    if (is_array($item['items'])) {
+                        if (isset($item['items']['_reference'])) {
+                            $data_map[$item['id']] = array($item['items']);
+                        } else {
+                            $data_map[$item['id']] = $item['items'];
+                        }
+                    }
+                if ($item['id'] == 'root') {
+                    $root_item = $item['id'];
+                }
+            }
+
+            $this->process_category_order($data_map, $root_item);
+        }
+    }
+
+    public function removeicon() {
+        $feed_id = clean($_REQUEST["feed_id"]);
+
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
+        $sth->execute([$feed_id, $_SESSION['uid']]);
+
+        if ($sth->fetch()) {
+            @unlink(ICONS_DIR."/$feed_id.ico");
+
+            $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?");
+            $sth->execute([$feed_id]);
+        }
+    }
+
+    public function uploadicon() {
+        header("Content-type: text/html");
+
+        if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
+            $tmp_file = tempnam(CACHE_DIR.'/upload', 'icon');
+
+            $result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
+                $tmp_file);
+
+            if (!$result) {
+                return;
+            }
+        } else {
+            return;
+        }
 
-		$icon_file = $tmp_file;
-		$feed_id = clean($_REQUEST["feed_id"]);
-		$rc = 2; // failed
+        $icon_file = $tmp_file;
+        $feed_id = clean($_REQUEST["feed_id"]);
+        $rc = 2; // failed
 
-		if (is_file($icon_file) && $feed_id) {
-			if (filesize($icon_file) < 65535) {
+        if (is_file($icon_file) && $feed_id) {
+            if (filesize($icon_file) < 65535) {
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$feed_id, $_SESSION['uid']]);
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
+                $sth->execute([$feed_id, $_SESSION['uid']]);
 
-				if ($sth->fetch()) {
-					@unlink(ICONS_DIR."/$feed_id.ico");
-					if (rename($icon_file, ICONS_DIR."/$feed_id.ico")) {
+                if ($sth->fetch()) {
+                    @unlink(ICONS_DIR."/$feed_id.ico");
+                    if (rename($icon_file, ICONS_DIR."/$feed_id.ico")) {
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?");
-						$sth->execute([$feed_id]);
+                        $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?");
+                        $sth->execute([$feed_id]);
 
-						$rc = 0;
-					}
-				}
-			} else {
-				$rc = 1;
-			}
-		}
+                        $rc = 0;
+                    }
+                }
+            } else {
+                $rc = 1;
+            }
+        }
 
-		if (is_file($icon_file)) {
-		    @unlink($icon_file);
-		}
+        if (is_file($icon_file)) {
+            @unlink($icon_file);
+        }
 
-		print $rc;
-		return;
-	}
+        print $rc;
+        return;
+    }
 
-	public function editfeed() {
-		global $purge_intervals;
-		global $update_intervals;
+    public function editfeed() {
+        global $purge_intervals;
+        global $update_intervals;
 
 
-		$feed_id = clean($_REQUEST["id"]);
+        $feed_id = clean($_REQUEST["id"]);
 
-		$sth = $this->pdo->prepare("SELECT * FROM ttrss_feeds WHERE id = ? AND
+        $sth = $this->pdo->prepare("SELECT * FROM ttrss_feeds WHERE id = ? AND
 				owner_uid = ?");
-		$sth->execute([$feed_id, $_SESSION['uid']]);
+        $sth->execute([$feed_id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
+        if ($row = $sth->fetch()) {
+            print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
         		<div dojoType="dijit.layout.ContentPane" title="'.__('General').'">';
 
-			$title = htmlspecialchars($row["title"]);
+            $title = htmlspecialchars($row["title"]);
 
-			print_hidden("id", "$feed_id");
-			print_hidden("op", "pref-feeds");
-			print_hidden("method", "editSave");
+            print_hidden("id", "$feed_id");
+            print_hidden("op", "pref-feeds");
+            print_hidden("method", "editSave");
 
-			print "<header>".__("Feed")."</header>";
-			print "<section>";
+            print "<header>".__("Feed")."</header>";
+            print "<section>";
 
-			/* Title */
+            /* Title */
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
+            print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed Title")."\"
 				style='font-size : 16px; width: 500px' name='title' value=\"$title\">";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* Feed URL */
+            /* Feed URL */
 
-			$feed_url = htmlspecialchars($row["feed_url"]);
+            $feed_url = htmlspecialchars($row["feed_url"]);
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>".__('URL:')."</label> ";
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
+            print "<label>".__('URL:')."</label> ";
+            print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
 				name='feed_url' value=\"$feed_url\">";
 
-			$last_error = $row["last_error"];
+            $last_error = $row["last_error"];
 
-			if ($last_error) {
-				print "&nbsp;<i class=\"material-icons\"
+            if ($last_error) {
+                print "&nbsp;<i class=\"material-icons\"
 					title=\"".htmlspecialchars($last_error)."\">error</i>";
-			}
+            }
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* Category */
+            /* Category */
 
-			if (get_pref('ENABLE_FEED_CATS')) {
+            if (get_pref('ENABLE_FEED_CATS')) {
 
-				$cat_id = $row["cat_id"];
+                $cat_id = $row["cat_id"];
 
-				print "<fieldset>";
+                print "<fieldset>";
 
-				print "<label>".__('Place in category:')."</label> ";
+                print "<label>".__('Place in category:')."</label> ";
 
-				print_feed_cat_select("cat_id", $cat_id,
-					'dojoType="fox.form.Select"');
+                print_feed_cat_select("cat_id", $cat_id,
+                    'dojoType="fox.form.Select"');
 
-				print "</fieldset>";
-			}
+                print "</fieldset>";
+            }
 
-			/* Site URL  */
+            /* Site URL  */
 
-			$site_url = htmlspecialchars($row["site_url"]);
+            $site_url = htmlspecialchars($row["site_url"]);
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>".__('Site URL:')."</label> ";
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
+            print "<label>".__('Site URL:')."</label> ";
+            print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Site URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
 				name='site_url' value=\"$site_url\">";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* FTS Stemming Language */
+            /* FTS Stemming Language */
 
-			if (DB_TYPE == "pgsql") {
-				$feed_language = $row["feed_language"];
+            if (DB_TYPE == "pgsql") {
+                $feed_language = $row["feed_language"];
 
-				if (!$feed_language) {
-									$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
-				}
+                if (!$feed_language) {
+                                    $feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
+                }
 
-				print "<fieldset>";
+                print "<fieldset>";
 
-				print "<label>".__('Language:')."</label> ";
-				print_select("feed_language", $feed_language, $this::get_ts_languages(),
-					'dojoType="fox.form.Select"');
+                print "<label>".__('Language:')."</label> ";
+                print_select("feed_language", $feed_language, $this::get_ts_languages(),
+                    'dojoType="fox.form.Select"');
 
-				print "</fieldset>";
-			}
+                print "</fieldset>";
+            }
 
-			print "</section>";
+            print "</section>";
 
-			print "<header>".__("Update")."</header>";
-			print "<section>";
+            print "<header>".__("Update")."</header>";
+            print "<section>";
 
-			/* Update Interval */
+            /* Update Interval */
 
-			$update_interval = $row["update_interval"];
+            $update_interval = $row["update_interval"];
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>".__("Interval:")."</label> ";
+            print "<label>".__("Interval:")."</label> ";
 
-			print_select_hash("update_interval", $update_interval, $update_intervals,
-				'dojoType="fox.form.Select"');
+            print_select_hash("update_interval", $update_interval, $update_intervals,
+                'dojoType="fox.form.Select"');
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* Purge intl */
+            /* Purge intl */
 
-			$purge_interval = $row["purge_interval"];
+            $purge_interval = $row["purge_interval"];
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>".__('Article purging:')."</label> ";
+            print "<label>".__('Article purging:')."</label> ";
 
-			print_select_hash("purge_interval", $purge_interval, $purge_intervals,
-				'dojoType="fox.form.Select" '.
-				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
+            print_select_hash("purge_interval", $purge_interval, $purge_intervals,
+                'dojoType="fox.form.Select" '.
+                ((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			print "</section>";
+            print "</section>";
 
-			$auth_login = htmlspecialchars($row["auth_login"]);
-			$auth_pass = htmlspecialchars($row["auth_pass"]);
+            $auth_login = htmlspecialchars($row["auth_login"]);
+            $auth_pass = htmlspecialchars($row["auth_pass"]);
 
-			$auth_enabled = $auth_login !== '' || $auth_pass !== '';
+            $auth_enabled = $auth_login !== '' || $auth_pass !== '';
 
-			$auth_style = $auth_enabled ? '' : 'display: none';
-			print "<div id='feedEditDlg_loginContainer' style='$auth_style'>";
-			print "<header>".__("Authentication")."</header>";
-			print "<section>";
+            $auth_style = $auth_enabled ? '' : 'display: none';
+            print "<div id='feedEditDlg_loginContainer' style='$auth_style'>";
+            print "<header>".__("Authentication")."</header>";
+            print "<section>";
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login'
+            print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login'
 				placeHolder='".__("Login")."'
 				autocomplete='new-password'
 				name='auth_login' value=\"$auth_login\">";
 
-			print "</fieldset><fieldset>";
+            print "</fieldset><fieldset>";
 
-			print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
+            print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
 				autocomplete='new-password'
 				placeHolder='".__("Password")."'
 				value=\"$auth_pass\">";
 
-			print "<div dojoType='dijit.Tooltip' connectId='feedEditDlg_login' position='below'>
+            print "<div dojoType='dijit.Tooltip' connectId='feedEditDlg_login' position='below'>
 				".__('<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')."
 				</div>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			print "</section></div>";
+            print "</section></div>";
 
-			$auth_checked = $auth_enabled ? 'checked' : '';
-			print "<label class='checkbox'>
+            $auth_checked = $auth_enabled ? 'checked' : '';
+            print "<label class='checkbox'>
 				<input type='checkbox' $auth_checked name='need_auth' dojoType='dijit.form.CheckBox' id='feedEditDlg_loginCheck'
 						onclick='displayIfChecked(this, \"feedEditDlg_loginContainer\")'>
 					".__('This feed requires authentication.')."</label>";
 
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">';
+            print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">';
 
-			print "<section class='narrow'>";
+            print "<section class='narrow'>";
 
-			$include_in_digest = $row["include_in_digest"];
+            $include_in_digest = $row["include_in_digest"];
 
-			if ($include_in_digest) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
+            if ($include_in_digest) {
+                $checked = "checked=\"1\"";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
+            print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
 				name=\"include_in_digest\"
 				$checked> ".__('Include in e-mail digest')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$always_display_enclosures = $row["always_display_enclosures"];
+            $always_display_enclosures = $row["always_display_enclosures"];
 
-			if ($always_display_enclosures) {
-				$checked = "checked";
-			} else {
-				$checked = "";
-			}
+            if ($always_display_enclosures) {
+                $checked = "checked";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
+            print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
 				name=\"always_display_enclosures\"
 				$checked> ".__('Always display image attachments')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$hide_images = $row["hide_images"];
+            $hide_images = $row["hide_images"];
 
-			if ($hide_images) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
+            if ($hide_images) {
+                $checked = "checked=\"1\"";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images'
+            print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images'
 				name='hide_images' $checked> ".__('Do not embed media')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$cache_images = $row["cache_images"];
+            $cache_images = $row["cache_images"];
 
-			if ($cache_images) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
+            if ($cache_images) {
+                $checked = "checked=\"1\"";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
+            print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
 				name='cache_images' $checked> ".__('Cache media')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$mark_unread_on_update = $row["mark_unread_on_update"];
+            $mark_unread_on_update = $row["mark_unread_on_update"];
 
-			if ($mark_unread_on_update) {
-				$checked = "checked";
-			} else {
-				$checked = "";
-			}
+            if ($mark_unread_on_update) {
+                $checked = "checked";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update'
+            print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update'
 				name='mark_unread_on_update' $checked> ".__('Mark updated articles as unread')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">';
+            print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">';
 
-			/* Icon */
+            /* Icon */
 
-			print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::getFeedIcon($feed_id)."\">";
+            print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::getFeedIcon($feed_id)."\">";
 
-			print "<form onsubmit='return false;' id='feed_icon_upload_form'
+            print "<form onsubmit='return false;' id='feed_icon_upload_form'
 				enctype='multipart/form-data' method='POST'>
 			<label class='dijitButton'>".__("Choose file...")."
 				<input style='display: none' id='icon_file' size='10' name='icon_file' type='file'>
@@ -785,231 +785,231 @@ 
 				type='submit'>".__('Remove')."</button>
 			</form>";
 
-			print "</section>";
+            print "</section>";
 
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">';
+            print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">';
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
-				"hook_prefs_edit_feed", $feed_id);
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
+                "hook_prefs_edit_feed", $feed_id);
 
-			print "</div></div>";
+            print "</div></div>";
 
-			$title = htmlspecialchars($title, ENT_QUOTES);
+            $title = htmlspecialchars($title, ENT_QUOTES);
 
-			print "<footer>
+            print "<footer>
 				<button style='float : left' class='alt-danger' dojoType='dijit.form.Button' onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
-					__('Unsubscribe')."</button>
+                    __('Unsubscribe')."</button>
 				<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return dijit.byId('feedEditDlg').execute()\">".__('Save')."</button>
 				<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button>
 				</footer>";
-		}
-	}
+        }
+    }
 
-	public function editfeeds() {
-		global $purge_intervals;
-		global $update_intervals;
+    public function editfeeds() {
+        global $purge_intervals;
+        global $update_intervals;
 
-		$feed_ids = clean($_REQUEST["ids"]);
+        $feed_ids = clean($_REQUEST["ids"]);
 
-		print_notice("Enable the options you wish to apply using checkboxes on the right:");
+        print_notice("Enable the options you wish to apply using checkboxes on the right:");
 
-		print "<p>";
+        print "<p>";
 
-		print_hidden("ids", "$feed_ids");
-		print_hidden("op", "pref-feeds");
-		print_hidden("method", "batchEditSave");
+        print_hidden("ids", "$feed_ids");
+        print_hidden("op", "pref-feeds");
+        print_hidden("method", "batchEditSave");
 
-		print "<header>".__("Feed")."</header>";
-		print "<section>";
+        print "<header>".__("Feed")."</header>";
+        print "<section>";
 
-		/* Category */
+        /* Category */
 
-		if (get_pref('ENABLE_FEED_CATS')) {
+        if (get_pref('ENABLE_FEED_CATS')) {
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>".__('Place in category:')."</label> ";
+            print "<label>".__('Place in category:')."</label> ";
 
-			print_feed_cat_select("cat_id", false,
-				'disabled="1" dojoType="fox.form.Select"');
+            print_feed_cat_select("cat_id", false,
+                'disabled="1" dojoType="fox.form.Select"');
 
-			$this->batch_edit_cbox("cat_id");
+            $this->batch_edit_cbox("cat_id");
 
-			print "</fieldset>";
-		}
+            print "</fieldset>";
+        }
 
-		/* FTS Stemming Language */
+        /* FTS Stemming Language */
 
-		if (DB_TYPE == "pgsql") {
-			print "<fieldset>";
+        if (DB_TYPE == "pgsql") {
+            print "<fieldset>";
 
-			print "<label>".__('Language:')."</label> ";
-			print_select("feed_language", "", $this::get_ts_languages(),
-				'disabled="1" dojoType="fox.form.Select"');
+            print "<label>".__('Language:')."</label> ";
+            print_select("feed_language", "", $this::get_ts_languages(),
+                'disabled="1" dojoType="fox.form.Select"');
 
-			$this->batch_edit_cbox("feed_language");
+            $this->batch_edit_cbox("feed_language");
 
-			print "</fieldset>";
-		}
+            print "</fieldset>";
+        }
 
-		print "</section>";
+        print "</section>";
 
-		print "<header>".__("Update")."</header>";
-		print "<section>";
+        print "<header>".__("Update")."</header>";
+        print "<section>";
 
-		/* Update Interval */
+        /* Update Interval */
 
-		print "<fieldset>";
+        print "<fieldset>";
 
-		print "<label>".__("Interval:")."</label> ";
+        print "<label>".__("Interval:")."</label> ";
 
-		print_select_hash("update_interval", "", $update_intervals,
-			'disabled="1" dojoType="fox.form.Select"');
+        print_select_hash("update_interval", "", $update_intervals,
+            'disabled="1" dojoType="fox.form.Select"');
 
-		$this->batch_edit_cbox("update_interval");
+        $this->batch_edit_cbox("update_interval");
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		/* Purge intl */
+        /* Purge intl */
 
-		if (FORCE_ARTICLE_PURGE == 0) {
+        if (FORCE_ARTICLE_PURGE == 0) {
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>".__('Article purging:')."</label> ";
+            print "<label>".__('Article purging:')."</label> ";
 
-			print_select_hash("purge_interval", "", $purge_intervals,
-				'disabled="1" dojoType="fox.form.Select"');
+            print_select_hash("purge_interval", "", $purge_intervals,
+                'disabled="1" dojoType="fox.form.Select"');
 
-			$this->batch_edit_cbox("purge_interval");
+            $this->batch_edit_cbox("purge_interval");
 
-			print "</fieldset>";
-		}
+            print "</fieldset>";
+        }
 
-		print "</section>";
-		print "<header>".__("Authentication")."</header>";
-		print "<section>";
+        print "</section>";
+        print "<header>".__("Authentication")."</header>";
+        print "<section>";
 
-		print "<fieldset>";
+        print "<fieldset>";
 
-		print "<input dojoType='dijit.form.TextBox'
+        print "<input dojoType='dijit.form.TextBox'
 			placeHolder=\"".__("Login")."\" disabled='1'
 			autocomplete='new-password'
 			name='auth_login' value=''>";
 
-		$this->batch_edit_cbox("auth_login");
+        $this->batch_edit_cbox("auth_login");
 
-		print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
+        print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
 			autocomplete='new-password'
 			placeHolder=\"".__("Password")."\" disabled='1'
 			value=''>";
 
-		$this->batch_edit_cbox("auth_pass");
+        $this->batch_edit_cbox("auth_pass");
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		print "</section>";
-		print "<header>".__("Options")."</header>";
-		print "<section>";
+        print "</section>";
+        print "<header>".__("Options")."</header>";
+        print "<section>";
 
-		print "<fieldset class='narrow'>";
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='include_in_digest'
+        print "<fieldset class='narrow'>";
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='include_in_digest'
 			name='include_in_digest' dojoType='dijit.form.CheckBox'>&nbsp;".__('Include in e-mail digest')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l");
+        print "&nbsp;"; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='always_display_enclosures'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='always_display_enclosures'
 			name='always_display_enclosures' dojoType='dijit.form.CheckBox'>&nbsp;".__('Always display image attachments')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l");
+        print "&nbsp;"; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='hide_images'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='hide_images'
 			name='hide_images' dojoType='dijit.form.CheckBox'>&nbsp;". __('Do not embed media')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("hide_images", "hide_images_l");
+        print "&nbsp;"; $this->batch_edit_cbox("hide_images", "hide_images_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='cache_images'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='cache_images'
 			name='cache_images' dojoType='dijit.form.CheckBox'>&nbsp;".__('Cache media')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("cache_images", "cache_images_l");
+        print "&nbsp;"; $this->batch_edit_cbox("cache_images", "cache_images_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='mark_unread_on_update'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='mark_unread_on_update'
 			name='mark_unread_on_update' dojoType='dijit.form.CheckBox'>&nbsp;".__('Mark updated articles as unread')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l");
+        print "&nbsp;"; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l");
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		print "</section>";
+        print "</section>";
 
-		print "<footer>
+        print "<footer>
 			<button dojoType='dijit.form.Button' type='submit' class='alt-primary'
 				onclick=\"return dijit.byId('feedEditDlg').execute()\">".
-				__('Save')."</button>
+                __('Save')."</button>
 			<button dojoType='dijit.form.Button'
 			onclick=\"return dijit.byId('feedEditDlg').hide()\">".
-				__('Cancel')."</button>
+                __('Cancel')."</button>
 			</footer>";
 
-		return;
-	}
-
-	public function batchEditSave() {
-		return $this->editsaveops(true);
-	}
-
-	public function editSave() {
-		return $this->editsaveops(false);
-	}
-
-	public function editsaveops($batch) {
-
-		$feed_title = trim(clean($_POST["title"]));
-		$feed_url = trim(clean($_POST["feed_url"]));
-		$site_url = trim(clean($_POST["site_url"]));
-		$upd_intl = (int) clean($_POST["update_interval"]);
-		$purge_intl = (int) clean($_POST["purge_interval"]);
-		$feed_id = (int) clean($_POST["id"]); /* editSave */
-		$feed_ids = explode(",", clean($_POST["ids"])); /* batchEditSave */
-		$cat_id = (int) clean($_POST["cat_id"]);
-		$auth_login = trim(clean($_POST["auth_login"]));
-		$auth_pass = trim(clean($_POST["auth_pass"]));
-		$private = checkbox_to_sql_bool(clean($_POST["private"]));
-		$include_in_digest = checkbox_to_sql_bool(
-			clean($_POST["include_in_digest"]));
-		$cache_images = checkbox_to_sql_bool(
-			clean($_POST["cache_images"]));
-		$hide_images = checkbox_to_sql_bool(
-			clean($_POST["hide_images"]));
-		$always_display_enclosures = checkbox_to_sql_bool(
-			clean($_POST["always_display_enclosures"]));
-
-		$mark_unread_on_update = checkbox_to_sql_bool(
-			clean($_POST["mark_unread_on_update"]));
-
-		$feed_language = trim(clean($_POST["feed_language"]));
-
-		if (!$batch) {
-			if (clean($_POST["need_auth"]) !== 'on') {
-				$auth_login = '';
-				$auth_pass = '';
-			}
-
-			/* $sth = $this->pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?");
+        return;
+    }
+
+    public function batchEditSave() {
+        return $this->editsaveops(true);
+    }
+
+    public function editSave() {
+        return $this->editsaveops(false);
+    }
+
+    public function editsaveops($batch) {
+
+        $feed_title = trim(clean($_POST["title"]));
+        $feed_url = trim(clean($_POST["feed_url"]));
+        $site_url = trim(clean($_POST["site_url"]));
+        $upd_intl = (int) clean($_POST["update_interval"]);
+        $purge_intl = (int) clean($_POST["purge_interval"]);
+        $feed_id = (int) clean($_POST["id"]); /* editSave */
+        $feed_ids = explode(",", clean($_POST["ids"])); /* batchEditSave */
+        $cat_id = (int) clean($_POST["cat_id"]);
+        $auth_login = trim(clean($_POST["auth_login"]));
+        $auth_pass = trim(clean($_POST["auth_pass"]));
+        $private = checkbox_to_sql_bool(clean($_POST["private"]));
+        $include_in_digest = checkbox_to_sql_bool(
+            clean($_POST["include_in_digest"]));
+        $cache_images = checkbox_to_sql_bool(
+            clean($_POST["cache_images"]));
+        $hide_images = checkbox_to_sql_bool(
+            clean($_POST["hide_images"]));
+        $always_display_enclosures = checkbox_to_sql_bool(
+            clean($_POST["always_display_enclosures"]));
+
+        $mark_unread_on_update = checkbox_to_sql_bool(
+            clean($_POST["mark_unread_on_update"]));
+
+        $feed_language = trim(clean($_POST["feed_language"]));
+
+        if (!$batch) {
+            if (clean($_POST["need_auth"]) !== 'on') {
+                $auth_login = '';
+                $auth_pass = '';
+            }
+
+            /* $sth = $this->pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?");
 			$sth->execute([$feed_id]);
 			$row = $sth->fetch();$orig_feed_url = $row["feed_url"];
 
 			$reset_basic_info = $orig_feed_url != $feed_url; */
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET
+            $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET
 				cat_id = :cat_id,
 				title = :title,
 				feed_url = :feed_url,
@@ -1028,253 +1028,253 @@ 
 				feed_language = :feed_language
 			WHERE id = :id AND owner_uid = :uid");
 
-			$sth->execute([":title" => $feed_title,
-					":cat_id" => $cat_id ? $cat_id : null,
-					":feed_url" => $feed_url,
-					":site_url" => $site_url,
-					":upd_intl" => $upd_intl,
-					":purge_intl" => $purge_intl,
-					":auth_login" => $auth_login,
-					":auth_pass" => $auth_pass,
-					":private" => (int) $private,
-					":cache_images" => (int) $cache_images,
-					":hide_images" => (int) $hide_images,
-					":include_in_digest" => (int) $include_in_digest,
-					":always_display_enclosures" => (int) $always_display_enclosures,
-					":mark_unread_on_update" => (int) $mark_unread_on_update,
-					":feed_language" => $feed_language,
-					":id" => $feed_id,
-					":uid" => $_SESSION['uid']]);
+            $sth->execute([":title" => $feed_title,
+                    ":cat_id" => $cat_id ? $cat_id : null,
+                    ":feed_url" => $feed_url,
+                    ":site_url" => $site_url,
+                    ":upd_intl" => $upd_intl,
+                    ":purge_intl" => $purge_intl,
+                    ":auth_login" => $auth_login,
+                    ":auth_pass" => $auth_pass,
+                    ":private" => (int) $private,
+                    ":cache_images" => (int) $cache_images,
+                    ":hide_images" => (int) $hide_images,
+                    ":include_in_digest" => (int) $include_in_digest,
+                    ":always_display_enclosures" => (int) $always_display_enclosures,
+                    ":mark_unread_on_update" => (int) $mark_unread_on_update,
+                    ":feed_language" => $feed_language,
+                    ":id" => $feed_id,
+                    ":uid" => $_SESSION['uid']]);
 
 /*			if ($reset_basic_info) {
 				RSSUtils::set_basic_feed_info($feed_id);
 			} */
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED,
-				"hook_prefs_save_feed", $feed_id);
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED,
+                "hook_prefs_save_feed", $feed_id);
 
-		} else {
-			$feed_data = array();
+        } else {
+            $feed_data = array();
 
-			foreach (array_keys($_POST) as $k) {
-				if ($k != "op" && $k != "method" && $k != "ids") {
-					$feed_data[$k] = clean($_POST[$k]);
-				}
-			}
+            foreach (array_keys($_POST) as $k) {
+                if ($k != "op" && $k != "method" && $k != "ids") {
+                    $feed_data[$k] = clean($_POST[$k]);
+                }
+            }
 
-			$this->pdo->beginTransaction();
+            $this->pdo->beginTransaction();
 
-			$feed_ids_qmarks = arr_qmarks($feed_ids);
+            $feed_ids_qmarks = arr_qmarks($feed_ids);
 
-			foreach (array_keys($feed_data) as $k) {
+            foreach (array_keys($feed_data) as $k) {
 
-				$qpart = "";
+                $qpart = "";
 
-				switch ($k) {
-					case "title":
-						$qpart = "title = ".$this->pdo->quote($feed_title);
-						break;
+                switch ($k) {
+                    case "title":
+                        $qpart = "title = ".$this->pdo->quote($feed_title);
+                        break;
 
-					case "feed_url":
-						$qpart = "feed_url = ".$this->pdo->quote($feed_url);
-						break;
+                    case "feed_url":
+                        $qpart = "feed_url = ".$this->pdo->quote($feed_url);
+                        break;
 
-					case "update_interval":
-						$qpart = "update_interval = ".$this->pdo->quote($upd_intl);
-						break;
+                    case "update_interval":
+                        $qpart = "update_interval = ".$this->pdo->quote($upd_intl);
+                        break;
 
-					case "purge_interval":
-						$qpart = "purge_interval =".$this->pdo->quote($purge_intl);
-						break;
+                    case "purge_interval":
+                        $qpart = "purge_interval =".$this->pdo->quote($purge_intl);
+                        break;
 
-					case "auth_login":
-						$qpart = "auth_login = ".$this->pdo->quote($auth_login);
-						break;
+                    case "auth_login":
+                        $qpart = "auth_login = ".$this->pdo->quote($auth_login);
+                        break;
 
-					case "auth_pass":
-						$qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
-						break;
+                    case "auth_pass":
+                        $qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
+                        break;
 
-					case "private":
-						$qpart = "private = ".$this->pdo->quote($private);
-						break;
+                    case "private":
+                        $qpart = "private = ".$this->pdo->quote($private);
+                        break;
 
-					case "include_in_digest":
-						$qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
-						break;
+                    case "include_in_digest":
+                        $qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
+                        break;
 
-					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
-						break;
+                    case "always_display_enclosures":
+                        $qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
+                        break;
 
-					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
-						break;
+                    case "mark_unread_on_update":
+                        $qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
+                        break;
 
-					case "cache_images":
-						$qpart = "cache_images = ".$this->pdo->quote($cache_images);
-						break;
+                    case "cache_images":
+                        $qpart = "cache_images = ".$this->pdo->quote($cache_images);
+                        break;
 
-					case "hide_images":
-						$qpart = "hide_images = ".$this->pdo->quote($hide_images);
-						break;
+                    case "hide_images":
+                        $qpart = "hide_images = ".$this->pdo->quote($hide_images);
+                        break;
 
-					case "cat_id":
-						if (get_pref('ENABLE_FEED_CATS')) {
-							if ($cat_id) {
-								$qpart = "cat_id = ".$this->pdo->quote($cat_id);
-							} else {
-								$qpart = 'cat_id = NULL';
-							}
-						} else {
-							$qpart = "";
-						}
+                    case "cat_id":
+                        if (get_pref('ENABLE_FEED_CATS')) {
+                            if ($cat_id) {
+                                $qpart = "cat_id = ".$this->pdo->quote($cat_id);
+                            } else {
+                                $qpart = 'cat_id = NULL';
+                            }
+                        } else {
+                            $qpart = "";
+                        }
 
-						break;
+                        break;
 
-					case "feed_language":
-						$qpart = "feed_language = ".$this->pdo->quote($feed_language);
-						break;
+                    case "feed_language":
+                        $qpart = "feed_language = ".$this->pdo->quote($feed_language);
+                        break;
 
-				}
+                }
 
-				if ($qpart) {
-					$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids_qmarks)
+                if ($qpart) {
+                    $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids_qmarks)
 						AND owner_uid = ?");
-					$sth->execute(array_merge($feed_ids, [$_SESSION['uid']]));
-				}
-			}
+                    $sth->execute(array_merge($feed_ids, [$_SESSION['uid']]));
+                }
+            }
 
-			$this->pdo->commit();
-		}
-		return;
-	}
+            $this->pdo->commit();
+        }
+        return;
+    }
 
-	public function remove() {
+    public function remove() {
 
-		$ids = explode(",", clean($_REQUEST["ids"]));
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			Pref_Feeds::remove_feed($id, $_SESSION["uid"]);
-		}
+        foreach ($ids as $id) {
+            Pref_Feeds::remove_feed($id, $_SESSION["uid"]);
+        }
 
-		return;
-	}
+        return;
+    }
 
-	public function removeCat() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		foreach ($ids as $id) {
-			$this->remove_feed_category($id, $_SESSION["uid"]);
-		}
-	}
+    public function removeCat() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        foreach ($ids as $id) {
+            $this->remove_feed_category($id, $_SESSION["uid"]);
+        }
+    }
 
-	public function addCat() {
-		$feed_cat = trim(clean($_REQUEST["cat"]));
+    public function addCat() {
+        $feed_cat = trim(clean($_REQUEST["cat"]));
 
-		Feeds::add_feed_category($feed_cat);
-	}
+        Feeds::add_feed_category($feed_cat);
+    }
 
-	public function index() {
+    public function index() {
 
-		print "<div dojoType='dijit.layout.AccordionContainer' region='center'>";
-		print "<div style='padding : 0px' dojoType='dijit.layout.AccordionPane'
+        print "<div dojoType='dijit.layout.AccordionContainer' region='center'>";
+        print "<div style='padding : 0px' dojoType='dijit.layout.AccordionPane'
 			title=\"<i class='material-icons'>rss_feed</i> ".__('Feeds')."\">";
 
-		$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
+        $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$num_errors = $row["num_errors"];
-		} else {
-			$num_errors = 0;
-		}
+        if ($row = $sth->fetch()) {
+            $num_errors = $row["num_errors"];
+        } else {
+            $num_errors = 0;
+        }
 
-		if ($num_errors > 0) {
+        if ($num_errors > 0) {
 
-			$error_button = "<button dojoType=\"dijit.form.Button\"
+            $error_button = "<button dojoType=\"dijit.form.Button\"
 			  		onclick=\"CommonDialogs.showFeedsWithErrors()\" id=\"errorButton\">" .
-				__("Feeds with errors")."</button>";
-		}
+                __("Feeds with errors")."</button>";
+        }
 
-		$inactive_button = "<button dojoType=\"dijit.form.Button\"
+        $inactive_button = "<button dojoType=\"dijit.form.Button\"
 				id=\"pref_feeds_inactive_btn\"
 				style=\"display : none\"
 				onclick=\"dijit.byId('feedTree').showInactiveFeeds()\">" .
-				__("Inactive feeds")."</button>";
+                __("Inactive feeds")."</button>";
 
-		$feed_search = clean($_REQUEST["search"]);
+        $feed_search = clean($_REQUEST["search"]);
 
-		if (array_key_exists("search", $_REQUEST)) {
-			$_SESSION["prefs_feed_search"] = $feed_search;
-		} else {
-			$feed_search = $_SESSION["prefs_feed_search"];
-		}
+        if (array_key_exists("search", $_REQUEST)) {
+            $_SESSION["prefs_feed_search"] = $feed_search;
+        } else {
+            $feed_search = $_SESSION["prefs_feed_search"];
+        }
 
-		print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
+        print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
 
-		print "<div region='top' dojoType=\"fox.Toolbar\">"; #toolbar
+        print "<div region='top' dojoType=\"fox.Toolbar\">"; #toolbar
 
-		print "<div style='float : right; padding-right : 4px;'>
+        print "<div style='float : right; padding-right : 4px;'>
 			<input dojoType=\"dijit.form.TextBox\" id=\"feed_search\" size=\"20\" type=\"search\"
 				value=\"$feed_search\">
 			<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedTree').reload()\">".
-				__('Search')."</button>
+                __('Search')."</button>
 			</div>";
 
-		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>".__('Select')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"dijit.byId('feedTree').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('feedTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-		print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\"
+        print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\"
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-		print "</div></div>";
+        print "</div></div>";
 
-		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>".__('Feeds')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"CommonDialogs.quickAddFeed()\"
+        print "<div dojoType=\"fox.form.DropDownButton\">".
+                "<span>".__('Feeds')."</span>";
+        print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+        print "<div onclick=\"CommonDialogs.quickAddFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
-		print "<div onclick=\"dijit.byId('feedTree').editSelectedFeed()\"
+        print "<div onclick=\"dijit.byId('feedTree').editSelectedFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Edit selected feeds')."</div>";
-		print "<div onclick=\"dijit.byId('feedTree').resetFeedOrder()\"
+        print "<div onclick=\"dijit.byId('feedTree').resetFeedOrder()\"
 			dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
-		print "<div onclick=\"dijit.byId('feedTree').batchSubscribe()\"
+        print "<div onclick=\"dijit.byId('feedTree').batchSubscribe()\"
 			dojoType=\"dijit.MenuItem\">".__('Batch subscribe')."</div>";
-		print "<div dojoType=\"dijit.MenuItem\" onclick=\"dijit.byId('feedTree').removeSelectedFeeds()\">"
-			.__('Unsubscribe')."</div> ";
-		print "</div></div>";
-
-		if (get_pref('ENABLE_FEED_CATS')) {
-			print "<div dojoType=\"fox.form.DropDownButton\">".
-					"<span>".__('Categories')."</span>";
-			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-			print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
+        print "<div dojoType=\"dijit.MenuItem\" onclick=\"dijit.byId('feedTree').removeSelectedFeeds()\">"
+            .__('Unsubscribe')."</div> ";
+        print "</div></div>";
+
+        if (get_pref('ENABLE_FEED_CATS')) {
+            print "<div dojoType=\"fox.form.DropDownButton\">".
+                    "<span>".__('Categories')."</span>";
+            print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+            print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
 				dojoType=\"dijit.MenuItem\">".__('Add category')."</div>";
-			print "<div onclick=\"dijit.byId('feedTree').resetCatOrder()\"
+            print "<div onclick=\"dijit.byId('feedTree').resetCatOrder()\"
 				dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
-			print "<div onclick=\"dijit.byId('feedTree').removeSelectedCategories()\"
+            print "<div onclick=\"dijit.byId('feedTree').removeSelectedCategories()\"
 				dojoType=\"dijit.MenuItem\">".__('Remove selected')."</div>";
-			print "</div></div>";
+            print "</div></div>";
 
-		}
+        }
 
-		print $error_button;
-		print $inactive_button;
+        print $error_button;
+        print $inactive_button;
 
-		print "</div>"; # toolbar
+        print "</div>"; # toolbar
 
-		//print '</div>';
-		print '<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">';
+        //print '</div>';
+        print '<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">';
 
-		print "<div id=\"feedlistLoading\">
+        print "<div id=\"feedlistLoading\">
 		<img src='images/indicator_tiny.gif'>".
-		 __("Loading, please wait...")."</div>";
+            __("Loading, please wait...")."</div>";
 
-		$auto_expand = $feed_search != "" ? "true" : "false";
+        $auto_expand = $feed_search != "" ? "true" : "false";
 
-		print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\"
+        print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\"
 			url=\"backend.php?op=pref-feeds&method=getfeedtree\">
 		</div>
 		<div dojoType=\"lib.CheckBoxStoreModel\" jsId=\"feedModel\" store=\"feedStore\"
@@ -1307,23 +1307,23 @@ 
 #			".__('<b>Hint:</b> you can drag feeds and categories around.')."
 #			</div>";
 
-		print '</div>';
-		print '</div>';
+        print '</div>';
+        print '</div>';
 
-		print "</div>"; # feeds pane
+        print "</div>"; # feeds pane
 
-		print "<div dojoType='dijit.layout.AccordionPane'
+        print "<div dojoType='dijit.layout.AccordionPane'
 			title='<i class=\"material-icons\">import_export</i> ".__('OPML')."'>";
 
-		print "<h3>".__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.")."</h3>";
+        print "<h3>".__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.")."</h3>";
 
-		print_notice("Only main settings profile can be migrated using OPML.");
+        print_notice("Only main settings profile can be migrated using OPML.");
 
-		print "<iframe id=\"upload_iframe\"
+        print "<iframe id=\"upload_iframe\"
 			name=\"upload_iframe\" onload=\"Helpers.OPML.onImportComplete(this)\"
 			style=\"width: 400px; height: 100px; display: none;\"></iframe>";
 
-		print "<form  name='opml_form' style='display : inline-block' target='upload_iframe'
+        print "<form  name='opml_form' style='display : inline-block' target='upload_iframe'
 			enctype='multipart/form-data' method='POST'
 			action='backend.php'>
 			<label class='dijitButton'>".__("Choose file...")."
@@ -1332,118 +1332,118 @@ 
 			<input type='hidden' name='op' value='dlg'>
 			<input type='hidden' name='method' value='importOpml'>
 			<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return Helpers.OPML.import();\" type=\"submit\">" .
-			__('Import OPML')."</button>";
+            __('Import OPML')."</button>";
 
-		print "</form>";
+        print "</form>";
 
-		print "<form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'>";
+        print "<form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'>";
 
-		print "<button dojoType='dijit.form.Button'
+        print "<button dojoType='dijit.form.Button'
 			onclick='Helpers.OPML.export()' >" .
-			__('Export OPML')."</button>";
+            __('Export OPML')."</button>";
 
-		print " <label class='checkbox'>";
-		print_checkbox("include_settings", true, "1", "");
-		print " ".__("Include settings");
-		print "</label>";
+        print " <label class='checkbox'>";
+        print_checkbox("include_settings", true, "1", "");
+        print " ".__("Include settings");
+        print "</label>";
 
-		print "</form>";
+        print "</form>";
 
-		print "<p/>";
+        print "<p/>";
 
-		print "<h2>".__("Published OPML")."</h2>";
+        print "<h2>".__("Published OPML")."</h2>";
 
-		print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.').
-			" ".
-			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.")."</p>";
+        print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.').
+            " ".
+            __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.")."</p>";
 
-		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
-			__('Display published OPML URL')."</button> ";
+        print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
+            __('Display published OPML URL')."</button> ";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefFeedsOPML");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefFeedsOPML");
 
-		print "</div>"; # pane
+        print "</div>"; # pane
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>share</i> ".__('Published & shared articles / Generated feeds')."\">";
 
-		print "<h3>".__('Published articles can be subscribed by anyone who knows the following URL:')."</h3>";
+        print "<h3>".__('Published articles can be subscribed by anyone who knows the following URL:')."</h3>";
 
-		$rss_url = '-2::'.htmlspecialchars(get_self_url_prefix().
-				"/public.php?op=rss&id=-2&view-mode=all_articles"); ;
+        $rss_url = '-2::'.htmlspecialchars(get_self_url_prefix().
+                "/public.php?op=rss&id=-2&view-mode=all_articles"); ;
 
-		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
-			__('Display URL')."</button> ";
+        print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
+            __('Display URL')."</button> ";
 
-		print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">".
-			__('Clear all generated URLs')."</button> ";
+        print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">".
+            __('Clear all generated URLs')."</button> ";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefFeedsPublishedGenerated");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefFeedsPublishedGenerated");
 
-		print "</div>"; #pane
+        print "</div>"; #pane
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-			"hook_prefs_tab", "prefFeeds");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+            "hook_prefs_tab", "prefFeeds");
 
-		print "</div>"; #container
-	}
+        print "</div>"; #container
+    }
 
-	private function feedlist_init_cat($cat_id) {
-		$obj = array();
-		$cat_id = (int) $cat_id;
+    private function feedlist_init_cat($cat_id) {
+        $obj = array();
+        $cat_id = (int) $cat_id;
 
-		if ($cat_id > 0) {
-			$cat_unread = CCache::find($cat_id, $_SESSION["uid"], true);
-		} else if ($cat_id == 0 || $cat_id == -2) {
-			$cat_unread = Feeds::getCategoryUnread($cat_id);
-		}
+        if ($cat_id > 0) {
+            $cat_unread = CCache::find($cat_id, $_SESSION["uid"], true);
+        } else if ($cat_id == 0 || $cat_id == -2) {
+            $cat_unread = Feeds::getCategoryUnread($cat_id);
+        }
 
-		$obj['id'] = 'CAT:'.$cat_id;
-		$obj['items'] = array();
-		$obj['name'] = Feeds::getCategoryTitle($cat_id);
-		$obj['type'] = 'category';
-		$obj['unread'] = (int) $cat_unread;
-		$obj['bare_id'] = $cat_id;
+        $obj['id'] = 'CAT:'.$cat_id;
+        $obj['items'] = array();
+        $obj['name'] = Feeds::getCategoryTitle($cat_id);
+        $obj['type'] = 'category';
+        $obj['unread'] = (int) $cat_unread;
+        $obj['bare_id'] = $cat_id;
 
-		return $obj;
-	}
+        return $obj;
+    }
 
-	private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') {
-		$obj = array();
-		$feed_id = (int) $feed_id;
+    private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') {
+        $obj = array();
+        $feed_id = (int) $feed_id;
 
-		if (!$title) {
-					$title = Feeds::getFeedTitle($feed_id, false);
-		}
+        if (!$title) {
+                    $title = Feeds::getFeedTitle($feed_id, false);
+        }
 
-		if ($unread === false) {
-					$unread = getFeedUnread($feed_id, false);
-		}
+        if ($unread === false) {
+                    $unread = getFeedUnread($feed_id, false);
+        }
 
-		$obj['id'] = 'FEED:'.$feed_id;
-		$obj['name'] = $title;
-		$obj['unread'] = (int) $unread;
-		$obj['type'] = 'feed';
-		$obj['error'] = $error;
-		$obj['updated'] = $updated;
-		$obj['icon'] = Feeds::getFeedIcon($feed_id);
-		$obj['bare_id'] = $feed_id;
-		$obj['auxcounter'] = 0;
+        $obj['id'] = 'FEED:'.$feed_id;
+        $obj['name'] = $title;
+        $obj['unread'] = (int) $unread;
+        $obj['type'] = 'feed';
+        $obj['error'] = $error;
+        $obj['updated'] = $updated;
+        $obj['icon'] = Feeds::getFeedIcon($feed_id);
+        $obj['bare_id'] = $feed_id;
+        $obj['auxcounter'] = 0;
 
-		return $obj;
-	}
+        return $obj;
+    }
 
-	public function inactiveFeeds() {
+    public function inactiveFeeds() {
 
-		if (DB_TYPE == "pgsql") {
-			$interval_qpart = "NOW() - INTERVAL '3 months'";
-		} else {
-			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
-		}
+        if (DB_TYPE == "pgsql") {
+            $interval_qpart = "NOW() - INTERVAL '3 months'";
+        } else {
+            $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
+        }
 
-		$sth = $this->pdo->prepare("SELECT ttrss_feeds.title, ttrss_feeds.site_url,
+        $sth = $this->pdo->prepare("SELECT ttrss_feeds.title, ttrss_feeds.site_url,
 		  		ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article
 			FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE
 				(SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
@@ -1454,358 +1454,358 @@ 
 				ttrss_entries.id = ref_id
 			GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url
 			ORDER BY last_article");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		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=\"Tables.select('inactive-feeds-list', true)\"
+        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=\"Tables.select('inactive-feeds-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
-		print "<div onclick=\"Tables.select('inactive-feeds-list', false)\"
+        print "<div onclick=\"Tables.select('inactive-feeds-list', false)\"
 			dojoType='dijit.MenuItem'>".__('None')."</div>";
-		print "</div></div>";
-		print "</div>"; #toolbar
+        print "</div></div>";
+        print "</div>"; #toolbar
 
-		print "<div class='panel panel-scrollable'>";
-		print "<table width='100%' id='inactive-feeds-list'>";
+        print "<div class='panel panel-scrollable'>";
+        print "<table width='100%' id='inactive-feeds-list'>";
 
-		$lnum = 1;
+        $lnum = 1;
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$feed_id = $line["id"];
+            $feed_id = $line["id"];
 
-			print "<tr data-row-id='$feed_id'>";
+            print "<tr data-row-id='$feed_id'>";
 
-			print "<td width='5%' align='center'><input
+            print "<td width='5%' align='center'><input
 				onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox'
 				type='checkbox'></td>";
-			print "<td>";
+            print "<td>";
 
-			print "<a href='#' ".
-				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
-				htmlspecialchars($line["title"])."</a>";
+            print "<a href='#' ".
+                "title=\"".__("Click to edit feed")."\" ".
+                "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
+                htmlspecialchars($line["title"])."</a>";
 
-			print "</td><td class='text-muted' align='right'>";
-			print make_local_datetime($line['last_article'], false);
-			print "</td>";
-			print "</tr>";
+            print "</td><td class='text-muted' align='right'>";
+            print make_local_datetime($line['last_article'], false);
+            print "</td>";
+            print "</tr>";
 
-			++$lnum;
-		}
+            ++$lnum;
+        }
 
-		print "</table>";
-		print "</div>";
+        print "</table>";
+        print "</div>";
 
-		print "<footer>
+        print "<footer>
 			<button style='float : left' class=\"alt-danger\" dojoType='dijit.form.Button' onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
-			.__('Unsubscribe from selected feeds')."</button>
+            .__('Unsubscribe from selected feeds')."</button>
 			<button dojoType='dijit.form.Button' onclick=\"dijit.byId('inactiveFeedsDlg').hide()\">"
-			.__('Close this window')."</button>
+            .__('Close this window')."</button>
 			</footer>";
 
-	}
+    }
 
-	public function feedsWithErrors() {
-		$sth = $this->pdo->prepare("SELECT id,title,feed_url,last_error,site_url
+    public function feedsWithErrors() {
+        $sth = $this->pdo->prepare("SELECT id,title,feed_url,last_error,site_url
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		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=\"Tables.select('error-feeds-list', true)\"
+        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=\"Tables.select('error-feeds-list', true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-		print "<div onclick=\"Tables.select('error-feeds-list', false)\"
+        print "<div onclick=\"Tables.select('error-feeds-list', false)\"
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-		print "</div></div>";
-		print "</div>"; #toolbar
+        print "</div></div>";
+        print "</div>"; #toolbar
 
-		print "<div class='panel panel-scrollable'>";
-		print "<table width='100%' id='error-feeds-list'>";
+        print "<div class='panel panel-scrollable'>";
+        print "<table width='100%' id='error-feeds-list'>";
 
-		$lnum = 1;
+        $lnum = 1;
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$feed_id = $line["id"];
+            $feed_id = $line["id"];
 
-			print "<tr data-row-id='$feed_id'>";
+            print "<tr data-row-id='$feed_id'>";
 
-			print "<td width='5%' align='center'><input
+            print "<td width='5%' align='center'><input
 				onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\"
 				type=\"checkbox\"></td>";
-			print "<td>";
+            print "<td>";
 
-			print "<a class=\"visibleLink\" href=\"#\" ".
-				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
-				htmlspecialchars($line["title"])."</a>: ";
+            print "<a class=\"visibleLink\" href=\"#\" ".
+                "title=\"".__("Click to edit feed")."\" ".
+                "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
+                htmlspecialchars($line["title"])."</a>: ";
 
-			print "<span class=\"text-muted\">";
-			print htmlspecialchars($line["last_error"]);
-			print "</span>";
+            print "<span class=\"text-muted\">";
+            print htmlspecialchars($line["last_error"]);
+            print "</span>";
 
-			print "</td>";
-			print "</tr>";
+            print "</td>";
+            print "</tr>";
 
-			++$lnum;
-		}
+            ++$lnum;
+        }
 
-		print "</table>";
-		print "</div>";
+        print "</table>";
+        print "</div>";
 
-		print "<footer>";
-		print "<button style='float : left' class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
-			.__('Unsubscribe from selected feeds')."</button> ";
+        print "<footer>";
+        print "<button style='float : left' class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
+            .__('Unsubscribe from selected feeds')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">".
-			__('Close this window')."</button>";
+        print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">".
+            __('Close this window')."</button>";
 
-		print "</footer>";
-	}
+        print "</footer>";
+    }
 
-	private function remove_feed_category($id, $owner_uid) {
+    private function remove_feed_category($id, $owner_uid) {
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_feed_categories
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_feed_categories
 			WHERE id = ? AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		CCache::remove($id, $owner_uid, true);
-	}
+        CCache::remove($id, $owner_uid, true);
+    }
 
-	public static function remove_feed($id, $owner_uid) {
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
-			if (!$p->hook_unsubscribe_feed($id, $owner_uid)) {
+    public static function remove_feed($id, $owner_uid) {
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
+            if (!$p->hook_unsubscribe_feed($id, $owner_uid)) {
                 user_error("feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
                 return;
-			}
-		}
+            }
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if ($id > 0) {
-			$pdo->beginTransaction();
+        if ($id > 0) {
+            $pdo->beginTransaction();
 
-			/* save starred articles in Archived feed */
+            /* save starred articles in Archived feed */
 
-			/* prepare feed if necessary */
+            /* prepare feed if necessary */
 
-			$sth = $pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?
+            $sth = $pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?
 				AND owner_uid = ?");
-			$sth->execute([$id, $owner_uid]);
+            $sth->execute([$id, $owner_uid]);
 
-			if ($row = $sth->fetch()) {
-				$feed_url = $row["feed_url"];
+            if ($row = $sth->fetch()) {
+                $feed_url = $row["feed_url"];
 
-				$sth = $pdo->prepare("SELECT id FROM ttrss_archived_feeds
+                $sth = $pdo->prepare("SELECT id FROM ttrss_archived_feeds
 					WHERE feed_url = ? AND owner_uid = ?");
-				$sth->execute([$feed_url, $owner_uid]);
+                $sth->execute([$feed_url, $owner_uid]);
 
-				if ($row = $sth->fetch()) {
-					$archive_id = $row["id"];
-				} else {
-					$res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
-					$row = $res->fetch();
+                if ($row = $sth->fetch()) {
+                    $archive_id = $row["id"];
+                } else {
+                    $res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
+                    $row = $res->fetch();
 
-					$new_feed_id = (int) $row['id'] + 1;
+                    $new_feed_id = (int) $row['id'] + 1;
 
-					$sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
+                    $sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
 							SELECT ?, owner_uid, title, feed_url, site_url, NOW() from ttrss_feeds
 							WHERE id = ?");
-					$sth->execute([$new_feed_id, $id]);
+                    $sth->execute([$new_feed_id, $id]);
 
-					$archive_id = $new_feed_id;
-				}
+                    $archive_id = $new_feed_id;
+                }
 
-				$sth = $pdo->prepare("UPDATE ttrss_user_entries SET feed_id = NULL,
+                $sth = $pdo->prepare("UPDATE ttrss_user_entries SET feed_id = NULL,
 					orig_feed_id = ? WHERE feed_id = ? AND
 						marked = true AND owner_uid = ?");
 
-				$sth->execute([$archive_id, $id, $owner_uid]);
+                $sth->execute([$archive_id, $id, $owner_uid]);
 
-				/* Remove access key for the feed */
+                /* Remove access key for the feed */
 
-				$sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
+                $sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
 					feed_id = ? AND owner_uid = ?");
-				$sth->execute([$id, $owner_uid]);
+                $sth->execute([$id, $owner_uid]);
 
-				/* remove the feed */
+                /* remove the feed */
 
-				$sth = $pdo->prepare("DELETE FROM ttrss_feeds
+                $sth = $pdo->prepare("DELETE FROM ttrss_feeds
 					WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$id, $owner_uid]);
-			}
+                $sth->execute([$id, $owner_uid]);
+            }
 
-			$pdo->commit();
+            $pdo->commit();
 
-			if (file_exists(ICONS_DIR."/$id.ico")) {
-				unlink(ICONS_DIR."/$id.ico");
-			}
+            if (file_exists(ICONS_DIR."/$id.ico")) {
+                unlink(ICONS_DIR."/$id.ico");
+            }
 
-			CCache::remove($id, $owner_uid);
+            CCache::remove($id, $owner_uid);
 
-		} else {
-			Labels::remove(Labels::feed_to_label_id($id), $owner_uid);
-			//CCache::remove($id, $owner_uid); don't think labels are cached
-		}
-	}
+        } else {
+            Labels::remove(Labels::feed_to_label_id($id), $owner_uid);
+            //CCache::remove($id, $owner_uid); don't think labels are cached
+        }
+    }
 
-	public function batchSubscribe() {
-		print_hidden("op", "pref-feeds");
-		print_hidden("method", "batchaddfeeds");
+    public function batchSubscribe() {
+        print_hidden("op", "pref-feeds");
+        print_hidden("method", "batchaddfeeds");
 
-		print "<header class='horizontal'>".__("One valid feed per line (no detection is done)")."</header>";
-		print "<section>";
+        print "<header class='horizontal'>".__("One valid feed per line (no detection is done)")."</header>";
+        print "<section>";
 
-		print "<textarea
+        print "<textarea
 			style='font-size : 12px; width : 98%; height: 200px;'
 			dojoType='dijit.form.SimpleTextarea' name='feeds'></textarea>";
 
-		if (get_pref('ENABLE_FEED_CATS')) {
-			print "<fieldset>";
-			print "<label>".__('Place in category:')."</label> ";
-			print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
-			print "</fieldset>";
-		}
+        if (get_pref('ENABLE_FEED_CATS')) {
+            print "<fieldset>";
+            print "<label>".__('Place in category:')."</label> ";
+            print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
+            print "</fieldset>";
+        }
 
-		print "</section>";
+        print "</section>";
 
-		print "<div id='feedDlg_loginContainer' style='display : none'>";
+        print "<div id='feedDlg_loginContainer' style='display : none'>";
 
-		print "<header>".__("Authentication")."</header>";
-		print "<section>";
+        print "<header>".__("Authentication")."</header>";
+        print "<section>";
 
-		print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
+        print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
 			<input placeHolder=\"".__("Password")."\" dojoType=\"dijit.form.TextBox\" type='password'
 				autocomplete='new-password' name='pass''></div>";
 
-		print "</section>";
-		print "</div>";
+        print "</section>";
+        print "</div>";
 
-		print "<fieldset class='narrow'>
+        print "<fieldset class='narrow'>
 			<label class='checkbox'><input type='checkbox' name='need_auth' dojoType='dijit.form.CheckBox'
 					onclick='displayIfChecked(this, \"feedDlg_loginContainer\")'> ".
-				__('Feeds require authentication.')."</label></div>";
-		print "</fieldset>";
+                __('Feeds require authentication.')."</label></div>";
+        print "</fieldset>";
 
-		print "<footer>
+        print "<footer>
 			<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".__('Subscribe')."</button>
 			<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('batchSubDlg').hide()\">".__('Cancel')."</button>
 			</footer>";
-	}
+    }
 
-	public function batchAddFeeds() {
-		$cat_id = clean($_REQUEST['cat']);
-		$feeds = explode("\n", clean($_REQUEST['feeds']));
-		$login = clean($_REQUEST['login']);
-		$pass = trim(clean($_REQUEST['pass']));
+    public function batchAddFeeds() {
+        $cat_id = clean($_REQUEST['cat']);
+        $feeds = explode("\n", clean($_REQUEST['feeds']));
+        $login = clean($_REQUEST['login']);
+        $pass = trim(clean($_REQUEST['pass']));
 
-		$csth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
+        $csth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
 						WHERE feed_url = ? AND owner_uid = ?");
 
-		$isth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+        $isth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method,auth_pass_encrypted)
 						VALUES (?, ?, '[Unknown]', ?, ?, ?, 0, false)");
 
-		foreach ($feeds as $feed) {
-			$feed = trim($feed);
+        foreach ($feeds as $feed) {
+            $feed = trim($feed);
 
-			if (Feeds::validate_feed_url($feed)) {
+            if (Feeds::validate_feed_url($feed)) {
 
-				$this->pdo->beginTransaction();
+                $this->pdo->beginTransaction();
 
-				$csth->execute([$feed, $_SESSION['uid']]);
+                $csth->execute([$feed, $_SESSION['uid']]);
 
-				if (!$csth->fetch()) {
-					$isth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]);
-				}
+                if (!$csth->fetch()) {
+                    $isth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]);
+                }
 
-				$this->pdo->commit();
-			}
-		}
-	}
+                $this->pdo->commit();
+            }
+        }
+    }
 
-	public function regenOPMLKey() {
-		$this->update_feed_access_key('OPML:Publish',
-		false, $_SESSION["uid"]);
+    public function regenOPMLKey() {
+        $this->update_feed_access_key('OPML:Publish',
+        false, $_SESSION["uid"]);
 
-		$new_link = Opml::opml_publish_url();
+        $new_link = Opml::opml_publish_url();
 
-		print json_encode(array("link" => $new_link));
-	}
+        print json_encode(array("link" => $new_link));
+    }
 
-	public function regenFeedKey() {
-		$feed_id = clean($_REQUEST['id']);
-		$is_cat = clean($_REQUEST['is_cat']);
+    public function regenFeedKey() {
+        $feed_id = clean($_REQUEST['id']);
+        $is_cat = clean($_REQUEST['is_cat']);
 
-		$new_key = $this->update_feed_access_key($feed_id, $is_cat);
+        $new_key = $this->update_feed_access_key($feed_id, $is_cat);
 
-		print json_encode(["link" => $new_key]);
-	}
+        print json_encode(["link" => $new_key]);
+    }
 
 
-	private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
-		if (!$owner_uid) {
-		    $owner_uid = $_SESSION["uid"];
-		}
+    private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
+        if (!$owner_uid) {
+            $owner_uid = $_SESSION["uid"];
+        }
 
-		// clear old value and generate new one
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys
+        // clear old value and generate new one
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys
 			WHERE feed_id = ? AND is_cat = ? AND owner_uid = ?");
-		$sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]);
+        $sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]);
 
-		return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid);
-	}
+        return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid);
+    }
 
-	// Silent
-	public function clearKeys() {
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys WHERE
+    // Silent
+    public function clearKeys() {
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys WHERE
 			owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-	}
-
-	private function calculate_children_count($cat) {
-		$c = 0;
-
-		foreach ($cat['items'] as $child) {
-			if ($child['type'] == 'category') {
-				$c += $this->calculate_children_count($child);
-			} else {
-				$c += 1;
-			}
-		}
-
-		return $c;
-	}
-
-	public function getinactivefeeds() {
-		if (DB_TYPE == "pgsql") {
-			$interval_qpart = "NOW() - INTERVAL '3 months'";
-		} else {
-			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
-		}
-
-		$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_inactive FROM ttrss_feeds WHERE
+        $sth->execute([$_SESSION['uid']]);
+    }
+
+    private function calculate_children_count($cat) {
+        $c = 0;
+
+        foreach ($cat['items'] as $child) {
+            if ($child['type'] == 'category') {
+                $c += $this->calculate_children_count($child);
+            } else {
+                $c += 1;
+            }
+        }
+
+        return $c;
+    }
+
+    public function getinactivefeeds() {
+        if (DB_TYPE == "pgsql") {
+            $interval_qpart = "NOW() - INTERVAL '3 months'";
+        } else {
+            $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
+        }
+
+        $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_inactive FROM ttrss_feeds WHERE
 				(SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
 					ttrss_entries.id = ref_id AND
 						ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart AND
 			  ttrss_feeds.owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-
-		if ($row = $sth->fetch()) {
-			print (int) $row["num_inactive"];
-		}
-	}
-
-	public static function subscribe_to_feed_url() {
-		$url_path = get_self_url_prefix().
-			"/public.php?op=subscribe&feed_url=%s";
-		return $url_path;
-	}
+        $sth->execute([$_SESSION['uid']]);
+
+        if ($row = $sth->fetch()) {
+            print (int) $row["num_inactive"];
+        }
+    }
+
+    public static function subscribe_to_feed_url() {
+        $url_path = get_self_url_prefix().
+            "/public.php?op=subscribe&feed_url=%s";
+        return $url_path;
+    }
 
 }

classes/pref/users.php

Indentation +273 added lines, -273 removed lines

@@ -1,130 +1,130 @@ 
 <?php
 class Pref_Users extends Handler_Protected {
-		public function before($method) {
-			if (parent::before($method)) {
-				if ($_SESSION["access_level"] < 10) {
-					print __("Your access level is insufficient to open this tab.");
-					return false;
-				}
-				return true;
-			}
-			return false;
-		}
+        public function before($method) {
+            if (parent::before($method)) {
+                if ($_SESSION["access_level"] < 10) {
+                    print __("Your access level is insufficient to open this tab.");
+                    return false;
+                }
+                return true;
+            }
+            return false;
+        }
 
-		public function csrf_ignore($method) {
-			$csrf_ignored = array("index", "edit", "userdetails");
+        public function csrf_ignore($method) {
+            $csrf_ignored = array("index", "edit", "userdetails");
 
-			return array_search($method, $csrf_ignored) !== false;
-		}
+            return array_search($method, $csrf_ignored) !== false;
+        }
 
-		public function edit() {
-			global $access_level_names;
+        public function edit() {
+            global $access_level_names;
 
-			print "<form id='user_edit_form' onsubmit='return false' dojoType='dijit.form.Form'>";
+            print "<form id='user_edit_form' onsubmit='return false' dojoType='dijit.form.Form'>";
 
-			print '<div dojoType="dijit.layout.TabContainer" style="height : 400px">
+            print '<div dojoType="dijit.layout.TabContainer" style="height : 400px">
         		<div dojoType="dijit.layout.ContentPane" title="'.__('Edit user').'">';
 
-			//print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">";
+            //print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">";
 
-			$id = (int) clean($_REQUEST["id"]);
+            $id = (int) clean($_REQUEST["id"]);
 
-			print_hidden("id", "$id");
-			print_hidden("op", "pref-users");
-			print_hidden("method", "editSave");
+            print_hidden("id", "$id");
+            print_hidden("op", "pref-users");
+            print_hidden("method", "editSave");
 
-			$sth = $this->pdo->prepare("SELECT * FROM ttrss_users WHERE id = ?");
-			$sth->execute([$id]);
+            $sth = $this->pdo->prepare("SELECT * FROM ttrss_users WHERE id = ?");
+            $sth->execute([$id]);
 
-			if ($row = $sth->fetch()) {
+            if ($row = $sth->fetch()) {
 
-				$login = $row["login"];
-				$access_level = $row["access_level"];
-				$email = $row["email"];
+                $login = $row["login"];
+                $access_level = $row["access_level"];
+                $email = $row["email"];
 
-				$sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : "";
+                $sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : "";
 
-				print "<header>".__("User")."</header>";
-				print "<section>";
+                print "<header>".__("User")."</header>";
+                print "<section>";
 
-				if ($sel_disabled) {
-					print_hidden("login", "$login");
-				}
+                if ($sel_disabled) {
+                    print_hidden("login", "$login");
+                }
 
-				print "<fieldset>";
-				print "<label>".__("Login:")."</label>";
-				print "<input style='font-size : 16px'
+                print "<fieldset>";
+                print "<label>".__("Login:")."</label>";
+                print "<input style='font-size : 16px'
 					dojoType='dijit.form.ValidationTextBox' required='1'
 					$sel_disabled name='login' value=\"$login\">";
-				print "</fieldset>";
+                print "</fieldset>";
 
-				print "</section>";
+                print "</section>";
 
-				print "<header>".__("Authentication")."</header>";
-				print "<section>";
+                print "<header>".__("Authentication")."</header>";
+                print "<section>";
 
-				print "<fieldset>";
+                print "<fieldset>";
 
-				print "<label>".__('Access level: ')."</label> ";
+                print "<label>".__('Access level: ')."</label> ";
 
-				if (!$sel_disabled) {
-					print_select_hash("access_level", $access_level, $access_level_names,
-						"dojoType=\"fox.form.Select\" $sel_disabled");
-				} else {
-					print_select_hash("", $access_level, $access_level_names,
-						"dojoType=\"fox.form.Select\" $sel_disabled");
-					print_hidden("access_level", "$access_level");
-				}
+                if (!$sel_disabled) {
+                    print_select_hash("access_level", $access_level, $access_level_names,
+                        "dojoType=\"fox.form.Select\" $sel_disabled");
+                } else {
+                    print_select_hash("", $access_level, $access_level_names,
+                        "dojoType=\"fox.form.Select\" $sel_disabled");
+                    print_hidden("access_level", "$access_level");
+                }
 
-				print "</fieldset>";
-				print "<fieldset>";
+                print "</fieldset>";
+                print "<fieldset>";
 
-				print "<label>".__("New password:")."</label> ";
-				print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password'
+                print "<label>".__("New password:")."</label> ";
+                print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password'
 					name='password'>";
 
-				print "</fieldset>";
+                print "</fieldset>";
 
-				print "</section>";
+                print "</section>";
 
-				print "<header>".__("Options")."</header>";
-				print "<section>";
+                print "<header>".__("Options")."</header>";
+                print "<section>";
 
-				print "<fieldset>";
-				print "<label>".__("E-mail:")."</label> ";
-				print "<input dojoType='dijit.form.TextBox' size='30' name='email'
+                print "<fieldset>";
+                print "<label>".__("E-mail:")."</label> ";
+                print "<input dojoType='dijit.form.TextBox' size='30' name='email'
 					value=\"$email\">";
-				print "</fieldset>";
+                print "</fieldset>";
 
-				print "</section>";
+                print "</section>";
 
-				print "</table>";
+                print "</table>";
 
-			}
+            }
 
-			print '</div>'; #tab
-			print "<div href=\"backend.php?op=pref-users&method=userdetails&id=$id\"
+            print '</div>'; #tab
+            print "<div href=\"backend.php?op=pref-users&method=userdetails&id=$id\"
 				dojoType=\"dijit.layout.ContentPane\" title=\"".__('User details')."\">";
 
-			print '</div>';
-			print '</div>';
+            print '</div>';
+            print '</div>';
 
-			print "<footer>
+            print "<footer>
 				<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick=\"dijit.byId('userEditDlg').execute()\">".
-				__('Save')."</button>
+                __('Save')."</button>
 				<button dojoType='dijit.form.Button' onclick=\"dijit.byId('userEditDlg').hide()\">".
-				__('Cancel')."</button>
+                __('Cancel')."</button>
 				</footer>";
 
-			print "</form>";
+            print "</form>";
 
-			return;
-		}
+            return;
+        }
 
-		public function userdetails() {
-			$id = (int) clean($_REQUEST["id"]);
+        public function userdetails() {
+            $id = (int) clean($_REQUEST["id"]);
 
-			$sth = $this->pdo->prepare("SELECT login,
+            $sth = $this->pdo->prepare("SELECT login,
 				".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
 				access_level,
 				(SELECT COUNT(int_id) FROM ttrss_user_entries
@@ -132,248 +132,248 @@ 
 				".SUBSTRING_FOR_DATE."(created,1,16) AS created
 				FROM ttrss_users
 				WHERE id = ?");
-			$sth->execute([$id]);
+            $sth->execute([$id]);
 
-			if ($row = $sth->fetch()) {
-				print "<table width='100%'>";
+            if ($row = $sth->fetch()) {
+                print "<table width='100%'>";
 
-				$last_login = make_local_datetime(
-					$row["last_login"], true);
+                $last_login = make_local_datetime(
+                    $row["last_login"], true);
 
-				$created = make_local_datetime(
-					$row["created"], true);
+                $created = make_local_datetime(
+                    $row["created"], true);
 
-				$stored_articles = $row["stored_articles"];
+                $stored_articles = $row["stored_articles"];
 
-				print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
-				print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
+                print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
+                print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
 
-				$sth = $this->pdo->prepare("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
+                $sth = $this->pdo->prepare("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
 					WHERE owner_uid = ?");
-				$sth->execute([$id]);
-				$row = $sth->fetch();
-				$num_feeds = $row["num_feeds"];
+                $sth->execute([$id]);
+                $row = $sth->fetch();
+                $num_feeds = $row["num_feeds"];
 
-				print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
-				print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>";
+                print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
+                print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>";
 
-				print "</table>";
+                print "</table>";
 
-				print "<h1>".__('Subscribed feeds')."</h1>";
+                print "<h1>".__('Subscribed feeds')."</h1>";
 
-				$sth = $this->pdo->prepare("SELECT id,title,site_url FROM ttrss_feeds
+                $sth = $this->pdo->prepare("SELECT id,title,site_url FROM ttrss_feeds
 					WHERE owner_uid = ? ORDER BY title");
-				$sth->execute([$id]);
+                $sth->execute([$id]);
 
-				print "<ul class=\"panel panel-scrollable list list-unstyled\">";
+                print "<ul class=\"panel panel-scrollable list list-unstyled\">";
 
-				while ($line = $sth->fetch()) {
+                while ($line = $sth->fetch()) {
 
-					$icon_file = ICONS_URL."/".$line["id"].".ico";
+                    $icon_file = ICONS_URL."/".$line["id"].".ico";
 
-					if (file_exists($icon_file) && filesize($icon_file) > 0) {
-						$feed_icon = "<img class=\"icon\" src=\"$icon_file\">";
-					} else {
-						$feed_icon = "<img class=\"icon\" src=\"images/blank_icon.gif\">";
-					}
+                    if (file_exists($icon_file) && filesize($icon_file) > 0) {
+                        $feed_icon = "<img class=\"icon\" src=\"$icon_file\">";
+                    } else {
+                        $feed_icon = "<img class=\"icon\" src=\"images/blank_icon.gif\">";
+                    }
 
-					print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
+                    print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
 
-				}
+                }
 
-				print "</ul>";
+                print "</ul>";
 
 
-			} else {
-				print "<h1>".__('User not found')."</h1>";
-			}
+            } else {
+                print "<h1>".__('User not found')."</h1>";
+            }
 
-		}
+        }
 
-		public function editSave() {
-			$login = trim(clean($_REQUEST["login"]));
-			$uid = clean($_REQUEST["id"]);
-			$access_level = (int) clean($_REQUEST["access_level"]);
-			$email = trim(clean($_REQUEST["email"]));
-			$password = clean($_REQUEST["password"]);
+        public function editSave() {
+            $login = trim(clean($_REQUEST["login"]));
+            $uid = clean($_REQUEST["id"]);
+            $access_level = (int) clean($_REQUEST["access_level"]);
+            $email = trim(clean($_REQUEST["email"]));
+            $password = clean($_REQUEST["password"]);
 
-			if ($password) {
-				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-				$pwd_hash = encrypt_password($password, $salt, true);
-				$pass_query_part = "pwd_hash = ".$this->pdo->quote($pwd_hash).",
+            if ($password) {
+                $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+                $pwd_hash = encrypt_password($password, $salt, true);
+                $pass_query_part = "pwd_hash = ".$this->pdo->quote($pwd_hash).",
 					salt = ".$this->pdo->quote($salt).",";
-			} else {
-				$pass_query_part = "";
-			}
+            } else {
+                $pass_query_part = "";
+            }
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_users SET $pass_query_part login = ?,
+            $sth = $this->pdo->prepare("UPDATE ttrss_users SET $pass_query_part login = ?,
 				access_level = ?, email = ?, otp_enabled = false WHERE id = ?");
-			$sth->execute([$login, $access_level, $email, $uid]);
+            $sth->execute([$login, $access_level, $email, $uid]);
 
-		}
+        }
 
-		public function remove() {
-			$ids = explode(",", clean($_REQUEST["ids"]));
+        public function remove() {
+            $ids = explode(",", clean($_REQUEST["ids"]));
 
-			foreach ($ids as $id) {
-				if ($id != $_SESSION["uid"] && $id != 1) {
-					$sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE owner_uid = ?");
-					$sth->execute([$id]);
+            foreach ($ids as $id) {
+                if ($id != $_SESSION["uid"] && $id != 1) {
+                    $sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE owner_uid = ?");
+                    $sth->execute([$id]);
 
-					$sth = $this->pdo->prepare("DELETE FROM ttrss_feeds WHERE owner_uid = ?");
-					$sth->execute([$id]);
+                    $sth = $this->pdo->prepare("DELETE FROM ttrss_feeds WHERE owner_uid = ?");
+                    $sth->execute([$id]);
 
-					$sth = $this->pdo->prepare("DELETE FROM ttrss_users WHERE id = ?");
-					$sth->execute([$id]);
-				}
-			}
-		}
+                    $sth = $this->pdo->prepare("DELETE FROM ttrss_users WHERE id = ?");
+                    $sth->execute([$id]);
+                }
+            }
+        }
 
-		public function add() {
-			$login = trim(clean($_REQUEST["login"]));
-			$tmp_user_pwd = make_password();
-			$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-			$pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
+        public function add() {
+            $login = trim(clean($_REQUEST["login"]));
+            $tmp_user_pwd = make_password();
+            $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+            $pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
 
-			if (!$login) {
-			    return;
-			}
-			// no blank usernames
+            if (!$login) {
+                return;
+            }
+            // no blank usernames
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
 				login = ?");
-			$sth->execute([$login]);
+            $sth->execute([$login]);
 
-			if (!$sth->fetch()) {
+            if (!$sth->fetch()) {
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_users
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_users
 					(login,pwd_hash,access_level,last_login,created, salt)
 					VALUES (?, ?, 0, null, NOW(), ?)");
-				$sth->execute([$login, $pwd_hash, $salt]);
+                $sth->execute([$login, $pwd_hash, $salt]);
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
 					login = ? AND pwd_hash = ?");
-				$sth->execute([$login, $pwd_hash]);
+                $sth->execute([$login, $pwd_hash]);
 
-				if ($row = $sth->fetch()) {
+                if ($row = $sth->fetch()) {
 
-					$new_uid = $row['id'];
+                    $new_uid = $row['id'];
 
-					print T_sprintf("Added user %s with password %s",
-						$login, $tmp_user_pwd);
+                    print T_sprintf("Added user %s with password %s",
+                        $login, $tmp_user_pwd);
 
-					initialize_user($new_uid);
+                    initialize_user($new_uid);
 
-				} else {
+                } else {
 
-					print T_sprintf("Could not create user %s", $login);
+                    print T_sprintf("Could not create user %s", $login);
 
-				}
-			} else {
-				print T_sprintf("User %s already exists.", $login);
-			}
-		}
+                }
+            } else {
+                print T_sprintf("User %s already exists.", $login);
+            }
+        }
 
-		public static function resetUserPassword($uid, $format_output = false) {
+        public static function resetUserPassword($uid, $format_output = false) {
 
-			$pdo = Db::pdo();
+            $pdo = Db::pdo();
 
-			$sth = $pdo->prepare("SELECT login FROM ttrss_users WHERE id = ?");
-			$sth->execute([$uid]);
+            $sth = $pdo->prepare("SELECT login FROM ttrss_users WHERE id = ?");
+            $sth->execute([$uid]);
 
-			if ($row = $sth->fetch()) {
+            if ($row = $sth->fetch()) {
 
-				$login = $row["login"];
+                $login = $row["login"];
 
-				$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-				$tmp_user_pwd = make_password();
+                $new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+                $tmp_user_pwd = make_password();
 
-				$pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
+                $pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
 
-				$sth = $pdo->prepare("UPDATE ttrss_users
+                $sth = $pdo->prepare("UPDATE ttrss_users
 					  SET pwd_hash = ?, salt = ?, otp_enabled = false
 					WHERE id = ?");
-				$sth->execute([$pwd_hash, $new_salt, $uid]);
+                $sth->execute([$pwd_hash, $new_salt, $uid]);
 
-				$message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>");
+                $message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>");
 
-				if ($format_output) {
-									print_notice($message);
-				} else {
-									print $message;
-				}
+                if ($format_output) {
+                                    print_notice($message);
+                } else {
+                                    print $message;
+                }
 
-			}
-		}
+            }
+        }
 
-		public function resetPass() {
-			$uid = clean($_REQUEST["id"]);
-			Pref_Users::resetUserPassword($uid);
-		}
+        public function resetPass() {
+            $uid = clean($_REQUEST["id"]);
+            Pref_Users::resetUserPassword($uid);
+        }
 
-		public function index() {
+        public function index() {
 
-			global $access_level_names;
+            global $access_level_names;
 
-			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'>";
 
-			$user_search = trim(clean($_REQUEST["search"]));
+            $user_search = trim(clean($_REQUEST["search"]));
 
-			if (array_key_exists("search", $_REQUEST)) {
-				$_SESSION["prefs_user_search"] = $user_search;
-			} else {
-				$user_search = $_SESSION["prefs_user_search"];
-			}
+            if (array_key_exists("search", $_REQUEST)) {
+                $_SESSION["prefs_user_search"] = $user_search;
+            } else {
+                $user_search = $_SESSION["prefs_user_search"];
+            }
 
-			print "<div style='float : right; padding-right : 4px;'>
+            print "<div style='float : right; padding-right : 4px;'>
 				<input dojoType='dijit.form.TextBox' id='user_search' size='20' type='search'
 					value=\"$user_search\">
 				<button dojoType='dijit.form.Button' onclick='Users.reload()'>".
-					__('Search')."</button>
+                    __('Search')."</button>
 				</div>";
 
-			$sort = clean($_REQUEST["sort"]);
+            $sort = clean($_REQUEST["sort"]);
 
-			if (!$sort || $sort == "undefined") {
-				$sort = "login";
-			}
+            if (!$sort || $sort == "undefined") {
+                $sort = "login";
+            }
 
-			print "<div dojoType='fox.form.DropDownButton'>".
-					"<span>".__('Select')."</span>";
-			print "<div dojoType='dijit.Menu' style='display: none'>";
-			print "<div onclick=\"Tables.select('prefUserList', true)\"
+            print "<div dojoType='fox.form.DropDownButton'>".
+                    "<span>".__('Select')."</span>";
+            print "<div dojoType='dijit.Menu' style='display: none'>";
+            print "<div onclick=\"Tables.select('prefUserList', true)\"
 				dojoType='dijit.MenuItem'>".__('All')."</div>";
-			print "<div onclick=\"Tables.select('prefUserList', false)\"
+            print "<div onclick=\"Tables.select('prefUserList', false)\"
 				dojoType='dijit.MenuItem'>".__('None')."</div>";
-			print "</div></div>";
+            print "</div></div>";
 
-			print "<button dojoType='dijit.form.Button' onclick='Users.add()'>".__('Create user')."</button>";
+            print "<button dojoType='dijit.form.Button' onclick='Users.add()'>".__('Create user')."</button>";
 
-			print "
+            print "
 				<button dojoType='dijit.form.Button' onclick='Users.editSelected()'>".
-				__('Edit')."</button dojoType=\"dijit.form.Button\">
+                __('Edit')."</button dojoType=\"dijit.form.Button\">
 				<button dojoType='dijit.form.Button' onclick='Users.removeSelected()'>".
-				__('Remove')."</button dojoType=\"dijit.form.Button\">
+                __('Remove')."</button dojoType=\"dijit.form.Button\">
 				<button dojoType='dijit.form.Button' onclick='Users.resetSelected()'>".
-				__('Reset password')."</button dojoType=\"dijit.form.Button\">";
+                __('Reset password')."</button dojoType=\"dijit.form.Button\">";
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-				"hook_prefs_tab_section", "prefUsersToolbar");
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+                "hook_prefs_tab_section", "prefUsersToolbar");
 
-			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'>";
 
-			$sort = $this->validate_field($sort,
-				["login", "access_level", "created", "num_feeds", "created", "last_login"], "login");
+            $sort = $this->validate_field($sort,
+                ["login", "access_level", "created", "num_feeds", "created", "last_login"], "login");
 
-			if ($sort != "login") {
-			    $sort = "$sort DESC";
-			}
+            if ($sort != "login") {
+                $sort = "$sort DESC";
+            }
 
-			$sth = $this->pdo->prepare("SELECT
+            $sth = $this->pdo->prepare("SELECT
 					tu.id,
 					login,access_level,email,
 					".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login,
@@ -384,11 +384,11 @@ 
 				WHERE
 					(:search = '' OR login LIKE :search) AND tu.id > 0
 				ORDER BY $sort");
-			$sth->execute([":search" => $user_search ? "%$user_search%" : ""]);
+            $sth->execute([":search" => $user_search ? "%$user_search%" : ""]);
 
-			print "<p><table width='100%' cellspacing='0' class='prefUserList' id='prefUserList'>";
+            print "<p><table width='100%' cellspacing='0' class='prefUserList' id='prefUserList'>";
 
-			print "<tr class='title'>
+            print "<tr class='title'>
 						<td align='center' width='5%'>&nbsp;</td>
 						<td width='20%'><a href='#' onclick=\"Users.reload('login')\">".__('Login')."</a></td>
 						<td width='20%'><a href='#' onclick=\"Users.reload('access_level')\">".__('Access Level')."</a></td>
@@ -396,58 +396,58 @@ 
 						<td width='20%'><a href='#' onclick=\"Users.reload('created')\">".__('Registered')."</a></td>
 						<td width='20%'><a href='#' onclick=\"Users.reload('last_login')\">".__('Last login')."</a></td></tr>";
 
-			$lnum = 0;
+            $lnum = 0;
 
-			while ($line = $sth->fetch()) {
+            while ($line = $sth->fetch()) {
 
-				$uid = $line["id"];
+                $uid = $line["id"];
 
-				print "<tr data-row-id='$uid' onclick='Users.edit($uid)'>";
+                print "<tr data-row-id='$uid' onclick='Users.edit($uid)'>";
 
-				$line["login"] = htmlspecialchars($line["login"]);
-				$line["created"] = make_local_datetime($line["created"], false);
-				$line["last_login"] = make_local_datetime($line["last_login"], false);
+                $line["login"] = htmlspecialchars($line["login"]);
+                $line["created"] = make_local_datetime($line["created"], false);
+                $line["last_login"] = make_local_datetime($line["last_login"], false);
 
-				print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();'
+                print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();'
 					dojoType='dijit.form.CheckBox' type='checkbox'></td>";
 
-				print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> ".$line["login"]."</td>";
+                print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> ".$line["login"]."</td>";
 
-				print "<td>".$access_level_names[$line["access_level"]]."</td>";
-				print "<td>".$line["num_feeds"]."</td>";
-				print "<td>".$line["created"]."</td>";
-				print "<td>".$line["last_login"]."</td>";
+                print "<td>".$access_level_names[$line["access_level"]]."</td>";
+                print "<td>".$line["num_feeds"]."</td>";
+                print "<td>".$line["created"]."</td>";
+                print "<td>".$line["last_login"]."</td>";
 
-				print "</tr>";
+                print "</tr>";
 
-				++$lnum;
-			}
+                ++$lnum;
+            }
 
-			print "</table>";
+            print "</table>";
 
-			if ($lnum == 0) {
-				if (!$user_search) {
-					print_warning(__('No users defined.'));
-				} else {
-					print_warning(__('No matching users found.'));
-				}
-			}
+            if ($lnum == 0) {
+                if (!$user_search) {
+                    print_warning(__('No users defined.'));
+                } else {
+                    print_warning(__('No matching users found.'));
+                }
+            }
 
-			print "</div>"; #pane
+            print "</div>"; #pane
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-				"hook_prefs_tab", "prefUsers");
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+                "hook_prefs_tab", "prefUsers");
 
-			print "</div>"; #container
+            print "</div>"; #container
 
-		}
+        }
 
-		public function validate_field($string, $allowed, $default = "") {
-			if (in_array($string, $allowed)) {
-							return $string;
-			} else {
-							return $default;
-			}
-		}
+        public function validate_field($string, $allowed, $default = "") {
+            if (in_array($string, $allowed)) {
+                            return $string;
+            } else {
+                            return $default;
+            }
+        }
 
 }