codysnider / tt-rss

classes/rssutils.php

Spacing +32 added lines, -32 removed lines

@@ -7,11 +7,11 @@ 
 			if ($k != "feed" && isset($v)) {
 				$x = strip_tags(is_array($v) ? implode(",", $v) : $v);
 
-				$tmp .= sha1("$k:" . sha1($x));
+				$tmp .= sha1("$k:".sha1($x));
 			}
 		}
 
-		return sha1(implode(",", $pluginhost->get_plugin_names()) . $tmp);
+		return sha1(implode(",", $pluginhost->get_plugin_names()).$tmp);
 	}
 
 	// Strips utf8mb4 characters (i.e. emoji) for mysql
@@ -137,7 +137,7 @@ 
 			//update_rss_feed($line["id"], true);
 
 			if ($tline = $usth->fetch()) {
-				Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
+				Debug::log(" => ".$tline["last_updated"].", ".$tline["id"]." ".$tline["owner_uid"]);
 
 				if (array_search($tline["owner_uid"], $batch_owners) === FALSE)
 					array_push($batch_owners, $tline["owner_uid"]);
@@ -323,7 +323,7 @@ 
 
 		$date_feed_processed = date('Y-m-d H:i');
 
-		$cache_filename = CACHE_DIR . "/feeds/" . sha1($fetch_url) . ".xml";
+		$cache_filename = CACHE_DIR."/feeds/".sha1($fetch_url).".xml";
 
 		$pluginhost = new PluginHost();
 		$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
@@ -340,7 +340,7 @@ 
 		Debug::log("running HOOK_FETCH_FEED handlers...", Debug::$LOG_VERBOSE);
 
 		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+			Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 			$start = microtime(true);
 			$feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
 			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
@@ -402,7 +402,7 @@ 
 			$feed_data = trim($feed_data);
 
 			Debug::log("fetch done.", Debug::$LOG_VERBOSE);
-			Debug::log("source last modified: " . $fetch_last_modified, Debug::$LOG_VERBOSE);
+			Debug::log("source last modified: ".$fetch_last_modified, Debug::$LOG_VERBOSE);
 
 			if ($feed_data && $fetch_last_modified != $stored_last_modified) {
 				$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_modified = ? WHERE id = ?");
@@ -410,7 +410,7 @@ 
 			}
 
 			// cache vanilla feed data for re-use
-			if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/feeds")) {
+			if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR."/feeds")) {
 				$new_rss_hash = sha1($feed_data);
 
 				if ($new_rss_hash != $rss_hash) {
@@ -445,7 +445,7 @@ 
 		$feed_data_checksum = md5($feed_data);
 
 		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+			Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 			$start = microtime(true);
 			$feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed);
 			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
@@ -467,7 +467,7 @@ 
 			// We use local pluginhost here because we need to load different per-user feed plugins
 
 			foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_PARSED) as $plugin) {
-				Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+				Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 				$start = microtime(true);
 				$plugin->hook_feed_parsed($rss);
 				Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
@@ -499,14 +499,14 @@ 
 			$site_url = mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245);
 
 			Debug::log("site_url: $site_url", Debug::$LOG_VERBOSE);
-			Debug::log("feed_title: " . clean($rss->get_title()), Debug::$LOG_VERBOSE);
+			Debug::log("feed_title: ".clean($rss->get_title()), Debug::$LOG_VERBOSE);
 
 			if ($favicon_needs_check || $force_refetch) {
 
 				/* terrible hack: if we crash on floicon shit here, we won't check
 				 * the icon avgcolor again (unless the icon got updated) */
 
-				$favicon_file = ICONS_DIR . "/$feed.ico";
+				$favicon_file = ICONS_DIR."/$feed.ico";
 				$favicon_modified = @filemtime($favicon_file);
 
 				Debug::log("checking favicon...", Debug::$LOG_VERBOSE);
@@ -527,7 +527,7 @@ 
 
 					$favicon_color = calculate_avg_color($favicon_file);
 
-					$favicon_colorstring = ",favicon_avg_color = " . $pdo->quote($favicon_color);
+					$favicon_colorstring = ",favicon_avg_color = ".$pdo->quote($favicon_color);
 
 				} else if ($favicon_avg_color == 'fail') {
 					Debug::log("floicon failed on this file, not trying to recalculate avg color", Debug::$LOG_VERBOSE);
@@ -546,7 +546,7 @@ 
 				print_r($filters);
 			}
 
-			Debug::log("" . count($filters) . " filters loaded.", Debug::$LOG_VERBOSE);
+			Debug::log("".count($filters)." filters loaded.", Debug::$LOG_VERBOSE);
 
 			$items = $rss->get_items();
 
@@ -588,13 +588,13 @@ 
 
 				$entry_guid = "$owner_uid,$entry_guid";
 
-				$entry_guid_hashed = 'SHA1:' . sha1($entry_guid);
+				$entry_guid_hashed = 'SHA1:'.sha1($entry_guid);
 
 				Debug::log("guid $entry_guid / $entry_guid_hashed", Debug::$LOG_VERBOSE);
 
-				$entry_timestamp = (int)$item->get_date();
+				$entry_timestamp = (int) $item->get_date();
 
-				Debug::log("orig date: " . $item->get_date(), Debug::$LOG_VERBOSE);
+				Debug::log("orig date: ".$item->get_date(), Debug::$LOG_VERBOSE);
 
 				$entry_title = strip_tags($item->get_title());
 
@@ -606,7 +606,7 @@ 
 				Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
 				Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
 
-				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
+				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp); ;
 
 				$entry_content = $item->get_content();
 				if (!$entry_content) $entry_content = $item->get_description();
@@ -627,7 +627,7 @@ 
 				Debug::log("looking for tags...", Debug::$LOG_VERBOSE);
 
 				$entry_tags = $item->get_categories();
-				Debug::log("tags found: " . join(", ", $entry_tags), Debug::$LOG_VERBOSE);
+				Debug::log("tags found: ".join(", ", $entry_tags), Debug::$LOG_VERBOSE);
 
 				Debug::log("done collecting data.", Debug::$LOG_VERBOSE);
 
@@ -692,14 +692,14 @@ 
 				Debug::log("hash differs, applying plugin filters:", Debug::$LOG_VERBOSE);
 
 				foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
-					Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+					Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 
 					$start = microtime(true);
 					$article = $plugin->hook_article_filter($article);
 
 					Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
 
