codysnider / tt-rss

plugins/mail/init.php

Spacing +6 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
 	}
 
 	public function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/mail.js");
+		return file_get_contents(dirname(__FILE__)."/mail.js");
 	}
 
 	public function save() {
@@ -35,7 +35,7 @@ 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>mail</i> ".__('Mail plugin')."\">";
 
-		print "<p>" . __("You can set predefined email addressed here (comma-separated list):") . "</p>";
+		print "<p>".__("You can set predefined email addressed here (comma-separated list):")."</p>";
 
 		print "<form dojoType=\"dijit.form.Form\">";
 
@@ -115,17 +115,17 @@ 
 		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
 		if (count($ids) > 1) {
-			$subject = __("[Forwarded]") . " " . __("Multiple articles");
+			$subject = __("[Forwarded]")." ".__("Multiple articles");
 		}
 
 		while ($line = $sth->fetch()) {
 
 			if (!$subject)
-				$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+				$subject = __("[Forwarded]")." ".htmlspecialchars($line["title"]);
 
 			$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
 			$tnote = strip_tags($line["note"]);
-			if( $tnote != ''){
+			if ($tnote != '') {
 				$tpl->setVariable('ARTICLE_NOTE', $tnote, true);
 				$tpl->addBlock('note');
 			}
@@ -210,7 +210,7 @@ 
 			"message" => $message]);
 
 		if (!$rc) {
-			$reply['error'] =  $mailer->error();
+			$reply['error'] = $mailer->error();
 		} else {
 			//save_email_address($destination);
 			$reply['message'] = "UPDATE_COUNTERS";

Indentation +122 added lines, -122 removed lines

@@ -1,45 +1,45 @@ 
 <?php
 class Mail extends Plugin {
 
-	/* @var PluginHost $host */
-	private $host;
+    /* @var PluginHost $host */
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Share article via email",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Share article via email",
+            "fox");
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public function init($host) {
+        $this->host = $host;
 
-		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
-		$host->add_hook($host::HOOK_PREFS_TAB, $this);
-	}
+        $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+        $host->add_hook($host::HOOK_PREFS_TAB, $this);
+    }
 
-	public function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/mail.js");
-	}
+    public function get_js() {
+        return file_get_contents(dirname(__FILE__) . "/mail.js");
+    }
 
-	public function save() {
-		$addresslist = $_POST["addresslist"];
+    public function save() {
+        $addresslist = $_POST["addresslist"];
 
-		$this->host->set($this, "addresslist", $addresslist);
+        $this->host->set($this, "addresslist", $addresslist);
 
-		echo __("Mail addresses saved.");
-	}
+        echo __("Mail addresses saved.");
+    }
 
-	public function hook_prefs_tab($args) {
-		if ($args != "prefPrefs") return;
+    public function hook_prefs_tab($args) {
+        if ($args != "prefPrefs") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>mail</i> ".__('Mail plugin')."\">";
 
-		print "<p>" . __("You can set predefined email addressed here (comma-separated list):") . "</p>";
+        print "<p>" . __("You can set predefined email addressed here (comma-separated list):") . "</p>";
 
-		print "<form dojoType=\"dijit.form.Form\">";
+        print "<form dojoType=\"dijit.form.Form\">";
 
-		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
+        print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 			evt.preventDefault();
 			if (this.validate()) {
 				console.log(dojo.objectToQuery(this.getValues()));
@@ -53,138 +53,138 @@ 
 			}
 			</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "mail");
+            print_hidden("op", "pluginhandler");
+            print_hidden("method", "save");
+            print_hidden("plugin", "mail");
 
-			$addresslist = $this->host->get($this, "addresslist");
+            $addresslist = $this->host->get($this, "addresslist");
 
-			print "<textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 50%' rows=\"3\"
+            print "<textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 50%' rows=\"3\"
 				name='addresslist'>$addresslist</textarea>";
 
-			print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
-				__("Save")."</button>";
+            print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
+                __("Save")."</button>";
 
-			print "</form>";
+            print "</form>";
 
-		print "</div>";
-	}
+        print "</div>";
+    }
 
-	public function hook_article_button($line) {
-		return "<i class='material-icons' style=\"cursor : pointer\"
+    public function hook_article_button($line) {
+        return "<i class='material-icons' style=\"cursor : pointer\"
 					onclick=\"Plugins.Mail.send(".$line["id"].")\"
 					title='".__('Forward by email')."'>mail</i>";
-	}
+    }
 
-	public function emailArticle() {
+    public function emailArticle() {
 
-		$ids = explode(",", $_REQUEST['param']);
-		$ids_qmarks = arr_qmarks($ids);
+        $ids = explode(",", $_REQUEST['param']);
+        $ids_qmarks = arr_qmarks($ids);
 
-		print_hidden("op", "pluginhandler");
-		print_hidden("plugin", "mail");
-		print_hidden("method", "sendEmail");
+        print_hidden("op", "pluginhandler");
+        print_hidden("plugin", "mail");
+        print_hidden("method", "sendEmail");
 
-		$sth = $this->pdo->prepare("SELECT email, full_name FROM ttrss_users WHERE
+        $sth = $this->pdo->prepare("SELECT email, full_name FROM ttrss_users WHERE
 			id = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$user_email = htmlspecialchars($row['email']);
-			$user_name = htmlspecialchars($row['full_name']);
-		}
+        if ($row = $sth->fetch()) {
+            $user_email = htmlspecialchars($row['email']);
+            $user_name = htmlspecialchars($row['full_name']);
+        }
 
-		if (!$user_name) $user_name = $_SESSION['name'];
+        if (!$user_name) $user_name = $_SESSION['name'];
 
-		print_hidden("from_email", "$user_email");
-		print_hidden("from_name", "$user_name");
+        print_hidden("from_email", "$user_email");
+        print_hidden("from_name", "$user_name");
 
-		require_once "lib/MiniTemplator.class.php";
+        require_once "lib/MiniTemplator.class.php";
 
-		$tpl = new MiniTemplator;
+        $tpl = new MiniTemplator;
 
-		$tpl->readTemplateFromFile("templates/email_article_template.txt");
+        $tpl->readTemplateFromFile("templates/email_article_template.txt");
 
-		$tpl->setVariable('USER_NAME', $_SESSION["name"], true);
-		$tpl->setVariable('USER_EMAIL', $user_email, true);
-		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
+        $tpl->setVariable('USER_NAME', $_SESSION["name"], true);
+        $tpl->setVariable('USER_EMAIL', $user_email, true);
+        $tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
-		$sth = $this->pdo->prepare("SELECT DISTINCT link, content, title, note
+        $sth = $this->pdo->prepare("SELECT DISTINCT link, content, title, note
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
 			id IN ($ids_qmarks) AND owner_uid = ?");
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
-		if (count($ids) > 1) {
-			$subject = __("[Forwarded]") . " " . __("Multiple articles");
-		}
+        if (count($ids) > 1) {
+            $subject = __("[Forwarded]") . " " . __("Multiple articles");
+        }
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			if (!$subject)
-				$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+            if (!$subject)
+                $subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
 
-			$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
-			$tnote = strip_tags($line["note"]);
-			if( $tnote != ''){
-				$tpl->setVariable('ARTICLE_NOTE', $tnote, true);
-				$tpl->addBlock('note');
-			}
-			$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
+            $tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
+            $tnote = strip_tags($line["note"]);
+            if( $tnote != ''){
+                $tpl->setVariable('ARTICLE_NOTE', $tnote, true);
+                $tpl->addBlock('note');
+            }
+            $tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
 
-			$tpl->addBlock('article');
-		}
+            $tpl->addBlock('article');
+        }
 
-		$tpl->addBlock('email');
+        $tpl->addBlock('email');
 
-		$content = "";
-		$tpl->generateOutputToString($content);
+        $content = "";
+        $tpl->generateOutputToString($content);
 
-		print "<table width='100%'><tr><td>";
+        print "<table width='100%'><tr><td>";
 
-		$addresslist = explode(",", $this->host->get($this, "addresslist"));
+        $addresslist = explode(",", $this->host->get($this, "addresslist"));
 
-		print __('To:');
+        print __('To:');
 
-		print "</td><td>";
+        print "</td><td>";
 
 /*		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
 				style=\"width : 30em;\"
 				name=\"destination\" id=\"emailArticleDlg_destination\">"; */
 
-		print_select("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.ComboBox"');
+        print_select("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.ComboBox"');
 
 /*		print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
 	style=\"z-index: 30; display : none\"></div>"; */
 
-		print "</td></tr><tr><td>";
+        print "</td></tr><tr><td>";
 
-		print __('Subject:');
+        print __('Subject:');
 
-		print "</td><td>";
+        print "</td><td>";
 
-		print "<input dojoType='dijit.form.ValidationTextBox' required='true'
+        print "<input dojoType='dijit.form.ValidationTextBox' required='true'
 				style='width : 30em;' name='subject' value=\"$subject\" id='subject'>";
 
-		print "</td></tr>";
+        print "</td></tr>";
 
-		print "<tr><td colspan='2'><textarea dojoType='dijit.form.SimpleTextarea'
+        print "<tr><td colspan='2'><textarea dojoType='dijit.form.SimpleTextarea'
 			style='height : 200px; font-size : 12px; width : 98%' rows=\"20\"
 			name='content'>$content</textarea>";
 
-		print "</td></tr></table>";
+        print "</td></tr></table>";
 
-		print "<footer>";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
-		print "</footer>";
+        print "<footer>";
+        print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
+        print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function sendEmail() {
-		$reply = array();
+    public function sendEmail() {
+        $reply = array();
 
-		/*$mail->AddReplyTo(strip_tags($_REQUEST['from_email']),
+        /*$mail->AddReplyTo(strip_tags($_REQUEST['from_email']),
 			strip_tags($_REQUEST['from_name']));
 		//$mail->AddAddress($_REQUEST['destination']);
 		$addresses = explode(';', $_REQUEST['destination']);
@@ -197,29 +197,29 @@ 
 
 		$rc = $mail->Send(); */
 
-		$to = $_REQUEST["destination"];
-		$subject = strip_tags($_REQUEST["subject"]);
-		$message = strip_tags($_REQUEST["content"]);
-		$from = strip_tags($_REQUEST["from_email"]);
+        $to = $_REQUEST["destination"];
+        $subject = strip_tags($_REQUEST["subject"]);
+        $message = strip_tags($_REQUEST["content"]);
+        $from = strip_tags($_REQUEST["from_email"]);
 
-		$mailer = new Mailer();
+        $mailer = new Mailer();
 
-		$rc = $mailer->mail(["to_address" => $to,
-			"headers" => ["Reply-To: $from"],
-			"subject" => $subject,
-			"message" => $message]);
+        $rc = $mailer->mail(["to_address" => $to,
+            "headers" => ["Reply-To: $from"],
+            "subject" => $subject,
+            "message" => $message]);
 
-		if (!$rc) {
-			$reply['error'] =  $mailer->error();
-		} else {
-			//save_email_address($destination);
-			$reply['message'] = "UPDATE_COUNTERS";
-		}
+        if (!$rc) {
+            $reply['error'] =  $mailer->error();
+        } else {
+            //save_email_address($destination);
+            $reply['message'] = "UPDATE_COUNTERS";
+        }
 
-		print json_encode($reply);
-	}
+        print json_encode($reply);
+    }
 
-	/* function completeEmails() {
+    /* function completeEmails() {
 		$search = $_REQUEST["search"];
 
 		print "<ul>";
@@ -233,8 +233,8 @@ 
 		print "</ul>";
 	} */
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

Braces +9 added lines, -4 removed lines

@@ -30,7 +30,9 @@ 
 	}
 
 	public function hook_prefs_tab($args) {
-		if ($args != "prefPrefs") return;
+		if ($args != "prefPrefs") {
+		    return;
+		}
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>mail</i> ".__('Mail plugin')."\">";
@@ -94,7 +96,9 @@ 
 			$user_name = htmlspecialchars($row['full_name']);
 		}
 
-		if (!$user_name) $user_name = $_SESSION['name'];
+		if (!$user_name) {
+		    $user_name = $_SESSION['name'];
+		}
 
 		print_hidden("from_email", "$user_email");
 		print_hidden("from_name", "$user_name");
@@ -120,8 +124,9 @@ 
 
 		while ($line = $sth->fetch()) {
 
-			if (!$subject)
-				$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+			if (!$subject) {
+							$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+			}
 
 			$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
 			$tnote = strip_tags($line["note"]);

plugins/af_comics/init.php

Spacing +6 added lines, -6 removed lines

@@ -19,9 +19,9 @@ 
 		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
 		$host->add_hook($host::HOOK_PREFS_TAB, $this);
 
-		require_once __DIR__ . "/filter_base.php";
+		require_once __DIR__."/filter_base.php";
 
-		$filters = array_merge(glob(__DIR__ . "/filters.local/*.php"), glob(__DIR__ . "/filters/*.php"));
+		$filters = array_merge(glob(__DIR__."/filters.local/*.php"), glob(__DIR__."/filters/*.php"));
 		$names = [];
 
 		foreach ($filters as $file) {
@@ -50,7 +50,7 @@ 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>photo</i> ".__('Feeds supported by af_comics')."\">";
 
-		print "<p>" . __("The following comics are currently supported:") . "</p>";
+		print "<p>".__("The following comics are currently supported:")."</p>";
 
 		$comics = array("GoComics");
 
@@ -93,9 +93,9 @@ 
 			return $feed_data;
 
 		if (preg_match('#^https?://(?:feeds\.feedburner\.com/uclick|www\.gocomics\.com)/([-a-z0-9]+)$#i', $fetch_url, $comic)) {
-			$site_url = 'https://www.gocomics.com/' . $comic[1];
+			$site_url = 'https://www.gocomics.com/'.$comic[1];
 
-			$article_link = $site_url . date('/Y/m/d');
+			$article_link = $site_url.date('/Y/m/d');
 
 			$body = fetch_file_contents(array('url' => $article_link, 'type' => 'text/html', 'followlocation' => false));
 
@@ -131,7 +131,7 @@ 
 							$title = date('l, F d, Y');
 						}
 
-						foreach (['srcset', 'sizes', 'data-srcset', 'width'] as $attr ) {
+						foreach (['srcset', 'sizes', 'data-srcset', 'width'] as $attr) {
 							$node->removeAttribute($attr);
 						}
 

Braces +25 added lines, -15 removed lines

@@ -45,7 +45,9 @@ 
 	}
 
 	public function hook_prefs_tab($args) {
-		if ($args != "prefFeeds") return;
+		if ($args != "prefFeeds") {
+		    return;
+		}
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>photo</i> ".__('Feeds supported by af_comics')."\">";
@@ -77,8 +79,9 @@ 
 
 	public function hook_article_filter($article) {
 		foreach ($this->filters as $f) {
-			if ($f->process($article))
-				break;
+			if ($f->process($article)) {
+							break;
+			}
 		}
 
 		return $article;
@@ -89,8 +92,9 @@ 
 	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
 	 */
 	public function hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass) {
-		if ($auth_login || $auth_pass)
-			return $feed_data;
+		if ($auth_login || $auth_pass) {
+					return $feed_data;
+		}
 
 		if (preg_match('#^https?://(?:feeds\.feedburner\.com/uclick|www\.gocomics\.com)/([-a-z0-9]+)$#i', $fetch_url, $comic)) {
 			$site_url = 'https://www.gocomics.com/' . $comic[1];
@@ -153,29 +157,35 @@ 
 
 			$tpl->addBlock('feed');
 
-			if ($tpl->generateOutputToString($tmp_data))
-				$feed_data = $tmp_data;
+			if ($tpl->generateOutputToString($tmp_data)) {
+							$feed_data = $tmp_data;
+			}
 		}
 
 		return $feed_data;
 	}
 
 	public function hook_subscribe_feed($contents, $url, $auth_login, $auth_pass) {
-		if ($auth_login || $auth_pass)
-			return $contents;
+		if ($auth_login || $auth_pass) {
+					return $contents;
+		}
 
-		if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $url))
-			return '<?xml version="1.0" encoding="utf-8"?>'; // Get is_html() to return false.
+		if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $url)) {
+					return '<?xml version="1.0" encoding="utf-8"?>';
+		}
+		// Get is_html() to return false.
 
 		return $contents;
 	}
 
 	public function hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass) {
-		if ($auth_login || $auth_pass)
-			return $basic_info;
+		if ($auth_login || $auth_pass) {
+					return $basic_info;
+		}
 
-		if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $fetch_url, $matches))
-			$basic_info = array('title' => ucfirst($matches[1]), 'site_url' => $matches[0]);
+		if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $fetch_url, $matches)) {
+					$basic_info = array('title' => ucfirst($matches[1]), 'site_url' => $matches[0]);
+		}
 
 		return $basic_info;
 	}

