codysnider / tt-rss

classes/dlg.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 class Dlg extends Handler_Protected {
 	private $param;
-    private $params;
+	private $params;
 
-    function before($method) {
+	function before($method) {
 		if (parent::before($method)) {
 			header("Content-Type: text/html"); # required for iframe
 
@@ -108,7 +108,7 @@ 
 			$tags[$line["tag_name"]] = $line["count"];
 		}
 
-        if(count($tags) == 0 ){ return; }
+		if(count($tags) == 0 ){ return; }
 
 		ksort($tags);
 
@@ -193,7 +193,7 @@ 
 
 	function defaultPasswordWarning() {
 
-    	print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
+		print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
 
 		print "<footer class='text-center'>";
 		print "<button dojoType='dijit.form.Button' onclick=\"document.location.href = 'prefs.php'\">".

Spacing +10 added lines, -10 removed lines

@@ -38,7 +38,7 @@ 
 	function pubOPMLUrl() {
 		$url_path = Opml::opml_publish_url();
 
-		print "<header>" . __("Your Public OPML URL is:") . "</header>";
+		print "<header>".__("Your Public OPML URL is:")."</header>";
 
 		print "<section>";
 
@@ -67,18 +67,18 @@ 
 		if ($this->param == 1) {
 			print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner.");
 
-			$stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+			$stamp = (int) file_get_contents(LOCK_DIRECTORY."/update_daemon.stamp");
 
-			print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
+			print "<p>".__("Last update:")." ".date("Y.m.d, G:i", $stamp);
 
 		}
 
 		if ($this->param == 3) {
 			print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner.");
 
-			$stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+			$stamp = (int) file_get_contents(LOCK_DIRECTORY."/update_daemon.stamp");
 
-			print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
+			print "<p>".__("Last update:")." ".date("Y.m.d, G:i", $stamp);
 
 		}
 
@@ -108,7 +108,7 @@ 
 			$tags[$line["tag_name"]] = $line["count"];
 		}
 
-        if(count($tags) == 0 ){ return; }
+        if (count($tags) == 0) { return; }
 
 		ksort($tags);
 
@@ -138,9 +138,9 @@ 
 
 			$key_escaped = str_replace("'", "\\'", $key);
 
-			echo "<a href=\"#\" onclick=\"Feeds.open({feed:'$key_escaped'}) \" style=\"font-size: " .
-				$size . "px\" title=\"$value articles tagged with " .
-				$key . '">' . $key . '</a> ';
+			echo "<a href=\"#\" onclick=\"Feeds.open({feed:'$key_escaped'}) \" style=\"font-size: ".
+				$size."px\" title=\"$value articles tagged with ".
+				$key.'">'.$key.'</a> ';
 		}
 
 
@@ -163,7 +163,7 @@ 
 
 		$key = Feeds::get_feed_access_key($feed_id, $is_cat);
 
-		$url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
+		$url_path = htmlspecialchars($this->params[2])."&key=".$key;
 
 		$feed_title = Feeds::getFeedTitle($feed_id, $is_cat);
 

classes/rpc.php

Spacing +7 added lines, -7 removed lines

@@ -237,7 +237,7 @@ 
 					$new_feed_id = $row['id'];
 				} else {
 					$row = $this->pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds")->fetch();
-					$new_feed_id = (int)$row['id'] + 1;
+					$new_feed_id = (int) $row['id'] + 1;
 
 					$sth = $this->pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
@@ -287,7 +287,7 @@ 
 	/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
 	function catchupSelected() {
 		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int)clean($_REQUEST["cmode"]);
+		$cmode = (int) clean($_REQUEST["cmode"]);
 
 		Article::catchupArticlesById($ids, $cmode);
 
@@ -296,7 +296,7 @@ 
 
 	function markSelected() {
 		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int)clean($_REQUEST["cmode"]);
+		$cmode = (int) clean($_REQUEST["cmode"]);
 
 		$this->markArticlesById($ids, $cmode);
 
@@ -305,7 +305,7 @@ 
 
 	function publishSelected() {
 		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int)clean($_REQUEST["cmode"]);
+		$cmode = (int) clean($_REQUEST["cmode"]);
 
 		$this->publishArticlesById($ids, $cmode);
 
@@ -342,7 +342,7 @@ 
 
 		print "<ul>";
 		while ($line = $sth->fetch()) {
-			print "<li>" . $line["caption"] . "</li>";
+			print "<li>".$line["caption"]."</li>";
 		}
 		print "</ul>";
 	}
@@ -578,7 +578,7 @@ 
 
 		if ($msg) {
 			Logger::get()->log_error(E_USER_WARNING,
-				$msg, 'client-js:' . $file, $line, $context);
+				$msg, 'client-js:'.$file, $line, $context);
 
 			echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
 		} else {
@@ -602,7 +602,7 @@ 
 				$content = json_decode($content, true);
 
 				if ($content && isset($content["changeset"])) {
-					if ($git_timestamp < (int)$content["changeset"]["timestamp"] &&
+					if ($git_timestamp < (int) $content["changeset"]["timestamp"] &&
 						$git_commit != $content["changeset"]["id"]) {
 
 						$rv = $content["changeset"];

Braces +15 added lines, -6 removed lines

@@ -11,7 +11,9 @@ 
 		$_SESSION["profile"] = (int) clean($_REQUEST["id"]);
 
 		// default value
-		if (!$_SESSION["profile"]) $_SESSION["profile"] = null;
+		if (!$_SESSION["profile"]) {
+			$_SESSION["profile"] = null;
+		}
 	}
 
 	function remprofiles() {
@@ -173,7 +175,9 @@ 
 				if ($row = $sth->fetch()) {
 					$feed_id = $row["id"];
 				} else {
-					if (!$title) $title = '[Unknown]';
+					if (!$title) {
+						$title = '[Unknown]';
+					}
 
 					$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
@@ -216,7 +220,9 @@ 
 	private function archive_article($id, $owner_uid) {
 		$this->pdo->beginTransaction();
 
-		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION['uid'];
+		}
 
 		$sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = ? AND owner_uid = ?");
@@ -278,8 +284,9 @@ 
 			'seq' => $seq
 		];
 
-		if ($seq % 2 == 0)
-			$reply['runtime-info'] = make_runtime_info();
+		if ($seq % 2 == 0) {
+					$reply['runtime-info'] = make_runtime_info();
+		}
 
 		print json_encode($reply);
 	}
@@ -353,7 +360,9 @@ 
 		$payload = json_decode(clean($_REQUEST["payload"]), false);
 		$mode = clean($_REQUEST["mode"]);
 
-		if (!$payload || !is_array($payload)) return;
+		if (!$payload || !is_array($payload)) {
+			return;
+		}
 
 		if ($mode == 1) {
 			foreach ($payload as $feed) {

classes/logger.php

Braces +16 added lines, -11 removed lines

@@ -22,19 +22,23 @@ 
 		32767		=> 'E_ALL');
 
 	function log_error($errno, $errstr, $file, $line, $context) {
-		if ($errno == E_NOTICE) return false;
-
-		if ($this->adapter)
-			return $this->adapter->log_error($errno, $errstr, $file, $line, $context);
-		else
+		if ($errno == E_NOTICE) {
 			return false;
+		}
+
+		if ($this->adapter) {
+					return $this->adapter->log_error($errno, $errstr, $file, $line, $context);
+		} else {
+					return false;
+		}
 	}
 
 	function log($string, $context = "") {
-		if ($this->adapter)
-			return $this->adapter->log_error(E_USER_NOTICE, $string, '', 0, $context);
-		else
-			return false;
+		if ($this->adapter) {
+					return $this->adapter->log_error(E_USER_NOTICE, $string, '', 0, $context);
+		} else {
+					return false;
+		}
 	}
 
 	private function __clone() {
@@ -58,8 +62,9 @@ 
 	}
 
 	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		return self::$instance;
 	}

classes/labels.php

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
 		}
 	}
 
-	static function get_all_labels($owner_uid)	{
+	static function get_all_labels($owner_uid) {
 		$rv = array();
 
 		$pdo = Db::pdo();
@@ -70,7 +70,7 @@ 
 
 	}
 
-	static function clear_cache($id)	{
+	static function clear_cache($id) {
 
 		$pdo = Db::pdo();
 
@@ -98,7 +98,7 @@ 
 		Labels::clear_cache($id);
 	}
 
-	static function add_article($id, $label, $owner_uid)	{
+	static function add_article($id, $label, $owner_uid) {
 
 		$label_id = Labels::find_id($label, $owner_uid);
 
@@ -171,7 +171,7 @@ 
 		if (!$tr_in_progress) $pdo->commit();
 	}
 
-	static function create($caption, $fg_color = '', $bg_color = '', $owner_uid = false)	{
+	static function create($caption, $fg_color = '', $bg_color = '', $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 

Braces +24 added lines, -10 removed lines

@@ -56,11 +56,13 @@ 
 	static function update_cache($owner_uid, $id, $labels = false, $force = false) {
 		$pdo = Db::pdo();
 
-		if ($force)
-			Labels::clear_cache($id);
+		if ($force) {
+					Labels::clear_cache($id);
+		}
 
-		if (!$labels)
-			$labels = Article::get_article_labels($id);
+		if (!$labels) {
+					$labels = Article::get_article_labels($id);
+		}
 
 		$labels = json_encode($labels);
 
@@ -84,7 +86,9 @@ 
 
 		$label_id = Labels::find_id($label, $owner_uid);
 
-		if (!$label_id) return;
+		if (!$label_id) {
+			return;
+		}
 
 		$pdo = Db::pdo();
 
@@ -102,7 +106,9 @@ 
 
 		$label_id = Labels::find_id($label, $owner_uid);
 
-		if (!$label_id) return;
+		if (!$label_id) {
+			return;
+		}
 
 		$pdo = Db::pdo();
 
@@ -128,7 +134,9 @@ 
 	}
 
 	static function remove($id, $owner_uid) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 		$tr_in_progress = false;
@@ -168,12 +176,16 @@ 
 
 		}
 
-		if (!$tr_in_progress) $pdo->commit();
+		if (!$tr_in_progress) {
+			$pdo->commit();
+		}
 	}
 
 	static function create($caption, $fg_color = '', $bg_color = '', $owner_uid = false)	{
 
-		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION['uid'];
+		}
 
 		$pdo = Db::pdo();
 
@@ -198,7 +210,9 @@ 
 			$result = $sth->rowCount();
 		}
 
-		if (!$tr_in_progress) $pdo->commit();
+		if (!$tr_in_progress) {
+			$pdo->commit();
+		}
 
 		return $result;
 	}

classes/debug.php

Indentation +60 added lines, -60 removed lines

@@ -1,86 +1,86 @@
 <?php
 class Debug {
 	public static $LOG_DISABLED = -1;
-    public static $LOG_NORMAL = 0;
-    public static $LOG_VERBOSE = 1;
-    public static $LOG_EXTENDED = 2;
+	public static $LOG_NORMAL = 0;
+	public static $LOG_VERBOSE = 1;
+	public static $LOG_EXTENDED = 2;
 
-    private static $enabled = false;
-    private static $quiet = false;
-    private static $logfile = false;
-    private static $loglevel = 0;
+	private static $enabled = false;
+	private static $quiet = false;
+	private static $logfile = false;
+	private static $loglevel = 0;
 
 	public static function set_logfile($logfile) {
-        Debug::$logfile = $logfile;
-    }
+		Debug::$logfile = $logfile;
+	}
 
-    public static function enabled() {
-        return Debug::$enabled;
-    }
+	public static function enabled() {
+		return Debug::$enabled;
+	}
 
-    public static function set_enabled($enable) {
-        Debug::$enabled = $enable;
-    }
+	public static function set_enabled($enable) {
+		Debug::$enabled = $enable;
+	}
 
-    public static function set_quiet($quiet) {
-        Debug::$quiet = $quiet;
-    }
+	public static function set_quiet($quiet) {
+		Debug::$quiet = $quiet;
+	}
 
-    public static function set_loglevel($level) {
-        Debug::$loglevel = $level;
-    }
+	public static function set_loglevel($level) {
+		Debug::$loglevel = $level;
+	}
 
-    public static function get_loglevel() {
-        return Debug::$loglevel;
-    }
+	public static function get_loglevel() {
+		return Debug::$loglevel;
+	}
 
-    public static function log($message, $level = 0) {
+	public static function log($message, $level = 0) {
 
-        if (!Debug::$enabled || Debug::$loglevel < $level) return false;
+		if (!Debug::$enabled || Debug::$loglevel < $level) return false;
 
-        $ts = strftime("%H:%M:%S", time());
-        if (function_exists('posix_getpid')) {
-            $ts = "$ts/" . posix_getpid();
-        }
+		$ts = strftime("%H:%M:%S", time());
+		if (function_exists('posix_getpid')) {
+			$ts = "$ts/" . posix_getpid();
+		}
 
-        if (Debug::$logfile) {
-            $fp = fopen(Debug::$logfile, 'a+');
+		if (Debug::$logfile) {
+			$fp = fopen(Debug::$logfile, 'a+');
 
-            if ($fp) {
-                $locked = false;
+			if ($fp) {
+				$locked = false;
 
-                if (function_exists("flock")) {
-                    $tries = 0;
+				if (function_exists("flock")) {
+					$tries = 0;
 
-                    // try to lock logfile for writing
-                    while ($tries < 5 && !$locked = flock($fp, LOCK_EX | LOCK_NB)) {
-                        sleep(1);
-                        ++$tries;
-                    }
+					// try to lock logfile for writing
+					while ($tries < 5 && !$locked = flock($fp, LOCK_EX | LOCK_NB)) {
+						sleep(1);
+						++$tries;
+					}
 
-                    if (!$locked) {
-                        fclose($fp);
-                        user_error("Unable to lock debugging log file: " . Debug::$logfile, E_USER_WARNING);
-                        return;
-                    }
-                }
+					if (!$locked) {
+						fclose($fp);
+						user_error("Unable to lock debugging log file: " . Debug::$logfile, E_USER_WARNING);
+						return;
+					}
+				}
 
-                fputs($fp, "[$ts] $message\n");
+				fputs($fp, "[$ts] $message\n");
 
-                if (function_exists("flock")) {
-                    flock($fp, LOCK_UN);
-                }
+				if (function_exists("flock")) {
+					flock($fp, LOCK_UN);
+				}
 
-                fclose($fp);
+				fclose($fp);
 
-                if (Debug::$quiet)
-                    return;
+				if (Debug::$quiet)
+					return;
 
-            } else {
-                user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING);
-            }
-        }
+			} else {
+				user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING);
+			}
+		}
 
-        print "[$ts] $message\n";
-    }
+		print "[$ts] $message\n";
+	}
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

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

Braces +6 added lines, -3 removed lines

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

classes/logger/syslog.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 			$priority = LOG_INFO;
 		}
 