-					$entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
+					$entry_plugin_data .= mb_strtolower(get_class($plugin)).",";
 				}
 
                 if (Debug::get_loglevel() >= 3) {
@@ -772,7 +772,7 @@ 
 					Debug::log("applying plugin filter actions...", Debug::$LOG_VERBOSE);
 
 					foreach ($plugin_filter_names as $pfn) {
-						list($pfclass,$pfaction) = explode(":", $pfn["param"]);
+						list($pfclass, $pfaction) = explode(":", $pfn["param"]);
 
 						if (isset($plugin_filter_actions[$pfclass])) {
 							$plugin = $pluginhost->get_plugin($pfclass);
@@ -867,7 +867,7 @@ 
 							$entry_current_hash,
 							$date_feed_processed,
 							$entry_comments,
-							(int)$num_comments,
+							(int) $num_comments,
 							$entry_plugin_data,
 							"$entry_language",
 							"$entry_author"]);
@@ -979,7 +979,7 @@ 
 						":content" => "$entry_content",
 						":content_hash" => $entry_current_hash,
 						":updated" => $entry_timestamp_fmt,
-						":num_comments" => (int)$num_comments,
+						":num_comments" => (int) $num_comments,
 						":plugin_data" => $entry_plugin_data,
 						":author" => "$entry_author",
 						":lang" => $entry_language,
@@ -987,7 +987,7 @@ 
 
 					if (DB_TYPE == "pgsql") {
 						$params[":ts_lang"] = $feed_language;
-						$params[":ts_content"] = mb_substr(strip_tags($entry_title . " " . $entry_content), 0, 900000);
+						$params[":ts_content"] = mb_substr(strip_tags($entry_title." ".$entry_content), 0, 900000);
 					}
 
 					$sth->execute($params);
@@ -1067,7 +1067,7 @@ 
 				foreach ($enclosures as $enc) {
 					$enc_url = $enc[0];
 					$enc_type = $enc[1];
-					$enc_dur = (int)$enc[2];
+					$enc_dur = (int) $enc[2];
 					$enc_title = $enc[3];
 					$enc_width = intval($enc[4]);
 					$enc_height = intval($enc[5]);
@@ -1075,7 +1075,7 @@ 
 					$esth->execute([$enc_url, $enc_type, $entry_ref_id]);
 
 					if (!$esth->fetch()) {
-						$usth->execute([$enc_url, $enc_type, (string)$enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
+						$usth->execute([$enc_url, $enc_type, (string) $enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
 					}
 				}
 
@@ -1109,7 +1109,7 @@ 
 				$filtered_tags = array_unique($filtered_tags);
 
 				if (Debug::get_loglevel() >= Debug::$LOG_VERBOSE) {
-					Debug::log("filtered tags: " . implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
+					Debug::log("filtered tags: ".implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
 
 				}
 
@@ -1297,11 +1297,11 @@ 
 		$num_deleted = 0;
 
 		if (is_writable(LOCK_DIRECTORY)) {
-			$files = glob(LOCK_DIRECTORY . "/*.lock");
+			$files = glob(LOCK_DIRECTORY."/*.lock");
 
 			if ($files) {
 				foreach ($files as $file) {
-					if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400*2) {
+					if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400 * 2) {
 						unlink($file);
 						++$num_deleted;
 					}
@@ -1516,7 +1516,7 @@ 
 	public static function check_feed_favicon($site_url, $feed) {
 		#		print "FAVICON [$site_url]: $favicon_url\n";
 
-		$icon_file = ICONS_DIR . "/$feed.ico";
+		$icon_file = ICONS_DIR."/$feed.ico";
 
 		if (!file_exists($icon_file)) {
 			$favicon_url = RSSUtils::get_favicon_url($site_url);
@@ -1570,14 +1570,14 @@ 
 
 	public static function is_gzipped($feed_data) {
 		return strpos(substr($feed_data, 0, 3),
-				"\x1f" . "\x8b" . "\x08", 0) === 0;
+				"\x1f"."\x8b"."\x08", 0) === 0;
 	}
 
 	public static function load_filters($feed_id, $owner_uid) {
 		$filters = array();
 
 		$feed_id = (int) $feed_id;
-		$cat_id = (int)Feeds::getFeedCategory($feed_id);
+		$cat_id = (int) Feeds::getFeedCategory($feed_id);
 
 		if ($cat_id == 0)
 			$null_cat_qpart = "cat_id IS NULL OR";

classes/pluginhost.php

Spacing +18 added lines, -18 removed lines

@@ -194,12 +194,12 @@ 
 					!is_dir(__DIR__."/../plugins.local/$class_file")) continue;
 
 			// try system plugin directory first
-			$file = __DIR__ . "/../plugins/$class_file/init.php";
-			$vendor_dir = __DIR__ . "/../plugins/$class_file/vendor";
+			$file = __DIR__."/../plugins/$class_file/init.php";
+			$vendor_dir = __DIR__."/../plugins/$class_file/vendor";
 
 			if (!file_exists($file)) {
-				$file = __DIR__ . "/../plugins.local/$class_file/init.php";
-				$vendor_dir = __DIR__ . "/../plugins.local/$class_file/vendor";
+				$file = __DIR__."/../plugins.local/$class_file/init.php";
+				$vendor_dir = __DIR__."/../plugins.local/$class_file/vendor";
 			}
 
 			if (!isset($this->plugins[$class])) {
@@ -217,7 +217,7 @@ 
 								list ($namespace, $class_name) = explode('\\', $class, 2);
 
 								if ($namespace && $class_name) {
-									$class_file = "$vendor_dir/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
+									$class_file = "$vendor_dir/$namespace/".str_replace('\\', '/', $class_name).".php";
 
 									if (file_exists($class_file))
 										require_once $class_file;
@@ -231,12 +231,12 @@ 
 					$plugin_api = $plugin->api_version();
 
 					if ($plugin_api < PluginHost::API_VERSION) {
-						user_error("Plugin $class is not compatible with current API version (need: " . PluginHost::API_VERSION . ", got: $plugin_api)", E_USER_WARNING);
+						user_error("Plugin $class is not compatible with current API version (need: ".PluginHost::API_VERSION.", got: $plugin_api)", E_USER_WARNING);
 						continue;
 					}
 
-					if (file_exists(dirname($file) . "/locale")) {
-						_bindtextdomain($class, dirname($file) . "/locale");
+					if (file_exists(dirname($file)."/locale")) {
+						_bindtextdomain($class, dirname($file)."/locale");
 						_bind_textdomain_codeset($class, "UTF-8");
 					}
 
@@ -319,13 +319,13 @@ 
 	}
 
 	public function del_command($command) {
-		$command = "-" . strtolower($command);
+		$command = "-".strtolower($command);
 
 		unset($this->commands[$command]);
 	}
 
 	public function lookup_command($command) {
-		$command = "-" . strtolower($command);
+		$command = "-".strtolower($command);
 
 		if (is_array($this->commands[$command])) {
 			return $this->commands[$command]["class"];
@@ -348,7 +348,7 @@ 
 	}
 
 	public function load_data() {
-		if ($this->owner_uid)  {
+		if ($this->owner_uid) {
 			$sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage
 				WHERE owner_uid = ?");
 			$sth->execute([$this->owner_uid]);
@@ -375,13 +375,13 @@ 
 			if ($sth->fetch()) {
 				$sth = $this->pdo->prepare("UPDATE ttrss_plugin_storage SET content = ?
 					WHERE owner_uid= ? AND name = ?");
-				$sth->execute([(string)$content, $this->owner_uid, $plugin]);
+				$sth->execute([(string) $content, $this->owner_uid, $plugin]);
 
 			} else {
 				$sth = $this->pdo->prepare("INSERT INTO ttrss_plugin_storage
 					(name,owner_uid,content) VALUES
 					(?, ?, ?)");
-				$sth->execute([$plugin, $this->owner_uid, (string)$content]);
+				$sth->execute([$plugin, $this->owner_uid, (string) $content]);
 			}
 
 			$this->pdo->commit();
@@ -495,8 +495,8 @@ 
 	}
 
 	// handled by classes/pluginhandler.php, requires valid session
-	public function get_method_url($sender, $method, $params)  {
-		return get_self_url_prefix() . "/backend.php?" .
+	public function get_method_url($sender, $method, $params) {
+		return get_self_url_prefix()."/backend.php?".
 			http_build_query(
 				array_merge(
 					[
@@ -508,9 +508,9 @@ 
 	}
 
 	// WARNING: endpoint in public.php, exposed to unauthenticated users
-	public function get_public_method_url($sender, $method, $params)  {
+	public function get_public_method_url($sender, $method, $params) {
 		if ($sender->is_public_method($method)) {
-			return get_self_url_prefix() . "/public.php?" .
+			return get_self_url_prefix()."/public.php?".
 				http_build_query(
 					array_merge(
 						[
@@ -520,7 +520,7 @@ 
 						],
 						$params));
 		} else {
-			user_error("get_public_method_url: requested method '$method' of '" . get_class($sender) . "' is private.");
+			user_error("get_public_method_url: requested method '$method' of '".get_class($sender)."' is private.");
 		}
 	}
 }

Braces +36 added lines, -17 removed lines

@@ -82,8 +82,9 @@ 
 	}
 
 	public static function getInstance() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		return self::$instance;
 	}
@@ -191,7 +192,9 @@ 
 			$class_file = strtolower(clean_filename($class));
 
 			if (!is_dir(__DIR__."/../plugins/$class_file") &&
-					!is_dir(__DIR__."/../plugins.local/$class_file")) continue;
+					!is_dir(__DIR__."/../plugins.local/$class_file")) {
+				continue;
+			}
 
 			// try system plugin directory first
 			$file = __DIR__ . "/../plugins/$class_file/init.php";
@@ -203,7 +206,9 @@ 
 			}
 
 			if (!isset($this->plugins[$class])) {
-				if (file_exists($file)) require_once $file;
+				if (file_exists($file)) {
+					require_once $file;
+				}
 
 				if (class_exists($class) && is_subclass_of($class, "Plugin")) {
 
@@ -219,8 +224,9 @@ 
 								if ($namespace && $class_name) {
 									$class_file = "$vendor_dir/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
 
-									if (file_exists($class_file))
-										require_once $class_file;
+									if (file_exists($class_file)) {
+																			require_once $class_file;
+									}
 								}
 							}
 						});
@@ -245,18 +251,24 @@ 
 					switch ($kind) {
 					case $this::KIND_SYSTEM:
 						if ($this->is_system($plugin)) {
-							if (!$skip_init) $plugin->init($this);
+							if (!$skip_init) {
+								$plugin->init($this);
+							}
 							$this->register_plugin($class, $plugin);
 						}
 						break;
 					case $this::KIND_USER:
 						if (!$this->is_system($plugin)) {
-							if (!$skip_init) $plugin->init($this);
+							if (!$skip_init) {
+								$plugin->init($this);
+							}
 							$this->register_plugin($class, $plugin);
 						}
 						break;
 					case $this::KIND_ALL:
-						if (!$skip_init) $plugin->init($this);
+						if (!$skip_init) {
+							$plugin->init($this);
+						}
 						$this->register_plugin($class, $plugin);
 						break;
 					}
@@ -367,8 +379,9 @@ 
 				owner_uid= ? AND name = ?");
 			$sth->execute([$this->owner_uid, $plugin]);
 
-			if (!isset($this->storage[$plugin]))
-				$this->storage[$plugin] = array();
+			if (!isset($this->storage[$plugin])) {
+							$this->storage[$plugin] = array();
+			}
 
 			$content = serialize($this->storage[$plugin]);
 
@@ -391,12 +404,15 @@ 
 	public function set($sender, $name, $value, $sync = true) {
 		$idx = get_class($sender);
 
-		if (!isset($this->storage[$idx]))
-			$this->storage[$idx] = array();
+		if (!isset($this->storage[$idx])) {
+					$this->storage[$idx] = array();
+		}
 
 		$this->storage[$idx][$name] = $value;
 
-		if ($sync) $this->save_data(get_class($sender));
+		if ($sync) {
+			$this->save_data(get_class($sender));
+		}
 	}
 
 	public function get($sender, $name, $default_value = false) {
@@ -433,7 +449,9 @@ 
 
 	// cat_id: only -1 is supported (Special)
 	public function add_feed($cat_id, $title, $icon, $sender) {
-		if (!$this->feeds[$cat_id]) $this->feeds[$cat_id] = array();
+		if (!$this->feeds[$cat_id]) {
+			$this->feeds[$cat_id] = array();
+		}
 
 		$id = count($this->feeds[$cat_id]);
 
@@ -479,8 +497,9 @@ 
 	public function add_filter_action($sender, $action_name, $action_desc) {
 		$sender_class = get_class($sender);
 
-		if (!isset($this->plugin_actions[$sender_class]))
-			$this->plugin_actions[$sender_class] = array();
+		if (!isset($this->plugin_actions[$sender_class])) {
+					$this->plugin_actions[$sender_class] = array();
+		}
 
 		array_push($this->plugin_actions[$sender_class],
 			array("action" => $action_name, "description" => $action_desc, "sender" => $sender));

classes/opml.php

Spacing +14 added lines, -14 removed lines

@@ -70,7 +70,7 @@ 
 			$cat_title = htmlspecialchars($row['title']);
 
 			if ($include_settings) {
-				$order_id = (int)$row["order_id"];
+				$order_id = (int) $row["order_id"];
 				$ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\"";
 			}
 		} else {
@@ -103,8 +103,8 @@ 
 			$site_url = htmlspecialchars($fline["site_url"]);
 
 			if ($include_settings) {
-				$update_interval = (int)$fline["update_interval"];
-				$order_id = (int)$fline["order_id"];
+				$update_interval = (int) $fline["update_interval"];
+				$order_id = (int) $fline["order_id"];
 
 				$ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\" ttrssUpdateInterval=\"$update_interval\"";
 			} else {
@@ -130,7 +130,7 @@ 
 
 		if (!isset($_REQUEST["debug"])) {
 			header("Content-type: application/xml+opml");
-			header("Content-Disposition: attachment; filename=" . $name );
+			header("Content-Disposition: attachment; filename=".$name);
 		} else {
 			header("Content-type: text/xml");
 		}
@@ -139,7 +139,7 @@ 
 
 		$out .= "<opml version=\"1.0\">";
 		$out .= "<head>
-			<dateCreated>" . date("r", time()) . "</dateCreated>
+			<dateCreated>" . date("r", time())."</dateCreated>
 			<title>Tiny Tiny RSS Feed Export</title>
 		</head>";
 		$out .= "<body>";
@@ -214,7 +214,7 @@ 
 					    foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
 
                             if (strpos($feed_id, "CAT:") === 0) {
-                                $feed_id = (int)substr($feed_id, 4);
+                                $feed_id = (int) substr($feed_id, 4);
                                 if ($feed_id) {
                                     array_push($match, [Feeds::getCategoryTitle($feed_id), true, false]);
                                 } else {
@@ -222,7 +222,7 @@ 
                                 }
                             } else {
                                 if ($feed_id) {
-                                    array_push($match, [Feeds::getFeedTitle((int)$feed_id), false, false]);
+                                    array_push($match, [Feeds::getFeedTitle((int) $feed_id), false, false]);
                                 } else {
                                     array_push($match, [0, false, true]);
                                 }
@@ -409,7 +409,7 @@ 
 						        list ($name, $is_cat, $is_id) = $match;
 
 						        if ($is_id) {
-						            array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
+						            array_push($match_on, ($is_cat ? "CAT:" : "").$name);
                                 } else {
 
                                     if (!$is_cat) {
@@ -438,7 +438,7 @@ 
                             }
 
                             $reg_exp = $rule["reg_exp"];
-                            $filter_type = (int)$rule["filter_type"];
+                            $filter_type = (int) $rule["filter_type"];
                             $inverse = bool_to_sql_bool($rule["inverse"]);
                             $match_on = json_encode($match_on);
 
@@ -472,7 +472,7 @@ 
 
                             $cat_filter = bool_to_sql_bool($rule["cat_filter"]);
                             $reg_exp = $rule["reg_exp"];
-                            $filter_type = (int)$rule["filter_type"];
+                            $filter_type = (int) $rule["filter_type"];
                             $inverse = bool_to_sql_bool($rule["inverse"]);
 
                             $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
@@ -485,7 +485,7 @@ 
 
 					foreach ($filter["actions"] as $action) {
 
-						$action_id = (int)$action["action_id"];
+						$action_id = (int) $action["action_id"];
 						$action_param = $action["action_param"];
 
 						$usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_actions
@@ -585,7 +585,7 @@ 
 		}
 
 		if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'opml');
+			$tmp_file = tempnam(CACHE_DIR.'/upload', 'opml');
 
 			$result = move_uploaded_file($_FILES['opml_file']['tmp_name'],
 				$tmp_file);
@@ -623,10 +623,10 @@ 
 		print "$msg<br/>";
 	}
 
-	public static function opml_publish_url(){
+	public static function opml_publish_url() {
 
 		$url_path = get_self_url_prefix();
-		$url_path .= "/opml.php?op=publish&key=" .
+		$url_path .= "/opml.php?op=publish&key=".
 			Feeds::get_feed_access_key('OPML:Publish', false, $_SESSION["uid"]);
 
 		return $url_path;

Braces +47 added lines, -21 removed lines

@@ -52,10 +52,11 @@ 
 
 		$cat_id = (int) $cat_id;
 
-		if ($hide_private_feeds)
-			$hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
-		else
-			$hide_qpart = "true";
+		if ($hide_private_feeds) {
+					$hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
+		} else {
+					$hide_qpart = "true";
+		}
 
 		$out = "";
 
@@ -77,7 +78,9 @@ 
 			$cat_title = "";
 		}
 
-		if ($cat_title) $out .= "<outline text=\"$cat_title\" $ttrss_specific_qpart>\n";
+		if ($cat_title) {
+			$out .= "<outline text=\"$cat_title\" $ttrss_specific_qpart>\n";
+		}
 
 		$sth = $this->pdo->prepare("SELECT id,title
 			FROM ttrss_feed_categories WHERE
@@ -120,13 +123,17 @@ 
 			$out .= "<outline type=\"rss\" text=\"$title\" xmlUrl=\"$url\" $ttrss_specific_qpart $html_url_qpart/>\n";
 		}
 
-		if ($cat_title) $out .= "</outline>\n";
+		if ($cat_title) {
+			$out .= "</outline>\n";
+		}
 
 		return $out;
 	}
 
 	public function opml_export($name, $owner_uid, $hide_private_feeds = false, $include_settings = true) {
-		if (!$owner_uid) return;
+		if (!$owner_uid) {
+			return;
+		}
 
 		if (!isset($_REQUEST["debug"])) {
 			header("Content-type: application/xml+opml");
@@ -275,8 +282,9 @@ 
 
 		// cleanup empty categories
 		foreach ($outlines as $node) {
-			if ($node->getElementsByTagName('outline')->length == 0)
-				$node->parentNode->removeChild($node);
+			if ($node->getElementsByTagName('outline')->length == 0) {
+							$node->parentNode->removeChild($node);
+			}
 		}
 
 		$res = $doc->saveXML();
@@ -297,10 +305,14 @@ 
 		$attrs = $node->attributes;
 
 		$feed_title = mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250);
-		if (!$feed_title) $feed_title = mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250);
+		if (!$feed_title) {
+			$feed_title = mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250);
+		}
 
 		$feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
-		if (!$feed_url) $feed_url = $attrs->getNamedItem('xmlURL')->nodeValue;
+		if (!$feed_url) {
+			$feed_url = $attrs->getNamedItem('xmlURL')->nodeValue;
+		}
 
 		$site_url = mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250);
 
@@ -309,19 +321,27 @@ 
 				feed_url = ? AND owner_uid = ?");
 			$sth->execute([$feed_url, $owner_uid]);
 
-			if (!$feed_title) $feed_title = '[Unknown]';
+			if (!$feed_title) {
+				$feed_title = '[Unknown]';
+			}
 
 			if (!$sth->fetch()) {
 				#$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
 				$this->opml_notice(T_sprintf("Adding feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
 
-				if (!$cat_id) $cat_id = null;
+				if (!$cat_id) {
+					$cat_id = null;
+				}
 
 				$update_interval = (int) $attrs->getNamedItem('ttrssUpdateInterval')->nodeValue;
-				if (!$update_interval) $update_interval = 0;
+				if (!$update_interval) {
+					$update_interval = 0;
+				}
 
 				$order_id = (int) $attrs->getNamedItem('ttrssSortOrder')->nodeValue;
-				if (!$order_id) $order_id = 0;
+				if (!$order_id) {
+					$order_id = 0;
+				}
 
 				$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 					(title, feed_url, owner_uid, cat_id, site_url, order_id, update_interval) VALUES
@@ -505,15 +525,18 @@ 
 		if ($root_node) {
 			$cat_title = mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250);
 
-			if (!$cat_title)
-				$cat_title = mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250);
+			if (!$cat_title) {
+							$cat_title = mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250);
+			}
 
 			if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
 				$cat_id = $this->get_feed_category($cat_title, $parent_id);
 
 				if ($cat_id === false) {
 					$order_id = (int) $root_node->attributes->getNamedItem('ttrssSortOrder')->nodeValue;
-					if (!$order_id) $order_id = 0;
+					if (!$order_id) {
+						$order_id = 0;
+					}
 
 					Feeds::add_feed_category($cat_title, $parent_id, $order_id);
 					$cat_id = $this->get_feed_category($cat_title, $parent_id);
@@ -540,8 +563,9 @@ 
 				$attrs = $node->attributes;
 				$node_cat_title = $attrs->getNamedItem('text')->nodeValue;
 
-				if (!$node_cat_title)
-					$node_cat_title = $attrs->getNamedItem('title')->nodeValue;
+				if (!$node_cat_title) {
+									$node_cat_title = $attrs->getNamedItem('title')->nodeValue;
+				}
 
 				$node_feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
 
@@ -574,7 +598,9 @@ 
 	}
 
 	public function opml_import($owner_uid) {
-		if (!$owner_uid) return;
+		if (!$owner_uid) {
+			return;
+		}
 
 		$doc = false;
 

include/colors.php

Indentation +304 added lines, -304 removed lines

@@ -1,355 +1,355 @@
 <?php
 
 if (file_exists("lib/floIcon.php")) {
-    require_once "lib/floIcon.php";
+	require_once "lib/floIcon.php";
 }
 
 function _resolve_htmlcolor($color) {
-    $htmlcolors = array(
-        "aliceblue" => "#f0f8ff",
-        "antiquewhite" => "#faebd7",
-        "aqua" => "#00ffff",
-        "aquamarine" => "#7fffd4",
-        "azure" => "#f0ffff",
-        "beige" => "#f5f5dc",
-        "bisque" => "#ffe4c4",
-        "black" => "#000000",
-        "blanchedalmond" => "#ffebcd",
-        "blue" => "#0000ff",
-        "blueviolet" => "#8a2be2",
-        "brown" => "#a52a2a",
-        "burlywood" => "#deb887",
-        "cadetblue" => "#5f9ea0",
-        "chartreuse" => "#7fff00",
-        "chocolate" => "#d2691e",
-        "coral" => "#ff7f50",
-        "cornflowerblue" => "#6495ed",
-        "cornsilk" => "#fff8dc",
-        "crimson" => "#dc143c",
-        "cyan" => "#00ffff",
-        "darkblue" => "#00008b",
-        "darkcyan" => "#008b8b",
-        "darkgoldenrod" => "#b8860b",
-        "darkgray" => "#a9a9a9",
-        "darkgrey" => "#a9a9a9",
-        "darkgreen" => "#006400",
-        "darkkhaki" => "#bdb76b",
-        "darkmagenta" => "#8b008b",
-        "darkolivegreen" => "#556b2f",
-        "darkorange" => "#ff8c00",
-        "darkorchid" => "#9932cc",
-        "darkred" => "#8b0000",
-        "darksalmon" => "#e9967a",
-        "darkseagreen" => "#8fbc8f",
-        "darkslateblue" => "#483d8b",
-        "darkslategray" => "#2f4f4f",
-        "darkslategrey" => "#2f4f4f",
-        "darkturquoise" => "#00ced1",
-        "darkviolet" => "#9400d3",
-        "deeppink" => "#ff1493",
-        "deepskyblue" => "#00bfff",
-        "dimgray" => "#696969",
-        "dimgrey" => "#696969",
-        "dodgerblue" => "#1e90ff",
-        "firebrick" => "#b22222",
-        "floralwhite" => "#fffaf0",
-        "forestgreen" => "#228b22",
-        "fuchsia" => "#ff00ff",
-        "gainsboro" => "#dcdcdc",
-        "ghostwhite" => "#f8f8ff",
-        "gold" => "#ffd700",
-        "goldenrod" => "#daa520",
-        "gray" => "#808080",
-        "grey" => "#808080",
-        "green" => "#008000",
-        "greenyellow" => "#adff2f",
-        "honeydew" => "#f0fff0",
-        "hotpink" => "#ff69b4",
-        "indianred " => "#cd5c5c",
-        "indigo " => "#4b0082",
-        "ivory" => "#fffff0",
-        "khaki" => "#f0e68c",
-        "lavender" => "#e6e6fa",
-        "lavenderblush" => "#fff0f5",
-        "lawngreen" => "#7cfc00",
-        "lemonchiffon" => "#fffacd",
-        "lightblue" => "#add8e6",
-        "lightcoral" => "#f08080",
-        "lightcyan" => "#e0ffff",
-        "lightgoldenrodyellow" => "#fafad2",
-        "lightgray" => "#d3d3d3",
-        "lightgrey" => "#d3d3d3",
-        "lightgreen" => "#90ee90",
-        "lightpink" => "#ffb6c1",
-        "lightsalmon" => "#ffa07a",
-        "lightseagreen" => "#20b2aa",
-        "lightskyblue" => "#87cefa",
-        "lightslategray" => "#778899",
-        "lightslategrey" => "#778899",
-        "lightsteelblue" => "#b0c4de",
-        "lightyellow" => "#ffffe0",
-        "lime" => "#00ff00",
-        "limegreen" => "#32cd32",
-        "linen" => "#faf0e6",
-        "magenta" => "#ff00ff",
-        "maroon" => "#800000",
-        "mediumaquamarine" => "#66cdaa",
-        "mediumblue" => "#0000cd",
-        "mediumorchid" => "#ba55d3",
-        "mediumpurple" => "#9370db",
-        "mediumseagreen" => "#3cb371",
-        "mediumslateblue" => "#7b68ee",
-        "mediumspringgreen" => "#00fa9a",
-        "mediumturquoise" => "#48d1cc",
-        "mediumvioletred" => "#c71585",
-        "midnightblue" => "#191970",
-        "mintcream" => "#f5fffa",
-        "mistyrose" => "#ffe4e1",
-        "moccasin" => "#ffe4b5",
-        "navajowhite" => "#ffdead",
-        "navy" => "#000080",
-        "oldlace" => "#fdf5e6",
-        "olive" => "#808000",
-        "olivedrab" => "#6b8e23",
-        "orange" => "#ffa500",
-        "orangered" => "#ff4500",
-        "orchid" => "#da70d6",
-        "palegoldenrod" => "#eee8aa",
-        "palegreen" => "#98fb98",
-        "paleturquoise" => "#afeeee",
-        "palevioletred" => "#db7093",
-        "papayawhip" => "#ffefd5",
-        "peachpuff" => "#ffdab9",
-        "peru" => "#cd853f",
-        "pink" => "#ffc0cb",
-        "plum" => "#dda0dd",
-        "powderblue" => "#b0e0e6",
-        "purple" => "#800080",
-        "red" => "#ff0000",
-        "rosybrown" => "#bc8f8f",
-        "royalblue" => "#4169e1",
-        "saddlebrown" => "#8b4513",
-        "salmon" => "#fa8072",
-        "sandybrown" => "#f4a460",
-        "seagreen" => "#2e8b57",
-        "seashell" => "#fff5ee",
-        "sienna" => "#a0522d",
-        "silver" => "#c0c0c0",
-        "skyblue" => "#87ceeb",
-        "slateblue" => "#6a5acd",
-        "slategray" => "#708090",
-        "slategrey" => "#708090",
-        "snow" => "#fffafa",
-        "springgreen" => "#00ff7f",
-        "steelblue" => "#4682b4",
-        "tan" => "#d2b48c",
-        "teal" => "#008080",
-        "thistle" => "#d8bfd8",
-        "tomato" => "#ff6347",
-        "turquoise" => "#40e0d0",
-        "violet" => "#ee82ee",
-        "wheat" => "#f5deb3",
-        "white" => "#ffffff",
-        "whitesmoke" => "#f5f5f5",
-        "yellow" => "#ffff00",
-        "yellowgreen" => "#9acd32"
-    );
-
-    $color = strtolower($color);
-
-    if (isset($htmlcolors[$color]))
-        return $htmlcolors[$color];
-    else
-        return $color;
+	$htmlcolors = array(
+		"aliceblue" => "#f0f8ff",
+		"antiquewhite" => "#faebd7",
+		"aqua" => "#00ffff",
+		"aquamarine" => "#7fffd4",
+		"azure" => "#f0ffff",
+		"beige" => "#f5f5dc",
+		"bisque" => "#ffe4c4",
+		"black" => "#000000",
+		"blanchedalmond" => "#ffebcd",
+		"blue" => "#0000ff",
+		"blueviolet" => "#8a2be2",
+		"brown" => "#a52a2a",
+		"burlywood" => "#deb887",
+		"cadetblue" => "#5f9ea0",
+		"chartreuse" => "#7fff00",
+		"chocolate" => "#d2691e",
+		"coral" => "#ff7f50",
+		"cornflowerblue" => "#6495ed",
+		"cornsilk" => "#fff8dc",
+		"crimson" => "#dc143c",
+		"cyan" => "#00ffff",
+		"darkblue" => "#00008b",
+		"darkcyan" => "#008b8b",
+		"darkgoldenrod" => "#b8860b",
+		"darkgray" => "#a9a9a9",
+		"darkgrey" => "#a9a9a9",
+		"darkgreen" => "#006400",
+		"darkkhaki" => "#bdb76b",
+		"darkmagenta" => "#8b008b",
+		"darkolivegreen" => "#556b2f",
+		"darkorange" => "#ff8c00",
+		"darkorchid" => "#9932cc",
+		"darkred" => "#8b0000",
+		"darksalmon" => "#e9967a",
+		"darkseagreen" => "#8fbc8f",
+		"darkslateblue" => "#483d8b",
+		"darkslategray" => "#2f4f4f",
+		"darkslategrey" => "#2f4f4f",
+		"darkturquoise" => "#00ced1",
+		"darkviolet" => "#9400d3",
+		"deeppink" => "#ff1493",
+		"deepskyblue" => "#00bfff",
+		"dimgray" => "#696969",
+		"dimgrey" => "#696969",
+		"dodgerblue" => "#1e90ff",
+		"firebrick" => "#b22222",
+		"floralwhite" => "#fffaf0",
+		"forestgreen" => "#228b22",
+		"fuchsia" => "#ff00ff",
+		"gainsboro" => "#dcdcdc",
+		"ghostwhite" => "#f8f8ff",
+		"gold" => "#ffd700",
+		"goldenrod" => "#daa520",
+		"gray" => "#808080",
+		"grey" => "#808080",
+		"green" => "#008000",
+		"greenyellow" => "#adff2f",
+		"honeydew" => "#f0fff0",
+		"hotpink" => "#ff69b4",
+		"indianred " => "#cd5c5c",
+		"indigo " => "#4b0082",
+		"ivory" => "#fffff0",
+		"khaki" => "#f0e68c",
+		"lavender" => "#e6e6fa",
+		"lavenderblush" => "#fff0f5",
+		"lawngreen" => "#7cfc00",
+		"lemonchiffon" => "#fffacd",
+		"lightblue" => "#add8e6",
+		"lightcoral" => "#f08080",
+		"lightcyan" => "#e0ffff",
+		"lightgoldenrodyellow" => "#fafad2",
+		"lightgray" => "#d3d3d3",
+		"lightgrey" => "#d3d3d3",
+		"lightgreen" => "#90ee90",
+		"lightpink" => "#ffb6c1",
+		"lightsalmon" => "#ffa07a",
+		"lightseagreen" => "#20b2aa",
+		"lightskyblue" => "#87cefa",
+		"lightslategray" => "#778899",
+		"lightslategrey" => "#778899",
+		"lightsteelblue" => "#b0c4de",
+		"lightyellow" => "#ffffe0",
+		"lime" => "#00ff00",
+		"limegreen" => "#32cd32",
+		"linen" => "#faf0e6",
+		"magenta" => "#ff00ff",
+		"maroon" => "#800000",
+		"mediumaquamarine" => "#66cdaa",
+		"mediumblue" => "#0000cd",
+		"mediumorchid" => "#ba55d3",
+		"mediumpurple" => "#9370db",
+		"mediumseagreen" => "#3cb371",
+		"mediumslateblue" => "#7b68ee",
+		"mediumspringgreen" => "#00fa9a",
+		"mediumturquoise" => "#48d1cc",
+		"mediumvioletred" => "#c71585",
+		"midnightblue" => "#191970",
+		"mintcream" => "#f5fffa",
+		"mistyrose" => "#ffe4e1",
+		"moccasin" => "#ffe4b5",
+		"navajowhite" => "#ffdead",
+		"navy" => "#000080",
+		"oldlace" => "#fdf5e6",
+		"olive" => "#808000",
+		"olivedrab" => "#6b8e23",
+		"orange" => "#ffa500",
+		"orangered" => "#ff4500",
+		"orchid" => "#da70d6",
+		"palegoldenrod" => "#eee8aa",
+		"palegreen" => "#98fb98",
+		"paleturquoise" => "#afeeee",
+		"palevioletred" => "#db7093",
+		"papayawhip" => "#ffefd5",
+		"peachpuff" => "#ffdab9",
+		"peru" => "#cd853f",
+		"pink" => "#ffc0cb",
+		"plum" => "#dda0dd",
+		"powderblue" => "#b0e0e6",
+		"purple" => "#800080",
+		"red" => "#ff0000",
+		"rosybrown" => "#bc8f8f",
+		"royalblue" => "#4169e1",
+		"saddlebrown" => "#8b4513",
+		"salmon" => "#fa8072",
+		"sandybrown" => "#f4a460",
+		"seagreen" => "#2e8b57",
+		"seashell" => "#fff5ee",
+		"sienna" => "#a0522d",
+		"silver" => "#c0c0c0",
+		"skyblue" => "#87ceeb",
+		"slateblue" => "#6a5acd",
+		"slategray" => "#708090",
+		"slategrey" => "#708090",
+		"snow" => "#fffafa",
+		"springgreen" => "#00ff7f",
+		"steelblue" => "#4682b4",
+		"tan" => "#d2b48c",
+		"teal" => "#008080",
+		"thistle" => "#d8bfd8",
+		"tomato" => "#ff6347",
+		"turquoise" => "#40e0d0",
+		"violet" => "#ee82ee",
+		"wheat" => "#f5deb3",
+		"white" => "#ffffff",
+		"whitesmoke" => "#f5f5f5",
+		"yellow" => "#ffff00",
+		"yellowgreen" => "#9acd32"
+	);
+
+	$color = strtolower($color);
+
+	if (isset($htmlcolors[$color]))
+		return $htmlcolors[$color];
+	else
+		return $color;
 }
 
 ### RGB >> HSL
 function _color_rgb2hsl($rgb) {
-    $r = $rgb[0]; $g = $rgb[1]; $b = $rgb[2];
-    $min = min($r, min($g, $b)); $max = max($r, max($g, $b));
-    $delta = $max - $min; $l = ($min + $max) / 2; $s = 0;
-    if ($l > 0 && $l < 1) {
-        $s = $delta / ($l < 0.5 ? (2 * $l) : (2 - 2 * $l));
-    }
-    $h = 0;
-    if ($delta > 0) {
-        if ($max == $r && $max != $g) $h += ($g - $b) / $delta;
-        if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta);
-        if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta);
-        $h /= 6;
-    } return array($h, $s, $l);
+	$r = $rgb[0]; $g = $rgb[1]; $b = $rgb[2];
+	$min = min($r, min($g, $b)); $max = max($r, max($g, $b));
+	$delta = $max - $min; $l = ($min + $max) / 2; $s = 0;
+	if ($l > 0 && $l < 1) {
+		$s = $delta / ($l < 0.5 ? (2 * $l) : (2 - 2 * $l));
+	}
+	$h = 0;
+	if ($delta > 0) {
+		if ($max == $r && $max != $g) $h += ($g - $b) / $delta;
+		if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta);
+		if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta);
+		$h /= 6;
+	} return array($h, $s, $l);
 }
 
 ### HSL >> RGB
 function _color_hsl2rgb($hsl) {
-    $h = $hsl[0]; $s = $hsl[1]; $l = $hsl[2];
-    $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
-    $m1 = $l * 2 - $m2;
-    return array(_color_hue2rgb($m1, $m2, $h + 0.33333),
-        _color_hue2rgb($m1, $m2, $h),
-        _color_hue2rgb($m1, $m2, $h - 0.33333));
+	$h = $hsl[0]; $s = $hsl[1]; $l = $hsl[2];
+	$m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
+	$m1 = $l * 2 - $m2;
+	return array(_color_hue2rgb($m1, $m2, $h + 0.33333),
+		_color_hue2rgb($m1, $m2, $h),
+		_color_hue2rgb($m1, $m2, $h - 0.33333));
 }
 
 ### Helper function for _color_hsl2rgb().
 function _color_hue2rgb($m1, $m2, $h) {
-    $h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
-    if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
-    if ($h * 2 < 1) return $m2;
-    if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
-    return $m1;
+	$h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
+	if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
+	if ($h * 2 < 1) return $m2;
+	if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+	return $m1;
 }
 
 ### Convert a hex color into an RGB triplet.
 function _color_unpack($hex, $normalize = false) {
 
-    if (strpos($hex, '#') !== 0)
-        $hex = _resolve_htmlcolor($hex);
-    else
-        $hex = substr($hex, 1);
-
-    if (strlen($hex) == 4) {
-        $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
-    }
-    $c = hexdec($hex);
-    for ($i = 16; $i >= 0; $i -= 8) {
-        $out[] = (($c >> $i) & 0xFF) / ($normalize ? 255 : 1);
-    } return $out;
+	if (strpos($hex, '#') !== 0)
+		$hex = _resolve_htmlcolor($hex);
+	else
+		$hex = substr($hex, 1);
+
+	if (strlen($hex) == 4) {
+		$hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
+	}
+	$c = hexdec($hex);
+	for ($i = 16; $i >= 0; $i -= 8) {
+		$out[] = (($c >> $i) & 0xFF) / ($normalize ? 255 : 1);
+	} return $out;
 }
 
 ### Convert an RGB triplet to a hex color.
 function _color_pack($rgb, $normalize = false) {
-    foreach ($rgb as $k => $v) {
-        $out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8));
-    }return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
+	foreach ($rgb as $k => $v) {
+		$out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8));
+	}return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
 }
 
 function rgb2hsl($arr) {
-    $r = $arr[0];
-    $g = $arr[1];
-    $b = $arr[2];
+	$r = $arr[0];
+	$g = $arr[1];
+	$b = $arr[2];
 
-    $var_R = ($r / 255);
-    $var_G = ($g / 255);
-    $var_B = ($b / 255);
+	$var_R = ($r / 255);
+	$var_G = ($g / 255);
+	$var_B = ($b / 255);
 
-    $var_Min = min($var_R, $var_G, $var_B);
-    $var_Max = max($var_R, $var_G, $var_B);
-    $del_Max = $var_Max - $var_Min;
+	$var_Min = min($var_R, $var_G, $var_B);
+	$var_Max = max($var_R, $var_G, $var_B);
+	$del_Max = $var_Max - $var_Min;
 
-    $v = $var_Max;
+	$v = $var_Max;
 
-    if ($del_Max == 0) {
-        $h = 0;
-        $s = 0;
-    } else {
-        $s = $del_Max / $var_Max;
+	if ($del_Max == 0) {
+		$h = 0;
+		$s = 0;
+	} else {
+		$s = $del_Max / $var_Max;
 
-        $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-        $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-        $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+		$del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+		$del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+		$del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
 
-        if      ($var_R == $var_Max) $h = $del_B - $del_G;
-        else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
-        else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
+		if      ($var_R == $var_Max) $h = $del_B - $del_G;
+		else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
+		else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
 
-        if ($h < 0) $h++;
-        if ($h > 1) $h--;
-    }
+		if ($h < 0) $h++;
+		if ($h > 1) $h--;
+	}
 
-    return array($h, $s, $v);
+	return array($h, $s, $v);
 }
 
 function hsl2rgb($arr) {
-    $h = $arr[0];
-    $s = $arr[1];
-    $v = $arr[2];
-
-    if($s == 0) {
-        $r = $g = $B = $v * 255;
-    } else {
-        $var_H = $h * 6;
-        $var_i = floor($var_H );
-        $var_1 = $v * (1 - $s );
-        $var_2 = $v * (1 - $s * ($var_H - $var_i ) );
-        $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
-
-        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
-        else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
-        else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
-        else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
-        else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
-        else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
-
-        $r = $var_R * 255;
-        $g = $var_G * 255;
-        $B = $var_B * 255;
-    }
-    return array($r, $g, $B);
+	$h = $arr[0];
+	$s = $arr[1];
+	$v = $arr[2];
+
+	if($s == 0) {
+		$r = $g = $B = $v * 255;
+	} else {
+		$var_H = $h * 6;
+		$var_i = floor($var_H );
+		$var_1 = $v * (1 - $s );
+		$var_2 = $v * (1 - $s * ($var_H - $var_i ) );
+		$var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
+
+		if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
+		else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
+		else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
+		else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
+		else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
+		else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+
+		$r = $var_R * 255;
+		$g = $var_G * 255;
+		$B = $var_B * 255;
+	}
+	return array($r, $g, $B);
 }
 
 function colorPalette($imageFile, $numColors, $granularity = 5) {
-    $granularity = max(1, abs((int)$granularity));
-    $colors = array();
-
-    $size = @getimagesize($imageFile);
-
-    // to enable .ico support place floIcon.php into lib/
-    if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
-
-        if (class_exists("floIcon")) {
-
-            $ico = new floIcon();
-            @$ico->readICO($imageFile);
-
-            if(count($ico->images)==0)
-                return false;
-            else
-                $img = @$ico->images[count($ico->images)-1]->getImageResource();
-
-        } else {
-            return false;
-        }
-
-    } else if ($size[0] > 0 && $size[1] > 0) {
-        $img = @imagecreatefromstring(file_get_contents($imageFile));
-    }
-
-    if (!$img) return false;
-
-    for($x = 0; $x < $size[0]; $x += $granularity) {
-        for($y = 0; $y < $size[1]; $y += $granularity) {
-            $thisColor = imagecolorat($img, $x, $y);
-            $rgb = imagecolorsforindex($img, $thisColor);
-            $red = round(round(($rgb['red'] / 0x33)) * 0x33);
-            $green = round(round(($rgb['green'] / 0x33)) * 0x33);
-            $blue = round(round(($rgb['blue'] / 0x33)) * 0x33);
-            $thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue);
-            if(array_key_exists($thisRGB, $colors)) {
-                $colors[$thisRGB]++;
-            } else{
-                $colors[$thisRGB] = 1;
-            }
-        }
-    }
-
-    arsort($colors);
-    return array_slice(array_keys($colors), 0, $numColors);
+	$granularity = max(1, abs((int)$granularity));
+	$colors = array();
+
+	$size = @getimagesize($imageFile);
+
+	// to enable .ico support place floIcon.php into lib/
+	if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') {
+
+		if (class_exists("floIcon")) {
+
+			$ico = new floIcon();
+			@$ico->readICO($imageFile);
+
+			if(count($ico->images)==0)
+				return false;
+			else
+				$img = @$ico->images[count($ico->images)-1]->getImageResource();
+
+		} else {
+			return false;
+		}
+
+	} else if ($size[0] > 0 && $size[1] > 0) {
+		$img = @imagecreatefromstring(file_get_contents($imageFile));
+	}
+
+	if (!$img) return false;
+
+	for($x = 0; $x < $size[0]; $x += $granularity) {
+		for($y = 0; $y < $size[1]; $y += $granularity) {
+			$thisColor = imagecolorat($img, $x, $y);
+			$rgb = imagecolorsforindex($img, $thisColor);
+			$red = round(round(($rgb['red'] / 0x33)) * 0x33);
+			$green = round(round(($rgb['green'] / 0x33)) * 0x33);
+			$blue = round(round(($rgb['blue'] / 0x33)) * 0x33);
+			$thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue);
+			if(array_key_exists($thisRGB, $colors)) {
+				$colors[$thisRGB]++;
+			} else{
+				$colors[$thisRGB] = 1;
+			}
+		}
+	}
+
+	arsort($colors);
+	return array_slice(array_keys($colors), 0, $numColors);
 }
 
 function calculate_avg_color($iconFile) {
-    $palette = colorPalette($iconFile, 4, 4);
+	$palette = colorPalette($iconFile, 4, 4);
 
-    if (is_array($palette)) {
-        foreach ($palette as $p) {
-            $hsl = rgb2hsl(_color_unpack("#$p"));
+	if (is_array($palette)) {
+		foreach ($palette as $p) {
+			$hsl = rgb2hsl(_color_unpack("#$p"));
 
-            if ($hsl[1] > 0.25 && $hsl[2] > 0.25 &&
-                !($hsl[0] >= 0 && $hsl[0] < 0.01 && $hsl[1] < 0.01) &&
-                !($hsl[0] >= 0 && $hsl[0] < 0.01 && $hsl[2] > 0.99)) {
+			if ($hsl[1] > 0.25 && $hsl[2] > 0.25 &&
+				!($hsl[0] >= 0 && $hsl[0] < 0.01 && $hsl[1] < 0.01) &&
+				!($hsl[0] >= 0 && $hsl[0] < 0.01 && $hsl[2] > 0.99)) {
 
-                return _color_pack(hsl2rgb($hsl));
-            }
-        }
-    }
-    return '';
+				return _color_pack(hsl2rgb($hsl));
+			}
+		}
+	}
+	return '';
 }

Spacing +28 added lines, -28 removed lines

@@ -183,7 +183,7 @@ 
 ### HSL >> RGB
 function _color_hsl2rgb($hsl) {
     $h = $hsl[0]; $s = $hsl[1]; $l = $hsl[2];
-    $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
+    $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l * $s;
     $m1 = $l * 2 - $m2;
     return array(_color_hue2rgb($m1, $m2, $h + 0.33333),
         _color_hue2rgb($m1, $m2, $h),
@@ -208,7 +208,7 @@ 
         $hex = substr($hex, 1);
 
     if (strlen($hex) == 4) {
-        $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
+        $hex = $hex[1].$hex[1].$hex[2].$hex[2].$hex[3].$hex[3];
     }
     $c = hexdec($hex);
     for ($i = 16; $i >= 0; $i -= 8) {
@@ -220,7 +220,7 @@ 
 function _color_pack($rgb, $normalize = false) {
     foreach ($rgb as $k => $v) {
         $out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8));
-    }return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
+    }return '#'.str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
 }
 
 function rgb2hsl($arr) {
@@ -244,13 +244,13 @@ 
     } else {
         $s = $del_Max / $var_Max;
 
-        $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-        $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-        $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+        $del_R = ((($var_Max - $var_R) / 6) + ($del_Max / 2)) / $del_Max;
+        $del_G = ((($var_Max - $var_G) / 6) + ($del_Max / 2)) / $del_Max;
+        $del_B = ((($var_Max - $var_B) / 6) + ($del_Max / 2)) / $del_Max;
 
-        if      ($var_R == $var_Max) $h = $del_B - $del_G;
-        else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
-        else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
+        if ($var_R == $var_Max) $h = $del_B - $del_G;
+        else if ($var_G == $var_Max) $h = (1 / 3) + $del_R - $del_B;
+        else if ($var_B == $var_Max) $h = (2 / 3) + $del_G - $del_R;
 
         if ($h < 0) $h++;
         if ($h > 1) $h--;
@@ -264,21 +264,21 @@ 
     $s = $arr[1];
     $v = $arr[2];
 
-    if($s == 0) {
+    if ($s == 0) {
         $r = $g = $B = $v * 255;
     } else {
         $var_H = $h * 6;
-        $var_i = floor($var_H );
-        $var_1 = $v * (1 - $s );
-        $var_2 = $v * (1 - $s * ($var_H - $var_i ) );
-        $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
-
-        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
-        else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
-        else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
-        else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
-        else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
-        else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+        $var_i = floor($var_H);
+        $var_1 = $v * (1 - $s);
+        $var_2 = $v * (1 - $s * ($var_H - $var_i));
+        $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i)));
+
+        if ($var_i == 0) { $var_R = $v; $var_G = $var_3; $var_B = $var_1; }
+        else if ($var_i == 1) { $var_R = $var_2; $var_G = $v; $var_B = $var_1; }
+        else if ($var_i == 2) { $var_R = $var_1; $var_G = $v; $var_B = $var_3; }
+        else if ($var_i == 3) { $var_R = $var_1; $var_G = $var_2; $var_B = $v; }
+        else if ($var_i == 4) { $var_R = $var_3; $var_G = $var_1; $var_B = $v; }
+        else { $var_R = $v; $var_G = $var_1; $var_B = $var_2; }
 
         $r = $var_R * 255;
         $g = $var_G * 255;
@@ -288,7 +288,7 @@ 
 }
 
 function colorPalette($imageFile, $numColors, $granularity = 5) {
-    $granularity = max(1, abs((int)$granularity));
+    $granularity = max(1, abs((int) $granularity));
     $colors = array();
 
     $size = @getimagesize($imageFile);
@@ -301,10 +301,10 @@ 
             $ico = new floIcon();
             @$ico->readICO($imageFile);
 
-            if(count($ico->images)==0)
+            if (count($ico->images) == 0)
                 return false;
             else
-                $img = @$ico->images[count($ico->images)-1]->getImageResource();
+                $img = @$ico->images[count($ico->images) - 1]->getImageResource();
 
         } else {
             return false;
@@ -316,17 +316,17 @@ 
 
     if (!$img) return false;
 
-    for($x = 0; $x < $size[0]; $x += $granularity) {
-        for($y = 0; $y < $size[1]; $y += $granularity) {
+    for ($x = 0; $x < $size[0]; $x += $granularity) {
+        for ($y = 0; $y < $size[1]; $y += $granularity) {
             $thisColor = imagecolorat($img, $x, $y);
             $rgb = imagecolorsforindex($img, $thisColor);
             $red = round(round(($rgb['red'] / 0x33)) * 0x33);
             $green = round(round(($rgb['green'] / 0x33)) * 0x33);
             $blue = round(round(($rgb['blue'] / 0x33)) * 0x33);
             $thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue);
-            if(array_key_exists($thisRGB, $colors)) {
+            if (array_key_exists($thisRGB, $colors)) {
                 $colors[$thisRGB]++;
-            } else{
+            } else {
                 $colors[$thisRGB] = 1;
             }
         }

Braces +51 added lines, -31 removed lines

@@ -157,11 +157,12 @@ 
 
     $color = strtolower($color);
 
-    if (isset($htmlcolors[$color]))
-        return $htmlcolors[$color];
-    else
-        return $color;
-}
+    if (isset($htmlcolors[$color])) {
+            return $htmlcolors[$color];
+    } else {
+            return $color;
+    }
+    }
 
 ### RGB >> HSL
 function _color_rgb2hsl($rgb) {
@@ -173,9 +174,15 @@ 
     }
     $h = 0;
     if ($delta > 0) {
-        if ($max == $r && $max != $g) $h += ($g - $b) / $delta;
-        if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta);
-        if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta);
+        if ($max == $r && $max != $g) {
+        	$h += ($g - $b) / $delta;
+        }
+        if ($max == $g && $max != $b) {
+        	$h += (2 + ($b - $r) / $delta);
+        }
+        if ($max == $b && $max != $r) {
+        	$h += (4 + ($r - $g) / $delta);
+        }
         $h /= 6;
     } return array($h, $s, $l);
 }
@@ -193,19 +200,26 @@ 
 ### Helper function for _color_hsl2rgb().
 function _color_hue2rgb($m1, $m2, $h) {
     $h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
-    if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
-    if ($h * 2 < 1) return $m2;
-    if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+    if ($h * 6 < 1) {
+    	return $m1 + ($m2 - $m1) * $h * 6;
+    }
+    if ($h * 2 < 1) {
+    	return $m2;
+    }
+    if ($h * 3 < 2) {
+    	return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+    }
     return $m1;
 }
 
 ### Convert a hex color into an RGB triplet.
 function _color_unpack($hex, $normalize = false) {
 
-    if (strpos($hex, '#') !== 0)
-        $hex = _resolve_htmlcolor($hex);
-    else
-        $hex = substr($hex, 1);
+    if (strpos($hex, '#') !== 0) {
+            $hex = _resolve_htmlcolor($hex);
+    } else {
+            $hex = substr($hex, 1);
+    }
 
     if (strlen($hex) == 4) {
         $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
@@ -248,12 +262,20 @@ 
         $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
         $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
 
-        if      ($var_R == $var_Max) $h = $del_B - $del_G;
-        else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
-        else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
+        if      ($var_R == $var_Max) {
+        	$h = $del_B - $del_G;
+        } else if ($var_G == $var_Max) {
+        	$h = (1 / 3 ) + $del_R - $del_B;
+        } else if ($var_B == $var_Max) {
+        	$h = (2 / 3 ) + $del_G - $del_R;
+        }
 
-        if ($h < 0) $h++;
-        if ($h > 1) $h--;
+        if ($h < 0) {
+        	$h++;
+        }
+        if ($h > 1) {
+        	$h--;
+        }
     }
 
     return array($h, $s, $v);
@@ -273,12 +295,7 @@ 
         $var_2 = $v * (1 - $s * ($var_H - $var_i ) );
         $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
 
-        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
-        else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
-        else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
-        else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
-        else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
-        else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; } else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; } else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; } else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; } else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; } else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
 
         $r = $var_R * 255;
         $g = $var_G * 255;
@@ -301,10 +318,11 @@ 
             $ico = new floIcon();
             @$ico->readICO($imageFile);
 
-            if(count($ico->images)==0)
-                return false;
-            else
-                $img = @$ico->images[count($ico->images)-1]->getImageResource();
+            if(count($ico->images)==0) {
+                            return false;
+            } else {
+                            $img = @$ico->images[count($ico->images)-1]->getImageResource();
+            }
 
         } else {
             return false;
@@ -314,7 +332,9 @@ 
         $img = @imagecreatefromstring(file_get_contents($imageFile));
     }
 
-    if (!$img) return false;
+    if (!$img) {
+    	return false;
+    }
 
     for($x = 0; $x < $size[0]; $x += $granularity) {
         for($y = 0; $y < $size[1]; $y += $granularity) {

include/db-prefs.php

Indentation +2 added lines, -2 removed lines

@@ -3,9 +3,9 @@
 require_once "db.php";
 
 function get_pref($pref_name, $user_id = false, $die_on_error = false) {
-    return Db_Prefs::get()->read($pref_name, $user_id, $die_on_error);
+	return Db_Prefs::get()->read($pref_name, $user_id, $die_on_error);
 }
 
 function set_pref($pref_name, $value, $user_id = false, $strip_tags = true) {
-    return Db_Prefs::get()->write($pref_name, $value, $user_id, $strip_tags);
+	return Db_Prefs::get()->write($pref_name, $value, $user_id, $strip_tags);
 }

include/sanity_check.php

Indentation +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 			}
 
 			if (SINGLE_USER_MODE && class_exists("PDO")) {
-			    $pdo = DB::pdo();
+				$pdo = DB::pdo();
 
 				$res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");
 

include/functions.php

Indentation +1180 added lines, -1180 removed lines

@@ -22,9 +22,9 @@ 
 
 date_default_timezone_set('UTC');
 if (defined('E_DEPRECATED')) {
-    error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+	error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 } else {
-    error_reporting(E_ALL & ~E_NOTICE);
+	error_reporting(E_ALL & ~E_NOTICE);
 }
 
 ini_set('display_errors', 0);
@@ -36,7 +36,7 @@ 
  * Define a constant if not already defined
  */
 function define_default($name, $value) {
-    defined($name) or define($name, $value);
+	defined($name) or define($name, $value);
 }
 
 /* Some tunables you can override in config.php using define():	*/
@@ -75,9 +75,9 @@ 
 /* tunables end here */
 
 if (DB_TYPE == "pgsql") {
-    define('SUBSTRING_FOR_DATE', 'SUBSTRING_FOR_DATE');
+	define('SUBSTRING_FOR_DATE', 'SUBSTRING_FOR_DATE');
 } else {
-    define('SUBSTRING_FOR_DATE', 'SUBSTRING');
+	define('SUBSTRING_FOR_DATE', 'SUBSTRING');
 }
 
 /**
@@ -87,38 +87,38 @@ 
  * @return array A array of available translations.
  */
 function get_translations() {
-    $tr = array(
-        "auto"  => __("Detect automatically"),
-        "ar_SA" => "العربيّة (Arabic)",
-        "bg_BG" => "Bulgarian",
-        "da_DA" => "Dansk",
-        "ca_CA" => "Català",
-        "cs_CZ" => "Česky",
-        "en_US" => "English",
-        "el_GR" => "Ελληνικά",
-        "es_ES" => "Español (España)",
-        "es_LA" => "Español",
-        "de_DE" => "Deutsch",
-        "fr_FR" => "Français",
-        "hu_HU" => "Magyar (Hungarian)",
-        "it_IT" => "Italiano",
-        "ja_JP" => "日本語 (Japanese)",
-        "lv_LV" => "Latviešu",
-        "nb_NO" => "Norwegian bokmål",
-        "nl_NL" => "Dutch",
-        "pl_PL" => "Polski",
-        "ru_RU" => "Русский",
-        "pt_BR" => "Portuguese/Brazil",
-        "pt_PT" => "Portuguese/Portugal",
-        "zh_CN" => "Simplified Chinese",
-        "zh_TW" => "Traditional Chinese",
-        "uk_UA" => "Українська",
-        "sv_SE" => "Svenska",
-        "fi_FI" => "Suomi",
-        "tr_TR" => "Türkçe"
-    );
-
-    return $tr;
+	$tr = array(
+		"auto"  => __("Detect automatically"),
+		"ar_SA" => "العربيّة (Arabic)",
+		"bg_BG" => "Bulgarian",
+		"da_DA" => "Dansk",
+		"ca_CA" => "Català",
+		"cs_CZ" => "Česky",
+		"en_US" => "English",
+		"el_GR" => "Ελληνικά",
+		"es_ES" => "Español (España)",
+		"es_LA" => "Español",
+		"de_DE" => "Deutsch",
+		"fr_FR" => "Français",
+		"hu_HU" => "Magyar (Hungarian)",
+		"it_IT" => "Italiano",
+		"ja_JP" => "日本語 (Japanese)",
+		"lv_LV" => "Latviešu",
+		"nb_NO" => "Norwegian bokmål",
+		"nl_NL" => "Dutch",
+		"pl_PL" => "Polski",
+		"ru_RU" => "Русский",
+		"pt_BR" => "Portuguese/Brazil",
+		"pt_PT" => "Portuguese/Portugal",
+		"zh_CN" => "Simplified Chinese",
+		"zh_TW" => "Traditional Chinese",
+		"uk_UA" => "Українська",
+		"sv_SE" => "Svenska",
+		"fi_FI" => "Suomi",
+		"tr_TR" => "Türkçe"
+	);
+
+	return $tr;
 }
 
 require_once "lib/accept-to-gettext.php";
@@ -126,32 +126,32 @@ 
 
 function startup_gettext() {
 
-    # Get locale from Accept-Language header
-    $lang = al2gt(array_keys(get_translations()), "text/html");
+	# Get locale from Accept-Language header
+	$lang = al2gt(array_keys(get_translations()), "text/html");
 
-    if (defined('_TRANSLATION_OVERRIDE_DEFAULT')) {
-        $lang = _TRANSLATION_OVERRIDE_DEFAULT;
-    }
+	if (defined('_TRANSLATION_OVERRIDE_DEFAULT')) {
+		$lang = _TRANSLATION_OVERRIDE_DEFAULT;
+	}
 
-    if ($_SESSION["uid"] && get_schema_version() >= 120) {
-        $pref_lang = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
+	if ($_SESSION["uid"] && get_schema_version() >= 120) {
+		$pref_lang = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
 
-        if ($pref_lang && $pref_lang != 'auto') {
-            $lang = $pref_lang;
-        }
-    }
+		if ($pref_lang && $pref_lang != 'auto') {
+			$lang = $pref_lang;
+		}
+	}
 
-    if ($lang) {
-        if (defined('LC_MESSAGES')) {
-            _setlocale(LC_MESSAGES, $lang);
-        } else if (defined('LC_ALL')) {
-            _setlocale(LC_ALL, $lang);
-        }
+	if ($lang) {
+		if (defined('LC_MESSAGES')) {
+			_setlocale(LC_MESSAGES, $lang);
+		} else if (defined('LC_ALL')) {
+			_setlocale(LC_ALL, $lang);
+		}
 
-        _bindtextdomain("messages", "locale");
-        _textdomain("messages");
-        _bind_textdomain_codeset("messages", "UTF-8");
-    }
+		_bindtextdomain("messages", "locale");
+		_textdomain("messages");
+		_bind_textdomain_codeset("messages", "UTF-8");
+	}
 }
 
 require_once 'db-prefs.php';
@@ -164,13 +164,13 @@ 
 
 // TODO: compat wrapper, remove at some point
 function _debug($msg) {
-    Debug::log($msg);
+	Debug::log($msg);
 }
 
 function reset_fetch_domain_quota() {
-    global $fetch_domain_hits;
+	global $fetch_domain_hits;
 
-    $fetch_domain_hits = [];
+	$fetch_domain_hits = [];
 }
 
 // TODO: max_size currently only works for CURL transfers
@@ -178,467 +178,467 @@ 
 function fetch_file_contents($options /* previously: 0: $url , 1: $type = false, 2: $login = false, 3: $pass = false,
             4: $post_query = false, 5: $timeout = false, 6: $timestamp = 0, 7: $useragent = false*/) {
 
-    global $fetch_last_error;
-    global $fetch_last_error_code;
-    global $fetch_last_error_content;
-    global $fetch_last_content_type;
-    global $fetch_last_modified;
-    global $fetch_effective_url;
-    global $fetch_curl_used;
-    global $fetch_domain_hits;
-
-    $fetch_last_error = false;
-    $fetch_last_error_code = -1;
-    $fetch_last_error_content = "";
-    $fetch_last_content_type = "";
-    $fetch_curl_used = false;
-    $fetch_last_modified = "";
-    $fetch_effective_url = "";
-
-    if (!is_array($fetch_domain_hits))
-        $fetch_domain_hits = [];
-
-    if (!is_array($options)) {
-
-        // falling back on compatibility shim
-        $option_names = [ "url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent" ];
-        $tmp = [];
-
-        for ($i = 0; $i < func_num_args(); $i++) {
-            $tmp[$option_names[$i]] = func_get_arg($i);
-        }
+	global $fetch_last_error;
+	global $fetch_last_error_code;
+	global $fetch_last_error_content;
+	global $fetch_last_content_type;
+	global $fetch_last_modified;
+	global $fetch_effective_url;
+	global $fetch_curl_used;
+	global $fetch_domain_hits;
+
+	$fetch_last_error = false;
+	$fetch_last_error_code = -1;
+	$fetch_last_error_content = "";
+	$fetch_last_content_type = "";
+	$fetch_curl_used = false;
+	$fetch_last_modified = "";
+	$fetch_effective_url = "";
+
+	if (!is_array($fetch_domain_hits))
+		$fetch_domain_hits = [];
+
+	if (!is_array($options)) {
 
-        $options = $tmp;
-    }
+		// falling back on compatibility shim
+		$option_names = [ "url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent" ];
+		$tmp = [];
 
-    $url = $options["url"];
-    $type = isset($options["type"]) ? $options["type"] : false;
-    $login = isset($options["login"]) ? $options["login"] : false;
-    $pass = isset($options["pass"]) ? $options["pass"] : false;
-    $post_query = isset($options["post_query"]) ? $options["post_query"] : false;
-    $timeout = isset($options["timeout"]) ? $options["timeout"] : false;
-    $last_modified = isset($options["last_modified"]) ? $options["last_modified"] : "";
-    $useragent = isset($options["useragent"]) ? $options["useragent"] : false;
-    $followlocation = isset($options["followlocation"]) ? $options["followlocation"] : true;
-    $max_size = isset($options["max_size"]) ? $options["max_size"] : MAX_DOWNLOAD_FILE_SIZE; // in bytes
-    $http_accept = isset($options["http_accept"]) ? $options["http_accept"] : false;
-    $http_referrer = isset($options["http_referrer"]) ? $options["http_referrer"] : false;
+		for ($i = 0; $i < func_num_args(); $i++) {
+			$tmp[$option_names[$i]] = func_get_arg($i);
+		}
 
-    $url = ltrim($url, ' ');
-    $url = str_replace(' ', '%20', $url);
+		$options = $tmp;
+	}
 
-    if (strpos($url, "//") === 0)
-        $url = 'http:' . $url;
+	$url = $options["url"];
+	$type = isset($options["type"]) ? $options["type"] : false;
+	$login = isset($options["login"]) ? $options["login"] : false;
+	$pass = isset($options["pass"]) ? $options["pass"] : false;
+	$post_query = isset($options["post_query"]) ? $options["post_query"] : false;
+	$timeout = isset($options["timeout"]) ? $options["timeout"] : false;
+	$last_modified = isset($options["last_modified"]) ? $options["last_modified"] : "";
+	$useragent = isset($options["useragent"]) ? $options["useragent"] : false;
+	$followlocation = isset($options["followlocation"]) ? $options["followlocation"] : true;
+	$max_size = isset($options["max_size"]) ? $options["max_size"] : MAX_DOWNLOAD_FILE_SIZE; // in bytes
+	$http_accept = isset($options["http_accept"]) ? $options["http_accept"] : false;
+	$http_referrer = isset($options["http_referrer"]) ? $options["http_referrer"] : false;
+
+	$url = ltrim($url, ' ');
+	$url = str_replace(' ', '%20', $url);
+
+	if (strpos($url, "//") === 0)
+		$url = 'http:' . $url;
+
+	$url_host = parse_url($url, PHP_URL_HOST);
+	$fetch_domain_hits[$url_host] += 1;
 
-    $url_host = parse_url($url, PHP_URL_HOST);
-    $fetch_domain_hits[$url_host] += 1;
+	if ($fetch_domain_hits[$url_host] > MAX_FETCH_REQUESTS_PER_HOST) {
+		user_error("Exceeded fetch request quota for $url_host: " . $fetch_domain_hits[$url_host], E_USER_WARNING);
+		#return false;
+	}
 
-    if ($fetch_domain_hits[$url_host] > MAX_FETCH_REQUESTS_PER_HOST) {
-        user_error("Exceeded fetch request quota for $url_host: " . $fetch_domain_hits[$url_host], E_USER_WARNING);
-        #return false;
-    }
+	if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) {
 
-    if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) {
+		$fetch_curl_used = true;
 
-        $fetch_curl_used = true;
+		$ch = curl_init($url);
 
-        $ch = curl_init($url);
+		$curl_http_headers = [];
 
-        $curl_http_headers = [];
+		if ($last_modified && !$post_query)
+			array_push($curl_http_headers, "If-Modified-Since: $last_modified");
+
+		if ($http_accept)
+			array_push($curl_http_headers, "Accept: " . $http_accept);
 
-        if ($last_modified && !$post_query)
-            array_push($curl_http_headers, "If-Modified-Since: $last_modified");
+		if (count($curl_http_headers) > 0)
+			curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
 
-        if ($http_accept)
-            array_push($curl_http_headers, "Accept: " . $http_accept);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
+		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir") && $followlocation);
+		curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
+		curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_HEADER, true);
+		curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+		curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent :
+			SELF_USER_AGENT);
+		curl_setopt($ch, CURLOPT_ENCODING, "");
 
-        if (count($curl_http_headers) > 0)
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
+		if  ($http_referrer)
+			curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
 
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
-        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir") && $followlocation);
-        curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
-        curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_HEADER, true);
-        curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-        curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent :
-            SELF_USER_AGENT);
-        curl_setopt($ch, CURLOPT_ENCODING, "");
+		if ($max_size) {
+			curl_setopt($ch, CURLOPT_NOPROGRESS, false);
+			curl_setopt($ch, CURLOPT_BUFFERSIZE, 16384); // needed to get 5 arguments in progress function?
 
-        if  ($http_referrer)
-            curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
+			// holy shit closures in php
+			// download & upload are *expected* sizes respectively, could be zero
+			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use( &$max_size) {
+				Debug::log("[curl progressfunction] $downloaded $max_size", Debug::$LOG_EXTENDED);
 
-        if ($max_size) {
-            curl_setopt($ch, CURLOPT_NOPROGRESS, false);
-            curl_setopt($ch, CURLOPT_BUFFERSIZE, 16384); // needed to get 5 arguments in progress function?
+				return ($downloaded > $max_size) ? 1 : 0; // if max size is set, abort when exceeding it
+			});
 
-            // holy shit closures in php
-            // download & upload are *expected* sizes respectively, could be zero
-            curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use( &$max_size) {
-                Debug::log("[curl progressfunction] $downloaded $max_size", Debug::$LOG_EXTENDED);
+		}
 
-                return ($downloaded > $max_size) ? 1 : 0; // if max size is set, abort when exceeding it
-            });
+		if (!ini_get("open_basedir")) {
+			curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null");
+		}
 