Indentation +131 added lines, -131 removed lines

@@ -1,187 +1,187 @@
 <?php
 class Af_Comics extends Plugin {
 
-	private $host;
-	private $filters = array();
+    private $host;
+    private $filters = array();
 
-	public function about() {
-		return array(2.0,
-			"Fixes RSS feeds of assorted comic strips",
-			"fox");
-	}
+    public function about() {
+        return array(2.0,
+            "Fixes RSS feeds of assorted comic strips",
+            "fox");
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public function init($host) {
+        $this->host = $host;
 
-		$host->add_hook($host::HOOK_FETCH_FEED, $this);
-		$host->add_hook($host::HOOK_FEED_BASIC_INFO, $this);
-		$host->add_hook($host::HOOK_SUBSCRIBE_FEED, $this);
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-		$host->add_hook($host::HOOK_PREFS_TAB, $this);
+        $host->add_hook($host::HOOK_FETCH_FEED, $this);
+        $host->add_hook($host::HOOK_FEED_BASIC_INFO, $this);
+        $host->add_hook($host::HOOK_SUBSCRIBE_FEED, $this);
+        $host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
+        $host->add_hook($host::HOOK_PREFS_TAB, $this);
 
-		require_once __DIR__ . "/filter_base.php";
+        require_once __DIR__ . "/filter_base.php";
 
-		$filters = array_merge(glob(__DIR__ . "/filters.local/*.php"), glob(__DIR__ . "/filters/*.php"));
-		$names = [];
+        $filters = array_merge(glob(__DIR__ . "/filters.local/*.php"), glob(__DIR__ . "/filters/*.php"));
+        $names = [];
 
-		foreach ($filters as $file) {
-			$filter_name = preg_replace("/\..*$/", "", basename($file));
+        foreach ($filters as $file) {
+            $filter_name = preg_replace("/\..*$/", "", basename($file));
 
-			if (array_search($filter_name, $names) === false) {
-				if (!class_exists($filter_name)) {
-					require_once $file;
-				}
+            if (array_search($filter_name, $names) === false) {
+                if (!class_exists($filter_name)) {
+                    require_once $file;
+                }
 
-				array_push($names, $filter_name);
+                array_push($names, $filter_name);
 
-				$filter = new $filter_name();
+                $filter = new $filter_name();
 
-				if (is_subclass_of($filter, "Af_ComicFilter")) {
-					array_push($this->filters, $filter);
-					array_push($names, $filter_name);
-				}
-			}
-		}
-	}
+                if (is_subclass_of($filter, "Af_ComicFilter")) {
+                    array_push($this->filters, $filter);
+                    array_push($names, $filter_name);
+                }
+            }
+        }
+    }
 
-	public function hook_prefs_tab($args) {
-		if ($args != "prefFeeds") return;
+    public function hook_prefs_tab($args) {
+        if ($args != "prefFeeds") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>photo</i> ".__('Feeds supported by af_comics')."\">";
 
-		print "<p>" . __("The following comics are currently supported:") . "</p>";
+        print "<p>" . __("The following comics are currently supported:") . "</p>";
 
-		$comics = array("GoComics");
+        $comics = array("GoComics");
 
-		foreach ($this->filters as $f) {
-			foreach ($f->supported() as $comic) {
-				array_push($comics, $comic);
-			}
-		}
+        foreach ($this->filters as $f) {
+            foreach ($f->supported() as $comic) {
+                array_push($comics, $comic);
+            }
+        }
 
-		asort($comics);
+        asort($comics);
 
-		print "<ul class='panel panel-scrollable list list-unstyled'>";
-		foreach ($comics as $comic) {
-			print "<li>$comic</li>";
-		}
-		print "</ul>";
+        print "<ul class='panel panel-scrollable list list-unstyled'>";
+        foreach ($comics as $comic) {
+            print "<li>$comic</li>";
+        }
+        print "</ul>";
 
-		print "<p>".__("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).")."</p>";
+        print "<p>".__("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).")."</p>";
 
-		print "<p>".__('Drop any updated filters into <code>filters.local</code> in plugin directory.')."</p>";
+        print "<p>".__('Drop any updated filters into <code>filters.local</code> in plugin directory.')."</p>";
 
-		print "</div>";
-	}
+        print "</div>";
+    }
 
-	public function hook_article_filter($article) {
-		foreach ($this->filters as $f) {
-			if ($f->process($article))
-				break;
-		}
+    public function hook_article_filter($article) {
+        foreach ($this->filters as $f) {
+            if ($f->process($article))
+                break;
+        }
 
-		return $article;
-	}
+        return $article;
+    }
 
-	// GoComics dropped feed support so it needs to be handled when fetching the feed.
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public function hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass) {
-		if ($auth_login || $auth_pass)
-			return $feed_data;
+    // GoComics dropped feed support so it needs to be handled when fetching the feed.
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass) {
+        if ($auth_login || $auth_pass)
+            return $feed_data;
 
-		if (preg_match('#^https?://(?:feeds\.feedburner\.com/uclick|www\.gocomics\.com)/([-a-z0-9]+)$#i', $fetch_url, $comic)) {
-			$site_url = 'https://www.gocomics.com/' . $comic[1];
+        if (preg_match('#^https?://(?:feeds\.feedburner\.com/uclick|www\.gocomics\.com)/([-a-z0-9]+)$#i', $fetch_url, $comic)) {
+            $site_url = 'https://www.gocomics.com/' . $comic[1];
 
-			$article_link = $site_url . date('/Y/m/d');
+            $article_link = $site_url . date('/Y/m/d');
 
-			$body = fetch_file_contents(array('url' => $article_link, 'type' => 'text/html', 'followlocation' => false));
+            $body = fetch_file_contents(array('url' => $article_link, 'type' => 'text/html', 'followlocation' => false));
 
-			require_once 'lib/MiniTemplator.class.php';
+            require_once 'lib/MiniTemplator.class.php';
 
-			$feed_title = htmlspecialchars($comic[1]);
-			$site_url = htmlspecialchars($site_url);
-			$article_link = htmlspecialchars($article_link);
+            $feed_title = htmlspecialchars($comic[1]);
+            $site_url = htmlspecialchars($site_url);
+            $article_link = htmlspecialchars($article_link);
 
-			$tpl = new MiniTemplator();
+            $tpl = new MiniTemplator();
 
-			$tpl->readTemplateFromFile('templates/generated_feed.txt');
+            $tpl->readTemplateFromFile('templates/generated_feed.txt');
 
-			$tpl->setVariable('FEED_TITLE', $feed_title, true);
-			$tpl->setVariable('VERSION', get_version(), true);
-			$tpl->setVariable('FEED_URL', htmlspecialchars($fetch_url), true);
-			$tpl->setVariable('SELF_URL', $site_url, true);
+            $tpl->setVariable('FEED_TITLE', $feed_title, true);
+            $tpl->setVariable('VERSION', get_version(), true);
+            $tpl->setVariable('FEED_URL', htmlspecialchars($fetch_url), true);
+            $tpl->setVariable('SELF_URL', $site_url, true);
 
-			if ($body) {
-				$doc = new DOMDocument();
+            if ($body) {
+                $doc = new DOMDocument();
 
-				if (@$doc->loadHTML($body)) {
-					$xpath = new DOMXPath($doc);
+                if (@$doc->loadHTML($body)) {
+                    $xpath = new DOMXPath($doc);
 
-					$node = $xpath->query('//picture[contains(@class, "item-comic-image")]/img')->item(0);
+                    $node = $xpath->query('//picture[contains(@class, "item-comic-image")]/img')->item(0);
 
-					if ($node) {
-						$title = $xpath->query('//h1')->item(0);
+                    if ($node) {
+                        $title = $xpath->query('//h1')->item(0);
 
-						if ($title) {
-							$title = clean(trim($title->nodeValue));
-						} else {
-							$title = date('l, F d, Y');
-						}
+                        if ($title) {
+                            $title = clean(trim($title->nodeValue));
+                        } else {
+                            $title = date('l, F d, Y');
+                        }
 
-						foreach (['srcset', 'sizes', 'data-srcset', 'width'] as $attr ) {
-							$node->removeAttribute($attr);
-						}
+                        foreach (['srcset', 'sizes', 'data-srcset', 'width'] as $attr ) {
+                            $node->removeAttribute($attr);
+                        }
 
-						$tpl->setVariable('ARTICLE_ID', $article_link, true);
-						$tpl->setVariable('ARTICLE_LINK', $article_link, true);
-						$tpl->setVariable('ARTICLE_UPDATED_ATOM', date('c', mktime(11, 0, 0)), true);
-						$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($title), true);
-						$tpl->setVariable('ARTICLE_EXCERPT', '', true);
-						$tpl->setVariable('ARTICLE_CONTENT', $doc->saveHTML($node), true);
+                        $tpl->setVariable('ARTICLE_ID', $article_link, true);
+                        $tpl->setVariable('ARTICLE_LINK', $article_link, true);
+                        $tpl->setVariable('ARTICLE_UPDATED_ATOM', date('c', mktime(11, 0, 0)), true);
+                        $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($title), true);
+                        $tpl->setVariable('ARTICLE_EXCERPT', '', true);
+                        $tpl->setVariable('ARTICLE_CONTENT', $doc->saveHTML($node), true);
 
-						$tpl->setVariable('ARTICLE_AUTHOR', '', true);
-						$tpl->setVariable('ARTICLE_SOURCE_LINK', $site_url, true);
-						$tpl->setVariable('ARTICLE_SOURCE_TITLE', $feed_title, true);
+                        $tpl->setVariable('ARTICLE_AUTHOR', '', true);
+                        $tpl->setVariable('ARTICLE_SOURCE_LINK', $site_url, true);
+                        $tpl->setVariable('ARTICLE_SOURCE_TITLE', $feed_title, true);
 
-						$tpl->addBlock('entry');
-					}
-				}
-			}
+                        $tpl->addBlock('entry');
+                    }
+                }
+            }
 
-			$tpl->addBlock('feed');
+            $tpl->addBlock('feed');
 
-			if ($tpl->generateOutputToString($tmp_data))
-				$feed_data = $tmp_data;
-		}
+            if ($tpl->generateOutputToString($tmp_data))
+                $feed_data = $tmp_data;
+        }
 
