codysnider / tt-rss

classes/logger.php

Indentation +58 added lines, -58 removed lines

@@ -2,72 +2,72 @@
 
 class Logger {
 
-    /**
-     * @var Logger
-     */
-    private static $instance;
+	/**
+	 * @var Logger
+	 */
+	private static $instance;
 
-    /**
-     * @var bool|Logger_SQL|Logger_Syslog
-     */
-    private $adapter;
+	/**
+	 * @var bool|Logger_SQL|Logger_Syslog
+	 */
+	private $adapter;
 
-    public static $errornames = array(
-        1 => 'E_ERROR',
-        2 => 'E_WARNING',
-        4 => 'E_PARSE',
-        8 => 'E_NOTICE',
-        16 => 'E_CORE_ERROR',
-        32 => 'E_CORE_WARNING',
-        64 => 'E_COMPILE_ERROR',
-        128 => 'E_COMPILE_WARNING',
-        256 => 'E_USER_ERROR',
-        512 => 'E_USER_WARNING',
-        1024 => 'E_USER_NOTICE',
-        2048 => 'E_STRICT',
-        4096 => 'E_RECOVERABLE_ERROR',
-        8192 => 'E_DEPRECATED',
-        16384 => 'E_USER_DEPRECATED',
-        32767 => 'E_ALL');
+	public static $errornames = array(
+		1 => 'E_ERROR',
+		2 => 'E_WARNING',
+		4 => 'E_PARSE',
+		8 => 'E_NOTICE',
+		16 => 'E_CORE_ERROR',
+		32 => 'E_CORE_WARNING',
+		64 => 'E_COMPILE_ERROR',
+		128 => 'E_COMPILE_WARNING',
+		256 => 'E_USER_ERROR',
+		512 => 'E_USER_WARNING',
+		1024 => 'E_USER_NOTICE',
+		2048 => 'E_STRICT',
+		4096 => 'E_RECOVERABLE_ERROR',
+		8192 => 'E_DEPRECATED',
+		16384 => 'E_USER_DEPRECATED',
+		32767 => 'E_ALL');
 
-    public function log_error($errno, $errstr, $file, $line, $context) {
-        if ($errno === E_NOTICE) {
-            return false;
-        }
+	public 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);
-        }
+		if ($this->adapter) {
+			return $this->adapter->log_error($errno, $errstr, $file, $line, $context);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public function log($string, $context = "") {
-        if ($this->adapter) {
-            return $this->adapter->log_error(E_USER_NOTICE, $string, '', 0, $context);
-        }
+	public function log($string, $context = "") {
+		if ($this->adapter) {
+			return $this->adapter->log_error(E_USER_NOTICE, $string, '', 0, $context);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public function __construct() {
-        switch (LOG_DESTINATION) {
-            case "sql":
-                $this->adapter = new Logger_SQL();
-                break;
-            case "syslog":
-                $this->adapter = new Logger_Syslog();
-                break;
-            default:
-                $this->adapter = false;
-        }
-    }
+	public function __construct() {
+		switch (LOG_DESTINATION) {
+			case "sql":
+				$this->adapter = new Logger_SQL();
+				break;
+			case "syslog":
+				$this->adapter = new Logger_Syslog();
+				break;
+			default:
+				$this->adapter = false;
+		}
+	}
 
-    public static function get(): Logger {
-        if (self::$instance == null) {
-            self::$instance = new self();
-        }
-        return self::$instance;
-    }
+	public static function get(): Logger {
+		if (self::$instance == null) {
+			self::$instance = new self();
+		}
+		return self::$instance;
+	}
 
 }

Switch Indentation +8 added lines, -8 removed lines

@@ -52,14 +52,14 @@
 
     public function __construct() {
         switch (LOG_DESTINATION) {
-            case "sql":
-                $this->adapter = new Logger_SQL();
-                break;
-            case "syslog":
-                $this->adapter = new Logger_Syslog();
-                break;
-            default:
-                $this->adapter = false;
+        case "sql":
+            $this->adapter = new Logger_SQL();
+            break;
+        case "syslog":
+            $this->adapter = new Logger_Syslog();
+            break;
+        default:
+            $this->adapter = false;
         }
     }
 

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 @@ 
 
 	public 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 @@ 
 	public 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/logger/sql.php

Braces +6 added lines, -3 removed lines

@@ -6,7 +6,9 @@ 
 	public 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/db/prefs.php

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/pgsql.php

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/db/mysqli.php

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/backend.php

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/labels.php

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
 		}
 	}
 
-	public static function get_all_labels($owner_uid)	{
+	public static function get_all_labels($owner_uid) {
 		$rv = array();
 
 		$pdo = Db::pdo();
@@ -70,7 +70,7 @@ 
 
 	}
 
-	public static function clear_cache($id)	{
+	public static function clear_cache($id) {
 
 		$pdo = Db::pdo();
 
@@ -98,7 +98,7 @@ 
 		Labels::clear_cache($id);
 	}
 
-	public static function add_article($id, $label, $owner_uid)	{
+	public 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();
 	}
 
-	public static function create($caption, $fg_color = '', $bg_color = '', $owner_uid = false)	{
+	public 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 @@ 
 	public 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 @@ 
 	}
 
 	public 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();
+		}
 	}
 
 	public 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/feeditem/common.php

Braces +30 added lines, -16 removed lines

@@ -14,8 +14,9 @@ 
 			$source = $elem->getElementsByTagName("source")->item(0);
 
 			// we don't need <source> element
-			if ($source)
-				$elem->removeChild($source);
+			if ($source) {
+							$elem->removeChild($source);
+			}
 		} catch (DOMException $e) {
 			//
 		}