-        }
+		if (defined('_HTTP_PROXY')) {
+			curl_setopt($ch, CURLOPT_PROXY, _HTTP_PROXY);
+		}
 
-        if (!ini_get("open_basedir")) {
-            curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null");
-        }
+		if ($post_query) {
+			curl_setopt($ch, CURLOPT_POST, true);
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query);
+		}
 
-        if (defined('_HTTP_PROXY')) {
-            curl_setopt($ch, CURLOPT_PROXY, _HTTP_PROXY);
-        }
+		if ($login && $pass)
+			curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
 
-        if ($post_query) {
-            curl_setopt($ch, CURLOPT_POST, true);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query);
-        }
+		$ret = @curl_exec($ch);
 
-        if ($login && $pass)
-            curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
+		$headers_length = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+		$headers = explode("\r\n", substr($ret, 0, $headers_length));
+		$contents = substr($ret, $headers_length);
 
-        $ret = @curl_exec($ch);
+		foreach ($headers as $header) {
+			if (strstr($header, ": ") !== FALSE) {
+				list ($key, $value) = explode(": ", $header);
 
-        $headers_length = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
-        $headers = explode("\r\n", substr($ret, 0, $headers_length));
-        $contents = substr($ret, $headers_length);
+				if (strtolower($key) == "last-modified") {
+					$fetch_last_modified = $value;
+				}
+			}
 
-        foreach ($headers as $header) {
-            if (strstr($header, ": ") !== FALSE) {
-                list ($key, $value) = explode(": ", $header);
+			if (substr(strtolower($header), 0, 7) == 'http/1.') {
+				$fetch_last_error_code = (int) substr($header, 9, 3);
+				$fetch_last_error = $header;
+			}
+		}
 
-                if (strtolower($key) == "last-modified") {
-                    $fetch_last_modified = $value;
-                }
-            }
+		if (curl_errno($ch) === 23 || curl_errno($ch) === 61) {
+			curl_setopt($ch, CURLOPT_ENCODING, 'none');
+			$contents = @curl_exec($ch);
+		}
 
-            if (substr(strtolower($header), 0, 7) == 'http/1.') {
-                $fetch_last_error_code = (int) substr($header, 9, 3);
-                $fetch_last_error = $header;
-            }
-        }
+		$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		$fetch_last_content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
 
