codysnider / tt-rss

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/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;

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;
 

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

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;

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

classes/pref/prefs.php

Switch Indentation +13 added lines, -13 removed lines

@@ -170,22 +170,22 @@
 			$value = $_POST[$pref_name];
 
 			switch ($pref_name) {
-				case 'DIGEST_PREFERRED_TIME':
-					if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
+			case 'DIGEST_PREFERRED_TIME':
+				if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_users SET
+					$sth = $this->pdo->prepare("UPDATE ttrss_users SET
 						last_digest_sent = NULL WHERE id = ?");
-						$sth->execute([$_SESSION['uid']]);
+					$sth->execute([$_SESSION['uid']]);
 
-					}
-					break;
-				case 'USER_LANGUAGE':
-					if (!$need_reload) $need_reload = $_SESSION["language"] != $value;
-					break;
-
-				case 'USER_CSS_THEME':
-					if (!$need_reload) $need_reload = get_pref($pref_name) != $value;
-					break;
+				}
+				break;
+			case 'USER_LANGUAGE':
+				if (!$need_reload) $need_reload = $_SESSION["language"] != $value;
+				break;
+
+			case 'USER_CSS_THEME':
+				if (!$need_reload) $need_reload = get_pref($pref_name) != $value;
+				break;
 			}
 
 			set_pref($pref_name, $value);

Spacing +25 added lines, -25 removed lines

@@ -82,7 +82,7 @@ 
 			"ENABLE_API_ACCESS" => array(__("Enable API"), __("Allows accessing this account through the API")),
 			"ENABLE_FEED_CATS" => array(__("Enable categories")),
 			"FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""),
-			"FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>" . __("hours") . "</strong>"),
+			"FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>".__("hours")."</strong>"),
 			"HIDE_READ_FEEDS" => array(__("Hide read feeds")),
 			"HIDE_READ_SHOWS_SPECIAL" => array(__("Always show special feeds"), __("While hiding read feeds")),
 			"LONG_DATE_FORMAT" => array(__("Long date format"), __("Syntax is identical to PHP <a href='http://php.net/manual/function.date.php'>date()</a> function.")),
@@ -403,7 +403,7 @@ 
 
 			if ($_SESSION["auth_module"] == "auth_internal") {
 
-				print "<div dojoType='dijit.layout.ContentPane' title=\"" . __('App passwords') . "\">";
+				print "<div dojoType='dijit.layout.ContentPane' title=\"".__('App passwords')."\">";
 
 				print_notice("You can create separate passwords for API clients. Using one is required if you enable OTP.");
 
@@ -415,11 +415,11 @@ 
 
 				print "<button style='float : left' class='alt-primary' dojoType='dijit.form.Button'
 					onclick=\"Helpers.AppPasswords.generate()\">" .
-					__('Generate new password') . "</button> ";
+					__('Generate new password')."</button> ";
 
 				print "<button style='float : left' class='alt-danger' dojoType='dijit.form.Button'
 					onclick=\"Helpers.AppPasswords.removeSelected()\">" .
-					__('Remove selected passwords') . "</button>";
+					__('Remove selected passwords')."</button>";
 
 				print "</div>"; # content pane
 			}
@@ -474,13 +474,13 @@ 
 					print_notice("You will need to generate app passwords for the API clients if you enable OTP.");
 
 					if (function_exists("imagecreatefromstring")) {
-						print "<h3>" . __("Scan the following code by the Authenticator application or copy the key manually") . "</h3>";
+						print "<h3>".__("Scan the following code by the Authenticator application or copy the key manually")."</h3>";
 
 						$csrf_token = $_SESSION["csrf_token"];
 						print "<img alt='otp qr-code' src='backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token'>";
 					} else {
 						print_error("PHP GD functions are required to generate QR codes.");
-						print "<h3>" . __("Use the following OTP key with a compatible Authenticator application") . "</h3>";
+						print "<h3>".__("Use the following OTP key with a compatible Authenticator application")."</h3>";
 					}
 
 					print "<form dojoType='dijit.form.Form' id='changeOtpForm'>";
@@ -647,7 +647,7 @@ 
 					print "<fieldset class='prefs'>";
 
 					print "<label for='CB_$pref_name'>";
-					print $item['short_desc'] . ":";
+					print $item['short_desc'].":";
 					print "</label>";
 
 					$value = $item['value'];
@@ -684,7 +684,7 @@ 
 						print "</select>";
 
 						print " <button dojoType=\"dijit.form.Button\" class='alt-info'
-							onclick=\"Helpers.customizeCSS()\">" . __('Customize') . "</button>";
+							onclick=\"Helpers.customizeCSS()\">" . __('Customize')."</button>";
 
 						print " <button dojoType='dijit.form.Button' onclick='window.open(\"https://tt-rss.org/wiki/Themes\")'>
 							<i class='material-icons'>open_in_new</i> ".__("More themes...")."</button>";
@@ -747,12 +747,12 @@ 
 						$has_serial = ($cert_serial) ? "false" : "true";
 
 						print "<button dojoType='dijit.form.Button' disabled='$has_serial'
-							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">" .
-							__('Register') . "</button>";
+							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">".
+							__('Register')."</button>";
 
 						print "<button dojoType='dijit.form.Button' class='alt-danger'
 							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '')\">" .
-							__('Clear') . "</button>";
+							__('Clear')."</button>";
 
 						print "<button dojoType='dijit.form.Button' class='alt-info'
 							onclick='window.open(\"https://tt-rss.org/wiki/SSL%20Certificate%20Authentication\")'>
@@ -763,7 +763,7 @@ 
 							id=\"$pref_name\" regexp=\"[012]?\d:\d\d\" placeHolder=\"12:00\"
 							name=\"$pref_name\" value=\"$value\">";
 
-						$item['help_text'] .= ". " . T_sprintf("Current server time: %s", date("H:i"));
+						$item['help_text'] .= ". ".T_sprintf("Current server time: %s", date("H:i"));
 					} else {
 						$regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
 
@@ -849,7 +849,7 @@ 
 			print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly.");
 		}
 
-		$feed_handler_whitelist = [ "Af_Comics" ];
+		$feed_handler_whitelist = ["Af_Comics"];
 
 		$feed_handlers = array_merge(
 			PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED),
@@ -861,9 +861,9 @@ 
 
 		if (count($feed_handlers) > 0) {
 			print_error(
-				T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>" ,
+				T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>",
 					implode(", ", array_map(function($plugin) { return get_class($plugin); }, $feed_handlers))
-				) . " (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)"
+				)." (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)"
 			);
 		}
 
@@ -892,7 +892,7 @@ 
 					<label class='checkbox description text-muted' id='PLABEL-$name'>
 						<input disabled='1'
 							dojoType='dijit.form.CheckBox' $checked type='checkbox'>
-						".htmlspecialchars($about[1]). "</label>";
+						".htmlspecialchars($about[1])."</label>";
 
 					if (@$about[4]) {
 						print "<button dojoType='dijit.form.Button' class='alt-info'
@@ -1154,7 +1154,7 @@ 
 		print "<div dojoType='fox.Toolbar'>";
 
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('pref-profiles-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -1192,7 +1192,7 @@ 
 			$is_active = "";
 		}
 
-		print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>";
+		print "<td width='100%'><span>".__("Default profile")." $is_active</span></td>";
 
 		print "</tr>";
 
@@ -1214,7 +1214,7 @@ 
 
 			print "<td><span dojoType='dijit.InlineEditBox'
 				width='300px' autoSave='false'
-				profile-id='$profile_id'>" . $edit_title .
+				profile-id='$profile_id'>".$edit_title.
 				"<script type='dojo/method' event='onChange' args='item'>
 					var elem = this;
 					dojo.xhrPost({
@@ -1263,13 +1263,13 @@ 
 
 	private function appPasswordList() {
 		print "<div dojoType='fox.Toolbar'>";
-		print "<div dojoType='fox.form.DropDownButton'>" .
-			"<span>" . __('Select') . "</span>";
+		print "<div dojoType='fox.form.DropDownButton'>".
+			"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('app-password-list', true)\"
-				dojoType=\"dijit.MenuItem\">" . __('All') . "</div>";
+				dojoType=\"dijit.MenuItem\">" . __('All')."</div>";
 		print "<div onclick=\"Tables.select('app-password-list', false)\"
-				dojoType=\"dijit.MenuItem\">" . __('None') . "</div>";
+				dojoType=\"dijit.MenuItem\">" . __('None')."</div>";
 		print "</div></div>";
 		print "</div>"; #toolbar
 
@@ -1294,7 +1294,7 @@ 
 
 			print "<td align='center'>
 						<input onclick='Tables.onRowChecked(this)' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
-			print "<td>" . htmlspecialchars($row["title"]) . "</td>";
+			print "<td>".htmlspecialchars($row["title"])."</td>";
 
 			print "<td align='right' class='text-muted'>";
 			print make_local_datetime($row['created'], false);
@@ -1314,7 +1314,7 @@ 
 	private function encryptAppPassword($password) {
 		$salt = substr(bin2hex(get_random_bytes(24)), 0, 24);
 
-		return "SSHA-512:".hash('sha512', $salt . $password). ":$salt";
+		return "SSHA-512:".hash('sha512', $salt.$password).":$salt";
 	}
 
 	public function deleteAppPassword() {

Braces +28 added lines, -16 removed lines

@@ -160,7 +160,9 @@ 
 		$boolean_prefs = explode(",", clean($_POST["boolean_prefs"]));
 
 		foreach ($boolean_prefs as $pref) {
-			if (!isset($_POST[$pref])) $_POST[$pref] = 'false';
+			if (!isset($_POST[$pref])) {
+			    $_POST[$pref] = 'false';
+			}
 		}
 
 		$need_reload = false;
@@ -180,11 +182,15 @@ 
 					}
 					break;
 				case 'USER_LANGUAGE':
-					if (!$need_reload) $need_reload = $_SESSION["language"] != $value;
+					if (!$need_reload) {
+					    $need_reload = $_SESSION["language"] != $value;
+					}
 					break;
 
 				case 'USER_CSS_THEME':
-					if (!$need_reload) $need_reload = get_pref($pref_name) != $value;
+					if (!$need_reload) {
+					    $need_reload = get_pref($pref_name) != $value;
+					}
 					break;
 			}
 
@@ -616,8 +622,9 @@ 
 			$pref_name = $line["pref_name"];
 			$short_desc = $this->getShortDesc($pref_name);
 
-			if (!$short_desc)
-				continue;
+			if (!$short_desc) {
+							continue;
+			}
 
 			$prefs_available[$pref_name] = [
 				'type_name' => $line["type_name"],
@@ -669,7 +676,9 @@ 
 						$themes = array_filter($themes, "theme_exists");
 						asort($themes);
 
-						if (!theme_exists($value)) $value = "default.php";
+						if (!theme_exists($value)) {
+						    $value = "default.php";
+						}
 
 						print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>";
 
@@ -728,14 +737,15 @@ 
 							$disabled = "";
 						}
 
-						if ($type_name == 'integer')
-							print "<input dojoType=\"dijit.form.NumberSpinner\"
+						if ($type_name == 'integer') {
+													print "<input dojoType=\"dijit.form.NumberSpinner\"
 								required='1' $disabled
 								name=\"$pref_name\" value=\"$value\">";
-						else
-							print "<input dojoType=\"dijit.form.TextBox\"
+						} else {
+													print "<input dojoType=\"dijit.form.TextBox\"
 								required='1' $regexp $disabled
 								name=\"$pref_name\" value=\"$value\">";
+						}
 
 					} else if ($pref_name == "SSL_CERT_SERIAL") {
 
@@ -770,8 +780,9 @@ 
 						print "<input dojoType=\"dijit.form.ValidationTextBox\" $regexp name=\"$pref_name\" value=\"$value\">";
 					}
 
-					if ($item['help_text'])
-						print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>";
+					if ($item['help_text']) {
+											print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>";
+					}
 
 					print "</fieldset>";
 				}
@@ -1108,10 +1119,11 @@ 
 	}
 
 	public function setplugins() {
-		if (is_array(clean($_REQUEST["plugins"])))
-			$plugins = join(",", clean($_REQUEST["plugins"]));
-		else
-			$plugins = "";
+		if (is_array(clean($_REQUEST["plugins"]))) {
+					$plugins = join(",", clean($_REQUEST["plugins"]));
+		} else {
+					$plugins = "";
+		}
 
 		set_pref("_ENABLED_PLUGINS", $plugins);
 	}

Indentation +839 added lines, -839 removed lines