-		return $feed_data;
-	}
+        return $feed_data;
+    }
 
-	public function hook_subscribe_feed($contents, $url, $auth_login, $auth_pass) {
-		if ($auth_login || $auth_pass)
-			return $contents;
+    public function hook_subscribe_feed($contents, $url, $auth_login, $auth_pass) {
+        if ($auth_login || $auth_pass)
+            return $contents;
 
-		if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $url))
-			return '<?xml version="1.0" encoding="utf-8"?>'; // Get is_html() to return false.
+        if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $url))
+            return '<?xml version="1.0" encoding="utf-8"?>'; // Get is_html() to return false.
 
-		return $contents;
-	}
+        return $contents;
+    }
 
-	public function hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass) {
-		if ($auth_login || $auth_pass)
-			return $basic_info;
+    public function hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass) {
+        if ($auth_login || $auth_pass)
+            return $basic_info;
 
-		if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $fetch_url, $matches))
-			$basic_info = array('title' => ucfirst($matches[1]), 'site_url' => $matches[0]);
+        if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $fetch_url, $matches))
+            $basic_info = array('title' => ucfirst($matches[1]), 'site_url' => $matches[0]);
 
-		return $basic_info;
-	}
+        return $basic_info;
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

plugins/shorten_expanded/init.php

Spacing +2 added lines, -2 removed lines

@@ -14,11 +14,11 @@
 	}
 
 	public function get_css() {
-		return file_get_contents(__DIR__ . "/init.css");
+		return file_get_contents(__DIR__."/init.css");
 	}
 
 	public function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	public function api_version() {

Indentation +18 added lines, -18 removed lines

@@ -1,28 +1,28 @@
 <?php
 class Shorten_Expanded extends Plugin {
-	private $host;
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Shorten overly long articles in CDM/expanded",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Shorten overly long articles in CDM/expanded",
+            "fox");
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public function init($host) {
+        $this->host = $host;
 
-	}
+    }
 
-	public function get_css() {
-		return file_get_contents(__DIR__ . "/init.css");
-	}
+    public function get_css() {
+        return file_get_contents(__DIR__ . "/init.css");
+    }
 
-	public function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
-	}
+    public function get_js() {
+        return file_get_contents(__DIR__ . "/init.js");
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

plugins/search_sphinx/init.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 			user_error("Your PHP has a separate systemwide Sphinx client installed which conflicts with the client library used by tt-rss. Either remove the system library or disable Sphinx support.");
 		}
 
-		require_once __DIR__ . "/sphinxapi.php";
+		require_once __DIR__."/sphinxapi.php";
 	}
 
 	public function hook_search($search) {
@@ -28,7 +28,7 @@ 
 
 		$sphinxpair = explode(":", SPHINX_SERVER, 2);
 
-		$sphinxClient->SetServer($sphinxpair[0], (int)$sphinxpair[1]);
+		$sphinxClient->SetServer($sphinxpair[0], (int) $sphinxpair[1]);
 		$sphinxClient->SetConnectTimeout(1);
 
 		$sphinxClient->SetFieldWeights(array('title' => 70, 'content' => 30,

Braces +5 added lines, -4 removed lines

@@ -53,10 +53,11 @@
 
 		$ids = join(",", $ids);
 
-		if ($ids)
-			return array("ref_id IN ($ids)", array());
-		else
-			return array("ref_id = -1", array());
+		if ($ids) {
+					return array("ref_id IN ($ids)", array());
+		} else {
+					return array("ref_id = -1", array());
+		}
 	}
 
 	public function api_version() {

Indentation +46 added lines, -46 removed lines

@@ -1,65 +1,65 @@
 <?php
 
 class Search_Sphinx extends Plugin {
-	public function about() {
-		return array(1.0,
-			"Delegate searching for articles to Sphinx (don't forget to set options in config.php)",
-			"hoelzro",
-			true,
-			"https://git.tt-rss.org/fox/tt-rss/wiki/SphinxSearch");
-	}
+    public function about() {
+        return array(1.0,
+            "Delegate searching for articles to Sphinx (don't forget to set options in config.php)",
+            "hoelzro",
+            true,
+            "https://git.tt-rss.org/fox/tt-rss/wiki/SphinxSearch");
+    }
 
-	public function init($host) {
-		$host->add_hook($host::HOOK_SEARCH, $this);
+    public function init($host) {
+        $host->add_hook($host::HOOK_SEARCH, $this);
 
-		// idk if that would work but checking for the class being loaded is somehow not enough
-		if (class_exists("SphinxClient") && !defined('SEARCHD_COMMAND_SEARCH')) {
-			user_error("Your PHP has a separate systemwide Sphinx client installed which conflicts with the client library used by tt-rss. Either remove the system library or disable Sphinx support.");
-		}
+        // idk if that would work but checking for the class being loaded is somehow not enough
+        if (class_exists("SphinxClient") && !defined('SEARCHD_COMMAND_SEARCH')) {
+            user_error("Your PHP has a separate systemwide Sphinx client installed which conflicts with the client library used by tt-rss. Either remove the system library or disable Sphinx support.");
+        }
 
-		require_once __DIR__ . "/sphinxapi.php";
-	}
+        require_once __DIR__ . "/sphinxapi.php";
+    }
 
-	public function hook_search($search) {
-		$offset = 0;
-		$limit  = 500;
+    public function hook_search($search) {
+        $offset = 0;
+        $limit  = 500;
 
-		$sphinxClient = new SphinxClient();
+        $sphinxClient = new SphinxClient();
 
-		$sphinxpair = explode(":", SPHINX_SERVER, 2);
+        $sphinxpair = explode(":", SPHINX_SERVER, 2);
 
-		$sphinxClient->SetServer($sphinxpair[0], (int)$sphinxpair[1]);
-		$sphinxClient->SetConnectTimeout(1);
+        $sphinxClient->SetServer($sphinxpair[0], (int)$sphinxpair[1]);
+        $sphinxClient->SetConnectTimeout(1);
 
-		$sphinxClient->SetFieldWeights(array('title' => 70, 'content' => 30,
-			'feed_title' => 20));
+        $sphinxClient->SetFieldWeights(array('title' => 70, 'content' => 30,
+            'feed_title' => 20));
 
-		$sphinxClient->SetMatchMode(SPH_MATCH_EXTENDED2);
-		$sphinxClient->SetRankingMode(SPH_RANK_PROXIMITY_BM25);
-		$sphinxClient->SetLimits($offset, $limit, 1000);
-		$sphinxClient->SetArrayResult(false);
-		$sphinxClient->SetFilter('owner_uid', array($_SESSION['uid']));
+        $sphinxClient->SetMatchMode(SPH_MATCH_EXTENDED2);
+        $sphinxClient->SetRankingMode(SPH_RANK_PROXIMITY_BM25);
+        $sphinxClient->SetLimits($offset, $limit, 1000);
+        $sphinxClient->SetArrayResult(false);
+        $sphinxClient->SetFilter('owner_uid', array($_SESSION['uid']));
 
-		$result = $sphinxClient->Query($search, SPHINX_INDEX);
+        $result = $sphinxClient->Query($search, SPHINX_INDEX);
 
-		$ids = array();
+        $ids = array();
 
-		if (is_array($result['matches'])) {
-			foreach (array_keys($result['matches']) as $int_id) {
-				$ref_id = $result['matches'][$int_id]['attrs']['ref_id'];
-				array_push($ids, $ref_id);
-			}
-		}
+        if (is_array($result['matches'])) {
+            foreach (array_keys($result['matches']) as $int_id) {
+                $ref_id = $result['matches'][$int_id]['attrs']['ref_id'];
+                array_push($ids, $ref_id);
+            }
+        }
 
-		$ids = join(",", $ids);
+        $ids = join(",", $ids);
 
-		if ($ids)
-			return array("ref_id IN ($ids)", array());
-		else
-			return array("ref_id = -1", array());
-	}
+        if ($ids)
+            return array("ref_id IN ($ids)", array());
+        else
+            return array("ref_id = -1", array());
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 }

plugins/af_psql_trgm/init.php

Spacing +12 added lines, -12 removed lines

@@ -41,7 +41,7 @@ 
 	}
 
 	public function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	public function showrelated() {
@@ -98,7 +98,7 @@ 
 
 				print "</div>";
 
-				print "<div style='text-align : right' class='text-muted'>" . smart_date_time(strtotime($line["updated"])) . "</div>";
+				print "<div style='text-align : right' class='text-muted'>".smart_date_time(strtotime($line["updated"]))."</div>";
 
 				print "</li>";
 			}
@@ -163,24 +163,24 @@ 
 			print_hidden("method", "save");
 			print_hidden("plugin", "af_psql_trgm");
 
-			print "<h2>" . __("Global settings") . "</h2>";
+			print "<h2>".__("Global settings")."</h2>";
 
 			print_notice("Enable for specific feeds in the feed editor.");
 
 			print "<fieldset>";
 
-			print "<label>" . __("Minimum similarity:") . "</label> ";
+			print "<label>".__("Minimum similarity:")."</label> ";
 			print "<input dojoType=\"dijit.form.NumberSpinner\"
 				placeholder=\"0.75\" id='psql_trgm_similarity'
 				required=\"1\" name=\"similarity\" value=\"$similarity\">";
 
-			print "<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>" .
-				__("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.") .
+			print "<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>".
+				__("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.").
 				"</div>";
 
 			print "</fieldset><fieldset>";
 
-			print "<label>" . __("Minimum title length:") . "</label> ";
+			print "<label>".__("Minimum title length:")."</label> ";
 			print "<input dojoType=\"dijit.form.NumberSpinner\"
 				placeholder=\"32\"
 				required=\"1\" name=\"min_title_length\" value=\"$min_title_length\">";
@@ -189,7 +189,7 @@ 
 
 			print "<label class='checkbox'>";
 			print_checkbox("enable_globally", $enable_globally);
-			print " " . __("Enable for all feeds:");
+			print " ".__("Enable for all feeds:");
 			print "</label>";
 
 			print "</fieldset>";
@@ -204,14 +204,14 @@ 
 			$this->host->set($this, "enabled_feeds", $enabled_feeds);
 
 			if (count($enabled_feeds) > 0) {
-				print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
+				print "<h3>".__("Currently enabled for (click to edit):")."</h3>";
 
 				print "<ul class=\"panel panel-scrollable list list-unstyled\">";
 				foreach ($enabled_feeds as $f) {
-					print "<li>" .
+					print "<li>".
 						"<i class='material-icons'>rss_feed</i> <a href='#'
-							onclick='CommonDialogs.editFeed($f)'>" .
-						Feeds::getFeedTitle($f) . "</a></li>";
+							onclick='CommonDialogs.editFeed($f)'>".
+						Feeds::getFeedTitle($f)."</a></li>";
 				}
 				print "</ul>";
 			}

Indentation +201 added lines, -201 removed lines

@@ -1,64 +1,64 @@ 
 <?php
 class Af_Psql_Trgm extends Plugin {
 
-	/* @var PluginHost $host */
-	private $host;
+    /* @var PluginHost $host */
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Marks similar articles as read (requires pg_trgm)",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Marks similar articles as read (requires pg_trgm)",
+            "fox");
+    }
 
-	public function save() {
-		$similarity = (float) $_POST["similarity"];
-		$min_title_length = (int) $_POST["min_title_length"];
-		$enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]);
+    public function save() {
+        $similarity = (float) $_POST["similarity"];
+        $min_title_length = (int) $_POST["min_title_length"];
+        $enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]);
 
