codysnider / tt-rss

plugins/af_fsckportal/init.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 			$doc = new DOMDocument();
 
-			@$doc->loadHTML('<?xml encoding="UTF-8">' . $article["content"]);
+			@$doc->loadHTML('<?xml encoding="UTF-8">'.$article["content"]);
 
 			if ($doc) {
 				$xpath = new DOMXPath($doc);

Indentation +30 added lines, -30 removed lines

@@ -1,47 +1,47 @@
 <?php
 class Af_Fsckportal extends Plugin {
 
-	private $host;
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Remove feedsportal spamlinks from article content",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Remove feedsportal spamlinks from article content",
+            "fox");
+    }
 
-	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_ARTICLE_FILTER, $this);
+    }
 
-	public function hook_article_filter($article) {
+    public function hook_article_filter($article) {
 
-			$doc = new DOMDocument();
+            $doc = new DOMDocument();
 
-			@$doc->loadHTML('<?xml encoding="UTF-8">' . $article["content"]);
+            @$doc->loadHTML('<?xml encoding="UTF-8">' . $article["content"]);
 
-			if ($doc) {
-				$xpath = new DOMXPath($doc);
-				$entries = $xpath->query('(//img[@src]|//a[@href])');
+            if ($doc) {
+                $xpath = new DOMXPath($doc);
+                $entries = $xpath->query('(//img[@src]|//a[@href])');
 
-				foreach ($entries as $entry) {
-					if (preg_match("/feedsportal.com/", $entry->getAttribute("src"))) {
-						$entry->parentNode->removeChild($entry);
-					} else if (preg_match("/feedsportal.com/", $entry->getAttribute("href"))) {
-						$entry->parentNode->removeChild($entry);
-					}
-				}
+                foreach ($entries as $entry) {
+                    if (preg_match("/feedsportal.com/", $entry->getAttribute("src"))) {
+                        $entry->parentNode->removeChild($entry);
+                    } else if (preg_match("/feedsportal.com/", $entry->getAttribute("href"))) {
+                        $entry->parentNode->removeChild($entry);
+                    }
+                }
 
-				$article["content"] = $doc->saveHTML();
+                $article["content"] = $doc->saveHTML();
 
-		}
+        }
 
-		return $article;
-	}
+        return $article;
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

classes/db.php

Switch Indentation +8 added lines, -8 removed lines

@@ -24,14 +24,14 @@
 		$er = error_reporting(E_ALL);
 
 		switch (DB_TYPE) {
-			case "mysql":
-				$this->adapter = new Db_Mysqli();
-				break;
-			case "pgsql":
-				$this->adapter = new Db_Pgsql();
-				break;
-			default:
-				die("Unknown DB_TYPE: " . DB_TYPE);
+		case "mysql":
+			$this->adapter = new Db_Mysqli();
+			break;
+		case "pgsql":
+			$this->adapter = new Db_Pgsql();
+			break;
+		default:
+			die("Unknown DB_TYPE: " . DB_TYPE);
 		}
 
 		if (!$this->adapter) {

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
 	private function legacy_connect() {
 
-		user_error("Legacy connect requested to " . DB_TYPE, E_USER_NOTICE);
+		user_error("Legacy connect requested to ".DB_TYPE, E_USER_NOTICE);
 
 		$er = error_reporting(E_ALL);
 
@@ -31,18 +31,18 @@ 
 				$this->adapter = new Db_Pgsql();
 				break;
 			default:
-				die("Unknown DB_TYPE: " . DB_TYPE);
+				die("Unknown DB_TYPE: ".DB_TYPE);
 		}
 
 		if (!$this->adapter) {
-			print("Error initializing database adapter for " . DB_TYPE);
+			print("Error initializing database adapter for ".DB_TYPE);
 			exit(100);
 		}
 
 		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
 
 		if (!$this->link) {
-			print("Error connecting through adapter: " . $this->adapter->last_error());
+			print("Error connecting through adapter: ".$this->adapter->last_error());
 			exit(101);
 		}
 
@@ -53,15 +53,15 @@ 
 	// normal usage is Db::pdo()->prepare(...) etc
 	public function pdo_connect() {
 
-		$db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : '';
-		$db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
+		$db_port = defined('DB_PORT') && DB_PORT ? ';port='.DB_PORT : '';
+		$db_host = defined('DB_HOST') && DB_HOST ? ';host='.DB_HOST : '';
 
 		try {
-			$pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port,
+			$pdo = new PDO(DB_TYPE.':dbname='.DB_NAME.$db_host.$db_port,
 				DB_USER,
 				DB_PASS);
 		} catch (Exception $e) {
-			print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>";
+			print "<pre>Exception while creating PDO object:".$e->getMessage()."</pre>";
 			exit(101);
 		}
 
@@ -78,7 +78,7 @@ 
 			$pdo->query("SET time_zone = '+0:0'");
 
 			if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-				$pdo->query("SET NAMES " . MYSQL_CHARSET);
+				$pdo->query("SET NAMES ".MYSQL_CHARSET);
 			}
 		}
 

Braces +9 added lines, -6 removed lines

@@ -86,15 +86,17 @@ 
 	}
 
 	public static function instance() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		return self::$instance;
 	}
 
 	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		if (!self::$instance->adapter) {
 			self::$instance->legacy_connect();
@@ -104,8 +106,9 @@ 
 	}
 
 	public static function pdo() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		if (!self::$instance->pdo) {
 			self::$instance->pdo = self::$instance->pdo_connect();

Indentation +82 added lines, -82 removed lines

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

classes/mailer.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 				return 0;
 		}
 
-		$headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ];
+		$headers = ["From: $from_combined", "Content-Type: text/plain; charset=UTF-8"];
 
 		return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
 	}

Braces +9 added lines, -6 removed lines

@@ -19,8 +19,9 @@ 
 		$from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
 		$to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
 
-		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL)
-			Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
+		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) {
+					Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
+		}
 
 		// HOOK_SEND_MAIL plugin instructions:
 		// 1. return 1 or true if mail is handled
@@ -31,11 +32,13 @@ 
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
 			$rc = $p->hook_send_mail($this, $params);
 
-			if ($rc == 1)
-				return $rc;
+			if ($rc == 1) {
+							return $rc;
+			}
 
-			if ($rc == -1)
-				return 0;
+			if ($rc == -1) {
+							return 0;
+			}
 		}
 
 		$headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ];

Indentation +35 added lines, -35 removed lines

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

classes/db/prefs.php

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
 		if ($type_name == "bool") {
 			return $value == "true";
 		} else if ($type_name == "integer") {
-			return (int)$value;
+			return (int) $value;
 		} else {
 			return $value;
 		}