-        if (curl_errno($ch) === 23 || curl_errno($ch) === 61) {
-            curl_setopt($ch, CURLOPT_ENCODING, 'none');
-            $contents = @curl_exec($ch);
-        }
+		$fetch_effective_url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
 
-        $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $fetch_last_content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+		$fetch_last_error_code = $http_code;
 
-        $fetch_effective_url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
+		if ($http_code != 200 || $type && strpos($fetch_last_content_type, "$type") === false) {
 
-        $fetch_last_error_code = $http_code;
+			if (curl_errno($ch) != 0) {
+				$fetch_last_error .=  "; " . curl_errno($ch) . " " . curl_error($ch);
+			}
 
-        if ($http_code != 200 || $type && strpos($fetch_last_content_type, "$type") === false) {
+			$fetch_last_error_content = $contents;
+			curl_close($ch);
+			return false;
+		}
 
-            if (curl_errno($ch) != 0) {
-                $fetch_last_error .=  "; " . curl_errno($ch) . " " . curl_error($ch);
-            }
+		if (!$contents) {
+			$fetch_last_error = curl_errno($ch) . " " . curl_error($ch);
+			curl_close($ch);
+			return false;
+		}
 
-            $fetch_last_error_content = $contents;
-            curl_close($ch);
-            return false;
-        }
+		curl_close($ch);
 
-        if (!$contents) {
-            $fetch_last_error = curl_errno($ch) . " " . curl_error($ch);
-            curl_close($ch);
-            return false;
-        }
+		$is_gzipped = RSSUtils::is_gzipped($contents);
 
-        curl_close($ch);
+		if ($is_gzipped) {
+			$tmp = @gzdecode($contents);
 
-        $is_gzipped = RSSUtils::is_gzipped($contents);
+			if ($tmp) $contents = $tmp;
+		}
 
-        if ($is_gzipped) {
-            $tmp = @gzdecode($contents);
+		return $contents;
+	} else {
 
-            if ($tmp) $contents = $tmp;
-        }
+		$fetch_curl_used = false;
 
-        return $contents;
-    } else {
+		if ($login && $pass){
+			$url_parts = array();
 
-        $fetch_curl_used = false;
+			preg_match("/(^[^:]*):\/\/(.*)/", $url, $url_parts);
 
-        if ($login && $pass){
-            $url_parts = array();
+			$pass = urlencode($pass);
 
-            preg_match("/(^[^:]*):\/\/(.*)/", $url, $url_parts);
+			if ($url_parts[1] && $url_parts[2]) {
+				$url = $url_parts[1] . "://$login:$pass@" . $url_parts[2];
+			}
+		}
 
-            $pass = urlencode($pass);
+		// TODO: should this support POST requests or not? idk
 
-            if ($url_parts[1] && $url_parts[2]) {
-                $url = $url_parts[1] . "://$login:$pass@" . $url_parts[2];
-            }
-        }
+		 $context_options = array(
+			  'http' => array(
+					'header' => array(
+						'Connection: close'
+					),
+					'method' => 'GET',
+					'ignore_errors' => true,
+					'timeout' => $timeout ? $timeout : FILE_FETCH_TIMEOUT,
+					'protocol_version'=> 1.1)
+			  );
 
-        // TODO: should this support POST requests or not? idk
+		if (!$post_query && $last_modified)
+			array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
 
-         $context_options = array(
-              'http' => array(
-                    'header' => array(
-                        'Connection: close'
-                    ),
-                    'method' => 'GET',
-                    'ignore_errors' => true,
-                    'timeout' => $timeout ? $timeout : FILE_FETCH_TIMEOUT,
-                    'protocol_version'=> 1.1)
-              );
+		if ($http_accept)
+			array_push($context_options['http']['header'], "Accept: $http_accept");
 
-        if (!$post_query && $last_modified)
-            array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
+		if ($http_referrer)
+			array_push($context_options['http']['header'], "Referer: $http_referrer");
 
-        if ($http_accept)
-            array_push($context_options['http']['header'], "Accept: $http_accept");
+		if (defined('_HTTP_PROXY')) {
+			$context_options['http']['request_fulluri'] = true;
+			$context_options['http']['proxy'] = _HTTP_PROXY;
+		}
 
-        if ($http_referrer)
-            array_push($context_options['http']['header'], "Referer: $http_referrer");
+		$context = stream_context_create($context_options);
 
-        if (defined('_HTTP_PROXY')) {
-            $context_options['http']['request_fulluri'] = true;
-            $context_options['http']['proxy'] = _HTTP_PROXY;
-        }
+		$old_error = error_get_last();
 
-        $context = stream_context_create($context_options);
+		$fetch_effective_url = $url;
 
-        $old_error = error_get_last();
+		$data = @file_get_contents($url, false, $context);
 
-        $fetch_effective_url = $url;
+		if (isset($http_response_header) && is_array($http_response_header)) {
+			foreach ($http_response_header as $header) {
+				if (strstr($header, ": ") !== FALSE) {
+					list ($key, $value) = explode(": ", $header);
 
-        $data = @file_get_contents($url, false, $context);
+					$key = strtolower($key);
 
-        if (isset($http_response_header) && is_array($http_response_header)) {
-            foreach ($http_response_header as $header) {
-                if (strstr($header, ": ") !== FALSE) {
-                    list ($key, $value) = explode(": ", $header);
+					if ($key == 'content-type') {
+						$fetch_last_content_type = $value;
+						// don't abort here b/c there might be more than one
+						// e.g. if we were being redirected -- last one is the right one
+					} else if ($key == 'last-modified') {
+						$fetch_last_modified = $value;
+					} else if ($key == 'location') {
+						$fetch_effective_url = $value;
+					}
+				}
 
-                    $key = strtolower($key);
+				if (substr(strtolower($header), 0, 7) == 'http/1.') {
+					$fetch_last_error_code = (int) substr($header, 9, 3);
+					$fetch_last_error = $header;
+				}
+			}
+		}
 
-                    if ($key == 'content-type') {
-                        $fetch_last_content_type = $value;
-                        // don't abort here b/c there might be more than one
-                        // e.g. if we were being redirected -- last one is the right one
-                    } else if ($key == 'last-modified') {
-                        $fetch_last_modified = $value;
-                    } else if ($key == 'location') {
-                        $fetch_effective_url = $value;
-                    }
-                }
+		if ($fetch_last_error_code != 200) {
+			$error = error_get_last();
 
-                if (substr(strtolower($header), 0, 7) == 'http/1.') {
-                    $fetch_last_error_code = (int) substr($header, 9, 3);
-                    $fetch_last_error = $header;
-                }
-            }
-        }
+			if ($error['message'] != $old_error['message']) {
+				$fetch_last_error .= "; " . $error["message"];
+			}
 
-        if ($fetch_last_error_code != 200) {
-            $error = error_get_last();
+			$fetch_last_error_content = $data;
 
-            if ($error['message'] != $old_error['message']) {
-                $fetch_last_error .= "; " . $error["message"];
-            }
+			return false;
+		}
 
-            $fetch_last_error_content = $data;
+		$is_gzipped = RSSUtils::is_gzipped($data);
 
-            return false;
-        }
+		if ($is_gzipped) {
+			$tmp = @gzdecode($data);
 
-        $is_gzipped = RSSUtils::is_gzipped($data);
+			if ($tmp) $data = $tmp;
+		}
 
-        if ($is_gzipped) {
-            $tmp = @gzdecode($data);
-
-            if ($tmp) $data = $tmp;
-        }
-
-        return $data;
-    }
+		return $data;
+	}
 
 }
 
 function initialize_user_prefs($uid, $profile = false) {
 
-    if (get_schema_version() < 63) $profile_qpart = "";
+	if (get_schema_version() < 63) $profile_qpart = "";
 
-    $pdo = DB::pdo();
-    $in_nested_tr = false;
+	$pdo = DB::pdo();
+	$in_nested_tr = false;
 
-    try {
-        $pdo->beginTransaction();
-    } catch (Exception $e) {
-        $in_nested_tr = true;
-    }
+	try {
+		$pdo->beginTransaction();
+	} catch (Exception $e) {
+		$in_nested_tr = true;
+	}
 
-    $sth = $pdo->query("SELECT pref_name,def_value FROM ttrss_prefs");
+	$sth = $pdo->query("SELECT pref_name,def_value FROM ttrss_prefs");
 
-    if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+	if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
 
-    $u_sth = $pdo->prepare("SELECT pref_name
+	$u_sth = $pdo->prepare("SELECT pref_name
         FROM ttrss_user_prefs WHERE owner_uid = :uid AND
             (profile = :profile OR (:profile IS NULL AND profile IS NULL))");
-    $u_sth->execute([':uid' => $uid, ':profile' => $profile]);
+	$u_sth->execute([':uid' => $uid, ':profile' => $profile]);
 
-    $active_prefs = array();
+	$active_prefs = array();
 
-    while ($line = $u_sth->fetch()) {
-        array_push($active_prefs, $line["pref_name"]);
-    }
+	while ($line = $u_sth->fetch()) {
+		array_push($active_prefs, $line["pref_name"]);
+	}
 
-    while ($line = $sth->fetch()) {
-        if (array_search($line["pref_name"], $active_prefs) === FALSE) {
+	while ($line = $sth->fetch()) {
+		if (array_search($line["pref_name"], $active_prefs) === FALSE) {
 //				print "adding " . $line["pref_name"] . "<br>";
 
-            if (get_schema_version() < 63) {
-                $i_sth = $pdo->prepare("INSERT INTO ttrss_user_prefs
+			if (get_schema_version() < 63) {
+				$i_sth = $pdo->prepare("INSERT INTO ttrss_user_prefs
                     (owner_uid,pref_name,value) VALUES
                     (?, ?, ?)");
-                $i_sth->execute([$uid, $line["pref_name"], $line["def_value"]]);
+				$i_sth->execute([$uid, $line["pref_name"], $line["def_value"]]);
 
-            } else {
-                $i_sth = $pdo->prepare("INSERT INTO ttrss_user_prefs
+			} else {
+				$i_sth = $pdo->prepare("INSERT INTO ttrss_user_prefs
                     (owner_uid,pref_name,value, profile) VALUES
                     (?, ?, ?, ?)");
-                $i_sth->execute([$uid, $line["pref_name"], $line["def_value"], $profile]);
-            }
+				$i_sth->execute([$uid, $line["pref_name"], $line["def_value"], $profile]);
+			}
 
-        }
-    }
+		}
+	}
 
-    if (!$in_nested_tr) $pdo->commit();
+	if (!$in_nested_tr) $pdo->commit();
 
 }
 
 function get_ssl_certificate_id() {
-    if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]) {
-        return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] .
-            $_SERVER["REDIRECT_SSL_CLIENT_V_START"] .
-            $_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
-            $_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
-    }
-    if ($_SERVER["SSL_CLIENT_M_SERIAL"]) {
-        return sha1($_SERVER["SSL_CLIENT_M_SERIAL"] .
-            $_SERVER["SSL_CLIENT_V_START"] .
-            $_SERVER["SSL_CLIENT_V_END"] .
-            $_SERVER["SSL_CLIENT_S_DN"]);
-    }
-    return "";
+	if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]) {
+		return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] .
+			$_SERVER["REDIRECT_SSL_CLIENT_V_START"] .
+			$_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
+			$_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
+	}
+	if ($_SERVER["SSL_CLIENT_M_SERIAL"]) {
+		return sha1($_SERVER["SSL_CLIENT_M_SERIAL"] .
+			$_SERVER["SSL_CLIENT_V_START"] .
+			$_SERVER["SSL_CLIENT_V_END"] .
+			$_SERVER["SSL_CLIENT_S_DN"]);
+	}
+	return "";
 }
 
 function authenticate_user($login, $password, $check_only = false, $service = false) {
 
-    if (!SINGLE_USER_MODE) {
-        $user_id = false;
-        $auth_module = false;
+	if (!SINGLE_USER_MODE) {
+		$user_id = false;
+		$auth_module = false;
 
-        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_AUTH_USER) as $plugin) {
+		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_AUTH_USER) as $plugin) {
 
-            $user_id = (int) $plugin->authenticate($login, $password, $service);
+			$user_id = (int) $plugin->authenticate($login, $password, $service);
 
-            if ($user_id) {
-                $auth_module = strtolower(get_class($plugin));
-                break;
-            }
-        }
+			if ($user_id) {
+				$auth_module = strtolower(get_class($plugin));
+				break;
+			}
+		}
 
-        if ($user_id && !$check_only) {
+		if ($user_id && !$check_only) {
 
-            session_start();
-            session_regenerate_id(true);
+			session_start();
+			session_regenerate_id(true);
 
-            $_SESSION["uid"] = $user_id;
-            $_SESSION["auth_module"] = $auth_module;
+			$_SESSION["uid"] = $user_id;
+			$_SESSION["auth_module"] = $auth_module;
 
-            $pdo = DB::pdo();
-            $sth = $pdo->prepare("SELECT login,access_level,pwd_hash FROM ttrss_users
+			$pdo = DB::pdo();
+			$sth = $pdo->prepare("SELECT login,access_level,pwd_hash FROM ttrss_users
                 WHERE id = ?");
-            $sth->execute([$user_id]);
-            $row = $sth->fetch();
+			$sth->execute([$user_id]);
+			$row = $sth->fetch();
 
-            $_SESSION["name"] = $row["login"];
-            $_SESSION["access_level"] = $row["access_level"];
-            $_SESSION["csrf_token"] = uniqid_short();
+			$_SESSION["name"] = $row["login"];
+			$_SESSION["access_level"] = $row["access_level"];
+			$_SESSION["csrf_token"] = uniqid_short();
 
-            $usth = $pdo->prepare("UPDATE ttrss_users SET last_login = NOW() WHERE id = ?");
-            $usth->execute([$user_id]);
+			$usth = $pdo->prepare("UPDATE ttrss_users SET last_login = NOW() WHERE id = ?");
+			$usth->execute([$user_id]);
 
-            $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
-            $_SESSION["user_agent"] = sha1($_SERVER['HTTP_USER_AGENT']);
-            $_SESSION["pwd_hash"] = $row["pwd_hash"];
+			$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
+			$_SESSION["user_agent"] = sha1($_SERVER['HTTP_USER_AGENT']);
+			$_SESSION["pwd_hash"] = $row["pwd_hash"];
 
-            initialize_user_prefs($_SESSION["uid"]);
+			initialize_user_prefs($_SESSION["uid"]);
 
-            return true;
-        }
+			return true;
+		}
 
-        return false;
+		return false;
 
-    } else {
+	} else {
 
-        $_SESSION["uid"] = 1;
-        $_SESSION["name"] = "admin";
-        $_SESSION["access_level"] = 10;
+		$_SESSION["uid"] = 1;
+		$_SESSION["name"] = "admin";
+		$_SESSION["access_level"] = 10;
 
-        $_SESSION["hide_hello"] = true;
-        $_SESSION["hide_logout"] = true;
+		$_SESSION["hide_hello"] = true;
+		$_SESSION["hide_logout"] = true;
 
-        $_SESSION["auth_module"] = false;
+		$_SESSION["auth_module"] = false;
 
-        if (!$_SESSION["csrf_token"]) {
-            $_SESSION["csrf_token"] = uniqid_short();
-        }
+		if (!$_SESSION["csrf_token"]) {
+			$_SESSION["csrf_token"] = uniqid_short();
+		}
 
-        $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
+		$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
 
-        initialize_user_prefs($_SESSION["uid"]);
+		initialize_user_prefs($_SESSION["uid"]);
 
-        return true;
-    }
+		return true;
+	}
 }
 
 // this is used for user http parameters unless HTML code is actually needed
 function clean($param) {
-    if (is_array($param)) {
-        return array_map("strip_tags", $param);
-    } else if (is_string($param)) {
-        return strip_tags($param);
-    } else {
-        return $param;
-    }
+	if (is_array($param)) {
+		return array_map("strip_tags", $param);
+	} else if (is_string($param)) {
+		return strip_tags($param);
+	} else {
+		return $param;
+	}
 }
 
 function clean_filename($filename) {
-    return basename(preg_replace("/\.\.|[\/\\\]/", "", clean($filename)));
+	return basename(preg_replace("/\.\.|[\/\\\]/", "", clean($filename)));
 }
 
 function make_password($length = 12) {
-    $password = "";
-    $possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ*%+^";
+	$password = "";
+	$possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ*%+^";
 
-    $i = 0;
+	$i = 0;
 
-    while ($i < $length) {
+	while ($i < $length) {
 
-        try {
-            $idx = function_exists("random_int") ? random_int(0, strlen($possible) - 1) : mt_rand(0, strlen($possible) - 1);
-        } catch (Exception $e) {
-            $idx = mt_rand(0, strlen($possible) - 1);
-        }
+		try {
+			$idx = function_exists("random_int") ? random_int(0, strlen($possible) - 1) : mt_rand(0, strlen($possible) - 1);
+		} catch (Exception $e) {
+			$idx = mt_rand(0, strlen($possible) - 1);
+		}
 
-        $char = substr($possible, $idx, 1);
+		$char = substr($possible, $idx, 1);
 
-        if (!strstr($password, $char)) {
-            $password .= $char;
-            $i++;
-        }
-    }
+		if (!strstr($password, $char)) {
+			$password .= $char;
+			$i++;
+		}
+	}
 
-    return $password;
+	return $password;
 }
 
 // this is called after user is created to initialize default feeds, labels