-		$errname = Logger::$errornames[$errno] . " ($errno)";
+		$errname = Logger::$errornames[$errno]." ($errno)";
 
 		syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
 

classes/logger/sql.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
 			foreach ($server_params as $n => $p) {
 				if (isset($_SERVER[$p]))
-					$context .= "\n$n: " . $_SERVER[$p];
+					$context .= "\n$n: ".$_SERVER[$p];
 			}
 
 			// passed error message may contain invalid unicode characters, failing to insert an error here

Braces +6 added lines, -3 removed lines

@@ -6,7 +6,9 @@ 
 	function log_error($errno, $errstr, $file, $line, $context) {
 
 		// separate PDO connection object is used for logging
-		if (!$this->pdo) $this->pdo = Db::instance()->pdo_connect();
+		if (!$this->pdo) {
+			$this->pdo = Db::instance()->pdo_connect();
+		}
 
 		if ($this->pdo && get_schema_version() > 117) {
 
@@ -22,8 +24,9 @@ 
 			];
 
 			foreach ($server_params as $n => $p) {
-				if (isset($_SERVER[$p]))
-					$context .= "\n$n: " . $_SERVER[$p];
+				if (isset($_SERVER[$p])) {
+									$context .= "\n$n: " . $_SERVER[$p];
+				}
 			}
 
 			// passed error message may contain invalid unicode characters, failing to insert an error here

classes/rssutils.php

Indentation +1 added lines, -1 removed lines

@@ -702,7 +702,7 @@
 					$entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
 				}
 