-		if ($similarity < 0) $similarity = 0;
-		if ($similarity > 1) $similarity = 1;
+        if ($similarity < 0) $similarity = 0;
+        if ($similarity > 1) $similarity = 1;
 
-		if ($min_title_length < 0) $min_title_length = 0;
+        if ($min_title_length < 0) $min_title_length = 0;
 
-		$similarity = sprintf("%.2f", $similarity);
+        $similarity = sprintf("%.2f", $similarity);
 
-		$this->host->set($this, "similarity", $similarity);
-		$this->host->set($this, "min_title_length", $min_title_length);
-		$this->host->set($this, "enable_globally", $enable_globally);
+        $this->host->set($this, "similarity", $similarity);
+        $this->host->set($this, "min_title_length", $min_title_length);
+        $this->host->set($this, "enable_globally", $enable_globally);
 
-		echo T_sprintf("Data saved (%s, %d)", $similarity, $enable_globally);
-	}
+        echo T_sprintf("Data saved (%s, %d)", $similarity, $enable_globally);
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public function init($host) {
+        $this->host = $host;
 
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-		$host->add_hook($host::HOOK_PREFS_TAB, $this);
-		$host->add_hook($host::HOOK_PREFS_EDIT_FEED, $this);
-		$host->add_hook($host::HOOK_PREFS_SAVE_FEED, $this);
-		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+        $host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
+        $host->add_hook($host::HOOK_PREFS_TAB, $this);
+        $host->add_hook($host::HOOK_PREFS_EDIT_FEED, $this);
+        $host->add_hook($host::HOOK_PREFS_SAVE_FEED, $this);
+        $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
 
-	}
+    }
 
-	public function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
-	}
+    public function get_js() {
+        return file_get_contents(__DIR__ . "/init.js");
+    }
 
-	public function showrelated() {
-		$id = (int) $_REQUEST['param'];
-		$owner_uid = $_SESSION["uid"];
+    public function showrelated() {
+        $id = (int) $_REQUEST['param'];
+        $owner_uid = $_SESSION["uid"];
 
-		$sth = $this->pdo->prepare("SELECT title FROM ttrss_entries, ttrss_user_entries
+        $sth = $this->pdo->prepare("SELECT title FROM ttrss_entries, ttrss_user_entries
 			WHERE ref_id = id AND id = ? AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			$title = $row['title'];
+            $title = $row['title'];
 
-			print "<p>$title</p>";
+            print "<p>$title</p>";
 
-			$sth = $this->pdo->prepare("SELECT ttrss_entries.id AS id,
+            $sth = $this->pdo->prepare("SELECT ttrss_entries.id AS id,
 				feed_id,
 				ttrss_entries.title AS title,
 				updated, link,
@@ -75,77 +75,77 @@ 
 				sm DESC, date_entered DESC
 			LIMIT 10");
 
-			$sth->execute([$title, $owner_uid, $id]);
+            $sth->execute([$title, $owner_uid, $id]);
 
-			print "<ul class='panel panel-scrollable'>";
+            print "<ul class='panel panel-scrollable'>";
 
-			while ($line = $sth->fetch()) {
-				print "<li style='display : flex'>";
-				print "<i class='material-icons'>bookmark_outline</i>";
+            while ($line = $sth->fetch()) {
+                print "<li style='display : flex'>";
+                print "<i class='material-icons'>bookmark_outline</i>";
 
-				$sm = sprintf("%.2f", $line['sm']);
-				$article_link = htmlspecialchars($line["link"]);
+                $sm = sprintf("%.2f", $line['sm']);
+                $article_link = htmlspecialchars($line["link"]);
 
-				print "<div style='flex-grow : 2'>";
+                print "<div style='flex-grow : 2'>";
 
-				print " <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"$article_link\">".
-					$line["title"]."</a>";
+                print " <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"$article_link\">".
+                    $line["title"]."</a>";
 
-				print " (<a href=\"#\" onclick=\"Feeds.open({feed:".$line["feed_id"]."})\">".
-					htmlspecialchars($line["feed_title"])."</a>)";
+                print " (<a href=\"#\" onclick=\"Feeds.open({feed:".$line["feed_id"]."})\">".
+                    htmlspecialchars($line["feed_title"])."</a>)";
 
-				print " &mdash; $sm";
+                print " &mdash; $sm";
 
-				print "</div>";
+                print "</div>";
 
-				print "<div style='text-align : right' class='text-muted'>" . smart_date_time(strtotime($line["updated"])) . "</div>";
+                print "<div style='text-align : right' class='text-muted'>" . smart_date_time(strtotime($line["updated"])) . "</div>";
 
-				print "</li>";
-			}
+                print "</li>";
+            }
 
-			print "</ul>";
+            print "</ul>";
 
-		}
+        }
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('trgmRelatedDlg').hide()\">".__('Close this window')."</button>";
-		print "</footer>";
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('trgmRelatedDlg').hide()\">".__('Close this window')."</button>";
+        print "</footer>";
 
 
-	}
+    }
 
-	public function hook_article_button($line) {
-		return "<i style=\"cursor : pointer\" class='material-icons'
+    public function hook_article_button($line) {
+        return "<i style=\"cursor : pointer\" class='material-icons'
 			onclick=\"Plugins.Psql_Trgm.showRelated(".$line["id"].")\"
 			title='".__('Show related articles')."'>bookmark_outline</i>";
-	}
+    }
 
-	public function hook_prefs_tab($args) {
-		if ($args != "prefFeeds") return;
+    public function hook_prefs_tab($args) {
+        if ($args != "prefFeeds") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>extension</i> ".__('Mark similar articles as read')."\">";
 
-		if (DB_TYPE != "pgsql") {
-			print_error("Database type not supported.");
-		} else {
+        if (DB_TYPE != "pgsql") {
+            print_error("Database type not supported.");
+        } else {
 
-			$res = $this->pdo->query("select 'similarity'::regproc");
+            $res = $this->pdo->query("select 'similarity'::regproc");
 
-			if (!$res->fetch()) {
-				print_error("pg_trgm extension not found.");
-			}
+            if (!$res->fetch()) {
+                print_error("pg_trgm extension not found.");
+            }
 
-			$similarity = $this->host->get($this, "similarity");
-			$min_title_length = $this->host->get($this, "min_title_length");
-			$enable_globally = $this->host->get($this, "enable_globally");
+            $similarity = $this->host->get($this, "similarity");
+            $min_title_length = $this->host->get($this, "min_title_length");
+            $enable_globally = $this->host->get($this, "enable_globally");
 
-			if (!$similarity) $similarity = '0.75';
-			if (!$min_title_length) $min_title_length = '32';
+            if (!$similarity) $similarity = '0.75';
+            if (!$min_title_length) $min_title_length = '32';
 
-			print "<form dojoType=\"dijit.form.Form\">";
+            print "<form dojoType=\"dijit.form.Form\">";
 
-			print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
+            print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 				evt.preventDefault();
 				if (this.validate()) {
 					console.log(dojo.objectToQuery(this.getValues()));
@@ -159,190 +159,190 @@ 
 				}
 				</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "af_psql_trgm");
+            print_hidden("op", "pluginhandler");
+            print_hidden("method", "save");
+            print_hidden("plugin", "af_psql_trgm");
 
-			print "<h2>" . __("Global settings") . "</h2>";
+            print "<h2>" . __("Global settings") . "</h2>";
 
-			print_notice("Enable for specific feeds in the feed editor.");
+            print_notice("Enable for specific feeds in the feed editor.");
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>" . __("Minimum similarity:") . "</label> ";
-			print "<input dojoType=\"dijit.form.NumberSpinner\"
+            print "<label>" . __("Minimum similarity:") . "</label> ";
+            print "<input dojoType=\"dijit.form.NumberSpinner\"
 				placeholder=\"0.75\" id='psql_trgm_similarity'
 				required=\"1\" name=\"similarity\" value=\"$similarity\">";
 
-			print "<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>" .
-				__("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.") .
-				"</div>";
+            print "<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>" .
+                __("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.") .
+                "</div>";
 
-			print "</fieldset><fieldset>";
+            print "</fieldset><fieldset>";
 
-			print "<label>" . __("Minimum title length:") . "</label> ";
-			print "<input dojoType=\"dijit.form.NumberSpinner\"
+            print "<label>" . __("Minimum title length:") . "</label> ";
+            print "<input dojoType=\"dijit.form.NumberSpinner\"
 				placeholder=\"32\"
 				required=\"1\" name=\"min_title_length\" value=\"$min_title_length\">";
 
-			print "</fieldset><fieldset>";
+            print "</fieldset><fieldset>";
 
-			print "<label class='checkbox'>";
-			print_checkbox("enable_globally", $enable_globally);
-			print " " . __("Enable for all feeds:");
-			print "</label>";
+            print "<label class='checkbox'>";
+            print_checkbox("enable_globally", $enable_globally);
+            print " " . __("Enable for all feeds:");
+            print "</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			print_button("submit", __("Save"), "class='alt-primary'");
-			print "</form>";
+            print_button("submit", __("Save"), "class='alt-primary'");
+            print "</form>";
 
-			$enabled_feeds = $this->host->get($this, "enabled_feeds");
-			if (!array($enabled_feeds)) $enabled_feeds = array();
+            $enabled_feeds = $this->host->get($this, "enabled_feeds");
+            if (!array($enabled_feeds)) $enabled_feeds = array();
 
-			$enabled_feeds = $this->filter_unknown_feeds($enabled_feeds);
-			$this->host->set($this, "enabled_feeds", $enabled_feeds);
+            $enabled_feeds = $this->filter_unknown_feeds($enabled_feeds);
+            $this->host->set($this, "enabled_feeds", $enabled_feeds);
 
-			if (count($enabled_feeds) > 0) {
-				print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
+            if (count($enabled_feeds) > 0) {
+                print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
 
-				print "<ul class=\"panel panel-scrollable list list-unstyled\">";
-				foreach ($enabled_feeds as $f) {
-					print "<li>" .
-						"<i class='material-icons'>rss_feed</i> <a href='#'
+                print "<ul class=\"panel panel-scrollable list list-unstyled\">";
+                foreach ($enabled_feeds as $f) {
+                    print "<li>" .
+                        "<i class='material-icons'>rss_feed</i> <a href='#'
 							onclick='CommonDialogs.editFeed($f)'>" .
-						Feeds::getFeedTitle($f) . "</a></li>";
-				}
-				print "</ul>";
-			}
-		}
+                        Feeds::getFeedTitle($f) . "</a></li>";
+                }
+                print "</ul>";
+            }
+        }
 
-		print "</div>";
-	}
+        print "</div>";
+    }
 
-	public function hook_prefs_edit_feed($feed_id) {
-		print "<header>".__("Similarity (pg_trgm)")."</header>";
-		print "<section>";
+    public function hook_prefs_edit_feed($feed_id) {
+        print "<header>".__("Similarity (pg_trgm)")."</header>";
+        print "<section>";
 
-		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!array($enabled_feeds)) $enabled_feeds = array();
+        $enabled_feeds = $this->host->get($this, "enabled_feeds");
+        if (!array($enabled_feeds)) $enabled_feeds = array();
 
-		$key = array_search($feed_id, $enabled_feeds);
-		$checked = $key !== false ? "checked" : "";
+        $key = array_search($feed_id, $enabled_feeds);
+        $checked = $key !== false ? "checked" : "";
 
-		print "<fieldset>";
+        print "<fieldset>";
 
-		print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='trgm_similarity_enabled'
+        print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='trgm_similarity_enabled'
 			name='trgm_similarity_enabled' $checked> ".__('Mark similar articles as read')."</label>";
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		print "</section>";
-	}
+        print "</section>";
+    }
 
-	public function hook_prefs_save_feed($feed_id) {
-		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!is_array($enabled_feeds)) $enabled_feeds = array();
+    public function hook_prefs_save_feed($feed_id) {
+        $enabled_feeds = $this->host->get($this, "enabled_feeds");
+        if (!is_array($enabled_feeds)) $enabled_feeds = array();
 
-		$enable = checkbox_to_sql_bool($_POST["trgm_similarity_enabled"]);
-		$key = array_search($feed_id, $enabled_feeds);
+        $enable = checkbox_to_sql_bool($_POST["trgm_similarity_enabled"]);
+        $key = array_search($feed_id, $enabled_feeds);
 
-		if ($enable) {
-			if ($key === false) {
-				array_push($enabled_feeds, $feed_id);
-			}
-		} else {
-			if ($key !== false) {
-				unset($enabled_feeds[$key]);
-			}
-		}
+        if ($enable) {
+            if ($key === false) {
+                array_push($enabled_feeds, $feed_id);
+            }
+        } else {
+            if ($key !== false) {
+                unset($enabled_feeds[$key]);
+            }
+        }
 
-		$this->host->set($this, "enabled_feeds", $enabled_feeds);
-	}
+        $this->host->set($this, "enabled_feeds", $enabled_feeds);
+    }
 
