codysnider / tt-rss

plugins/share/init.php

Indentation +83 added lines, -83 removed lines

@@ -1,142 +1,142 @@
 <?php
 class Share extends Plugin {
-	private $host;
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Share article by unique URL",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Share article by unique URL",
+            "fox");
+    }
 
-	/* @var PluginHost $host */
-	public function init($host) {
-		$this->host = $host;
+    /* @var PluginHost $host */
+    public function init($host) {
+        $this->host = $host;
 
-		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
-		$host->add_hook($host::HOOK_PREFS_TAB_SECTION, $this);
-	}
+        $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+        $host->add_hook($host::HOOK_PREFS_TAB_SECTION, $this);
+    }
 
-	public function get_js() {
-		return file_get_contents(dirname(__FILE__)."/share.js");
-	}
+    public function get_js() {
+        return file_get_contents(dirname(__FILE__)."/share.js");
+    }
 
-	public function get_css() {
-		return file_get_contents(dirname(__FILE__)."/share.css");
-	}
+    public function get_css() {
+        return file_get_contents(dirname(__FILE__)."/share.css");
+    }
 
-	public function get_prefs_js() {
-		return file_get_contents(dirname(__FILE__)."/share_prefs.js");
-	}
+    public function get_prefs_js() {
+        return file_get_contents(dirname(__FILE__)."/share_prefs.js");
+    }
 
 
-	public function unshare() {
-		$id = $_REQUEST['id'];
+    public function unshare() {
+        $id = $_REQUEST['id'];
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET uuid = '' WHERE int_id = ?
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET uuid = '' WHERE int_id = ?
 			AND owner_uid = ?");
-		$sth->execute([$id, $_SESSION['uid']]);
+        $sth->execute([$id, $_SESSION['uid']]);
 
-		print "OK";
-	}
+        print "OK";
+    }
 
-	public function hook_prefs_tab_section($id) {
-		if ($id == "prefFeedsPublishedGenerated") {
+    public function hook_prefs_tab_section($id) {
+        if ($id == "prefFeedsPublishedGenerated") {
 
-			print "<h3>".__("You can disable all articles shared by unique URLs here.")."</h3>";
+            print "<h3>".__("You can disable all articles shared by unique URLs here.")."</h3>";
 
-			print "<button class='alt-danger' dojoType='dijit.form.Button' onclick=\"return Plugins.Share.clearKeys()\">".
-				__('Unshare all articles')."</button> ";
+            print "<button class='alt-danger' dojoType='dijit.form.Button' onclick=\"return Plugins.Share.clearKeys()\">".
+                __('Unshare all articles')."</button> ";
 
-			print "</p>";
+            print "</p>";
 
-		}
-	}
+        }
+    }
 
-	// Silent
-	public function clearArticleKeys() {
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET uuid = '' WHERE
+    // Silent
+    public function clearArticleKeys() {
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET uuid = '' WHERE
 			owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		return;
-	}
+        return;
+    }
 
 
-	public function newkey() {
-		$id = $_REQUEST['id'];
-		$uuid = uniqid_short();
+    public function newkey() {
+        $id = $_REQUEST['id'];
+        $uuid = uniqid_short();
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET uuid = ? WHERE int_id = ?
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET uuid = ? WHERE int_id = ?
 			AND owner_uid = ?");
-		$sth->execute([$uuid, $id, $_SESSION['uid']]);
+        $sth->execute([$uuid, $id, $_SESSION['uid']]);
 
-		print json_encode(array("link" => $uuid));
-	}
+        print json_encode(array("link" => $uuid));
+    }
 
-	public function hook_article_button($line) {
-		$img_class = $line['uuid'] ? "shared" : "";
+    public function hook_article_button($line) {
+        $img_class = $line['uuid'] ? "shared" : "";
 
-		return "<i id='SHARE-IMG-".$line['int_id']."' class='material-icons icon-share $img_class'
+        return "<i id='SHARE-IMG-".$line['int_id']."' class='material-icons icon-share $img_class'
 			style='cursor : pointer' onclick=\"Plugins.Share.shareArticle(".$line['int_id'].")\"
 			title='".__('Share by URL')."'>link</i>";
-	}
+    }
 