@@ -2,278 +2,278 @@ 
 
 class Pref_Prefs extends Handler_Protected {
 
-	private $pref_help = [];
-	private $pref_item_map = [];
-	private $pref_blacklist = [];
-	private $profile_blacklist = [];
-
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("index", "updateself", "customizecss", "editprefprofiles");
-
-		return array_search($method, $csrf_ignored) !== false;
-	}
-
-	public function __construct($args) {
-		parent::__construct($args);
-
-		$this->pref_item_map = [
-			__('General') => [
-				'USER_LANGUAGE',
-				'USER_TIMEZONE',
-				'BLOCK_SEPARATOR',
-				'USER_CSS_THEME',
-				'BLOCK_SEPARATOR',
-				'ENABLE_API_ACCESS',
-			],
-			__('Feeds') => [
-				'DEFAULT_UPDATE_INTERVAL',
-				'FRESH_ARTICLE_MAX_AGE',
-				'DEFAULT_SEARCH_LANGUAGE',
-				'BLOCK_SEPARATOR',
-				'ENABLE_FEED_CATS',
-				'BLOCK_SEPARATOR',
-				'CONFIRM_FEED_CATCHUP',
-				'ON_CATCHUP_SHOW_NEXT_FEED',
-				'BLOCK_SEPARATOR',
-				'HIDE_READ_FEEDS',
-				'HIDE_READ_SHOWS_SPECIAL',
-			],
-			__('Articles') => [
-				'PURGE_OLD_DAYS',
-				'PURGE_UNREAD_ARTICLES',
-				'BLOCK_SEPARATOR',
-				'COMBINED_DISPLAY_MODE',
-				'CDM_EXPANDED',
-				'BLOCK_SEPARATOR',
-				'CDM_AUTO_CATCHUP',
-				'VFEED_GROUP_BY_FEED',
-				'BLOCK_SEPARATOR',
-				'SHOW_CONTENT_PREVIEW',
-				'STRIP_IMAGES',
-			],
-			__('Digest') => [
-				'DIGEST_ENABLE',
-				'DIGEST_CATCHUP',
-				'DIGEST_PREFERRED_TIME',
-			],
-			__('Advanced') => [
-				'BLACKLISTED_TAGS',
-				'BLOCK_SEPARATOR',
-				'LONG_DATE_FORMAT',
-				'SHORT_DATE_FORMAT',
-				'BLOCK_SEPARATOR',
-				'SSL_CERT_SERIAL',
-			]
-		];
-
-		$this->pref_help = [
-			"ALLOW_DUPLICATE_POSTS" => array(__("Allow duplicate articles"), ""),
-			"BLACKLISTED_TAGS" => array(__("Blacklisted tags"), __("Never apply these tags automatically (comma-separated list).")),
-			"DEFAULT_SEARCH_LANGUAGE" => array(__("Default language"), __("Used for full-text search")),
-			"CDM_AUTO_CATCHUP" => array(__("Mark read on scroll"), __("Mark articles as read as you scroll past them")),
-			"CDM_EXPANDED" => array(__("Always expand articles")),
-			"COMBINED_DISPLAY_MODE" => array(__("Combined mode"), __("Show flat list of articles instead of separate panels")),
-			"CONFIRM_FEED_CATCHUP" => array(__("Confirm marking feeds as read")),
-			"DEFAULT_ARTICLE_LIMIT" => array(__("Amount of articles to display at once")),
-			"DEFAULT_UPDATE_INTERVAL" => array(__("Default update interval")),
-			"DIGEST_CATCHUP" => array(__("Mark sent articles as read")),
-			"DIGEST_ENABLE" => array(__("Enable digest"), __("Send daily digest of new (and unread) headlines to your e-mail address")),
-			"DIGEST_PREFERRED_TIME" => array(__("Try to send around this time"), __("Time in UTC")),
-			"ENABLE_API_ACCESS" => array(__("Enable API"), __("Allows accessing this account through the API")),
-			"ENABLE_FEED_CATS" => array(__("Enable categories")),
-			"FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""),
-			"FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>" . __("hours") . "</strong>"),
-			"HIDE_READ_FEEDS" => array(__("Hide read feeds")),
-			"HIDE_READ_SHOWS_SPECIAL" => array(__("Always show special feeds"), __("While hiding read feeds")),
-			"LONG_DATE_FORMAT" => array(__("Long date format"), __("Syntax is identical to PHP <a href='http://php.net/manual/function.date.php'>date()</a> function.")),
-			"ON_CATCHUP_SHOW_NEXT_FEED" => array(__("Automatically show next feed"), __("After marking one as read")),
-			"PURGE_OLD_DAYS" => array(__("Purge articles older than"), __("<strong>days</strong> (0 disables)")),
-			"PURGE_UNREAD_ARTICLES" => array(__("Purge unread articles")),
-			"REVERSE_HEADLINES" => array(__("Reverse headline order (oldest first)")),
-			"SHORT_DATE_FORMAT" => array(__("Short date format")),
-			"SHOW_CONTENT_PREVIEW" => array(__("Show content preview in headlines")),
-			"SORT_HEADLINES_BY_FEED_DATE" => array(__("Sort headlines by feed date"), __("Use feed-specified date to sort headlines instead of local import date.")),
-			"SSL_CERT_SERIAL" => array(__("SSL client certificate")),
-			"STRIP_IMAGES" => array(__("Do not embed media")),
-			"STRIP_UNSAFE_TAGS" => array(__("Strip unsafe tags from articles"), __("Strip all but most common HTML tags when reading articles.")),
-			"USER_STYLESHEET" => array(__("Customize stylesheet")),
-			"USER_TIMEZONE" => array(__("Time zone")),
-			"VFEED_GROUP_BY_FEED" => array(__("Group by feed"), __("Group multiple-feed output by originating feed")),
-			"USER_LANGUAGE" => array(__("Language")),
-			"USER_CSS_THEME" => array(__("Theme"))
-		];
-
-		$this->pref_blacklist = ["ALLOW_DUPLICATE_POSTS", "STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES",
-			"SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT",
-			"FEEDS_SORT_BY_UNREAD", "USER_STYLESHEET"];
-
-		/* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */
-
-		$this->profile_blacklist = ["ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS",
-			"PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",
-			"BLACKLISTED_TAGS", "ENABLE_API_ACCESS", "UPDATE_POST_ON_CHECKSUM_CHANGE",
-			"DEFAULT_UPDATE_INTERVAL", "USER_TIMEZONE", "SORT_HEADLINES_BY_FEED_DATE",
-			"SSL_CERT_SERIAL", "DIGEST_PREFERRED_TIME"];
-	}
-
-	public function changepassword() {
-
-		if (defined('_TTRSS_DEMO_INSTANCE')) {
-			print "ERROR: ".format_error("Disabled in demo version.");
-			return;
-		}
-
-		$old_pw = clean($_POST["old_password"]);
-		$new_pw = clean($_POST["new_password"]);
-		$con_pw = clean($_POST["confirm_password"]);
-
-		if ($old_pw == $new_pw) {
-			print "ERROR: ".format_error("New password must be different from the old one.");
-			return;
-		}
-
-		if ($old_pw == "") {
-			print "ERROR: ".format_error("Old password cannot be blank.");
-			return;
-		}
-
-		if ($new_pw == "") {
-			print "ERROR: ".format_error("New password cannot be blank.");
-			return;
-		}
-
-		if ($new_pw != $con_pw) {
-			print "ERROR: ".format_error("Entered passwords do not match.");
-			return;
-		}
-
-		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
-
-		if (method_exists($authenticator, "change_password")) {
-			print format_notice($authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw));
-		} else {
-			print "ERROR: ".format_error("Function not supported by authentication module.");
-		}
-	}
-
-	public function saveconfig() {
-		$boolean_prefs = explode(",", clean($_POST["boolean_prefs"]));
-
-		foreach ($boolean_prefs as $pref) {
-			if (!isset($_POST[$pref])) $_POST[$pref] = 'false';
-		}
-
-		$need_reload = false;
-
-		foreach (array_keys($_POST) as $pref_name) {
-
-			$value = $_POST[$pref_name];
-
-			switch ($pref_name) {
-				case 'DIGEST_PREFERRED_TIME':
-					if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
-
-						$sth = $this->pdo->prepare("UPDATE ttrss_users SET
+    private $pref_help = [];
+    private $pref_item_map = [];
+    private $pref_blacklist = [];
+    private $profile_blacklist = [];
+
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("index", "updateself", "customizecss", "editprefprofiles");
+
+        return array_search($method, $csrf_ignored) !== false;
+    }
+
+    public function __construct($args) {
+        parent::__construct($args);
+
+        $this->pref_item_map = [
+            __('General') => [
+                'USER_LANGUAGE',
+                'USER_TIMEZONE',
+                'BLOCK_SEPARATOR',
+                'USER_CSS_THEME',
+                'BLOCK_SEPARATOR',
+                'ENABLE_API_ACCESS',
+            ],
+            __('Feeds') => [
+                'DEFAULT_UPDATE_INTERVAL',
+                'FRESH_ARTICLE_MAX_AGE',
+                'DEFAULT_SEARCH_LANGUAGE',
+                'BLOCK_SEPARATOR',
+                'ENABLE_FEED_CATS',
+                'BLOCK_SEPARATOR',
+                'CONFIRM_FEED_CATCHUP',
+                'ON_CATCHUP_SHOW_NEXT_FEED',
+                'BLOCK_SEPARATOR',
+                'HIDE_READ_FEEDS',
+                'HIDE_READ_SHOWS_SPECIAL',
+            ],
+            __('Articles') => [
+                'PURGE_OLD_DAYS',
+                'PURGE_UNREAD_ARTICLES',
+                'BLOCK_SEPARATOR',
+                'COMBINED_DISPLAY_MODE',
+                'CDM_EXPANDED',
+                'BLOCK_SEPARATOR',
+                'CDM_AUTO_CATCHUP',
+                'VFEED_GROUP_BY_FEED',
+                'BLOCK_SEPARATOR',
+                'SHOW_CONTENT_PREVIEW',
+                'STRIP_IMAGES',
+            ],
+            __('Digest') => [
+                'DIGEST_ENABLE',
+                'DIGEST_CATCHUP',
+                'DIGEST_PREFERRED_TIME',
+            ],
+            __('Advanced') => [
+                'BLACKLISTED_TAGS',
+                'BLOCK_SEPARATOR',
+                'LONG_DATE_FORMAT',
+                'SHORT_DATE_FORMAT',
+                'BLOCK_SEPARATOR',
+                'SSL_CERT_SERIAL',
+            ]
+        ];
+
+        $this->pref_help = [
+            "ALLOW_DUPLICATE_POSTS" => array(__("Allow duplicate articles"), ""),
+            "BLACKLISTED_TAGS" => array(__("Blacklisted tags"), __("Never apply these tags automatically (comma-separated list).")),
+            "DEFAULT_SEARCH_LANGUAGE" => array(__("Default language"), __("Used for full-text search")),
+            "CDM_AUTO_CATCHUP" => array(__("Mark read on scroll"), __("Mark articles as read as you scroll past them")),
+            "CDM_EXPANDED" => array(__("Always expand articles")),
+            "COMBINED_DISPLAY_MODE" => array(__("Combined mode"), __("Show flat list of articles instead of separate panels")),
+            "CONFIRM_FEED_CATCHUP" => array(__("Confirm marking feeds as read")),
+            "DEFAULT_ARTICLE_LIMIT" => array(__("Amount of articles to display at once")),
+            "DEFAULT_UPDATE_INTERVAL" => array(__("Default update interval")),
+            "DIGEST_CATCHUP" => array(__("Mark sent articles as read")),
+            "DIGEST_ENABLE" => array(__("Enable digest"), __("Send daily digest of new (and unread) headlines to your e-mail address")),
+            "DIGEST_PREFERRED_TIME" => array(__("Try to send around this time"), __("Time in UTC")),
+            "ENABLE_API_ACCESS" => array(__("Enable API"), __("Allows accessing this account through the API")),
+            "ENABLE_FEED_CATS" => array(__("Enable categories")),
+            "FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""),
+            "FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>" . __("hours") . "</strong>"),
+            "HIDE_READ_FEEDS" => array(__("Hide read feeds")),
+            "HIDE_READ_SHOWS_SPECIAL" => array(__("Always show special feeds"), __("While hiding read feeds")),
+            "LONG_DATE_FORMAT" => array(__("Long date format"), __("Syntax is identical to PHP <a href='http://php.net/manual/function.date.php'>date()</a> function.")),
+            "ON_CATCHUP_SHOW_NEXT_FEED" => array(__("Automatically show next feed"), __("After marking one as read")),
+            "PURGE_OLD_DAYS" => array(__("Purge articles older than"), __("<strong>days</strong> (0 disables)")),
+            "PURGE_UNREAD_ARTICLES" => array(__("Purge unread articles")),
+            "REVERSE_HEADLINES" => array(__("Reverse headline order (oldest first)")),
+            "SHORT_DATE_FORMAT" => array(__("Short date format")),
+            "SHOW_CONTENT_PREVIEW" => array(__("Show content preview in headlines")),
+            "SORT_HEADLINES_BY_FEED_DATE" => array(__("Sort headlines by feed date"), __("Use feed-specified date to sort headlines instead of local import date.")),
+            "SSL_CERT_SERIAL" => array(__("SSL client certificate")),
+            "STRIP_IMAGES" => array(__("Do not embed media")),
+            "STRIP_UNSAFE_TAGS" => array(__("Strip unsafe tags from articles"), __("Strip all but most common HTML tags when reading articles.")),
+            "USER_STYLESHEET" => array(__("Customize stylesheet")),
+            "USER_TIMEZONE" => array(__("Time zone")),
+            "VFEED_GROUP_BY_FEED" => array(__("Group by feed"), __("Group multiple-feed output by originating feed")),
+            "USER_LANGUAGE" => array(__("Language")),
+            "USER_CSS_THEME" => array(__("Theme"))
+        ];
+
+        $this->pref_blacklist = ["ALLOW_DUPLICATE_POSTS", "STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES",
+            "SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT",
+            "FEEDS_SORT_BY_UNREAD", "USER_STYLESHEET"];
+
+        /* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */
+
+        $this->profile_blacklist = ["ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS",
+            "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",
+            "BLACKLISTED_TAGS", "ENABLE_API_ACCESS", "UPDATE_POST_ON_CHECKSUM_CHANGE",
+            "DEFAULT_UPDATE_INTERVAL", "USER_TIMEZONE", "SORT_HEADLINES_BY_FEED_DATE",
+            "SSL_CERT_SERIAL", "DIGEST_PREFERRED_TIME"];
+    }
+
+    public function changepassword() {
+
+        if (defined('_TTRSS_DEMO_INSTANCE')) {
+            print "ERROR: ".format_error("Disabled in demo version.");
+            return;
+        }
+
+        $old_pw = clean($_POST["old_password"]);
+        $new_pw = clean($_POST["new_password"]);
+        $con_pw = clean($_POST["confirm_password"]);
+
+        if ($old_pw == $new_pw) {
+            print "ERROR: ".format_error("New password must be different from the old one.");
+            return;
+        }
+
+        if ($old_pw == "") {
+            print "ERROR: ".format_error("Old password cannot be blank.");
+            return;
+        }
+
+        if ($new_pw == "") {
+            print "ERROR: ".format_error("New password cannot be blank.");
+            return;
+        }
+
+        if ($new_pw != $con_pw) {
+            print "ERROR: ".format_error("Entered passwords do not match.");
+            return;
+        }
+
+        $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
+
+        if (method_exists($authenticator, "change_password")) {
+            print format_notice($authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw));
+        } else {
+            print "ERROR: ".format_error("Function not supported by authentication module.");
+        }
+    }
+
+    public function saveconfig() {
+        $boolean_prefs = explode(",", clean($_POST["boolean_prefs"]));
+
+        foreach ($boolean_prefs as $pref) {
+            if (!isset($_POST[$pref])) $_POST[$pref] = 'false';
+        }
+
+        $need_reload = false;
+
+        foreach (array_keys($_POST) as $pref_name) {
+
+            $value = $_POST[$pref_name];
+
+            switch ($pref_name) {
+                case 'DIGEST_PREFERRED_TIME':
+                    if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
+
+                        $sth = $this->pdo->prepare("UPDATE ttrss_users SET
 						last_digest_sent = NULL WHERE id = ?");
-						$sth->execute([$_SESSION['uid']]);
+                        $sth->execute([$_SESSION['uid']]);
 
-					}
-					break;
-				case 'USER_LANGUAGE':
-					if (!$need_reload) $need_reload = $_SESSION["language"] != $value;
-					break;
-
-				case 'USER_CSS_THEME':
-					if (!$need_reload) $need_reload = get_pref($pref_name) != $value;
-					break;
-			}
+                    }
+                    break;
+                case 'USER_LANGUAGE':
+                    if (!$need_reload) $need_reload = $_SESSION["language"] != $value;
+                    break;
 
-			set_pref($pref_name, $value);
-		}
+                case 'USER_CSS_THEME':
+                    if (!$need_reload) $need_reload = get_pref($pref_name) != $value;
+                    break;
+            }
 
-		if ($need_reload) {
-			print "PREFS_NEED_RELOAD";
-		} else {
-			print __("The configuration was saved.");
-		}
-	}
+            set_pref($pref_name, $value);
+        }
 
-	public function changeemail() {
+        if ($need_reload) {
+            print "PREFS_NEED_RELOAD";
+        } else {
+            print __("The configuration was saved.");
+        }
+    }
 
