codysnider / tt-rss

include/autoload.php

Braces +6 added lines, -4 removed lines

@@ -5,8 +5,9 @@ 
 		$namespace = '';
 		$class_name = $class;
 
-		if (strpos($class, '\\') !== FALSE)
-			list ($namespace, $class_name) = explode('\\', $class, 2);
+		if (strpos($class, '\\') !== FALSE) {
+					list ($namespace, $class_name) = explode('\\', $class, 2);
+		}
 
 		$root_dir = dirname(__DIR__); // we're in tt-rss/include
 
@@ -20,7 +21,8 @@ 
 			$class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php";
 		}
 
-		if (file_exists($class_file))
-			include $class_file;
+		if (file_exists($class_file)) {
+					include $class_file;
+		}
 
 	});

Indentation +18 added lines, -18 removed lines

@@ -1,26 +1,26 @@
 <?php
-	require_once "functions.php";
+    require_once "functions.php";
 
-	spl_autoload_register(function($class) {
-		$namespace = '';
-		$class_name = $class;
+    spl_autoload_register(function($class) {
+        $namespace = '';
+        $class_name = $class;
 
-		if (strpos($class, '\\') !== FALSE)
-			list ($namespace, $class_name) = explode('\\', $class, 2);
+        if (strpos($class, '\\') !== FALSE)
+            list ($namespace, $class_name) = explode('\\', $class, 2);
 
-		$root_dir = dirname(__DIR__); // we're in tt-rss/include
+        $root_dir = dirname(__DIR__); // we're in tt-rss/include
 
-		// 1. third party libraries with namespaces are loaded from vendor/
-		// 2. internal tt-rss classes are loaded from classes/ and use special naming logic instead of namespaces
-		// 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?)
+        // 1. third party libraries with namespaces are loaded from vendor/
+        // 2. internal tt-rss classes are loaded from classes/ and use special naming logic instead of namespaces
+        // 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?)
 
-		if ($namespace && $class_name) {
-			$class_file = "$root_dir/vendor/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
-		} else {
-			$class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php";
-		}
+        if ($namespace && $class_name) {
+            $class_file = "$root_dir/vendor/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
+        } else {
+            $class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php";
+        }
 
-		if (file_exists($class_file))
-			include $class_file;
+        if (file_exists($class_file))
+            include $class_file;
 
-	});
+    });

classes/db.php

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();

Indentation +82 added lines, -82 removed lines

@@ -2,115 +2,115 @@
 class Db
 {
 
-	/* @var Db $instance */
-	private static $instance;
+    /* @var Db $instance */
+    private static $instance;
 
-	/* @var IDb $adapter */
-	private $adapter;
+    /* @var IDb $adapter */
+    private $adapter;
 
-	private $link;
+    private $link;
 
-	/* @var PDO $pdo */
-	private $pdo;
+    /* @var PDO $pdo */
+    private $pdo;
 
-	private function __clone() {
-		//
-	}
+    private function __clone() {
+        //
+    }
 
-	private function legacy_connect() {
+    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);
+        $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);
-		}
+        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);
+        }
 
-		if (!$this->adapter) {
-			print("Error initializing database adapter for " . DB_TYPE);
-			exit(100);
-		}
+        if (!$this->adapter) {
+            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 : "");
+        $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());
-			exit(101);
-		}
+        if (!$this->link) {
+            print("Error connecting through adapter: " . $this->adapter->last_error());
+            exit(101);
+        }
 
-		error_reporting($er);
-	}
+        error_reporting($er);
+    }
 
-	// this really shouldn't be used unless a separate PDO connection is needed
-	// normal usage is Db::pdo()->prepare(...) etc
-	public function pdo_connect() {
+    // this really shouldn't be used unless a separate PDO connection is needed
+    // 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,
-				DB_USER,
-				DB_PASS);
-		} catch (Exception $e) {
-			print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>";
-			exit(101);
-		}
+        try {
+            $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>";
+            exit(101);
+        }
 
-		$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
-		if (DB_TYPE == "pgsql") {
+        if (DB_TYPE == "pgsql") {
 
-			$pdo->query("set client_encoding = 'UTF-8'");
-			$pdo->query("set datestyle = 'ISO, european'");
-			$pdo->query("set TIME ZONE 0");
-			$pdo->query("set cpu_tuple_cost = 0.5");
+            $pdo->query("set client_encoding = 'UTF-8'");
+            $pdo->query("set datestyle = 'ISO, european'");
+            $pdo->query("set TIME ZONE 0");
+            $pdo->query("set cpu_tuple_cost = 0.5");
 
-		} else if (DB_TYPE == "mysql") {
-			$pdo->query("SET time_zone = '+0:0'");
+        } else if (DB_TYPE == "mysql") {
+            $pdo->query("SET time_zone = '+0:0'");
 
-			if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-				$pdo->query("SET NAMES " . MYSQL_CHARSET);
-			}
-		}
+            if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                $pdo->query("SET NAMES " . MYSQL_CHARSET);
+            }
+        }
 
-		return $pdo;
-	}
+        return $pdo;
+    }
 
-	public static function instance() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function instance() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
-	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function get() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		if (!self::$instance->adapter) {
-			self::$instance->legacy_connect();
-		}
+        if (!self::$instance->adapter) {
+            self::$instance->legacy_connect();
+        }
 
