codysnider / tt-rss

classes/db.php

Switch Indentation +8 added lines, -8 removed lines

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

Spacing +9 added lines, -9 removed lines

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

Braces +9 added lines, -6 removed lines

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

classes/diskcache.php

Braces +26 added lines, -20 removed lines

@@ -18,10 +18,11 @@ 
 
 	public function isWritable($filename = "") {
 		if ($filename) {
-			if (file_exists($this->getFullPath($filename)))
-				return is_writable($this->getFullPath($filename));
-			else
-				return is_writable($this->dir);
+			if (file_exists($this->getFullPath($filename))) {
+							return is_writable($this->getFullPath($filename));
+			} else {
+							return is_writable($this->dir);
+			}
 		} else {
 			return is_writable($this->dir);
 		}
@@ -32,10 +33,11 @@ 
 	}
 
 	public function getSize($filename) {
-		if ($this->exists($filename))
-			return filesize($this->getFullPath($filename));
-		else
-			return -1;
+		if ($this->exists($filename)) {
+					return filesize($this->getFullPath($filename));
+		} else {
+					return -1;
+		}
 	}
 
 	public function getFullPath($filename) {
@@ -53,17 +55,19 @@ 
 	}
 
 	public function get($filename) {
-		if ($this->exists($filename))
-			return file_get_contents($this->getFullPath($filename));
-		else
-			return null;
+		if ($this->exists($filename)) {
+					return file_get_contents($this->getFullPath($filename));
+		} else {
+					return null;
+		}
 	}
 
 	public function getMimeType($filename) {
-		if ($this->exists($filename))
-			return mime_content_type($this->getFullPath($filename));
-		else
-			return null;
+		if ($this->exists($filename)) {
+					return mime_content_type($this->getFullPath($filename));
+		} else {
+					return null;
+		}
 	}
 
 	public function send($filename) {
@@ -82,7 +86,9 @@ 
 	static public function rewriteUrls($str)
 	{
 		$res = trim($str);
-		if (!$res) return '';
+		if (!$res) {
+			return '';
+		}
 
 		$doc = new DOMDocument();
 		if ($doc->loadHTML('<?xml encoding="UTF-8">' . $res)) {
@@ -105,9 +111,9 @@ 
 
 						$src = $cache->getUrl(sha1($src));
 
-						if ($entry->hasAttribute('poster'))
-							$entry->setAttribute('poster', $src);
-						else {
+						if ($entry->hasAttribute('poster')) {
+													$entry->setAttribute('poster', $src);
+						} else {
 							$entry->setAttribute('src', $src);
 							$entry->removeAttribute("srcset");
 						}

Spacing +6 added lines, -6 removed lines

@@ -3,7 +3,7 @@ 
 	private $dir;
 
 	public function __construct($dir) {
-		$this->dir = CACHE_DIR . "/" . clean_filename($dir);
+		$this->dir = CACHE_DIR."/".clean_filename($dir);
 	}
 
 	public function getDir() {
@@ -41,7 +41,7 @@ 
 	public function getFullPath($filename) {
 		$filename = clean_filename($filename);
 
-		return $this->dir . "/" . $filename;
+		return $this->dir."/".$filename;
 	}
 
 	public function put($filename, $data) {
@@ -73,7 +73,7 @@ 
 	}
 
 	public function getUrl($filename) {
-		return get_self_url_prefix() . "/public.php?op=cached_url&file=" . basename($this->dir) . "/" . $filename;
+		return get_self_url_prefix()."/public.php?op=cached_url&file=".basename($this->dir)."/".$filename;
 	}
 
 	// check for locally cached (media) URLs and rewrite to local versions
@@ -85,7 +85,7 @@ 
 		if (!$res) return '';
 
 		$doc = new DOMDocument();
-		if ($doc->loadHTML('<?xml encoding="UTF-8">' . $res)) {
+		if ($doc->loadHTML('<?xml encoding="UTF-8">'.$res)) {
 			$xpath = new DOMXPath($doc);
 			$cache = new DiskCache("images");
 
@@ -126,7 +126,7 @@ 
 	}
 
 	public static function expire() {
-		$dirs = array_filter(glob(CACHE_DIR . "/*"), "is_dir");
+		$dirs = array_filter(glob(CACHE_DIR."/*"), "is_dir");
 
 		foreach ($dirs as $cache_dir) {
 			$num_deleted = 0;
@@ -136,7 +136,7 @@ 
 
 				if ($files) {
 					foreach ($files as $file) {
-						if (time() - filemtime($file) > 86400*CACHE_MAX_DAYS) {
+						if (time() - filemtime($file) > 86400 * CACHE_MAX_DAYS) {
 							unlink($file);
 
 							++$num_deleted;

classes/mailer.php

Spacing +1 added lines, -1 removed lines

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

Braces +9 added lines, -6 removed lines

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

classes/db/prefs.php

Spacing +2 added lines, -2 removed lines

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

Braces +21 added lines, -9 removed lines

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

classes/db/mysqli.php

Spacing +2 added lines, -2 removed lines

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

Braces +8 added lines, -5 removed lines

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

classes/db/pgsql.php

Spacing +3 added lines, -3 removed lines

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

Braces +3 added lines, -1 removed lines

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

classes/api.php

Indentation +1 added lines, -1 removed lines

@@ -597,7 +597,7 @@
 								"title" => $line["title"],
 								"unread" => $unread,
 								"is_cat" => true,
-                                "order_id" => (int) $line["order_id"]
+								"order_id" => (int) $line["order_id"]
 							);
 						array_push($feeds, $row);
 					}

Switch Indentation +33 added lines, -33 removed lines

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

Braces +47 added lines, -28 removed lines

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

Spacing +21 added lines, -22 removed lines

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

classes/backend.php

Switch Indentation +8 added lines, -8 removed lines

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

Braces +6 added lines, -2 removed lines

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

Spacing +5 added lines, -5 removed lines

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

classes/pref/system.php

Spacing +7 added lines, -7 removed lines

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