@@ -648,889 +648,889 @@ 
 
 function initialize_user($uid) {
 
-    $pdo = DB::pdo();
+	$pdo = DB::pdo();
 
-    $sth = $pdo->prepare("insert into ttrss_feeds (owner_uid,title,feed_url)
+	$sth = $pdo->prepare("insert into ttrss_feeds (owner_uid,title,feed_url)
         values (?, 'Tiny Tiny RSS: Forum',
             'http://tt-rss.org/forum/rss.php')");
-    $sth->execute([$uid]);
+	$sth->execute([$uid]);
 }
 
 function logout_user() {
-    @session_destroy();
-    if (isset($_COOKIE[session_name()])) {
-       setcookie(session_name(), '', time()-42000, '/');
-    }
-    session_commit();
+	@session_destroy();
+	if (isset($_COOKIE[session_name()])) {
+	   setcookie(session_name(), '', time()-42000, '/');
+	}
+	session_commit();
 }
 
 function validate_csrf($csrf_token) {
-    return $csrf_token == $_SESSION['csrf_token'];
+	return $csrf_token == $_SESSION['csrf_token'];
 }
 
 function load_user_plugins($owner_uid, $pluginhost = false) {
 
-    if (!$pluginhost) $pluginhost = PluginHost::getInstance();
+	if (!$pluginhost) $pluginhost = PluginHost::getInstance();
 
-    if ($owner_uid && SCHEMA_VERSION >= 100) {
-        $plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
+	if ($owner_uid && SCHEMA_VERSION >= 100) {
+		$plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-        $pluginhost->load($plugins, PluginHost::KIND_USER, $owner_uid);
+		$pluginhost->load($plugins, PluginHost::KIND_USER, $owner_uid);
 
-        if (get_schema_version() > 100) {
-            $pluginhost->load_data();
-        }
-    }
+		if (get_schema_version() > 100) {
+			$pluginhost->load_data();
+		}
+	}
 }
 
 function login_sequence() {
-    $pdo = Db::pdo();
+	$pdo = Db::pdo();
 
-    if (SINGLE_USER_MODE) {
-        @session_start();
-        authenticate_user("admin", null);
-        startup_gettext();
-        load_user_plugins($_SESSION["uid"]);
-    } else {
-        if (!validate_session()) $_SESSION["uid"] = false;
+	if (SINGLE_USER_MODE) {
+		@session_start();
+		authenticate_user("admin", null);
+		startup_gettext();
+		load_user_plugins($_SESSION["uid"]);
+	} else {
+		if (!validate_session()) $_SESSION["uid"] = false;
 
-        if (!$_SESSION["uid"]) {
+		if (!$_SESSION["uid"]) {
 
-            if (AUTH_AUTO_LOGIN && authenticate_user(null, null)) {
-                $_SESSION["ref_schema_version"] = get_schema_version(true);
-            } else {
-                 authenticate_user(null, null, true);
-            }
+			if (AUTH_AUTO_LOGIN && authenticate_user(null, null)) {
+				$_SESSION["ref_schema_version"] = get_schema_version(true);
+			} else {
+				 authenticate_user(null, null, true);
+			}
 
-            if (!$_SESSION["uid"]) {
-                logout_user();
+			if (!$_SESSION["uid"]) {
+				logout_user();
 
-                render_login_form();
-                exit;
-            }
+				render_login_form();
+				exit;
+			}
 
-        } else {
-            /* bump login timestamp */
-            $sth = $pdo->prepare("UPDATE ttrss_users SET last_login = NOW() WHERE id = ?");
-            $sth->execute([$_SESSION['uid']]);
+		} else {
+			/* bump login timestamp */
+			$sth = $pdo->prepare("UPDATE ttrss_users SET last_login = NOW() WHERE id = ?");
+			$sth->execute([$_SESSION['uid']]);
 
-            $_SESSION["last_login_update"] = time();
-        }
+			$_SESSION["last_login_update"] = time();
+		}
 
-        if ($_SESSION["uid"]) {
-            startup_gettext();
-            load_user_plugins($_SESSION["uid"]);
+		if ($_SESSION["uid"]) {
+			startup_gettext();
+			load_user_plugins($_SESSION["uid"]);
 
-            /* cleanup ccache */
+			/* cleanup ccache */
 
-            $sth = $pdo->prepare("DELETE FROM ttrss_counters_cache WHERE owner_uid = ?
+			$sth = $pdo->prepare("DELETE FROM ttrss_counters_cache WHERE owner_uid = ?
                 AND
                     (SELECT COUNT(id) FROM ttrss_feeds WHERE
                         ttrss_feeds.id = feed_id) = 0");
 
-            $sth->execute([$_SESSION['uid']]);
+			$sth->execute([$_SESSION['uid']]);
 
-            $sth = $pdo->prepare("DELETE FROM ttrss_cat_counters_cache WHERE owner_uid = ?
+			$sth = $pdo->prepare("DELETE FROM ttrss_cat_counters_cache WHERE owner_uid = ?
                 AND
                     (SELECT COUNT(id) FROM ttrss_feed_categories WHERE
                         ttrss_feed_categories.id = feed_id) = 0");
 
-            $sth->execute([$_SESSION['uid']]);
-        }
+			$sth->execute([$_SESSION['uid']]);
+		}
 
-    }
+	}
 }
 
 function truncate_string($str, $max_len, $suffix = '&hellip;') {
-    if (mb_strlen($str, "utf-8") > $max_len) {
-        return mb_substr($str, 0, $max_len, "utf-8") . $suffix;
-    } else {
-        return $str;
-    }
+	if (mb_strlen($str, "utf-8") > $max_len) {
+		return mb_substr($str, 0, $max_len, "utf-8") . $suffix;
+	} else {
+		return $str;
+	}
 }
 
 function mb_substr_replace($original, $replacement, $position, $length) {
-    $startString = mb_substr($original, 0, $position, "UTF-8");
-    $endString = mb_substr($original, $position + $length, mb_strlen($original), "UTF-8");
+	$startString = mb_substr($original, 0, $position, "UTF-8");
+	$endString = mb_substr($original, $position + $length, mb_strlen($original), "UTF-8");
 
-    $out = $startString . $replacement . $endString;
+	$out = $startString . $replacement . $endString;
 
-    return $out;
+	return $out;
 }
 
 function truncate_middle($str, $max_len, $suffix = '&hellip;') {
-    if (mb_strlen($str) > $max_len) {
-        return mb_substr_replace($str, $suffix, $max_len / 2, mb_strlen($str) - $max_len);
-    } else {
-        return $str;
-    }
+	if (mb_strlen($str) > $max_len) {
+		return mb_substr_replace($str, $suffix, $max_len / 2, mb_strlen($str) - $max_len);
+	} else {
+		return $str;
+	}
 }
 
 function convert_timestamp($timestamp, $source_tz, $dest_tz) {
 
-    try {
-        $source_tz = new DateTimeZone($source_tz);
-    } catch (Exception $e) {
-        $source_tz = new DateTimeZone('UTC');
-    }
+	try {
+		$source_tz = new DateTimeZone($source_tz);
+	} catch (Exception $e) {
+		$source_tz = new DateTimeZone('UTC');
+	}
 
-    try {
-        $dest_tz = new DateTimeZone($dest_tz);
-    } catch (Exception $e) {
-        $dest_tz = new DateTimeZone('UTC');
-    }
+	try {
+		$dest_tz = new DateTimeZone($dest_tz);
+	} catch (Exception $e) {
+		$dest_tz = new DateTimeZone('UTC');
+	}
 
-    $dt = new DateTime(date('Y-m-d H:i:s', $timestamp), $source_tz);
-    return $dt->format('U') + $dest_tz->getOffset($dt);
+	$dt = new DateTime(date('Y-m-d H:i:s', $timestamp), $source_tz);
+	return $dt->format('U') + $dest_tz->getOffset($dt);
 }
 
 function make_local_datetime($timestamp, $long, $owner_uid = false,
-                $no_smart_dt = false, $eta_min = false) {
+				$no_smart_dt = false, $eta_min = false) {
 
-    if (!$owner_uid) $owner_uid = $_SESSION['uid'];
-    if (!$timestamp) $timestamp = '1970-01-01 0:00';
+	if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+	if (!$timestamp) $timestamp = '1970-01-01 0:00';
 
-    global $utc_tz;
-    global $user_tz;
+	global $utc_tz;
+	global $user_tz;
 
-    if (!$utc_tz) $utc_tz = new DateTimeZone('UTC');
+	if (!$utc_tz) $utc_tz = new DateTimeZone('UTC');
 
-    $timestamp = substr($timestamp, 0, 19);
+	$timestamp = substr($timestamp, 0, 19);
 
-    # We store date in UTC internally
-    $dt = new DateTime($timestamp, $utc_tz);
+	# We store date in UTC internally
+	$dt = new DateTime($timestamp, $utc_tz);
 
-    $user_tz_string = get_pref('USER_TIMEZONE', $owner_uid);
+	$user_tz_string = get_pref('USER_TIMEZONE', $owner_uid);
 
-    if ($user_tz_string != 'Automatic') {
+	if ($user_tz_string != 'Automatic') {
 
-        try {
-            if (!$user_tz) $user_tz = new DateTimeZone($user_tz_string);
-        } catch (Exception $e) {
-            $user_tz = $utc_tz;
-        }
+		try {
+			if (!$user_tz) $user_tz = new DateTimeZone($user_tz_string);
+		} catch (Exception $e) {
+			$user_tz = $utc_tz;
+		}
 
-        $tz_offset = $user_tz->getOffset($dt);
-    } else {
-        $tz_offset = (int) -$_SESSION["clientTzOffset"];
-    }
+		$tz_offset = $user_tz->getOffset($dt);
+	} else {
+		$tz_offset = (int) -$_SESSION["clientTzOffset"];
+	}
 
-    $user_timestamp = $dt->format('U') + $tz_offset;
+	$user_timestamp = $dt->format('U') + $tz_offset;
 
-    if (!$no_smart_dt) {
-        return smart_date_time($user_timestamp,
-            $tz_offset, $owner_uid, $eta_min);
-    } else {
-        if ($long)
-            $format = get_pref('LONG_DATE_FORMAT', $owner_uid);
-        else
-            $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
+	if (!$no_smart_dt) {
+		return smart_date_time($user_timestamp,
+			$tz_offset, $owner_uid, $eta_min);
+	} else {
+		if ($long)
+			$format = get_pref('LONG_DATE_FORMAT', $owner_uid);
+		else
+			$format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
 
-        return date($format, $user_timestamp);
-    }
+		return date($format, $user_timestamp);
+	}
 }
 
 function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false, $eta_min = false) {
-    if (!$owner_uid) $owner_uid = $_SESSION['uid'];
-
-    if ($eta_min && time() + $tz_offset - $timestamp < 3600) {
-        return T_sprintf("%d min", date("i", time() + $tz_offset - $timestamp));
-    } else if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) {
-        $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
-        if (strpos((strtolower($format)), "a") === false)
-            return date("G:i", $timestamp);
-        else
-            return date("g:i a", $timestamp);
-    } else if (date("Y", $timestamp) == date("Y", time() + $tz_offset)) {
-        $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
-        return date($format, $timestamp);
-    } else {
-        $format = get_pref('LONG_DATE_FORMAT', $owner_uid);
-        return date($format, $timestamp);
-    }
+	if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+
+	if ($eta_min && time() + $tz_offset - $timestamp < 3600) {
+		return T_sprintf("%d min", date("i", time() + $tz_offset - $timestamp));
+	} else if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) {
+		$format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
+		if (strpos((strtolower($format)), "a") === false)
+			return date("G:i", $timestamp);
+		else
+			return date("g:i a", $timestamp);
+	} else if (date("Y", $timestamp) == date("Y", time() + $tz_offset)) {
+		$format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
+		return date($format, $timestamp);
+	} else {
+		$format = get_pref('LONG_DATE_FORMAT', $owner_uid);
+		return date($format, $timestamp);
+	}
 }
 
 function sql_bool_to_bool($s) {
-    return $s && ($s !== "f" && $s !== "false"); //no-op for PDO, backwards compat for legacy layer
+	return $s && ($s !== "f" && $s !== "false"); //no-op for PDO, backwards compat for legacy layer
 }
 
 function bool_to_sql_bool($s) {
-    return $s ? 1 : 0;
+	return $s ? 1 : 0;
 }
 
 // Session caching removed due to causing wrong redirects to upgrade
 // script when get_schema_version() is called on an obsolete session
 // created on a previous schema version.
 function get_schema_version($nocache = false) {
-    global $schema_version;
+	global $schema_version;
 
-    $pdo = DB::pdo();
+	$pdo = DB::pdo();
 
-    if (!$schema_version && !$nocache) {
-        $row = $pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
-        $version = $row["schema_version"];
-        $schema_version = $version;
-        return $version;
-    } else {
-        return $schema_version;
-    }
+	if (!$schema_version && !$nocache) {
+		$row = $pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
+		$version = $row["schema_version"];
+		$schema_version = $version;
+		return $version;
+	} else {
+		return $schema_version;
+	}
 }
 
 function sanity_check() {
-    require_once 'errors.php';
-    global $ERRORS;
+	require_once 'errors.php';
+	global $ERRORS;
 
-    $error_code = 0;
-    $schema_version = get_schema_version(true);
+	$error_code = 0;
+	$schema_version = get_schema_version(true);
 
-    if ($schema_version != SCHEMA_VERSION) {
-        $error_code = 5;
-    }
+	if ($schema_version != SCHEMA_VERSION) {
+		$error_code = 5;
+	}
 
-    return array("code" => $error_code, "message" => $ERRORS[$error_code]);
+	return array("code" => $error_code, "message" => $ERRORS[$error_code]);
 }
 
 function file_is_locked($filename) {
-    if (file_exists(LOCK_DIRECTORY . "/$filename")) {
-        if (function_exists('flock')) {
-            $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
-            if ($fp) {
-                if (flock($fp, LOCK_EX | LOCK_NB)) {
-                    flock($fp, LOCK_UN);
-                    fclose($fp);
-                    return false;
-                }
-                fclose($fp);
-                return true;
-            } else {
-                return false;
-            }
-        }
-        return true; // consider the file always locked and skip the test
-    } else {
-        return false;
-    }
+	if (file_exists(LOCK_DIRECTORY . "/$filename")) {
+		if (function_exists('flock')) {
+			$fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
+			if ($fp) {
+				if (flock($fp, LOCK_EX | LOCK_NB)) {
+					flock($fp, LOCK_UN);
+					fclose($fp);
+					return false;
+				}
+				fclose($fp);
+				return true;
+			} else {
+				return false;
+			}
+		}
+		return true; // consider the file always locked and skip the test
+	} else {
+		return false;
+	}
 }
 
 
 function make_lockfile($filename) {
-    $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+	$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
 
-    if ($fp && flock($fp, LOCK_EX | LOCK_NB)) {
-        $stat_h = fstat($fp);
-        $stat_f = stat(LOCK_DIRECTORY . "/$filename");
+	if ($fp && flock($fp, LOCK_EX | LOCK_NB)) {
+		$stat_h = fstat($fp);
+		$stat_f = stat(LOCK_DIRECTORY . "/$filename");
 
-        if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-            if ($stat_h["ino"] != $stat_f["ino"] ||
-                    $stat_h["dev"] != $stat_f["dev"]) {
+		if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
+			if ($stat_h["ino"] != $stat_f["ino"] ||
+					$stat_h["dev"] != $stat_f["dev"]) {
 
-                return false;
-            }
-        }
+				return false;
+			}
+		}
 
-        if (function_exists('posix_getpid')) {
-            fwrite($fp, posix_getpid() . "\n");
-        }
-        return $fp;
-    } else {
-        return false;
-    }
+		if (function_exists('posix_getpid')) {
+			fwrite($fp, posix_getpid() . "\n");
+		}
+		return $fp;
+	} else {
+		return false;
+	}
 }
 
 function make_stampfile($filename) {
-    $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+	$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
 
-    if (flock($fp, LOCK_EX | LOCK_NB)) {
-        fwrite($fp, time() . "\n");
-        flock($fp, LOCK_UN);
-        fclose($fp);
-        return true;
-    } else {
-        return false;
-    }
+	if (flock($fp, LOCK_EX | LOCK_NB)) {
+		fwrite($fp, time() . "\n");
+		flock($fp, LOCK_UN);
+		fclose($fp);
+		return true;
+	} else {
+		return false;
+	}
 }
 
 function sql_random_function() {
-    if (DB_TYPE == "mysql") {
-        return "RAND()";
-    } else {
-        return "RANDOM()";
-    }
+	if (DB_TYPE == "mysql") {
+		return "RAND()";
+	} else {
+		return "RANDOM()";
+	}
 }
 
 function getFeedUnread($feed, $is_cat = false) {
-    return Feeds::getFeedArticles($feed, $is_cat, true, $_SESSION["uid"]);
+	return Feeds::getFeedArticles($feed, $is_cat, true, $_SESSION["uid"]);
 }
 
 function checkbox_to_sql_bool($val) {
-    return ($val == "on") ? 1 : 0;
+	return ($val == "on") ? 1 : 0;
 }
 
 function uniqid_short() {
-    return uniqid(base_convert(rand(), 10, 36));
+	return uniqid(base_convert(rand(), 10, 36));
 }
 
 function make_init_params() {
-    $params = array();
+	$params = array();
 
-    foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
-                 "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
-                 "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
-                 "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
+	foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
+				 "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
+				 "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
+				 "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
 
-        $params[strtolower($param)] = (int) get_pref($param);
-    }
+		$params[strtolower($param)] = (int) get_pref($param);
+	}
 
-    $params["check_for_updates"] = CHECK_FOR_UPDATES;
-    $params["icons_url"] = ICONS_URL;
-    $params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME;
-    $params["default_view_mode"] = get_pref("_DEFAULT_VIEW_MODE");
-    $params["default_view_limit"] = (int) get_pref("_DEFAULT_VIEW_LIMIT");
-    $params["default_view_order_by"] = get_pref("_DEFAULT_VIEW_ORDER_BY");
-    $params["bw_limit"] = (int) $_SESSION["bw_limit"];
-    $params["is_default_pw"] = Pref_Prefs::isdefaultpassword();
-    $params["label_base_index"] = (int) LABEL_BASE_INDEX;
+	$params["check_for_updates"] = CHECK_FOR_UPDATES;
+	$params["icons_url"] = ICONS_URL;
+	$params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME;
+	$params["default_view_mode"] = get_pref("_DEFAULT_VIEW_MODE");
+	$params["default_view_limit"] = (int) get_pref("_DEFAULT_VIEW_LIMIT");
+	$params["default_view_order_by"] = get_pref("_DEFAULT_VIEW_ORDER_BY");
+	$params["bw_limit"] = (int) $_SESSION["bw_limit"];
+	$params["is_default_pw"] = Pref_Prefs::isdefaultpassword();
+	$params["label_base_index"] = (int) LABEL_BASE_INDEX;
 
-    $theme = get_pref( "USER_CSS_THEME", false, false);
-    $params["theme"] = theme_exists($theme) ? $theme : "";
+	$theme = get_pref( "USER_CSS_THEME", false, false);
+	$params["theme"] = theme_exists($theme) ? $theme : "";
 
-    $params["plugins"] = implode(", ", PluginHost::getInstance()->get_plugin_names());
+	$params["plugins"] = implode(", ", PluginHost::getInstance()->get_plugin_names());
 
-    $params["php_platform"] = PHP_OS;
-    $params["php_version"] = PHP_VERSION;
+	$params["php_platform"] = PHP_OS;
+	$params["php_version"] = PHP_VERSION;
 
-    $params["sanity_checksum"] = sha1(file_get_contents("include/sanity_check.php"));
+	$params["sanity_checksum"] = sha1(file_get_contents("include/sanity_check.php"));
 
-    $pdo = Db::pdo();
+	$pdo = Db::pdo();
 
-    $sth = $pdo->prepare("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM ttrss_feeds WHERE owner_uid = ?");
-    $sth->execute([$_SESSION['uid']]);
-    $row = $sth->fetch();
+	$sth = $pdo->prepare("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM ttrss_feeds WHERE owner_uid = ?");
+	$sth->execute([$_SESSION['uid']]);
+	$row = $sth->fetch();
 
-    $max_feed_id = $row["mid"];
-    $num_feeds = $row["nf"];
+	$max_feed_id = $row["mid"];
+	$num_feeds = $row["nf"];
 
-    $params["max_feed_id"] = (int) $max_feed_id;
-    $params["num_feeds"] = (int) $num_feeds;
+	$params["max_feed_id"] = (int) $max_feed_id;
+	$params["num_feeds"] = (int) $num_feeds;
 
-    $params["hotkeys"] = get_hotkeys_map();
+	$params["hotkeys"] = get_hotkeys_map();
 
-    $params["csrf_token"] = $_SESSION["csrf_token"];
-    $params["widescreen"] = (int) $_COOKIE["ttrss_widescreen"];
+	$params["csrf_token"] = $_SESSION["csrf_token"];
+	$params["widescreen"] = (int) $_COOKIE["ttrss_widescreen"];
 
-    $params['simple_update'] = defined('SIMPLE_UPDATE_MODE') && SIMPLE_UPDATE_MODE;
+	$params['simple_update'] = defined('SIMPLE_UPDATE_MODE') && SIMPLE_UPDATE_MODE;
 
-    $params["icon_indicator_white"] = base64_img("images/indicator_white.gif");
+	$params["icon_indicator_white"] = base64_img("images/indicator_white.gif");
 
-    $params["labels"] = Labels::get_all_labels($_SESSION["uid"]);
+	$params["labels"] = Labels::get_all_labels($_SESSION["uid"]);
 
-    return $params;
+	return $params;
 }
 
 function get_hotkeys_info() {
-    $hotkeys = array(
-        __("Navigation") => array(
-            "next_feed" => __("Open next feed"),
-            "prev_feed" => __("Open previous feed"),
-            "next_article_or_scroll" => __("Open next article (in combined mode, scroll down)"),
-            "prev_article_or_scroll" => __("Open previous article (in combined mode, scroll up)"),
-            "next_article_page" => __("Scroll article by one page down"),
-            "prev_article_page" => __("Scroll article by one page up"),
-            "next_article_noscroll" => __("Open next article"),
-            "prev_article_noscroll" => __("Open previous article"),
-            "next_article_noexpand" => __("Move to next article (don't expand or mark read)"),
-            "prev_article_noexpand" => __("Move to previous article (don't expand or mark read)"),
-            "search_dialog" => __("Show search dialog")),
-        __("Article") => array(
-            "toggle_mark" => __("Toggle starred"),
-            "toggle_publ" => __("Toggle published"),
-            "toggle_unread" => __("Toggle unread"),
-            "edit_tags" => __("Edit tags"),
-            "open_in_new_window" => __("Open in new window"),
-            "catchup_below" => __("Mark below as read"),
-            "catchup_above" => __("Mark above as read"),
-            "article_scroll_down" => __("Scroll down"),
-            "article_scroll_up" => __("Scroll up"),
-            "article_page_down" => __("Scroll down page"),
-            "article_page_up" => __("Scroll up page"),
-            "select_article_cursor" => __("Select article under cursor"),
-            "email_article" => __("Email article"),
-            "close_article" => __("Close/collapse article"),
-            "toggle_expand" => __("Toggle article expansion (combined mode)"),
-            "toggle_widescreen" => __("Toggle widescreen mode"),
-            "toggle_embed_original" => __("Toggle embed original")),
-        __("Article selection") => array(
-            "select_all" => __("Select all articles"),
-            "select_unread" => __("Select unread"),
-            "select_marked" => __("Select starred"),
-            "select_published" => __("Select published"),
-            "select_invert" => __("Invert selection"),
-            "select_none" => __("Deselect everything")),
-        __("Feed") => array(
-            "feed_refresh" => __("Refresh current feed"),
-            "feed_unhide_read" => __("Un/hide read feeds"),
-            "feed_subscribe" => __("Subscribe to feed"),
-            "feed_edit" => __("Edit feed"),
-            "feed_catchup" => __("Mark as read"),
-            "feed_reverse" => __("Reverse headlines"),
-            "feed_toggle_vgroup" => __("Toggle headline grouping"),
-            "feed_debug_update" => __("Debug feed update"),
-            "feed_debug_viewfeed" => __("Debug viewfeed()"),
-            "catchup_all" => __("Mark all feeds as read"),
-            "cat_toggle_collapse" => __("Un/collapse current category"),
-            "toggle_cdm_expanded" => __("Toggle auto expand in combined mode"),
-            "toggle_combined_mode" => __("Toggle combined mode")),
-        __("Go to") => array(
-            "goto_all" => __("All articles"),
-            "goto_fresh" => __("Fresh"),
-            "goto_marked" => __("Starred"),
-            "goto_published" => __("Published"),
-            "goto_read" => __("Recently read"),
-            "goto_tagcloud" => __("Tag cloud"),
-            "goto_prefs" => __("Preferences")),
-        __("Other") => array(
-            "create_label" => __("Create label"),
-            "create_filter" => __("Create filter"),
-            "collapse_sidebar" => __("Un/collapse sidebar"),
-            "help_dialog" => __("Show help dialog"))
-    );
-
-    foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HOTKEY_INFO) as $plugin) {
-        $hotkeys = $plugin->hook_hotkey_info($hotkeys);
-    }
-
-    return $hotkeys;
+	$hotkeys = array(
+		__("Navigation") => array(
+			"next_feed" => __("Open next feed"),
+			"prev_feed" => __("Open previous feed"),
+			"next_article_or_scroll" => __("Open next article (in combined mode, scroll down)"),
+			"prev_article_or_scroll" => __("Open previous article (in combined mode, scroll up)"),
+			"next_article_page" => __("Scroll article by one page down"),
+			"prev_article_page" => __("Scroll article by one page up"),
+			"next_article_noscroll" => __("Open next article"),
+			"prev_article_noscroll" => __("Open previous article"),
+			"next_article_noexpand" => __("Move to next article (don't expand or mark read)"),
+			"prev_article_noexpand" => __("Move to previous article (don't expand or mark read)"),
+			"search_dialog" => __("Show search dialog")),
+		__("Article") => array(
+			"toggle_mark" => __("Toggle starred"),
+			"toggle_publ" => __("Toggle published"),
+			"toggle_unread" => __("Toggle unread"),
+			"edit_tags" => __("Edit tags"),
+			"open_in_new_window" => __("Open in new window"),
+			"catchup_below" => __("Mark below as read"),
+			"catchup_above" => __("Mark above as read"),
+			"article_scroll_down" => __("Scroll down"),
+			"article_scroll_up" => __("Scroll up"),
+			"article_page_down" => __("Scroll down page"),
+			"article_page_up" => __("Scroll up page"),
+			"select_article_cursor" => __("Select article under cursor"),
+			"email_article" => __("Email article"),
+			"close_article" => __("Close/collapse article"),
+			"toggle_expand" => __("Toggle article expansion (combined mode)"),
+			"toggle_widescreen" => __("Toggle widescreen mode"),
+			"toggle_embed_original" => __("Toggle embed original")),
+		__("Article selection") => array(
+			"select_all" => __("Select all articles"),
+			"select_unread" => __("Select unread"),
+			"select_marked" => __("Select starred"),
+			"select_published" => __("Select published"),
+			"select_invert" => __("Invert selection"),
+			"select_none" => __("Deselect everything")),
+		__("Feed") => array(
+			"feed_refresh" => __("Refresh current feed"),
+			"feed_unhide_read" => __("Un/hide read feeds"),
+			"feed_subscribe" => __("Subscribe to feed"),
+			"feed_edit" => __("Edit feed"),
+			"feed_catchup" => __("Mark as read"),
+			"feed_reverse" => __("Reverse headlines"),
+			"feed_toggle_vgroup" => __("Toggle headline grouping"),
+			"feed_debug_update" => __("Debug feed update"),
+			"feed_debug_viewfeed" => __("Debug viewfeed()"),
+			"catchup_all" => __("Mark all feeds as read"),
+			"cat_toggle_collapse" => __("Un/collapse current category"),
+			"toggle_cdm_expanded" => __("Toggle auto expand in combined mode"),
+			"toggle_combined_mode" => __("Toggle combined mode")),
+		__("Go to") => array(
+			"goto_all" => __("All articles"),
+			"goto_fresh" => __("Fresh"),
+			"goto_marked" => __("Starred"),
+			"goto_published" => __("Published"),
+			"goto_read" => __("Recently read"),
+			"goto_tagcloud" => __("Tag cloud"),
+			"goto_prefs" => __("Preferences")),
+		__("Other") => array(
+			"create_label" => __("Create label"),
+			"create_filter" => __("Create filter"),
+			"collapse_sidebar" => __("Un/collapse sidebar"),
+			"help_dialog" => __("Show help dialog"))
+	);
+
+	foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HOTKEY_INFO) as $plugin) {
+		$hotkeys = $plugin->hook_hotkey_info($hotkeys);
+	}
+
+	return $hotkeys;
 }
 
 function get_hotkeys_map() {
-    $hotkeys = array(
-        "k" => "next_feed",
-        "j" => "prev_feed",
-        "n" => "next_article_noscroll",
-        "p" => "prev_article_noscroll",
-        //"(33)|PageUp" => "prev_article_page",
-        //"(34)|PageDown" => "next_article_page",
-        "*(33)|Shift+PgUp" => "article_page_up",
-        "*(34)|Shift+PgDn" => "article_page_down",
-        "(38)|Up" => "prev_article_or_scroll",
-        "(40)|Down" => "next_article_or_scroll",
-        "*(38)|Shift+Up" => "article_scroll_up",
-        "*(40)|Shift+Down" => "article_scroll_down",
-        "^(38)|Ctrl+Up" => "prev_article_noscroll",
-        "^(40)|Ctrl+Down" => "next_article_noscroll",
-        "/" => "search_dialog",
-        "s" => "toggle_mark",
-        "S" => "toggle_publ",
-        "u" => "toggle_unread",
-        "T" => "edit_tags",
-        "o" => "open_in_new_window",
-        "c p" => "catchup_below",
-        "c n" => "catchup_above",
-        "N" => "article_scroll_down",
-        "P" => "article_scroll_up",
-        "a W" => "toggle_widescreen",
-        "a e" => "toggle_embed_original",
-        "e" => "email_article",
-        "a q" => "close_article",
-        "a a" => "select_all",
-        "a u" => "select_unread",
-        "a U" => "select_marked",
-        "a p" => "select_published",
-        "a i" => "select_invert",
-        "a n" => "select_none",
-        "f r" => "feed_refresh",
-        "f a" => "feed_unhide_read",
-        "f s" => "feed_subscribe",
-        "f e" => "feed_edit",
-        "f q" => "feed_catchup",
-        "f x" => "feed_reverse",
-        "f g" => "feed_toggle_vgroup",
-        "f D" => "feed_debug_update",
-        "f G" => "feed_debug_viewfeed",
-        "f C" => "toggle_combined_mode",
-        "f c" => "toggle_cdm_expanded",
-        "Q" => "catchup_all",
-        "x" => "cat_toggle_collapse",
-        "g a" => "goto_all",
-        "g f" => "goto_fresh",
-        "g s" => "goto_marked",
-        "g p" => "goto_published",
-        "g r" => "goto_read",
-        "g t" => "goto_tagcloud",
-        "g P" => "goto_prefs",
-        "r" => "select_article_cursor",
-        "c l" => "create_label",
-        "c f" => "create_filter",
-        "c s" => "collapse_sidebar",
-        "?" => "help_dialog",
-    );
-
-    foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HOTKEY_MAP) as $plugin) {
-        $hotkeys = $plugin->hook_hotkey_map($hotkeys);
-    }
-
-    $prefixes = array();
-
-    foreach (array_keys($hotkeys) as $hotkey) {
-        $pair = explode(" ", $hotkey, 2);
-
-        if (count($pair) > 1 && !in_array($pair[0], $prefixes)) {
-            array_push($prefixes, $pair[0]);
-        }
-    }
-
-    return array($prefixes, $hotkeys);
+	$hotkeys = array(
+		"k" => "next_feed",
+		"j" => "prev_feed",
+		"n" => "next_article_noscroll",
+		"p" => "prev_article_noscroll",
+		//"(33)|PageUp" => "prev_article_page",
+		//"(34)|PageDown" => "next_article_page",
+		"*(33)|Shift+PgUp" => "article_page_up",
+		"*(34)|Shift+PgDn" => "article_page_down",
+		"(38)|Up" => "prev_article_or_scroll",
+		"(40)|Down" => "next_article_or_scroll",
+		"*(38)|Shift+Up" => "article_scroll_up",
+		"*(40)|Shift+Down" => "article_scroll_down",
+		"^(38)|Ctrl+Up" => "prev_article_noscroll",
+		"^(40)|Ctrl+Down" => "next_article_noscroll",
+		"/" => "search_dialog",
+		"s" => "toggle_mark",
+		"S" => "toggle_publ",
+		"u" => "toggle_unread",
+		"T" => "edit_tags",
+		"o" => "open_in_new_window",
+		"c p" => "catchup_below",
+		"c n" => "catchup_above",
+		"N" => "article_scroll_down",
+		"P" => "article_scroll_up",
+		"a W" => "toggle_widescreen",
+		"a e" => "toggle_embed_original",
+		"e" => "email_article",
+		"a q" => "close_article",
+		"a a" => "select_all",
+		"a u" => "select_unread",
+		"a U" => "select_marked",
+		"a p" => "select_published",
+		"a i" => "select_invert",
+		"a n" => "select_none",
+		"f r" => "feed_refresh",
+		"f a" => "feed_unhide_read",
+		"f s" => "feed_subscribe",
+		"f e" => "feed_edit",
+		"f q" => "feed_catchup",
+		"f x" => "feed_reverse",
+		"f g" => "feed_toggle_vgroup",
+		"f D" => "feed_debug_update",
+		"f G" => "feed_debug_viewfeed",
+		"f C" => "toggle_combined_mode",
+		"f c" => "toggle_cdm_expanded",
+		"Q" => "catchup_all",
+		"x" => "cat_toggle_collapse",
+		"g a" => "goto_all",
+		"g f" => "goto_fresh",
+		"g s" => "goto_marked",
+		"g p" => "goto_published",
+		"g r" => "goto_read",
+		"g t" => "goto_tagcloud",
+		"g P" => "goto_prefs",
+		"r" => "select_article_cursor",
+		"c l" => "create_label",
+		"c f" => "create_filter",
+		"c s" => "collapse_sidebar",
+		"?" => "help_dialog",
+	);
+
+	foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HOTKEY_MAP) as $plugin) {
+		$hotkeys = $plugin->hook_hotkey_map($hotkeys);
+	}
+
+	$prefixes = array();
+
+	foreach (array_keys($hotkeys) as $hotkey) {
+		$pair = explode(" ", $hotkey, 2);
+
+		if (count($pair) > 1 && !in_array($pair[0], $prefixes)) {
+			array_push($prefixes, $pair[0]);
+		}
+	}
+
+	return array($prefixes, $hotkeys);
 }
 
 function make_runtime_info() {
-    $data = array();
+	$data = array();
 
-    $pdo = Db::pdo();
+	$pdo = Db::pdo();
 
-    $sth = $pdo->prepare("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
+	$sth = $pdo->prepare("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
             ttrss_feeds WHERE owner_uid = ?");
-    $sth->execute([$_SESSION['uid']]);
-    $row = $sth->fetch();
-
-    $max_feed_id = $row['mid'];
-    $num_feeds = $row['nf'];
-
-    $data["max_feed_id"] = (int) $max_feed_id;
-    $data["num_feeds"] = (int) $num_feeds;
-    $data['cdm_expanded'] = get_pref('CDM_EXPANDED');
-    $data["labels"] = Labels::get_all_labels($_SESSION["uid"]);
-
-    if (LOG_DESTINATION == 'sql' && $_SESSION['access_level'] >= 10) {
-        if (DB_TYPE == 'pgsql') {
-            $log_interval = "created_at > NOW() - interval '1 hour'";
-        } else {
-            $log_interval = "created_at > DATE_SUB(NOW(), INTERVAL 1 HOUR)";
-        }
+	$sth->execute([$_SESSION['uid']]);
+	$row = $sth->fetch();
 
-        $sth = $pdo->prepare("SELECT COUNT(id) AS cid FROM ttrss_error_log WHERE $log_interval");
-        $sth->execute();
+	$max_feed_id = $row['mid'];
+	$num_feeds = $row['nf'];
 
-        if ($row = $sth->fetch()) {
-            $data['recent_log_events'] = $row['cid'];
-        }
-    }
+	$data["max_feed_id"] = (int) $max_feed_id;
+	$data["num_feeds"] = (int) $num_feeds;
+	$data['cdm_expanded'] = get_pref('CDM_EXPANDED');
+	$data["labels"] = Labels::get_all_labels($_SESSION["uid"]);
 
-    if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+	if (LOG_DESTINATION == 'sql' && $_SESSION['access_level'] >= 10) {
+		if (DB_TYPE == 'pgsql') {
+			$log_interval = "created_at > NOW() - interval '1 hour'";
+		} else {
+			$log_interval = "created_at > DATE_SUB(NOW(), INTERVAL 1 HOUR)";
+		}
 
-        $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
+		$sth = $pdo->prepare("SELECT COUNT(id) AS cid FROM ttrss_error_log WHERE $log_interval");
+		$sth->execute();
 
-        if (time() - $_SESSION["daemon_stamp_check"] > 30) {
+		if ($row = $sth->fetch()) {
+			$data['recent_log_events'] = $row['cid'];
+		}
+	}
 
-            $stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+	if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
 
-            if ($stamp) {
-                $stamp_delta = time() - $stamp;
+		$data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
 
-                if ($stamp_delta > 1800) {
-                    $stamp_check = 0;
-                } else {
-                    $stamp_check = 1;
-                    $_SESSION["daemon_stamp_check"] = time();
-                }
+		if (time() - $_SESSION["daemon_stamp_check"] > 30) {
 
-                $data['daemon_stamp_ok'] = $stamp_check;
+			$stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
 
-                $stamp_fmt = date("Y.m.d, G:i", $stamp);
+			if ($stamp) {
+				$stamp_delta = time() - $stamp;
 
-                $data['daemon_stamp'] = $stamp_fmt;
-            }
-        }
-    }
+				if ($stamp_delta > 1800) {
+					$stamp_check = 0;
+				} else {
+					$stamp_check = 1;
+					$_SESSION["daemon_stamp_check"] = time();
+				}
+
+				$data['daemon_stamp_ok'] = $stamp_check;
 
-    return $data;
+				$stamp_fmt = date("Y.m.d, G:i", $stamp);
+
+				$data['daemon_stamp'] = $stamp_fmt;
+			}
+		}
+	}
+
+	return $data;
 }
 
 function iframe_whitelisted($entry) {
-    @$src = parse_url($entry->getAttribute("src"), PHP_URL_HOST);
+	@$src = parse_url($entry->getAttribute("src"), PHP_URL_HOST);
 
-    if ($src) {
-        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_IFRAME_WHITELISTED) as $plugin) {
-            if ($plugin->hook_iframe_whitelisted($src))
-                return true;
-        }
-    }
+	if ($src) {
+		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_IFRAME_WHITELISTED) as $plugin) {
+			if ($plugin->hook_iframe_whitelisted($src))
+				return true;
+		}
+	}
 