-	public function shareArticle() {
-		$param = $_REQUEST['param'];
+    public function shareArticle() {
+        $param = $_REQUEST['param'];
 
-		$sth = $this->pdo->prepare("SELECT uuid FROM ttrss_user_entries WHERE int_id = ?
+        $sth = $this->pdo->prepare("SELECT uuid FROM ttrss_user_entries WHERE int_id = ?
 			AND owner_uid = ?");
-		$sth->execute([$param, $_SESSION['uid']]);
+        $sth->execute([$param, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			$uuid = $row['uuid'];
+            $uuid = $row['uuid'];
 
-			if (!$uuid) {
-				$uuid = uniqid_short();
+            if (!$uuid) {
+                $uuid = uniqid_short();
 
-				$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET uuid = ? WHERE int_id = ?
+                $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET uuid = ? WHERE int_id = ?
 					AND owner_uid = ?");
-				$sth->execute([$uuid, $param, $_SESSION['uid']]);
-			}
+                $sth->execute([$uuid, $param, $_SESSION['uid']]);
+            }
 
-			print "<header>".__("You can share this article by the following unique URL:")."</header>";
+            print "<header>".__("You can share this article by the following unique URL:")."</header>";
 
-			$url_path = get_self_url_prefix();
-			$url_path .= "/public.php?op=share&key=$uuid";
+            $url_path = get_self_url_prefix();
+            $url_path .= "/public.php?op=share&key=$uuid";
 
-			print "<section>
+            print "<section>
 				<div class='panel text-center'>
 				<a id='gen_article_url' href='$url_path' target='_blank' rel='noopener noreferrer'>$url_path</a>
 				</div>
 				</section>";
 
-			/* if (!label_find_id(__('Shared'), $_SESSION["uid"]))
+            /* if (!label_find_id(__('Shared'), $_SESSION["uid"]))
 				label_create(__('Shared'), $_SESSION["uid"]);
 
 			label_add_article($ref_id, __('Shared'), $_SESSION['uid']); */
 
 
-		} else {
-			print "Article not found.";
-		}
+        } else {
+            print "Article not found.";
+        }
 
-		print "<footer class='text-center'>";
+        print "<footer class='text-center'>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('shareArticleDlg').unshare()\">".
-			__('Unshare article')."</button>";
+        print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('shareArticleDlg').unshare()\">".
+            __('Unshare article')."</button>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('shareArticleDlg').newurl()\">".
-			__('Generate new URL')."</button>";
+        print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('shareArticleDlg').newurl()\">".
+            __('Generate new URL')."</button>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('shareArticleDlg').hide()\">".
-			__('Close this window')."</button>";
+        print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('shareArticleDlg').hide()\">".
+            __('Close this window')."</button>";
 
-		print "</footer>";
-	}
+        print "</footer>";
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

plugins/mail/init.php

Indentation +126 added lines, -126 removed lines

@@ -1,47 +1,47 @@ 
 <?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()));
@@ -55,140 +55,140 @@ 
 			}
 			</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']);
@@ -201,29 +201,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>";
@@ -237,8 +237,8 @@ 
 		print "</ul>";
 	} */
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

plugins/af_zz_noautoplay/init.php

Indentation +15 added lines, -15 removed lines

@@ -1,23 +1,23 @@
 <?php
 class Af_Zz_NoAutoPlay extends Plugin {
-	private $host;
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Don't autoplay HTML5 videos",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Don't autoplay HTML5 videos",
+            "fox");
+    }
 
-	public function init($host) {
-		$this->host = $host;
-	}
+    public function init($host) {
+        $this->host = $host;
+    }
 
-	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/no_url_hashes/init.php

Indentation +15 added lines, -15 removed lines