-		$email = clean($_POST["email"]);
-		$full_name = clean($_POST["full_name"]);
-		$active_uid = $_SESSION["uid"];
+    public function changeemail() {
 
-		$sth = $this->pdo->prepare("SELECT email, login, full_name FROM ttrss_users WHERE id = ?");
-		$sth->execute([$active_uid]);
+        $email = clean($_POST["email"]);
+        $full_name = clean($_POST["full_name"]);
+        $active_uid = $_SESSION["uid"];
 
-		if ($row = $sth->fetch()) {
-			$old_email = $row["email"];
+        $sth = $this->pdo->prepare("SELECT email, login, full_name FROM ttrss_users WHERE id = ?");
+        $sth->execute([$active_uid]);
 
-			if ($old_email != $email) {
-				$mailer = new Mailer();
+        if ($row = $sth->fetch()) {
+            $old_email = $row["email"];
 
-				require_once "lib/MiniTemplator.class.php";
+            if ($old_email != $email) {
+                $mailer = new Mailer();
 
-				$tpl = new MiniTemplator;
+                require_once "lib/MiniTemplator.class.php";
 
-				$tpl->readTemplateFromFile("templates/mail_change_template.txt");
+                $tpl = new MiniTemplator;
 
-				$tpl->setVariable('LOGIN', $row["login"]);
-				$tpl->setVariable('NEWMAIL', $email);
-				$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+                $tpl->readTemplateFromFile("templates/mail_change_template.txt");
 
-				$tpl->addBlock('message');
+                $tpl->setVariable('LOGIN', $row["login"]);
+                $tpl->setVariable('NEWMAIL', $email);
+                $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-				$tpl->generateOutputToString($message);
+                $tpl->addBlock('message');
 
-				$mailer->mail(["to_name" => $row["login"],
-					"to_address" => $row["email"],
-					"subject" => "[tt-rss] Mail address change notification",
-					"message" => $message]);
+                $tpl->generateOutputToString($message);
 
-			}
-		}
+                $mailer->mail(["to_name" => $row["login"],
+                    "to_address" => $row["email"],
+                    "subject" => "[tt-rss] Mail address change notification",
+                    "message" => $message]);
+
+            }
+        }
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_users SET email = ?,
+        $sth = $this->pdo->prepare("UPDATE ttrss_users SET email = ?,
 			full_name = ? WHERE id = ?");
-		$sth->execute([$email, $full_name, $active_uid]);
+        $sth->execute([$email, $full_name, $active_uid]);
 
-		print __("Your personal data has been saved.");
+        print __("Your personal data has been saved.");
 
-		return;
-	}
+        return;
+    }
 
-	public function resetconfig() {
+    public function resetconfig() {
 
-		$_SESSION["prefs_op_result"] = "reset-to-defaults";
+        $_SESSION["prefs_op_result"] = "reset-to-defaults";
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_user_prefs
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_user_prefs
 			WHERE (profile = :profile OR (:profile IS NULL AND profile IS NULL))
 				AND owner_uid = :uid");
-		$sth->execute([":profile" => $_SESSION['profile'], ":uid" => $_SESSION['uid']]);
+        $sth->execute([":profile" => $_SESSION['profile'], ":uid" => $_SESSION['uid']]);
 
-		initialize_user_prefs($_SESSION["uid"], $_SESSION["profile"]);
+        initialize_user_prefs($_SESSION["uid"], $_SESSION["profile"]);
 
-		echo __("Your preferences are now set to default values.");
-	}
+        echo __("Your preferences are now set to default values.");
+    }
 