-    return false;
+	return false;
 }
 
 function sanitize($str, $force_remove_images = false, $owner = false, $site_url = false, $highlight_words = false, $article_id = false) {
-    if (!$owner) $owner = $_SESSION["uid"];
+	if (!$owner) $owner = $_SESSION["uid"];
 
-    $res = trim($str); if (!$res) return '';
+	$res = trim($str); if (!$res) return '';
 
-    $doc = new DOMDocument();
-    $doc->loadHTML('<?xml encoding="UTF-8">' . $res);
-    $xpath = new DOMXPath($doc);
+	$doc = new DOMDocument();
+	$doc->loadHTML('<?xml encoding="UTF-8">' . $res);
+	$xpath = new DOMXPath($doc);
 
-    $rewrite_base_url = $site_url ? $site_url : get_self_url_prefix();
+	$rewrite_base_url = $site_url ? $site_url : get_self_url_prefix();
 
-    $entries = $xpath->query('(//a[@href]|//img[@src]|//video/source[@src]|//audio/source[@src]|//picture/source[@src])');
+	$entries = $xpath->query('(//a[@href]|//img[@src]|//video/source[@src]|//audio/source[@src]|//picture/source[@src])');
 
-    foreach ($entries as $entry) {
+	foreach ($entries as $entry) {
 
-        if ($entry->hasAttribute('href')) {
-            $entry->setAttribute('href',
-                rewrite_relative_url($rewrite_base_url, $entry->getAttribute('href')));
+		if ($entry->hasAttribute('href')) {
+			$entry->setAttribute('href',
+				rewrite_relative_url($rewrite_base_url, $entry->getAttribute('href')));
 
-            $entry->setAttribute('rel', 'noopener noreferrer');
-        }
+			$entry->setAttribute('rel', 'noopener noreferrer');
+		}
 
-        if ($entry->hasAttribute('src')) {
-            $src = rewrite_relative_url($rewrite_base_url, $entry->getAttribute('src'));
-            $entry->setAttribute('src', $src);
-        }
+		if ($entry->hasAttribute('src')) {
+			$src = rewrite_relative_url($rewrite_base_url, $entry->getAttribute('src'));
+			$entry->setAttribute('src', $src);
+		}
 
-        if ($entry->nodeName == 'img') {
-            $entry->setAttribute('referrerpolicy', 'no-referrer');
+		if ($entry->nodeName == 'img') {
+			$entry->setAttribute('referrerpolicy', 'no-referrer');
 
-            $entry->removeAttribute('width');
-            $entry->removeAttribute('height');
+			$entry->removeAttribute('width');
+			$entry->removeAttribute('height');
 
-            if ($entry->hasAttribute('src')) {
-                $is_https_url = parse_url($entry->getAttribute('src'), PHP_URL_SCHEME) === 'https';
+			if ($entry->hasAttribute('src')) {
+				$is_https_url = parse_url($entry->getAttribute('src'), PHP_URL_SCHEME) === 'https';
 
-                if (is_prefix_https() && !$is_https_url) {
+				if (is_prefix_https() && !$is_https_url) {
 
-                    if ($entry->hasAttribute('srcset')) {
-                        $entry->removeAttribute('srcset');
-                    }
+					if ($entry->hasAttribute('srcset')) {
+						$entry->removeAttribute('srcset');
+					}
 
-                    if ($entry->hasAttribute('sizes')) {
-                        $entry->removeAttribute('sizes');
-                    }
-                }
-            }
-        }
+					if ($entry->hasAttribute('sizes')) {
+						$entry->removeAttribute('sizes');
+					}
+				}
+			}
+		}
 
-        if ($entry->hasAttribute('src') &&
-                ($owner && get_pref("STRIP_IMAGES", $owner)) || $force_remove_images || $_SESSION["bw_limit"]) {
+		if ($entry->hasAttribute('src') &&
+				($owner && get_pref("STRIP_IMAGES", $owner)) || $force_remove_images || $_SESSION["bw_limit"]) {
 
-            $p = $doc->createElement('p');
+			$p = $doc->createElement('p');
 
-            $a = $doc->createElement('a');
-            $a->setAttribute('href', $entry->getAttribute('src'));
+			$a = $doc->createElement('a');
+			$a->setAttribute('href', $entry->getAttribute('src'));
 
-            $a->appendChild(new DOMText($entry->getAttribute('src')));
-            $a->setAttribute('target', '_blank');
-            $a->setAttribute('rel', 'noopener noreferrer');
+			$a->appendChild(new DOMText($entry->getAttribute('src')));
+			$a->setAttribute('target', '_blank');
+			$a->setAttribute('rel', 'noopener noreferrer');
 
-            $p->appendChild($a);
+			$p->appendChild($a);
 
-            if ($entry->nodeName == 'source') {
+			if ($entry->nodeName == 'source') {
 
-                if ($entry->parentNode && $entry->parentNode->parentNode)
-                    $entry->parentNode->parentNode->replaceChild($p, $entry->parentNode);
+				if ($entry->parentNode && $entry->parentNode->parentNode)
+					$entry->parentNode->parentNode->replaceChild($p, $entry->parentNode);
 
-            } else if ($entry->nodeName == 'img') {
+			} else if ($entry->nodeName == 'img') {
 
-                if ($entry->parentNode)
-                    $entry->parentNode->replaceChild($p, $entry);
+				if ($entry->parentNode)
+					$entry->parentNode->replaceChild($p, $entry);
 
-            }
-        }
+			}
+		}
 
-        if (strtolower($entry->nodeName) == "a") {
-            $entry->setAttribute("target", "_blank");
-            $entry->setAttribute("rel", "noopener noreferrer");
-        }
-    }
-
-    $entries = $xpath->query('//iframe');
-    foreach ($entries as $entry) {
-        if (!iframe_whitelisted($entry)) {
-            $entry->setAttribute('sandbox', 'allow-scripts');
-        } else {
-            if (is_prefix_https()) {
-                $entry->setAttribute("src",
-                    str_replace("http://", "https://",
-                        $entry->getAttribute("src")));
-            }
-        }
-    }
-
-    $allowed_elements = array('a', 'abbr', 'address', 'acronym', 'audio', 'article', 'aside',
-        'b', 'bdi', 'bdo', 'big', 'blockquote', 'body', 'br',
-        'caption', 'cite', 'center', 'code', 'col', 'colgroup',
-        'data', 'dd', 'del', 'details', 'description', 'dfn', 'div', 'dl', 'font',
-        'dt', 'em', 'footer', 'figure', 'figcaption',
-        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hr', 'html', 'i',
-        'img', 'ins', 'kbd', 'li', 'main', 'mark', 'nav', 'noscript',
-        'ol', 'p', 'picture', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section',
-        'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary',
-        'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
-        'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
-
-    if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
-
-    $disallowed_attributes = array('id', 'style', 'class');
-
-    foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SANITIZE) as $plugin) {
-        $retval = $plugin->hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes, $article_id);
-        if (is_array($retval)) {
-            $doc = $retval[0];
-            $allowed_elements = $retval[1];
-            $disallowed_attributes = $retval[2];
-        } else {
-            $doc = $retval;
-        }
-    }
+		if (strtolower($entry->nodeName) == "a") {
+			$entry->setAttribute("target", "_blank");
+			$entry->setAttribute("rel", "noopener noreferrer");
+		}
+	}
 
-    $doc->removeChild($doc->firstChild); //remove doctype
-    $doc = strip_harmful_tags($doc, $allowed_elements, $disallowed_attributes);
+	$entries = $xpath->query('//iframe');
+	foreach ($entries as $entry) {
+		if (!iframe_whitelisted($entry)) {
+			$entry->setAttribute('sandbox', 'allow-scripts');
+		} else {
+			if (is_prefix_https()) {
+				$entry->setAttribute("src",
+					str_replace("http://", "https://",
+						$entry->getAttribute("src")));
+			}
+		}
+	}
 