-		return self::$instance->adapter;
-	}
+        return self::$instance->adapter;
+    }
 
-	public static function pdo() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function pdo() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		if (!self::$instance->pdo) {
-			self::$instance->pdo = self::$instance->pdo_connect();
-		}
+        if (!self::$instance->pdo) {
+            self::$instance->pdo = self::$instance->pdo_connect();
+        }
 
-		return self::$instance->pdo;
-	}
+        return self::$instance->pdo;
+    }
 }

classes/mailer.php

Braces +9 added lines, -6 removed lines

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

Indentation +35 added lines, -35 removed lines

@@ -1,52 +1,52 @@
 <?php
 class Mailer {
-	// TODO: support HTML mail (i.e. MIME messages)
+    // TODO: support HTML mail (i.e. MIME messages)
 
-	private $last_error = "Unable to send mail: check local configuration.";
+    private $last_error = "Unable to send mail: check local configuration.";
 
-	public function mail($params) {
+    public function mail($params) {
 
-		$to_name = $params["to_name"];
-		$to_address = $params["to_address"];
-		$subject = $params["subject"];
-		$message = $params["message"];
-		$from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME;
-		$from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS;
+        $to_name = $params["to_name"];
+        $to_address = $params["to_address"];
+        $subject = $params["subject"];
+        $message = $params["message"];
+        $from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME;
+        $from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS;
 
-		$additional_headers = $params["headers"] ? $params["headers"] : [];
+        $additional_headers = $params["headers"] ? $params["headers"] : [];
 
-		$from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
-		$to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
+        $from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
+        $to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
 
-		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL)
-			Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
+        if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL)
+            Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
 
-		// HOOK_SEND_MAIL plugin instructions:
-		// 1. return 1 or true if mail is handled
-		// 2. return -1 if there's been a fatal error and no further action is allowed
-		// 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function
-		// 4. set error message if needed via passed Mailer instance function set_error()
+        // HOOK_SEND_MAIL plugin instructions:
+        // 1. return 1 or true if mail is handled
+        // 2. return -1 if there's been a fatal error and no further action is allowed
+        // 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function
+        // 4. set error message if needed via passed Mailer instance function set_error()
 
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
-			$rc = $p->hook_send_mail($this, $params);
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
+            $rc = $p->hook_send_mail($this, $params);
 
-			if ($rc == 1)
-				return $rc;
+            if ($rc == 1)
+                return $rc;
 
-			if ($rc == -1)
-				return 0;
-		}
+            if ($rc == -1)
+                return 0;
+        }
 
-		$headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ];
+        $headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ];
 
-		return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
-	}
+        return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
+    }
 
-	public function set_error($message) {
-		$this->last_error = $message;
-	}
+    public function set_error($message) {
+        $this->last_error = $message;
+    }
 
-	public function error() {
-		return $this->last_error;
-	}
+    public function error() {
+        return $this->last_error;
+    }
 }

classes/feeditem/atom.php

Braces +8 added lines, -6 removed lines

@@ -43,10 +43,11 @@ 
 					|| $link->getAttribute("rel") == "standout")) {
 				$base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
 
-				if ($base)
-					return rewrite_relative_url($base, clean(trim($link->getAttribute("href"))));
-				else
-					return clean(trim($link->getAttribute("href")));
+				if ($base) {
+									return rewrite_relative_url($base, clean(trim($link->getAttribute("href"))));
+				} else {
+									return clean(trim($link->getAttribute("href")));
+				}
 
 			}
 		}
@@ -106,8 +107,9 @@ 
 		$cats = [];
 
 		foreach ($categories as $cat) {
-			if ($cat->hasAttribute("term"))
-				array_push($cats, $cat->getAttribute("term"));
+			if ($cat->hasAttribute("term")) {
+							array_push($cats, $cat->getAttribute("term"));
+			}
 		}
 
 		$categories = $this->xpath->query("dc:subject", $this->elem);

Indentation +140 added lines, -140 removed lines