-	public function index() {
+    public function index() {
 
-		global $access_level_names;
+        global $access_level_names;
 
-		$_SESSION["prefs_op_result"] = "";
+        $_SESSION["prefs_op_result"] = "";
 
-		print "<div dojoType='dijit.layout.AccordionContainer' region='center'>";
-		print "<div dojoType='dijit.layout.AccordionPane'
+        print "<div dojoType='dijit.layout.AccordionContainer' region='center'>";
+        print "<div dojoType='dijit.layout.AccordionPane'
 			title=\"<i class='material-icons'>person</i> ".__('Personal data / Authentication')."\">";
 
-		print "<div dojoType='dijit.layout.TabContainer'>";
-		print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Personal data')."\">";
+        print "<div dojoType='dijit.layout.TabContainer'>";
+        print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Personal data')."\">";
 
-		print "<form dojoType='dijit.form.Form' id='changeUserdataForm'>";
+        print "<form dojoType='dijit.form.Form' id='changeUserdataForm'>";
 
-		print "<script type='dojo/method' event='onSubmit' args='evt'>
+        print "<script type='dojo/method' event='onSubmit' args='evt'>
 		evt.preventDefault();
 		if (this.validate()) {
 			Notify.progress('Saving data...', true);
@@ -287,61 +287,61 @@ 
 		}
 		</script>";
 
-		$sth = $this->pdo->prepare("SELECT email,full_name,otp_enabled,
+        $sth = $this->pdo->prepare("SELECT email,full_name,otp_enabled,
 			access_level FROM ttrss_users
 			WHERE id = ?");
-		$sth->execute([$_SESSION["uid"]]);
-		$row = $sth->fetch();
-
-		$email = htmlspecialchars($row["email"]);
-		$full_name = htmlspecialchars($row["full_name"]);
-		$otp_enabled = sql_bool_to_bool($row["otp_enabled"]);
-
-		print "<fieldset>";
-		print "<label>".__('Full name:')."</label>";
-		print "<input dojoType='dijit.form.ValidationTextBox' name='full_name' required='1' value='$full_name'>";
-		print "</fieldset>";
-
-		print "<fieldset>";
-		print "<label>".__('E-mail:')."</label>";
-		print "<input dojoType='dijit.form.ValidationTextBox' name='email' required='1' value='$email'>";
-		print "</fieldset>";
-
-		if (!SINGLE_USER_MODE && !$_SESSION["hide_hello"]) {
-
-			$access_level = $row["access_level"];
-			print "<fieldset>";
-			print "<label>".__('Access level:')."</label>";
-			print $access_level_names[$access_level];
-			print "</fieldset>";
-		}
+        $sth->execute([$_SESSION["uid"]]);
+        $row = $sth->fetch();
 
-		print_hidden("op", "pref-prefs");
-		print_hidden("method", "changeemail");
+        $email = htmlspecialchars($row["email"]);
+        $full_name = htmlspecialchars($row["full_name"]);
+        $otp_enabled = sql_bool_to_bool($row["otp_enabled"]);
 
-		print "<hr/>";
+        print "<fieldset>";
+        print "<label>".__('Full name:')."</label>";
+        print "<input dojoType='dijit.form.ValidationTextBox' name='full_name' required='1' value='$full_name'>";
+        print "</fieldset>";
 
-		print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
-			__("Save data")."</button>";
+        print "<fieldset>";
+        print "<label>".__('E-mail:')."</label>";
+        print "<input dojoType='dijit.form.ValidationTextBox' name='email' required='1' value='$email'>";
+        print "</fieldset>";
 
-		print "</form>";
+        if (!SINGLE_USER_MODE && !$_SESSION["hide_hello"]) {
 
-		print "</div>"; # content pane
-		print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Password')."\">";
+            $access_level = $row["access_level"];
+            print "<fieldset>";
+            print "<label>".__('Access level:')."</label>";
+            print $access_level_names[$access_level];
+            print "</fieldset>";
+        }
 
-		if ($_SESSION["auth_module"]) {
-			$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
-		} else {
-			$authenticator = false;
-		}
+        print_hidden("op", "pref-prefs");
+        print_hidden("method", "changeemail");
 
-		if ($authenticator && method_exists($authenticator, "change_password")) {
+        print "<hr/>";
 
-			print "<div style='display : none' id='pwd_change_infobox'></div>";
+        print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
+            __("Save data")."</button>";
 
-			print "<form dojoType='dijit.form.Form'>";
+        print "</form>";
 
-			print "<script type='dojo/method' event='onSubmit' args='evt'>
+        print "</div>"; # content pane
+        print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Password')."\">";
+
+        if ($_SESSION["auth_module"]) {
+            $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
+        } else {
+            $authenticator = false;
+        }
+
+        if ($authenticator && method_exists($authenticator, "change_password")) {
+
+            print "<div style='display : none' id='pwd_change_infobox'></div>";
+
+            print "<form dojoType='dijit.form.Form'>";
+
+            print "<script type='dojo/method' event='onSubmit' args='evt'>
 			evt.preventDefault();
 			if (this.validate()) {
 				Notify.progress('Changing password...', true);
@@ -370,71 +370,71 @@ 
 			}
 			</script>";
 
-			if ($otp_enabled) {
-				print_notice(__("Changing your current password will disable OTP."));
-			}
+            if ($otp_enabled) {
+                print_notice(__("Changing your current password will disable OTP."));
+            }
 
-			print "<fieldset>";
-			print "<label>".__("Old password:")."</label>";
-			print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='old_password'>";
-			print "</fieldset>";
+            print "<fieldset>";
+            print "<label>".__("Old password:")."</label>";
+            print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='old_password'>";
+            print "</fieldset>";
 
-			print "<fieldset>";
-			print "<label>".__("New password:")."</label>";
-			print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='new_password'>";
-			print "</fieldset>";
+            print "<fieldset>";
+            print "<label>".__("New password:")."</label>";
+            print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='new_password'>";
+            print "</fieldset>";
 
-			print "<fieldset>";
-			print "<label>".__("Confirm password:")."</label>";
-			print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='confirm_password'>";
-			print "</fieldset>";
+            print "<fieldset>";
+            print "<label>".__("Confirm password:")."</label>";
+            print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='confirm_password'>";
+            print "</fieldset>";
 
-			print_hidden("op", "pref-prefs");
-			print_hidden("method", "changepassword");
+            print_hidden("op", "pref-prefs");
+            print_hidden("method", "changepassword");
 
-			print "<hr/>";
+            print "<hr/>";
 
-			print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
-				__("Change password")."</button>";
+            print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
+                __("Change password")."</button>";
 
-			print "</form>";
+            print "</form>";
 
-			print "</div>"; # content pane
+            print "</div>"; # content pane
 
-			if ($_SESSION["auth_module"] == "auth_internal") {
+            if ($_SESSION["auth_module"] == "auth_internal") {
 
-				print "<div dojoType='dijit.layout.ContentPane' title=\"" . __('App passwords') . "\">";
+                print "<div dojoType='dijit.layout.ContentPane' title=\"" . __('App passwords') . "\">";
 
-				print_notice("You can create separate passwords for API clients. Using one is required if you enable OTP.");
+                print_notice("You can create separate passwords for API clients. Using one is required if you enable OTP.");
 
-				print "<div id='app_passwords_holder'>";
-				$this->appPasswordList();
-				print "</div>";
+                print "<div id='app_passwords_holder'>";
+                $this->appPasswordList();
+                print "</div>";
 
-				print "<hr>";
+                print "<hr>";
 
-				print "<button style='float : left' class='alt-primary' dojoType='dijit.form.Button'
+                print "<button style='float : left' class='alt-primary' dojoType='dijit.form.Button'
 					onclick=\"Helpers.AppPasswords.generate()\">" .
-					__('Generate new password') . "</button> ";
+                    __('Generate new password') . "</button> ";
 
-				print "<button style='float : left' class='alt-danger' dojoType='dijit.form.Button'
+                print "<button style='float : left' class='alt-danger' dojoType='dijit.form.Button'
 					onclick=\"Helpers.AppPasswords.removeSelected()\">" .
-					__('Remove selected passwords') . "</button>";
+                    __('Remove selected passwords') . "</button>";
 
-				print "</div>"; # content pane
-			}
+                print "</div>"; # content pane
+            }
 
-			print "<div dojoType='dijit.layout.ContentPane' title=\"".__('One time passwords / Authenticator')."\">";
+            print "<div dojoType='dijit.layout.ContentPane' title=\"".__('One time passwords / Authenticator')."\">";
 
-			if ($_SESSION["auth_module"] == "auth_internal") {
+            if ($_SESSION["auth_module"] == "auth_internal") {
 
-				if ($otp_enabled) {
+                if ($otp_enabled) {
 
-					print_warning("One time passwords are currently enabled. Enter your current password below to disable.");
+                    print_warning("One time passwords are currently enabled. Enter your current password below to disable.");
 
-					print "<form dojoType='dijit.form.Form'>";
+                    print "<form dojoType='dijit.form.Form'>";
 
-					print "<script type='dojo/method' event='onSubmit' args='evt'>
+                    print "<script type='dojo/method' event='onSubmit' args='evt'>
 					evt.preventDefault();
 					if (this.validate()) {
 						Notify.progress('Disabling OTP', true);
@@ -453,49 +453,49 @@ 
 					}
 					</script>";
 
-					print "<fieldset>";
-					print "<label>".__("Your password:")."</label>";
-					print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='password'>";
-					print "</fieldset>";
+                    print "<fieldset>";
+                    print "<label>".__("Your password:")."</label>";
+                    print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='password'>";
+                    print "</fieldset>";
 
-					print_hidden("op", "pref-prefs");
-					print_hidden("method", "otpdisable");
+                    print_hidden("op", "pref-prefs");
+                    print_hidden("method", "otpdisable");
 
-					print "<hr/>";
+                    print "<hr/>";
 
-					print "<button dojoType='dijit.form.Button' type='submit'>".
-						__("Disable OTP")."</button>";
+                    print "<button dojoType='dijit.form.Button' type='submit'>".
+                        __("Disable OTP")."</button>";
 
-					print "</form>";
+                    print "</form>";
 
-				} else {
+                } else {
 
-					print_warning("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.");
-					print_notice("You will need to generate app passwords for the API clients if you enable OTP.");
+                    print_warning("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.");
+                    print_notice("You will need to generate app passwords for the API clients if you enable OTP.");
 
-					if (function_exists("imagecreatefromstring")) {
-						print "<h3>" . __("Scan the following code by the Authenticator application or copy the key manually") . "</h3>";
+                    if (function_exists("imagecreatefromstring")) {
+                        print "<h3>" . __("Scan the following code by the Authenticator application or copy the key manually") . "</h3>";
 
-						$csrf_token = $_SESSION["csrf_token"];
-						print "<img alt='otp qr-code' src='backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token'>";
-					} else {
-						print_error("PHP GD functions are required to generate QR codes.");
-						print "<h3>" . __("Use the following OTP key with a compatible Authenticator application") . "</h3>";
-					}
+                        $csrf_token = $_SESSION["csrf_token"];
+                        print "<img alt='otp qr-code' src='backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token'>";
+                    } else {
+                        print_error("PHP GD functions are required to generate QR codes.");
+                        print "<h3>" . __("Use the following OTP key with a compatible Authenticator application") . "</h3>";
+                    }
 
-					print "<form dojoType='dijit.form.Form' id='changeOtpForm'>";
+                    print "<form dojoType='dijit.form.Form' id='changeOtpForm'>";
 
-					$otp_secret = $this->otpsecret();
+                    $otp_secret = $this->otpsecret();
 
-					print "<fieldset>";
-					print "<label>".__("OTP Key:")."</label>";
-					print "<input dojoType='dijit.form.ValidationTextBox' disabled='disabled' value='$otp_secret' size='32'>";
-					print "</fieldset>";
+                    print "<fieldset>";
+                    print "<label>".__("OTP Key:")."</label>";
+                    print "<input dojoType='dijit.form.ValidationTextBox' disabled='disabled' value='$otp_secret' size='32'>";
+                    print "</fieldset>";
 
-					print_hidden("op", "pref-prefs");
-					print_hidden("method", "otpenable");
+                    print_hidden("op", "pref-prefs");
+                    print_hidden("method", "otpenable");
 
-					print "<script type='dojo/method' event='onSubmit' args='evt'>
+                    print "<script type='dojo/method' event='onSubmit' args='evt'>
 					evt.preventDefault();
 					if (this.validate()) {
 						Notify.progress('Saving data...', true);
@@ -514,43 +514,43 @@ 
 					}
 					</script>";
 
-					print "<fieldset>";
-					print "<label>".__("Your password:")."</label>";
-					print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1'
+                    print "<fieldset>";
+                    print "<label>".__("Your password:")."</label>";
+                    print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1'
 						name='password'>";
-					print "</fieldset>";
+                    print "</fieldset>";
 
-					print "<fieldset>";
-					print "<label>".__("One time password:")."</label>";
-					print "<input dojoType='dijit.form.ValidationTextBox' autocomplete='off'
+                    print "<fieldset>";
+                    print "<label>".__("One time password:")."</label>";
+                    print "<input dojoType='dijit.form.ValidationTextBox' autocomplete='off'
 						required='1' name='otp'>";
-					print "</fieldset>";
+                    print "</fieldset>";
 
-					print "<hr/>";
-					print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
-						__("Enable OTP")."</button>";
+                    print "<hr/>";
+                    print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
+                        __("Enable OTP")."</button>";
 
-					print "</form>";
+                    print "</form>";
 
-				}
-			}
+                }
+            }
 
-			print "</div>"; # content pane
-			print "</div>"; # tab container
+            print "</div>"; # content pane
+            print "</div>"; # tab container
 
-		}
+        }
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefPrefsAuth");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefPrefsAuth");
 
-		print "</div>"; #pane
+        print "</div>"; #pane
 
-		print "<div dojoType='dijit.layout.AccordionPane' selected='true'
+        print "<div dojoType='dijit.layout.AccordionPane' selected='true'
 			title=\"<i class='material-icons'>settings</i> ".__('Preferences')."\">";
 
-		print "<form dojoType='dijit.form.Form' id='changeSettingsForm'>";
+        print "<form dojoType='dijit.form.Form' id='changeSettingsForm'>";
 
-		print "<script type='dojo/method' event='onSubmit' args='evt, quit'>
+        print "<script type='dojo/method' event='onSubmit' args='evt, quit'>
 		if (evt) evt.preventDefault();
 		if (this.validate()) {
 			console.log(dojo.objectToQuery(this.getValues()));
@@ -572,23 +572,23 @@ 
 		}
 		</script>";
 
-		print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
+        print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
 
-		print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">';
+        print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">';
 
-		$profile = $_SESSION["profile"];
+        $profile = $_SESSION["profile"];
 
-		if ($profile) {
-			print_notice(__("Some preferences are only available in default profile."));
+        if ($profile) {
+            print_notice(__("Some preferences are only available in default profile."));
 
-			initialize_user_prefs($_SESSION["uid"], $profile);
-		} else {
-			initialize_user_prefs($_SESSION["uid"]);
-		}
+            initialize_user_prefs($_SESSION["uid"], $profile);
+        } else {
+            initialize_user_prefs($_SESSION["uid"]);
+        }
 
-		$prefs_available = [];
+        $prefs_available = [];
 
-		$sth = $this->pdo->prepare("SELECT DISTINCT
+        $sth = $this->pdo->prepare("SELECT DISTINCT
 			ttrss_user_prefs.pref_name,value,type_name,
 			ttrss_prefs_sections.order_id,
 			def_value,section_id
@@ -599,230 +599,230 @@ 
 				ttrss_user_prefs.pref_name = ttrss_prefs.pref_name AND
 				owner_uid = :uid
 			ORDER BY ttrss_prefs_sections.order_id,pref_name");
-		$sth->execute([":uid" => $_SESSION['uid'], ":profile" => $profile]);
+        $sth->execute([":uid" => $_SESSION['uid'], ":profile" => $profile]);
 
-		$listed_boolean_prefs = [];
+        $listed_boolean_prefs = [];
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			if (in_array($line["pref_name"], $this->pref_blacklist)) {
-				continue;
-			}
+            if (in_array($line["pref_name"], $this->pref_blacklist)) {
+                continue;
+            }
 
-			if ($profile && in_array($line["pref_name"], $this->profile_blacklist)) {
-				continue;
-			}
+            if ($profile && in_array($line["pref_name"], $this->profile_blacklist)) {
+                continue;
+            }
 
-			$pref_name = $line["pref_name"];
-			$short_desc = $this->getShortDesc($pref_name);
+            $pref_name = $line["pref_name"];
+            $short_desc = $this->getShortDesc($pref_name);
 
-			if (!$short_desc)
-				continue;
+            if (!$short_desc)
+                continue;
 
-			$prefs_available[$pref_name] = [
-				'type_name' => $line["type_name"],
-				'value' => $line['value'],
-				'help_text' => $this->getHelpText($pref_name),
-				'short_desc' => $short_desc
-			];
-		}
+            $prefs_available[$pref_name] = [
+                'type_name' => $line["type_name"],
+                'value' => $line['value'],
+                'help_text' => $this->getHelpText($pref_name),
+                'short_desc' => $short_desc
+            ];
+        }
 
-		foreach (array_keys($this->pref_item_map) as $section) {
+        foreach (array_keys($this->pref_item_map) as $section) {
 
-			print "<h2>$section</h2>";
+            print "<h2>$section</h2>";
 
-			foreach ($this->pref_item_map[$section] as $pref_name) {
+            foreach ($this->pref_item_map[$section] as $pref_name) {
 
-				if ($pref_name == 'BLOCK_SEPARATOR' && !$profile) {
-					print "<hr/>";
-					continue;
-				}
+                if ($pref_name == 'BLOCK_SEPARATOR' && !$profile) {
+                    print "<hr/>";
+                    continue;
+                }
 
-				if ($pref_name == "DEFAULT_SEARCH_LANGUAGE" && DB_TYPE != "pgsql") {
-					continue;
-				}
+                if ($pref_name == "DEFAULT_SEARCH_LANGUAGE" && DB_TYPE != "pgsql") {
+                    continue;
+                }
 
-				if ($item = $prefs_available[$pref_name]) {
+                if ($item = $prefs_available[$pref_name]) {
 
-					print "<fieldset class='prefs'>";
+                    print "<fieldset class='prefs'>";
 
-					print "<label for='CB_$pref_name'>";
-					print $item['short_desc'] . ":";
-					print "</label>";
+                    print "<label for='CB_$pref_name'>";
+                    print $item['short_desc'] . ":";
+                    print "</label>";
 
-					$value = $item['value'];
-					$type_name = $item['type_name'];
+                    $value = $item['value'];
+                    $type_name = $item['type_name'];
 
-					if ($pref_name == "USER_LANGUAGE") {
-						print_select_hash($pref_name, $value, get_translations(),
-							"style='width : 220px; margin : 0px' dojoType='fox.form.Select'");
+                    if ($pref_name == "USER_LANGUAGE") {
+                        print_select_hash($pref_name, $value, get_translations(),
+                            "style='width : 220px; margin : 0px' dojoType='fox.form.Select'");
 
-					} else if ($pref_name == "USER_TIMEZONE") {
+                    } else if ($pref_name == "USER_TIMEZONE") {
 
-						$timezones = explode("\n", file_get_contents("lib/timezones.txt"));
+                        $timezones = explode("\n", file_get_contents("lib/timezones.txt"));
 
-						print_select($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"');
-					} else if ($pref_name == "USER_CSS_THEME") {
+                        print_select($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"');
+                    } else if ($pref_name == "USER_CSS_THEME") {
 
-						$themes = array_merge(glob("themes/*.php"), glob("themes/*.css"), glob("themes.local/*.css"));
-						$themes = array_map("basename", $themes);
-						$themes = array_filter($themes, "theme_exists");
-						asort($themes);
+                        $themes = array_merge(glob("themes/*.php"), glob("themes/*.css"), glob("themes.local/*.css"));
+                        $themes = array_map("basename", $themes);
+                        $themes = array_filter($themes, "theme_exists");
+                        asort($themes);
 
-						if (!theme_exists($value)) $value = "default.php";
+                        if (!theme_exists($value)) $value = "default.php";
 
-						print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>";
+                        print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>";
 
-						$issel = $value == "default.php" ? "selected='selected'" : "";
-						print "<option $issel value='default.php'>".__("default")."</option>";
+                        $issel = $value == "default.php" ? "selected='selected'" : "";
+                        print "<option $issel value='default.php'>".__("default")."</option>";
 
-						foreach ($themes as $theme) {
-							$issel = $value == $theme ? "selected='selected'" : "";
-							print "<option $issel value='$theme'>$theme</option>";
-						}
+                        foreach ($themes as $theme) {
+                            $issel = $value == $theme ? "selected='selected'" : "";
+                            print "<option $issel value='$theme'>$theme</option>";
+                        }
 
-						print "</select>";
+                        print "</select>";
 
-						print " <button dojoType=\"dijit.form.Button\" class='alt-info'
+                        print " <button dojoType=\"dijit.form.Button\" class='alt-info'
 							onclick=\"Helpers.customizeCSS()\">" . __('Customize') . "</button>";
 
-						print " <button dojoType='dijit.form.Button' onclick='window.open(\"https://tt-rss.org/wiki/Themes\")'>
+                        print " <button dojoType='dijit.form.Button' onclick='window.open(\"https://tt-rss.org/wiki/Themes\")'>
 							<i class='material-icons'>open_in_new</i> ".__("More themes...")."</button>";
 
-					} else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") {
+                    } else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") {
 
-						global $update_intervals_nodefault;
+                        global $update_intervals_nodefault;
 
-						print_select_hash($pref_name, $value, $update_intervals_nodefault,
-							'dojoType="fox.form.Select"');
-					} else if ($pref_name == "DEFAULT_SEARCH_LANGUAGE") {
+                        print_select_hash($pref_name, $value, $update_intervals_nodefault,
+                            'dojoType="fox.form.Select"');
+                    } else if ($pref_name == "DEFAULT_SEARCH_LANGUAGE") {
 
-						print_select($pref_name, $value, Pref_Feeds::get_ts_languages(),
-							'dojoType="fox.form.Select"');
+                        print_select($pref_name, $value, Pref_Feeds::get_ts_languages(),
+                            'dojoType="fox.form.Select"');
 
-					} else if ($type_name == "bool") {
+                    } else if ($type_name == "bool") {
 
-						array_push($listed_boolean_prefs, $pref_name);
+                        array_push($listed_boolean_prefs, $pref_name);
 
-						$checked = ($value == "true") ? "checked=\"checked\"" : "";
+                        $checked = ($value == "true") ? "checked=\"checked\"" : "";
 
-						if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) {
-							$disabled = "disabled=\"1\"";
-							$checked = "checked=\"checked\"";
-						} else {
-							$disabled = "";
-						}
+                        if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) {
+                            $disabled = "disabled=\"1\"";
+                            $checked = "checked=\"checked\"";
+                        } else {
+                            $disabled = "";
+                        }
 
-						print "<input type='checkbox' name='$pref_name' $checked $disabled
+                        print "<input type='checkbox' name='$pref_name' $checked $disabled
 							dojoType='dijit.form.CheckBox' id='CB_$pref_name' value='1'>";
 
-					} else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE',
-							'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) {
+                    } else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE',
+                            'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) {
 
-						$regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
+                        $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
 
-						if ($pref_name == "PURGE_OLD_DAYS" && FORCE_ARTICLE_PURGE != 0) {
-							$disabled = "disabled='1'";
-							$value = FORCE_ARTICLE_PURGE;
-						} else {
-							$disabled = "";
-						}
+                        if ($pref_name == "PURGE_OLD_DAYS" && FORCE_ARTICLE_PURGE != 0) {
+                            $disabled = "disabled='1'";
+                            $value = FORCE_ARTICLE_PURGE;
+                        } else {
+                            $disabled = "";
+                        }
 
-						if ($type_name == 'integer')
-							print "<input dojoType=\"dijit.form.NumberSpinner\"
+                        if ($type_name == 'integer')
+                            print "<input dojoType=\"dijit.form.NumberSpinner\"
 								required='1' $disabled
 								name=\"$pref_name\" value=\"$value\">";
-						else
-							print "<input dojoType=\"dijit.form.TextBox\"
+                        else
+                            print "<input dojoType=\"dijit.form.TextBox\"
 								required='1' $regexp $disabled
 								name=\"$pref_name\" value=\"$value\">";
 
-					} else if ($pref_name == "SSL_CERT_SERIAL") {
+                    } else if ($pref_name == "SSL_CERT_SERIAL") {
 
-						print "<input dojoType='dijit.form.ValidationTextBox'
+                        print "<input dojoType='dijit.form.ValidationTextBox'
 							id='SSL_CERT_SERIAL' readonly='1'
 							name=\"$pref_name\" value=\"$value\">";
 
-						$cert_serial = htmlspecialchars(get_ssl_certificate_id());
-						$has_serial = ($cert_serial) ? "false" : "true";
+                        $cert_serial = htmlspecialchars(get_ssl_certificate_id());
+                        $has_serial = ($cert_serial) ? "false" : "true";
 
-						print "<button dojoType='dijit.form.Button' disabled='$has_serial'
+                        print "<button dojoType='dijit.form.Button' disabled='$has_serial'
 							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">" .
-							__('Register') . "</button>";
+                            __('Register') . "</button>";
 
-						print "<button dojoType='dijit.form.Button' class='alt-danger'
+                        print "<button dojoType='dijit.form.Button' class='alt-danger'
 							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '')\">" .
-							__('Clear') . "</button>";
+                            __('Clear') . "</button>";
 
-						print "<button dojoType='dijit.form.Button' class='alt-info'
+                        print "<button dojoType='dijit.form.Button' class='alt-info'
 							onclick='window.open(\"https://tt-rss.org/wiki/SSL%20Certificate%20Authentication\")'>
 							<i class='material-icons'>help</i> ".__("More info...")."</button>";
 
-					} else if ($pref_name == 'DIGEST_PREFERRED_TIME') {
-						print "<input dojoType=\"dijit.form.ValidationTextBox\"
+                    } else if ($pref_name == 'DIGEST_PREFERRED_TIME') {
+                        print "<input dojoType=\"dijit.form.ValidationTextBox\"
 							id=\"$pref_name\" regexp=\"[012]?\d:\d\d\" placeHolder=\"12:00\"
 							name=\"$pref_name\" value=\"$value\">";
 
-						$item['help_text'] .= ". " . T_sprintf("Current server time: %s", date("H:i"));
-					} else {
-						$regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
+                        $item['help_text'] .= ". " . T_sprintf("Current server time: %s", date("H:i"));
+                    } else {
+                        $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
 
-						print "<input dojoType=\"dijit.form.ValidationTextBox\" $regexp name=\"$pref_name\" value=\"$value\">";
-					}
+                        print "<input dojoType=\"dijit.form.ValidationTextBox\" $regexp name=\"$pref_name\" value=\"$value\">";
+                    }
 
-					if ($item['help_text'])
-						print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>";
+                    if ($item['help_text'])
+                        print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>";
 
-					print "</fieldset>";
-				}
-			}
-		}
+                    print "</fieldset>";
+                }
+            }
+        }
 