-                if (Debug::get_loglevel() >= 3) {
+				if (Debug::get_loglevel() >= 3) {
 					print "processed content: ";
 					print htmlspecialchars($article["content"]);
 					print "\n";

Switch Indentation +26 added lines, -26 removed lines

@@ -1349,35 +1349,35 @@
 					continue;
 
 				switch ($rule["type"]) {
-					case "title":
-						$match = @preg_match("/$reg_exp/iu", $title);
-						break;
-					case "content":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
+				case "title":
+					$match = @preg_match("/$reg_exp/iu", $title);
+					break;
+				case "content":
+					// we don't need to deal with multiline regexps
+					$content = preg_replace("/[\r\n\t]/", "", $content);
 
-						$match = @preg_match("/$reg_exp/iu", $content);
-						break;
-					case "both":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
+					$match = @preg_match("/$reg_exp/iu", $content);
+					break;
+				case "both":
+					// we don't need to deal with multiline regexps
+					$content = preg_replace("/[\r\n\t]/", "", $content);
 
-						$match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
-						break;
-					case "link":
-						$match = @preg_match("/$reg_exp/iu", $link);
-						break;
-					case "author":
-						$match = @preg_match("/$reg_exp/iu", $author);
-						break;
-					case "tag":
-						foreach ($tags as $tag) {
-							if (@preg_match("/$reg_exp/iu", $tag)) {
-								$match = true;
-								break;
-							}
+					$match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
+					break;
+				case "link":
+					$match = @preg_match("/$reg_exp/iu", $link);
+					break;
+				case "author":
+					$match = @preg_match("/$reg_exp/iu", $author);
+					break;
+				case "tag":
+					foreach ($tags as $tag) {
+						if (@preg_match("/$reg_exp/iu", $tag)) {
+							$match = true;
+							break;
 						}
-						break;
+					}
+					break;
 				}
 
 				if ($rule_inverse) $match = !$match;

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 @@ 
 	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 @@ 
 
 	static function is_gzipped($feed_data) {
 		return strpos(substr($feed_data, 0, 3),
-				"\x1f" . "\x8b" . "\x08", 0) === 0;
+				"\x1f"."\x8b"."\x08", 0) === 0;
 	}
 
 	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";

Braces +73 added lines, -46 removed lines

@@ -80,7 +80,9 @@ 
 
 		// Update the least recently updated feeds first
 		$query_order = "ORDER BY last_updated";
-		if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
+		if (DB_TYPE == "pgsql") {
+			$query_order .= " NULLS FIRST";
+		}
 
 		$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
 			FROM
@@ -139,8 +141,9 @@ 
 			if ($tline = $usth->fetch()) {
 				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"]);
+				if (array_search($tline["owner_uid"], $batch_owners) === FALSE) {
+									array_push($batch_owners, $tline["owner_uid"]);
+				}
 
 				$fstarted = microtime(true);
 
@@ -311,11 +314,13 @@ 
 
 			$feed_language = mb_strtolower($row["feed_language"]);
 
-			if (!$feed_language)
-				$feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
+			if (!$feed_language) {
+							$feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
+			}
 
-			if (!$feed_language)
-				$feed_language = 'simple';
+			if (!$feed_language) {
+							$feed_language = 'simple';
+			}
 
 		} else {
 			return false;
@@ -514,8 +519,9 @@ 
 				RSSUtils::check_feed_favicon($site_url, $feed);
 				$favicon_modified_new = @filemtime($favicon_file);
 
-				if ($favicon_modified_new > $favicon_modified)
-					$favicon_avg_color = '';
+				if ($favicon_modified_new > $favicon_modified) {
+									$favicon_avg_color = '';
+				}
 
 				$favicon_colorstring = "";
 				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
@@ -578,8 +584,12 @@ 
 				}
 
 				$entry_guid = strip_tags($item->get_id());
-				if (!$entry_guid) $entry_guid = strip_tags($item->get_link());
-				if (!$entry_guid) $entry_guid = RSSUtils::make_guid_from_title($item->get_title());
+				if (!$entry_guid) {
+					$entry_guid = strip_tags($item->get_link());
+				}
+				if (!$entry_guid) {
+					$entry_guid = RSSUtils::make_guid_from_title($item->get_title());
+				}
 
 				if (!$entry_guid) {
 					$pdo->commit();
@@ -606,10 +616,15 @@ 
 				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();
+				if (!$entry_content) {
+					$entry_content = $item->get_description();
+				}
 
 				if (Debug::get_loglevel() >= 3) {
 					print "content: ";
@@ -824,8 +839,9 @@ 
 
 				Debug::log("force catchup: $entry_force_catchup", Debug::$LOG_VERBOSE);
 
-				if ($cache_images)
-					RSSUtils::cache_media($entry_content, $site_url);
+				if ($cache_images) {
+									RSSUtils::cache_media($entry_content, $site_url);
+				}
 
 				$csth = $pdo->prepare("SELECT id FROM ttrss_entries
 					WHERE guid = ? OR guid = ?");
@@ -951,16 +967,18 @@ 
 
 						$sth->execute([$ref_id, $owner_uid, $feed]);
 
-						if ($row = $sth->fetch())
-							$entry_int_id = $row['int_id'];
+						if ($row = $sth->fetch()) {
+													$entry_int_id = $row['int_id'];
+						}
 					}
 
 					Debug::log("resulting RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
 
-					if (DB_TYPE == "pgsql")
-						$tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
-					else
-						$tsvector_qpart = "";
+					if (DB_TYPE == "pgsql") {
+											$tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
+					} else {
+											$tsvector_qpart = "";
+					}
 
 					$sth = $pdo->prepare("UPDATE ttrss_entries
 						SET title = :title,
@@ -1049,8 +1067,9 @@ 
 					}
 				}
 
-				if ($cache_images)
-					RSSUtils::cache_enclosures($enclosures, $site_url);
+				if ($cache_images) {
+									RSSUtils::cache_enclosures($enclosures, $site_url);
+				}
 
 				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
 					Debug::log("article enclosures:", Debug::$LOG_VERBOSE);
@@ -1345,8 +1364,9 @@ 
 				$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
 				$rule_inverse = $rule["inverse"];
 
-				if (!$reg_exp)
-					continue;
+				if (!$reg_exp) {
+									continue;
+				}
 
 				switch ($rule["type"]) {
 					case "title":
@@ -1380,7 +1400,9 @@ 
 						break;
 				}
 
-				if ($rule_inverse) $match = !$match;
+				if ($rule_inverse) {
+					$match = !$match;
+				}
 
 				if ($match_any_rule) {
 					if ($match) {
@@ -1395,17 +1417,25 @@ 
 				}
 			}
 
-			if ($inverse) $filter_match = !$filter_match;
+			if ($inverse) {
+				$filter_match = !$filter_match;
+			}
 
 			if ($filter_match) {
-				if (is_array($matched_rules)) array_push($matched_rules, $rule);
-				if (is_array($matched_filters)) array_push($matched_filters, $filter);
+				if (is_array($matched_rules)) {
+					array_push($matched_rules, $rule);
+				}
+				if (is_array($matched_filters)) {
+					array_push($matched_filters, $filter);
+				}
 
 				foreach ($filter["actions"] AS $action) {
 					array_push($matches, $action);
 
 					// if Stop action encountered, perform no further processing
-					if (isset($action["type"]) && $action["type"] == "stop") return $matches;
+					if (isset($action["type"]) && $action["type"] == "stop") {
+						return $matches;
+					}
 				}
 			}
 		}
@@ -1531,24 +1561,19 @@ 
 					if (preg_match('/^\x00\x00\x01\x00/', $contents)) {
 						// 0       string  \000\000\001\000        MS Windows icon resource
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa MS Windows icon resource");
-					}
-					elseif (preg_match('/^GIF8/', $contents)) {
+					} elseif (preg_match('/^GIF8/', $contents)) {
 						// 0       string          GIF8            GIF image data
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa GIF image");
-					}
-					elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
+					} elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
 						// 0       string          \x89PNG\x0d\x0a\x1a\x0a         PNG image data
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa PNG image");
-					}
-					elseif (preg_match('/^\xff\xd8/', $contents)) {
+					} elseif (preg_match('/^\xff\xd8/', $contents)) {
 						// 0       beshort         0xffd8          JPEG image data
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa JPG image");
-					}
-					elseif (preg_match('/^BM/', $contents)) {
+					} elseif (preg_match('/^BM/', $contents)) {
 						// 0	string		BM	PC bitmap (OS2, Windows BMP files)
 						//error_log("check_feed_favicon, favicon_url=$favicon_url isa BMP image");
-					}
-					else {
+					} else {
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa UNKNOWN type");
 						$contents = "";
 					}
@@ -1579,10 +1604,11 @@ 
 		$feed_id = (int) $feed_id;
 		$cat_id = (int)Feeds::getFeedCategory($feed_id);
 
-		if ($cat_id == 0)
-			$null_cat_qpart = "cat_id IS NULL OR";
-		else
-			$null_cat_qpart = "";
+		if ($cat_id == 0) {
+					$null_cat_qpart = "cat_id IS NULL OR";
+		} else {
+					$null_cat_qpart = "";
+		}
 
 		$pdo = Db::pdo();
 
@@ -1718,8 +1744,9 @@ 
 			}
 		}
 