@@ -1,24 +1,24 @@
 <?php
 class No_URL_Hashes extends Plugin {
-	private $host;
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Disable URL hash usage (e.g. #f=10, etc)",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Disable URL hash usage (e.g. #f=10, etc)",
+            "fox");
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public function init($host) {
+        $this->host = $host;
 
-	}
+    }
 
-	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/shorten_expanded/init.php

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;
+    }
 
 }

index.php

Indentation +62 added lines, -62 removed lines

@@ -1,38 +1,38 @@ 
 <?php
-	if (file_exists("install") && !file_exists("config.php")) {
-		header("Location: install/");
-	}
+    if (file_exists("install") && !file_exists("config.php")) {
+        header("Location: install/");
+    }
 
-	if (!file_exists("config.php")) {
-		print "<b>Fatal Error</b>: You forgot to copy
+    if (!file_exists("config.php")) {
+        print "<b>Fatal Error</b>: You forgot to copy
 		<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
-		exit;
-	}
+        exit;
+    }
 
-	// we need a separate check here because functions.php might get parsed
-	// incorrectly before 5.3 because of :: syntax.
-	if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-		print "<b>Fatal Error</b>: PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".\n";
-		exit;
-	}
+    // we need a separate check here because functions.php might get parsed
+    // incorrectly before 5.3 because of :: syntax.
+    if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+        print "<b>Fatal Error</b>: PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".\n";
+        exit;
+    }
 
-	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
-		get_include_path());
+    set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
+        get_include_path());
 
-	require_once "autoload.php";
-	require_once "sessions.php";
-	require_once "functions.php";
-	require_once "sanity_check.php";
-	require_once "config.php";
-	require_once "db-prefs.php";
+    require_once "autoload.php";
+    require_once "sessions.php";
+    require_once "functions.php";
+    require_once "sanity_check.php";
+    require_once "config.php";
+    require_once "db-prefs.php";
 
-	if (!init_plugins()) {
-	    return;
-	}
+    if (!init_plugins()) {
+        return;
+    }
 
-	login_sequence();
+    login_sequence();
 
-	header('Content-Type: text/html; charset=utf-8');
+    header('Content-Type: text/html; charset=utf-8');
 
 ?>
 <!DOCTYPE html>
@@ -42,23 +42,23 @@ 
     <meta name="viewport" content="initial-scale=1,width=device-width" />
 
 	<?php if ($_SESSION["uid"]) {
-		$theme = get_pref("USER_CSS_THEME", false, false);
-		if ($theme && theme_exists("$theme")) {
-			echo stylesheet_tag(get_theme_path($theme), 'theme_css');
-		}
-	}
+        $theme = get_pref("USER_CSS_THEME", false, false);
+        if ($theme && theme_exists("$theme")) {
+            echo stylesheet_tag(get_theme_path($theme), 'theme_css');
+        }
+    }
 
-	print_user_stylesheet()
+    print_user_stylesheet()
 
-	?>
+    ?>
 	<style type="text/css">
 	<?php
-		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
-			if (method_exists($p, "get_css")) {
-				echo $p->get_css();
-			}
-		}
-	?>
+        foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
+            if (method_exists($p, "get_css")) {
+                echo $p->get_css();
+            }
+        }
+    ?>
 	</style>
 
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
@@ -75,17 +75,17 @@ 
 	</script>
 
 	<?php
-	foreach (array("lib/prototype.js",
-				"lib/scriptaculous/scriptaculous.js?load=effects,controls",
-				"lib/dojo/dojo.js",
-				"lib/dojo/tt-rss-layer.js",
-				"js/tt-rss.js",
-				"js/common.js",
-				"errors.php?mode=js") as $jsfile) {
+    foreach (array("lib/prototype.js",
+                "lib/scriptaculous/scriptaculous.js?load=effects,controls",
+                "lib/dojo/dojo.js",
+                "lib/dojo/tt-rss-layer.js",
+                "js/tt-rss.js",
+                "js/common.js",
+                "errors.php?mode=js") as $jsfile) {
 
-		echo javascript_tag($jsfile);
+        echo javascript_tag($jsfile);
 
-	} ?>
+    } ?>
 
 	<script type="text/javascript">
 		require({cache:{}});