-	public function hook_article_filter($article) {
+    public function hook_article_filter($article) {
 
-		if (DB_TYPE != "pgsql") return $article;
+        if (DB_TYPE != "pgsql") return $article;
 
-		$res = $this->pdo->query("select 'similarity'::regproc");
-		if (!$res->fetch()) return $article;
+        $res = $this->pdo->query("select 'similarity'::regproc");
+        if (!$res->fetch()) return $article;
 
-		$enable_globally = $this->host->get($this, "enable_globally");
+        $enable_globally = $this->host->get($this, "enable_globally");
 
-		if (!$enable_globally) {
-			$enabled_feeds = $this->host->get($this, "enabled_feeds");
-			$key = array_search($article["feed"]["id"], $enabled_feeds);
-			if ($key === false) return $article;
-		}
+        if (!$enable_globally) {
+            $enabled_feeds = $this->host->get($this, "enabled_feeds");
+            $key = array_search($article["feed"]["id"], $enabled_feeds);
+            if ($key === false) return $article;
+        }
 
-		$similarity = (float) $this->host->get($this, "similarity");
-		if ($similarity < 0.01) return $article;
+        $similarity = (float) $this->host->get($this, "similarity");
+        if ($similarity < 0.01) return $article;
 
-		$min_title_length = (int) $this->host->get($this, "min_title_length");
-		if (mb_strlen($article["title"]) < $min_title_length) return $article;
+        $min_title_length = (int) $this->host->get($this, "min_title_length");
+        if (mb_strlen($article["title"]) < $min_title_length) return $article;
 
-		$owner_uid = $article["owner_uid"];
-		$entry_guid = $article["guid_hashed"];
-		$title_escaped = $article["title"];
+        $owner_uid = $article["owner_uid"];
+        $entry_guid = $article["guid_hashed"];
+        $title_escaped = $article["title"];
 
-		// trgm does not return similarity=1 for completely equal strings
+        // trgm does not return similarity=1 for completely equal strings
 
-		$sth = $this->pdo->prepare("SELECT COUNT(id) AS nequal
+        $sth = $this->pdo->prepare("SELECT COUNT(id) AS nequal
 		  FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND
 		  date_entered >= NOW() - interval '3 days' AND
 		  title = ? AND
 		  guid != ? AND
 		  owner_uid = ?");
-		$sth->execute([$title_escaped, $entry_guid, $owner_uid]);
+        $sth->execute([$title_escaped, $entry_guid, $owner_uid]);
 
-		$row = $sth->fetch();
-		$nequal = $row['nequal'];
+        $row = $sth->fetch();
+        $nequal = $row['nequal'];
 
-		Debug::log("af_psql_trgm: num equals: $nequal", Debug::$LOG_EXTENDED);
+        Debug::log("af_psql_trgm: num equals: $nequal", Debug::$LOG_EXTENDED);
 
-		if ($nequal != 0) {
-			$article["force_catchup"] = true;
-			return $article;
-		}
+        if ($nequal != 0) {
+            $article["force_catchup"] = true;
+            return $article;
+        }
 
-		$sth = $this->pdo->prepare("SELECT MAX(SIMILARITY(title, ?)) AS ms
+        $sth = $this->pdo->prepare("SELECT MAX(SIMILARITY(title, ?)) AS ms
 		  FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND
 		  date_entered >= NOW() - interval '1 day' AND
 		  guid != ? AND
 		  owner_uid = ?");
-		$sth->execute([$title_escaped, $entry_guid, $owner_uid]);
+        $sth->execute([$title_escaped, $entry_guid, $owner_uid]);
 
-		$row = $sth->fetch();
-		$similarity_result = $row['ms'];
+        $row = $sth->fetch();
+        $similarity_result = $row['ms'];
 
-		Debug::log("af_psql_trgm: similarity result: $similarity_result", Debug::$LOG_EXTENDED);
+        Debug::log("af_psql_trgm: similarity result: $similarity_result", Debug::$LOG_EXTENDED);
 
-		if ($similarity_result >= $similarity) {
-			$article["force_catchup"] = true;
-		}
+        if ($similarity_result >= $similarity) {
+            $article["force_catchup"] = true;
+        }
 
-		return $article;
+        return $article;
 
-	}
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
-	private function filter_unknown_feeds($enabled_feeds) {
-		$tmp = array();
+    private function filter_unknown_feeds($enabled_feeds) {
+        $tmp = array();
 
-		foreach ($enabled_feeds as $feed) {
+        foreach ($enabled_feeds as $feed) {
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
-			$sth->execute([$feed, $_SESSION['uid']]);
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
+            $sth->execute([$feed, $_SESSION['uid']]);
 
-			if ($row = $sth->fetch()) {
-				array_push($tmp, $feed);
-			}
-		}
+            if ($row = $sth->fetch()) {
+                array_push($tmp, $feed);
+            }
+        }
 
-		return $tmp;
-	}
+        return $tmp;
+    }
 
 }

Braces +42 added lines, -14 removed lines

@@ -15,10 +15,16 @@ 
 		$min_title_length = (int) $_POST["min_title_length"];
 		$enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]);
 
-		if ($similarity < 0) $similarity = 0;
-		if ($similarity > 1) $similarity = 1;
+		if ($similarity < 0) {
+		    $similarity = 0;
+		}
+		if ($similarity > 1) {
+		    $similarity = 1;
+		}
 
-		if ($min_title_length < 0) $min_title_length = 0;
+		if ($min_title_length < 0) {
+		    $min_title_length = 0;
+		}
 
 		$similarity = sprintf("%.2f", $similarity);
 
@@ -121,7 +127,9 @@ 
 	}
 
 	public function hook_prefs_tab($args) {
-		if ($args != "prefFeeds") return;
+		if ($args != "prefFeeds") {
+		    return;
+		}
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>extension</i> ".__('Mark similar articles as read')."\">";
@@ -140,8 +148,12 @@ 
 			$min_title_length = $this->host->get($this, "min_title_length");
 			$enable_globally = $this->host->get($this, "enable_globally");
 
-			if (!$similarity) $similarity = '0.75';
-			if (!$min_title_length) $min_title_length = '32';
+			if (!$similarity) {
+			    $similarity = '0.75';
+			}
+			if (!$min_title_length) {
+			    $min_title_length = '32';
+			}
 
 			print "<form dojoType=\"dijit.form.Form\">";
 
@@ -198,7 +210,9 @@ 
 			print "</form>";
 
 			$enabled_feeds = $this->host->get($this, "enabled_feeds");
-			if (!array($enabled_feeds)) $enabled_feeds = array();
+			if (!array($enabled_feeds)) {
+			    $enabled_feeds = array();
+			}
 
 			$enabled_feeds = $this->filter_unknown_feeds($enabled_feeds);
 			$this->host->set($this, "enabled_feeds", $enabled_feeds);
@@ -225,7 +239,9 @@ 
 		print "<section>";
 
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!array($enabled_feeds)) $enabled_feeds = array();
+		if (!array($enabled_feeds)) {
+		    $enabled_feeds = array();
+		}
 
 		$key = array_search($feed_id, $enabled_feeds);
 		$checked = $key !== false ? "checked" : "";
@@ -242,7 +258,9 @@ 
 
 	public function hook_prefs_save_feed($feed_id) {
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!is_array($enabled_feeds)) $enabled_feeds = array();
+		if (!is_array($enabled_feeds)) {
+		    $enabled_feeds = array();
+		}
 
 		$enable = checkbox_to_sql_bool($_POST["trgm_similarity_enabled"]);
 		$key = array_search($feed_id, $enabled_feeds);
@@ -262,24 +280,34 @@ 
 
 	public function hook_article_filter($article) {
 
-		if (DB_TYPE != "pgsql") return $article;
+		if (DB_TYPE != "pgsql") {
+		    return $article;
+		}
 
 		$res = $this->pdo->query("select 'similarity'::regproc");
-		if (!$res->fetch()) return $article;
+		if (!$res->fetch()) {
+		    return $article;
+		}
 
 		$enable_globally = $this->host->get($this, "enable_globally");
 
 		if (!$enable_globally) {
 			$enabled_feeds = $this->host->get($this, "enabled_feeds");
 			$key = array_search($article["feed"]["id"], $enabled_feeds);
-			if ($key === false) return $article;
+			if ($key === false) {
+			    return $article;
+			}
 		}
 
 		$similarity = (float) $this->host->get($this, "similarity");
-		if ($similarity < 0.01) return $article;
+		if ($similarity < 0.01) {
+		    return $article;
+		}
 
 		$min_title_length = (int) $this->host->get($this, "min_title_length");
-		if (mb_strlen($article["title"]) < $min_title_length) return $article;
+		if (mb_strlen($article["title"]) < $min_title_length) {
+		    return $article;
+		}
 
 		$owner_uid = $article["owner_uid"];
 		$entry_guid = $article["guid_hashed"];

plugins/toggle_sidebar/init.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 	}
 
 	public function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	public function hook_main_toolbar_button() {

Indentation +19 added lines, -19 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 class Toggle_Sidebar extends Plugin {
 
-	private $host;
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Adds a main toolbar button to toggle sidebar",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Adds a main toolbar button to toggle sidebar",
+            "fox");
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public function init($host) {
+        $this->host = $host;
 
-		$host->add_hook($host::HOOK_MAIN_TOOLBAR_BUTTON, $this);
-	}
+        $host->add_hook($host::HOOK_MAIN_TOOLBAR_BUTTON, $this);
+    }
 
-	public function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
-	}
+    public function get_js() {
+        return file_get_contents(__DIR__ . "/init.js");
+    }
 
-	public function hook_main_toolbar_button() {
-		?>
+    public function hook_main_toolbar_button() {
+        ?>
 
 		<button dojoType="dijit.form.Button" onclick="Plugins.Toggle_Sidebar.toggle(this)">
 			<i class="material-icons toggle-sidebar-label"
@@ -28,11 +28,11 @@ 
 		</button>
 
 		<?php
-	}
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }
 ?>

api/index.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
         return;
     }
 
-    load_user_plugins( $_SESSION["uid"]);
+    load_user_plugins($_SESSION["uid"]);
 }
 
 $method = strtolower($_REQUEST["op"]);
@@ -84,6 +84,6 @@ 
     $handler->after();
 }
 
-header("Api-Content-Length: " . ob_get_length());
+header("Api-Content-Length: ".ob_get_length());
 
 ob_end_flush();

Braces +6 added lines, -2 removed lines