@@ -149,7 +149,7 @@ 
 					$value = "false";
 				}
 			} else if ($type_name == "integer") {
-				$value = (int)$value;
+				$value = (int) $value;
 			}
 
 			if ($pref_name == 'USER_TIMEZONE' && $value == '') {

Indentation +125 added lines, -125 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 class Db_Prefs {
-	private $pdo;
-	private static $instance;
-	private $cache;
+    private $pdo;
+    private static $instance;
+    private $cache;
 
-	public function __construct() {
-		$this->pdo = Db::pdo();
-		$this->cache = array();
+    public function __construct() {
+        $this->pdo = Db::pdo();
+        $this->cache = array();
 
-		if ($_SESSION["uid"]) $this->cache();
-	}
+        if ($_SESSION["uid"]) $this->cache();
+    }
 
-	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function get() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
-	public function cache() {
-		$user_id = $_SESSION["uid"];
-		@$profile = $_SESSION["profile"];
+    public function cache() {
+        $user_id = $_SESSION["uid"];
+        @$profile = $_SESSION["profile"];
 
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+        if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
 
-		$sth = $this->pdo->prepare("SELECT
+        $sth = $this->pdo->prepare("SELECT
 			value,ttrss_prefs_types.type_name as type_name,ttrss_prefs.pref_name AS pref_name
 			FROM
 				ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
@@ -35,35 +35,35 @@ 
 				owner_uid = :uid AND
 				ttrss_user_prefs.pref_name = ttrss_prefs.pref_name");
 
-		$sth->execute([":profile" => $profile, ":uid" => $user_id]);
+        $sth->execute([":profile" => $profile, ":uid" => $user_id]);
 
-		while ($line = $sth->fetch()) {
-			if ($user_id == $_SESSION["uid"]) {
-				$pref_name = $line["pref_name"];
+        while ($line = $sth->fetch()) {
+            if ($user_id == $_SESSION["uid"]) {
+                $pref_name = $line["pref_name"];
 
-				$this->cache[$pref_name]["type"] = $line["type_name"];
-				$this->cache[$pref_name]["value"] = $line["value"];
-			}
-		}
-	}
+                $this->cache[$pref_name]["type"] = $line["type_name"];
+                $this->cache[$pref_name]["value"] = $line["value"];
+            }
+        }
+    }
 
-	public function read($pref_name, $user_id = false, $die_on_error = false) {
+    public function read($pref_name, $user_id = false, $die_on_error = false) {
 
-		if (!$user_id) {
-			$user_id = $_SESSION["uid"];
-			@$profile = $_SESSION["profile"];
-		} else {
-			$profile = false;
-		}
+        if (!$user_id) {
+            $user_id = $_SESSION["uid"];
+            @$profile = $_SESSION["profile"];
+        } else {
+            $profile = false;
+        }
 
-		if ($user_id == $_SESSION['uid'] && isset($this->cache[$pref_name])) {
-			$tuple = $this->cache[$pref_name];
-			return $this->convert($tuple["value"], $tuple["type"]);
-		}
+        if ($user_id == $_SESSION['uid'] && isset($this->cache[$pref_name])) {
+            $tuple = $this->cache[$pref_name];
+            return $this->convert($tuple["value"], $tuple["type"]);
+        }
 
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+        if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
 
-		$sth = $this->pdo->prepare("SELECT
+        $sth = $this->pdo->prepare("SELECT
 			value,ttrss_prefs_types.type_name as type_name
 			FROM
 				ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
@@ -73,96 +73,96 @@ 
 				ttrss_prefs_types.id = type_id AND
 				owner_uid = :uid AND
 				ttrss_user_prefs.pref_name = ttrss_prefs.pref_name");
-		$sth->execute([":uid" => $user_id, ":profile" => $profile, ":pref_name" => $pref_name]);
-
-		if ($row = $sth->fetch()) {
-			$value = $row["value"];
-			$type_name = $row["type_name"];
-
-			if ($user_id == $_SESSION["uid"]) {
-				$this->cache[$pref_name]["type"] = $type_name;
-				$this->cache[$pref_name]["value"] = $value;
-			}
-
-			return $this->convert($value, $type_name);
-
-		} else if ($die_on_error) {
-			user_error("Fatal error, unknown preferences key: $pref_name (owner: $user_id)", E_USER_ERROR);
-			return null;
-		} else {
-			return null;
-		}
-	}
-
-	public function convert($value, $type_name) {
-		if ($type_name == "bool") {
-			return $value == "true";
-		} else if ($type_name == "integer") {
-			return (int)$value;
-		} else {
-			return $value;
-		}
-	}
-
-	public function write($pref_name, $value, $user_id = false, $strip_tags = true) {
-		if ($strip_tags) $value = strip_tags($value);
-
-		if (!$user_id) {
-			$user_id = $_SESSION["uid"];
-			@$profile = $_SESSION["profile"];
-		} else {
-			$profile = null;
-		}
-
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
-
-		$type_name = "";
-		$current_value = "";
-
-		if (isset($this->cache[$pref_name])) {
-			$type_name = $this->cache[$pref_name]["type"];
-			$current_value = $this->cache[$pref_name]["value"];
-		}
-
-		if (!$type_name) {
-			$sth = $this->pdo->prepare("SELECT type_name
+        $sth->execute([":uid" => $user_id, ":profile" => $profile, ":pref_name" => $pref_name]);
+
+        if ($row = $sth->fetch()) {
+            $value = $row["value"];
+            $type_name = $row["type_name"];
+
+            if ($user_id == $_SESSION["uid"]) {
+                $this->cache[$pref_name]["type"] = $type_name;
+                $this->cache[$pref_name]["value"] = $value;
+            }
+
+            return $this->convert($value, $type_name);
+
+        } else if ($die_on_error) {
+            user_error("Fatal error, unknown preferences key: $pref_name (owner: $user_id)", E_USER_ERROR);
+            return null;
+        } else {
+            return null;
+        }
+    }
+
+    public function convert($value, $type_name) {
+        if ($type_name == "bool") {
+            return $value == "true";
+        } else if ($type_name == "integer") {
+            return (int)$value;
+        } else {
+            return $value;
+        }
+    }
+
+    public function write($pref_name, $value, $user_id = false, $strip_tags = true) {
+        if ($strip_tags) $value = strip_tags($value);
+
+        if (!$user_id) {
+            $user_id = $_SESSION["uid"];
+            @$profile = $_SESSION["profile"];
+        } else {
+            $profile = null;
+        }
+
+        if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+
+        $type_name = "";
+        $current_value = "";
+
+        if (isset($this->cache[$pref_name])) {
+            $type_name = $this->cache[$pref_name]["type"];
+            $current_value = $this->cache[$pref_name]["value"];
+        }
+
+        if (!$type_name) {
+            $sth = $this->pdo->prepare("SELECT type_name
 				FROM ttrss_prefs,ttrss_prefs_types
 				WHERE pref_name = ? AND type_id = ttrss_prefs_types.id");
-			$sth->execute([$pref_name]);
-
-			if ($row = $sth->fetch())
-				$type_name = $row["type_name"];
-
-		} else if ($current_value == $value) {
-			return;
-		}
-
-		if ($type_name) {
-			if ($type_name == "bool") {
-				if ($value == "1" || $value == "true") {
-					$value = "true";
-				} else {
-					$value = "false";
-				}
-			} else if ($type_name == "integer") {
-				$value = (int)$value;
-			}
-
-			if ($pref_name == 'USER_TIMEZONE' && $value == '') {
-				$value = 'UTC';
-			}
-
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_prefs SET
+            $sth->execute([$pref_name]);
+
+            if ($row = $sth->fetch())
+                $type_name = $row["type_name"];
+
+        } else if ($current_value == $value) {
+            return;
+        }
+
+        if ($type_name) {
+            if ($type_name == "bool") {
+                if ($value == "1" || $value == "true") {
+                    $value = "true";
+                } else {
+                    $value = "false";
+                }
+            } else if ($type_name == "integer") {
+                $value = (int)$value;
+            }
+
+            if ($pref_name == 'USER_TIMEZONE' && $value == '') {
+                $value = 'UTC';
+            }
+
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_prefs SET
 				value = :value WHERE pref_name = :pref_name
 					AND (profile = :profile OR (:profile IS NULL AND profile IS NULL))
 					AND owner_uid = :uid");
 
-			$sth->execute([":pref_name" => $pref_name, ":value" => $value, ":uid" => $user_id, ":profile" => $profile]);
+            $sth->execute([":pref_name" => $pref_name, ":value" => $value, ":uid" => $user_id, ":profile" => $profile]);
 
-			if ($user_id == $_SESSION["uid"]) {
-				$this->cache[$pref_name]["type"] = $type_name;
-				$this->cache[$pref_name]["value"] = $value;
-			}
-		}
-	}
+            if ($user_id == $_SESSION["uid"]) {
+                $this->cache[$pref_name]["type"] = $type_name;
+                $this->cache[$pref_name]["value"] = $value;
+            }
+        }
+    }
 }

Braces +21 added lines, -9 removed lines

@@ -8,12 +8,15 @@ 
 		$this->pdo = Db::pdo();
 		$this->cache = array();
 
-		if ($_SESSION["uid"]) $this->cache();
+		if ($_SESSION["uid"]) {
+		    $this->cache();
+		}
 	}
 
 	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		return self::$instance;
 	}
@@ -22,7 +25,9 @@ 
 		$user_id = $_SESSION["uid"];
 		@$profile = $_SESSION["profile"];
 
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) {
+		    $profile = null;
+		}
 
 		$sth = $this->pdo->prepare("SELECT
 			value,ttrss_prefs_types.type_name as type_name,ttrss_prefs.pref_name AS pref_name
@@ -61,7 +66,9 @@ 
 			return $this->convert($tuple["value"], $tuple["type"]);
 		}
 
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) {
+		    $profile = null;
+		}
 
 		$sth = $this->pdo->prepare("SELECT
 			value,ttrss_prefs_types.type_name as type_name
@@ -105,7 +112,9 @@ 
 	}
 
 	public function write($pref_name, $value, $user_id = false, $strip_tags = true) {
-		if ($strip_tags) $value = strip_tags($value);
+		if ($strip_tags) {
+		    $value = strip_tags($value);
+		}
 
 		if (!$user_id) {
 			$user_id = $_SESSION["uid"];
@@ -114,7 +123,9 @@ 
 			$profile = null;
 		}
 
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) {
+		    $profile = null;
+		}
 
 		$type_name = "";
 		$current_value = "";
@@ -130,8 +141,9 @@ 
 				WHERE pref_name = ? AND type_id = ttrss_prefs_types.id");
 			$sth->execute([$pref_name]);
 
-			if ($row = $sth->fetch())
-				$type_name = $row["type_name"];
+			if ($row = $sth->fetch()) {
+							$type_name = $row["type_name"];
+			}
 
 		} else if ($current_value == $value) {
 			return;

classes/db/mysqli.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 
 			return $this->link;
 		} else {
-			print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
+			print("Unable to connect to database (as $user to $host, database $db): ".mysqli_connect_error());
 			exit(102);
 		}
 	}
@@ -31,7 +31,7 @@ 
 			$this->last_error = @mysqli_error($this->link);
 
 			@mysqli_query($this->link, "ROLLBACK");
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+			user_error("Query $query failed: ".($this->link ? $this->last_error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 			$this->last_error = @mysqli_error($this->link);
 
 			@mysqli_query($this->link, "ROLLBACK");
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+			user_error("query $query failed: " . ($this->link ? $this->last_error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 

Indentation +81 added lines, -81 removed lines

@@ -1,85 +1,85 @@
 <?php
 class Db_Mysqli implements IDb {
-	private $link;
-	private $last_error;
-
-	public function connect($host, $user, $pass, $db, $port) {
-		if ($port)
-			$this->link = mysqli_connect($host, $user, $pass, $db, $port);
-		else
-			$this->link = mysqli_connect($host, $user, $pass, $db);
-
-		if ($this->link) {
-			$this->init();
-
-			return $this->link;
-		} else {
-			print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
-			exit(102);
-		}
-	}
-
-	public function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
-
-		return mysqli_real_escape_string($this->link, $s);
-	}
-
-	public function query($query, $die_on_error = true) {
-		$result = @mysqli_query($this->link, $query);
-		if (!$result) {
-			$this->last_error = @mysqli_error($this->link);
-
-			@mysqli_query($this->link, "ROLLBACK");
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
-				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
-		}
-
-		return $result;
-	}
-
-	public function fetch_assoc($result) {
-		return mysqli_fetch_assoc($result);
-	}
-
-
-	public function num_rows($result) {
-		return mysqli_num_rows($result);
-	}
-
-	public function fetch_result($result, $row, $param) {
-		if (mysqli_data_seek($result, $row)) {
-			$line = mysqli_fetch_assoc($result);
-			return $line[$param];
-		} else {
-			return false;
-		}
-	}
-
-	public function close() {
-		return mysqli_close($this->link);
-	}
-
-	public function affected_rows($result) {
-		return mysqli_affected_rows($this->link);
-	}
-
-	public function last_error() {
-		return mysqli_error($this->link);
-	}
-
-	public function last_query_error() {
-		return $this->last_error;
-	}
-
-	public function init() {
-		$this->query("SET time_zone = '+0:0'");
-
-		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-			mysqli_set_charset($this->link, MYSQL_CHARSET);
-		}
-
-		return true;
-	}
+    private $link;
+    private $last_error;
+
+    public function connect($host, $user, $pass, $db, $port) {
+        if ($port)
+            $this->link = mysqli_connect($host, $user, $pass, $db, $port);
+        else
+            $this->link = mysqli_connect($host, $user, $pass, $db);
+
+        if ($this->link) {
+            $this->init();
+
+            return $this->link;
+        } else {
+            print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
+            exit(102);
+        }
+    }
+
+    public function escape_string($s, $strip_tags = true) {
+        if ($strip_tags) $s = strip_tags($s);
+
+        return mysqli_real_escape_string($this->link, $s);
+    }
+
+    public function query($query, $die_on_error = true) {
+        $result = @mysqli_query($this->link, $query);
+        if (!$result) {
+            $this->last_error = @mysqli_error($this->link);
+
+            @mysqli_query($this->link, "ROLLBACK");
+            user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+                $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+        }
+
+        return $result;
+    }
+
+    public function fetch_assoc($result) {
+        return mysqli_fetch_assoc($result);
+    }
+
+
+    public function num_rows($result) {
+        return mysqli_num_rows($result);
+    }
+
+    public function fetch_result($result, $row, $param) {
+        if (mysqli_data_seek($result, $row)) {
+            $line = mysqli_fetch_assoc($result);
+            return $line[$param];
+        } else {
+            return false;
+        }
+    }
+
+    public function close() {
+        return mysqli_close($this->link);
+    }
+
+    public function affected_rows($result) {
+        return mysqli_affected_rows($this->link);
+    }
+
+    public function last_error() {
+        return mysqli_error($this->link);
+    }
+
+    public function last_query_error() {
+        return $this->last_error;
+    }
+
+    public function init() {
+        $this->query("SET time_zone = '+0:0'");
+
+        if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+            mysqli_set_charset($this->link, MYSQL_CHARSET);
+        }
+
+        return true;
+    }
 
 }

Braces +8 added lines, -5 removed lines

@@ -4,10 +4,11 @@ 
 	private $last_error;
 
 	public function connect($host, $user, $pass, $db, $port) {
-		if ($port)
-			$this->link = mysqli_connect($host, $user, $pass, $db, $port);
-		else
-			$this->link = mysqli_connect($host, $user, $pass, $db);
+		if ($port) {
+					$this->link = mysqli_connect($host, $user, $pass, $db, $port);
+		} else {
+					$this->link = mysqli_connect($host, $user, $pass, $db);
+		}
 
 		if ($this->link) {
 			$this->init();
@@ -20,7 +21,9 @@ 
 	}
 
 	public function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
+		if ($strip_tags) {
+		    $s = strip_tags($s);
+		}
 
 		return mysqli_real_escape_string($this->link, $s);
 	}

classes/db/pgsql.php

Spacing +3 added lines, -3 removed lines

@@ -15,13 +15,13 @@ 
 		}
 
 		if (is_numeric($port) && $port > 0) {
-			$string = "$string port=" . $port;
+			$string = "$string port=".$port;
 		}
 
 		$this->link = pg_connect($string);
 
 		if (!$this->link) {
-			print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
+			print("Unable to connect to database (as $user to $host, database $db):".pg_last_error());
 			exit(102);
 		}
 
@@ -44,7 +44,7 @@ 
 
 			@pg_query($this->link, "ROLLBACK");
 			$query = htmlspecialchars($query); // just in case
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+			user_error("Query $query failed: ".($this->link ? $this->last_error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 		return $result;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
 			@pg_query($this->link, "ROLLBACK");
 			$query = htmlspecialchars($query); // just in case
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+			user_error("query $query failed: " . ($this->link ? $this->last_error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 		return $result;

Indentation +65 added lines, -65 removed lines

@@ -1,91 +1,91 @@
 <?php
 class Db_Pgsql implements IDb {
-	private $link;
-	private $last_error;
+    private $link;
+    private $last_error;
 
-	public function connect($host, $user, $pass, $db, $port) {
-		$string = "dbname=$db user=$user";
+    public function connect($host, $user, $pass, $db, $port) {
+        $string = "dbname=$db user=$user";
 
-		if ($pass) {
-			$string .= " password=$pass";
-		}
+        if ($pass) {
+            $string .= " password=$pass";
+        }
 
-		if ($host) {
-			$string .= " host=$host";
-		}
+        if ($host) {
+            $string .= " host=$host";
+        }
 
-		if (is_numeric($port) && $port > 0) {
-			$string = "$string port=" . $port;
-		}
+        if (is_numeric($port) && $port > 0) {
+            $string = "$string port=" . $port;
+        }
 
-		$this->link = pg_connect($string);
+        $this->link = pg_connect($string);
 
-		if (!$this->link) {
-			print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
-			exit(102);
-		}
+        if (!$this->link) {
+            print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
+            exit(102);
+        }
 
-		$this->init();
+        $this->init();
 
-		return $this->link;
-	}
+        return $this->link;
+    }
 
-	public function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
+    public function escape_string($s, $strip_tags = true) {
+        if ($strip_tags) $s = strip_tags($s);
 
-		return pg_escape_string($s);
-	}
+        return pg_escape_string($s);
+    }
 
-	public function query($query, $die_on_error = true) {
-		$result = @pg_query($this->link, $query);
+    public function query($query, $die_on_error = true) {
+        $result = @pg_query($this->link, $query);
 
-		if (!$result) {
-			$this->last_error = @pg_last_error($this->link);
+        if (!$result) {
+            $this->last_error = @pg_last_error($this->link);
 
-			@pg_query($this->link, "ROLLBACK");
-			$query = htmlspecialchars($query); // just in case
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
-				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
-		}
-		return $result;
-	}
+            @pg_query($this->link, "ROLLBACK");
+            $query = htmlspecialchars($query); // just in case
+            user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+                $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+        }
+        return $result;
+    }
 
-	public function fetch_assoc($result) {
-		return pg_fetch_assoc($result);
-	}
+    public function fetch_assoc($result) {
+        return pg_fetch_assoc($result);
+    }
 
 
-	public function num_rows($result) {
-		return pg_num_rows($result);
-	}
+    public function num_rows($result) {
+        return pg_num_rows($result);
+    }
 
-	public function fetch_result($result, $row, $param) {
-		return pg_fetch_result($result, $row, $param);
-	}
+    public function fetch_result($result, $row, $param) {
+        return pg_fetch_result($result, $row, $param);
+    }
 
-	public function close() {
-		return pg_close($this->link);
-	}
+    public function close() {
+        return pg_close($this->link);
+    }
 
-	public function affected_rows($result) {
-		return pg_affected_rows($result);
-	}
+    public function affected_rows($result) {
+        return pg_affected_rows($result);
+    }
 
-	public function last_error() {
-		return pg_last_error($this->link);
-	}
+    public function last_error() {
+        return pg_last_error($this->link);
+    }
 
-	public function last_query_error() {
-		return $this->last_error;
-	}
+    public function last_query_error() {
+        return $this->last_error;
+    }
 
-	public function init() {
-		$this->query("set client_encoding = 'UTF-8'");
-		pg_set_client_encoding("UNICODE");
-		$this->query("set datestyle = 'ISO, european'");
-		$this->query("set TIME ZONE 0");
-		$this->query("set cpu_tuple_cost = 0.5");
+    public function init() {
+        $this->query("set client_encoding = 'UTF-8'");
+        pg_set_client_encoding("UNICODE");
+        $this->query("set datestyle = 'ISO, european'");
+        $this->query("set TIME ZONE 0");
+        $this->query("set cpu_tuple_cost = 0.5");
 
-		return true;
-	}
+        return true;
+    }
 }

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
 	}
 
 	public function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
+		if ($strip_tags) {
+		    $s = strip_tags($s);
+		}
 
 		return pg_escape_string($s);
 	}

classes/api.php

Switch Indentation +33 added lines, -33 removed lines

@@ -218,16 +218,16 @@ 
 
 			$override_order = false;
 			switch (clean($_REQUEST["order_by"])) {
-				case "title":
-					$override_order = "ttrss_entries.title, date_entered, updated";
-					break;
-				case "date_reverse":
-					$override_order = "score DESC, date_entered, updated";
-					$skip_first_id_check = true;
-					break;
-				case "feed_dates":
-					$override_order = "updated DESC";
-					break;
+			case "title":
+				$override_order = "ttrss_entries.title, date_entered, updated";
+				break;
+			case "date_reverse":
+				$override_order = "score DESC, date_entered, updated";
+				$skip_first_id_check = true;
+				break;
+			case "feed_dates":
+				$override_order = "updated DESC";
+				break;
 			}
 
 			/* do not rely on params below */
@@ -259,32 +259,32 @@ 
 		$set_to = "";
 
 		switch ($field_raw) {
-			case 0:
-				$field = "marked";
-				$additional_fields = ",last_marked = NOW()";
-				break;
-			case 1:
-				$field = "published";
-				$additional_fields = ",last_published = NOW()";
-				break;
-			case 2:
-				$field = "unread";
-				$additional_fields = ",last_read = NOW()";
-				break;
-			case 3:
-				$field = "note";
+		case 0:
+			$field = "marked";
+			$additional_fields = ",last_marked = NOW()";
+			break;
+		case 1:
+			$field = "published";
+			$additional_fields = ",last_published = NOW()";
+			break;
+		case 2:
+			$field = "unread";
+			$additional_fields = ",last_read = NOW()";
+			break;
+		case 3:
+			$field = "note";
 		};
 
 		switch ($mode) {
-			case 1:
-				$set_to = "true";
-				break;
-			case 0:
-				$set_to = "false";
-				break;
-			case 2:
-				$set_to = "NOT $field";
-				break;
+		case 1:
+			$set_to = "true";
+			break;
+		case 0:
+			$set_to = "false";
+			break;
+		case 2:
+			$set_to = "NOT $field";
+			break;
 		}
 
 		if ($field == "note") $set_to = $this->pdo->quote($data);

Spacing +21 added lines, -22 removed lines

@@ -74,11 +74,11 @@ 
 		}
 
 		if (get_pref("ENABLE_API_ACCESS", $uid)) {
-			if (authenticate_user($login, $password, false,  Auth_Base::AUTH_SERVICE_API)) {               // try login with normal password
+			if (authenticate_user($login, $password, false, Auth_Base::AUTH_SERVICE_API)) {               // try login with normal password
 				$this->wrap(self::STATUS_OK, array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
 			} else if (authenticate_user($login, $password_base64, false, Auth_Base::AUTH_SERVICE_API)) { // else try with base64_decoded password
-				$this->wrap(self::STATUS_OK,	array("session_id" => session_id(),
+				$this->wrap(self::STATUS_OK, array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
 			} else {                                                         // else we are not logged in
 				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
@@ -169,7 +169,7 @@ 
 			}
 		}
 
-		foreach (array(-2,-1,0) as $cat_id) {
+		foreach (array(-2, -1, 0) as $cat_id) {
 			if ($include_empty || !$this->isCategoryEmpty($cat_id)) {
 				$unread = getFeedUnread($cat_id, true);
 
@@ -190,11 +190,11 @@ 
 
 			if (is_numeric($feed_id)) $feed_id = (int) $feed_id;
 
-			$limit = (int)clean($_REQUEST["limit"]);
+			$limit = (int) clean($_REQUEST["limit"]);
 
 			if (!$limit || $limit >= 200) $limit = 200;
 
-			$offset = (int)clean($_REQUEST["skip"]);
+			$offset = (int) clean($_REQUEST["skip"]);
 			$filter = clean($_REQUEST["filter"]);
 			$is_cat = API::param_to_bool(clean($_REQUEST["is_cat"]));
 			$show_excerpt = API::param_to_bool(clean($_REQUEST["show_excerpt"]));
@@ -202,14 +202,14 @@ 
 			/* all_articles, unread, adaptive, marked, updated */
 			$view_mode = clean($_REQUEST["view_mode"]);
 			$include_attachments = API::param_to_bool(clean($_REQUEST["include_attachments"]));
-			$since_id = (int)clean($_REQUEST["since_id"]);
+			$since_id = (int) clean($_REQUEST["since_id"]);
 			$include_nested = API::param_to_bool(clean($_REQUEST["include_nested"]));
 			$sanitize_content = !isset($_REQUEST["sanitize"]) ||
 				API::param_to_bool($_REQUEST["sanitize"]);
 			$force_update = API::param_to_bool(clean($_REQUEST["force_update"]));
 			$has_sandbox = API::param_to_bool(clean($_REQUEST["has_sandbox"]));
-			$excerpt_length = (int)clean($_REQUEST["excerpt_length"]);
-			$check_first_id = (int)clean($_REQUEST["check_first_id"]);
+			$excerpt_length = (int) clean($_REQUEST["excerpt_length"]);
+			$check_first_id = (int) clean($_REQUEST["check_first_id"]);
 			$include_header = API::param_to_bool(clean($_REQUEST["include_header"]));
 
 			$_SESSION['hasSandbox'] = $has_sandbox;
@@ -253,7 +253,7 @@ 
 		$article_ids = explode(",", clean($_REQUEST["article_ids"]));
 		$mode = (int) clean($_REQUEST["mode"]);
 		$data = clean($_REQUEST["data"]);
-		$field_raw = (int)clean($_REQUEST["field"]);
+		$field_raw = (int) clean($_REQUEST["field"]);
 
 		$field = "";
 		$set_to = "";
@@ -360,7 +360,7 @@ 
 					"updated" => (int) strtotime($line["updated"]),
 					"feed_id" => $line["feed_id"],
 					"attachments" => $attachments,
-					"score" => (int)$line["score"],
+					"score" => (int) $line["score"],
 					"feed_title" => $line["feed_title"],
 					"note" => $line["note"],
 					"lang" => $line["lang"]
@@ -434,7 +434,7 @@ 
 	}
 
 	public function getLabels() {
-		$article_id = (int)clean($_REQUEST['article_id']);
+		$article_id = (int) clean($_REQUEST['article_id']);
 
 		$rv = array();
 
@@ -459,7 +459,7 @@ 
 			}
 
 			array_push($rv, array(
-				"id" => (int)Labels::label_to_feed_id($line['id']),
+				"id" => (int) Labels::label_to_feed_id($line['id']),
 				"caption" => $line['caption'],
 				"fg_color" => $line['fg_color'],
 				"bg_color" => $line['bg_color'],
@@ -644,10 +644,10 @@ 
 					$row = array(
 							"feed_url" => $line["feed_url"],
 							"title" => $line["title"],
-							"id" => (int)$line["id"],
-							"unread" => (int)$unread,
+							"id" => (int) $line["id"],
+							"unread" => (int) $unread,
 							"has_icon" => $has_icon,
-							"cat_id" => (int)$line["cat_id"],
+							"cat_id" => (int) $line["cat_id"],
 							"last_updated" => (int) strtotime($line["last_updated"]),
 							"order_id" => (int) $line["order_id"],
 						);
@@ -748,12 +748,12 @@ 
 					if (!is_array($labels)) $labels = Article::get_article_labels($line["id"]);
 
 					$headline_row = array(
-						"id" => (int)$line["id"],
+						"id" => (int) $line["id"],
 						"guid" => $line["guid"],
 						"unread" => API::param_to_bool($line["unread"]),
 						"marked" => API::param_to_bool($line["marked"]),
 						"published" => API::param_to_bool($line["published"]),
-						"updated" => (int)strtotime($line["updated"]),
+						"updated" => (int) strtotime($line["updated"]),
 						"is_updated" => $is_updated,
 						"title" => $line["title"],
 						"link" => $line["link"],
@@ -786,17 +786,16 @@ 
 
 					$headline_row["labels"] = $labels;
 
-					$headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] :
-						$feed_title;
+					$headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] : $feed_title;
 
-					$headline_row["comments_count"] = (int)$line["num_comments"];
+					$headline_row["comments_count"] = (int) $line["num_comments"];
 					$headline_row["comments_link"] = $line["comments"];
 
 					$headline_row["always_display_attachments"] = API::param_to_bool($line["always_display_enclosures"]);
 
 					$headline_row["author"] = $line["author"];
 
-					$headline_row["score"] = (int)$line["score"];
+					$headline_row["score"] = (int) $line["score"];
 					$headline_row["note"] = $line["note"];
 					$headline_row["lang"] = $line["lang"];
 
@@ -858,7 +857,7 @@ 
 		$_REQUEST['mode'] = 2;
 		$_REQUEST['force_show_empty'] = $include_empty;
 
-		if ($pf){
+		if ($pf) {
 			$data = $pf->makefeedtree();
 			$this->wrap(self::STATUS_OK, array("categories" => $data));
 		} else {

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -283,7 +283,7 @@ 
 				$set_to = "false";
 				break;
 			case 2:
-				$set_to = "NOT $field";
+				$set_to = "not $field";
 				break;
 		}
 
@@ -607,7 +607,7 @@ 
 			/* Real feeds */
 
 			if ($limit) {
-				$limit_qpart = "LIMIT $limit OFFSET $offset";
+				$limit_qpart = "limit $limit OFFSET $offset";
 			} else {
 				$limit_qpart = "";
 			}

Indentation +754 added lines, -754 removed lines

@@ -1,145 +1,145 @@ 
 <?php
 class API extends Handler {
 
-	const API_LEVEL  = 14;
-
-	const STATUS_OK  = 0;
-	const STATUS_ERR = 1;
-
-	private $seq;
-
-	public static function param_to_bool($p) {
-		return $p && ($p !== "f" && $p !== "false");
-	}
-
-	public function before($method) {
-		if (parent::before($method)) {
-			header("Content-Type: text/json");
-
-			if (!$_SESSION["uid"] && $method != "login" && $method != "isloggedin") {
-				$this->wrap(self::STATUS_ERR, array("error" => 'NOT_LOGGED_IN'));
-				return false;
-			}
-
-			if ($_SESSION["uid"] && $method != "logout" && !get_pref('ENABLE_API_ACCESS')) {
-				$this->wrap(self::STATUS_ERR, array("error" => 'API_DISABLED'));
-				return false;
-			}
-
-			$this->seq = (int) clean($_REQUEST['seq']);
-
-			return true;
-		}
-		return false;
-	}
-
-	public function wrap($status, $reply) {
-		print json_encode(array("seq" => $this->seq,
-			"status" => $status,
-			"content" => $reply));
-	}
-
-	public function getVersion() {
-		$rv = array("version" => VERSION);
-		$this->wrap(self::STATUS_OK, $rv);
-	}
-
-	public function getApiLevel() {
-		$rv = array("level" => self::API_LEVEL);
-		$this->wrap(self::STATUS_OK, $rv);
-	}
-
-	public function login() {
-		@session_destroy();
-		@session_start();
-
-		$login = clean($_REQUEST["user"]);
-		$password = clean($_REQUEST["password"]);
-		$password_base64 = base64_decode(clean($_REQUEST["password"]));
-
-		if (SINGLE_USER_MODE) $login = "admin";
-
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
-		$sth->execute([$login]);
-
-		if ($row = $sth->fetch()) {
-			$uid = $row["id"];
-		} else {
-			$uid = 0;
-		}
-
-		if (!$uid) {
-			$this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
-			return;
-		}
-
-		if (get_pref("ENABLE_API_ACCESS", $uid)) {
-			if (authenticate_user($login, $password, false,  Auth_Base::AUTH_SERVICE_API)) {               // try login with normal password
-				$this->wrap(self::STATUS_OK, array("session_id" => session_id(),
-					"api_level" => self::API_LEVEL));
-			} else if (authenticate_user($login, $password_base64, false, Auth_Base::AUTH_SERVICE_API)) { // else try with base64_decoded password
-				$this->wrap(self::STATUS_OK,	array("session_id" => session_id(),
-					"api_level" => self::API_LEVEL));
-			} else {                                                         // else we are not logged in
-				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
-				$this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
-			}
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => "API_DISABLED"));
-		}
-
-	}
-
-	public function logout() {
-		logout_user();
-		$this->wrap(self::STATUS_OK, array("status" => "OK"));
-	}
-
-	public function isLoggedIn() {
-		$this->wrap(self::STATUS_OK, array("status" => $_SESSION["uid"] != ''));
-	}
-
-	public function getUnread() {
-		$feed_id = clean($_REQUEST["feed_id"]);
-		$is_cat = clean($_REQUEST["is_cat"]);
-
-		if ($feed_id) {
-			$this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
-		} else {
-			$this->wrap(self::STATUS_OK, array("unread" => Feeds::getGlobalUnread()));
-		}
-	}
-
-	/* Method added for ttrss-reader for Android */
-	public function getCounters() {
-		$this->wrap(self::STATUS_OK, Counters::getAllCounters());
-	}
-
-	public function getFeeds() {
-		$cat_id = clean($_REQUEST["cat_id"]);
-		$unread_only = API::param_to_bool(clean($_REQUEST["unread_only"]));
-		$limit = (int) clean($_REQUEST["limit"]);
-		$offset = (int) clean($_REQUEST["offset"]);
-		$include_nested = API::param_to_bool(clean($_REQUEST["include_nested"]));
-
-		$feeds = $this->api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested);
-
-		$this->wrap(self::STATUS_OK, $feeds);
-	}
-
-	public function getCategories() {
-		$unread_only = API::param_to_bool(clean($_REQUEST["unread_only"]));
-		$enable_nested = API::param_to_bool(clean($_REQUEST["enable_nested"]));
-		$include_empty = API::param_to_bool(clean($_REQUEST['include_empty']));
-
-		// TODO do not return empty categories, return Uncategorized and standard virtual cats
-
-		if ($enable_nested)
-			$nested_qpart = "parent_cat IS NULL";
-		else
-			$nested_qpart = "true";
-
-		$sth = $this->pdo->prepare("SELECT
+    const API_LEVEL  = 14;
+
+    const STATUS_OK  = 0;
+    const STATUS_ERR = 1;
+
+    private $seq;
+
+    public static function param_to_bool($p) {
+        return $p && ($p !== "f" && $p !== "false");
+    }
+
+    public function before($method) {
+        if (parent::before($method)) {
+            header("Content-Type: text/json");
+
+            if (!$_SESSION["uid"] && $method != "login" && $method != "isloggedin") {
+                $this->wrap(self::STATUS_ERR, array("error" => 'NOT_LOGGED_IN'));
+                return false;
+            }
+
+            if ($_SESSION["uid"] && $method != "logout" && !get_pref('ENABLE_API_ACCESS')) {
+                $this->wrap(self::STATUS_ERR, array("error" => 'API_DISABLED'));
+                return false;
+            }
+
+            $this->seq = (int) clean($_REQUEST['seq']);
+
+            return true;
+        }
+        return false;
+    }
+
+    public function wrap($status, $reply) {
+        print json_encode(array("seq" => $this->seq,
+            "status" => $status,
+            "content" => $reply));
+    }
+
+    public function getVersion() {
+        $rv = array("version" => VERSION);
+        $this->wrap(self::STATUS_OK, $rv);
+    }
+
+    public function getApiLevel() {
+        $rv = array("level" => self::API_LEVEL);
+        $this->wrap(self::STATUS_OK, $rv);
+    }
+
+    public function login() {
+        @session_destroy();
+        @session_start();
+
+        $login = clean($_REQUEST["user"]);
+        $password = clean($_REQUEST["password"]);
+        $password_base64 = base64_decode(clean($_REQUEST["password"]));
+
+        if (SINGLE_USER_MODE) $login = "admin";
+
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
+        $sth->execute([$login]);
+
+        if ($row = $sth->fetch()) {
+            $uid = $row["id"];
+        } else {
+            $uid = 0;
+        }
+
+        if (!$uid) {
+            $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
+            return;
+        }
+
+        if (get_pref("ENABLE_API_ACCESS", $uid)) {
+            if (authenticate_user($login, $password, false,  Auth_Base::AUTH_SERVICE_API)) {               // try login with normal password
+                $this->wrap(self::STATUS_OK, array("session_id" => session_id(),
+                    "api_level" => self::API_LEVEL));
+            } else if (authenticate_user($login, $password_base64, false, Auth_Base::AUTH_SERVICE_API)) { // else try with base64_decoded password
+                $this->wrap(self::STATUS_OK,	array("session_id" => session_id(),
+                    "api_level" => self::API_LEVEL));
+            } else {                                                         // else we are not logged in
+                user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
+                $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
+            }
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => "API_DISABLED"));
+        }
+
+    }
+
+    public function logout() {
+        logout_user();
+        $this->wrap(self::STATUS_OK, array("status" => "OK"));
+    }
+
+    public function isLoggedIn() {
+        $this->wrap(self::STATUS_OK, array("status" => $_SESSION["uid"] != ''));
+    }
+
+    public function getUnread() {
+        $feed_id = clean($_REQUEST["feed_id"]);
+        $is_cat = clean($_REQUEST["is_cat"]);
+
+        if ($feed_id) {
+            $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
+        } else {
+            $this->wrap(self::STATUS_OK, array("unread" => Feeds::getGlobalUnread()));
+        }
+    }
+
+    /* Method added for ttrss-reader for Android */
+    public function getCounters() {
+        $this->wrap(self::STATUS_OK, Counters::getAllCounters());
+    }
+
+    public function getFeeds() {
+        $cat_id = clean($_REQUEST["cat_id"]);
+        $unread_only = API::param_to_bool(clean($_REQUEST["unread_only"]));
+        $limit = (int) clean($_REQUEST["limit"]);
+        $offset = (int) clean($_REQUEST["offset"]);
+        $include_nested = API::param_to_bool(clean($_REQUEST["include_nested"]));
+
+        $feeds = $this->api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested);
+
+        $this->wrap(self::STATUS_OK, $feeds);
+    }
+
+    public function getCategories() {
+        $unread_only = API::param_to_bool(clean($_REQUEST["unread_only"]));
+        $enable_nested = API::param_to_bool(clean($_REQUEST["enable_nested"]));
+        $include_empty = API::param_to_bool(clean($_REQUEST['include_empty']));
+
+        // TODO do not return empty categories, return Uncategorized and standard virtual cats
+
+        if ($enable_nested)
+            $nested_qpart = "parent_cat IS NULL";
+        else
+            $nested_qpart = "true";
+
+        $sth = $this->pdo->prepare("SELECT
 				id, title, order_id, (SELECT COUNT(id) FROM
 				ttrss_feeds WHERE
 				ttrss_feed_categories.id IS NOT NULL AND cat_id = ttrss_feed_categories.id) AS num_feeds,
@@ -148,188 +148,188 @@ 
 				c2.parent_cat = ttrss_feed_categories.id) AS num_cats
 			FROM ttrss_feed_categories
 			WHERE $nested_qpart AND owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-
-		$cats = array();
-
-		while ($line = $sth->fetch()) {
-			if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
-				$unread = getFeedUnread($line["id"], true);
-
-				if ($enable_nested)
-					$unread += Feeds::getCategoryChildrenUnread($line["id"]);
-
-				if ($unread || !$unread_only) {
-					array_push($cats, array("id" => $line["id"],
-						"title" => $line["title"],
-						"unread" => $unread,
-						"order_id" => (int) $line["order_id"],
-					));
-				}
-			}
-		}
-
-		foreach (array(-2,-1,0) as $cat_id) {
-			if ($include_empty || !$this->isCategoryEmpty($cat_id)) {
-				$unread = getFeedUnread($cat_id, true);
-
-				if ($unread || !$unread_only) {
-					array_push($cats, array("id" => $cat_id,
-						"title" => Feeds::getCategoryTitle($cat_id),
-						"unread" => $unread));
-				}
-			}
-		}
-
-		$this->wrap(self::STATUS_OK, $cats);
-	}
-
-	public function getHeadlines() {
-		$feed_id = clean($_REQUEST["feed_id"]);
-		if ($feed_id !== "") {
-
-			if (is_numeric($feed_id)) $feed_id = (int) $feed_id;
-
-			$limit = (int)clean($_REQUEST["limit"]);
-
-			if (!$limit || $limit >= 200) $limit = 200;
-
-			$offset = (int)clean($_REQUEST["skip"]);
-			$filter = clean($_REQUEST["filter"]);
-			$is_cat = API::param_to_bool(clean($_REQUEST["is_cat"]));
-			$show_excerpt = API::param_to_bool(clean($_REQUEST["show_excerpt"]));
-			$show_content = API::param_to_bool(clean($_REQUEST["show_content"]));
-			/* all_articles, unread, adaptive, marked, updated */
-			$view_mode = clean($_REQUEST["view_mode"]);
-			$include_attachments = API::param_to_bool(clean($_REQUEST["include_attachments"]));
-			$since_id = (int)clean($_REQUEST["since_id"]);
-			$include_nested = API::param_to_bool(clean($_REQUEST["include_nested"]));
-			$sanitize_content = !isset($_REQUEST["sanitize"]) ||
-				API::param_to_bool($_REQUEST["sanitize"]);
-			$force_update = API::param_to_bool(clean($_REQUEST["force_update"]));
-			$has_sandbox = API::param_to_bool(clean($_REQUEST["has_sandbox"]));
-			$excerpt_length = (int)clean($_REQUEST["excerpt_length"]);
-			$check_first_id = (int)clean($_REQUEST["check_first_id"]);
-			$include_header = API::param_to_bool(clean($_REQUEST["include_header"]));
-
-			$_SESSION['hasSandbox'] = $has_sandbox;
-
-			$skip_first_id_check = false;
-
-			$override_order = false;
-			switch (clean($_REQUEST["order_by"])) {
-				case "title":
-					$override_order = "ttrss_entries.title, date_entered, updated";
-					break;
-				case "date_reverse":
-					$override_order = "score DESC, date_entered, updated";
-					$skip_first_id_check = true;
-					break;
-				case "feed_dates":
-					$override_order = "updated DESC";
-					break;
-			}
-
-			/* do not rely on params below */
-
-			$search = clean($_REQUEST["search"]);
-
-			list($headlines, $headlines_header) = $this->api_get_headlines($feed_id, $limit, $offset,
-				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order,
-				$include_attachments, $since_id, $search,
-				$include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id, $skip_first_id_check);
-
-			if ($include_header) {
-				$this->wrap(self::STATUS_OK, array($headlines_header, $headlines));
-			} else {
-				$this->wrap(self::STATUS_OK, $headlines);
-			}
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
-		}
-	}
-
-	public function updateArticle() {
-		$article_ids = explode(",", clean($_REQUEST["article_ids"]));
-		$mode = (int) clean($_REQUEST["mode"]);
-		$data = clean($_REQUEST["data"]);
-		$field_raw = (int)clean($_REQUEST["field"]);
-
-		$field = "";
-		$set_to = "";
-
-		switch ($field_raw) {
-			case 0:
-				$field = "marked";
-				$additional_fields = ",last_marked = NOW()";
-				break;
-			case 1:
-				$field = "published";
-				$additional_fields = ",last_published = NOW()";
-				break;
-			case 2:
-				$field = "unread";
-				$additional_fields = ",last_read = NOW()";
-				break;
-			case 3:
-				$field = "note";
-		};
-
-		switch ($mode) {
-			case 1:
-				$set_to = "true";
-				break;
-			case 0:
-				$set_to = "false";
-				break;
-			case 2:
-				$set_to = "NOT $field";
-				break;
-		}
-
-		if ($field == "note") $set_to = $this->pdo->quote($data);
-
-		if ($field && $set_to && count($article_ids) > 0) {
-
-			$article_qmarks = arr_qmarks($article_ids);
-
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        $sth->execute([$_SESSION['uid']]);
+
+        $cats = array();
+
+        while ($line = $sth->fetch()) {
+            if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
+                $unread = getFeedUnread($line["id"], true);
+
+                if ($enable_nested)
+                    $unread += Feeds::getCategoryChildrenUnread($line["id"]);
+
+                if ($unread || !$unread_only) {
+                    array_push($cats, array("id" => $line["id"],
+                        "title" => $line["title"],
+                        "unread" => $unread,
+                        "order_id" => (int) $line["order_id"],
+                    ));
+                }
+            }
+        }
+
+        foreach (array(-2,-1,0) as $cat_id) {
+            if ($include_empty || !$this->isCategoryEmpty($cat_id)) {
+                $unread = getFeedUnread($cat_id, true);
+
+                if ($unread || !$unread_only) {
+                    array_push($cats, array("id" => $cat_id,
+                        "title" => Feeds::getCategoryTitle($cat_id),
+                        "unread" => $unread));
+                }
+            }
+        }
+
+        $this->wrap(self::STATUS_OK, $cats);
+    }
+
+    public function getHeadlines() {
+        $feed_id = clean($_REQUEST["feed_id"]);
+        if ($feed_id !== "") {
+
+            if (is_numeric($feed_id)) $feed_id = (int) $feed_id;
+
+            $limit = (int)clean($_REQUEST["limit"]);
+
+            if (!$limit || $limit >= 200) $limit = 200;
+
+            $offset = (int)clean($_REQUEST["skip"]);
+            $filter = clean($_REQUEST["filter"]);
+            $is_cat = API::param_to_bool(clean($_REQUEST["is_cat"]));
+            $show_excerpt = API::param_to_bool(clean($_REQUEST["show_excerpt"]));
+            $show_content = API::param_to_bool(clean($_REQUEST["show_content"]));
+            /* all_articles, unread, adaptive, marked, updated */
+            $view_mode = clean($_REQUEST["view_mode"]);
+            $include_attachments = API::param_to_bool(clean($_REQUEST["include_attachments"]));
+            $since_id = (int)clean($_REQUEST["since_id"]);
+            $include_nested = API::param_to_bool(clean($_REQUEST["include_nested"]));
+            $sanitize_content = !isset($_REQUEST["sanitize"]) ||
+                API::param_to_bool($_REQUEST["sanitize"]);
+            $force_update = API::param_to_bool(clean($_REQUEST["force_update"]));
+            $has_sandbox = API::param_to_bool(clean($_REQUEST["has_sandbox"]));
+            $excerpt_length = (int)clean($_REQUEST["excerpt_length"]);
+            $check_first_id = (int)clean($_REQUEST["check_first_id"]);
+            $include_header = API::param_to_bool(clean($_REQUEST["include_header"]));
+
+            $_SESSION['hasSandbox'] = $has_sandbox;
+
+            $skip_first_id_check = false;
+
+            $override_order = false;
+            switch (clean($_REQUEST["order_by"])) {
+                case "title":
+                    $override_order = "ttrss_entries.title, date_entered, updated";
+                    break;
+                case "date_reverse":
+                    $override_order = "score DESC, date_entered, updated";
+                    $skip_first_id_check = true;
+                    break;
+                case "feed_dates":
+                    $override_order = "updated DESC";
+                    break;
+            }
+
+            /* do not rely on params below */
+
+            $search = clean($_REQUEST["search"]);
+
+            list($headlines, $headlines_header) = $this->api_get_headlines($feed_id, $limit, $offset,
+                $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order,
+                $include_attachments, $since_id, $search,
+                $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id, $skip_first_id_check);
+
+            if ($include_header) {
+                $this->wrap(self::STATUS_OK, array($headlines_header, $headlines));
+            } else {
+                $this->wrap(self::STATUS_OK, $headlines);
+            }
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+        }
+    }
+
+    public function updateArticle() {
+        $article_ids = explode(",", clean($_REQUEST["article_ids"]));
+        $mode = (int) clean($_REQUEST["mode"]);
+        $data = clean($_REQUEST["data"]);
+        $field_raw = (int)clean($_REQUEST["field"]);
+
+        $field = "";
+        $set_to = "";
+
+        switch ($field_raw) {
+            case 0:
+                $field = "marked";
+                $additional_fields = ",last_marked = NOW()";
+                break;
+            case 1:
+                $field = "published";
+                $additional_fields = ",last_published = NOW()";
+                break;
+            case 2:
+                $field = "unread";
+                $additional_fields = ",last_read = NOW()";
+                break;
+            case 3:
+                $field = "note";
+        };
+
+        switch ($mode) {
+            case 1:
+                $set_to = "true";
+                break;
+            case 0:
+                $set_to = "false";
+                break;
+            case 2:
+                $set_to = "NOT $field";
+                break;
+        }
+
+        if ($field == "note") $set_to = $this->pdo->quote($data);
+
+        if ($field && $set_to && count($article_ids) > 0) {
+
+            $article_qmarks = arr_qmarks($article_ids);
+
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				$field = $set_to $additional_fields
 				WHERE ref_id IN ($article_qmarks) AND owner_uid = ?");
-			$sth->execute(array_merge($article_ids, [$_SESSION['uid']]));
+            $sth->execute(array_merge($article_ids, [$_SESSION['uid']]));
 
-			$num_updated = $sth->rowCount();
+            $num_updated = $sth->rowCount();
 
-			if ($num_updated > 0 && $field == "unread") {
-				$sth = $this->pdo->prepare("SELECT DISTINCT feed_id FROM ttrss_user_entries
+            if ($num_updated > 0 && $field == "unread") {
+                $sth = $this->pdo->prepare("SELECT DISTINCT feed_id FROM ttrss_user_entries
 					WHERE ref_id IN ($article_qmarks)");
-				$sth->execute($article_ids);
+                $sth->execute($article_ids);
 
-				while ($line = $sth->fetch()) {
-					CCache::update($line["feed_id"], $_SESSION["uid"]);
-				}
-			}
+                while ($line = $sth->fetch()) {
+                    CCache::update($line["feed_id"], $_SESSION["uid"]);
+                }
+            }
 
-			$this->wrap(self::STATUS_OK, array("status" => "OK",
-				"updated" => $num_updated));
+            $this->wrap(self::STATUS_OK, array("status" => "OK",
+                "updated" => $num_updated));
 
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
-		}
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+        }
 
-	}
+    }
 
-	public function getArticle() {
+    public function getArticle() {
 
-		$article_ids = explode(",", clean($_REQUEST["article_id"]));
-		$sanitize_content = !isset($_REQUEST["sanitize"]) ||
-			API::param_to_bool($_REQUEST["sanitize"]);
+        $article_ids = explode(",", clean($_REQUEST["article_id"]));
+        $sanitize_content = !isset($_REQUEST["sanitize"]) ||
+            API::param_to_bool($_REQUEST["sanitize"]);
 
-		if ($article_ids) {
+        if ($article_ids) {
 
-			$article_qmarks = arr_qmarks($article_ids);
+            $article_qmarks = arr_qmarks($article_ids);
 
-			$sth = $this->pdo->prepare("SELECT id,guid,title,link,content,feed_id,comments,int_id,
+            $sth = $this->pdo->prepare("SELECT id,guid,title,link,content,feed_id,comments,int_id,
 				marked,unread,published,score,note,lang,
 				".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 				author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title,
@@ -338,559 +338,559 @@ 
 				FROM ttrss_entries,ttrss_user_entries
 				WHERE id IN ($article_qmarks) AND ref_id = id AND owner_uid = ?");
 
-			$sth->execute(array_merge($article_ids, [$_SESSION['uid']]));
-
-			$articles = array();
-
-			while ($line = $sth->fetch()) {
-
-				$attachments = Article::get_article_enclosures($line['id']);
-
-				$article = array(
-					"id" => $line["id"],
-					"guid" => $line["guid"],
-					"title" => $line["title"],
-					"link" => $line["link"],
-					"labels" => Article::get_article_labels($line['id']),
-					"unread" => API::param_to_bool($line["unread"]),
-					"marked" => API::param_to_bool($line["marked"]),
-					"published" => API::param_to_bool($line["published"]),
-					"comments" => $line["comments"],
-					"author" => $line["author"],
-					"updated" => (int) strtotime($line["updated"]),
-					"feed_id" => $line["feed_id"],
-					"attachments" => $attachments,
-					"score" => (int)$line["score"],
-					"feed_title" => $line["feed_title"],
-					"note" => $line["note"],
-					"lang" => $line["lang"]
-				);
-
-				if ($sanitize_content) {
-					$article["content"] = sanitize(
-						$line["content"],
-						API::param_to_bool($line['hide_images']),
-						false, $line["site_url"], false, $line["id"]);
-				} else {
-					$article["content"] = $line["content"];
-				}
-
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
-					$article = $p->hook_render_article_api(array("article" => $article));
-				}
-
-				$article['content'] = DiskCache::rewriteUrls($article['content']);
-
-				array_push($articles, $article);
-
-			}
-
-			$this->wrap(self::STATUS_OK, $articles);
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
-		}
-	}
-
-	public function getConfig() {
-		$config = array(
-			"icons_dir" => ICONS_DIR,
-			"icons_url" => ICONS_URL);
-
-		$config["daemon_is_running"] = file_is_locked("update_daemon.lock");
-
-		$sth = $this->pdo->prepare("SELECT COUNT(*) AS cf FROM
+            $sth->execute(array_merge($article_ids, [$_SESSION['uid']]));
+
+            $articles = array();
+
+            while ($line = $sth->fetch()) {
+
+                $attachments = Article::get_article_enclosures($line['id']);
+
+                $article = array(
+                    "id" => $line["id"],
+                    "guid" => $line["guid"],
+                    "title" => $line["title"],
+                    "link" => $line["link"],
+                    "labels" => Article::get_article_labels($line['id']),
+                    "unread" => API::param_to_bool($line["unread"]),
+                    "marked" => API::param_to_bool($line["marked"]),
+                    "published" => API::param_to_bool($line["published"]),
+                    "comments" => $line["comments"],
+                    "author" => $line["author"],
+                    "updated" => (int) strtotime($line["updated"]),
+                    "feed_id" => $line["feed_id"],
+                    "attachments" => $attachments,
+                    "score" => (int)$line["score"],
+                    "feed_title" => $line["feed_title"],
+                    "note" => $line["note"],
+                    "lang" => $line["lang"]
+                );
+
+                if ($sanitize_content) {
+                    $article["content"] = sanitize(
+                        $line["content"],
+                        API::param_to_bool($line['hide_images']),
+                        false, $line["site_url"], false, $line["id"]);
+                } else {
+                    $article["content"] = $line["content"];
+                }
+
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
+                    $article = $p->hook_render_article_api(array("article" => $article));
+                }
+
+                $article['content'] = DiskCache::rewriteUrls($article['content']);
+
+                array_push($articles, $article);
+
+            }
+
+            $this->wrap(self::STATUS_OK, $articles);
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+        }
+    }
+
+    public function getConfig() {
+        $config = array(
+            "icons_dir" => ICONS_DIR,
+            "icons_url" => ICONS_URL);
+
+        $config["daemon_is_running"] = file_is_locked("update_daemon.lock");
+
+        $sth = $this->pdo->prepare("SELECT COUNT(*) AS cf FROM
 			ttrss_feeds WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-		$row = $sth->fetch();
+        $sth->execute([$_SESSION['uid']]);
+        $row = $sth->fetch();
 
-		$config["num_feeds"] = $row["cf"];
+        $config["num_feeds"] = $row["cf"];
 
-		$this->wrap(self::STATUS_OK, $config);
-	}
+        $this->wrap(self::STATUS_OK, $config);
+    }
 
-	public function updateFeed() {
-		$feed_id = (int) clean($_REQUEST["feed_id"]);
+    public function updateFeed() {
+        $feed_id = (int) clean($_REQUEST["feed_id"]);
 
-		if (!ini_get("open_basedir")) {
-			RSSUtils::update_rss_feed($feed_id);
-		}
+        if (!ini_get("open_basedir")) {
+            RSSUtils::update_rss_feed($feed_id);
+        }
 
-		$this->wrap(self::STATUS_OK, array("status" => "OK"));
-	}
+        $this->wrap(self::STATUS_OK, array("status" => "OK"));
+    }
 
-	public function catchupFeed() {
-		$feed_id = clean($_REQUEST["feed_id"]);
-		$is_cat = clean($_REQUEST["is_cat"]);
+    public function catchupFeed() {
+        $feed_id = clean($_REQUEST["feed_id"]);
+        $is_cat = clean($_REQUEST["is_cat"]);
 
-		Feeds::catchup_feed($feed_id, $is_cat);
+        Feeds::catchup_feed($feed_id, $is_cat);
 
-		$this->wrap(self::STATUS_OK, array("status" => "OK"));
-	}
+        $this->wrap(self::STATUS_OK, array("status" => "OK"));
+    }
 
-	public function getPref() {
-		$pref_name = clean($_REQUEST["pref_name"]);
+    public function getPref() {
+        $pref_name = clean($_REQUEST["pref_name"]);
 
-		$this->wrap(self::STATUS_OK, array("value" => get_pref($pref_name)));
-	}
+        $this->wrap(self::STATUS_OK, array("value" => get_pref($pref_name)));
+    }
 
-	public function getLabels() {
-		$article_id = (int)clean($_REQUEST['article_id']);
+    public function getLabels() {
+        $article_id = (int)clean($_REQUEST['article_id']);
 
-		$rv = array();
+        $rv = array();
 
-		$sth = $this->pdo->prepare("SELECT id, caption, fg_color, bg_color
+        $sth = $this->pdo->prepare("SELECT id, caption, fg_color, bg_color
 			FROM ttrss_labels2
 			WHERE owner_uid = ? ORDER BY caption");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($article_id)
-			$article_labels = Article::get_article_labels($article_id);
-		else
-			$article_labels = array();
+        if ($article_id)
+            $article_labels = Article::get_article_labels($article_id);
+        else
+            $article_labels = array();
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$checked = false;
-			foreach ($article_labels as $al) {
-				if (Labels::feed_to_label_id($al[0]) == $line['id']) {
-					$checked = true;
-					break;
-				}
-			}
+            $checked = false;
+            foreach ($article_labels as $al) {
+                if (Labels::feed_to_label_id($al[0]) == $line['id']) {
+                    $checked = true;
+                    break;
+                }
+            }
 
-			array_push($rv, array(
-				"id" => (int)Labels::label_to_feed_id($line['id']),
-				"caption" => $line['caption'],
-				"fg_color" => $line['fg_color'],
-				"bg_color" => $line['bg_color'],
-				"checked" => $checked));
-		}
+            array_push($rv, array(
+                "id" => (int)Labels::label_to_feed_id($line['id']),
+                "caption" => $line['caption'],
+                "fg_color" => $line['fg_color'],
+                "bg_color" => $line['bg_color'],
+                "checked" => $checked));
+        }
 
-		$this->wrap(self::STATUS_OK, $rv);
-	}
+        $this->wrap(self::STATUS_OK, $rv);
+    }
 
-	public function setArticleLabel() {
+    public function setArticleLabel() {
 
-		$article_ids = explode(",", clean($_REQUEST["article_ids"]));
-		$label_id = (int) clean($_REQUEST['label_id']);
-		$assign = API::param_to_bool(clean($_REQUEST['assign']));
+        $article_ids = explode(",", clean($_REQUEST["article_ids"]));
+        $label_id = (int) clean($_REQUEST['label_id']);
+        $assign = API::param_to_bool(clean($_REQUEST['assign']));
 
-		$label = Labels::find_caption(Labels::feed_to_label_id($label_id), $_SESSION["uid"]);
+        $label = Labels::find_caption(Labels::feed_to_label_id($label_id), $_SESSION["uid"]);
 
-		$num_updated = 0;
+        $num_updated = 0;
 
-		if ($label) {
+        if ($label) {
 
-			foreach ($article_ids as $id) {
+            foreach ($article_ids as $id) {
 
-				if ($assign)
-					Labels::add_article($id, $label, $_SESSION["uid"]);
-				else
-					Labels::remove_article($id, $label, $_SESSION["uid"]);
+                if ($assign)
+                    Labels::add_article($id, $label, $_SESSION["uid"]);
+                else
+                    Labels::remove_article($id, $label, $_SESSION["uid"]);
 
-				++$num_updated;
+                ++$num_updated;
 
-			}
-		}
+            }
+        }
 
-		$this->wrap(self::STATUS_OK, array("status" => "OK",
-			"updated" => $num_updated));
+        $this->wrap(self::STATUS_OK, array("status" => "OK",
+            "updated" => $num_updated));
 
-	}
+    }
 
-	public function index($method) {
-		$plugin = PluginHost::getInstance()->get_api_method(strtolower($method));
+    public function index($method) {
+        $plugin = PluginHost::getInstance()->get_api_method(strtolower($method));
 
-		if ($plugin && method_exists($plugin, $method)) {
-			$reply = $plugin->$method();
+        if ($plugin && method_exists($plugin, $method)) {
+            $reply = $plugin->$method();
 
-			$this->wrap($reply[0], $reply[1]);
+            $this->wrap($reply[0], $reply[1]);
 
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'UNKNOWN_METHOD', "method" => $method));
-		}
-	}
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'UNKNOWN_METHOD', "method" => $method));
+        }
+    }
 
-	public function shareToPublished() {
-		$title = strip_tags(clean($_REQUEST["title"]));
-		$url = strip_tags(clean($_REQUEST["url"]));
-		$content = strip_tags(clean($_REQUEST["content"]));
+    public function shareToPublished() {
+        $title = strip_tags(clean($_REQUEST["title"]));
+        $url = strip_tags(clean($_REQUEST["url"]));
+        $content = strip_tags(clean($_REQUEST["content"]));
 
-		if (Article::create_published_article($title, $url, $content, "", $_SESSION["uid"])) {
-			$this->wrap(self::STATUS_OK, array("status" => 'OK'));
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
-		}
-	}
+        if (Article::create_published_article($title, $url, $content, "", $_SESSION["uid"])) {
+            $this->wrap(self::STATUS_OK, array("status" => 'OK'));
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
+        }
+    }
 
-	public static function api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested = false) {
+    public static function api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested = false) {
 
-			$feeds = array();
+            $feeds = array();
 
-			$pdo = Db::pdo();
+            $pdo = Db::pdo();
 
-			$limit = (int) $limit;
-			$offset = (int) $offset;
-			$cat_id = (int) $cat_id;
+            $limit = (int) $limit;
+            $offset = (int) $offset;
+            $cat_id = (int) $cat_id;
 
-			/* Labels */
+            /* Labels */
 
-			/* API only: -4 All feeds, including virtual feeds */
-			if ($cat_id == -4 || $cat_id == -2) {
-				$counters = Counters::getLabelCounters(true);
+            /* API only: -4 All feeds, including virtual feeds */
+            if ($cat_id == -4 || $cat_id == -2) {
+                $counters = Counters::getLabelCounters(true);
 
-				foreach (array_values($counters) as $cv) {
+                foreach (array_values($counters) as $cv) {
 
-					$unread = $cv["counter"];
+                    $unread = $cv["counter"];
 
-					if ($unread || !$unread_only) {
+                    if ($unread || !$unread_only) {
 
-						$row = array(
-								"id" => (int) $cv["id"],
-								"title" => $cv["description"],
-								"unread" => $cv["counter"],
-								"cat_id" => -2,
-							);
+                        $row = array(
+                                "id" => (int) $cv["id"],
+                                "title" => $cv["description"],
+                                "unread" => $cv["counter"],
+                                "cat_id" => -2,
+                            );
 
-						array_push($feeds, $row);
-					}
-				}
-			}
+                        array_push($feeds, $row);
+                    }
+                }
+            }
 
-			/* Virtual feeds */
+            /* Virtual feeds */
 
-			if ($cat_id == -4 || $cat_id == -1) {
-				foreach (array(-1, -2, -3, -4, -6, 0) as $i) {
-					$unread = getFeedUnread($i);
+            if ($cat_id == -4 || $cat_id == -1) {
+                foreach (array(-1, -2, -3, -4, -6, 0) as $i) {
+                    $unread = getFeedUnread($i);
 
-					if ($unread || !$unread_only) {
-						$title = Feeds::getFeedTitle($i);
+                    if ($unread || !$unread_only) {
+                        $title = Feeds::getFeedTitle($i);
 
-						$row = array(
-								"id" => $i,
-								"title" => $title,
-								"unread" => $unread,
-								"cat_id" => -1,
-							);
-						array_push($feeds, $row);
-					}
+                        $row = array(
+                                "id" => $i,
+                                "title" => $title,
+                                "unread" => $unread,
+                                "cat_id" => -1,
+                            );
+                        array_push($feeds, $row);
+                    }
 
-				}
-			}
+                }
+            }
 
-			/* Child cats */
+            /* Child cats */
 
-			if ($include_nested && $cat_id) {
-				$sth = $pdo->prepare("SELECT
+            if ($include_nested && $cat_id) {
+                $sth = $pdo->prepare("SELECT
 					id, title, order_id FROM ttrss_feed_categories
 					WHERE parent_cat = ? AND owner_uid = ? ORDER BY order_id, title");
 
-				$sth->execute([$cat_id, $_SESSION['uid']]);
+                $sth->execute([$cat_id, $_SESSION['uid']]);
 
-				while ($line = $sth->fetch()) {
-					$unread = getFeedUnread($line["id"], true) +
-						Feeds::getCategoryChildrenUnread($line["id"]);
+                while ($line = $sth->fetch()) {
+                    $unread = getFeedUnread($line["id"], true) +
+                        Feeds::getCategoryChildrenUnread($line["id"]);
 
-					if ($unread || !$unread_only) {
-						$row = array(
-								"id" => (int) $line["id"],
-								"title" => $line["title"],
-								"unread" => $unread,
-								"is_cat" => true,
+                    if ($unread || !$unread_only) {
+                        $row = array(
+                                "id" => (int) $line["id"],
+                                "title" => $line["title"],
+                                "unread" => $unread,
+                                "is_cat" => true,
                                 "order_id" => (int) $line["order_id"]
-							);
-						array_push($feeds, $row);
-					}
-				}
-			}
-
-			/* Real feeds */
-
-			if ($limit) {
-				$limit_qpart = "LIMIT $limit OFFSET $offset";
-			} else {
-				$limit_qpart = "";
-			}
-
-			/* API only: -3 All feeds, excluding virtual feeds (e.g. Labels and such) */
-			if ($cat_id == -4 || $cat_id == -3) {
-				$sth = $pdo->prepare("SELECT
+                            );
+                        array_push($feeds, $row);
+                    }
+                }
+            }
+
+            /* Real feeds */
+
+            if ($limit) {
+                $limit_qpart = "LIMIT $limit OFFSET $offset";
+            } else {
+                $limit_qpart = "";
+            }
+
+            /* API only: -3 All feeds, excluding virtual feeds (e.g. Labels and such) */
+            if ($cat_id == -4 || $cat_id == -3) {
+                $sth = $pdo->prepare("SELECT
 					id, feed_url, cat_id, title, order_id, ".
-						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+                        SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 						FROM ttrss_feeds WHERE owner_uid = ?
 						ORDER BY order_id, title " . $limit_qpart);
-				$sth->execute([$_SESSION['uid']]);
+                $sth->execute([$_SESSION['uid']]);
 
-			} else {
+            } else {
 
-				$sth = $pdo->prepare("SELECT
+                $sth = $pdo->prepare("SELECT
 					id, feed_url, cat_id, title, order_id, ".
-						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+                        SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 						FROM ttrss_feeds WHERE
 						(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL))
 						AND owner_uid = :uid
 						ORDER BY order_id, title " . $limit_qpart);
-				$sth->execute([":uid" => $_SESSION['uid'], ":cat" => $cat_id]);
-			}
+                $sth->execute([":uid" => $_SESSION['uid'], ":cat" => $cat_id]);
+            }
 
-			while ($line = $sth->fetch()) {
+            while ($line = $sth->fetch()) {
 
-				$unread = getFeedUnread($line["id"]);
+                $unread = getFeedUnread($line["id"]);
 
-				$has_icon = Feeds::feedHasIcon($line['id']);
+                $has_icon = Feeds::feedHasIcon($line['id']);
 
-				if ($unread || !$unread_only) {
+                if ($unread || !$unread_only) {
 
-					$row = array(
-							"feed_url" => $line["feed_url"],
-							"title" => $line["title"],
-							"id" => (int)$line["id"],
-							"unread" => (int)$unread,
-							"has_icon" => $has_icon,
-							"cat_id" => (int)$line["cat_id"],
-							"last_updated" => (int) strtotime($line["last_updated"]),
-							"order_id" => (int) $line["order_id"],
-						);
+                    $row = array(
+                            "feed_url" => $line["feed_url"],
+                            "title" => $line["title"],
+                            "id" => (int)$line["id"],
+                            "unread" => (int)$unread,
+                            "has_icon" => $has_icon,
+                            "cat_id" => (int)$line["cat_id"],
+                            "last_updated" => (int) strtotime($line["last_updated"]),
+                            "order_id" => (int) $line["order_id"],
+                        );
 
-					array_push($feeds, $row);
-				}
-			}
+                    array_push($feeds, $row);
+                }
+            }
 
-		return $feeds;
-	}
+        return $feeds;
+    }
 
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public static function api_get_headlines($feed_id, $limit, $offset,
-				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
-				$include_attachments, $since_id,
-				$search = "", $include_nested = false, $sanitize_content = true,
-				$force_update = false, $excerpt_length = 100, $check_first_id = false, $skip_first_id_check = false) {
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public static function api_get_headlines($feed_id, $limit, $offset,
+                $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
+                $include_attachments, $since_id,
+                $search = "", $include_nested = false, $sanitize_content = true,
+                $force_update = false, $excerpt_length = 100, $check_first_id = false, $skip_first_id_check = false) {
 
-			$pdo = Db::pdo();
+            $pdo = Db::pdo();
 
-			if ($force_update && $feed_id > 0 && is_numeric($feed_id)) {
-				// Update the feed if required with some basic flood control
+            if ($force_update && $feed_id > 0 && is_numeric($feed_id)) {
+                // Update the feed if required with some basic flood control
 
-				$sth = $pdo->prepare(
-					"SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+                $sth = $pdo->prepare(
+                    "SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 						FROM ttrss_feeds WHERE id = ?");
-				$sth->execute([$feed_id]);
+                $sth->execute([$feed_id]);
 
-				if ($row = $sth->fetch()) {
-					$last_updated = strtotime($row["last_updated"]);
-					$cache_images = API::param_to_bool($row["cache_images"]);
+                if ($row = $sth->fetch()) {
+                    $last_updated = strtotime($row["last_updated"]);
+                    $cache_images = API::param_to_bool($row["cache_images"]);
 
-					if (!$cache_images && time() - $last_updated > 120) {
-						RSSUtils::update_rss_feed($feed_id, true);
-					} else {
-						$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
+                    if (!$cache_images && time() - $last_updated > 120) {
+                        RSSUtils::update_rss_feed($feed_id, true);
+                    } else {
+                        $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
 							WHERE id = ?");
-						$sth->execute([$feed_id]);
-					}
-				}
-			}
-
-			$params = array(
-				"feed" => $feed_id,
-				"limit" => $limit,
-				"view_mode" => $view_mode,
-				"cat_view" => $is_cat,
-				"search" => $search,
-				"override_order" => $order,
-				"offset" => $offset,
-				"since_id" => $since_id,
-				"include_children" => $include_nested,
-				"check_first_id" => $check_first_id,
-				"skip_first_id_check" => $skip_first_id_check
-			);
-
-			$qfh_ret = Feeds::queryFeedHeadlines($params);
-
-			$result = $qfh_ret[0];
-			$feed_title = $qfh_ret[1];
-			$first_id = $qfh_ret[6];
-
-			$headlines = array();
-
-			$headlines_header = array(
-				'id' => $feed_id,
-				'first_id' => $first_id,
-				'is_cat' => $is_cat);
-
-			if (!is_numeric($result)) {
-				while ($line = $result->fetch()) {
-					$line["content_preview"] = truncate_string(strip_tags($line["content"]), $excerpt_length);
-					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-						$line = $p->hook_query_headlines($line, $excerpt_length, true);
-					}
-
-					$is_updated = ($line["last_read"] == "" &&
-						($line["unread"] != "t" && $line["unread"] != "1"));
-
-					$tags = explode(",", $line["tag_cache"]);
-
-					$label_cache = $line["label_cache"];
-					$labels = false;
-
-					if ($label_cache) {
-						$label_cache = json_decode($label_cache, true);
-
-						if ($label_cache) {
-							if ($label_cache["no-labels"] == 1)
-								$labels = array();
-							else
-								$labels = $label_cache;
-						}
-					}
-
-					if (!is_array($labels)) $labels = Article::get_article_labels($line["id"]);
-
-					$headline_row = array(
-						"id" => (int)$line["id"],
-						"guid" => $line["guid"],
-						"unread" => API::param_to_bool($line["unread"]),
-						"marked" => API::param_to_bool($line["marked"]),
-						"published" => API::param_to_bool($line["published"]),
-						"updated" => (int)strtotime($line["updated"]),
-						"is_updated" => $is_updated,
-						"title" => $line["title"],
-						"link" => $line["link"],
-						"feed_id" => $line["feed_id"] ? $line['feed_id'] : 0,
-						"tags" => $tags,
-					);
-
-					$enclosures = Article::get_article_enclosures($line['id']);
-
-					if ($include_attachments)
-						$headline_row['attachments'] = $enclosures;
-
-					if ($show_excerpt)
-						$headline_row["excerpt"] = $line["content_preview"];
-
-					if ($show_content) {
-
-						if ($sanitize_content) {
-							$headline_row["content"] = sanitize(
-								$line["content"],
-								API::param_to_bool($line['hide_images']),
-								false, $line["site_url"], false, $line["id"]);
-						} else {
-							$headline_row["content"] = $line["content"];
-						}
-					}
-
-					// unify label output to ease parsing
-					if ($labels["no-labels"] == 1) $labels = array();
-
-					$headline_row["labels"] = $labels;
-
-					$headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] :
-						$feed_title;
-
-					$headline_row["comments_count"] = (int)$line["num_comments"];
-					$headline_row["comments_link"] = $line["comments"];
+                        $sth->execute([$feed_id]);
+                    }
+                }
+            }
+
+            $params = array(
+                "feed" => $feed_id,
+                "limit" => $limit,
+                "view_mode" => $view_mode,
+                "cat_view" => $is_cat,
+                "search" => $search,
+                "override_order" => $order,
+                "offset" => $offset,
+                "since_id" => $since_id,
+                "include_children" => $include_nested,
+                "check_first_id" => $check_first_id,
+                "skip_first_id_check" => $skip_first_id_check
+            );
+
+            $qfh_ret = Feeds::queryFeedHeadlines($params);
+
+            $result = $qfh_ret[0];
+            $feed_title = $qfh_ret[1];
+            $first_id = $qfh_ret[6];
+
+            $headlines = array();
+
+            $headlines_header = array(
+                'id' => $feed_id,
+                'first_id' => $first_id,
+                'is_cat' => $is_cat);
+
+            if (!is_numeric($result)) {
+                while ($line = $result->fetch()) {
+                    $line["content_preview"] = truncate_string(strip_tags($line["content"]), $excerpt_length);
+                    foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                        $line = $p->hook_query_headlines($line, $excerpt_length, true);
+                    }
+
+                    $is_updated = ($line["last_read"] == "" &&
+                        ($line["unread"] != "t" && $line["unread"] != "1"));
+
+                    $tags = explode(",", $line["tag_cache"]);
+
+                    $label_cache = $line["label_cache"];
+                    $labels = false;
+
+                    if ($label_cache) {
+                        $label_cache = json_decode($label_cache, true);
+
+                        if ($label_cache) {
+                            if ($label_cache["no-labels"] == 1)
+                                $labels = array();
+                            else
+                                $labels = $label_cache;
+                        }
+                    }
+
+                    if (!is_array($labels)) $labels = Article::get_article_labels($line["id"]);
+
+                    $headline_row = array(
+                        "id" => (int)$line["id"],
+                        "guid" => $line["guid"],
+                        "unread" => API::param_to_bool($line["unread"]),
+                        "marked" => API::param_to_bool($line["marked"]),
+                        "published" => API::param_to_bool($line["published"]),
+                        "updated" => (int)strtotime($line["updated"]),
+                        "is_updated" => $is_updated,
+                        "title" => $line["title"],
+                        "link" => $line["link"],
+                        "feed_id" => $line["feed_id"] ? $line['feed_id'] : 0,
+                        "tags" => $tags,
+                    );
+
+                    $enclosures = Article::get_article_enclosures($line['id']);
+
+                    if ($include_attachments)
+                        $headline_row['attachments'] = $enclosures;
+
+                    if ($show_excerpt)
+                        $headline_row["excerpt"] = $line["content_preview"];
+
+                    if ($show_content) {
+
+                        if ($sanitize_content) {
+                            $headline_row["content"] = sanitize(
+                                $line["content"],
+                                API::param_to_bool($line['hide_images']),
+                                false, $line["site_url"], false, $line["id"]);
+                        } else {
+                            $headline_row["content"] = $line["content"];
+                        }
+                    }
+
+                    // unify label output to ease parsing
+                    if ($labels["no-labels"] == 1) $labels = array();
+
+                    $headline_row["labels"] = $labels;
+
+                    $headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] :
+                        $feed_title;
+
+                    $headline_row["comments_count"] = (int)$line["num_comments"];
+                    $headline_row["comments_link"] = $line["comments"];
 
-					$headline_row["always_display_attachments"] = API::param_to_bool($line["always_display_enclosures"]);
+                    $headline_row["always_display_attachments"] = API::param_to_bool($line["always_display_enclosures"]);
 
-					$headline_row["author"] = $line["author"];
+                    $headline_row["author"] = $line["author"];
 
-					$headline_row["score"] = (int)$line["score"];
-					$headline_row["note"] = $line["note"];
-					$headline_row["lang"] = $line["lang"];
+                    $headline_row["score"] = (int)$line["score"];
+                    $headline_row["note"] = $line["note"];
+                    $headline_row["lang"] = $line["lang"];
 
-					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
-						$headline_row = $p->hook_render_article_api(array("headline" => $headline_row));
-					}
+                    foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
+                        $headline_row = $p->hook_render_article_api(array("headline" => $headline_row));
+                    }
 
-					$headline_row["content"] = DiskCache::rewriteUrls($headline_row['content']);
+                    $headline_row["content"] = DiskCache::rewriteUrls($headline_row['content']);
 
-					list ($flavor_image, $flavor_stream) = Article::get_article_image($enclosures, $line["content"], $line["site_url"]);
+                    list ($flavor_image, $flavor_stream) = Article::get_article_image($enclosures, $line["content"], $line["site_url"]);
 
-					$headline_row["flavor_image"] = $flavor_image;
-					$headline_row["flavor_stream"] = $flavor_stream;
+                    $headline_row["flavor_image"] = $flavor_image;
+                    $headline_row["flavor_stream"] = $flavor_stream;
 
-					array_push($headlines, $headline_row);
-				}
-			} else if (is_numeric($result) && $result == -1) {
-				$headlines_header['first_id_changed'] = true;
-			}
+                    array_push($headlines, $headline_row);
+                }
+            } else if (is_numeric($result) && $result == -1) {
+                $headlines_header['first_id_changed'] = true;
+            }
 
-			return array($headlines, $headlines_header);
-	}
+            return array($headlines, $headlines_header);
+    }
 
-	public function unsubscribeFeed() {
-		$feed_id = (int) clean($_REQUEST["feed_id"]);
+    public function unsubscribeFeed() {
+        $feed_id = (int) clean($_REQUEST["feed_id"]);
 
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 			id = ? AND owner_uid = ?");
-		$sth->execute([$feed_id, $_SESSION['uid']]);
-
-		if ($sth->fetch()) {
-			Pref_Feeds::remove_feed($feed_id, $_SESSION["uid"]);
-			$this->wrap(self::STATUS_OK, array("status" => "OK"));
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
-		}
-	}
-
-	public function subscribeToFeed() {
-		$feed_url = clean($_REQUEST["feed_url"]);
-		$category_id = (int) clean($_REQUEST["category_id"]);
-		$login = clean($_REQUEST["login"]);
-		$password = clean($_REQUEST["password"]);
-
-		if ($feed_url) {
-			$rc = Feeds::subscribe_to_feed($feed_url, $category_id, $login, $password);
-
-			$this->wrap(self::STATUS_OK, array("status" => $rc));
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
-		}
-	}
-
-	public function getFeedTree() {
-		$include_empty = API::param_to_bool(clean($_REQUEST['include_empty']));
-
-		$pf = new Pref_Feeds($_REQUEST);
-
-		$_REQUEST['mode'] = 2;
-		$_REQUEST['force_show_empty'] = $include_empty;
-
-		if ($pf){
-			$data = $pf->makefeedtree();
-			$this->wrap(self::STATUS_OK, array("categories" => $data));
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" =>
-				'UNABLE_TO_INSTANTIATE_OBJECT'));
-		}
-
-	}
-
-	// only works for labels or uncategorized for the time being
-	private function isCategoryEmpty($id) {
-
-		if ($id == -2) {
-			$sth = $this->pdo->prepare("SELECT COUNT(id) AS count FROM ttrss_labels2
+        $sth->execute([$feed_id, $_SESSION['uid']]);
+
+        if ($sth->fetch()) {
+            Pref_Feeds::remove_feed($feed_id, $_SESSION["uid"]);
+            $this->wrap(self::STATUS_OK, array("status" => "OK"));
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
+        }
+    }
+
+    public function subscribeToFeed() {
+        $feed_url = clean($_REQUEST["feed_url"]);
+        $category_id = (int) clean($_REQUEST["category_id"]);
+        $login = clean($_REQUEST["login"]);
+        $password = clean($_REQUEST["password"]);
+
+        if ($feed_url) {
+            $rc = Feeds::subscribe_to_feed($feed_url, $category_id, $login, $password);
+
+            $this->wrap(self::STATUS_OK, array("status" => $rc));
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+        }
+    }
+
+    public function getFeedTree() {
+        $include_empty = API::param_to_bool(clean($_REQUEST['include_empty']));
+
+        $pf = new Pref_Feeds($_REQUEST);
+
+        $_REQUEST['mode'] = 2;
+        $_REQUEST['force_show_empty'] = $include_empty;
+
+        if ($pf){
+            $data = $pf->makefeedtree();
+            $this->wrap(self::STATUS_OK, array("categories" => $data));
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" =>
+                'UNABLE_TO_INSTANTIATE_OBJECT'));
+        }
+
+    }
+
+    // only works for labels or uncategorized for the time being
+    private function isCategoryEmpty($id) {
+
+        if ($id == -2) {
+            $sth = $this->pdo->prepare("SELECT COUNT(id) AS count FROM ttrss_labels2
 				WHERE owner_uid = ?");
-			$sth->execute([$_SESSION['uid']]);
-			$row = $sth->fetch();
+            $sth->execute([$_SESSION['uid']]);
+            $row = $sth->fetch();
 
-			return $row["count"] == 0;
+            return $row["count"] == 0;
 
-		} else if ($id == 0) {
-			$sth = $this->pdo->prepare("SELECT COUNT(id) AS count FROM ttrss_feeds
+        } else if ($id == 0) {
+            $sth = $this->pdo->prepare("SELECT COUNT(id) AS count FROM ttrss_feeds
 				WHERE cat_id IS NULL AND owner_uid = ?");
-			$sth->execute([$_SESSION['uid']]);
-			$row = $sth->fetch();
+            $sth->execute([$_SESSION['uid']]);
+            $row = $sth->fetch();
 
-			return $row["count"] == 0;
+            return $row["count"] == 0;
 
-		}
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 
 }

Braces +47 added lines, -28 removed lines

@@ -57,7 +57,9 @@ 
 		$password = clean($_REQUEST["password"]);
 		$password_base64 = base64_decode(clean($_REQUEST["password"]));
 
-		if (SINGLE_USER_MODE) $login = "admin";
+		if (SINGLE_USER_MODE) {
+		    $login = "admin";
+		}
 
 		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
 		$sth->execute([$login]);
@@ -134,10 +136,11 @@ 
 
 		// TODO do not return empty categories, return Uncategorized and standard virtual cats
 
-		if ($enable_nested)
-			$nested_qpart = "parent_cat IS NULL";
-		else
-			$nested_qpart = "true";
+		if ($enable_nested) {
+					$nested_qpart = "parent_cat IS NULL";
+		} else {
+					$nested_qpart = "true";
+		}
 
 		$sth = $this->pdo->prepare("SELECT
 				id, title, order_id, (SELECT COUNT(id) FROM
@@ -156,8 +159,9 @@ 
 			if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
 				$unread = getFeedUnread($line["id"], true);
 
-				if ($enable_nested)
-					$unread += Feeds::getCategoryChildrenUnread($line["id"]);
+				if ($enable_nested) {
+									$unread += Feeds::getCategoryChildrenUnread($line["id"]);
+				}
 
 				if ($unread || !$unread_only) {
 					array_push($cats, array("id" => $line["id"],
@@ -188,11 +192,15 @@ 
 		$feed_id = clean($_REQUEST["feed_id"]);
 		if ($feed_id !== "") {
 
-			if (is_numeric($feed_id)) $feed_id = (int) $feed_id;
+			if (is_numeric($feed_id)) {
+			    $feed_id = (int) $feed_id;
+			}
 
 			$limit = (int)clean($_REQUEST["limit"]);
 
-			if (!$limit || $limit >= 200) $limit = 200;
+			if (!$limit || $limit >= 200) {
+			    $limit = 200;
+			}
 
 			$offset = (int)clean($_REQUEST["skip"]);
 			$filter = clean($_REQUEST["filter"]);
@@ -287,7 +295,9 @@ 
 				break;
 		}
 
-		if ($field == "note") $set_to = $this->pdo->quote($data);
+		if ($field == "note") {
+		    $set_to = $this->pdo->quote($data);
+		}
 
 		if ($field && $set_to && count($article_ids) > 0) {
 
@@ -443,10 +453,11 @@ 
 			WHERE owner_uid = ? ORDER BY caption");
 		$sth->execute([$_SESSION['uid']]);
 
-		if ($article_id)
-			$article_labels = Article::get_article_labels($article_id);
-		else
-			$article_labels = array();
+		if ($article_id) {
+					$article_labels = Article::get_article_labels($article_id);
+		} else {
+					$article_labels = array();
+		}
 
 		while ($line = $sth->fetch()) {
 
@@ -483,10 +494,11 @@ 
 
 			foreach ($article_ids as $id) {
 
-				if ($assign)
-					Labels::add_article($id, $label, $_SESSION["uid"]);
-				else
-					Labels::remove_article($id, $label, $_SESSION["uid"]);
+				if ($assign) {
+									Labels::add_article($id, $label, $_SESSION["uid"]);
+				} else {
+									Labels::remove_article($id, $label, $_SESSION["uid"]);
+				}
 
 				++$num_updated;
 
@@ -738,14 +750,17 @@ 
 						$label_cache = json_decode($label_cache, true);
 
 						if ($label_cache) {
-							if ($label_cache["no-labels"] == 1)
-								$labels = array();
-							else
-								$labels = $label_cache;
+							if ($label_cache["no-labels"] == 1) {
+															$labels = array();
+							} else {
+															$labels = $label_cache;
+							}
 						}
 					}
 
-					if (!is_array($labels)) $labels = Article::get_article_labels($line["id"]);
+					if (!is_array($labels)) {
+					    $labels = Article::get_article_labels($line["id"]);
+					}
 
 					$headline_row = array(
 						"id" => (int)$line["id"],
@@ -763,11 +778,13 @@ 
 
 					$enclosures = Article::get_article_enclosures($line['id']);
 
-					if ($include_attachments)
-						$headline_row['attachments'] = $enclosures;
+					if ($include_attachments) {
+											$headline_row['attachments'] = $enclosures;
+					}
 
-					if ($show_excerpt)
-						$headline_row["excerpt"] = $line["content_preview"];
+					if ($show_excerpt) {
+											$headline_row["excerpt"] = $line["content_preview"];
+					}
 
 					if ($show_content) {
 
@@ -782,7 +799,9 @@ 
 					}
 
 					// unify label output to ease parsing
-					if ($labels["no-labels"] == 1) $labels = array();
+					if ($labels["no-labels"] == 1) {
+					    $labels = array();
+					}
 
 					$headline_row["labels"] = $labels;
 

classes/backend.php

Switch Indentation +8 added lines, -8 removed lines

@@ -126,14 +126,14 @@
 										$tmp = '';
 										foreach (str_split($keys[$i]) as $c) {
 											switch ($c) {
-												case '*':
-													$tmp .= __('Shift') . '+';
-													break;
-												case '^':
-													$tmp .= __('Ctrl') . '+';
-													break;
-												default:
-													$tmp .= $c;
+											case '*':
+												$tmp .= __('Shift') . '+';
+												break;
+											case '^':
+												$tmp .= __('Ctrl') . '+';
+												break;
+											default:
+												$tmp .= $c;
 											}
 										}
 										$keys[$i] = $tmp;

Spacing +5 added lines, -5 removed lines

@@ -2,7 +2,7 @@ 
 class Backend extends Handler {
 	public function loading() {
 		header("Content-type: text/html");
-		print __("Loading, please wait...") . " " .
+		print __("Loading, please wait...")." ".
 			"<img src='images/indicator_tiny.gif'>";
 	}
 
@@ -41,7 +41,7 @@ 
 			foreach ($info as $section => $hotkeys) {
 
 				if ($cur_section) print "<li>&nbsp;</li>";
-				print "<li><h3>" . $section . "</h3></li>";
+				print "<li><h3>".$section."</h3></li>";
 				$cur_section = $section;
 
 				foreach ($hotkeys as $action => $description) {
@@ -50,7 +50,7 @@ 
 						foreach ($omap[$action] as $sequence) {
 							if (strpos($sequence, "|") !== FALSE) {
 								$sequence = substr($sequence,
-									strpos($sequence, "|")+1,
+									strpos($sequence, "|") + 1,
 									strlen($sequence));
 							} else {
 								$keys = explode(" ", $sequence);
@@ -61,10 +61,10 @@ 
 										foreach (str_split($keys[$i]) as $c) {
 											switch ($c) {
 												case '*':
-													$tmp .= __('Shift') . '+';
+													$tmp .= __('Shift').'+';
 													break;
 												case '^':
-													$tmp .= __('Ctrl') . '+';
+													$tmp .= __('Ctrl').'+';
 													break;
 												default:
 													$tmp .= $c;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
 					if (is_array($omap[$action])) {
 						foreach ($omap[$action] as $sequence) {
-							if (strpos($sequence, "|") !== FALSE) {
+							if (strpos($sequence, "|") !== false) {
 								$sequence = substr($sequence,
 									strpos($sequence, "|")+1,
 									strlen($sequence));

Indentation +92 added lines, -92 removed lines

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

Braces +6 added lines, -2 removed lines

@@ -30,7 +30,9 @@ 
 			$omap = array();
 
 			foreach ($imap[1] as $sequence => $action) {
-				if (!isset($omap[$action])) $omap[$action] = array();
+				if (!isset($omap[$action])) {
+				    $omap[$action] = array();
+				}
 
 				array_push($omap[$action], $sequence);
 			}
@@ -40,7 +42,9 @@ 
 			$cur_section = "";
 			foreach ($info as $section => $hotkeys) {
 
-				if ($cur_section) print "<li>&nbsp;</li>";
+				if ($cur_section) {
+				    print "<li>&nbsp;</li>";
+				}
 				print "<li><h3>" . $section . "</h3></li>";
 				$cur_section = $section;
 

classes/pref/system.php

Spacing +7 added lines, -7 removed lines

@@ -60,14 +60,14 @@ 
 					$line[$k] = htmlspecialchars($v);
 				}
 
-				print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
-				print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
-				print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>";
-				print "<td class='login'>" . $line["login"] . "</td>";
+				print "<td class='errno'>".Logger::$errornames[$line["errno"]]." (".$line["errno"].")</td>";
+				print "<td class='filename'>".$line["filename"].":".$line["lineno"]."</td>";
+				print "<td class='errstr'>".$line["errstr"]."<hr/>".nl2br($line["context"])."</td>";
+				print "<td class='login'>".$line["login"]."</td>";
 
-				print "<td class='timestamp'>" .
+				print "<td class='timestamp'>".
 					make_local_datetime(
-					$line["created_at"], false) . "</td>";
+					$line["created_at"], false)."</td>";
 
 				print "</tr>";
 			}
@@ -90,7 +90,7 @@ 
 		ob_end_clean();
 
 		print "<div class='phpinfo'>";
-		print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info);
+		print preg_replace('%^.*<body>(.*)</body>.*$%ms', '$1', $info);
 		print "</div>";
 
 		print "</div>";

Indentation +63 added lines, -63 removed lines

@@ -2,50 +2,50 @@ 
 
 class Pref_System extends Handler_Protected {
 
-	public function before($method) {
-		if (parent::before($method)) {
-			if ($_SESSION["access_level"] < 10) {
-				print __("Your access level is insufficient to open this tab.");
-				return false;
-			}
-			return true;
-		}
-		return false;
-	}
-
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("index");
-
-		return array_search($method, $csrf_ignored) !== false;
-	}
-
-	public function clearLog() {
-		$this->pdo->query("DELETE FROM ttrss_error_log");
-	}
-
-	public function index() {
-
-		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+    public function before($method) {
+        if (parent::before($method)) {
+            if ($_SESSION["access_level"] < 10) {
+                print __("Your access level is insufficient to open this tab.");
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("index");
+
+        return array_search($method, $csrf_ignored) !== false;
+    }
+
+    public function clearLog() {
+        $this->pdo->query("DELETE FROM ttrss_error_log");
+    }
+
+    public function index() {
+
+        print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>report</i> ".__('Event Log')."\">";
 
-		if (LOG_DESTINATION == "sql") {
+        if (LOG_DESTINATION == "sql") {
 
-			$res = $this->pdo->query("SELECT errno, errstr, filename, lineno,
+            $res = $this->pdo->query("SELECT errno, errstr, filename, lineno,
 				created_at, login, context FROM ttrss_error_log
 				LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
 				ORDER BY ttrss_error_log.id DESC
 				LIMIT 100");
 
-			print "<button dojoType=\"dijit.form.Button\"
+            print "<button dojoType=\"dijit.form.Button\"
 				onclick=\"Helpers.updateEventLog()\">".__('Refresh')."</button> ";
 
-			print "&nbsp;<button dojoType=\"dijit.form.Button\"
+            print "&nbsp;<button dojoType=\"dijit.form.Button\"
 				class=\"alt-danger\" onclick=\"Helpers.clearEventLog()\">".__('Clear')."</button> ";
 
-			print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
+            print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
 
-			print "<tr class=\"title\">
+            print "<tr class=\"title\">
 				<td width='5%'>".__("Error")."</td>
 				<td>".__("Filename")."</td>
 				<td>".__("Message")."</td>
@@ -53,52 +53,52 @@ 
 				<td width='5%'>".__("Date")."</td>
 				</tr>";
 
-			while ($line = $res->fetch()) {
-				print "<tr>";
+            while ($line = $res->fetch()) {
+                print "<tr>";
 
-				foreach ($line as $k => $v) {
-					$line[$k] = htmlspecialchars($v);
-				}
+                foreach ($line as $k => $v) {
+                    $line[$k] = htmlspecialchars($v);
+                }
 
-				print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
-				print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
-				print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>";
-				print "<td class='login'>" . $line["login"] . "</td>";
+                print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
+                print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
+                print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>";
+                print "<td class='login'>" . $line["login"] . "</td>";
 
-				print "<td class='timestamp'>" .
-					make_local_datetime(
-					$line["created_at"], false) . "</td>";
+                print "<td class='timestamp'>" .
+                    make_local_datetime(
+                    $line["created_at"], false) . "</td>";
 
-				print "</tr>";
-			}
+                print "</tr>";
+            }
 
-			print "</table>";
-		} else {
+            print "</table>";
+        } else {
 
-			print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging.");
+            print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging.");
 
-		}
+        }
 
-		print "</div>";
+        print "</div>";
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>info</i> ".__('PHP Information')."\">";
 
-		ob_start();
-		phpinfo();
-		$info = ob_get_contents();
-		ob_end_clean();
+        ob_start();
+        phpinfo();
+        $info = ob_get_contents();
+        ob_end_clean();
 
-		print "<div class='phpinfo'>";
-		print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info);
-		print "</div>";
+        print "<div class='phpinfo'>";
+        print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info);
+        print "</div>";
 
-		print "</div>";
+        print "</div>";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-			"hook_prefs_tab", "prefSystem");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+            "hook_prefs_tab", "prefSystem");
 
-		print "</div>"; #container
-	}
+        print "</div>"; #container
+    }
 
 }