@@ -31,14 +32,19 @@ 
 		if ($author) {
 			$name = $author->getElementsByTagName("name")->item(0);
 
-			if ($name) return clean($name->nodeValue);
+			if ($name) {
+				return clean($name->nodeValue);
+			}
 
 			$email = $author->getElementsByTagName("email")->item(0);
 
-			if ($email) return clean($email->nodeValue);
+			if ($email) {
+				return clean($email->nodeValue);
+			}
 
-			if ($author->nodeValue)
-				return clean($author->nodeValue);
+			if ($author->nodeValue) {
+							return clean($author->nodeValue);
+			}
 		}
 
 		$author_elems = $this->xpath->query("dc:creator", $this->elem);
@@ -56,15 +62,17 @@ 
 		//might give a wrong result if a default namespace was declared (possible with XPath 2.0)
 		$com_url = $this->xpath->query("comments", $this->elem)->item(0);
 
-		if ($com_url)
-			return clean($com_url->nodeValue);
+		if ($com_url) {
+					return clean($com_url->nodeValue);
+		}
 
 		//Atom Threading Extension (RFC 4685) stuff. Could be used in RSS feeds, so it's in common.
 		//'text/html' for type is too restrictive?
 		$com_url = $this->xpath->query("atom:link[@rel='replies' and contains(@type,'text/html')]/@href", $this->elem)->item(0);
 
-		if ($com_url)
-			return clean($com_url->nodeValue);
+		if ($com_url) {
+					return clean($com_url->nodeValue);
+		}
 	}
 
 	public function get_comments_count() {
@@ -98,7 +106,9 @@ 
 			}
 
 			$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-			if ($desc) $enc->title = clean($desc->nodeValue);
+			if ($desc) {
+				$enc->title = clean($desc->nodeValue);
+			}
 
 			array_push($encs, $enc);
 		}
@@ -127,7 +137,9 @@ 
 					$enc->title = clean($desc->nodeValue);
 				} else {
 					$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-					if ($desc) $enc->title = clean($desc->nodeValue);
+					if ($desc) {
+						$enc->title = clean($desc->nodeValue);
+					}
 				}
 
 				array_push($encs, $enc);
@@ -174,8 +186,9 @@ 
 			$cat = clean(trim(mb_strtolower($srccat)));
 
 			// we don't support numeric tags
-			if (is_numeric($cat))
-				$cat = 't:' . $cat;
+			if (is_numeric($cat)) {
+							$cat = 't:' . $cat;
+			}
 
 			$cat = preg_replace('/[,\'\"]/', "", $cat);
 
@@ -183,8 +196,9 @@ 
 				$cat = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $cat);
 			}
 
-			if (mb_strlen($cat) > 250)
-				$cat = mb_substr($cat, 0, 250);
+			if (mb_strlen($cat) > 250) {
+							$cat = mb_substr($cat, 0, 250);
+			}
 
 			return $cat;
 		}, $tmp);