@@ -1,160 +1,160 @@
 <?php
 class FeedItem_Atom extends FeedItem_Common {
-	const NS_XML = "http://www.w3.org/XML/1998/namespace";
+    const NS_XML = "http://www.w3.org/XML/1998/namespace";
 
-	public function get_id() {
-		$id = $this->elem->getElementsByTagName("id")->item(0);
+    public function get_id() {
+        $id = $this->elem->getElementsByTagName("id")->item(0);
 
-		if ($id) {
-			return $id->nodeValue;
-		} else {
-			return clean($this->get_link());
-		}
-	}
+        if ($id) {
+            return $id->nodeValue;
+        } else {
+            return clean($this->get_link());
+        }
+    }
 
-	public function get_date() {
-		$updated = $this->elem->getElementsByTagName("updated")->item(0);
+    public function get_date() {
+        $updated = $this->elem->getElementsByTagName("updated")->item(0);
 
-		if ($updated) {
-			return strtotime($updated->nodeValue);
-		}
+        if ($updated) {
+            return strtotime($updated->nodeValue);
+        }
 
-		$published = $this->elem->getElementsByTagName("published")->item(0);
+        $published = $this->elem->getElementsByTagName("published")->item(0);
 
-		if ($published) {
-			return strtotime($published->nodeValue);
-		}
+        if ($published) {
+            return strtotime($published->nodeValue);
+        }
 
-		$date = $this->xpath->query("dc:date", $this->elem)->item(0);
+        $date = $this->xpath->query("dc:date", $this->elem)->item(0);
 
-		if ($date) {
-			return strtotime($date->nodeValue);
-		}
-	}
+        if ($date) {
+            return strtotime($date->nodeValue);
+        }
+    }
 
 
-	public function get_link() {
-		$links = $this->elem->getElementsByTagName("link");
+    public function get_link() {
+        $links = $this->elem->getElementsByTagName("link");
 
-		foreach ($links as $link) {
-			if ($link && $link->hasAttribute("href") &&
-				(!$link->hasAttribute("rel")
-					|| $link->getAttribute("rel") == "alternate"
-					|| $link->getAttribute("rel") == "standout")) {
-				$base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
+        foreach ($links as $link) {
+            if ($link && $link->hasAttribute("href") &&
+                (!$link->hasAttribute("rel")
+                    || $link->getAttribute("rel") == "alternate"
+                    || $link->getAttribute("rel") == "standout")) {
+                $base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
 
-				if ($base)
-					return rewrite_relative_url($base, clean(trim($link->getAttribute("href"))));
-				else
-					return clean(trim($link->getAttribute("href")));
+                if ($base)
+                    return rewrite_relative_url($base, clean(trim($link->getAttribute("href"))));
+                else
+                    return clean(trim($link->getAttribute("href")));
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	public function get_title() {
-		$title = $this->elem->getElementsByTagName("title")->item(0);
+    public function get_title() {
+        $title = $this->elem->getElementsByTagName("title")->item(0);
 
-		if ($title) {
-			return clean(trim($title->nodeValue));
-		}
-	}
-
-	public function get_content() {
-		$content = $this->elem->getElementsByTagName("content")->item(0);
-
-		if ($content) {
-			if ($content->hasAttribute('type')) {
-				if ($content->getAttribute('type') == 'xhtml') {
-					for ($i = 0; $i < $content->childNodes->length; $i++) {
-						$child = $content->childNodes->item($i);
-
-						if ($child->hasChildNodes()) {
-							return $this->doc->saveHTML($child);
-						}
-					}
-				}
-			}
-
-			return $this->subtree_or_text($content);
-		}
-	}
-
-	public function get_description() {
-		$content = $this->elem->getElementsByTagName("summary")->item(0);
-
-		if ($content) {
-			if ($content->hasAttribute('type')) {
-				if ($content->getAttribute('type') == 'xhtml') {
-					for ($i = 0; $i < $content->childNodes->length; $i++) {
-						$child = $content->childNodes->item($i);
-
-						if ($child->hasChildNodes()) {
-							return $this->doc->saveHTML($child);
-						}
-					}
-				}
-			}
-
-			return $this->subtree_or_text($content);
-		}
-
-	}
-
-	public function get_categories() {
-		$categories = $this->elem->getElementsByTagName("category");
-		$cats = [];
-
-		foreach ($categories as $cat) {
-			if ($cat->hasAttribute("term"))
-				array_push($cats, $cat->getAttribute("term"));
-		}
-
-		$categories = $this->xpath->query("dc:subject", $this->elem);
+        if ($title) {
+            return clean(trim($title->nodeValue));
+        }
+    }
+
+    public function get_content() {
+        $content = $this->elem->getElementsByTagName("content")->item(0);
+
+        if ($content) {
+            if ($content->hasAttribute('type')) {
+                if ($content->getAttribute('type') == 'xhtml') {
+                    for ($i = 0; $i < $content->childNodes->length; $i++) {
+                        $child = $content->childNodes->item($i);
+
+                        if ($child->hasChildNodes()) {
+                            return $this->doc->saveHTML($child);
+                        }
+                    }
+                }
+            }
+
+            return $this->subtree_or_text($content);
+        }
+    }
+
+    public function get_description() {
+        $content = $this->elem->getElementsByTagName("summary")->item(0);
+
+        if ($content) {
+            if ($content->hasAttribute('type')) {
+                if ($content->getAttribute('type') == 'xhtml') {
+                    for ($i = 0; $i < $content->childNodes->length; $i++) {
+                        $child = $content->childNodes->item($i);
+
+                        if ($child->hasChildNodes()) {
+                            return $this->doc->saveHTML($child);
+                        }
+                    }
+                }
+            }
+
+            return $this->subtree_or_text($content);
+        }
+
+    }
+
+    public function get_categories() {
+        $categories = $this->elem->getElementsByTagName("category");
+        $cats = [];
+
+        foreach ($categories as $cat) {
+            if ($cat->hasAttribute("term"))
+                array_push($cats, $cat->getAttribute("term"));
+        }
+
+        $categories = $this->xpath->query("dc:subject", $this->elem);
 
-		foreach ($categories as $cat) {
-			array_push($cats, $cat->nodeValue);
-		}
-
-		return $this->normalize_categories($cats);
-	}
+        foreach ($categories as $cat) {
+            array_push($cats, $cat->nodeValue);
+        }
+
+        return $this->normalize_categories($cats);
+    }
 
-	public function get_enclosures() {
-		$links = $this->elem->getElementsByTagName("link");
-
-		$encs = array();
-
-		foreach ($links as $link) {
-			if ($link && $link->hasAttribute("href") && $link->hasAttribute("rel")) {
-				if ($link->getAttribute("rel") == "enclosure") {
-					$enc = new FeedEnclosure();
-
-					$enc->type = clean($link->getAttribute("type"));
-					$enc->link = clean($link->getAttribute("href"));
-					$enc->length = clean($link->getAttribute("length"));
-
-					array_push($encs, $enc);
-				}
-			}
-		}
-
-		$encs = array_merge($encs, parent::get_enclosures());
-
-		return $encs;
-	}
-
-	public function get_language() {
-		$lang = $this->elem->getAttributeNS(self::NS_XML, "lang");
-
-		if (!empty($lang)) {
-			return clean($lang);
-		} else {
-			// Fall back to the language declared on the feed, if any.
-			foreach ($this->doc->childNodes as $child) {
-				if (method_exists($child, "getAttributeNS")) {
-					return clean($child->getAttributeNS(self::NS_XML, "lang"));
-				}
-			}
-		}
-	}
+    public function get_enclosures() {
+        $links = $this->elem->getElementsByTagName("link");
+
+        $encs = array();
+
+        foreach ($links as $link) {
+            if ($link && $link->hasAttribute("href") && $link->hasAttribute("rel")) {
+                if ($link->getAttribute("rel") == "enclosure") {
+                    $enc = new FeedEnclosure();
+
+                    $enc->type = clean($link->getAttribute("type"));
+                    $enc->link = clean($link->getAttribute("href"));
+                    $enc->length = clean($link->getAttribute("length"));
+
+                    array_push($encs, $enc);
+                }
+            }
+        }
+
+        $encs = array_merge($encs, parent::get_enclosures());
+
+        return $encs;
+    }
+
+    public function get_language() {
+        $lang = $this->elem->getAttributeNS(self::NS_XML, "lang");
+
+        if (!empty($lang)) {
+            return clean($lang);
+        } else {
+            // Fall back to the language declared on the feed, if any.
+            foreach ($this->doc->childNodes as $child) {
+                if (method_exists($child, "getAttributeNS")) {
+                    return clean($child->getAttributeNS(self::NS_XML, "lang"));
+                }
+            }
+        }
+    }
 }

classes/counters.php

Braces +20 added lines, -14 removed lines

@@ -95,10 +95,11 @@ 
 
 			$count = getFeedUnread($i);
 
-			if ($i == 0 || $i == -1 || $i == -2)
-				$auxctr = Feeds::getFeedArticles($i, false);
-			else
-				$auxctr = 0;
+			if ($i == 0 || $i == -1 || $i == -2) {
+							$auxctr = Feeds::getFeedArticles($i, false);
+			} else {
+							$auxctr = 0;
+			}
 
 			$cv = array("id" => $i,
 				"counter" => (int) $count,
@@ -117,8 +118,9 @@ 
 				$cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
 					"counter" => $feed['sender']->get_unread($feed['id']));
 
-				if (method_exists($feed['sender'], 'get_total'))
-					$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
+				if (method_exists($feed['sender'], 'get_total')) {
+									$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
+				}
 
 				array_push($ret_arr, $cv);
 			}
@@ -150,8 +152,9 @@ 
 				"counter" => (int) $line["unread"],
 				"auxcounter" => (int) $line["total"]);
 
-			if ($descriptions)
-				$cv["description"] = $line["caption"];
+			if ($descriptions) {
+							$cv["description"] = $line["caption"];
+			}
 
 			array_push($ret_arr, $cv);
 		}
@@ -189,22 +192,25 @@ 
 				$has_img = false;
 			}
 
-			if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
-				$last_updated = '';
+			if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2) {
+							$last_updated = '';
+			}
 
 			$cv = array("id" => $id,
 				"updated" => $last_updated,
 				"counter" => (int) $count,
 				"has_img" => (int) $has_img);
 
-			if ($last_error)
-				$cv["error"] = $last_error;
+			if ($last_error) {
+							$cv["error"] = $last_error;
+			}
 
 //			if (get_pref('EXTENDED_FEEDLIST'))
 //				$cv["xmsg"] = getFeedArticles($id)." ".__("total");
 
-			if ($active_feed && $id == $active_feed)
-				$cv["title"] = truncate_string($line["title"], 30);
+			if ($active_feed && $id == $active_feed) {
+							$cv["title"] = truncate_string($line["title"], 30);
+			}
 
 			array_push($ret_arr, $cv);
 

Indentation +122 added lines, -122 removed lines

@@ -1,171 +1,171 @@ 
 <?php
 class Counters {
 
-	public static function getAllCounters() {
-		$data = Counters::getGlobalCounters();
+    public static function getAllCounters() {
+        $data = Counters::getGlobalCounters();
 
-		$data = array_merge($data, Counters::getVirtCounters());
-		$data = array_merge($data, Counters::getLabelCounters());
-		$data = array_merge($data, Counters::getFeedCounters());
-		$data = array_merge($data, Counters::getCategoryCounters());
+        $data = array_merge($data, Counters::getVirtCounters());
+        $data = array_merge($data, Counters::getLabelCounters());
+        $data = array_merge($data, Counters::getFeedCounters());
+        $data = array_merge($data, Counters::getCategoryCounters());
 
-		return $data;
-	}
+        return $data;
+    }
 
-	public static function getCategoryCounters() {
-		$ret_arr = array();
+    public static function getCategoryCounters() {
+        $ret_arr = array();
 
-		/* Labels category */
+        /* Labels category */
 
-		$cv = array("id" => -2, "kind" => "cat",
-			"counter" => Feeds::getCategoryUnread(-2));
+        $cv = array("id" => -2, "kind" => "cat",
+            "counter" => Feeds::getCategoryUnread(-2));
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		$pdo = DB::pdo();
+        $pdo = DB::pdo();
 
-		$sth = $pdo->prepare("SELECT ttrss_feed_categories.id AS cat_id, value AS unread,
+        $sth = $pdo->prepare("SELECT ttrss_feed_categories.id AS cat_id, value AS unread,
 			(SELECT COUNT(id) FROM ttrss_feed_categories AS c2
 				WHERE c2.parent_cat = ttrss_feed_categories.id) AS num_children
 			FROM ttrss_feed_categories, ttrss_cat_counters_cache
 			WHERE ttrss_cat_counters_cache.feed_id = ttrss_feed_categories.id AND
 			ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid AND
 			ttrss_feed_categories.owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
-			$line["cat_id"] = (int) $line["cat_id"];
+        while ($line = $sth->fetch()) {
+            $line["cat_id"] = (int) $line["cat_id"];
 
-			if ($line["num_children"] > 0) {
-				$child_counter = Feeds::getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]);
-			} else {
-				$child_counter = 0;
-			}
+            if ($line["num_children"] > 0) {
+                $child_counter = Feeds::getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]);
+            } else {
+                $child_counter = 0;
+            }
 
-			$cv = array("id" => $line["cat_id"], "kind" => "cat",
-				"counter" => $line["unread"] + $child_counter);
+            $cv = array("id" => $line["cat_id"], "kind" => "cat",
+                "counter" => $line["unread"] + $child_counter);
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		/* Special case: NULL category doesn't actually exist in the DB */
+        /* Special case: NULL category doesn't actually exist in the DB */
 
-		$cv = array("id" => 0, "kind" => "cat",
-			"counter" => (int) CCache::find(0, $_SESSION["uid"], true));
+        $cv = array("id" => 0, "kind" => "cat",
+            "counter" => (int) CCache::find(0, $_SESSION["uid"], true));
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getGlobalCounters($global_unread = -1) {
-		$ret_arr = array();
+    public static function getGlobalCounters($global_unread = -1) {
+        $ret_arr = array();
 
-		if ($global_unread == -1) {
-			$global_unread = Feeds::getGlobalUnread();
-		}
+        if ($global_unread == -1) {
+            $global_unread = Feeds::getGlobalUnread();
+        }
 
-		$cv = array("id" => "global-unread",
-			"counter" => (int) $global_unread);
+        $cv = array("id" => "global-unread",
+            "counter" => (int) $global_unread);
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT COUNT(id) AS fn FROM
+        $sth = $pdo->prepare("SELECT COUNT(id) AS fn FROM
 			ttrss_feeds WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-		$row = $sth->fetch();
+        $sth->execute([$_SESSION['uid']]);
+        $row = $sth->fetch();
 
-		$subscribed_feeds = $row["fn"];
+        $subscribed_feeds = $row["fn"];
 
-		$cv = array("id" => "subscribed-feeds",
-			"counter" => (int) $subscribed_feeds);
+        $cv = array("id" => "subscribed-feeds",
+            "counter" => (int) $subscribed_feeds);
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getVirtCounters() {
+    public static function getVirtCounters() {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		for ($i = 0; $i >= -4; $i--) {
+        for ($i = 0; $i >= -4; $i--) {
 
-			$count = getFeedUnread($i);
+            $count = getFeedUnread($i);
 
-			if ($i == 0 || $i == -1 || $i == -2)
-				$auxctr = Feeds::getFeedArticles($i, false);
-			else
-				$auxctr = 0;
+            if ($i == 0 || $i == -1 || $i == -2)
+                $auxctr = Feeds::getFeedArticles($i, false);
+            else
+                $auxctr = 0;
 
-			$cv = array("id" => $i,
-				"counter" => (int) $count,
-				"auxcounter" => (int) $auxctr);
+            $cv = array("id" => $i,
+                "counter" => (int) $count,
+                "auxcounter" => (int) $auxctr);
 
 //			if (get_pref('EXTENDED_FEEDLIST'))
 //				$cv["xmsg"] = getFeedArticles($i)." ".__("total");
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		$feeds = PluginHost::getInstance()->get_feeds(-1);
+        $feeds = PluginHost::getInstance()->get_feeds(-1);
 
-		if (is_array($feeds)) {
-			foreach ($feeds as $feed) {
-				$cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
-					"counter" => $feed['sender']->get_unread($feed['id']));
+        if (is_array($feeds)) {
+            foreach ($feeds as $feed) {
+                $cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
+                    "counter" => $feed['sender']->get_unread($feed['id']));
 
-				if (method_exists($feed['sender'], 'get_total'))
-					$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
+                if (method_exists($feed['sender'], 'get_total'))
+                    $cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
 
-				array_push($ret_arr, $cv);
-			}
-		}
+                array_push($ret_arr, $cv);
+            }
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getLabelCounters($descriptions = false) {
+    public static function getLabelCounters($descriptions = false) {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id,caption,SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread, COUNT(u1.unread) AS total
+        $sth = $pdo->prepare("SELECT id,caption,SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread, COUNT(u1.unread) AS total
 			FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
 				(ttrss_labels2.id = label_id)
 				LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id
 				WHERE ttrss_labels2.owner_uid = :uid AND u1.owner_uid = :uid
 				GROUP BY ttrss_labels2.id,
 					ttrss_labels2.caption");
-		$sth->execute([":uid" => $_SESSION['uid']]);
+        $sth->execute([":uid" => $_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$id = Labels::label_to_feed_id($line["id"]);
+            $id = Labels::label_to_feed_id($line["id"]);
 
-			$cv = array("id" => $id,
-				"counter" => (int) $line["unread"],
-				"auxcounter" => (int) $line["total"]);
+            $cv = array("id" => $id,
+                "counter" => (int) $line["unread"],
+                "auxcounter" => (int) $line["total"]);
 
-			if ($descriptions)
-				$cv["description"] = $line["caption"];
+            if ($descriptions)
+                $cv["description"] = $line["caption"];
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getFeedCounters($active_feed = false) {
+    public static function getFeedCounters($active_feed = false) {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT ttrss_feeds.id,
+        $sth = $pdo->prepare("SELECT ttrss_feeds.id,
 				ttrss_feeds.title,
 				".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
 				last_error, value AS count
@@ -173,44 +173,44 @@ 
 			WHERE ttrss_feeds.owner_uid = ?
 				AND ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid
 				AND ttrss_counters_cache.feed_id = ttrss_feeds.id");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$id = $line["id"];
-			$count = $line["count"];
-			$last_error = htmlspecialchars($line["last_error"]);
+            $id = $line["id"];
+            $count = $line["count"];
+            $last_error = htmlspecialchars($line["last_error"]);
 
-			$last_updated = make_local_datetime($line['last_updated'], false);
+            $last_updated = make_local_datetime($line['last_updated'], false);
 
-			if (Feeds::feedHasIcon($id)) {
-				$has_img = filemtime(Feeds::getIconFile($id));
-			} else {
-				$has_img = false;
-			}
+            if (Feeds::feedHasIcon($id)) {
+                $has_img = filemtime(Feeds::getIconFile($id));
+            } else {
+                $has_img = false;
+            }
 
-			if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
-				$last_updated = '';
+            if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
+                $last_updated = '';
 
-			$cv = array("id" => $id,
-				"updated" => $last_updated,
-				"counter" => (int) $count,
-				"has_img" => (int) $has_img);
+            $cv = array("id" => $id,
+                "updated" => $last_updated,
+                "counter" => (int) $count,
+                "has_img" => (int) $has_img);
 
-			if ($last_error)
-				$cv["error"] = $last_error;
+            if ($last_error)
+                $cv["error"] = $last_error;
 
 //			if (get_pref('EXTENDED_FEEDLIST'))
 //				$cv["xmsg"] = getFeedArticles($id)." ".__("total");
 
-			if ($active_feed && $id == $active_feed)
-				$cv["title"] = truncate_string($line["title"], 30);
+            if ($active_feed && $id == $active_feed)
+                $cv["title"] = truncate_string($line["title"], 30);
 
-			array_push($ret_arr, $cv);
+            array_push($ret_arr, $cv);
 
-		}
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
 }

classes/dbupdater.php

Braces +5 added lines, -4 removed lines

@@ -43,10 +43,11 @@
 				foreach ($lines as $line) {
 					if (strpos($line, "--") !== 0 && $line) {
 
-						if ($html_output)
-							print "<pre>$line</pre>";
-						else
-							Debug::log("> $line");
+						if ($html_output) {
+													print "<pre>$line</pre>";
+						} else {
+													Debug::log("> $line");
+						}
 
 						try {
 							$this->pdo->query($line); // PDO returns errors as exceptions now

Indentation +78 added lines, -78 removed lines

@@ -2,83 +2,83 @@
 
 class DbUpdater {
 
-	private $pdo;
-	private $db_type;
-	private $need_version;
-
-	public function __construct($db_type, $need_version) {
-		$this->pdo = Db::pdo();
-		$this->db_type = $db_type;
-		$this->need_version = (int) $need_version;
-	}
-
-	public function getSchemaVersion() {
-		$row = $this->pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
-		return (int) $row['schema_version'];
-	}
-
-	public function isUpdateRequired() {
-		return $this->getSchemaVersion() < $this->need_version;
-	}
-
-	public function getSchemaLines($version) {
-		$filename = "schema/versions/".$this->db_type."/$version.sql";
-
-		if (file_exists($filename)) {
-			return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename)));
-		} else {
-			user_error("DB Updater: schema file for version $version is not found.");
-			return false;
-		}
-	}
-
-	public function performUpdateTo($version, $html_output = true) {
-		if ($this->getSchemaVersion() == $version - 1) {
-
-			$lines = $this->getSchemaLines($version);
-
-			if (is_array($lines)) {
-
-				$this->pdo->beginTransaction();
-
-				foreach ($lines as $line) {
-					if (strpos($line, "--") !== 0 && $line) {
-
-						if ($html_output)
-							print "<pre>$line</pre>";
-						else
-							Debug::log("> $line");
-
-						try {
-							$this->pdo->query($line); // PDO returns errors as exceptions now
-						} catch (PDOException $e) {
-							if ($html_output) {
-								print "<div class='text-error'>Error: " . $e->getMessage() . "</div>";
-							} else {
-								Debug::log("Error: " . $e->getMessage());
-							}
-
-							$this->pdo->rollBack();
-							return false;
-						}
-					}
-				}
-
-				$db_version = $this->getSchemaVersion();
-
-				if ($db_version == $version) {
-					$this->pdo->commit();
-					return true;
-				} else {
-					$this->pdo->rollBack();
-					return false;
-				}
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
+    private $pdo;
+    private $db_type;
+    private $need_version;
+
+    public function __construct($db_type, $need_version) {
+        $this->pdo = Db::pdo();
+        $this->db_type = $db_type;
+        $this->need_version = (int) $need_version;
+    }
+
+    public function getSchemaVersion() {
+        $row = $this->pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
+        return (int) $row['schema_version'];
+    }
+
+    public function isUpdateRequired() {
+        return $this->getSchemaVersion() < $this->need_version;
+    }
+
+    public function getSchemaLines($version) {
+        $filename = "schema/versions/".$this->db_type."/$version.sql";
+
+        if (file_exists($filename)) {
+            return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename)));
+        } else {
+            user_error("DB Updater: schema file for version $version is not found.");
+            return false;
+        }
+    }
+
+    public function performUpdateTo($version, $html_output = true) {
+        if ($this->getSchemaVersion() == $version - 1) {
+
+            $lines = $this->getSchemaLines($version);
+
+            if (is_array($lines)) {
+
+                $this->pdo->beginTransaction();
+
+                foreach ($lines as $line) {
+                    if (strpos($line, "--") !== 0 && $line) {
+
+                        if ($html_output)
+                            print "<pre>$line</pre>";
+                        else
+                            Debug::log("> $line");
+
+                        try {
+                            $this->pdo->query($line); // PDO returns errors as exceptions now
+                        } catch (PDOException $e) {
+                            if ($html_output) {
+                                print "<div class='text-error'>Error: " . $e->getMessage() . "</div>";
+                            } else {
+                                Debug::log("Error: " . $e->getMessage());
+                            }
+
+                            $this->pdo->rollBack();
+                            return false;
+                        }
+                    }
+                }
+
+                $db_version = $this->getSchemaVersion();
+
+                if ($db_version == $version) {
+                    $this->pdo->commit();
+                    return true;
+                } else {
+                    $this->pdo->rollBack();
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 
 }

lib/jimIcon.php

Braces +21 added lines, -14 removed lines

@@ -24,13 +24,15 @@ 
                 $r = ord($str[2]);
                 if (strlen($str) > 3) {
                         $a = 127 - (ord($str[3]) / 2);
-                        if ($a != 0 && $a != 127)
-                                $this->had_alpha = 1;
+                        if ($a != 0 && $a != 127) {
+                                                        $this->had_alpha = 1;
+                        }
                 } else {
                         $a = 0;
                 }
-                if ($a != 127)
-                        $this->all_transaprent = 0;
+                if ($a != 127) {
+                                        $this->all_transaprent = 0;
+                }
                 return imagecolorallocatealpha($img, $r, $g, $b, $a);
         }
 
@@ -65,8 +67,9 @@ 
                 $most_pixels = 0;
                 for ($i = 0; $i < $h["num"]; $i++) {
                         $entry = substr($ico, 6 + 16 * $i, 16);
-                        if (!$entry || strlen($entry) < 16)
-                                continue;
+                        if (!$entry || strlen($entry) < 16) {
+                                                        continue;
+                        }
                         $e = unpack("Cwidth/" .
                                     "Cheight/" .
                                     "Ccolors/" .
@@ -76,10 +79,12 @@ 
                                     "Vsize/" .
                                     "Voffset/",
                                     $entry);
-                        if ($e["width"] == 0)
-                                $e["width"] = 256;
-                        if ($e["height"] == 0)
-                                $e["height"] = 256;
+                        if ($e["width"] == 0) {
+                                                        $e["width"] = 256;
+                        }
+                        if ($e["height"] == 0) {
+                                                        $e["height"] = 256;
+                        }
                         if ($e["zero"] != 0) {
                                 $this->error = "nonzero reserved field";
                                 return false;
@@ -226,8 +231,9 @@ 
                                 }
                         }
                         // End of row padding
-                        while ($offset & 3)
-                                $offset++;
+                        while ($offset & 3) {
+                                                        $offset++;
+                        }
                 }
 
                 // Now the "AND" image, which is 1 bit per pixel.  Ignore
@@ -261,8 +267,9 @@ 
                         }
 
                         // End of row padding
-                        while ($offset & 3)
-                                $offset++;
+                        while ($offset & 3) {
+                                                        $offset++;
+                        }
                 }
                 return $img;
         }

Indentation +13 added lines, -13 removed lines

@@ -123,16 +123,16 @@ 
                 $bitmapinfo = unpack("Vsize", $data);
                 if ($bitmapinfo["size"] == 40) {
                         $info = unpack("Vsize/" .
-                                       "Vwidth/" .
-                                       "Vheight/" .
-                                       "vplanes/" .
-                                       "vbpp/" .
-                                       "Vcompress/" .
-                                       "Vsize/" .
-                                       "Vxres/" .
-                                       "Vyres/" .
-                                       "Vpalcolors/" .
-                                       "Vimpcolors/", $data);
+                                        "Vwidth/" .
+                                        "Vheight/" .
+                                        "vplanes/" .
+                                        "vbpp/" .
+                                        "Vcompress/" .
+                                        "Vsize/" .
+                                        "Vxres/" .
+                                        "Vyres/" .
+                                        "Vpalcolors/" .
+                                        "Vimpcolors/", $data);
                         if ($e["bpp"] == 0) {
                                 $e["bpp"] = $info["bpp"];
                         }
@@ -239,7 +239,7 @@ 
                         for ($y = 0; $y < $height; $y++) {
                                 for ($x = 0; $x < $width; $x++) {
                                         imagesetpixel($img, $x, $y,
-                                                      $XOR[$y][$x]);
+                                                        $XOR[$y][$x]);
                                 }
                         }
                         return $img;
@@ -250,10 +250,10 @@ 
                         $x = 0;
                         while ($x < $width) {
                                 for ($b = 0x80;
-                                     $b > 0 && $x < $width; $b >>= 1) {
+                                        $b > 0 && $x < $width; $b >>= 1) {
                                         if (!(ord($data[$offset]) & $b)) {
                                                 imagesetpixel($img, $x, $y,
-                                                              $XOR[$y][$x]);
+                                                                $XOR[$y][$x]);
                                         }
                                         $x++;
                                 }

lib/phpqrcode/qrbitstream.php

Braces +12 added lines, -8 removed lines

@@ -108,13 +108,15 @@ 
         //----------------------------------------------------------------------

         public function appendNum($bits, $num)

         {

-            if ($bits == 0) 

-                return 0;

+            if ($bits == 0) {
+                            return 0;
+            }
 

             $b = QRbitstream::newFromNum($bits, $num);

             

-            if(is_null($b))

-                return -1;

+            if(is_null($b)) {
+                            return -1;
+            }
 

             $ret = $this->append($b);

             unset($b);

@@ -125,13 +127,15 @@ 
         //----------------------------------------------------------------------

         public function appendBytes($size, $data)

         {

-            if ($size == 0) 

-                return 0;

+            if ($size == 0) {
+                            return 0;
+            }
 

             $b = QRbitstream::newFromBytes($size, $data);

             

-            if(is_null($b))

-                return -1;

+            if(is_null($b)) {
+                            return -1;
+            }
 

             $ret = $this->append($b);

             unset($b);

lib/phpqrcode/qrspec.php

Braces +27 added lines, -18 removed lines

@@ -115,8 +115,9 @@ 
 

             for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {

                 $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];

-                if($words >= $size) 

-                    return $i;

+                if($words >= $size) {
+                                    return $i;
+                }
             }

 

             return -1;

@@ -134,8 +135,9 @@ 
         //----------------------------------------------------------------------

         public static function lengthIndicator($mode, $version)

         {

-            if ($mode == QR_MODE_STRUCTURE)

-                return 0;

+            if ($mode == QR_MODE_STRUCTURE) {
+                            return 0;
+            }
                 

             if ($version <= 9) {

                 $l = 0;

@@ -151,8 +153,9 @@ 
         //----------------------------------------------------------------------

         public static function maximumWords($mode, $version)

         {

-            if($mode == QR_MODE_STRUCTURE) 

-                return 3;

+            if($mode == QR_MODE_STRUCTURE) {
+                            return 3;
+            }
                 

             if($version <= 9) {

                 $l = 0;

@@ -298,8 +301,9 @@ 
         //----------------------------------------------------------------------

         public static function putAlignmentPattern($version, &$frame, $width)

         {

-            if($version < 2)

-                return;

+            if($version < 2) {
+                            return;
+            }
 

             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];

             if($d < 0) {

@@ -351,8 +355,9 @@ 
         //----------------------------------------------------------------------

         public static function getVersionPattern($version)

         {

-            if($version < 7 || $version > QRSPEC_VERSION_MAX)

-                return 0;

+            if($version < 7 || $version > QRSPEC_VERSION_MAX) {
+                            return 0;
+            }
 

             return self::$versionPattern[$version -7];

         }

@@ -369,11 +374,13 @@ 
 

         public static function getFormatInfo($mask, $level)

         {

-            if($mask < 0 || $mask > 7)

-                return 0;

+            if($mask < 0 || $mask > 7) {
+                            return 0;
+            }
                 

-            if($level < 0 || $level > 3)

-                return 0;                

+            if($level < 0 || $level > 3) {
+                            return 0;
+            }
 

             return self::$formatInfo[$level][$mask];

         }

@@ -553,8 +560,9 @@ 
         //----------------------------------------------------------------------

         public static function newFrame($version)

         {

-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 

-                return null;

+            if($version < 1 || $version > QRSPEC_VERSION_MAX) {
+                            return null;
+            }
 

             if(!isset(self::$frames[$version])) {

                 

@@ -572,8 +580,9 @@ 
                 }

             }

             

-            if(is_null(self::$frames[$version]))

-                return null;

+            if(is_null(self::$frames[$version])) {
+                            return null;
+            }
 

             return self::$frames[$version];

         }

Indentation +2 added lines, -2 removed lines

@@ -335,10 +335,10 @@
 

         // Version information pattern -----------------------------------------

 

-		// Version information pattern (BCH coded).

+        // Version information pattern (BCH coded).

         // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.

         

-		// size: [QRSPEC_VERSION_MAX - 6]

+        // size: [QRSPEC_VERSION_MAX - 6]

 		

         public static $versionPattern = array(

             0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,