@@ -38,7 +38,9 @@ 
     // fallback on HTTP parameters
     if ($input) {
         $input = json_decode($input, true);
-        if ($input) $_REQUEST = $input;
+        if ($input) {
+            $_REQUEST = $input;
+        }
     }
 } else {
     // Accept JSON only
@@ -55,7 +57,9 @@ 
 
 startup_gettext();
 
-if (!init_plugins()) return;
+if (!init_plugins()) {
+    return;
+}
 
 if ($_SESSION["uid"]) {
     if (!validate_session()) {

update_daemon2.php

Spacing +14 added lines, -14 removed lines

@@ -1,9 +1,9 @@ 
 #!/usr/bin/env php
 <?php
-set_include_path(dirname(__FILE__) .DIRECTORY_SEPARATOR."include" . PATH_SEPARATOR .
+set_include_path(dirname(__FILE__).DIRECTORY_SEPARATOR."include".PATH_SEPARATOR.
     get_include_path());
 
-declare(ticks = 1);
+declare(ticks=1);
 chdir(dirname(__FILE__));
 
 define('DISABLE_SESSIONS', true);
@@ -93,9 +93,9 @@ 
 
 function shutdown($caller_pid) {
     if ($caller_pid == posix_getpid()) {
-        if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+        if (file_exists(LOCK_DIRECTORY."/update_daemon.lock")) {
             Debug::log("removing lockfile (master)...");
-            unlink(LOCK_DIRECTORY . "/update_daemon.lock");
+            unlink(LOCK_DIRECTORY."/update_daemon.lock");
         }
     }
 }
@@ -103,9 +103,9 @@ 
 function task_shutdown() {
     $pid = posix_getpid();
 
-    if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) {
+    if (file_exists(LOCK_DIRECTORY."/update_daemon-$pid.lock")) {
         Debug::log("removing lockfile ($pid)...");
-        unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock");
+        unlink(LOCK_DIRECTORY."/update_daemon-$pid.lock");
     }
 }
 
@@ -134,15 +134,15 @@ 
 
 $options = getopt("", $longopts);
 
-if (isset($options["help"]) ) {
+if (isset($options["help"])) {
     print "Tiny Tiny RSS update daemon.\n\n";
     print "Options:\n";
     print "  --log FILE           - log messages to FILE\n";
     print "  --log-level N        - log verbosity level\n";
     print "  --tasks N            - amount of update tasks to spawn\n";
-    print "                         default: " . MAX_JOBS . "\n";
+    print "                         default: ".MAX_JOBS."\n";
     print "  --interval N         - task spawn interval\n";
-    print "                         default: " . SPAWN_INTERVAL . " seconds.\n";
+    print "                         default: ".SPAWN_INTERVAL." seconds.\n";
     print "  --quiet              - don't output messages to stdout\n";
     return;
 }
@@ -150,13 +150,13 @@ 
 Debug::set_enabled(true);
 
 if (isset($options["log-level"])) {
-    Debug::set_loglevel((int)$options["log-level"]);
+    Debug::set_loglevel((int) $options["log-level"]);
 }
 
 if (isset($options["log"])) {
     Debug::set_quiet(isset($options['quiet']));
     Debug::set_logfile($options["log"]);
-    Debug::log("Logging to " . $options["log"]);
+    Debug::log("Logging to ".$options["log"]);
 } else {
     if (isset($options['quiet'])) {
         Debug::set_loglevel(Debug::$LOG_DISABLED);
@@ -164,14 +164,14 @@ 
 }
 
 if (isset($options["tasks"])) {
-    Debug::log("Set to spawn " . $options["tasks"] . " children.");
+    Debug::log("Set to spawn ".$options["tasks"]." children.");
     $max_jobs = $options["tasks"];
 } else {
     $max_jobs = MAX_JOBS;
 }
 
 if (isset($options["interval"])) {
-    Debug::log("Spawn interval: " . $options["interval"] . " seconds.");
+    Debug::log("Spawn interval: ".$options["interval"]." seconds.");
     $spawn_interval = $options["interval"];
 } else {
     $spawn_interval = SPAWN_INTERVAL;
@@ -246,7 +246,7 @@ 
 
                 $my_pid = posix_getpid();
 
-                passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
+                passthru(PHP_EXECUTABLE." update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
 
                 sleep(1);
 

update.php

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 #!/usr/bin/env php
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	define('DISABLE_SESSIONS', true);
@@ -88,7 +88,7 @@ 
 			"help");
 
 	foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
-		array_push($longopts, $command . $data["suffix"]);
+		array_push($longopts, $command.$data["suffix"]);
 	}
 
 	$options = getopt("", $longopts);
@@ -119,7 +119,7 @@ 
 		exit;
 	}
 
-	if (count($options) == 0 || isset($options["help"]) ) {
+	if (count($options) == 0 || isset($options["help"])) {
 		print "Tiny Tiny RSS data update script.\n\n";
 		print "Options:\n";
 		print "  --feeds              - update feeds\n";
@@ -165,13 +165,13 @@ 
 	Debug::set_enabled(true);
 
 	if (isset($options["log-level"])) {
-	    Debug::set_loglevel((int)$options["log-level"]);
+	    Debug::set_loglevel((int) $options["log-level"]);
     }
 
 	if (isset($options["log"])) {
 		Debug::set_quiet(isset($options['quiet']));
 		Debug::set_logfile($options["log"]);
-        Debug::log("Logging to " . $options["log"]);
+        Debug::log("Logging to ".$options["log"]);
     } else {
 	    if (isset($options['quiet'])) {
 			Debug::set_loglevel(Debug::$LOG_DISABLED);
@@ -185,8 +185,8 @@ 
 	}
 
 	if (isset($options["task"])) {
-		Debug::log("Using task id " . $options["task"]);
-		$lock_filename = $lock_filename . "-task_" . $options["task"];
+		Debug::log("Using task id ".$options["task"]);
+		$lock_filename = $lock_filename."-task_".$options["task"];
 	}
 
 	if (isset($options["pidlock"])) {
@@ -215,7 +215,7 @@ 
 	if (isset($options["force-update"])) {
 		Debug::log("marking all feeds as needing update...");
 
-		$pdo->query( "UPDATE ttrss_feeds SET
+		$pdo->query("UPDATE ttrss_feeds SET
           last_update_started = '1970-01-01', last_updated = '1970-01-01'");
 	}
 
@@ -232,7 +232,7 @@ 
             $log = isset($options['log']) ? '--log '.$options['log'] : '';
             $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : '';
 
-			passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
+			passthru(PHP_EXECUTABLE." ".$argv[0]." --daemon-loop $quiet $log $log_level");
 
 			// let's enforce a minimum spawn interval as to not forkbomb the host
 			$spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
@@ -256,7 +256,7 @@ 
 	}
 
 	if (isset($options["cleanup-tags"])) {
-		$rc = cleanup_tags( 14, 50000);
+		$rc = cleanup_tags(14, 50000);
 		Debug::log("$rc tags deleted.\n");
 	}
 
@@ -270,18 +270,18 @@ 
 		Debug::log("clearing existing indexes...");
 
 		if (DB_TYPE == "pgsql") {
-			$sth = $pdo->query( "SELECT relname FROM
+			$sth = $pdo->query("SELECT relname FROM
 				pg_catalog.pg_class WHERE relname LIKE 'ttrss_%'
 					AND relname NOT LIKE '%_pkey'
 				AND relkind = 'i'");
 		} else {
-			$sth = $pdo->query( "SELECT index_name,table_name FROM
+			$sth = $pdo->query("SELECT index_name,table_name FROM
 				information_schema.statistics WHERE index_name LIKE 'ttrss_%'");
 		}
 
 		while ($line = $sth->fetch()) {
 			if (DB_TYPE == "pgsql") {
-				$statement = "DROP INDEX " . $line["relname"];
+				$statement = "DROP INDEX ".$line["relname"];
 				Debug::log($statement);
 			} else {
 				$statement = "ALTER TABLE ".
@@ -291,9 +291,9 @@ 
 			$pdo->query($statement);
 		}
 
-		Debug::log("reading indexes from schema for: " . DB_TYPE);
+		Debug::log("reading indexes from schema for: ".DB_TYPE);
 
-		$fp = fopen("schema/ttrss_schema_" . DB_TYPE . ".sql", "r");
+		$fp = fopen("schema/ttrss_schema_".DB_TYPE.".sql", "r");
 		if ($fp) {
 			while ($line = fgets($fp)) {
 				$matches = array();
@@ -336,9 +336,9 @@ 
 				$filter = array();
 
 				if (sql_bool_to_bool($line["cat_filter"])) {
-					$feed_id = "CAT:" . (int)$line["cat_id"];
+					$feed_id = "CAT:".(int) $line["cat_id"];
 				} else {
-					$feed_id = (int)$line["feed_id"];
+					$feed_id = (int) $line["feed_id"];
 				}
 
 				$filter["enabled"] = $line["enabled"] ? "on" : "off";
@@ -367,12 +367,12 @@ 
 	}
 
 	if (isset($options["update-schema"])) {
-		Debug::log("Checking for updates (" . DB_TYPE . ")...");
+		Debug::log("Checking for updates (".DB_TYPE.")...");
 
 		$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
 
 		if ($updater->isUpdateRequired()) {
-			Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
+			Debug::log("Schema update required, version ".$updater->getSchemaVersion()." to ".SCHEMA_VERSION);
 
 			if (DB_TYPE == "mysql")
 				Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
@@ -385,7 +385,7 @@ 
 			if (read_stdin() != 'yes')
 				exit;
 
-			Debug::log("Performing updates to version " . SCHEMA_VERSION);
+			Debug::log("Performing updates to version ".SCHEMA_VERSION);
 
 			for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
 				Debug::log("* Updating to version $i...");
@@ -428,7 +428,7 @@ 
 		while (true) {
 
 			while ($line = $sth->fetch()) {
-				$tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
+				$tsvector_combined = mb_substr(strip_tags($line["title"]." ".$line["content"]), 0, 1000000);
 
 				$usth->execute([$tsvector_combined, $line['id']]);
 
@@ -485,7 +485,7 @@ 
 
 	PluginHost::getInstance()->run_commands($options);
 
-	if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
+	if (file_exists(LOCK_DIRECTORY."/$lock_filename"))
 		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
 			fclose($lock_handle);
-		unlink(LOCK_DIRECTORY . "/$lock_filename");
+		unlink(LOCK_DIRECTORY."/$lock_filename");

Braces +32 added lines, -19 removed lines

@@ -59,8 +59,9 @@ 
 		return $tags_deleted;
 	}
 
-	if (!defined('PHP_EXECUTABLE'))
-		define('PHP_EXECUTABLE', '/usr/bin/php');
+	if (!defined('PHP_EXECUTABLE')) {
+			define('PHP_EXECUTABLE', '/usr/bin/php');
+	}
 
 	$pdo = Db::pdo();
 
@@ -249,8 +250,9 @@ 
 
 		RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
 
-		if (!isset($options["pidlock"]) || $options["task"] == 0)
-			RSSUtils::housekeeping_common(true);
+		if (!isset($options["pidlock"]) || $options["task"] == 0) {
+					RSSUtils::housekeeping_common(true);
+		}
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 	}
@@ -264,8 +266,9 @@ 
 		Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
 		Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+		if (read_stdin() != 'yes') {
+					exit;
+		}
 
 		Debug::log("clearing existing indexes...");
 
@@ -319,8 +322,9 @@ 
 		Debug::log("WARNING: this will remove all existing type2 filters.");
 		Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+		if (read_stdin() != 'yes') {
+					exit;
+		}
 
 		Debug::log("converting filters...");
 
@@ -374,16 +378,18 @@ 
 		if ($updater->isUpdateRequired()) {
 			Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
 
-			if (DB_TYPE == "mysql")
-				Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
+			if (DB_TYPE == "mysql") {
+							Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
 					"Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
-			else
-				Debug::log("WARNING: please backup your database before continuing.");
+			} else {
+							Debug::log("WARNING: please backup your database before continuing.");
+			}
 
 			Debug::log("Type 'yes' to continue.");
 
-			if (read_stdin() != 'yes')
-				exit;
+			if (read_stdin() != 'yes') {
+							exit;
+			}
 
 			Debug::log("Performing updates to version " . SCHEMA_VERSION);
 
@@ -456,7 +462,9 @@ 
 
 			$status = $about[3] ? "system" : "user";
 
-			if (in_array($name, $enabled)) $name .= "*";
+			if (in_array($name, $enabled)) {
+			    $name .= "*";
+			}
 
 			printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
 				$name, $status, $about[0], $about[2], $about[1]);
@@ -469,8 +477,12 @@ 
 	if (isset($options["debug-feed"])) {
 		$feed = $options["debug-feed"];
 
-		if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
-		if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
+		if (isset($options["force-refetch"])) {
+		    $_REQUEST["force_refetch"] = true;
+		}
+		if (isset($options["force-rehash"])) {
+		    $_REQUEST["force_rehash"] = true;
+		}
 
 		Debug::set_loglevel(Debug::$LOG_EXTENDED);
 
@@ -485,7 +497,8 @@ 
 
 	PluginHost::getInstance()->run_commands($options);
 
-	if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
-		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
+	if (file_exists(LOCK_DIRECTORY . "/$lock_filename")) {
+			if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
 			fclose($lock_handle);
+	}
 		unlink(LOCK_DIRECTORY . "/$lock_filename");

Indentation +363 added lines, -363 removed lines

@@ -1,107 +1,107 @@ 
 #!/usr/bin/env php
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
-		get_include_path());
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+        get_include_path());
 
-	define('DISABLE_SESSIONS', true);
+    define('DISABLE_SESSIONS', true);
 
-	chdir(dirname(__FILE__));
+    chdir(dirname(__FILE__));
 
-	require_once "autoload.php";
-	require_once "functions.php";
-	require_once "config.php";
-	require_once "sanity_check.php";
-	require_once "db.php";
-	require_once "db-prefs.php";
+    require_once "autoload.php";
+    require_once "functions.php";
+    require_once "config.php";
+    require_once "sanity_check.php";
+    require_once "db.php";
+    require_once "db-prefs.php";
 
-	function cleanup_tags($days = 14, $limit = 1000) {
+    function cleanup_tags($days = 14, $limit = 1000) {
 
-		$days = (int) $days;
+        $days = (int) $days;
 
-		if (DB_TYPE == "pgsql") {
-			$interval_query = "date_updated < NOW() - INTERVAL '$days days'";
-		} else if (DB_TYPE == "mysql") {
-			$interval_query = "date_updated < DATE_SUB(NOW(), INTERVAL $days DAY)";
-		}
+        if (DB_TYPE == "pgsql") {
+            $interval_query = "date_updated < NOW() - INTERVAL '$days days'";
+        } else if (DB_TYPE == "mysql") {
+            $interval_query = "date_updated < DATE_SUB(NOW(), INTERVAL $days DAY)";
+        }
 
-		$tags_deleted = 0;
+        $tags_deleted = 0;
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		while ($limit > 0) {
-			$limit_part = 500;
+        while ($limit > 0) {
+            $limit_part = 500;
 
-			$sth = $pdo->prepare("SELECT ttrss_tags.id AS id
+            $sth = $pdo->prepare("SELECT ttrss_tags.id AS id
 						FROM ttrss_tags, ttrss_user_entries, ttrss_entries
 						WHERE post_int_id = int_id AND $interval_query AND
 						ref_id = ttrss_entries.id AND tag_cache != '' LIMIT ?");
-			$sth->bindValue(1, $limit_part, PDO::PARAM_INT);
-			$sth->execute();
-
-			$ids = array();
-
-			while ($line = $sth->fetch()) {
-				array_push($ids, $line['id']);
-			}
-
-			if (count($ids) > 0) {
-				$ids = join(",", $ids);
-
-				$usth = $pdo->query("DELETE FROM ttrss_tags WHERE id IN ($ids)");
-				$tags_deleted = $usth->rowCount();
-			} else {
-				break;
-			}
-
-			$limit -= $limit_part;
-		}
-
-		return $tags_deleted;
-	}
-
-	if (!defined('PHP_EXECUTABLE'))
-		define('PHP_EXECUTABLE', '/usr/bin/php');
-
-	$pdo = Db::pdo();
-
-	init_plugins();
-
-	$longopts = array("feeds",
-			"daemon",
-			"daemon-loop",
-			"send-digests",
-			"task:",
-			"cleanup-tags",
-			"quiet",
-			"log:",
-			"log-level:",
-			"indexes",
-			"pidlock:",
-			"update-schema",
-			"convert-filters",
-			"force-update",
-			"gen-search-idx",
-			"list-plugins",
-			"debug-feed:",
-			"force-refetch",
-			"force-rehash",
-			"help");
-
-	foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
-		array_push($longopts, $command . $data["suffix"]);
-	}
-
-	$options = getopt("", $longopts);
-
-	if (!is_array($options)) {
-		die("error: getopt() failed. ".
-			"Most probably you are using PHP CGI to run this script ".
-			"instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
-			"additional information.\n");
-	}
-
-	if (count($options) == 0 && !defined('STDIN')) {
-		?>
+            $sth->bindValue(1, $limit_part, PDO::PARAM_INT);
+            $sth->execute();
+
+            $ids = array();
+
+            while ($line = $sth->fetch()) {
+                array_push($ids, $line['id']);
+            }
+
+            if (count($ids) > 0) {
+                $ids = join(",", $ids);
+
+                $usth = $pdo->query("DELETE FROM ttrss_tags WHERE id IN ($ids)");
+                $tags_deleted = $usth->rowCount();
+            } else {
+                break;
+            }
+
+            $limit -= $limit_part;
+        }
+
+        return $tags_deleted;
+    }
+
+    if (!defined('PHP_EXECUTABLE'))
+        define('PHP_EXECUTABLE', '/usr/bin/php');
+
+    $pdo = Db::pdo();
+
+    init_plugins();
+
+    $longopts = array("feeds",
+            "daemon",
+            "daemon-loop",
+            "send-digests",
+            "task:",
+            "cleanup-tags",
+            "quiet",
+            "log:",
+            "log-level:",
+            "indexes",
+            "pidlock:",
+            "update-schema",
+            "convert-filters",
+            "force-update",
+            "gen-search-idx",
+            "list-plugins",
+            "debug-feed:",
+            "force-refetch",
+            "force-rehash",
+            "help");
+
+    foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
+        array_push($longopts, $command . $data["suffix"]);
+    }
+
+    $options = getopt("", $longopts);
+
+    if (!is_array($options)) {
+        die("error: getopt() failed. ".
+            "Most probably you are using PHP CGI to run this script ".
+            "instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
+            "additional information.\n");
+    }
+
+    if (count($options) == 0 && !defined('STDIN')) {
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
@@ -116,376 +116,376 @@ 
 
 		</body></html>
 	<?php
-		exit;
-	}
-
-	if (count($options) == 0 || isset($options["help"]) ) {
-		print "Tiny Tiny RSS data update script.\n\n";
-		print "Options:\n";
-		print "  --feeds              - update feeds\n";
-		print "  --daemon             - start single-process update daemon\n";
-		print "  --task N             - create lockfile using this task id\n";
-		print "  --cleanup-tags       - perform tags table maintenance\n";
-		print "  --quiet              - don't output messages to stdout\n";
-		print "  --log FILE           - log messages to FILE\n";
-		print "  --log-level N        - log verbosity level\n";
-		print "  --indexes            - recreate missing schema indexes\n";
-		print "  --update-schema      - update database schema\n";
-		print "  --gen-search-idx     - generate basic PostgreSQL fulltext search index\n";
-		print "  --convert-filters    - convert type1 filters to type2\n";
-		print "  --send-digests       - send pending email digests\n";
-		print "  --force-update       - force update of all feeds\n";
-		print "  --list-plugins       - list all available plugins\n";
-		print "  --debug-feed N       - perform debug update of feed N\n";
-		print "  --force-refetch      - debug update: force refetch feed data\n";
-		print "  --force-rehash       - debug update: force rehash articles\n";
-		print "  --help               - show this help\n";
-		print "Plugin options:\n";
-
-		foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
-			$args = $data['arghelp'];
-			printf(" --%-19s - %s\n", "$command $args", $data["description"]);
-		}
-
-		return;
-	}
-
-	if (!isset($options['daemon'])) {
-		require_once "errorhandler.php";
-	}
-
-	if (!isset($options['update-schema'])) {
-		$schema_version = get_schema_version();
-
-		if ($schema_version != SCHEMA_VERSION) {
-			die("Schema version is wrong, please upgrade the database (--update-schema).\n");
-		}
-	}
-
-	Debug::set_enabled(true);
-
-	if (isset($options["log-level"])) {
-	    Debug::set_loglevel((int)$options["log-level"]);
+        exit;
+    }
+
+    if (count($options) == 0 || isset($options["help"]) ) {
+        print "Tiny Tiny RSS data update script.\n\n";
+        print "Options:\n";
+        print "  --feeds              - update feeds\n";
+        print "  --daemon             - start single-process update daemon\n";
+        print "  --task N             - create lockfile using this task id\n";
+        print "  --cleanup-tags       - perform tags table maintenance\n";
+        print "  --quiet              - don't output messages to stdout\n";
+        print "  --log FILE           - log messages to FILE\n";
+        print "  --log-level N        - log verbosity level\n";
+        print "  --indexes            - recreate missing schema indexes\n";
+        print "  --update-schema      - update database schema\n";
+        print "  --gen-search-idx     - generate basic PostgreSQL fulltext search index\n";
+        print "  --convert-filters    - convert type1 filters to type2\n";
+        print "  --send-digests       - send pending email digests\n";
+        print "  --force-update       - force update of all feeds\n";
+        print "  --list-plugins       - list all available plugins\n";
+        print "  --debug-feed N       - perform debug update of feed N\n";
+        print "  --force-refetch      - debug update: force refetch feed data\n";
+        print "  --force-rehash       - debug update: force rehash articles\n";
+        print "  --help               - show this help\n";
+        print "Plugin options:\n";
+
+        foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
+            $args = $data['arghelp'];
+            printf(" --%-19s - %s\n", "$command $args", $data["description"]);
+        }
+
+        return;
+    }
+
+    if (!isset($options['daemon'])) {
+        require_once "errorhandler.php";
+    }
+
+    if (!isset($options['update-schema'])) {
+        $schema_version = get_schema_version();
+
+        if ($schema_version != SCHEMA_VERSION) {
+            die("Schema version is wrong, please upgrade the database (--update-schema).\n");
+        }
+    }
+
+    Debug::set_enabled(true);
+
+    if (isset($options["log-level"])) {
+        Debug::set_loglevel((int)$options["log-level"]);
     }
 
-	if (isset($options["log"])) {
-		Debug::set_quiet(isset($options['quiet']));
-		Debug::set_logfile($options["log"]);
+    if (isset($options["log"])) {
+        Debug::set_quiet(isset($options['quiet']));
+        Debug::set_logfile($options["log"]);
         Debug::log("Logging to " . $options["log"]);
     } else {
-	    if (isset($options['quiet'])) {
-			Debug::set_loglevel(Debug::$LOG_DISABLED);
+        if (isset($options['quiet'])) {
+            Debug::set_loglevel(Debug::$LOG_DISABLED);
         }
     }
 
-	if (!isset($options["daemon"])) {
-		$lock_filename = "update.lock";
-	} else {
-		$lock_filename = "update_daemon.lock";
-	}
+    if (!isset($options["daemon"])) {
+        $lock_filename = "update.lock";
+    } else {
+        $lock_filename = "update_daemon.lock";
+    }
 
-	if (isset($options["task"])) {
-		Debug::log("Using task id " . $options["task"]);
-		$lock_filename = $lock_filename . "-task_" . $options["task"];
-	}
+    if (isset($options["task"])) {
+        Debug::log("Using task id " . $options["task"]);
+        $lock_filename = $lock_filename . "-task_" . $options["task"];
+    }
 
-	if (isset($options["pidlock"])) {
-		$my_pid = $options["pidlock"];
-		$lock_filename = "update_daemon-$my_pid.lock";
+    if (isset($options["pidlock"])) {
+        $my_pid = $options["pidlock"];
+        $lock_filename = "update_daemon-$my_pid.lock";
 
-	}
+    }
 
-	Debug::log("Lock: $lock_filename");
+    Debug::log("Lock: $lock_filename");
 
-	$lock_handle = make_lockfile($lock_filename);
-	$must_exit = false;
+    $lock_handle = make_lockfile($lock_filename);
+    $must_exit = false;
 
-	if (isset($options["task"]) && isset($options["pidlock"])) {
-		$waits = $options["task"] * 5;
-		Debug::log("Waiting before update ($waits)");
-		sleep($waits);
-	}
+    if (isset($options["task"]) && isset($options["pidlock"])) {
+        $waits = $options["task"] * 5;
+        Debug::log("Waiting before update ($waits)");
+        sleep($waits);
+    }
 
-	// Try to lock a file in order to avoid concurrent update.
-	if (!$lock_handle) {
-		die("error: Can't create lockfile ($lock_filename). ".
-			"Maybe another update process is already running.\n");
-	}
+    // Try to lock a file in order to avoid concurrent update.
+    if (!$lock_handle) {
+        die("error: Can't create lockfile ($lock_filename). ".
+            "Maybe another update process is already running.\n");
+    }
 
-	if (isset($options["force-update"])) {
-		Debug::log("marking all feeds as needing update...");
+    if (isset($options["force-update"])) {
+        Debug::log("marking all feeds as needing update...");
 
-		$pdo->query( "UPDATE ttrss_feeds SET
+        $pdo->query( "UPDATE ttrss_feeds SET
           last_update_started = '1970-01-01', last_updated = '1970-01-01'");
-	}
+    }
 
-	if (isset($options["feeds"])) {
-		RSSUtils::update_daemon_common();
-		RSSUtils::housekeeping_common(true);
+    if (isset($options["feeds"])) {
+        RSSUtils::update_daemon_common();
+        RSSUtils::housekeeping_common(true);
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
-	}
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+    }
 
-	if (isset($options["daemon"])) {
-		while (true) {
-			$quiet = (isset($options["quiet"])) ? "--quiet" : "";
+    if (isset($options["daemon"])) {
+        while (true) {
+            $quiet = (isset($options["quiet"])) ? "--quiet" : "";
             $log = isset($options['log']) ? '--log '.$options['log'] : '';
             $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : '';
 
-			passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
+            passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
 
-			// let's enforce a minimum spawn interval as to not forkbomb the host
-			$spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
+            // let's enforce a minimum spawn interval as to not forkbomb the host
+            $spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
 
-			Debug::log("Sleeping for $spawn_interval seconds...");
-			sleep($spawn_interval);
-		}
-	}
+            Debug::log("Sleeping for $spawn_interval seconds...");
+            sleep($spawn_interval);
+        }
+    }
 
-	if (isset($options["daemon-loop"])) {
-		if (!make_stampfile('update_daemon.stamp')) {
-			Debug::log("warning: unable to create stampfile\n");
-		}
+    if (isset($options["daemon-loop"])) {
+        if (!make_stampfile('update_daemon.stamp')) {
+            Debug::log("warning: unable to create stampfile\n");
+        }
 
-		RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
+        RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
 
-		if (!isset($options["pidlock"]) || $options["task"] == 0)
-			RSSUtils::housekeeping_common(true);
+        if (!isset($options["pidlock"]) || $options["task"] == 0)
+            RSSUtils::housekeeping_common(true);
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
-	}
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+    }
 
-	if (isset($options["cleanup-tags"])) {
-		$rc = cleanup_tags( 14, 50000);
-		Debug::log("$rc tags deleted.\n");
-	}
+    if (isset($options["cleanup-tags"])) {
+        $rc = cleanup_tags( 14, 50000);
+        Debug::log("$rc tags deleted.\n");
+    }
 
-	if (isset($options["indexes"])) {
-		Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
-		Debug::log("Type 'yes' to continue.");
+    if (isset($options["indexes"])) {
+        Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
+        Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+        if (read_stdin() != 'yes')
+            exit;
 
-		Debug::log("clearing existing indexes...");
+        Debug::log("clearing existing indexes...");
 
-		if (DB_TYPE == "pgsql") {
-			$sth = $pdo->query( "SELECT relname FROM
+        if (DB_TYPE == "pgsql") {
+            $sth = $pdo->query( "SELECT relname FROM
 				pg_catalog.pg_class WHERE relname LIKE 'ttrss_%'
 					AND relname NOT LIKE '%_pkey'
 				AND relkind = 'i'");
-		} else {
-			$sth = $pdo->query( "SELECT index_name,table_name FROM
+        } else {
+            $sth = $pdo->query( "SELECT index_name,table_name FROM
 				information_schema.statistics WHERE index_name LIKE 'ttrss_%'");
-		}
-
-		while ($line = $sth->fetch()) {
-			if (DB_TYPE == "pgsql") {
-				$statement = "DROP INDEX " . $line["relname"];
-				Debug::log($statement);
-			} else {
-				$statement = "ALTER TABLE ".
-					$line['table_name']." DROP INDEX ".$line['index_name'];
-				Debug::log($statement);
-			}
-			$pdo->query($statement);
-		}
+        }
 
-		Debug::log("reading indexes from schema for: " . DB_TYPE);
+        while ($line = $sth->fetch()) {
+            if (DB_TYPE == "pgsql") {
+                $statement = "DROP INDEX " . $line["relname"];
+                Debug::log($statement);
+            } else {
+                $statement = "ALTER TABLE ".
+                    $line['table_name']." DROP INDEX ".$line['index_name'];
+                Debug::log($statement);
+            }
+            $pdo->query($statement);
+        }
 
-		$fp = fopen("schema/ttrss_schema_" . DB_TYPE . ".sql", "r");
-		if ($fp) {
-			while ($line = fgets($fp)) {
-				$matches = array();
+        Debug::log("reading indexes from schema for: " . DB_TYPE);
 
-				if (preg_match("/^create index ([^ ]+) on ([^ ]+)$/i", $line, $matches)) {
-					$index = $matches[1];
-					$table = $matches[2];
+        $fp = fopen("schema/ttrss_schema_" . DB_TYPE . ".sql", "r");
+        if ($fp) {
+            while ($line = fgets($fp)) {
+                $matches = array();
 
-					$statement = "CREATE INDEX $index ON $table";
+                if (preg_match("/^create index ([^ ]+) on ([^ ]+)$/i", $line, $matches)) {
+                    $index = $matches[1];
+                    $table = $matches[2];
 
-					Debug::log($statement);
-					$pdo->query($statement);
-				}
-			}
-			fclose($fp);
-		} else {
-			Debug::log("unable to open schema file.");
-		}
-		Debug::log("all done.");
-	}
+                    $statement = "CREATE INDEX $index ON $table";
 
-	if (isset($options["convert-filters"])) {
-		Debug::log("WARNING: this will remove all existing type2 filters.");
-		Debug::log("Type 'yes' to continue.");
+                    Debug::log($statement);
+                    $pdo->query($statement);
+                }
+            }
+            fclose($fp);
+        } else {
+            Debug::log("unable to open schema file.");
+        }
+        Debug::log("all done.");
+    }
 
-		if (read_stdin() != 'yes')
-			exit;
+    if (isset($options["convert-filters"])) {
+        Debug::log("WARNING: this will remove all existing type2 filters.");
+        Debug::log("Type 'yes' to continue.");
 
-		Debug::log("converting filters...");
+        if (read_stdin() != 'yes')
+            exit;
 
-		$pdo->query("DELETE FROM ttrss_filters2");
+        Debug::log("converting filters...");
 
-		$res = $pdo->query("SELECT * FROM ttrss_filters ORDER BY id");
+        $pdo->query("DELETE FROM ttrss_filters2");
 
-		while ($line = $res->fetch()) {
-			$owner_uid = $line["owner_uid"];
+        $res = $pdo->query("SELECT * FROM ttrss_filters ORDER BY id");
 
-			// date filters are removed
-			if ($line["filter_type"] != 5) {
-				$filter = array();
+        while ($line = $res->fetch()) {
+            $owner_uid = $line["owner_uid"];
 
-				if (sql_bool_to_bool($line["cat_filter"])) {
-					$feed_id = "CAT:" . (int)$line["cat_id"];
-				} else {
-					$feed_id = (int)$line["feed_id"];
-				}
+            // date filters are removed
+            if ($line["filter_type"] != 5) {
+                $filter = array();
 
-				$filter["enabled"] = $line["enabled"] ? "on" : "off";
-				$filter["rule"] = array(
-					json_encode(array(
-						"reg_exp" => $line["reg_exp"],
-						"feed_id" => $feed_id,
-						"filter_type" => $line["filter_type"])));
+                if (sql_bool_to_bool($line["cat_filter"])) {
+                    $feed_id = "CAT:" . (int)$line["cat_id"];
+                } else {
+                    $feed_id = (int)$line["feed_id"];
+                }
 
-				$filter["action"] = array(
-					json_encode(array(
-						"action_id" => $line["action_id"],
-						"action_param_label" => $line["action_param"],
-						"action_param" => $line["action_param"])));
+                $filter["enabled"] = $line["enabled"] ? "on" : "off";
+                $filter["rule"] = array(
+                    json_encode(array(
+                        "reg_exp" => $line["reg_exp"],
+                        "feed_id" => $feed_id,
+                        "filter_type" => $line["filter_type"])));
 
-				// Oh god it's full of hacks
+                $filter["action"] = array(
+                    json_encode(array(
+                        "action_id" => $line["action_id"],
+                        "action_param_label" => $line["action_param"],
+                        "action_param" => $line["action_param"])));
 
-				$_REQUEST = $filter;
-				$_SESSION["uid"] = $owner_uid;
+                // Oh god it's full of hacks
 
-				$filters = new Pref_Filters($_REQUEST);
-				$filters->add();
-			}
-		}
+                $_REQUEST = $filter;
+                $_SESSION["uid"] = $owner_uid;
 
-	}
+                $filters = new Pref_Filters($_REQUEST);
+                $filters->add();
+            }
+        }
 
-	if (isset($options["update-schema"])) {
-		Debug::log("Checking for updates (" . DB_TYPE . ")...");
+    }
+
+    if (isset($options["update-schema"])) {
+        Debug::log("Checking for updates (" . DB_TYPE . ")...");
 
-		$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
+        $updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
 
-		if ($updater->isUpdateRequired()) {
-			Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
+        if ($updater->isUpdateRequired()) {
+            Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
 
-			if (DB_TYPE == "mysql")
-				Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
-					"Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
-			else
-				Debug::log("WARNING: please backup your database before continuing.");
+            if (DB_TYPE == "mysql")
+                Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
+                    "Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
+            else
+                Debug::log("WARNING: please backup your database before continuing.");
 
-			Debug::log("Type 'yes' to continue.");
+            Debug::log("Type 'yes' to continue.");
 
-			if (read_stdin() != 'yes')
-				exit;
+            if (read_stdin() != 'yes')
+                exit;
 
-			Debug::log("Performing updates to version " . SCHEMA_VERSION);
+            Debug::log("Performing updates to version " . SCHEMA_VERSION);
 
-			for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
-				Debug::log("* Updating to version $i...");
+            for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+                Debug::log("* Updating to version $i...");
 
-				$result = $updater->performUpdateTo($i, false);
+                $result = $updater->performUpdateTo($i, false);
 
-				if ($result) {
-					Debug::log("* Completed.");
-				} else {
-					Debug::log("One of the updates failed. Either retry the process or perform updates manually.");
-					return;
-				}
+                if ($result) {
+                    Debug::log("* Completed.");
+                } else {
+                    Debug::log("One of the updates failed. Either retry the process or perform updates manually.");
+                    return;
+                }
 
-			}
-		} else {
-			Debug::log("Update not required.");
-		}
+            }
+        } else {
+            Debug::log("Update not required.");
+        }
 
-	}
+    }
 
-	if (isset($options["gen-search-idx"])) {
-		echo "Generating search index (stemming set to English)...\n";
+    if (isset($options["gen-search-idx"])) {
+        echo "Generating search index (stemming set to English)...\n";
 
-		$res = $pdo->query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL");
-		$row = $res->fetch();
-		$count = $row['count'];
+        $res = $pdo->query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL");
+        $row = $res->fetch();
+        $count = $row['count'];
 
-		print "Articles to process: $count.\n";
+        print "Articles to process: $count.\n";
 
-		$limit = 500;
-		$processed = 0;
+        $limit = 500;
+        $processed = 0;
 
-		$sth = $pdo->prepare("SELECT id, title, content FROM ttrss_entries WHERE
+        $sth = $pdo->prepare("SELECT id, title, content FROM ttrss_entries WHERE
           tsvector_combined IS NULL ORDER BY id LIMIT ?");
-		$sth->execute([$limit]);
+        $sth->execute([$limit]);
 
-		$usth = $pdo->prepare("UPDATE ttrss_entries
+        $usth = $pdo->prepare("UPDATE ttrss_entries
           SET tsvector_combined = to_tsvector('english', ?) WHERE id = ?");
 
-		while (true) {
+        while (true) {
 
-			while ($line = $sth->fetch()) {
-				$tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
+            while ($line = $sth->fetch()) {
+                $tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
 
-				$usth->execute([$tsvector_combined, $line['id']]);
+                $usth->execute([$tsvector_combined, $line['id']]);
 
-				$processed++;
-			}
+                $processed++;
+            }
 
-			print "processed $processed articles...\n";
+            print "processed $processed articles...\n";
 
-			if ($processed < $limit) {
-				echo "All done.\n";
-				break;
-			}
-		}
-	}
+            if ($processed < $limit) {
+                echo "All done.\n";
+                break;
+            }
+        }
+    }
 
-	if (isset($options["list-plugins"])) {
-		$tmppluginhost = new PluginHost();
-		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, false);
-		$enabled = array_map("trim", explode(",", PLUGINS));
+    if (isset($options["list-plugins"])) {
+        $tmppluginhost = new PluginHost();
+        $tmppluginhost->load_all($tmppluginhost::KIND_ALL, false);
+        $enabled = array_map("trim", explode(",", PLUGINS));
 
-		echo "List of all available plugins:\n";
+        echo "List of all available plugins:\n";
 
-		foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
-			$about = $plugin->about();
+        foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
+            $about = $plugin->about();
 
-			$status = $about[3] ? "system" : "user";
+            $status = $about[3] ? "system" : "user";
 
-			if (in_array($name, $enabled)) $name .= "*";
+            if (in_array($name, $enabled)) $name .= "*";
 
-			printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
-				$name, $status, $about[0], $about[2], $about[1]);
-		}
+            printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
+                $name, $status, $about[0], $about[2], $about[1]);
+        }
 
-		echo "Plugins marked by * are currently enabled for all users.\n";
+        echo "Plugins marked by * are currently enabled for all users.\n";
 
-	}
+    }
 
-	if (isset($options["debug-feed"])) {
-		$feed = $options["debug-feed"];
+    if (isset($options["debug-feed"])) {
+        $feed = $options["debug-feed"];
 
-		if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
-		if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
+        if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
+        if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
 
-		Debug::set_loglevel(Debug::$LOG_EXTENDED);
+        Debug::set_loglevel(Debug::$LOG_EXTENDED);
 
-		$rc = RSSUtils::update_rss_feed($feed) != false ? 0 : 1;
+        $rc = RSSUtils::update_rss_feed($feed) != false ? 0 : 1;
 
-		exit($rc);
-	}
+        exit($rc);
+    }
 
-	if (isset($options["send-digests"])) {
-		Digest::send_headlines_digests();
-	}
+    if (isset($options["send-digests"])) {
+        Digest::send_headlines_digests();
+    }
 
-	PluginHost::getInstance()->run_commands($options);
+    PluginHost::getInstance()->run_commands($options);
 
-	if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
-		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
-			fclose($lock_handle);
-		unlink(LOCK_DIRECTORY . "/$lock_filename");
+    if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
+        if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
+            fclose($lock_handle);
+        unlink(LOCK_DIRECTORY . "/$lock_filename");