-    if ($highlight_words) {
-        foreach ($highlight_words as $word) {
+	$allowed_elements = array('a', 'abbr', 'address', 'acronym', 'audio', 'article', 'aside',
+		'b', 'bdi', 'bdo', 'big', 'blockquote', 'body', 'br',
+		'caption', 'cite', 'center', 'code', 'col', 'colgroup',
+		'data', 'dd', 'del', 'details', 'description', 'dfn', 'div', 'dl', 'font',
+		'dt', 'em', 'footer', 'figure', 'figcaption',
+		'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hr', 'html', 'i',
+		'img', 'ins', 'kbd', 'li', 'main', 'mark', 'nav', 'noscript',
+		'ol', 'p', 'picture', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section',
+		'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary',
+		'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
+		'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
 
-            // http://stackoverflow.com/questions/4081372/highlight-keywords-in-a-paragraph
+	if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
 
-            $elements = $xpath->query("//*/text()");
+	$disallowed_attributes = array('id', 'style', 'class');
 
-            foreach ($elements as $child) {
+	foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SANITIZE) as $plugin) {
+		$retval = $plugin->hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes, $article_id);
+		if (is_array($retval)) {
+			$doc = $retval[0];
+			$allowed_elements = $retval[1];
+			$disallowed_attributes = $retval[2];
+		} else {
+			$doc = $retval;
+		}
+	}
 
-                $fragment = $doc->createDocumentFragment();
-                $text = $child->textContent;
+	$doc->removeChild($doc->firstChild); //remove doctype
+	$doc = strip_harmful_tags($doc, $allowed_elements, $disallowed_attributes);
 
-                while (($pos = mb_stripos($text, $word)) !== false) {
-                    $fragment->appendChild(new DomText(mb_substr($text, 0, $pos)));
-                    $word = mb_substr($text, $pos, mb_strlen($word));
-                    $highlight = $doc->createElement('span');
-                    $highlight->appendChild(new DomText($word));
-                    $highlight->setAttribute('class', 'highlight');
-                    $fragment->appendChild($highlight);
-                    $text = mb_substr($text, $pos + mb_strlen($word));
-                }
+	if ($highlight_words) {
+		foreach ($highlight_words as $word) {
 
-                if (!empty($text)) $fragment->appendChild(new DomText($text));
+			// http://stackoverflow.com/questions/4081372/highlight-keywords-in-a-paragraph
 
-                $child->parentNode->replaceChild($fragment, $child);
-            }
-        }
-    }
+			$elements = $xpath->query("//*/text()");
+
+			foreach ($elements as $child) {
+
+				$fragment = $doc->createDocumentFragment();
+				$text = $child->textContent;
 
-    $res = $doc->saveHTML();
+				while (($pos = mb_stripos($text, $word)) !== false) {
+					$fragment->appendChild(new DomText(mb_substr($text, 0, $pos)));
+					$word = mb_substr($text, $pos, mb_strlen($word));
+					$highlight = $doc->createElement('span');
+					$highlight->appendChild(new DomText($word));
+					$highlight->setAttribute('class', 'highlight');
+					$fragment->appendChild($highlight);
+					$text = mb_substr($text, $pos + mb_strlen($word));
+				}
 
-    /* strip everything outside of <body>...</body> */
+				if (!empty($text)) $fragment->appendChild(new DomText($text));
 
-    $res_frag = array();
-    if (preg_match('/<body>(.*)<\/body>/is', $res, $res_frag)) {
-        return $res_frag[1];
-    } else {
-        return $res;
-    }
+				$child->parentNode->replaceChild($fragment, $child);
+			}
+		}
+	}
+
+	$res = $doc->saveHTML();
+
+	/* strip everything outside of <body>...</body> */
+
+	$res_frag = array();
+	if (preg_match('/<body>(.*)<\/body>/is', $res, $res_frag)) {
+		return $res_frag[1];
+	} else {
+		return $res;
+	}
 }
 
 function strip_harmful_tags($doc, $allowed_elements, $disallowed_attributes) {
-    $xpath = new DOMXPath($doc);
-    $entries = $xpath->query('//*');
+	$xpath = new DOMXPath($doc);
+	$entries = $xpath->query('//*');
 
-    foreach ($entries as $entry) {
-        if (!in_array($entry->nodeName, $allowed_elements)) {
-            $entry->parentNode->removeChild($entry);
-        }
+	foreach ($entries as $entry) {
+		if (!in_array($entry->nodeName, $allowed_elements)) {
+			$entry->parentNode->removeChild($entry);
+		}
 
-        if ($entry->hasAttributes()) {
-            $attrs_to_remove = array();
+		if ($entry->hasAttributes()) {
+			$attrs_to_remove = array();
 
-            foreach ($entry->attributes as $attr) {
+			foreach ($entry->attributes as $attr) {
 
-                if (strpos($attr->nodeName, 'on') === 0) {
-                    array_push($attrs_to_remove, $attr);
-                }
+				if (strpos($attr->nodeName, 'on') === 0) {
+					array_push($attrs_to_remove, $attr);
+				}
 
-                if (strpos($attr->nodeName, "data-") === 0) {
-                    array_push($attrs_to_remove, $attr);
-                }
+				if (strpos($attr->nodeName, "data-") === 0) {
+					array_push($attrs_to_remove, $attr);
+				}
 
-                if ($attr->nodeName == 'href' && stripos($attr->value, 'javascript:') === 0) {
-                    array_push($attrs_to_remove, $attr);
-                }
+				if ($attr->nodeName == 'href' && stripos($attr->value, 'javascript:') === 0) {
+					array_push($attrs_to_remove, $attr);
+				}
 
-                if (in_array($attr->nodeName, $disallowed_attributes)) {
-                    array_push($attrs_to_remove, $attr);
-                }
-            }
+				if (in_array($attr->nodeName, $disallowed_attributes)) {
+					array_push($attrs_to_remove, $attr);
+				}
+			}
 
-            foreach ($attrs_to_remove as $attr) {
-                $entry->removeAttributeNode($attr);
-            }
-        }
-    }
+			foreach ($attrs_to_remove as $attr) {
+				$entry->removeAttributeNode($attr);
+			}
+		}
+	}
 
-    return $doc;
+	return $doc;
 }
 
 function trim_array($array) {
-    $tmp = $array;
-    array_walk($tmp, 'trim');
-    return $tmp;
+	$tmp = $array;
+	array_walk($tmp, 'trim');
+	return $tmp;
 }
 
 function render_login_form() {
-    header('Cache-Control: public');
+	header('Cache-Control: public');
 
-    require_once "login_form.php";
-    exit;
+	require_once "login_form.php";
+	exit;
 }
 
 function T_sprintf() {
-    $args = func_get_args();
-    return vsprintf(__(array_shift($args)), $args);
+	$args = func_get_args();
+	return vsprintf(__(array_shift($args)), $args);
 }
 
 function print_checkpoint($n, $s) {
-    $ts = microtime(true);
-    echo sprintf("<!-- CP[$n] %.4f seconds -->\n", $ts - $s);
-    return $ts;
+	$ts = microtime(true);
+	echo sprintf("<!-- CP[$n] %.4f seconds -->\n", $ts - $s);
+	return $ts;
 }
 
 function is_server_https() {
-    return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https';
+	return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https';
 }
 
 function is_prefix_https() {
-    return parse_url(SELF_URL_PATH, PHP_URL_SCHEME) == 'https';
+	return parse_url(SELF_URL_PATH, PHP_URL_SCHEME) == 'https';
 }
 
 // this returns SELF_URL_PATH sans ending slash
 function get_self_url_prefix() {
-    if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH)-1) {
-        return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH)-1);
-    } else {
-        return SELF_URL_PATH;
-    }
+	if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH)-1) {
+		return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH)-1);
+	} else {
+		return SELF_URL_PATH;
+	}
 }
 
 /* TODO: This needs to use bcrypt */
 function encrypt_password($pass, $salt = '', $mode2 = false) {
-    if ($salt && $mode2) {
-        return "MODE2:" . hash('sha256', $salt . $pass);
-    } else if ($salt) {
-        return "SHA1X:" . sha1("$salt:$pass");
-    } else {
-        return "SHA1:" . sha1($pass);
-    }
+	if ($salt && $mode2) {
+		return "MODE2:" . hash('sha256', $salt . $pass);
+	} else if ($salt) {
+		return "SHA1X:" . sha1("$salt:$pass");
+	} else {
+		return "SHA1:" . sha1($pass);
+	}
 }
 
 function init_plugins() {
-    PluginHost::getInstance()->load(PLUGINS, PluginHost::KIND_ALL);
+	PluginHost::getInstance()->load(PLUGINS, PluginHost::KIND_ALL);
 
-    return true;
+	return true;
 }
 
 function build_url($parts) {
-    return $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
+	return $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
 }
 
 function cleanup_url_path($path) {
-    $path = str_replace("/./", "/", $path);
-    $path = str_replace("//", "/", $path);
+	$path = str_replace("/./", "/", $path);
+	$path = str_replace("//", "/", $path);
 
-    return $path;
+	return $path;
 }
 
 /**
@@ -1542,98 +1542,98 @@ 
  * @return string Absolute URL
  */
 function rewrite_relative_url($url, $rel_url) {
-    if (strpos($rel_url, "://") !== false) {
-        return $rel_url;
-    } else if (strpos($rel_url, "//") === 0) {
-        # protocol-relative URL (rare but they exist)
-        return $rel_url;
-    } else if (preg_match("/^[a-z]+:/i", $rel_url)) {
-        # magnet:, feed:, etc
-        return $rel_url;
-    } else if (strpos($rel_url, "/") === 0) {
-        $parts = parse_url($url);
-        $parts['path'] = $rel_url;
-        $parts['path'] = cleanup_url_path($parts['path']);
-
-        return build_url($parts);
-
-    } else {
-        $parts = parse_url($url);
-        if (!isset($parts['path'])) {
-            $parts['path'] = '/';
-        }
-        $dir = $parts['path'];
-        if (substr($dir, -1) !== '/') {
-            $dir = dirname($parts['path']);
-            $dir !== '/' && $dir .= '/';
-        }
-        $parts['path'] = $dir . $rel_url;
-        $parts['path'] = cleanup_url_path($parts['path']);
-
-        return build_url($parts);
-    }
+	if (strpos($rel_url, "://") !== false) {
+		return $rel_url;
+	} else if (strpos($rel_url, "//") === 0) {
+		# protocol-relative URL (rare but they exist)
+		return $rel_url;
+	} else if (preg_match("/^[a-z]+:/i", $rel_url)) {
+		# magnet:, feed:, etc
+		return $rel_url;
+	} else if (strpos($rel_url, "/") === 0) {
+		$parts = parse_url($url);
+		$parts['path'] = $rel_url;
+		$parts['path'] = cleanup_url_path($parts['path']);
+
+		return build_url($parts);
+
+	} else {
+		$parts = parse_url($url);
+		if (!isset($parts['path'])) {
+			$parts['path'] = '/';
+		}
+		$dir = $parts['path'];
+		if (substr($dir, -1) !== '/') {
+			$dir = dirname($parts['path']);
+			$dir !== '/' && $dir .= '/';
+		}
+		$parts['path'] = $dir . $rel_url;
+		$parts['path'] = cleanup_url_path($parts['path']);
+
+		return build_url($parts);
+	}
 }
 
 function print_user_stylesheet() {
-    $value = get_pref('USER_STYLESHEET');
+	$value = get_pref('USER_STYLESHEET');
 
-    if ($value) {
-        print "<style type='text/css' id='user_css_style'>";
-        print str_replace("<br/>", "\n", $value);
-        print "</style>";
-    }
+	if ($value) {
+		print "<style type='text/css' id='user_css_style'>";
+		print str_replace("<br/>", "\n", $value);
+		print "</style>";
+	}
 }
 
 if (!function_exists('gzdecode')) {
-    function gzdecode($string) {
-        return file_get_contents('compress.zlib://data:who/cares;base64,'.base64_encode($string));
-    }
+	function gzdecode($string) {
+		return file_get_contents('compress.zlib://data:who/cares;base64,'.base64_encode($string));
+	}
 }
 
 function get_random_bytes($length) {
-    if (function_exists('openssl_random_pseudo_bytes')) {
-        return openssl_random_pseudo_bytes($length);
-    } else {
-        $output = "";
+	if (function_exists('openssl_random_pseudo_bytes')) {
+		return openssl_random_pseudo_bytes($length);
+	} else {
+		$output = "";
 
-        for ($i = 0; $i < $length; $i++)
-            $output .= chr(mt_rand(0, 255));
+		for ($i = 0; $i < $length; $i++)
+			$output .= chr(mt_rand(0, 255));
 
-        return $output;
-    }
+		return $output;
+	}
 }
 
 function read_stdin() {
-    $fp = fopen("php://stdin", "r");
+	$fp = fopen("php://stdin", "r");
 
-    if ($fp) {
-        $line = trim(fgets($fp));
-        fclose($fp);
-        return $line;
-    }
+	if ($fp) {
+		$line = trim(fgets($fp));
+		fclose($fp);
+		return $line;
+	}
 
-    return null;
+	return null;
 }
 
 function implements_interface($class, $interface) {
-    return in_array($interface, class_implements($class));
+	return in_array($interface, class_implements($class));
 }
 
 function T_js_decl($s1, $s2) {
-    if ($s1 && $s2) {
-        $s1 = preg_replace("/\n/", "", $s1);
-        $s2 = preg_replace("/\n/", "", $s2);
+	if ($s1 && $s2) {
+		$s1 = preg_replace("/\n/", "", $s1);
+		$s2 = preg_replace("/\n/", "", $s2);
 
-        $s1 = preg_replace("/\"/", "\\\"", $s1);
-        $s2 = preg_replace("/\"/", "\\\"", $s2);
+		$s1 = preg_replace("/\"/", "\\\"", $s1);
+		$s2 = preg_replace("/\"/", "\\\"", $s2);
 
-        return "T_messages[\"$s1\"] = \"$s2\";\n";
-    }
+		return "T_messages[\"$s1\"] = \"$s2\";\n";
+	}
 }
 
 function init_js_translations() {
 
-    print 'var T_messages = new Object();
+	print 'var T_messages = new Object();
 
         public function __(msg) {
             if (T_messages[msg]) {
@@ -1647,78 +1647,78 @@ 
             return __((parseInt(n) > 1) ? msg2 : msg1);
         }';
 
-    global $text_domains;
+	global $text_domains;
 
-    foreach (array_keys($text_domains) as $domain) {
-        $l10n = _get_reader($domain);
+	foreach (array_keys($text_domains) as $domain) {
+		$l10n = _get_reader($domain);
 
-        for ($i = 0; $i < $l10n->total; $i++) {
-            $orig = $l10n->get_original_string($i);
-            if(strpos($orig, "\000") !== FALSE) { // Plural forms
-                $key = explode(chr(0), $orig);
-                print T_js_decl($key[0], _ngettext($key[0], $key[1], 1)); // Singular
-                print T_js_decl($key[1], _ngettext($key[0], $key[1], 2)); // Plural
-            } else {
-                $translation = _dgettext($domain,$orig);
-                print T_js_decl($orig, $translation);
-            }
-        }
-    }
+		for ($i = 0; $i < $l10n->total; $i++) {
+			$orig = $l10n->get_original_string($i);
+			if(strpos($orig, "\000") !== FALSE) { // Plural forms
+				$key = explode(chr(0), $orig);
+				print T_js_decl($key[0], _ngettext($key[0], $key[1], 1)); // Singular
+				print T_js_decl($key[1], _ngettext($key[0], $key[1], 2)); // Plural
+			} else {
+				$translation = _dgettext($domain,$orig);
+				print T_js_decl($orig, $translation);
+			}
+		}
+	}
 }
 
 function get_theme_path($theme) {
-    if ($theme == "default.php")
-        return "css/default.css";
+	if ($theme == "default.php")
+		return "css/default.css";
 
-    $check = "themes/$theme";
-    if (file_exists($check)) return $check;
+	$check = "themes/$theme";
+	if (file_exists($check)) return $check;
 
-    $check = "themes.local/$theme";
-    if (file_exists($check)) return $check;
+	$check = "themes.local/$theme";
+	if (file_exists($check)) return $check;
 }
 
 function theme_exists($theme) {
-    return file_exists("themes/$theme") || file_exists("themes.local/$theme");
+	return file_exists("themes/$theme") || file_exists("themes.local/$theme");
 }
 
 function error_json($code) {
-    require_once "errors.php";
+	require_once "errors.php";
 
-    @$message = $ERRORS[$code];
+	@$message = $ERRORS[$code];
 
-    return json_encode(
-        array(
-            "error" => array(
-                "code" => $code,
-                "message" => $message
-            )
-        )
-    );
+	return json_encode(
+		array(
+			"error" => array(
+				"code" => $code,
+				"message" => $message
+			)
+		)
+	);
 }
 
 function get_upload_error_message($code) {
-    $errors = array(
-        0 => __('There is no error, the file uploaded with success'),
-        1 => __('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
-        2 => __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
-        3 => __('The uploaded file was only partially uploaded'),
-        4 => __('No file was uploaded'),
-        6 => __('Missing a temporary folder'),
-        7 => __('Failed to write file to disk.'),
-        8 => __('A PHP extension stopped the file upload.'),
-    );
+	$errors = array(
+		0 => __('There is no error, the file uploaded with success'),
+		1 => __('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
+		2 => __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
+		3 => __('The uploaded file was only partially uploaded'),
+		4 => __('No file was uploaded'),
+		6 => __('Missing a temporary folder'),
+		7 => __('Failed to write file to disk.'),
+		8 => __('A PHP extension stopped the file upload.'),
+	);
 
-    return $errors[$code];
+	return $errors[$code];
 }
 
 function base64_img($filename) {
-    if (file_exists($filename)) {
-        $ext = pathinfo($filename, PATHINFO_EXTENSION);
+	if (file_exists($filename)) {
+		$ext = pathinfo($filename, PATHINFO_EXTENSION);
 
-        return "data:image/$ext;base64," . base64_encode(file_get_contents($filename));
-    } else {
-        return "";
-    }
+		return "data:image/$ext;base64," . base64_encode(file_get_contents($filename));
+	} else {
+		return "";
+	}
 }
 
 /*	this is essentially a wrapper for readfile() which allows plugins to hook
@@ -1729,52 +1729,52 @@ 
     note that this can be called without user context so the plugin to handle this
     should be loaded systemwide in config.php */
 function send_local_file($filename) {
-    if (file_exists($filename)) {
+	if (file_exists($filename)) {
 
-        if (is_writable($filename)) touch($filename);
+		if (is_writable($filename)) touch($filename);
 
-        $tmppluginhost = new PluginHost();
+		$tmppluginhost = new PluginHost();
 
-        $tmppluginhost->load(PLUGINS, PluginHost::KIND_SYSTEM);
-        $tmppluginhost->load_data();
+		$tmppluginhost->load(PLUGINS, PluginHost::KIND_SYSTEM);
+		$tmppluginhost->load_data();
 
-        foreach ($tmppluginhost->get_hooks(PluginHost::HOOK_SEND_LOCAL_FILE) as $plugin) {
-            if ($plugin->hook_send_local_file($filename)) return true;
-        }
+		foreach ($tmppluginhost->get_hooks(PluginHost::HOOK_SEND_LOCAL_FILE) as $plugin) {
+			if ($plugin->hook_send_local_file($filename)) return true;
+		}
 
-        $mimetype = mime_content_type($filename);
+		$mimetype = mime_content_type($filename);
 
-        // this is hardly ideal but 1) only media is cached in images/ and 2) seemingly only mp4
-        // video files are detected as octet-stream by mime_content_type()
+		// this is hardly ideal but 1) only media is cached in images/ and 2) seemingly only mp4
+		// video files are detected as octet-stream by mime_content_type()
 
-        if ($mimetype == "application/octet-stream")
-            $mimetype = "video/mp4";
+		if ($mimetype == "application/octet-stream")
+			$mimetype = "video/mp4";
 
-        header("Content-type: $mimetype");
+		header("Content-type: $mimetype");
 
-        $stamp = gmdate("D, d M Y H:i:s", filemtime($filename)) . " GMT";
-        header("Last-Modified: $stamp", true);
+		$stamp = gmdate("D, d M Y H:i:s", filemtime($filename)) . " GMT";
+		header("Last-Modified: $stamp", true);
 
-        return readfile($filename);
-    } else {
-        return false;
-    }
+		return readfile($filename);
+	} else {
+		return false;
+	}
 }
 
 function arr_qmarks($arr) {
-    return str_repeat('?,', count($arr) - 1) . '?';
+	return str_repeat('?,', count($arr) - 1) . '?';
 }
 
 function get_scripts_timestamp() {
-    $files = glob("js/*.js");
-    $ts = 0;
+	$files = glob("js/*.js");
+	$ts = 0;
 
-    foreach ($files as $file) {
-        $file_ts = filemtime($file);
-        if ($file_ts > $ts) $ts = $file_ts;
-    }
+	foreach ($files as $file) {
+		$file_ts = filemtime($file);
+		if ($file_ts > $ts) $ts = $file_ts;
+	}
 
-    return $ts;
+	return $ts;
 }
 
 /* for package maintainers who don't use git: if version_static.txt exists in tt-rss root
@@ -1782,45 +1782,45 @@ 
     based on source git tree commit used when creating the package */
 
 function get_version(&$git_commit = false, &$git_timestamp = false) {
-    global $ttrss_version;
+	global $ttrss_version;
 
-    if (isset($ttrss_version))
-        return $ttrss_version;
+	if (isset($ttrss_version))
+		return $ttrss_version;
 
-    $ttrss_version = "UNKNOWN (Unsupported)";
+	$ttrss_version = "UNKNOWN (Unsupported)";
 
-    date_default_timezone_set('UTC');
-    $root_dir = dirname(dirname(__FILE__));
+	date_default_timezone_set('UTC');
+	$root_dir = dirname(dirname(__FILE__));
 
-    if ('\\' === DIRECTORY_SEPARATOR) {
-        $ttrss_version = "UNKNOWN (Unsupported, Windows)";
-    } else if (PHP_OS === "Darwin") {
-        $ttrss_version = "UNKNOWN (Unsupported, Darwin)";
-    } else if (file_exists("$root_dir/version_static.txt")) {
-        $ttrss_version = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)";
-    } else if (is_dir("$root_dir/.git")) {
-        $rc = 0;
-        $output = [];
+	if ('\\' === DIRECTORY_SEPARATOR) {
+		$ttrss_version = "UNKNOWN (Unsupported, Windows)";
+	} else if (PHP_OS === "Darwin") {
+		$ttrss_version = "UNKNOWN (Unsupported, Darwin)";
+	} else if (file_exists("$root_dir/version_static.txt")) {
+		$ttrss_version = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)";
+	} else if (is_dir("$root_dir/.git")) {
+		$rc = 0;
+		$output = [];
 
-        $cwd = getcwd();
+		$cwd = getcwd();
 
-        chdir($root_dir);
-        exec('git log --pretty='.escapeshellarg('%ct %h').' -n1 HEAD 2>&1', $output, $rc);
-        chdir($cwd);
+		chdir($root_dir);
+		exec('git log --pretty='.escapeshellarg('%ct %h').' -n1 HEAD 2>&1', $output, $rc);
+		chdir($cwd);
 
-        if ($rc == 0) {
-            if (is_array($output) && count($output) > 0) {
-                list ($timestamp, $commit) = explode(" ", $output[0], 2);
+		if ($rc == 0) {
+			if (is_array($output) && count($output) > 0) {
+				list ($timestamp, $commit) = explode(" ", $output[0], 2);
 
-                $git_commit = $commit;
-                $git_timestamp = $timestamp;
+				$git_commit = $commit;
+				$git_timestamp = $timestamp;
 
-                $ttrss_version = strftime("%y.%m", $timestamp) . "-$commit";
-            }
-        } else {
-            user_error("Unable to determine version (using $root_dir): " . implode("\n", $output), E_USER_WARNING);
-        }
-    }
+				$ttrss_version = strftime("%y.%m", $timestamp) . "-$commit";
+			}
+		} else {
+			user_error("Unable to determine version (using $root_dir): " . implode("\n", $output), E_USER_WARNING);
+		}
+	}
 
-    return $ttrss_version;
+	return $ttrss_version;
 }

Spacing +53 added lines, -54 removed lines

@@ -5,7 +5,7 @@ 
 define('LABEL_BASE_INDEX', -1024);
 define('PLUGIN_FEED_BASE_INDEX', -128);
 
-define('COOKIE_LIFETIME_LONG', 86400*365);
+define('COOKIE_LIFETIME_LONG', 86400 * 365);
 
 $fetch_last_error = false;
 $fetch_last_error_code = false;
@@ -57,13 +57,13 @@ 
 // feed limit for one update batch
 define_default('DAEMON_SLEEP_INTERVAL', 120);
 // default sleep interval between feed updates (sec)
-define_default('MAX_CACHE_FILE_SIZE', 64*1024*1024);
+define_default('MAX_CACHE_FILE_SIZE', 64 * 1024 * 1024);
 // do not cache files larger than that (bytes)
-define_default('MAX_DOWNLOAD_FILE_SIZE', 16*1024*1024);
+define_default('MAX_DOWNLOAD_FILE_SIZE', 16 * 1024 * 1024);
 // do not download general files larger than that (bytes)
 define_default('CACHE_MAX_DAYS', 7);
 // max age in days for various automatically cached (temporary) files
-define_default('MAX_CONDITIONAL_INTERVAL', 3600*12);
+define_default('MAX_CONDITIONAL_INTERVAL', 3600 * 12);
 // max interval between forced unconditional updates for servers
 // not complying with http if-modified-since (seconds)
 define_default('MAX_FETCH_REQUESTS_PER_HOST', 25);
@@ -157,7 +157,7 @@ 
 require_once 'db-prefs.php';
 require_once 'controls.php';
 
-define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . get_version() . ' (http://tt-rss.org/)');
+define('SELF_USER_AGENT', 'Tiny Tiny RSS/'.get_version().' (http://tt-rss.org/)');
 ini_set('user_agent', SELF_USER_AGENT);
 
 $schema_version = false;
@@ -201,7 +201,7 @@ 
     if (!is_array($options)) {
 
         // falling back on compatibility shim
-        $option_names = [ "url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent" ];
+        $option_names = ["url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent"];
         $tmp = [];
 
         for ($i = 0; $i < func_num_args(); $i++) {
@@ -228,13 +228,13 @@ 
     $url = str_replace(' ', '%20', $url);
 
     if (strpos($url, "//") === 0)
-        $url = 'http:' . $url;
+        $url = 'http:'.$url;
 
     $url_host = parse_url($url, PHP_URL_HOST);
     $fetch_domain_hits[$url_host] += 1;
 
     if ($fetch_domain_hits[$url_host] > MAX_FETCH_REQUESTS_PER_HOST) {
-        user_error("Exceeded fetch request quota for $url_host: " . $fetch_domain_hits[$url_host], E_USER_WARNING);
+        user_error("Exceeded fetch request quota for $url_host: ".$fetch_domain_hits[$url_host], E_USER_WARNING);
         #return false;
     }
 
@@ -250,7 +250,7 @@ 
             array_push($curl_http_headers, "If-Modified-Since: $last_modified");
 
         if ($http_accept)
-            array_push($curl_http_headers, "Accept: " . $http_accept);
+            array_push($curl_http_headers, "Accept: ".$http_accept);
 
         if (count($curl_http_headers) > 0)
             curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
@@ -263,11 +263,10 @@ 
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HEADER, true);
         curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-        curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent :
-            SELF_USER_AGENT);
+        curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent : SELF_USER_AGENT);
         curl_setopt($ch, CURLOPT_ENCODING, "");
 
-        if  ($http_referrer)
+        if ($http_referrer)
             curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
 
         if ($max_size) {
@@ -276,7 +275,7 @@ 
 
             // holy shit closures in php
             // download & upload are *expected* sizes respectively, could be zero
-            curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use( &$max_size) {
+            curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use(&$max_size) {
                 Debug::log("[curl progressfunction] $downloaded $max_size", Debug::$LOG_EXTENDED);
 
                 return ($downloaded > $max_size) ? 1 : 0; // if max size is set, abort when exceeding it
@@ -336,7 +335,7 @@ 
         if ($http_code != 200 || $type && strpos($fetch_last_content_type, "$type") === false) {
 
             if (curl_errno($ch) != 0) {
-                $fetch_last_error .=  "; " . curl_errno($ch) . " " . curl_error($ch);
+                $fetch_last_error .= "; ".curl_errno($ch)." ".curl_error($ch);
             }
 
             $fetch_last_error_content = $contents;
@@ -345,7 +344,7 @@ 
         }
 
         if (!$contents) {
-            $fetch_last_error = curl_errno($ch) . " " . curl_error($ch);
+            $fetch_last_error = curl_errno($ch)." ".curl_error($ch);
             curl_close($ch);
             return false;
         }
@@ -365,7 +364,7 @@ 
 
         $fetch_curl_used = false;
 
-        if ($login && $pass){
+        if ($login && $pass) {
             $url_parts = array();
 
             preg_match("/(^[^:]*):\/\/(.*)/", $url, $url_parts);
@@ -373,7 +372,7 @@ 
             $pass = urlencode($pass);
 
             if ($url_parts[1] && $url_parts[2]) {
-                $url = $url_parts[1] . "://$login:$pass@" . $url_parts[2];
+                $url = $url_parts[1]."://$login:$pass@".$url_parts[2];
             }
         }
 
@@ -441,7 +440,7 @@ 
             $error = error_get_last();
 
             if ($error['message'] != $old_error['message']) {
-                $fetch_last_error .= "; " . $error["message"];
+                $fetch_last_error .= "; ".$error["message"];
             }
 
             $fetch_last_error_content = $data;
@@ -516,15 +515,15 @@ 
 
 function get_ssl_certificate_id() {
     if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]) {
-        return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] .
-            $_SERVER["REDIRECT_SSL_CLIENT_V_START"] .
-            $_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
+        return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"].
+            $_SERVER["REDIRECT_SSL_CLIENT_V_START"].
+            $_SERVER["REDIRECT_SSL_CLIENT_V_END"].
             $_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
     }
     if ($_SERVER["SSL_CLIENT_M_SERIAL"]) {
-        return sha1($_SERVER["SSL_CLIENT_M_SERIAL"] .
-            $_SERVER["SSL_CLIENT_V_START"] .
-            $_SERVER["SSL_CLIENT_V_END"] .
+        return sha1($_SERVER["SSL_CLIENT_M_SERIAL"].
+            $_SERVER["SSL_CLIENT_V_START"].
+            $_SERVER["SSL_CLIENT_V_END"].
             $_SERVER["SSL_CLIENT_S_DN"]);
     }
     return "";
@@ -659,7 +658,7 @@ 
 function logout_user() {
     @session_destroy();
     if (isset($_COOKIE[session_name()])) {
-       setcookie(session_name(), '', time()-42000, '/');
+       setcookie(session_name(), '', time() - 42000, '/');
     }
     session_commit();
 }
@@ -743,7 +742,7 @@ 
 
 function truncate_string($str, $max_len, $suffix = '&hellip;') {
     if (mb_strlen($str, "utf-8") > $max_len) {
-        return mb_substr($str, 0, $max_len, "utf-8") . $suffix;
+        return mb_substr($str, 0, $max_len, "utf-8").$suffix;
     } else {
         return $str;
     }
@@ -753,7 +752,7 @@ 
     $startString = mb_substr($original, 0, $position, "UTF-8");
     $endString = mb_substr($original, $position + $length, mb_strlen($original), "UTF-8");
 
-    $out = $startString . $replacement . $endString;
+    $out = $startString.$replacement.$endString;
 
     return $out;
 }
@@ -891,9 +890,9 @@ 
 }
 
 function file_is_locked($filename) {
-    if (file_exists(LOCK_DIRECTORY . "/$filename")) {
+    if (file_exists(LOCK_DIRECTORY."/$filename")) {
         if (function_exists('flock')) {
-            $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
+            $fp = @fopen(LOCK_DIRECTORY."/$filename", "r");
             if ($fp) {
                 if (flock($fp, LOCK_EX | LOCK_NB)) {
                     flock($fp, LOCK_UN);
@@ -914,11 +913,11 @@ 
 
 
 function make_lockfile($filename) {
-    $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+    $fp = fopen(LOCK_DIRECTORY."/$filename", "w");
 
     if ($fp && flock($fp, LOCK_EX | LOCK_NB)) {
         $stat_h = fstat($fp);
-        $stat_f = stat(LOCK_DIRECTORY . "/$filename");
+        $stat_f = stat(LOCK_DIRECTORY."/$filename");
 
         if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
             if ($stat_h["ino"] != $stat_f["ino"] ||
@@ -929,7 +928,7 @@ 
         }
 
         if (function_exists('posix_getpid')) {
-            fwrite($fp, posix_getpid() . "\n");
+            fwrite($fp, posix_getpid()."\n");
         }
         return $fp;
     } else {
@@ -938,10 +937,10 @@ 
 }
 
 function make_stampfile($filename) {
-    $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+    $fp = fopen(LOCK_DIRECTORY."/$filename", "w");
 
     if (flock($fp, LOCK_EX | LOCK_NB)) {
-        fwrite($fp, time() . "\n");
+        fwrite($fp, time()."\n");
         flock($fp, LOCK_UN);
         fclose($fp);
         return true;
@@ -991,7 +990,7 @@ 
     $params["is_default_pw"] = Pref_Prefs::isdefaultpassword();
     $params["label_base_index"] = (int) LABEL_BASE_INDEX;
 
-    $theme = get_pref( "USER_CSS_THEME", false, false);
+    $theme = get_pref("USER_CSS_THEME", false, false);
     $params["theme"] = theme_exists($theme) ? $theme : "";
 
     $params["plugins"] = implode(", ", PluginHost::getInstance()->get_plugin_names());
@@ -1215,13 +1214,13 @@ 
         }
     }
 
-    if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+    if (file_exists(LOCK_DIRECTORY."/update_daemon.lock")) {
 
         $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
 
         if (time() - $_SESSION["daemon_stamp_check"] > 30) {
 
-            $stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+            $stamp = (int) @file_get_contents(LOCK_DIRECTORY."/update_daemon.stamp");
 
             if ($stamp) {
                 $stamp_delta = time() - $stamp;
@@ -1264,7 +1263,7 @@ 
     $res = trim($str); if (!$res) return '';
 
     $doc = new DOMDocument();
-    $doc->loadHTML('<?xml encoding="UTF-8">' . $res);
+    $doc->loadHTML('<?xml encoding="UTF-8">'.$res);
     $xpath = new DOMXPath($doc);
 
     $rewrite_base_url = $site_url ? $site_url : get_self_url_prefix();
@@ -1363,7 +1362,7 @@ 
         'ol', 'p', 'picture', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section',
         'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary',
         'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
-        'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
+        'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace');
 
     if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
 
@@ -1498,8 +1497,8 @@ 
 
 // this returns SELF_URL_PATH sans ending slash
 function get_self_url_prefix() {
-    if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH)-1) {
-        return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH)-1);
+    if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH) - 1) {
+        return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH) - 1);
     } else {
         return SELF_URL_PATH;
     }
@@ -1508,11 +1507,11 @@ 
 /* TODO: This needs to use bcrypt */
 function encrypt_password($pass, $salt = '', $mode2 = false) {
     if ($salt && $mode2) {
-        return "MODE2:" . hash('sha256', $salt . $pass);
+        return "MODE2:".hash('sha256', $salt.$pass);
     } else if ($salt) {
-        return "SHA1X:" . sha1("$salt:$pass");
+        return "SHA1X:".sha1("$salt:$pass");
     } else {
-        return "SHA1:" . sha1($pass);
+        return "SHA1:".sha1($pass);
     }
 }
 
@@ -1523,7 +1522,7 @@ 
 }
 
 function build_url($parts) {
-    return $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
+    return $parts['scheme']."://".$parts['host'].$parts['path'];
 }
 
 function cleanup_url_path($path) {
@@ -1567,7 +1566,7 @@ 
             $dir = dirname($parts['path']);
             $dir !== '/' && $dir .= '/';
         }
-        $parts['path'] = $dir . $rel_url;
+        $parts['path'] = $dir.$rel_url;
         $parts['path'] = cleanup_url_path($parts['path']);
 
         return build_url($parts);
@@ -1654,12 +1653,12 @@ 
 
         for ($i = 0; $i < $l10n->total; $i++) {
             $orig = $l10n->get_original_string($i);
-            if(strpos($orig, "\000") !== FALSE) { // Plural forms
+            if (strpos($orig, "\000") !== FALSE) { // Plural forms
                 $key = explode(chr(0), $orig);
                 print T_js_decl($key[0], _ngettext($key[0], $key[1], 1)); // Singular
                 print T_js_decl($key[1], _ngettext($key[0], $key[1], 2)); // Plural
             } else {
-                $translation = _dgettext($domain,$orig);
+                $translation = _dgettext($domain, $orig);
                 print T_js_decl($orig, $translation);
             }
         }
@@ -1715,7 +1714,7 @@ 
     if (file_exists($filename)) {
         $ext = pathinfo($filename, PATHINFO_EXTENSION);
 
-        return "data:image/$ext;base64," . base64_encode(file_get_contents($filename));
+        return "data:image/$ext;base64,".base64_encode(file_get_contents($filename));
     } else {
         return "";
     }
@@ -1752,7 +1751,7 @@ 
 
         header("Content-type: $mimetype");
 
-        $stamp = gmdate("D, d M Y H:i:s", filemtime($filename)) . " GMT";
+        $stamp = gmdate("D, d M Y H:i:s", filemtime($filename))." GMT";
         header("Last-Modified: $stamp", true);
 
         return readfile($filename);
@@ -1762,7 +1761,7 @@ 
 }
 
 function arr_qmarks($arr) {
-    return str_repeat('?,', count($arr) - 1) . '?';
+    return str_repeat('?,', count($arr) - 1).'?';
 }
 
 function get_scripts_timestamp() {
@@ -1797,7 +1796,7 @@ 
     } else if (PHP_OS === "Darwin") {
         $ttrss_version = "UNKNOWN (Unsupported, Darwin)";
     } else if (file_exists("$root_dir/version_static.txt")) {
-        $ttrss_version = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)";
+        $ttrss_version = trim(file_get_contents("$root_dir/version_static.txt"))." (Unsupported)";
     } else if (is_dir("$root_dir/.git")) {
         $rc = 0;
         $output = [];
@@ -1815,10 +1814,10 @@ 
                 $git_commit = $commit;
                 $git_timestamp = $timestamp;
 
-                $ttrss_version = strftime("%y.%m", $timestamp) . "-$commit";
+                $ttrss_version = strftime("%y.%m", $timestamp)."-$commit";
             }
         } else {
-            user_error("Unable to determine version (using $root_dir): " . implode("\n", $output), E_USER_WARNING);
+            user_error("Unable to determine version (using $root_dir): ".implode("\n", $output), E_USER_WARNING);
         }
     }
 

Braces +128 added lines, -65 removed lines

@@ -18,7 +18,9 @@ 
 libxml_use_internal_errors(true);
 
 // separate test because this is included before sanity checks
-if (function_exists("mb_internal_encoding")) mb_internal_encoding("UTF-8");
+if (function_exists("mb_internal_encoding")) {
+	mb_internal_encoding("UTF-8");
+}
 
 date_default_timezone_set('UTC');
 if (defined('E_DEPRECATED')) {
@@ -195,8 +197,9 @@ 
     $fetch_last_modified = "";
     $fetch_effective_url = "";
 
-    if (!is_array($fetch_domain_hits))
-        $fetch_domain_hits = [];
+    if (!is_array($fetch_domain_hits)) {
+            $fetch_domain_hits = [];
+    }
 
     if (!is_array($options)) {
 
@@ -227,8 +230,9 @@ 
     $url = ltrim($url, ' ');
     $url = str_replace(' ', '%20', $url);
 
-    if (strpos($url, "//") === 0)
-        $url = 'http:' . $url;
+    if (strpos($url, "//") === 0) {
+            $url = 'http:' . $url;
+    }
 
     $url_host = parse_url($url, PHP_URL_HOST);
     $fetch_domain_hits[$url_host] += 1;
@@ -246,14 +250,17 @@ 
 
         $curl_http_headers = [];
 
-        if ($last_modified && !$post_query)
-            array_push($curl_http_headers, "If-Modified-Since: $last_modified");
+        if ($last_modified && !$post_query) {
+                    array_push($curl_http_headers, "If-Modified-Since: $last_modified");
+        }
 
-        if ($http_accept)
-            array_push($curl_http_headers, "Accept: " . $http_accept);
+        if ($http_accept) {
+                    array_push($curl_http_headers, "Accept: " . $http_accept);
+        }
 
-        if (count($curl_http_headers) > 0)
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
+        if (count($curl_http_headers) > 0) {
+                    curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
+        }
 
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
@@ -267,8 +274,9 @@ 
             SELF_USER_AGENT);
         curl_setopt($ch, CURLOPT_ENCODING, "");
 
-        if  ($http_referrer)
-            curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
+        if  ($http_referrer) {
+                    curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
+        }
 
         if ($max_size) {
             curl_setopt($ch, CURLOPT_NOPROGRESS, false);
@@ -297,8 +305,9 @@ 
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query);
         }
 
-        if ($login && $pass)
-            curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
+        if ($login && $pass) {
+                    curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
+        }
 
         $ret = @curl_exec($ch);
 
@@ -357,7 +366,9 @@ 
         if ($is_gzipped) {
             $tmp = @gzdecode($contents);
 
-            if ($tmp) $contents = $tmp;
+            if ($tmp) {
+            	$contents = $tmp;
+            }
         }
 
         return $contents;
@@ -390,14 +401,17 @@ 
                     'protocol_version'=> 1.1)
               );
 