-		$listed_boolean_prefs = htmlspecialchars(join(",", $listed_boolean_prefs));
+        $listed_boolean_prefs = htmlspecialchars(join(",", $listed_boolean_prefs));
 
-		print_hidden("boolean_prefs", "$listed_boolean_prefs");
+        print_hidden("boolean_prefs", "$listed_boolean_prefs");
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefPrefsPrefsInside");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefPrefsPrefsInside");
 
-		print '</div>'; # inside pane
-		print '<div dojoType="dijit.layout.ContentPane" region="bottom">';
+        print '</div>'; # inside pane
+        print '<div dojoType="dijit.layout.ContentPane" region="bottom">';
 
-		print_hidden("op", "pref-prefs");
-		print_hidden("method", "saveconfig");
+        print_hidden("op", "pref-prefs");
+        print_hidden("method", "saveconfig");
 
-		print "<div dojoType=\"fox.form.ComboButton\" type=\"submit\" class=\"alt-primary\">
+        print "<div dojoType=\"fox.form.ComboButton\" type=\"submit\" class=\"alt-primary\">
 			<span>".__('Save configuration')."</span>
 			<div dojoType=\"dijit.DropDownMenu\">
 				<div dojoType=\"dijit.MenuItem\"
 					onclick=\"dijit.byId('changeSettingsForm').onSubmit(null, true)\">".
-				__("Save and exit preferences")."</div>
+                __("Save and exit preferences")."</div>
 			</div>
 			</div>";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Helpers.editProfiles()\">".
-			__('Manage profiles')."</button> ";
+        print "<button dojoType=\"dijit.form.Button\" onclick=\"return Helpers.editProfiles()\">".
+            __('Manage profiles')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" class=\"alt-danger\" onclick=\"return Helpers.confirmReset()\">".
-			__('Reset to defaults')."</button>";
+        print "<button dojoType=\"dijit.form.Button\" class=\"alt-danger\" onclick=\"return Helpers.confirmReset()\">".
+            __('Reset to defaults')."</button>";
 
-		print "&nbsp;";
+        print "&nbsp;";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefPrefsPrefsOutside");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefPrefsPrefsOutside");
 
-		print "</form>";
-		print '</div>'; # inner pane
-		print '</div>'; # border container
+        print "</form>";
+        print '</div>'; # inner pane
+        print '</div>'; # border container
 
-		print "</div>"; #pane
+        print "</div>"; #pane
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>extension</i> ".__('Plugins')."\">";
 
-		print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">";
+        print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">";
 
-		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
+        print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 		evt.preventDefault();
 		if (this.validate()) {
 			Notify.progress('Saving data...', true);
@@ -839,383 +839,383 @@ 
 		}
 		</script>";
 
-		print_hidden("op", "pref-prefs");
-		print_hidden("method", "setplugins");
+        print_hidden("op", "pref-prefs");
+        print_hidden("method", "setplugins");
 
-		print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
-		print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">';
+        print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
+        print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">';
 
-		if (ini_get("open_basedir") && function_exists("curl_init") && !defined("NO_CURL")) {
-			print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly.");
-		}
+        if (ini_get("open_basedir") && function_exists("curl_init") && !defined("NO_CURL")) {
+            print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly.");
+        }
 
-		$feed_handler_whitelist = [ "Af_Comics" ];
+        $feed_handler_whitelist = [ "Af_Comics" ];
 
-		$feed_handlers = array_merge(
-			PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED),
-			PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_PARSED),
-			PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FETCH_FEED));
+        $feed_handlers = array_merge(
+            PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED),
+            PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_PARSED),
+            PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FETCH_FEED));
 
-		$feed_handlers = array_filter($feed_handlers, function($plugin) use ($feed_handler_whitelist) {
-			return in_array(get_class($plugin), $feed_handler_whitelist) === false; });
+        $feed_handlers = array_filter($feed_handlers, function($plugin) use ($feed_handler_whitelist) {
+            return in_array(get_class($plugin), $feed_handler_whitelist) === false; });
 
-		if (count($feed_handlers) > 0) {
-			print_error(
-				T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>" ,
-					implode(", ", array_map(function($plugin) { return get_class($plugin); }, $feed_handlers))
-				) . " (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)"
-			);
-		}
+        if (count($feed_handlers) > 0) {
+            print_error(
+                T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>" ,
+                    implode(", ", array_map(function($plugin) { return get_class($plugin); }, $feed_handlers))
+                ) . " (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)"
+            );
+        }
 
-		print "<h2>".__("System plugins")."</h2>";
-		print_notice("System plugins are enabled in <strong>config.php</strong> for all users.");
+        print "<h2>".__("System plugins")."</h2>";
+        print_notice("System plugins are enabled in <strong>config.php</strong> for all users.");
 
-		$system_enabled = array_map("trim", explode(",", PLUGINS));
-		$user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
+        $system_enabled = array_map("trim", explode(",", PLUGINS));
+        $user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
 
-		$tmppluginhost = new PluginHost();
-		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true);
-		$tmppluginhost->load_data();
+        $tmppluginhost = new PluginHost();
+        $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true);
+        $tmppluginhost->load_data();
 
-		foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
-			$about = $plugin->about();
+        foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
+            $about = $plugin->about();
 
-			if ($about[3]) {
-				if (in_array($name, $system_enabled)) {
-					$checked = "checked='1'";
-				} else {
-					$checked = "";
-				}
+            if ($about[3]) {
+                if (in_array($name, $system_enabled)) {
+                    $checked = "checked='1'";
+                } else {
+                    $checked = "";
+                }
 
-				print "<fieldset class='prefs plugin'>
+                print "<fieldset class='prefs plugin'>
 					<label>$name:</label>
 					<label class='checkbox description text-muted' id='PLABEL-$name'>
 						<input disabled='1'
 							dojoType='dijit.form.CheckBox' $checked type='checkbox'>
 						".htmlspecialchars($about[1]). "</label>";
 
-					if (@$about[4]) {
-						print "<button dojoType='dijit.form.Button' class='alt-info'
+                    if (@$about[4]) {
+                        print "<button dojoType='dijit.form.Button' class='alt-info'
 							onclick='window.open(\"".htmlspecialchars($about[4])."\")'>
 								<i class='material-icons'>open_in_new</i> ".__("More info...")."</button>";
-					}
+                    }
 
-					print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>".
-						htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])).
-						"</div>";
+                    print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>".
+                        htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])).
+                        "</div>";
 
-				print "</fieldset>";
+                print "</fieldset>";
 
-			}
-		}
+            }
+        }
 
-		print "<h2>".__("User plugins")."</h2>";
+        print "<h2>".__("User plugins")."</h2>";
 
-		foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
-			$about = $plugin->about();
+        foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
+            $about = $plugin->about();
 
-			if (!$about[3]) {
+            if (!$about[3]) {
 
-				$checked = "";
-				$disabled = "";
+                $checked = "";
+                $disabled = "";
 
-				if (in_array($name, $system_enabled)) {
-					$checked = "checked='1'";
-					$disabled = "disabled='1'";
-				} else if (in_array($name, $user_enabled)) {
-					$checked = "checked='1'";
-				}
+                if (in_array($name, $system_enabled)) {
+                    $checked = "checked='1'";
+                    $disabled = "disabled='1'";
+                } else if (in_array($name, $user_enabled)) {
+                    $checked = "checked='1'";
+                }
 
-				print "<fieldset class='prefs plugin'>
+                print "<fieldset class='prefs plugin'>
 					<label>$name:</label>
 					<label class='checkbox description text-muted' id='PLABEL-$name'>
 						<input name='plugins[]' value='$name' dojoType='dijit.form.CheckBox' $checked $disabled type='checkbox'>
 						".htmlspecialchars($about[1])."</label>";
 
-				if (count($tmppluginhost->get_all($plugin)) > 0) {
-					if (in_array($name, $system_enabled) || in_array($name, $user_enabled)) {
-						print " <button dojoType='dijit.form.Button'
+                if (count($tmppluginhost->get_all($plugin)) > 0) {
+                    if (in_array($name, $system_enabled) || in_array($name, $user_enabled)) {
+                        print " <button dojoType='dijit.form.Button'
 							onclick=\"Helpers.clearPluginData('$name')\">
 								<i class='material-icons'>clear</i> ".__("Clear data")."</button>";
-					}
-				}
+                    }
+                }
 
-				if (@$about[4]) {
-					print " <button dojoType='dijit.form.Button' class='alt-info'
+                if (@$about[4]) {
+                    print " <button dojoType='dijit.form.Button' class='alt-info'
 							onclick='window.open(\"".htmlspecialchars($about[4])."\")'>
 								<i class='material-icons'>open_in_new</i> ".__("More info...")."</button>";
-				}
+                }
 
-				print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>".
-					htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])).
-					"</div>";
+                print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>".
+                    htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])).
+                    "</div>";
 
-				print "</fieldset>";
-			}
-		}
+                print "</fieldset>";
+            }
+        }
 
-		print "</div>"; #content-pane
-		print '<div dojoType="dijit.layout.ContentPane" region="bottom">';
+        print "</div>"; #content-pane
+        print '<div dojoType="dijit.layout.ContentPane" region="bottom">';
 
-		print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/Plugins\")'>
+        print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/Plugins\")'>
 			<i class='material-icons'>help</i> ".__("More info...")."</button>";
 
-		print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit'>".
-			__("Enable selected plugins")."</button>";
-		print "</div>"; #pane
+        print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit'>".
+            __("Enable selected plugins")."</button>";
+        print "</div>"; #pane
 
-		print "</div>"; #pane
-		print "</div>"; #border-container
+        print "</div>"; #pane
+        print "</div>"; #border-container
 
-		print "</form>";
+        print "</form>";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-			"hook_prefs_tab", "prefPrefs");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+            "hook_prefs_tab", "prefPrefs");
 
-		print "</div>"; #container
+        print "</div>"; #container
 
-	}
+    }
 
-	public function toggleAdvanced() {
-		$_SESSION["prefs_show_advanced"] = !$_SESSION["prefs_show_advanced"];
-	}
+    public function toggleAdvanced() {
+        $_SESSION["prefs_show_advanced"] = !$_SESSION["prefs_show_advanced"];
+    }
 