-		if (!$favicon_url)
-			$favicon_url = rewrite_relative_url($url, "/favicon.ico");
+		if (!$favicon_url) {
+					$favicon_url = rewrite_relative_url($url, "/favicon.ico");
+		}
 
 		return $favicon_url;
 	}

classes/digest.php

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
 					time() - $preferred_ts <= 7200
 				) {
 
-					Debug::log("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
+					Debug::log("Sending digest for UID:".$line['id']." - ".$line["email"]);
 
 					$do_catchup = get_pref('DIGEST_CATCHUP', $line['id'], false);
 
@@ -123,13 +123,13 @@ 
 
 		$sth = $pdo->prepare("SELECT ttrss_entries.title,
 				ttrss_feeds.title AS feed_title,
-				COALESCE(ttrss_feed_categories.title, '" . __('Uncategorized') . "') AS cat_title,
+				COALESCE(ttrss_feed_categories.title, '" . __('Uncategorized')."') AS cat_title,
 				date_updated,
 				ttrss_user_entries.ref_id,
 				link,
 				score,
 				content,
-				" . SUBSTRING_FOR_DATE . "(last_updated,1,19) AS last_updated
+				" . SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 			FROM
 				ttrss_user_entries,ttrss_entries,ttrss_feeds
 			LEFT JOIN
@@ -165,7 +165,7 @@ 
 				$user_id);
 
 			if (get_pref('ENABLE_FEED_CATS', $user_id)) {
-				$line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
+				$line['feed_title'] = $line['cat_title']." / ".$line['feed_title'];
 			}
 
 			$article_labels = Article::get_article_labels($line["ref_id"], $user_id);