-        if (!$post_query && $last_modified)
-            array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
+        if (!$post_query && $last_modified) {
+                    array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
+        }
 
-        if ($http_accept)
-            array_push($context_options['http']['header'], "Accept: $http_accept");
+        if ($http_accept) {
+                    array_push($context_options['http']['header'], "Accept: $http_accept");
+        }
 
-        if ($http_referrer)
-            array_push($context_options['http']['header'], "Referer: $http_referrer");
+        if ($http_referrer) {
+                    array_push($context_options['http']['header'], "Referer: $http_referrer");
+        }
 
         if (defined('_HTTP_PROXY')) {
             $context_options['http']['request_fulluri'] = true;
@@ -454,7 +468,9 @@ 
         if ($is_gzipped) {
             $tmp = @gzdecode($data);
 
-            if ($tmp) $data = $tmp;
+            if ($tmp) {
+            	$data = $tmp;
+            }
         }
 
         return $data;
@@ -464,7 +480,9 @@ 
 
 function initialize_user_prefs($uid, $profile = false) {
 
-    if (get_schema_version() < 63) $profile_qpart = "";
+    if (get_schema_version() < 63) {
+    	$profile_qpart = "";
+    }
 
     $pdo = DB::pdo();
     $in_nested_tr = false;
@@ -477,7 +495,9 @@ 
 
     $sth = $pdo->query("SELECT pref_name,def_value FROM ttrss_prefs");
 
-    if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+    if (!is_numeric($profile) || !$profile || get_schema_version() < 63) {
+    	$profile = null;
+    }
 
     $u_sth = $pdo->prepare("SELECT pref_name
         FROM ttrss_user_prefs WHERE owner_uid = :uid AND
@@ -510,7 +530,9 @@ 
         }
     }
 
-    if (!$in_nested_tr) $pdo->commit();
+    if (!$in_nested_tr) {
+    	$pdo->commit();
+    }
 
 }
 
@@ -670,7 +692,9 @@ 
 
 function load_user_plugins($owner_uid, $pluginhost = false) {
 
-    if (!$pluginhost) $pluginhost = PluginHost::getInstance();
+    if (!$pluginhost) {
+    	$pluginhost = PluginHost::getInstance();
+    }
 
     if ($owner_uid && SCHEMA_VERSION >= 100) {
         $plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
@@ -692,7 +716,9 @@ 
         startup_gettext();
         load_user_plugins($_SESSION["uid"]);
     } else {
-        if (!validate_session()) $_SESSION["uid"] = false;
+        if (!validate_session()) {
+        	$_SESSION["uid"] = false;
+        }
 
         if (!$_SESSION["uid"]) {
 
@@ -787,13 +813,19 @@ 
 function make_local_datetime($timestamp, $long, $owner_uid = false,
                 $no_smart_dt = false, $eta_min = false) {
 
-    if (!$owner_uid) $owner_uid = $_SESSION['uid'];
-    if (!$timestamp) $timestamp = '1970-01-01 0:00';
+    if (!$owner_uid) {
+    	$owner_uid = $_SESSION['uid'];
+    }
+    if (!$timestamp) {
+    	$timestamp = '1970-01-01 0:00';
+    }
 
     global $utc_tz;
     global $user_tz;
 
-    if (!$utc_tz) $utc_tz = new DateTimeZone('UTC');
+    if (!$utc_tz) {
+    	$utc_tz = new DateTimeZone('UTC');
+    }
 
     $timestamp = substr($timestamp, 0, 19);
 
@@ -805,7 +837,9 @@ 
     if ($user_tz_string != 'Automatic') {
 
         try {
-            if (!$user_tz) $user_tz = new DateTimeZone($user_tz_string);
+            if (!$user_tz) {
+            	$user_tz = new DateTimeZone($user_tz_string);
+            }
         } catch (Exception $e) {
             $user_tz = $utc_tz;
         }
@@ -821,26 +855,30 @@ 
         return smart_date_time($user_timestamp,
             $tz_offset, $owner_uid, $eta_min);
     } else {
-        if ($long)
-            $format = get_pref('LONG_DATE_FORMAT', $owner_uid);
-        else
-            $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
+        if ($long) {
+                    $format = get_pref('LONG_DATE_FORMAT', $owner_uid);
+        } else {
+                    $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
+        }
 
         return date($format, $user_timestamp);
     }
 }
 
 function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false, $eta_min = false) {
-    if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+    if (!$owner_uid) {
+    	$owner_uid = $_SESSION['uid'];
+    }
 
     if ($eta_min && time() + $tz_offset - $timestamp < 3600) {
         return T_sprintf("%d min", date("i", time() + $tz_offset - $timestamp));
     } else if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) {
         $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
-        if (strpos((strtolower($format)), "a") === false)
-            return date("G:i", $timestamp);
-        else
-            return date("g:i a", $timestamp);
+        if (strpos((strtolower($format)), "a") === false) {
+                    return date("G:i", $timestamp);
+        } else {
+                    return date("g:i a", $timestamp);
+        }
     } else if (date("Y", $timestamp) == date("Y", time() + $tz_offset)) {
         $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
         return date($format, $timestamp);
@@ -1250,8 +1288,9 @@ 
 
     if ($src) {
         foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_IFRAME_WHITELISTED) as $plugin) {
-            if ($plugin->hook_iframe_whitelisted($src))
-                return true;
+            if ($plugin->hook_iframe_whitelisted($src)) {
+                            return true;
+            }
         }
     }
 
@@ -1259,9 +1298,13 @@ 
 }
 
 function sanitize($str, $force_remove_images = false, $owner = false, $site_url = false, $highlight_words = false, $article_id = false) {
-    if (!$owner) $owner = $_SESSION["uid"];
+    if (!$owner) {
+    	$owner = $_SESSION["uid"];
+    }
 
-    $res = trim($str); if (!$res) return '';
+    $res = trim($str); if (!$res) {
+    	return '';
+    }
 
     $doc = new DOMDocument();
     $doc->loadHTML('<?xml encoding="UTF-8">' . $res);
@@ -1323,13 +1366,15 @@ 
 
             if ($entry->nodeName == 'source') {
 
-                if ($entry->parentNode && $entry->parentNode->parentNode)
-                    $entry->parentNode->parentNode->replaceChild($p, $entry->parentNode);
+                if ($entry->parentNode && $entry->parentNode->parentNode) {
+                                    $entry->parentNode->parentNode->replaceChild($p, $entry->parentNode);
+                }
 
             } else if ($entry->nodeName == 'img') {
 
-                if ($entry->parentNode)
-                    $entry->parentNode->replaceChild($p, $entry);
+                if ($entry->parentNode) {
+                                    $entry->parentNode->replaceChild($p, $entry);
+                }
 
             }
         }
@@ -1365,7 +1410,9 @@ 
         'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
         'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
 
-    if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
+    if ($_SESSION['hasSandbox']) {
+    	$allowed_elements[] = 'iframe';
+    }
 
     $disallowed_attributes = array('id', 'style', 'class');
 
@@ -1405,7 +1452,9 @@ 
                     $text = mb_substr($text, $pos + mb_strlen($word));
                 }
 
-                if (!empty($text)) $fragment->appendChild(new DomText($text));
+                if (!empty($text)) {
+                	$fragment->appendChild(new DomText($text));
+                }
 
                 $child->parentNode->replaceChild($fragment, $child);
             }
@@ -1596,8 +1645,9 @@ 
     } else {
         $output = "";
 
-        for ($i = 0; $i < $length; $i++)
-            $output .= chr(mt_rand(0, 255));
+        for ($i = 0; $i < $length; $i++) {
+                    $output .= chr(mt_rand(0, 255));
+        }
 
         return $output;
     }
@@ -1667,15 +1717,20 @@ 
 }
 
 function get_theme_path($theme) {
-    if ($theme == "default.php")
-        return "css/default.css";
+    if ($theme == "default.php") {
+            return "css/default.css";
+    }
 
     $check = "themes/$theme";
-    if (file_exists($check)) return $check;
+    if (file_exists($check)) {
+    	return $check;
+    }
 
     $check = "themes.local/$theme";
-    if (file_exists($check)) return $check;
-}
+    if (file_exists($check)) {
+    	return $check;
+    }
+    }
 
 function theme_exists($theme) {
     return file_exists("themes/$theme") || file_exists("themes.local/$theme");
@@ -1731,7 +1786,9 @@ 
 function send_local_file($filename) {
     if (file_exists($filename)) {
 
-        if (is_writable($filename)) touch($filename);
+        if (is_writable($filename)) {
+        	touch($filename);
+        }
 
         $tmppluginhost = new PluginHost();
 
@@ -1739,7 +1796,9 @@ 
         $tmppluginhost->load_data();
 
         foreach ($tmppluginhost->get_hooks(PluginHost::HOOK_SEND_LOCAL_FILE) as $plugin) {
-            if ($plugin->hook_send_local_file($filename)) return true;
+            if ($plugin->hook_send_local_file($filename)) {
+            	return true;
+            }
         }
 
         $mimetype = mime_content_type($filename);
@@ -1747,8 +1806,9 @@ 
         // this is hardly ideal but 1) only media is cached in images/ and 2) seemingly only mp4
         // video files are detected as octet-stream by mime_content_type()
 
-        if ($mimetype == "application/octet-stream")
-            $mimetype = "video/mp4";
+        if ($mimetype == "application/octet-stream") {
+                    $mimetype = "video/mp4";
+        }
 
         header("Content-type: $mimetype");
 
@@ -1771,7 +1831,9 @@ 
 
     foreach ($files as $file) {
         $file_ts = filemtime($file);
-        if ($file_ts > $ts) $ts = $file_ts;
+        if ($file_ts > $ts) {
+        	$ts = $file_ts;
+        }
     }
 
     return $ts;
@@ -1784,8 +1846,9 @@ 
 function get_version(&$git_commit = false, &$git_timestamp = false) {
     global $ttrss_version;
 
-    if (isset($ttrss_version))
-        return $ttrss_version;
+    if (isset($ttrss_version)) {
+            return $ttrss_version;
+    }
 
     $ttrss_version = "UNKNOWN (Unsupported)";
 

include/sessions.php

Indentation +76 added lines, -76 removed lines

@@ -11,7 +11,7 @@ 
 $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
 
 if (is_server_https()) {
-    ini_set("session.cookie_secure", true);
+	ini_set("session.cookie_secure", true);
 }
 
 ini_set("session.gc_probability", 75);
@@ -21,132 +21,132 @@ 
 ini_set("session.cookie_lifetime", min(0, SESSION_COOKIE_LIFETIME));
 
 function session_get_schema_version() {
-    global $schema_version;
+	global $schema_version;
 
-    if (!$schema_version) {
-        $row = Db::pdo()->query("SELECT schema_version FROM ttrss_version")->fetch();
+	if (!$schema_version) {
+		$row = Db::pdo()->query("SELECT schema_version FROM ttrss_version")->fetch();
 
-        $version = $row["schema_version"];
-        $schema_version = $version;
-        return $version;
-    }
+		$version = $row["schema_version"];
+		$schema_version = $version;
+		return $version;
+	}
 
-    return $schema_version;
+	return $schema_version;
 }
 
 function validate_session() {
-    if (SINGLE_USER_MODE) return true;
+	if (SINGLE_USER_MODE) return true;
 
-    if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) {
-        $_SESSION["login_error_msg"] =
-            __("Session failed to validate (schema version changed)");
-        return false;
-    }
-      $pdo = Db::pdo();
+	if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) {
+		$_SESSION["login_error_msg"] =
+			__("Session failed to validate (schema version changed)");
+		return false;
+	}
+	  $pdo = Db::pdo();
 
-    if ($_SESSION["uid"]) {
+	if ($_SESSION["uid"]) {
 
-        if (!defined('_SESSION_SKIP_UA_CHECKS') && $_SESSION["user_agent"] != sha1($_SERVER['HTTP_USER_AGENT'])) {
-            $_SESSION["login_error_msg"] = __("Session failed to validate (UA changed).");
-            return false;
-        }
+		if (!defined('_SESSION_SKIP_UA_CHECKS') && $_SESSION["user_agent"] != sha1($_SERVER['HTTP_USER_AGENT'])) {
+			$_SESSION["login_error_msg"] = __("Session failed to validate (UA changed).");
+			return false;
+		}
 
-        $sth = $pdo->prepare("SELECT pwd_hash FROM ttrss_users WHERE id = ?");
-        $sth->execute([$_SESSION['uid']]);
+		$sth = $pdo->prepare("SELECT pwd_hash FROM ttrss_users WHERE id = ?");
+		$sth->execute([$_SESSION['uid']]);
 
-        // user not found
-        if ($row = $sth->fetch()) {
-                 $pwd_hash = $row["pwd_hash"];
+		// user not found
+		if ($row = $sth->fetch()) {
+				 $pwd_hash = $row["pwd_hash"];
 
-                 if ($pwd_hash != $_SESSION["pwd_hash"]) {
+				 if ($pwd_hash != $_SESSION["pwd_hash"]) {
 
-                      $_SESSION["login_error_msg"] =
-                            __("Session failed to validate (password changed)");
+					  $_SESSION["login_error_msg"] =
+							__("Session failed to validate (password changed)");
 
-                      return false;
-                 }
-        } else {
+					  return false;
+				 }
+		} else {
 
-                 $_SESSION["login_error_msg"] =
-                      __("Session failed to validate (user not found)");
+				 $_SESSION["login_error_msg"] =
+					  __("Session failed to validate (user not found)");
 
-                 return false;
+				 return false;
 
-        }
-    }
+		}
+	}
 
-    return true;
+	return true;
 }
 
 function ttrss_open () {
-    return true;
+	return true;
 }
 
 function ttrss_read ($id){
-    global $session_expire;
+	global $session_expire;
 
-    $sth = Db::pdo()->prepare("SELECT data FROM ttrss_sessions WHERE id=?");
-    $sth->execute([$id]);
+	$sth = Db::pdo()->prepare("SELECT data FROM ttrss_sessions WHERE id=?");
+	$sth->execute([$id]);
 
-    if ($row = $sth->fetch()) {
-        return base64_decode($row["data"]);
+	if ($row = $sth->fetch()) {
+		return base64_decode($row["data"]);
 
-    } else {
-        $expire = time() + $session_expire;
+	} else {
+		$expire = time() + $session_expire;
 
-        $sth = Db::pdo()->prepare("INSERT INTO ttrss_sessions (id, data, expire) VALUES (?, '', ?)");
-        $sth->execute([$id, $expire]);
+		$sth = Db::pdo()->prepare("INSERT INTO ttrss_sessions (id, data, expire) VALUES (?, '', ?)");
+		$sth->execute([$id, $expire]);
 
-        return "";
-    }
+		return "";
+	}
 }
 
 function ttrss_write ($id, $data) {
-    global $session_expire;
+	global $session_expire;
 
-    $data = base64_encode($data);
-    $expire = time() + $session_expire;
+	$data = base64_encode($data);
+	$expire = time() + $session_expire;
 
-    $sth = Db::pdo()->prepare("SELECT id FROM ttrss_sessions WHERE id=?");
-    $sth->execute([$id]);
+	$sth = Db::pdo()->prepare("SELECT id FROM ttrss_sessions WHERE id=?");
+	$sth->execute([$id]);
 
-    if ($sth->fetch()) {
-        $sth = Db::pdo()->prepare("UPDATE ttrss_sessions SET data=?, expire=? WHERE id=?");
-        $sth->execute([$data, $expire, $id]);
-    } else {
-        $sth = Db::pdo()->prepare("INSERT INTO ttrss_sessions (id, data, expire) VALUES (?, ?, ?)");
-        $sth->execute([$id, $data, $expire]);
-    }
+	if ($sth->fetch()) {
+		$sth = Db::pdo()->prepare("UPDATE ttrss_sessions SET data=?, expire=? WHERE id=?");
+		$sth->execute([$data, $expire, $id]);
+	} else {
+		$sth = Db::pdo()->prepare("INSERT INTO ttrss_sessions (id, data, expire) VALUES (?, ?, ?)");
+		$sth->execute([$id, $data, $expire]);
+	}
 
-    return true;
+	return true;
 }
 
 function ttrss_close () {
-    return true;
+	return true;
 }
 
 function ttrss_destroy($id) {
-    $sth = Db::pdo()->prepare("DELETE FROM ttrss_sessions WHERE id = ?");
-    $sth->execute([$id]);
+	$sth = Db::pdo()->prepare("DELETE FROM ttrss_sessions WHERE id = ?");
+	$sth->execute([$id]);
 
-    return true;
+	return true;
 }
 
 function ttrss_gc () {
-    Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
+	Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
 
-    return true;
+	return true;
 }
 
 if (!SINGLE_USER_MODE) {
-    session_set_save_handler("ttrss_open",
-        "ttrss_close", "ttrss_read", "ttrss_write",
-        "ttrss_destroy", "ttrss_gc");
-    register_shutdown_function('session_write_close');
+	session_set_save_handler("ttrss_open",
+		"ttrss_close", "ttrss_read", "ttrss_write",
+		"ttrss_destroy", "ttrss_gc");
+	register_shutdown_function('session_write_close');
 }
 
 if (!defined('NO_SESSION_AUTOSTART')) {
-    if (isset($_COOKIE[session_name()])) {
-        @session_start();
-    }
+	if (isset($_COOKIE[session_name()])) {
+		@session_start();
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -78,11 +78,11 @@ 
     return true;
 }
 
-function ttrss_open () {
+function ttrss_open() {
     return true;
 }
 
-function ttrss_read ($id){
+function ttrss_read($id) {
     global $session_expire;
 
     $sth = Db::pdo()->prepare("SELECT data FROM ttrss_sessions WHERE id=?");
@@ -101,7 +101,7 @@ 
     }
 }
 
-function ttrss_write ($id, $data) {
+function ttrss_write($id, $data) {
     global $session_expire;
 
     $data = base64_encode($data);
@@ -121,7 +121,7 @@ 
     return true;
 }
 
-function ttrss_close () {
+function ttrss_close() {
     return true;
 }
 
@@ -132,8 +132,8 @@ 
     return true;
 }
 
-function ttrss_gc () {
-    Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
+function ttrss_gc() {
+    Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < ".time());
 
     return true;
 }

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 }
 
 function validate_session() {
-    if (SINGLE_USER_MODE) return true;
+    if (SINGLE_USER_MODE) {
+    	return true;
+    }
 
     if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) {
         $_SESSION["login_error_msg"] =

plugins/nsfw/init.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	}
 
 	public function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/init.js");
+		return file_get_contents(dirname(__FILE__)."/init.js");
 	}
 
 	public function hook_render_article($article) {

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
 	}
 
 	public function hook_prefs_tab($args) {
-		if ($args != "prefPrefs") return;
+		if ($args != "prefPrefs") {
+			return;
+		}
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>extension</i> ".__("NSFW Plugin")."\">";