@@ -93,22 +93,22 @@ 
 
 	<script type="text/javascript">
 	<?php
-		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
-			if (method_exists($p, "get_js")) {
-			    $script = $p->get_js();
+        foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
+            if (method_exists($p, "get_js")) {
+                $script = $p->get_js();
 
-			    if ($script) {
-					echo "try {
+                if ($script) {
+                    echo "try {
 					    $script
 					} catch (e) {
                         console.warn('failed to initialize plugin JS: $n', e);
                     }";
-				}
-			}
-		}
+                }
+            }
+        }
 
-		init_js_translations();
-	?>
+        init_js_translations();
+    ?>
 	</script>
 
 	<style type="text/css">
@@ -148,9 +148,9 @@ 
             <img src='images/indicator_tiny.gif'/>
             <?php echo  __("Loading, please wait..."); ?></div>
         <?php
-          foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_TREE) as $p) {
+            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_TREE) as $p) {
             echo $p->hook_feed_tree();
-          }
+            }
         ?>
         <div id="feedTree"></div>
     </div>
@@ -223,7 +223,7 @@ 
 
                 <?php
                     foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_TOOLBAR_BUTTON) as $p) {
-                         echo $p->hook_toolbar_button();
+                            echo $p->hook_toolbar_button();
                     }
                 ?>
 
@@ -245,7 +245,7 @@ 
 
                         <?php
                             foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) {
-                             echo $p->hook_action_item();
+                                echo $p->hook_action_item();
                             }
                         ?>
 

public.php

Indentation +45 added lines, -45 removed lines

@@ -1,46 +1,46 @@
 <?php
-	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
-		get_include_path());
-
-	require_once "autoload.php";
-	require_once "sessions.php";
-	require_once "functions.php";
-	require_once "sanity_check.php";
-	require_once "config.php";
-	require_once "db.php";
-	require_once "db-prefs.php";
-
-	startup_gettext();
-
-	$script_started = microtime(true);
-
-	if (!init_plugins()) {
-	    return;
-	}
-
-	if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
-		ob_start("ob_gzhandler");
-	}
-
-	$method = $_REQUEST["op"];
-
-	$override = PluginHost::getInstance()->lookup_handler("public", $method);
-
-	if ($override) {
-		$handler = $override;
-	} else {
-		$handler = new Handler_Public($_REQUEST);
-	}
-
-	if (implements_interface($handler, "IHandler") && $handler->before($method)) {
-		if ($method && method_exists($handler, $method)) {
-			$handler->$method();
-		} else if (method_exists($handler, 'index')) {
-			$handler->index();
-		}
-		$handler->after();
-		return;
-	}
-
-	header("Content-Type: text/plain");
-	print error_json(13);
+    set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
+        get_include_path());
+
+    require_once "autoload.php";
+    require_once "sessions.php";
+    require_once "functions.php";
+    require_once "sanity_check.php";
+    require_once "config.php";
+    require_once "db.php";
+    require_once "db-prefs.php";
+
+    startup_gettext();
+
+    $script_started = microtime(true);
+
+    if (!init_plugins()) {
+        return;
+    }
+
+    if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
+        ob_start("ob_gzhandler");
+    }
+
+    $method = $_REQUEST["op"];
+
+    $override = PluginHost::getInstance()->lookup_handler("public", $method);
+
+    if ($override) {
+        $handler = $override;
+    } else {
+        $handler = new Handler_Public($_REQUEST);
+    }
+
+    if (implements_interface($handler, "IHandler") && $handler->before($method)) {
+        if ($method && method_exists($handler, $method)) {
+            $handler->$method();
+        } else if (method_exists($handler, 'index')) {
+            $handler->index();
+        }
+        $handler->after();
+        return;
+    }
+
+    header("Content-Type: text/plain");
+    print error_json(13);

update.php

Indentation +375 added lines, -375 removed lines

@@ -1,108 +1,108 @@ 
 #!/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>
@@ -117,387 +117,387 @@ 
 
 		</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 (isset($options["convert-filters"])) {
+        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...");
+        Debug::log("converting filters...");
 
-		$pdo->query("DELETE FROM ttrss_filters2");
+        $pdo->query("DELETE FROM ttrss_filters2");
 
-		$res = $pdo->query("SELECT * FROM ttrss_filters ORDER BY id");
+        $res = $pdo->query("SELECT * FROM ttrss_filters ORDER BY id");
 
-		while ($line = $res->fetch()) {
-			$owner_uid = $line["owner_uid"];
+        while ($line = $res->fetch()) {
+            $owner_uid = $line["owner_uid"];
 
-			// date filters are removed
-			if ($line["filter_type"] != 5) {
-				$filter = array();
+            // date filters are removed
+            if ($line["filter_type"] != 5) {
+                $filter = array();
 
-				if (sql_bool_to_bool($line["cat_filter"])) {
-					$feed_id = "CAT:".(int) $line["cat_id"];
-				} else {
-					$feed_id = (int) $line["feed_id"];
-				}
+                if (sql_bool_to_bool($line["cat_filter"])) {
+                    $feed_id = "CAT:".(int) $line["cat_id"];
+                } else {
+                    $feed_id = (int) $line["feed_id"];
+                }
 
-				$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"])));
+                $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"])));
 
-				$filter["action"] = array(
-					json_encode(array(
-						"action_id" => $line["action_id"],
-						"action_param_label" => $line["action_param"],
-						"action_param" => $line["action_param"])));
+                $filter["action"] = array(
+                    json_encode(array(
+                        "action_id" => $line["action_id"],
+                        "action_param_label" => $line["action_param"],
+                        "action_param" => $line["action_param"])));
 
-				// Oh god it's full of hacks
+                // Oh god it's full of hacks
 
-				$_REQUEST = $filter;
-				$_SESSION["uid"] = $owner_uid;
+                $_REQUEST = $filter;
+                $_SESSION["uid"] = $owner_uid;
 
-				$filters = new Pref_Filters($_REQUEST);
-				$filters->add();
-			}
-		}
+                $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");

classes/counters.php

Indentation +128 added lines, -128 removed lines

@@ -1,174 +1,174 @@ 
 <?php
 class Counters {
 
-	public static function getAllCounters() {
-		$data = Counters::getGlobalCounters();
+    public static function getAllCounters() {
+        $data = Counters::getGlobalCounters();
 
-		$data = array_merge($data, Counters::getVirtCounters());
-		$data = array_merge($data, Counters::getLabelCounters());
-		$data = array_merge($data, Counters::getFeedCounters());
-		$data = array_merge($data, Counters::getCategoryCounters());
+        $data = array_merge($data, Counters::getVirtCounters());
+        $data = array_merge($data, Counters::getLabelCounters());
+        $data = array_merge($data, Counters::getFeedCounters());
+        $data = array_merge($data, Counters::getCategoryCounters());
 
-		return $data;
-	}
+        return $data;
+    }
 
-	public static function getCategoryCounters() {
-		$ret_arr = array();
+    public static function getCategoryCounters() {
+        $ret_arr = array();
 
-		/* Labels category */
+        /* Labels category */
 
-		$cv = array("id" => -2, "kind" => "cat",
-			"counter" => Feeds::getCategoryUnread(-2));
+        $cv = array("id" => -2, "kind" => "cat",
+            "counter" => Feeds::getCategoryUnread(-2));
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		$pdo = DB::pdo();
+        $pdo = DB::pdo();
 
-		$sth = $pdo->prepare("SELECT ttrss_feed_categories.id AS cat_id, value AS unread,
+        $sth = $pdo->prepare("SELECT ttrss_feed_categories.id AS cat_id, value AS unread,
 			(SELECT COUNT(id) FROM ttrss_feed_categories AS c2
 				WHERE c2.parent_cat = ttrss_feed_categories.id) AS num_children
 			FROM ttrss_feed_categories, ttrss_cat_counters_cache
 			WHERE ttrss_cat_counters_cache.feed_id = ttrss_feed_categories.id AND
 			ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid AND
 			ttrss_feed_categories.owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
-			$line["cat_id"] = (int) $line["cat_id"];
+        while ($line = $sth->fetch()) {
+            $line["cat_id"] = (int) $line["cat_id"];
 
-			if ($line["num_children"] > 0) {
-				$child_counter = Feeds::getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]);
-			} else {
-				$child_counter = 0;
-			}
+            if ($line["num_children"] > 0) {
+                $child_counter = Feeds::getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]);
+            } else {
+                $child_counter = 0;
+            }
 
-			$cv = array("id" => $line["cat_id"], "kind" => "cat",
-				"counter" => $line["unread"] + $child_counter);
+            $cv = array("id" => $line["cat_id"], "kind" => "cat",
+                "counter" => $line["unread"] + $child_counter);
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		/* Special case: NULL category doesn't actually exist in the DB */
+        /* Special case: NULL category doesn't actually exist in the DB */
 
-		$cv = array("id" => 0, "kind" => "cat",
-			"counter" => (int) CCache::find(0, $_SESSION["uid"], true));
+        $cv = array("id" => 0, "kind" => "cat",
+            "counter" => (int) CCache::find(0, $_SESSION["uid"], true));
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getGlobalCounters($global_unread = -1) {
-		$ret_arr = array();
+    public static function getGlobalCounters($global_unread = -1) {
+        $ret_arr = array();
 
-		if ($global_unread == -1) {
-			$global_unread = Feeds::getGlobalUnread();
-		}
+        if ($global_unread == -1) {
+            $global_unread = Feeds::getGlobalUnread();
+        }
 
-		$cv = array("id" => "global-unread",
-			"counter" => (int) $global_unread);
+        $cv = array("id" => "global-unread",
+            "counter" => (int) $global_unread);
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT COUNT(id) AS fn FROM
+        $sth = $pdo->prepare("SELECT COUNT(id) AS fn FROM
 			ttrss_feeds WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-		$row = $sth->fetch();
+        $sth->execute([$_SESSION['uid']]);
+        $row = $sth->fetch();
 
-		$subscribed_feeds = $row["fn"];
+        $subscribed_feeds = $row["fn"];
 
-		$cv = array("id" => "subscribed-feeds",
-			"counter" => (int) $subscribed_feeds);
+        $cv = array("id" => "subscribed-feeds",
+            "counter" => (int) $subscribed_feeds);
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getVirtCounters() {
+    public static function getVirtCounters() {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		for ($i = 0; $i >= -4; $i--) {
+        for ($i = 0; $i >= -4; $i--) {
 
-			$count = getFeedUnread($i);
+            $count = getFeedUnread($i);
 
-			if ($i == 0 || $i == -1 || $i == -2) {
-							$auxctr = Feeds::getFeedArticles($i, false);
-			} else {
-							$auxctr = 0;
-			}
+            if ($i == 0 || $i == -1 || $i == -2) {
+                            $auxctr = Feeds::getFeedArticles($i, false);
+            } else {
+                            $auxctr = 0;
+            }
 
-			$cv = array("id" => $i,
-				"counter" => (int) $count,
-				"auxcounter" => (int) $auxctr);
+            $cv = array("id" => $i,
+                "counter" => (int) $count,
+                "auxcounter" => (int) $auxctr);
 
 //			if (get_pref('EXTENDED_FEEDLIST'))
 //				$cv["xmsg"] = getFeedArticles($i)." ".__("total");
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		$feeds = PluginHost::getInstance()->get_feeds(-1);
+        $feeds = PluginHost::getInstance()->get_feeds(-1);
 
-		if (is_array($feeds)) {
-			foreach ($feeds as $feed) {
-				$cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
-					"counter" => $feed['sender']->get_unread($feed['id']));
+        if (is_array($feeds)) {
+            foreach ($feeds as $feed) {
+                $cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
+                    "counter" => $feed['sender']->get_unread($feed['id']));
 
-				if (method_exists($feed['sender'], 'get_total')) {
-									$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
-				}
+                if (method_exists($feed['sender'], 'get_total')) {
+                                    $cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
+                }
 
-				array_push($ret_arr, $cv);
-			}
-		}
+                array_push($ret_arr, $cv);
+            }
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getLabelCounters($descriptions = false) {
+    public static function getLabelCounters($descriptions = false) {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id,caption,SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread, COUNT(u1.unread) AS total
+        $sth = $pdo->prepare("SELECT id,caption,SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread, COUNT(u1.unread) AS total
 			FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
 				(ttrss_labels2.id = label_id)
 				LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id
 				WHERE ttrss_labels2.owner_uid = :uid AND u1.owner_uid = :uid
 				GROUP BY ttrss_labels2.id,
 					ttrss_labels2.caption");
-		$sth->execute([":uid" => $_SESSION['uid']]);
+        $sth->execute([":uid" => $_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$id = Labels::label_to_feed_id($line["id"]);
+            $id = Labels::label_to_feed_id($line["id"]);
 
-			$cv = array("id" => $id,
-				"counter" => (int) $line["unread"],
-				"auxcounter" => (int) $line["total"]);
+            $cv = array("id" => $id,
+                "counter" => (int) $line["unread"],
+                "auxcounter" => (int) $line["total"]);
 
-			if ($descriptions) {
-							$cv["description"] = $line["caption"];
-			}
+            if ($descriptions) {
+                            $cv["description"] = $line["caption"];
+            }
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getFeedCounters($active_feed = false) {
+    public static function getFeedCounters($active_feed = false) {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT ttrss_feeds.id,
+        $sth = $pdo->prepare("SELECT ttrss_feeds.id,
 				ttrss_feeds.title,
 				".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
 				last_error, value AS count
@@ -176,47 +176,47 @@ 
 			WHERE ttrss_feeds.owner_uid = ?
 				AND ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid
 				AND ttrss_counters_cache.feed_id = ttrss_feeds.id");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$id = $line["id"];
-			$count = $line["count"];
-			$last_error = htmlspecialchars($line["last_error"]);
+            $id = $line["id"];
+            $count = $line["count"];
+            $last_error = htmlspecialchars($line["last_error"]);
 
-			$last_updated = make_local_datetime($line['last_updated'], false);
+            $last_updated = make_local_datetime($line['last_updated'], false);
 
-			if (Feeds::feedHasIcon($id)) {
-				$has_img = filemtime(Feeds::getIconFile($id));
-			} else {
-				$has_img = false;
-			}
+            if (Feeds::feedHasIcon($id)) {
+                $has_img = filemtime(Feeds::getIconFile($id));
+            } else {
+                $has_img = false;
+            }
 
-			if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2) {
-							$last_updated = '';
-			}
+            if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2) {
+                            $last_updated = '';
+            }
 
-			$cv = array("id" => $id,
-				"updated" => $last_updated,
-				"counter" => (int) $count,
-				"has_img" => (int) $has_img);
+            $cv = array("id" => $id,
+                "updated" => $last_updated,
+                "counter" => (int) $count,
+                "has_img" => (int) $has_img);
 
-			if ($last_error) {
-							$cv["error"] = $last_error;
-			}
+            if ($last_error) {
+                            $cv["error"] = $last_error;
+            }
 
 //			if (get_pref('EXTENDED_FEEDLIST'))
 //				$cv["xmsg"] = getFeedArticles($id)." ".__("total");
 
-			if ($active_feed && $id == $active_feed) {
-							$cv["title"] = truncate_string($line["title"], 30);
-			}
+            if ($active_feed && $id == $active_feed) {
+                            $cv["title"] = truncate_string($line["title"], 30);
+            }
 
-			array_push($ret_arr, $cv);
+            array_push($ret_arr, $cv);
 
-		}
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
 }