-	public function otpsecret() {
-		$sth = $this->pdo->prepare("SELECT salt, otp_enabled
+    public function otpsecret() {
+        $sth = $this->pdo->prepare("SELECT salt, otp_enabled
 			FROM ttrss_users
 			WHERE id = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$otp_enabled = sql_bool_to_bool($row["otp_enabled"]);
+        if ($row = $sth->fetch()) {
+            $otp_enabled = sql_bool_to_bool($row["otp_enabled"]);
 
-			if (!$otp_enabled) {
-				$base32 = new \OTPHP\Base32();
-				$secret = $base32->encode(mb_substr(sha1($row["salt"]), 0, 12), false);
+            if (!$otp_enabled) {
+                $base32 = new \OTPHP\Base32();
+                $secret = $base32->encode(mb_substr(sha1($row["salt"]), 0, 12), false);
 
-				return $secret;
-			}
-		}
+                return $secret;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	public function otpqrcode() {
-		require_once "lib/phpqrcode/phpqrcode.php";
+    public function otpqrcode() {
+        require_once "lib/phpqrcode/phpqrcode.php";
 
-		$sth = $this->pdo->prepare("SELECT login
+        $sth = $this->pdo->prepare("SELECT login
 			FROM ttrss_users
 			WHERE id = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$secret = $this->otpsecret();
-			$login = $row['login'];
+        if ($row = $sth->fetch()) {
+            $secret = $this->otpsecret();
+            $login = $row['login'];
 
-			if ($secret) {
-				QRcode::png("otpauth://totp/".urlencode($login).
-					"?secret=$secret&issuer=".urlencode("Tiny Tiny RSS"));
-			}
-		}
-	}
+            if ($secret) {
+                QRcode::png("otpauth://totp/".urlencode($login).
+                    "?secret=$secret&issuer=".urlencode("Tiny Tiny RSS"));
+            }
+        }
+    }
 
-	public function otpenable() {
+    public function otpenable() {
 
-		$password = clean($_REQUEST["password"]);
-		$otp = clean($_REQUEST["otp"]);
+        $password = clean($_REQUEST["password"]);
+        $otp = clean($_REQUEST["otp"]);
 
-		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
+        $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
-		if ($authenticator->check_password($_SESSION["uid"], $password)) {
+        if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-			$secret = $this->otpsecret();
+            $secret = $this->otpsecret();
 
-			if ($secret) {
-				$topt = new \OTPHP\TOTP($secret);
-				$otp_check = $topt->now();
+            if ($secret) {
+                $topt = new \OTPHP\TOTP($secret);
+                $otp_check = $topt->now();
 
-				if ($otp == $otp_check) {
-					$sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = true WHERE id = ?");
+                if ($otp == $otp_check) {
+                    $sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = true WHERE id = ?");
 
-					$sth->execute([$_SESSION['uid']]);
+                    $sth->execute([$_SESSION['uid']]);
 
-					print "OK";
-				} else {
-					print "ERROR:".__("Incorrect one time password");
-				}
-			}
+                    print "OK";
+                } else {
+                    print "ERROR:".__("Incorrect one time password");
+                }
+            }
 
-		} else {
-			print "ERROR:".__("Incorrect password");
-		}
+        } else {
+            print "ERROR:".__("Incorrect password");
+        }
 
-	}
+    }
 
-	public static function isdefaultpassword() {
-		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
+    public static function isdefaultpassword() {
+        $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
-		if ($authenticator &&
+        if ($authenticator &&
                 method_exists($authenticator, "check_password") &&
                 $authenticator->check_password($_SESSION["uid"], "password")) {
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	public function otpdisable() {
-		$password = clean($_REQUEST["password"]);
+    public function otpdisable() {
+        $password = clean($_REQUEST["password"]);
 
-		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
+        $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
-		if ($authenticator->check_password($_SESSION["uid"], $password)) {
+        if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-			$sth = $this->pdo->prepare("SELECT email, login FROM ttrss_users WHERE id = ?");
-			$sth->execute([$_SESSION['uid']]);
+            $sth = $this->pdo->prepare("SELECT email, login FROM ttrss_users WHERE id = ?");
+            $sth->execute([$_SESSION['uid']]);
 
-			if ($row = $sth->fetch()) {
-				$mailer = new Mailer();
+            if ($row = $sth->fetch()) {
+                $mailer = new Mailer();
 
-				require_once "lib/MiniTemplator.class.php";
+                require_once "lib/MiniTemplator.class.php";
 
-				$tpl = new MiniTemplator;
+                $tpl = new MiniTemplator;
 
-				$tpl->readTemplateFromFile("templates/otp_disabled_template.txt");
+                $tpl->readTemplateFromFile("templates/otp_disabled_template.txt");
 
-				$tpl->setVariable('LOGIN', $row["login"]);
-				$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+                $tpl->setVariable('LOGIN', $row["login"]);
+                $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-				$tpl->addBlock('message');
+                $tpl->addBlock('message');
 
-				$tpl->generateOutputToString($message);
+                $tpl->generateOutputToString($message);
 
-				$mailer->mail(["to_name" => $row["login"],
-					"to_address" => $row["email"],
-					"subject" => "[tt-rss] OTP change notification",
-					"message" => $message]);
-			}
+                $mailer->mail(["to_name" => $row["login"],
+                    "to_address" => $row["email"],
+                    "subject" => "[tt-rss] OTP change notification",
+                    "message" => $message]);
+            }
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = false WHERE
+            $sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = false WHERE
 				id = ?");
-			$sth->execute([$_SESSION['uid']]);
+            $sth->execute([$_SESSION['uid']]);
 
-			print "OK";
-		} else {
-			print "ERROR: ".__("Incorrect password");
-		}
+            print "OK";
+        } else {
+            print "ERROR: ".__("Incorrect password");
+        }
 
-	}
+    }
 
-	public function setplugins() {
-		if (is_array(clean($_REQUEST["plugins"])))
-			$plugins = join(",", clean($_REQUEST["plugins"]));
-		else
-			$plugins = "";
+    public function setplugins() {
+        if (is_array(clean($_REQUEST["plugins"])))
+            $plugins = join(",", clean($_REQUEST["plugins"]));
+        else
+            $plugins = "";
 
-		set_pref("_ENABLED_PLUGINS", $plugins);
-	}
+        set_pref("_ENABLED_PLUGINS", $plugins);
+    }
 
-	public function clearplugindata() {
-		$name = clean($_REQUEST["name"]);
+    public function clearplugindata() {
+        $name = clean($_REQUEST["name"]);
 
-		PluginHost::getInstance()->clear_data(PluginHost::getInstance()->get_plugin($name));
-	}
+        PluginHost::getInstance()->clear_data(PluginHost::getInstance()->get_plugin($name));
+    }
 
-	public function customizeCSS() {
-		$value = get_pref("USER_STYLESHEET");
-		$value = str_replace("<br/>", "\n", $value);
+    public function customizeCSS() {
+        $value = get_pref("USER_STYLESHEET");
+        $value = str_replace("<br/>", "\n", $value);
 
-		print_notice(__("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here."));
+        print_notice(__("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here."));
 
-		print_hidden("op", "rpc");
-		print_hidden("method", "setpref");
-		print_hidden("key", "USER_STYLESHEET");
+        print_hidden("op", "rpc");
+        print_hidden("method", "setpref");
+        print_hidden("key", "USER_STYLESHEET");
 
-		print "<div id='css_edit_apply_msg' style='display : none'>";
-		print_warning(__("User CSS has been applied, you might need to reload the page to see all changes."));
-		print "</div>";
+        print "<div id='css_edit_apply_msg' style='display : none'>";
+        print_warning(__("User CSS has been applied, you might need to reload the page to see all changes."));
+        print "</div>";
 
-		print "<textarea class='panel user-css-editor' dojoType='dijit.form.SimpleTextarea'
+        print "<textarea class='panel user-css-editor' dojoType='dijit.form.SimpleTextarea'
 			style='font-size : 12px;' name='value'>$value</textarea>";
 
-		print "<footer>";
-		print "<button dojoType='dijit.form.Button' class='alt-success'
+        print "<footer>";
+        print "<button dojoType='dijit.form.Button' class='alt-success'
 			onclick=\"dijit.byId('cssEditDlg').apply()\">".__('Apply')."</button> ";
-		print "<button dojoType='dijit.form.Button' class='alt-primary'
+        print "<button dojoType='dijit.form.Button' class='alt-primary'
 			onclick=\"dijit.byId('cssEditDlg').execute()\">".__('Save and reload')."</button> ";
-		print "<button dojoType='dijit.form.Button'
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('cssEditDlg').hide()\">".__('Cancel')."</button>";
-		print "</footer>";
+        print "</footer>";
 
-	}
+    }
 
-	public function editPrefProfiles() {
-		print "<div dojoType='fox.Toolbar'>";
+    public function editPrefProfiles() {
+        print "<div dojoType='fox.Toolbar'>";
 
-		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
-		print "<div dojoType='dijit.Menu' style='display: none'>";
-		print "<div onclick=\"Tables.select('pref-profiles-list', true)\"
+        print "<div dojoType='fox.form.DropDownButton'>".
+                "<span>" . __('Select')."</span>";
+        print "<div dojoType='dijit.Menu' style='display: none'>";
+        print "<div onclick=\"Tables.select('pref-profiles-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
-		print "<div onclick=\"Tables.select('pref-profiles-list', false)\"
+        print "<div onclick=\"Tables.select('pref-profiles-list', false)\"
 			dojoType='dijit.MenuItem'>".__('None')."</div>";
-		print "</div></div>";
+        print "</div></div>";
 
-		print "<div style='float : right'>";
+        print "<div style='float : right'>";
 
-		print "<input name='newprofile' dojoType='dijit.form.ValidationTextBox'
+        print "<input name='newprofile' dojoType='dijit.form.ValidationTextBox'
 				required='1'>
 			<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('profileEditDlg').addProfile()\">".
-				__('Create profile')."</button></div>";
+                __('Create profile')."</button></div>";
 
-		print "</div>";
+        print "</div>";
 
-		$sth = $this->pdo->prepare("SELECT title,id FROM ttrss_settings_profiles
+        $sth = $this->pdo->prepare("SELECT title,id FROM ttrss_settings_profiles
 			WHERE owner_uid = ? ORDER BY title");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		print "<div class='panel panel-scrollable'>";
+        print "<div class='panel panel-scrollable'>";
 
-		print "<form id='profile_edit_form' onsubmit='return false'>";
+        print "<form id='profile_edit_form' onsubmit='return false'>";
 
-		print "<table width='100%' id='pref-profiles-list'>";
+        print "<table width='100%' id='pref-profiles-list'>";
 
-		print "<tr>"; # data-row-id='0' <-- no point, shouldn't be removed
+        print "<tr>"; # data-row-id='0' <-- no point, shouldn't be removed
 
-		print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
+        print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
 
-		if (!$_SESSION["profile"]) {
-			$is_active = __("(active)");
-		} else {
-			$is_active = "";
-		}
+        if (!$_SESSION["profile"]) {
+            $is_active = __("(active)");
+        } else {
+            $is_active = "";
+        }
 
-		print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>";
+        print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>";
 
-		print "</tr>";
+        print "</tr>";
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$profile_id = $line["id"];
+            $profile_id = $line["id"];
 
-			print "<tr data-row-id='$profile_id'>";
+            print "<tr data-row-id='$profile_id'>";
 
-			$edit_title = htmlspecialchars($line["title"]);
+            $edit_title = htmlspecialchars($line["title"]);
 
-			print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
+            print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
 
-			if ($_SESSION["profile"] == $line["id"]) {
-				$is_active = __("(active)");
-			} else {
-				$is_active = "";
-			}
+            if ($_SESSION["profile"] == $line["id"]) {
+                $is_active = __("(active)");
+            } else {
+                $is_active = "";
+            }
 
-			print "<td><span dojoType='dijit.InlineEditBox'
+            print "<td><span dojoType='dijit.InlineEditBox'
 				width='300px' autoSave='false'
 				profile-id='$profile_id'>" . $edit_title .
-				"<script type='dojo/method' event='onChange' args='item'>
+                "<script type='dojo/method' event='onChange' args='item'>
 					var elem = this;
 					dojo.xhrPost({
 						url: 'backend.php',
@@ -1229,118 +1229,118 @@ 
 				</script>
 			</span> $is_active</td>";
 
-			print "</tr>";
-		}
+            print "</tr>";
+        }
 
-		print "</table>";
-		print "</form>";
-		print "</div>";
+        print "</table>";
+        print "</form>";
+        print "</div>";
 
-		print "<footer>
+        print "<footer>
 			<button style='float : left' class='alt-danger' dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').removeSelected()\">".
-			__('Remove selected profiles')."</button>
+            __('Remove selected profiles')."</button>
 			<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick=\"dijit.byId('profileEditDlg').activateProfile()\">".
-			__('Activate profile')."</button>
+            __('Activate profile')."</button>
 			<button dojoType='dijit.form.Button' onclick=\"dijit.byId('profileEditDlg').hide()\">".
-			__('Cancel')."</button>";
-		print "</footer>";
-
-	}
-
-	private function getShortDesc($pref_name) {
-		if (isset($this->pref_help[$pref_name])) {
-			return $this->pref_help[$pref_name][0];
-		}
-		return "";
-	}
-
-	private function getHelpText($pref_name) {
-		if (isset($this->pref_help[$pref_name])) {
-			return $this->pref_help[$pref_name][1];
-		}
-		return "";
-	}
-
-	private function appPasswordList() {
-		print "<div dojoType='fox.Toolbar'>";
-		print "<div dojoType='fox.form.DropDownButton'>" .
-			"<span>" . __('Select') . "</span>";
-		print "<div dojoType='dijit.Menu' style='display: none'>";
-		print "<div onclick=\"Tables.select('app-password-list', true)\"
+            __('Cancel')."</button>";
+        print "</footer>";
+
+    }
+
+    private function getShortDesc($pref_name) {
+        if (isset($this->pref_help[$pref_name])) {
+            return $this->pref_help[$pref_name][0];
+        }
+        return "";
+    }
+
+    private function getHelpText($pref_name) {
+        if (isset($this->pref_help[$pref_name])) {
+            return $this->pref_help[$pref_name][1];
+        }
+        return "";
+    }
+
+    private function appPasswordList() {
+        print "<div dojoType='fox.Toolbar'>";
+        print "<div dojoType='fox.form.DropDownButton'>" .
+            "<span>" . __('Select') . "</span>";
+        print "<div dojoType='dijit.Menu' style='display: none'>";
+        print "<div onclick=\"Tables.select('app-password-list', true)\"
 				dojoType=\"dijit.MenuItem\">" . __('All') . "</div>";
-		print "<div onclick=\"Tables.select('app-password-list', false)\"
+        print "<div onclick=\"Tables.select('app-password-list', false)\"
 				dojoType=\"dijit.MenuItem\">" . __('None') . "</div>";
-		print "</div></div>";
-		print "</div>"; #toolbar
-
-		print "<div class='panel panel-scrollable'>";
-		print "<table width='100%' id='app-password-list'>";
-		print "<tr>";
-		print "<th width='2%'></th>";
-		print "<th align='left'>".__("Description")."</th>";
-		print "<th align='right'>".__("Created")."</th>";
-		print "<th align='right'>".__("Last used")."</th>";
-		print "</tr>";
-
-		$sth = $this->pdo->prepare("SELECT id, title, created, last_used
+        print "</div></div>";
+        print "</div>"; #toolbar
+
+        print "<div class='panel panel-scrollable'>";
+        print "<table width='100%' id='app-password-list'>";
+        print "<tr>";
+        print "<th width='2%'></th>";
+        print "<th align='left'>".__("Description")."</th>";
+        print "<th align='right'>".__("Created")."</th>";
+        print "<th align='right'>".__("Last used")."</th>";
+        print "</tr>";
+
+        $sth = $this->pdo->prepare("SELECT id, title, created, last_used
 			FROM ttrss_app_passwords WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($row = $sth->fetch()) {
+        while ($row = $sth->fetch()) {
 
-			$row_id = $row["id"];
+            $row_id = $row["id"];
 
-			print "<tr data-row-id='$row_id'>";
+            print "<tr data-row-id='$row_id'>";
 
-			print "<td align='center'>
+            print "<td align='center'>
 						<input onclick='Tables.onRowChecked(this)' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
-			print "<td>" . htmlspecialchars($row["title"]) . "</td>";
+            print "<td>" . htmlspecialchars($row["title"]) . "</td>";
 
-			print "<td align='right' class='text-muted'>";
-			print make_local_datetime($row['created'], false);
-			print "</td>";
+            print "<td align='right' class='text-muted'>";
+            print make_local_datetime($row['created'], false);
+            print "</td>";
 
-			print "<td align='right' class='text-muted'>";
-			print make_local_datetime($row['last_used'], false);
-			print "</td>";
+            print "<td align='right' class='text-muted'>";
+            print make_local_datetime($row['last_used'], false);
+            print "</td>";
 
-			print "</tr>";
-		}
+            print "</tr>";
+        }
 
-		print "</table>";
-		print "</div>";
-	}
+        print "</table>";
+        print "</div>";
+    }
 
-	private function encryptAppPassword($password) {
-		$salt = substr(bin2hex(get_random_bytes(24)), 0, 24);
+    private function encryptAppPassword($password) {
+        $salt = substr(bin2hex(get_random_bytes(24)), 0, 24);
 
-		return "SSHA-512:".hash('sha512', $salt . $password). ":$salt";
-	}
+        return "SSHA-512:".hash('sha512', $salt . $password). ":$salt";
+    }
 
-	public function deleteAppPassword() {
-		$ids = explode(",", clean($_REQUEST['ids']));
-		$ids_qmarks = arr_qmarks($ids);
+    public function deleteAppPassword() {
+        $ids = explode(",", clean($_REQUEST['ids']));
+        $ids_qmarks = arr_qmarks($ids);
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_app_passwords WHERE id IN ($ids_qmarks) AND owner_uid = ?");
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_app_passwords WHERE id IN ($ids_qmarks) AND owner_uid = ?");
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
-		$this->appPasswordList();
-	}
+        $this->appPasswordList();
+    }
 
-	public function generateAppPassword() {
-		$title = clean($_REQUEST['title']);
-		$new_password = make_password(16);
-		$new_password_hash = $this->encryptAppPassword($new_password);
+    public function generateAppPassword() {
+        $title = clean($_REQUEST['title']);
+        $new_password = make_password(16);
+        $new_password_hash = $this->encryptAppPassword($new_password);
 
-		print_warning(T_sprintf("Generated password <strong>%s</strong> for %s. Please remember it for future reference.", $new_password, $title));
+        print_warning(T_sprintf("Generated password <strong>%s</strong> for %s. Please remember it for future reference.", $new_password, $title));
 
-		$sth = $this->pdo->prepare("INSERT INTO ttrss_app_passwords
+        $sth = $this->pdo->prepare("INSERT INTO ttrss_app_passwords
     			(title, pwd_hash, service, created, owner_uid)
     		 VALUES
     		    (?, ?, ?, NOW(), ?)");
 
-		$sth->execute([$title, $new_password_hash, Auth_Base::AUTH_SERVICE_API, $_SESSION['uid']]);
+        $sth->execute([$title, $new_password_hash, Auth_Base::AUTH_SERVICE_API, $_SESSION['uid']]);
 
-		$this->appPasswordList();
-	}
+        $this->appPasswordList();
+    }
 }

classes/pref/labels.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 
 			print "</section>";
 
-			print "<header>" . __("Colors") . "</header>";
+			print "<header>".__("Colors")."</header>";
 			print "<section>";
 
 			print "<table>";
@@ -93,7 +93,7 @@ 
 
 		while ($line = $sth->fetch()) {
 			$label = array();
-			$label['id'] = 'LABEL:' . $line['id'];
+			$label['id'] = 'LABEL:'.$line['id'];
 			$label['bare_id'] = $line['id'];
 			$label['name'] = $line['caption'];
 			$label['fg_color'] = $line['fg_color'];
@@ -254,7 +254,7 @@ 
 		print "<div dojoType='fox.Toolbar'>";
 
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";

Indentation +180 added lines, -180 removed lines

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

classes/pref/feeds.php

Switch Indentation +60 added lines, -60 removed lines

@@ -1066,70 +1066,70 @@
 				$qpart = "";
 
 				switch ($k) {
-					case "title":
-						$qpart = "title = " . $this->pdo->quote($feed_title);
-						break;
-
-					case "feed_url":
-						$qpart = "feed_url = " . $this->pdo->quote($feed_url);
-						break;
-
-					case "update_interval":
-						$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
-						break;
-
-					case "purge_interval":
-						$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
-						break;
-
-					case "auth_login":
-						$qpart = "auth_login = " . $this->pdo->quote($auth_login);
-						break;
-
-					case "auth_pass":
-						$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
-						break;
-
-					case "private":
-						$qpart = "private = " . $this->pdo->quote($private);
-						break;
-
-					case "include_in_digest":
-						$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
-						break;
-
-					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
-						break;
-
-					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
-						break;
-
-					case "cache_images":
-						$qpart = "cache_images = " . $this->pdo->quote($cache_images);
-						break;
-
-					case "hide_images":
-						$qpart = "hide_images = " . $this->pdo->quote($hide_images);
-						break;
-
-					case "cat_id":
-						if (get_pref('ENABLE_FEED_CATS')) {
-							if ($cat_id) {
-								$qpart = "cat_id = " . $this->pdo->quote($cat_id);
-							} else {
-								$qpart = 'cat_id = NULL';
-							}
+				case "title":
+					$qpart = "title = " . $this->pdo->quote($feed_title);
+					break;
+
+				case "feed_url":
+					$qpart = "feed_url = " . $this->pdo->quote($feed_url);
+					break;
+
+				case "update_interval":
+					$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
+					break;
+
+				case "purge_interval":
+					$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
+					break;
+
+				case "auth_login":
+					$qpart = "auth_login = " . $this->pdo->quote($auth_login);
+					break;
+
+				case "auth_pass":
+					$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
+					break;
+
+				case "private":
+					$qpart = "private = " . $this->pdo->quote($private);
+					break;
+
+				case "include_in_digest":
+					$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
+					break;
+
+				case "always_display_enclosures":
+					$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
+					break;
+
+				case "mark_unread_on_update":
+					$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
+					break;
+
+				case "cache_images":
+					$qpart = "cache_images = " . $this->pdo->quote($cache_images);
+					break;
+
+				case "hide_images":
+					$qpart = "hide_images = " . $this->pdo->quote($hide_images);
+					break;
+
+				case "cat_id":
+					if (get_pref('ENABLE_FEED_CATS')) {
+						if ($cat_id) {
+							$qpart = "cat_id = " . $this->pdo->quote($cat_id);
 						} else {
-							$qpart = "";
+							$qpart = 'cat_id = NULL';
 						}
+					} else {
+						$qpart = "";
+					}
 
-						break;
+					break;
 
-					case "feed_language":
-						$qpart = "feed_language = " . $this->pdo->quote($feed_language);
-						break;
+				case "feed_language":
+					$qpart = "feed_language = " . $this->pdo->quote($feed_language);
+					break;
 
 				}
 

Braces +40 added lines, -26 removed lines

@@ -42,10 +42,11 @@ 
 
 	private function get_category_items($cat_id) {
 
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
+		if (clean($_REQUEST['mode']) != 2) {
+					$search = $_SESSION["prefs_feed_search"];
+		} else {
+					$search = "";
+		}
 
 		// first one is set by API
 		$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
@@ -76,8 +77,9 @@ 
 			$num_children = $this->calculate_children_count($cat);
 			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
-			if ($num_children > 0 || $show_empty_cats)
-				array_push($items, $cat);
+			if ($num_children > 0 || $show_empty_cats) {
+							array_push($items, $cat);
+			}
 
 		}
 
@@ -117,10 +119,11 @@ 
 
 	public function makefeedtree() {
 
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
+		if (clean($_REQUEST['mode']) != 2) {
+					$search = $_SESSION["prefs_feed_search"];
+		} else {
+					$search = "";
+		}
 
 		$root = array();
 		$root['id'] = 'root';
@@ -231,8 +234,9 @@ 
 				$num_children = $this->calculate_children_count($cat);
 				$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
-				if ($num_children > 0 || $show_empty_cats)
-					array_push($root['items'], $cat);
+				if ($num_children > 0 || $show_empty_cats) {
+									array_push($root['items'], $cat);
+				}
 
 				$root['param'] += count($cat['items']);
 			}
@@ -279,8 +283,9 @@ 
 
 			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
 
-			if (count($cat['items']) > 0 || $show_empty_cats)
-				array_push($root['items'], $cat);
+			if (count($cat['items']) > 0 || $show_empty_cats) {
+							array_push($root['items'], $cat);
+			}
 
 			$num_children = $this->calculate_children_count($root);
 			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
@@ -343,8 +348,9 @@ 
 	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
 
 		$prefix = "";
-		for ($i = 0; $i < $nest_level; $i++)
-			$prefix .= "   ";
+		for ($i = 0; $i < $nest_level; $i++) {
+					$prefix .= "   ";
+		}
 
 		Debug::log("$prefix C: $item_id P: $parent_id");
 
@@ -409,8 +415,9 @@ 
 		#file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
 		#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
 
-		if (!is_array($data['items']))
-			$data['items'] = json_decode($data['items'], true);
+		if (!is_array($data['items'])) {
+					$data['items'] = json_decode($data['items'], true);
+		}
 
 #		print_r($data['items']);
 
@@ -494,7 +501,9 @@ 
 			}
 		}
 
-		if (is_file($icon_file)) @unlink($icon_file);
+		if (is_file($icon_file)) {
+		    @unlink($icon_file);
+		}
 
 		print $rc;
 		return;
@@ -590,8 +599,9 @@ 
 			if (DB_TYPE == "pgsql") {
 				$feed_language = $row["feed_language"];
 
-				if (!$feed_language)
-					$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
+				if (!$feed_language) {
+									$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
+				}
 
 				print "<fieldset>";
 
@@ -1404,11 +1414,13 @@ 
 		$obj = array();
 		$feed_id = (int) $feed_id;
 
-		if (!$title)
-			$title = Feeds::getFeedTitle($feed_id, false);
+		if (!$title) {
+					$title = Feeds::getFeedTitle($feed_id, false);
+		}
 
-		if ($unread === false)
-			$unread = getFeedUnread($feed_id, false);
+		if ($unread === false) {
+					$unread = getFeedUnread($feed_id, false);
+		}
 
 		$obj['id'] = 'FEED:' . $feed_id;
 		$obj['name'] = $title;
@@ -1738,7 +1750,9 @@ 
 
 
 	private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+		    $owner_uid = $_SESSION["uid"];
+		}
 
 		// clear old value and generate new one
 		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys

Indentation +1153 added lines, -1153 removed lines

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

Spacing +81 added lines, -81 removed lines

@@ -60,8 +60,8 @@ 
 		while ($line = $sth->fetch()) {
 
 			$cat = array();
-			$cat['id'] = 'CAT:' . $line['id'];
-			$cat['bare_id'] = (int)$line['id'];
+			$cat['id'] = 'CAT:'.$line['id'];
+			$cat['bare_id'] = (int) $line['id'];
 			$cat['name'] = $line['title'];
 			$cat['items'] = array();
 			$cat['checkbox'] = false;
@@ -93,8 +93,8 @@ 
 
 		while ($feed_line = $fsth->fetch()) {
 			$feed = array();
-			$feed['id'] = 'FEED:' . $feed_line['id'];
-			$feed['bare_id'] = (int)$feed_line['id'];
+			$feed['id'] = 'FEED:'.$feed_line['id'];
+			$feed['bare_id'] = (int) $feed_line['id'];
 			$feed['auxcounter'] = -1;
 			$feed['name'] = $feed_line['title'];
 			$feed['checkbox'] = false;
@@ -103,7 +103,7 @@ 
 			$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
 			$feed['param'] = make_local_datetime(
 				$feed_line['last_updated'], true);
-			$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+			$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 			array_push($items, $feed);
 		}
@@ -151,8 +151,8 @@ 
 					$feed_id = PluginHost::pfeed_to_feed_id($feed['id']);
 
 					$item = array();
-					$item['id'] = 'FEED:' . $feed_id;
-					$item['bare_id'] = (int)$feed_id;
+					$item['id'] = 'FEED:'.$feed_id;
+					$item['bare_id'] = (int) $feed_id;
 					$item['auxcounter'] = -1;
 					$item['name'] = $feed['title'];
 					$item['checkbox'] = false;
@@ -216,8 +216,8 @@ 
 
 			while ($line = $sth->fetch()) {
 				$cat = array();
-				$cat['id'] = 'CAT:' . $line['id'];
-				$cat['bare_id'] = (int)$line['id'];
+				$cat['id'] = 'CAT:'.$line['id'];
+				$cat['bare_id'] = (int) $line['id'];
 				$cat['auxcounter'] = -1;
 				$cat['name'] = $line['title'];
 				$cat['items'] = array();
@@ -261,8 +261,8 @@ 
 
 			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
+				$feed['id'] = 'FEED:'.$feed_line['id'];
+				$feed['bare_id'] = (int) $feed_line['id'];
 				$feed['auxcounter'] = -1;
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
@@ -272,7 +272,7 @@ 
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 				array_push($cat['items'], $feed);
 			}
@@ -296,8 +296,8 @@ 
 
 			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
+				$feed['id'] = 'FEED:'.$feed_line['id'];
+				$feed['bare_id'] = (int) $feed_line['id'];
 				$feed['auxcounter'] = -1;
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
@@ -307,7 +307,7 @@ 
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 				array_push($root['items'], $feed);
 			}
@@ -348,11 +348,11 @@ 
 
 		Debug::log("$prefix C: $item_id P: $parent_id");
 
-		$bare_item_id = substr($item_id, strpos($item_id, ':')+1);
+		$bare_item_id = substr($item_id, strpos($item_id, ':') + 1);
 
 		if ($item_id != 'root') {
 			if ($parent_id && $parent_id != 'root') {
-				$parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
+				$parent_bare_id = substr($parent_id, strpos($parent_id, ':') + 1);
 				$parent_qpart = $parent_bare_id;
 			} else {
 				$parent_qpart = null;
@@ -371,7 +371,7 @@ 
 		if ($cat && is_array($cat)) {
 			foreach ($cat as $item) {
 				$id = $item['_reference'];
-				$bare_id = substr($id, strpos($id, ':')+1);
+				$bare_id = substr($id, strpos($id, ':') + 1);
 
 				Debug::log("$prefix [$order_id] $id/$bare_id");
 
@@ -389,7 +389,7 @@ 
 
 					} else if (strpos($id, "CAT:") === 0) {
 						$this->process_category_order($data_map, $item['_reference'], $item_id,
-							$nest_level+1);
+							$nest_level + 1);
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 								SET order_id = ? WHERE id = ? AND
@@ -446,7 +446,7 @@ 
 		$sth->execute([$feed_id, $_SESSION['uid']]);
 
 		if ($sth->fetch()) {
-			@unlink(ICONS_DIR . "/$feed_id.ico");
+			@unlink(ICONS_DIR."/$feed_id.ico");
 
 			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?");
 			$sth->execute([$feed_id]);
@@ -457,7 +457,7 @@ 
 		header("Content-type: text/html");
 
 		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
+			$tmp_file = tempnam(CACHE_DIR.'/upload', 'icon');
 
 			$result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
 				$tmp_file);
@@ -480,8 +480,8 @@ 
 				$sth->execute([$feed_id, $_SESSION['uid']]);
 
 				if ($sth->fetch()) {
-					@unlink(ICONS_DIR . "/$feed_id.ico");
-					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
+					@unlink(ICONS_DIR."/$feed_id.ico");
+					if (rename($icon_file, ICONS_DIR."/$feed_id.ico")) {
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?");
 						$sth->execute([$feed_id]);
@@ -540,7 +540,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('URL:') . "</label> ";
+			print "<label>".__('URL:')."</label> ";
 			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
@@ -563,7 +563,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Place in category:') . "</label> ";
+				print "<label>".__('Place in category:')."</label> ";
 
 				print_feed_cat_select("cat_id", $cat_id,
 					'dojoType="fox.form.Select"');
@@ -577,7 +577,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Site URL:') . "</label> ";
+			print "<label>".__('Site URL:')."</label> ";
 			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Site URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
@@ -595,7 +595,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Language:') . "</label> ";
+				print "<label>".__('Language:')."</label> ";
 				print_select("feed_language", $feed_language, $this::get_ts_languages(),
 					'dojoType="fox.form.Select"');
 
@@ -626,10 +626,10 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+			print "<label>".__('Article purging:')."</label> ";
 
 			print_select_hash("purge_interval", $purge_interval, $purge_intervals,
-				'dojoType="fox.form.Select" ' .
+				'dojoType="fox.form.Select" '.
 				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
 
 			print "</fieldset>";
@@ -736,7 +736,7 @@ 
 			print "<fieldset class='narrow'>";
 
 			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
-				name='cache_images' $checked> ". __('Cache media')."</label>";
+				name='cache_images' $checked> ".__('Cache media')."</label>";
 
 			print "</fieldset>";
 
@@ -818,7 +818,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Place in category:') . "</label> ";
+			print "<label>".__('Place in category:')."</label> ";
 
 			print_feed_cat_select("cat_id", false,
 				'disabled="1" dojoType="fox.form.Select"');
@@ -833,7 +833,7 @@ 
 		if (DB_TYPE == "pgsql") {
 			print "<fieldset>";
 
-			print "<label>" . __('Language:') . "</label> ";
+			print "<label>".__('Language:')."</label> ";
 			print_select("feed_language", "", $this::get_ts_languages(),
 				'disabled="1" dojoType="fox.form.Select"');
 
@@ -866,7 +866,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+			print "<label>".__('Article purging:')."</label> ";
 
 			print_select_hash("purge_interval", "", $purge_intervals,
 				'disabled="1" dojoType="fox.form.Select"');
@@ -1026,12 +1026,12 @@ 
 					":purge_intl" => $purge_intl,
 					":auth_login" => $auth_login,
 					":auth_pass" => $auth_pass,
-					":private" => (int)$private,
-					":cache_images" => (int)$cache_images,
-					":hide_images" => (int)$hide_images,
-					":include_in_digest" => (int)$include_in_digest,
-					":always_display_enclosures" => (int)$always_display_enclosures,
-					":mark_unread_on_update" => (int)$mark_unread_on_update,
+					":private" => (int) $private,
+					":cache_images" => (int) $cache_images,
+					":hide_images" => (int) $hide_images,
+					":include_in_digest" => (int) $include_in_digest,
+					":always_display_enclosures" => (int) $always_display_enclosures,
+					":mark_unread_on_update" => (int) $mark_unread_on_update,
 					":feed_language" => $feed_language,
 					":id" => $feed_id,
 					":uid" => $_SESSION['uid']]);
@@ -1062,57 +1062,57 @@ 
 
 				switch ($k) {
 					case "title":
-						$qpart = "title = " . $this->pdo->quote($feed_title);
+						$qpart = "title = ".$this->pdo->quote($feed_title);
 						break;
 
 					case "feed_url":
-						$qpart = "feed_url = " . $this->pdo->quote($feed_url);
+						$qpart = "feed_url = ".$this->pdo->quote($feed_url);
 						break;
 
 					case "update_interval":
-						$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
+						$qpart = "update_interval = ".$this->pdo->quote($upd_intl);
 						break;
 
 					case "purge_interval":
-						$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
+						$qpart = "purge_interval =".$this->pdo->quote($purge_intl);
 						break;
 
 					case "auth_login":
-						$qpart = "auth_login = " . $this->pdo->quote($auth_login);
+						$qpart = "auth_login = ".$this->pdo->quote($auth_login);
 						break;
 
 					case "auth_pass":
-						$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
+						$qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
 						break;
 
 					case "private":
-						$qpart = "private = " . $this->pdo->quote($private);
+						$qpart = "private = ".$this->pdo->quote($private);
 						break;
 
 					case "include_in_digest":
-						$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
+						$qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
 						break;
 
 					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
+						$qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
 						break;
 
 					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
+						$qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
 						break;
 
 					case "cache_images":
-						$qpart = "cache_images = " . $this->pdo->quote($cache_images);
+						$qpart = "cache_images = ".$this->pdo->quote($cache_images);
 						break;
 
 					case "hide_images":
-						$qpart = "hide_images = " . $this->pdo->quote($hide_images);
+						$qpart = "hide_images = ".$this->pdo->quote($hide_images);
 						break;
 
 					case "cat_id":
 						if (get_pref('ENABLE_FEED_CATS')) {
 							if ($cat_id) {
-								$qpart = "cat_id = " . $this->pdo->quote($cat_id);
+								$qpart = "cat_id = ".$this->pdo->quote($cat_id);
 							} else {
 								$qpart = 'cat_id = NULL';
 							}
@@ -1123,7 +1123,7 @@ 
 						break;
 
 					case "feed_language":
-						$qpart = "feed_language = " . $this->pdo->quote($feed_language);
+						$qpart = "feed_language = ".$this->pdo->quote($feed_language);
 						break;
 
 				}
@@ -1184,14 +1184,14 @@ 
 
 			$error_button = "<button dojoType=\"dijit.form.Button\"
 			  		onclick=\"CommonDialogs.showFeedsWithErrors()\" id=\"errorButton\">" .
-				__("Feeds with errors") . "</button>";
+				__("Feeds with errors")."</button>";
 		}
 
 		$inactive_button = "<button dojoType=\"dijit.form.Button\"
 				id=\"pref_feeds_inactive_btn\"
 				style=\"display : none\"
 				onclick=\"dijit.byId('feedTree').showInactiveFeeds()\">" .
-				__("Inactive feeds") . "</button>";
+				__("Inactive feeds")."</button>";
 
 		$feed_search = clean($_REQUEST["search"]);
 
@@ -1213,7 +1213,7 @@ 
 			</div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -1222,7 +1222,7 @@ 
 		print "</div></div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Feeds')."</span>";
+				"<span>".__('Feeds')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"CommonDialogs.quickAddFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
@@ -1238,7 +1238,7 @@ 
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 			print "<div dojoType=\"fox.form.DropDownButton\">".
-					"<span>" . __('Categories')."</span>";
+					"<span>".__('Categories')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 			print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
 				dojoType=\"dijit.MenuItem\">".__('Add category')."</div>";
@@ -1305,7 +1305,7 @@ 
 		print "<div dojoType='dijit.layout.AccordionPane'
 			title='<i class=\"material-icons\">import_export</i> ".__('OPML')."'>";
 
-		print "<h3>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "</h3>";
+		print "<h3>".__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.")."</h3>";
 
 		print_notice("Only main settings profile can be migrated using OPML.");
 
@@ -1322,7 +1322,7 @@ 
 			<input type='hidden' name='op' value='dlg'>
 			<input type='hidden' name='method' value='importOpml'>
 			<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return Helpers.OPML.import();\" type=\"submit\">" .
-			__('Import OPML') . "</button>";
+			__('Import OPML')."</button>";
 
 		print "</form>";
 
@@ -1330,22 +1330,22 @@ 
 
 		print "<button dojoType='dijit.form.Button'
 			onclick='Helpers.OPML.export()' >" .
-			__('Export OPML') . "</button>";
+			__('Export OPML')."</button>";
 
 		print " <label class='checkbox'>";
 		print_checkbox("include_settings", true, "1", "");
-		print " " . __("Include settings");
+		print " ".__("Include settings");
 		print "</label>";
 
 		print "</form>";
 
 		print "<p/>";
 
-		print "<h2>" . __("Published OPML") . "</h2>";
+		print "<h2>".__("Published OPML")."</h2>";
 
-		print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') .
-			" " .
-			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>";
+		print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.').
+			" ".
+			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.")."</p>";
 
 		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
 			__('Display published OPML URL')."</button> ";
@@ -1358,10 +1358,10 @@ 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>share</i> ".__('Published & shared articles / Generated feeds')."\">";
 
-		print "<h3>" . __('Published articles can be subscribed by anyone who knows the following URL:') . "</h3>";
+		print "<h3>".__('Published articles can be subscribed by anyone who knows the following URL:')."</h3>";
 
-		$rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
-				"/public.php?op=rss&id=-2&view-mode=all_articles");;
+		$rss_url = '-2::'.htmlspecialchars(get_self_url_prefix().
+				"/public.php?op=rss&id=-2&view-mode=all_articles"); ;
 
 		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
@@ -1390,7 +1390,7 @@ 
 			$cat_unread = Feeds::getCategoryUnread($cat_id);
 		}
 
-		$obj['id'] = 'CAT:' . $cat_id;
+		$obj['id'] = 'CAT:'.$cat_id;
 		$obj['items'] = array();
 		$obj['name'] = Feeds::getCategoryTitle($cat_id);
 		$obj['type'] = 'category';
@@ -1410,7 +1410,7 @@ 
 		if ($unread === false)
 			$unread = getFeedUnread($feed_id, false);
 
-		$obj['id'] = 'FEED:' . $feed_id;
+		$obj['id'] = 'FEED:'.$feed_id;
 		$obj['name'] = $title;
 		$obj['unread'] = (int) $unread;
 		$obj['type'] = 'feed';
@@ -1446,7 +1446,7 @@ 
 
 		print "<div dojoType='fox.Toolbar'>";
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('inactive-feeds-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -1503,7 +1503,7 @@ 
 
 		print "<div dojoType=\"fox.Toolbar\">";
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"Tables.select('error-feeds-list', true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -1567,7 +1567,7 @@ 
 
 	public static function remove_feed($id, $owner_uid) {
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
-			if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
+			if (!$p->hook_unsubscribe_feed($id, $owner_uid)) {
                 user_error("feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
                 return;
 			}
@@ -1599,7 +1599,7 @@ 
 					$res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
 					$row = $res->fetch();
 
-					$new_feed_id = (int)$row['id'] + 1;
+					$new_feed_id = (int) $row['id'] + 1;
 
 					$sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
@@ -1631,8 +1631,8 @@ 
 
 			$pdo->commit();
 
-			if (file_exists(ICONS_DIR . "/$id.ico")) {
-				unlink(ICONS_DIR . "/$id.ico");
+			if (file_exists(ICONS_DIR."/$id.ico")) {
+				unlink(ICONS_DIR."/$id.ico");
 			}
 
 			CCache::remove($id, $owner_uid);
@@ -1656,7 +1656,7 @@ 
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 			print "<fieldset>";
-			print "<label>" . __('Place in category:') . "</label> ";
+			print "<label>".__('Place in category:')."</label> ";
 			print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
 			print "</fieldset>";
 		}
@@ -1665,7 +1665,7 @@ 
 
 		print "<div id='feedDlg_loginContainer' style='display : none'>";
 
-		print "<header>" . __("Authentication") . "</header>";
+		print "<header>".__("Authentication")."</header>";
 		print "<section>";
 
 		print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
@@ -1784,12 +1784,12 @@ 
 		$sth->execute([$_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
-			print (int)$row["num_inactive"];
+			print (int) $row["num_inactive"];
 		}
 	}
 
 	public static function subscribe_to_feed_url() {
-		$url_path = get_self_url_prefix() .
+		$url_path = get_self_url_prefix().
 			"/public.php?op=subscribe&feed_url=%s";
 		return $url_path;
 	}

classes/pref/users.php

Spacing +10 added lines, -10 removed lines

@@ -52,7 +52,7 @@ 
 				}
 
 				print "<fieldset>";
-				print "<label>" . __("Login:") . "</label>";
+				print "<label>".__("Login:")."</label>";
 				print "<input style='font-size : 16px'
 					dojoType='dijit.form.ValidationTextBox' required='1'
 					$sel_disabled name='login' value=\"$login\">";
@@ -65,7 +65,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Access level: ') . "</label> ";
+				print "<label>".__('Access level: ')."</label> ";
 
 				if (!$sel_disabled) {
 					print_select_hash("access_level", $access_level, $access_level_names,
@@ -79,7 +79,7 @@ 
 				print "</fieldset>";
 				print "<fieldset>";
 
-				print "<label>" . __("New password:") . "</label> ";
+				print "<label>".__("New password:")."</label> ";
 				print "<input dojoType='dijit.form.TextBox' type='password' size='20' placeholder='Change password'
 					name='password'>";
 
@@ -91,7 +91,7 @@ 
 				print "<section>";
 
 				print "<fieldset>";
-				print "<label>" . __("E-mail:") . "</label> ";
+				print "<label>".__("E-mail:")."</label> ";
 				print "<input dojoType='dijit.form.TextBox' size='30' name='email'
 					value=\"$email\">";
 				print "</fieldset>";
@@ -337,7 +337,7 @@ 
 			}
 
 			print "<div dojoType='fox.form.DropDownButton'>".
-					"<span>" . __('Select')."</span>";
+					"<span>".__('Select')."</span>";
 			print "<div dojoType='dijit.Menu' style='display: none'>";
 			print "<div onclick=\"Tables.select('prefUserList', true)\"
 				dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -405,12 +405,12 @@ 
 				print "<td align='center'><input onclick='Tables.onRowChecked(this); event.stopPropagation();'
 					dojoType='dijit.form.CheckBox' type='checkbox'></td>";
 
-				print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> " . $line["login"] . "</td>";
+				print "<td title='".__('Click to edit')."'><i class='material-icons'>person</i> ".$line["login"]."</td>";
 
-				print "<td>" .	$access_level_names[$line["access_level"]] . "</td>";
-				print "<td>" . $line["num_feeds"] . "</td>";
-				print "<td>" . $line["created"] . "</td>";
-				print "<td>" . $line["last_login"] . "</td>";
+				print "<td>".$access_level_names[$line["access_level"]]."</td>";
+				print "<td>".$line["num_feeds"]."</td>";
+				print "<td>".$line["created"]."</td>";
+				print "<td>".$line["last_login"]."</td>";
 
 				print "</tr>";
 

Indentation +266 added lines, -266 removed lines

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

Braces +17 added lines, -10 removed lines

@@ -235,7 +235,10 @@ 
 			$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 			$pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
 
-			if (!$login) return; // no blank usernames
+			if (!$login) {
+			    return;
+			}
+			// no blank usernames
 
 			$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
 				login = ?");
@@ -294,10 +297,11 @@ 
 
 				$message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>");
 
-				if ($format_output)
-					print_notice($message);
-				else
-					print $message;
+				if ($format_output) {
+									print_notice($message);
+				} else {
+									print $message;
+				}
 
 			}
 		}
@@ -365,7 +369,9 @@ 
 			$sort = $this->validate_field($sort,
 				["login", "access_level", "created", "num_feeds", "created", "last_login"], "login");
 
-			if ($sort != "login") $sort = "$sort DESC";
+			if ($sort != "login") {
+			    $sort = "$sort DESC";
+			}
 
 			$sth = $this->pdo->prepare("SELECT
 					tu.id,
@@ -437,10 +443,11 @@ 
 		}
 
 		public function validate_field($string, $allowed, $default = "") {
-			if (in_array($string, $allowed))
-				return $string;
-			else
-				return $default;
+			if (in_array($string, $allowed)) {
+							return $string;
+			} else {
+							return $default;
+			}
 		}
 
 }

classes/debug.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 
         $ts = strftime("%H:%M:%S", time());
         if (function_exists('posix_getpid')) {
-            $ts = "$ts/" . posix_getpid();
+            $ts = "$ts/".posix_getpid();
         }
 
         if (Debug::$logfile) {
@@ -60,7 +60,7 @@ 
 
                     if (!$locked) {
                         fclose($fp);
-                        user_error("Unable to lock debugging log file: " . Debug::$logfile, E_USER_WARNING);
+                        user_error("Unable to lock debugging log file: ".Debug::$logfile, E_USER_WARNING);
                         return;
                     }
                 }
@@ -77,7 +77,7 @@ 
                     return;
 
             } else {
-                user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING);
+                user_error("Unable to open debugging log file: ".Debug::$logfile, E_USER_WARNING);
             }
         }
 

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 class Debug {
-	public static $LOG_DISABLED = -1;
+    public static $LOG_DISABLED = -1;
     public static $LOG_NORMAL = 0;
     public static $LOG_VERBOSE = 1;
     public static $LOG_EXTENDED = 2;
@@ -10,7 +10,7 @@ 
     private static $logfile = false;
     private static $loglevel = 0;
 
-	public static function set_logfile($logfile) {
+    public static function set_logfile($logfile) {
         Debug::$logfile = $logfile;
     }
 

Braces +6 added lines, -3 removed lines

@@ -36,7 +36,9 @@ 
 
     public static function log($message, $level = 0) {
 
-        if (!Debug::$enabled || Debug::$loglevel < $level) return false;
+        if (!Debug::$enabled || Debug::$loglevel < $level) {
+            return false;
+        }
 
         $ts = strftime("%H:%M:%S", time());
         if (function_exists('posix_getpid')) {
@@ -73,8 +75,9 @@ 
 
                 fclose($fp);
 
-                if (Debug::$quiet)
-                    return;
+                if (Debug::$quiet) {
+                                    return;
+                }
 
             } else {
                 user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING);