codysnider / tt-rss

classes/feedenclosure.php

Indentation +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@
 <?php
 class FeedEnclosure {
-	public $link;
-	public $type;
-	public $length;
-	public $title;
-	public $height;
-	public $width;
+    public $link;
+    public $type;
+    public $length;
+    public $title;
+    public $height;
+    public $width;
 }
 

classes/iauthmodule.php

Indentation +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
 interface IAuthModule {
-	public function authenticate($login, $password); // + optional third parameter: $service
+    public function authenticate($login, $password); // + optional third parameter: $service
 }

classes/pluginhandler.php

Indentation +18 added lines, -18 removed lines

@@ -1,23 +1,23 @@
 <?php
 class PluginHandler extends Handler_Protected {
-	public function csrf_ignore($method) {
-		return true;
-	}
+    public function csrf_ignore($method) {
+        return true;
+    }
 
-	public function catchall($method) {
-		$plugin_name = clean($_REQUEST["plugin"]);
-		$plugin = PluginHost::getInstance()->get_plugin($plugin_name);
+    public function catchall($method) {
+        $plugin_name = clean($_REQUEST["plugin"]);
+        $plugin = PluginHost::getInstance()->get_plugin($plugin_name);
 
-		if ($plugin) {
-			if (method_exists($plugin, $method)) {
-				$plugin->$method();
-			} else {
-				user_error("PluginHandler: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
-				print error_json(13);
-			}
-		} else {
-			user_error("PluginHandler: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
-			print error_json(14);
-		}
-	}
+        if ($plugin) {
+            if (method_exists($plugin, $method)) {
+                $plugin->$method();
+            } else {
+                user_error("PluginHandler: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
+                print error_json(13);
+            }
+        } else {
+            user_error("PluginHandler: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
+            print error_json(14);
+        }
+    }
 }

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

Indentation +65 added lines, -65 removed lines

@@ -1,91 +1,91 @@
 <?php
 class Db_Pgsql implements IDb {
-	private $link;
-	private $last_error;
+    private $link;
+    private $last_error;
 
-	public function connect($host, $user, $pass, $db, $port) {
-		$string = "dbname=$db user=$user";
+    public function connect($host, $user, $pass, $db, $port) {
+        $string = "dbname=$db user=$user";
 
-		if ($pass) {
-			$string .= " password=$pass";
-		}
+        if ($pass) {
+            $string .= " password=$pass";
+        }
 
-		if ($host) {
-			$string .= " host=$host";
-		}
+        if ($host) {
+            $string .= " host=$host";
+        }
 
-		if (is_numeric($port) && $port > 0) {
-			$string = "$string port=" . $port;
-		}
+        if (is_numeric($port) && $port > 0) {
+            $string = "$string port=" . $port;
+        }
 
-		$this->link = pg_connect($string);
+        $this->link = pg_connect($string);
 
-		if (!$this->link) {
-			print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
-			exit(102);
-		}
+        if (!$this->link) {
+            print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
+            exit(102);
+        }
 
-		$this->init();
+        $this->init();
 
-		return $this->link;
-	}
+        return $this->link;
+    }
 
-	public function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
+    public function escape_string($s, $strip_tags = true) {
+        if ($strip_tags) $s = strip_tags($s);
 
-		return pg_escape_string($s);
-	}
+        return pg_escape_string($s);
+    }
 
-	public function query($query, $die_on_error = true) {
-		$result = @pg_query($this->link, $query);
+    public function query($query, $die_on_error = true) {
+        $result = @pg_query($this->link, $query);
 
-		if (!$result) {
-			$this->last_error = @pg_last_error($this->link);
+        if (!$result) {
+            $this->last_error = @pg_last_error($this->link);
 
-			@pg_query($this->link, "ROLLBACK");
-			$query = htmlspecialchars($query); // just in case
-			user_error("query $query failed: " . ($this->link ? $this->last_error : "No connection"),
-				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
-		}
-		return $result;
-	}
+            @pg_query($this->link, "ROLLBACK");
+            $query = htmlspecialchars($query); // just in case
+            user_error("query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+                $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+        }
+        return $result;
+    }
 
-	public function fetch_assoc($result) {
-		return pg_fetch_assoc($result);
-	}
+    public function fetch_assoc($result) {
+        return pg_fetch_assoc($result);
+    }
 
 
-	public function num_rows($result) {
-		return pg_num_rows($result);
-	}
+    public function num_rows($result) {
+        return pg_num_rows($result);
+    }
 
-	public function fetch_result($result, $row, $param) {
-		return pg_fetch_result($result, $row, $param);
-	}
+    public function fetch_result($result, $row, $param) {
+        return pg_fetch_result($result, $row, $param);
+    }
 
-	public function close() {
-		return pg_close($this->link);
-	}
+    public function close() {
+        return pg_close($this->link);
+    }
 
-	public function affected_rows($result) {
-		return pg_affected_rows($result);
-	}
+    public function affected_rows($result) {
+        return pg_affected_rows($result);
+    }
 
-	public function last_error() {
-		return pg_last_error($this->link);
-	}
+    public function last_error() {
+        return pg_last_error($this->link);
+    }
 
-	public function last_query_error() {
-		return $this->last_error;
-	}
+    public function last_query_error() {
+        return $this->last_error;
+    }
 
-	public function init() {
-		$this->query("set client_encoding = 'UTF-8'");
-		pg_set_client_encoding("UNICODE");
-		$this->query("set datestyle = 'ISO, european'");
-		$this->query("set TIME ZONE 0");
-		$this->query("set cpu_tuple_cost = 0.5");
+    public function init() {
+        $this->query("set client_encoding = 'UTF-8'");
+        pg_set_client_encoding("UNICODE");
+        $this->query("set datestyle = 'ISO, european'");
+        $this->query("set TIME ZONE 0");
+        $this->query("set cpu_tuple_cost = 0.5");
 
-		return true;
-	}
+        return true;
+    }
 }

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;

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

Indentation +81 added lines, -81 removed lines

@@ -1,85 +1,85 @@
 <?php
 class Db_Mysqli implements IDb {
-	private $link;
-	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 ($this->link) {
-			$this->init();
-
-			return $this->link;
-		} else {
-			print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
-			exit(102);
-		}
-	}
-
-	public function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
-
-		return mysqli_real_escape_string($this->link, $s);
-	}
-
-	public function query($query, $die_on_error = true) {
-		$result = @mysqli_query($this->link, $query);
-		if (!$result) {
-			$this->last_error = @mysqli_error($this->link);
-
-			@mysqli_query($this->link, "ROLLBACK");
-			user_error("query $query failed: " . ($this->link ? $this->last_error : "No connection"),
-				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
-		}
-
-		return $result;
-	}
-
-	public function fetch_assoc($result) {
-		return mysqli_fetch_assoc($result);
-	}
-
-
-	public function num_rows($result) {
-		return mysqli_num_rows($result);
-	}
-
-	public function fetch_result($result, $row, $param) {
-		if (mysqli_data_seek($result, $row)) {
-			$line = mysqli_fetch_assoc($result);
-			return $line[$param];
-		} else {
-			return false;
-		}
-	}
-
-	public function close() {
-		return mysqli_close($this->link);
-	}
-
-	public function affected_rows($result) {
-		return mysqli_affected_rows($this->link);
-	}
-
-	public function last_error() {
-		return mysqli_error($this->link);
-	}
-
-	public function last_query_error() {
-		return $this->last_error;
-	}
-
-	public function init() {
-		$this->query("SET time_zone = '+0:0'");
-
-		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-			mysqli_set_charset($this->link, MYSQL_CHARSET);
-		}
-
-		return true;
-	}
+    private $link;
+    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 ($this->link) {
+            $this->init();
+
+            return $this->link;
+        } else {
+            print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
+            exit(102);
+        }
+    }
+
+    public function escape_string($s, $strip_tags = true) {
+        if ($strip_tags) $s = strip_tags($s);
+
+        return mysqli_real_escape_string($this->link, $s);
+    }
+
+    public function query($query, $die_on_error = true) {
+        $result = @mysqli_query($this->link, $query);
+        if (!$result) {
+            $this->last_error = @mysqli_error($this->link);
+
+            @mysqli_query($this->link, "ROLLBACK");
+            user_error("query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+                $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+        }
+
+        return $result;
+    }
+
+    public function fetch_assoc($result) {
+        return mysqli_fetch_assoc($result);
+    }
+
+
+    public function num_rows($result) {
+        return mysqli_num_rows($result);
+    }
+
+    public function fetch_result($result, $row, $param) {
+        if (mysqli_data_seek($result, $row)) {
+            $line = mysqli_fetch_assoc($result);
+            return $line[$param];
+        } else {
+            return false;
+        }
+    }
+
+    public function close() {
+        return mysqli_close($this->link);
+    }
+
+    public function affected_rows($result) {
+        return mysqli_affected_rows($this->link);
+    }
+
+    public function last_error() {
+        return mysqli_error($this->link);
+    }
+
+    public function last_query_error() {
+        return $this->last_error;
+    }
+
+    public function init() {
+        $this->query("SET time_zone = '+0:0'");
+
+        if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+            mysqli_set_charset($this->link, MYSQL_CHARSET);
+        }
+
+        return true;
+    }
 
 }

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

classes/auth/base.php

Indentation +32 added lines, -32 removed lines

@@ -1,48 +1,48 @@
 <?php
 class Auth_Base {
-	private $pdo;
+    private $pdo;
 
-	const AUTH_SERVICE_API = '_api';
+    const AUTH_SERVICE_API = '_api';
 
-	public function __construct() {
-		$this->pdo = Db::pdo();
-	}
+    public function __construct() {
+        $this->pdo = Db::pdo();
+    }
 
-	// Auto-creates specified user if allowed by system configuration
-	// Can be used instead of find_user_by_login() by external auth modules
-	public function auto_create_user($login, $password = false) {
-		if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
-			$user_id = $this->find_user_by_login($login);
+    // Auto-creates specified user if allowed by system configuration
+    // Can be used instead of find_user_by_login() by external auth modules
+    public function auto_create_user($login, $password = false) {
+        if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
+            $user_id = $this->find_user_by_login($login);
 
-			if (!$password) $password = make_password();
+            if (!$password) $password = make_password();
 
-			if (!$user_id) {
-				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-				$pwd_hash = encrypt_password($password, $salt, true);
+            if (!$user_id) {
+                $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+                $pwd_hash = encrypt_password($password, $salt, true);
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_users
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_users
 						(login,access_level,last_login,created,pwd_hash,salt)
 						VALUES (?, 0, null, NOW(), ?,?)");
-				$sth->execute([$login, $pwd_hash, $salt]);
+                $sth->execute([$login, $pwd_hash, $salt]);
 
-				return $this->find_user_by_login($login);
+                return $this->find_user_by_login($login);
 
-			} else {
-				return $user_id;
-			}
-		}
+            } else {
+                return $user_id;
+            }
+        }
 
-		return $this->find_user_by_login($login);
-	}
+        return $this->find_user_by_login($login);
+    }
 
-	public function find_user_by_login($login) {
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
-		$sth->execute([$login]);
+    public function find_user_by_login($login) {
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
+        $sth->execute([$login]);
 
-		if ($row = $sth->fetch()) {
-			return $row["id"];
-		} else {
-			return false;
-		}
-	}
+        if ($row = $sth->fetch()) {
+            return $row["id"];
+        } else {
+            return false;
+        }
+    }
 }

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 		if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
 			$user_id = $this->find_user_by_login($login);
 
-			if (!$password) $password = make_password();
+			if (!$password) {
+			    $password = make_password();
+			}
 
 			if (!$user_id) {
 				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);

classes/feeditem/rss.php

Indentation +104 added lines, -104 removed lines

@@ -1,147 +1,147 @@
 <?php
 class FeedItem_RSS extends FeedItem_Common {
-	public function get_id() {
-		$id = $this->elem->getElementsByTagName("guid")->item(0);
+    public function get_id() {
+        $id = $this->elem->getElementsByTagName("guid")->item(0);
 
-		if ($id) {
-			return clean($id->nodeValue);
-		} else {
-			return clean($this->get_link());
-		}
-	}
+        if ($id) {
+            return clean($id->nodeValue);
+        } else {
+            return clean($this->get_link());
+        }
+    }
 
-	public function get_date() {
-		$pubDate = $this->elem->getElementsByTagName("pubDate")->item(0);
+    public function get_date() {
+        $pubDate = $this->elem->getElementsByTagName("pubDate")->item(0);
 
-		if ($pubDate) {
-			return strtotime($pubDate->nodeValue);
-		}
+        if ($pubDate) {
+            return strtotime($pubDate->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->xpath->query("atom:link", $this->elem);
+    public function get_link() {
+        $links = $this->xpath->query("atom:link", $this->elem);
 
-		foreach ($links as $link) {
-			if ($link && $link->hasAttribute("href") &&
-				(!$link->hasAttribute("rel")
-					|| $link->getAttribute("rel") == "alternate"
-					|| $link->getAttribute("rel") == "standout")) {
+        foreach ($links as $link) {
+            if ($link && $link->hasAttribute("href") &&
+                (!$link->hasAttribute("rel")
+                    || $link->getAttribute("rel") == "alternate"
+                    || $link->getAttribute("rel") == "standout")) {
 
-				return clean(trim($link->getAttribute("href")));
-			}
-		}
+                return clean(trim($link->getAttribute("href")));
+            }
+        }
 
-		$link = $this->elem->getElementsByTagName("guid")->item(0);
+        $link = $this->elem->getElementsByTagName("guid")->item(0);
 
-		if ($link && $link->hasAttributes() && $link->getAttribute("isPermaLink") == "true") {
-			return clean(trim($link->nodeValue));
-		}
+        if ($link && $link->hasAttributes() && $link->getAttribute("isPermaLink") == "true") {
+            return clean(trim($link->nodeValue));
+        }
 
-		$link = $this->elem->getElementsByTagName("link")->item(0);
+        $link = $this->elem->getElementsByTagName("link")->item(0);
 
-		if ($link) {
-			return clean(trim($link->nodeValue));
-		}
-	}
+        if ($link) {
+            return clean(trim($link->nodeValue));
+        }
+    }
 
-	public function get_title() {
-		$title = $this->xpath->query("title", $this->elem)->item(0);
+    public function get_title() {
+        $title = $this->xpath->query("title", $this->elem)->item(0);
 
-		if ($title) {
-			return clean(trim($title->nodeValue));
-		}
+        if ($title) {
+            return clean(trim($title->nodeValue));
+        }
 
-		// if the document has a default namespace then querying for
-		// title would fail because of reasons so let's try the old way
-		$title = $this->elem->getElementsByTagName("title")->item(0);
+        // if the document has a default namespace then querying for
+        // title would fail because of reasons so let's try the old way
+        $title = $this->elem->getElementsByTagName("title")->item(0);
 
-		if ($title) {
-			return clean(trim($title->nodeValue));
-		}
-	}
+        if ($title) {
+            return clean(trim($title->nodeValue));
+        }
+    }
 
-	public function get_content() {
-		$contentA = $this->xpath->query("content:encoded", $this->elem)->item(0);
-		$contentB = $this->elem->getElementsByTagName("description")->item(0);
+    public function get_content() {
+        $contentA = $this->xpath->query("content:encoded", $this->elem)->item(0);
+        $contentB = $this->elem->getElementsByTagName("description")->item(0);
 
-		if ($contentA && !$contentB) {
-			return $this->subtree_or_text($contentA);
-		}
+        if ($contentA && !$contentB) {
+            return $this->subtree_or_text($contentA);
+        }
 
 
-		if ($contentB && !$contentA) {
-			return $this->subtree_or_text($contentB);
-		}
+        if ($contentB && !$contentA) {
+            return $this->subtree_or_text($contentB);
+        }
 
-		if ($contentA && $contentB) {
-			$resultA = $this->subtree_or_text($contentA);
-			$resultB = $this->subtree_or_text($contentB);
+        if ($contentA && $contentB) {
+            $resultA = $this->subtree_or_text($contentA);
+            $resultB = $this->subtree_or_text($contentB);
 
-			return mb_strlen($resultA) > mb_strlen($resultB) ? $resultA : $resultB;
-		}
-	}
+            return mb_strlen($resultA) > mb_strlen($resultB) ? $resultA : $resultB;
+        }
+    }
 
-	public function get_description() {
-		$summary = $this->elem->getElementsByTagName("description")->item(0);
+    public function get_description() {
+        $summary = $this->elem->getElementsByTagName("description")->item(0);
 
-		if ($summary) {
-			return $summary->nodeValue;
-		}
-	}
+        if ($summary) {
+            return $summary->nodeValue;
+        }
+    }
 
-	public function get_categories() {
-		$categories = $this->elem->getElementsByTagName("category");
-		$cats = [];
+    public function get_categories() {
+        $categories = $this->elem->getElementsByTagName("category");
+        $cats = [];
 
-		foreach ($categories as $cat) {
-			array_push($cats, $cat->nodeValue);
-		}
+        foreach ($categories as $cat) {
+            array_push($cats, $cat->nodeValue);
+        }
 
-		$categories = $this->xpath->query("dc:subject", $this->elem);
+        $categories = $this->xpath->query("dc:subject", $this->elem);
 
-		foreach ($categories as $cat) {
-			array_push($cats, $cat->nodeValue);
-		}
+        foreach ($categories as $cat) {
+            array_push($cats, $cat->nodeValue);
+        }
 
-		return $this->normalize_categories($cats);
-	}
+        return $this->normalize_categories($cats);
+    }
 
-	public function get_enclosures() {
-		$enclosures = $this->elem->getElementsByTagName("enclosure");
+    public function get_enclosures() {
+        $enclosures = $this->elem->getElementsByTagName("enclosure");
 
-		$encs = array();
+        $encs = array();
 
-		foreach ($enclosures as $enclosure) {
-			$enc = new FeedEnclosure();
+        foreach ($enclosures as $enclosure) {
+            $enc = new FeedEnclosure();
 
-			$enc->type = clean($enclosure->getAttribute("type"));
-			$enc->link = clean($enclosure->getAttribute("url"));
-			$enc->length = clean($enclosure->getAttribute("length"));
-			$enc->height = clean($enclosure->getAttribute("height"));
-			$enc->width = clean($enclosure->getAttribute("width"));
+            $enc->type = clean($enclosure->getAttribute("type"));
+            $enc->link = clean($enclosure->getAttribute("url"));
+            $enc->length = clean($enclosure->getAttribute("length"));
+            $enc->height = clean($enclosure->getAttribute("height"));
+            $enc->width = clean($enclosure->getAttribute("width"));
 
-			array_push($encs, $enc);
-		}
+            array_push($encs, $enc);
+        }
 
-		$encs = array_merge($encs, parent::get_enclosures());
+        $encs = array_merge($encs, parent::get_enclosures());
 
-		return $encs;
-	}
+        return $encs;
+    }
 
-	public function get_language() {
-		$languages = $this->doc->getElementsByTagName('language');
+    public function get_language() {
+        $languages = $this->doc->getElementsByTagName('language');
 
-		if (count($languages) == 0) {
-			return "";
-		}
+        if (count($languages) == 0) {
+            return "";
+        }
 
-		return clean($languages[0]->textContent);
-	}
+        return clean($languages[0]->textContent);
+    }
 
 }

classes/idb.php

Indentation +10 added lines, -10 removed lines

@@ -1,13 +1,13 @@
 <?php
 interface IDb {
-	public function connect($host, $user, $pass, $db, $port);
-	public function escape_string($s, $strip_tags = true);
-	public function query($query, $die_on_error = true);
-	public function fetch_assoc($result);
-	public function num_rows($result);
-	public function fetch_result($result, $row, $param);
-	public function close();
-	public function affected_rows($result);
-	public function last_error();
-	public function last_query_error();
+    public function connect($host, $user, $pass, $db, $port);
+    public function escape_string($s, $strip_tags = true);
+    public function query($query, $die_on_error = true);
+    public function fetch_assoc($result);
+    public function num_rows($result);
+    public function fetch_result($result, $row, $param);
+    public function close();
+    public function affected_rows($result);
+    public function last_error();
+    public function last_query_error();
 }

classes/pluginhost.php

Braces +36 added lines, -17 removed lines

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

Indentation +497 added lines, -497 removed lines

@@ -1,526 +1,526 @@
 <?php
 class PluginHost {
-	private $pdo;
-	private $hooks = array();
-	private $plugins = array();
-	private $handlers = array();
-	private $commands = array();
-	private $storage = array();
-	private $feeds = array();
-	private $api_methods = array();
-	private $plugin_actions = array();
-	private $owner_uid;
-	private $last_registered;
-	private static $instance;
-
-	const API_VERSION = 2;
-
-	// Hooks marked with *1 are run in global context and available
-	// to plugins loaded in config.php only
-
-	const HOOK_ARTICLE_BUTTON = 1;
-	const HOOK_ARTICLE_FILTER = 2;
-	const HOOK_PREFS_TAB = 3;
-	const HOOK_PREFS_TAB_SECTION = 4;
-	const HOOK_PREFS_TABS = 5;
-	const HOOK_FEED_PARSED = 6;
-	const HOOK_UPDATE_TASK = 7; // *1
-	const HOOK_AUTH_USER = 8;
-	const HOOK_HOTKEY_MAP = 9;
-	const HOOK_RENDER_ARTICLE = 10;
-	const HOOK_RENDER_ARTICLE_CDM = 11;
-	const HOOK_FEED_FETCHED = 12;
-	const HOOK_SANITIZE = 13;
-	const HOOK_RENDER_ARTICLE_API = 14;
-	const HOOK_TOOLBAR_BUTTON = 15;
-	const HOOK_ACTION_ITEM = 16;
-	const HOOK_HEADLINE_TOOLBAR_BUTTON = 17;
-	const HOOK_HOTKEY_INFO = 18;
-	const HOOK_ARTICLE_LEFT_BUTTON = 19;
-	const HOOK_PREFS_EDIT_FEED = 20;
-	const HOOK_PREFS_SAVE_FEED = 21;
-	const HOOK_FETCH_FEED = 22;
-	const HOOK_QUERY_HEADLINES = 23;
-	const HOOK_HOUSE_KEEPING = 24; // *1
-	const HOOK_SEARCH = 25;
-	const HOOK_FORMAT_ENCLOSURES = 26;
-	const HOOK_SUBSCRIBE_FEED = 27;
-	const HOOK_HEADLINES_BEFORE = 28;
-	const HOOK_RENDER_ENCLOSURE = 29;
-	const HOOK_ARTICLE_FILTER_ACTION = 30;
-	const HOOK_ARTICLE_EXPORT_FEED = 31;
-	const HOOK_MAIN_TOOLBAR_BUTTON = 32;
-	const HOOK_ENCLOSURE_ENTRY = 33;
-	const HOOK_FORMAT_ARTICLE = 34;
-	const HOOK_FORMAT_ARTICLE_CDM = 35; /* RIP */
-	const HOOK_FEED_BASIC_INFO = 36;
-	const HOOK_SEND_LOCAL_FILE = 37;
-	const HOOK_UNSUBSCRIBE_FEED = 38;
-	const HOOK_SEND_MAIL = 39;
-	const HOOK_FILTER_TRIGGERED = 40;
-	const HOOK_GET_FULL_TEXT = 41;
-	const HOOK_ARTICLE_IMAGE = 42;
-	const HOOK_FEED_TREE = 43;
-	const HOOK_IFRAME_WHITELISTED = 44;
-
-	const KIND_ALL = 1;
-	const KIND_SYSTEM = 2;
-	const KIND_USER = 3;
-
-	public static function object_to_domain($plugin) {
-		return strtolower(get_class($plugin));
-	}
-
-	public function __construct() {
-		$this->pdo = Db::pdo();
-
-		$this->storage = array();
-	}
-
-	private function __clone() {
-		//
-	}
-
-	public static function getInstance() {
-		if (self::$instance == null)
-			self::$instance = new self();
-
-		return self::$instance;
-	}
-
-	private function register_plugin($name, $plugin) {
-		//array_push($this->plugins, $plugin);
-		$this->plugins[$name] = $plugin;
-	}
-
-	// needed for compatibility with API 1
-	public function get_link() {
-		return false;
-	}
-
-	public function get_dbh() {
-		return Db::get();
-	}
-
-	public function get_pdo() {
-		return $this->pdo;
-	}
-
-	public function get_plugin_names() {
-		$names = array();
-
-		foreach ($this->plugins as $p) {
-			array_push($names, get_class($p));
-		}
-
-		return $names;
-	}
-
-	public function get_plugins() {
-		return $this->plugins;
-	}
-
-	public function get_plugin($name) {
-		return $this->plugins[strtolower($name)];
-	}
-
-	public function run_hooks($type, $method, $args) {
-		foreach ($this->get_hooks($type) as $hook) {
-			$hook->$method($args);
-		}
-	}
-
-	public function add_hook($type, $sender, $priority = 50) {
-		$priority = (int) $priority;
-
-		if (!is_array($this->hooks[$type])) {
-			$this->hooks[$type] = [];
-		}
-
-		if (!is_array($this->hooks[$type][$priority])) {
-			$this->hooks[$type][$priority] = [];
-		}
-
-		array_push($this->hooks[$type][$priority], $sender);
-		ksort($this->hooks[$type]);
-	}
-
-	public function del_hook($type, $sender) {
-		if (is_array($this->hooks[$type])) {
-			foreach (array_keys($this->hooks[$type]) as $prio) {
-				$key = array_search($sender, $this->hooks[$type][$prio]);
-
-				if ($key !== false) {
-					unset($this->hooks[$type][$prio][$key]);
-				}
-			}
-		}
-	}
-
-	public function get_hooks($type) {
-		if (isset($this->hooks[$type])) {
-			$tmp = [];
-
-			foreach (array_keys($this->hooks[$type]) as $prio) {
-				$tmp = array_merge($tmp, $this->hooks[$type][$prio]);
-			}
-
-			return $tmp;
-		} else {
-			return [];
-		}
-	}
-	public function load_all($kind, $owner_uid = false, $skip_init = false) {
-
-		$plugins = array_merge(glob("plugins/*"), glob("plugins.local/*"));
-		$plugins = array_filter($plugins, "is_dir");
-		$plugins = array_map("basename", $plugins);
-
-		asort($plugins);
-
-		$this->load(join(",", $plugins), $kind, $owner_uid, $skip_init);
-	}
-
-	public function load($classlist, $kind, $owner_uid = false, $skip_init = false) {
-		$plugins = explode(",", $classlist);
-
-		$this->owner_uid = (int) $owner_uid;
-
-		foreach ($plugins as $class) {
-			$class = trim($class);
-			$class_file = strtolower(clean_filename($class));
-
-			if (!is_dir(__DIR__."/../plugins/$class_file") &&
-					!is_dir(__DIR__."/../plugins.local/$class_file")) continue;
-
-			// try system plugin directory first
-			$file = __DIR__ . "/../plugins/$class_file/init.php";
-			$vendor_dir = __DIR__ . "/../plugins/$class_file/vendor";
-
-			if (!file_exists($file)) {
-				$file = __DIR__ . "/../plugins.local/$class_file/init.php";
-				$vendor_dir = __DIR__ . "/../plugins.local/$class_file/vendor";
-			}
-
-			if (!isset($this->plugins[$class])) {
-				if (file_exists($file)) require_once $file;
-
-				if (class_exists($class) && is_subclass_of($class, "Plugin")) {
-
-					// register plugin autoloader if necessary, for namespaced classes ONLY
-					// layout corresponds to tt-rss main /vendor/author/Package/Class.php
-
-					if (file_exists($vendor_dir)) {
-						spl_autoload_register(function($class) use ($vendor_dir) {
-
-							if (strpos($class, '\\') !== false) {
-								list ($namespace, $class_name) = explode('\\', $class, 2);
-
-								if ($namespace && $class_name) {
-									$class_file = "$vendor_dir/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
-
-									if (file_exists($class_file))
-										require_once $class_file;
-								}
-							}
-						});
-					}
-
-					$plugin = new $class($this);
-
-					$plugin_api = $plugin->api_version();
-
-					if ($plugin_api < PluginHost::API_VERSION) {
-						user_error("plugin $class is not compatible with current API version (need: " . PluginHost::API_VERSION . ", got: $plugin_api)", E_USER_WARNING);
-						continue;
-					}
-
-					if (file_exists(dirname($file) . "/locale")) {
-						_bindtextdomain($class, dirname($file) . "/locale");
-						_bind_textdomain_codeset($class, "UTF-8");
-					}
-
-					$this->last_registered = $class;
-
-					switch ($kind) {
-					case $this::KIND_SYSTEM:
-						if ($this->is_system($plugin)) {
-							if (!$skip_init) $plugin->init($this);
-							$this->register_plugin($class, $plugin);
-						}
-						break;
-					case $this::KIND_USER:
-						if (!$this->is_system($plugin)) {
-							if (!$skip_init) $plugin->init($this);
-							$this->register_plugin($class, $plugin);
-						}
-						break;
-					case $this::KIND_ALL:
-						if (!$skip_init) $plugin->init($this);
-						$this->register_plugin($class, $plugin);
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	public function is_system($plugin) {
-		$about = $plugin->about();
-
-		return @$about[3];
-	}
-
-	// only system plugins are allowed to modify routing
-	public function add_handler($handler, $method, $sender) {
-		$handler = str_replace("-", "_", strtolower($handler));
-		$method = strtolower($method);
-
-		if ($this->is_system($sender)) {
-			if (!is_array($this->handlers[$handler])) {
-				$this->handlers[$handler] = array();
-			}
-
-			$this->handlers[$handler][$method] = $sender;
-		}
-	}
-
-	public function del_handler($handler, $method, $sender) {
-		$handler = str_replace("-", "_", strtolower($handler));
-		$method = strtolower($method);
-
-		if ($this->is_system($sender)) {
-			unset($this->handlers[$handler][$method]);
-		}
-	}
-
-	public function lookup_handler($handler, $method) {
-		$handler = str_replace("-", "_", strtolower($handler));
-		$method = strtolower($method);
-
-		if (is_array($this->handlers[$handler])) {
-			if (isset($this->handlers[$handler]["*"])) {
-				return $this->handlers[$handler]["*"];
-			} else {
-				return $this->handlers[$handler][$method];
-			}
-		}
-
-		return false;
-	}
-
-	public function add_command($command, $description, $sender, $suffix = "", $arghelp = "") {
-		$command = str_replace("-", "_", strtolower($command));
-
-		$this->commands[$command] = array("description" => $description,
-			"suffix" => $suffix,
-			"arghelp" => $arghelp,
-			"class" => $sender);
-	}
-
-	public function del_command($command) {
-		$command = "-" . strtolower($command);
-
-		unset($this->commands[$command]);
-	}
-
-	public function lookup_command($command) {
-		$command = "-" . strtolower($command);
-
-		if (is_array($this->commands[$command])) {
-			return $this->commands[$command]["class"];
-		} else {
-			return false;
-		}
-	}
-
-	public function get_commands() {
-		return $this->commands;
-	}
-
-	public function run_commands($args) {
-		foreach ($this->get_commands() as $command => $data) {
-			if (isset($args[$command])) {
-				$command = str_replace("-", "", $command);
-				$data["class"]->$command($args);
-			}
-		}
-	}
-
-	public function load_data() {
-		if ($this->owner_uid)  {
-			$sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage
+    private $pdo;
+    private $hooks = array();
+    private $plugins = array();
+    private $handlers = array();
+    private $commands = array();
+    private $storage = array();
+    private $feeds = array();
+    private $api_methods = array();
+    private $plugin_actions = array();
+    private $owner_uid;
+    private $last_registered;
+    private static $instance;
+
+    const API_VERSION = 2;
+
+    // Hooks marked with *1 are run in global context and available
+    // to plugins loaded in config.php only
+
+    const HOOK_ARTICLE_BUTTON = 1;
+    const HOOK_ARTICLE_FILTER = 2;
+    const HOOK_PREFS_TAB = 3;
+    const HOOK_PREFS_TAB_SECTION = 4;
+    const HOOK_PREFS_TABS = 5;
+    const HOOK_FEED_PARSED = 6;
+    const HOOK_UPDATE_TASK = 7; // *1
+    const HOOK_AUTH_USER = 8;
+    const HOOK_HOTKEY_MAP = 9;
+    const HOOK_RENDER_ARTICLE = 10;
+    const HOOK_RENDER_ARTICLE_CDM = 11;
+    const HOOK_FEED_FETCHED = 12;
+    const HOOK_SANITIZE = 13;
+    const HOOK_RENDER_ARTICLE_API = 14;
+    const HOOK_TOOLBAR_BUTTON = 15;
+    const HOOK_ACTION_ITEM = 16;
+    const HOOK_HEADLINE_TOOLBAR_BUTTON = 17;
+    const HOOK_HOTKEY_INFO = 18;
+    const HOOK_ARTICLE_LEFT_BUTTON = 19;
+    const HOOK_PREFS_EDIT_FEED = 20;
+    const HOOK_PREFS_SAVE_FEED = 21;
+    const HOOK_FETCH_FEED = 22;
+    const HOOK_QUERY_HEADLINES = 23;
+    const HOOK_HOUSE_KEEPING = 24; // *1
+    const HOOK_SEARCH = 25;
+    const HOOK_FORMAT_ENCLOSURES = 26;
+    const HOOK_SUBSCRIBE_FEED = 27;
+    const HOOK_HEADLINES_BEFORE = 28;
+    const HOOK_RENDER_ENCLOSURE = 29;
+    const HOOK_ARTICLE_FILTER_ACTION = 30;
+    const HOOK_ARTICLE_EXPORT_FEED = 31;
+    const HOOK_MAIN_TOOLBAR_BUTTON = 32;
+    const HOOK_ENCLOSURE_ENTRY = 33;
+    const HOOK_FORMAT_ARTICLE = 34;
+    const HOOK_FORMAT_ARTICLE_CDM = 35; /* RIP */
+    const HOOK_FEED_BASIC_INFO = 36;
+    const HOOK_SEND_LOCAL_FILE = 37;
+    const HOOK_UNSUBSCRIBE_FEED = 38;
+    const HOOK_SEND_MAIL = 39;
+    const HOOK_FILTER_TRIGGERED = 40;
+    const HOOK_GET_FULL_TEXT = 41;
+    const HOOK_ARTICLE_IMAGE = 42;
+    const HOOK_FEED_TREE = 43;
+    const HOOK_IFRAME_WHITELISTED = 44;
+
+    const KIND_ALL = 1;
+    const KIND_SYSTEM = 2;
+    const KIND_USER = 3;
+
+    public static function object_to_domain($plugin) {
+        return strtolower(get_class($plugin));
+    }
+
+    public function __construct() {
+        $this->pdo = Db::pdo();
+
+        $this->storage = array();
+    }
+
+    private function __clone() {
+        //
+    }
+
+    public static function getInstance() {
+        if (self::$instance == null)
+            self::$instance = new self();
+
+        return self::$instance;
+    }
+
+    private function register_plugin($name, $plugin) {
+        //array_push($this->plugins, $plugin);
+        $this->plugins[$name] = $plugin;
+    }
+
+    // needed for compatibility with API 1
+    public function get_link() {
+        return false;
+    }
+
+    public function get_dbh() {
+        return Db::get();
+    }
+
+    public function get_pdo() {
+        return $this->pdo;
+    }
+
+    public function get_plugin_names() {
+        $names = array();
+
+        foreach ($this->plugins as $p) {
+            array_push($names, get_class($p));
+        }
+
+        return $names;
+    }
+
+    public function get_plugins() {
+        return $this->plugins;
+    }
+
+    public function get_plugin($name) {
+        return $this->plugins[strtolower($name)];
+    }
+
+    public function run_hooks($type, $method, $args) {
+        foreach ($this->get_hooks($type) as $hook) {
+            $hook->$method($args);
+        }
+    }
+
+    public function add_hook($type, $sender, $priority = 50) {
+        $priority = (int) $priority;
+
+        if (!is_array($this->hooks[$type])) {
+            $this->hooks[$type] = [];
+        }
+
+        if (!is_array($this->hooks[$type][$priority])) {
+            $this->hooks[$type][$priority] = [];
+        }
+
+        array_push($this->hooks[$type][$priority], $sender);
+        ksort($this->hooks[$type]);
+    }
+
+    public function del_hook($type, $sender) {
+        if (is_array($this->hooks[$type])) {
+            foreach (array_keys($this->hooks[$type]) as $prio) {
+                $key = array_search($sender, $this->hooks[$type][$prio]);
+
+                if ($key !== false) {
+                    unset($this->hooks[$type][$prio][$key]);
+                }
+            }
+        }
+    }
+
+    public function get_hooks($type) {
+        if (isset($this->hooks[$type])) {
+            $tmp = [];
+
+            foreach (array_keys($this->hooks[$type]) as $prio) {
+                $tmp = array_merge($tmp, $this->hooks[$type][$prio]);
+            }
+
+            return $tmp;
+        } else {
+            return [];
+        }
+    }
+    public function load_all($kind, $owner_uid = false, $skip_init = false) {
+
+        $plugins = array_merge(glob("plugins/*"), glob("plugins.local/*"));
+        $plugins = array_filter($plugins, "is_dir");
+        $plugins = array_map("basename", $plugins);
+
+        asort($plugins);
+
+        $this->load(join(",", $plugins), $kind, $owner_uid, $skip_init);
+    }
+
+    public function load($classlist, $kind, $owner_uid = false, $skip_init = false) {
+        $plugins = explode(",", $classlist);
+
+        $this->owner_uid = (int) $owner_uid;
+
+        foreach ($plugins as $class) {
+            $class = trim($class);
+            $class_file = strtolower(clean_filename($class));
+
+            if (!is_dir(__DIR__."/../plugins/$class_file") &&
+                    !is_dir(__DIR__."/../plugins.local/$class_file")) continue;
+
+            // try system plugin directory first
+            $file = __DIR__ . "/../plugins/$class_file/init.php";
+            $vendor_dir = __DIR__ . "/../plugins/$class_file/vendor";
+
+            if (!file_exists($file)) {
+                $file = __DIR__ . "/../plugins.local/$class_file/init.php";
+                $vendor_dir = __DIR__ . "/../plugins.local/$class_file/vendor";
+            }
+
+            if (!isset($this->plugins[$class])) {
+                if (file_exists($file)) require_once $file;
+
+                if (class_exists($class) && is_subclass_of($class, "Plugin")) {
+
+                    // register plugin autoloader if necessary, for namespaced classes ONLY
+                    // layout corresponds to tt-rss main /vendor/author/Package/Class.php
+
+                    if (file_exists($vendor_dir)) {
+                        spl_autoload_register(function($class) use ($vendor_dir) {
+
+                            if (strpos($class, '\\') !== false) {
+                                list ($namespace, $class_name) = explode('\\', $class, 2);
+
+                                if ($namespace && $class_name) {
+                                    $class_file = "$vendor_dir/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
+
+                                    if (file_exists($class_file))
+                                        require_once $class_file;
+                                }
+                            }
+                        });
+                    }
+
+                    $plugin = new $class($this);
+
+                    $plugin_api = $plugin->api_version();
+
+                    if ($plugin_api < PluginHost::API_VERSION) {
+                        user_error("plugin $class is not compatible with current API version (need: " . PluginHost::API_VERSION . ", got: $plugin_api)", E_USER_WARNING);
+                        continue;
+                    }
+
+                    if (file_exists(dirname($file) . "/locale")) {
+                        _bindtextdomain($class, dirname($file) . "/locale");
+                        _bind_textdomain_codeset($class, "UTF-8");
+                    }
+
+                    $this->last_registered = $class;
+
+                    switch ($kind) {
+                    case $this::KIND_SYSTEM:
+                        if ($this->is_system($plugin)) {
+                            if (!$skip_init) $plugin->init($this);
+                            $this->register_plugin($class, $plugin);
+                        }
+                        break;
+                    case $this::KIND_USER:
+                        if (!$this->is_system($plugin)) {
+                            if (!$skip_init) $plugin->init($this);
+                            $this->register_plugin($class, $plugin);
+                        }
+                        break;
+                    case $this::KIND_ALL:
+                        if (!$skip_init) $plugin->init($this);
+                        $this->register_plugin($class, $plugin);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    public function is_system($plugin) {
+        $about = $plugin->about();
+
+        return @$about[3];
+    }
+
+    // only system plugins are allowed to modify routing
+    public function add_handler($handler, $method, $sender) {
+        $handler = str_replace("-", "_", strtolower($handler));
+        $method = strtolower($method);
+
+        if ($this->is_system($sender)) {
+            if (!is_array($this->handlers[$handler])) {
+                $this->handlers[$handler] = array();
+            }
+
+            $this->handlers[$handler][$method] = $sender;
+        }
+    }
+
+    public function del_handler($handler, $method, $sender) {
+        $handler = str_replace("-", "_", strtolower($handler));
+        $method = strtolower($method);
+
+        if ($this->is_system($sender)) {
+            unset($this->handlers[$handler][$method]);
+        }
+    }
+
+    public function lookup_handler($handler, $method) {
+        $handler = str_replace("-", "_", strtolower($handler));
+        $method = strtolower($method);
+
+        if (is_array($this->handlers[$handler])) {
+            if (isset($this->handlers[$handler]["*"])) {
+                return $this->handlers[$handler]["*"];
+            } else {
+                return $this->handlers[$handler][$method];
+            }
+        }
+
+        return false;
+    }
+
+    public function add_command($command, $description, $sender, $suffix = "", $arghelp = "") {
+        $command = str_replace("-", "_", strtolower($command));
+
+        $this->commands[$command] = array("description" => $description,
+            "suffix" => $suffix,
+            "arghelp" => $arghelp,
+            "class" => $sender);
+    }
+
+    public function del_command($command) {
+        $command = "-" . strtolower($command);
+
+        unset($this->commands[$command]);
+    }
+
+    public function lookup_command($command) {
+        $command = "-" . strtolower($command);
+
+        if (is_array($this->commands[$command])) {
+            return $this->commands[$command]["class"];
+        } else {
+            return false;
+        }
+    }
+
+    public function get_commands() {
+        return $this->commands;
+    }
+
+    public function run_commands($args) {
+        foreach ($this->get_commands() as $command => $data) {
+            if (isset($args[$command])) {
+                $command = str_replace("-", "", $command);
+                $data["class"]->$command($args);
+            }
+        }
+    }
+
+    public function load_data() {
+        if ($this->owner_uid)  {
+            $sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage
 				WHERE owner_uid = ?");
-			$sth->execute([$this->owner_uid]);
+            $sth->execute([$this->owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				$this->storage[$line["name"]] = unserialize($line["content"]);
-			}
-		}
-	}
+            while ($line = $sth->fetch()) {
+                $this->storage[$line["name"]] = unserialize($line["content"]);
+            }
+        }
+    }
 
-	private function save_data($plugin) {
-		if ($this->owner_uid) {
-			$this->pdo->beginTransaction();
+    private function save_data($plugin) {
+        if ($this->owner_uid) {
+            $this->pdo->beginTransaction();
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_plugin_storage WHERE
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_plugin_storage WHERE
 				owner_uid= ? AND name = ?");
-			$sth->execute([$this->owner_uid, $plugin]);
+            $sth->execute([$this->owner_uid, $plugin]);
 
-			if (!isset($this->storage[$plugin]))
-				$this->storage[$plugin] = array();
+            if (!isset($this->storage[$plugin]))
+                $this->storage[$plugin] = array();
 
-			$content = serialize($this->storage[$plugin]);
+            $content = serialize($this->storage[$plugin]);
 
-			if ($sth->fetch()) {
-				$sth = $this->pdo->prepare("UPDATE ttrss_plugin_storage SET content = ?
+            if ($sth->fetch()) {
+                $sth = $this->pdo->prepare("UPDATE ttrss_plugin_storage SET content = ?
 					WHERE owner_uid= ? AND name = ?");
-				$sth->execute([(string)$content, $this->owner_uid, $plugin]);
+                $sth->execute([(string)$content, $this->owner_uid, $plugin]);
 
-			} else {
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_plugin_storage
+            } else {
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_plugin_storage
 					(name,owner_uid,content) VALUES
 					(?, ?, ?)");
-				$sth->execute([$plugin, $this->owner_uid, (string)$content]);
-			}
+                $sth->execute([$plugin, $this->owner_uid, (string)$content]);
+            }
 
-			$this->pdo->commit();
-		}
-	}
+            $this->pdo->commit();
+        }
+    }
 
-	public function set($sender, $name, $value, $sync = true) {
-		$idx = get_class($sender);
+    public function set($sender, $name, $value, $sync = true) {
+        $idx = get_class($sender);
 
-		if (!isset($this->storage[$idx]))
-			$this->storage[$idx] = array();
+        if (!isset($this->storage[$idx]))
+            $this->storage[$idx] = array();
 
-		$this->storage[$idx][$name] = $value;
+        $this->storage[$idx][$name] = $value;
 
-		if ($sync) $this->save_data(get_class($sender));
-	}
+        if ($sync) $this->save_data(get_class($sender));
+    }
 
-	public function get($sender, $name, $default_value = false) {
-		$idx = get_class($sender);
+    public function get($sender, $name, $default_value = false) {
+        $idx = get_class($sender);
 
-		if (isset($this->storage[$idx][$name])) {
-			return $this->storage[$idx][$name];
-		} else {
-			return $default_value;
-		}
-	}
+        if (isset($this->storage[$idx][$name])) {
+            return $this->storage[$idx][$name];
+        } else {
+            return $default_value;
+        }
+    }
 
-	public function get_all($sender) {
-		$idx = get_class($sender);
+    public function get_all($sender) {
+        $idx = get_class($sender);
 
-		$data = $this->storage[$idx];
+        $data = $this->storage[$idx];
 
-		return $data ? $data : [];
-	}
+        return $data ? $data : [];
+    }
 
-	public function clear_data($sender) {
-		if ($this->owner_uid) {
-			$idx = get_class($sender);
+    public function clear_data($sender) {
+        if ($this->owner_uid) {
+            $idx = get_class($sender);
 
-			unset($this->storage[$idx]);
+            unset($this->storage[$idx]);
 
-			$sth = $this->pdo->prepare("DELETE FROM ttrss_plugin_storage WHERE name = ?
+            $sth = $this->pdo->prepare("DELETE FROM ttrss_plugin_storage WHERE name = ?
 				AND owner_uid = ?");
-			$sth->execute([$idx, $this->owner_uid]);
-		}
-	}
-
-	// Plugin feed functions are *EXPERIMENTAL*!
-
-	// cat_id: only -1 is supported (Special)
-	public function add_feed($cat_id, $title, $icon, $sender) {
-		if (!$this->feeds[$cat_id]) $this->feeds[$cat_id] = array();
-
-		$id = count($this->feeds[$cat_id]);
-
-		array_push($this->feeds[$cat_id],
-			array('id' => $id, 'title' => $title, 'sender' => $sender, 'icon' => $icon));
-
-		return $id;
-	}
-
-	public function get_feeds($cat_id) {
-		return $this->feeds[$cat_id];
-	}
-
-	// convert feed_id (e.g. -129) to pfeed_id first
-	public function get_feed_handler($pfeed_id) {
-		foreach ($this->feeds as $cat) {
-			foreach ($cat as $feed) {
-				if ($feed['id'] == $pfeed_id) {
-					return $feed['sender'];
-				}
-			}
-		}
-	}
-
-	public static function pfeed_to_feed_id($label) {
-		return PLUGIN_FEED_BASE_INDEX - 1 - abs($label);
-	}
-
-	public static function feed_to_pfeed_id($feed) {
-		return PLUGIN_FEED_BASE_INDEX - 1 + abs($feed);
-	}
-
-	public function add_api_method($name, $sender) {
-		if ($this->is_system($sender)) {
-			$this->api_methods[strtolower($name)] = $sender;
-		}
-	}
-
-	public function get_api_method($name) {
-		return $this->api_methods[$name];
-	}
-
-	public function add_filter_action($sender, $action_name, $action_desc) {
-		$sender_class = get_class($sender);
-
-		if (!isset($this->plugin_actions[$sender_class]))
-			$this->plugin_actions[$sender_class] = array();
-
-		array_push($this->plugin_actions[$sender_class],
-			array("action" => $action_name, "description" => $action_desc, "sender" => $sender));
-	}
-
-	public function get_filter_actions() {
-		return $this->plugin_actions;
-	}
-
-	public function get_owner_uid() {
-		return $this->owner_uid;
-	}
-
-	// handled by classes/pluginhandler.php, requires valid session
-	public function get_method_url($sender, $method, $params)  {
-		return get_self_url_prefix() . "/backend.php?" .
-			http_build_query(
-				array_merge(
-					[
-						"op" => "pluginhandler",
-						"plugin" => strtolower(get_class($sender)),
-						"method" => $method
-					],
-					$params));
-	}
-
-	// WARNING: endpoint in public.php, exposed to unauthenticated users
-	public function get_public_method_url($sender, $method, $params)  {
-		if ($sender->is_public_method($method)) {
-			return get_self_url_prefix() . "/public.php?" .
-				http_build_query(
-					array_merge(
-						[
-							"op" => "pluginhandler",
-							"plugin" => strtolower(get_class($sender)),
-							"pmethod" => $method
-						],
-						$params));
-		} else {
-			user_error("get_public_method_url: requested method '$method' of '" . get_class($sender) . "' is private.");
-		}
-	}
+            $sth->execute([$idx, $this->owner_uid]);
+        }
+    }
+
+    // Plugin feed functions are *EXPERIMENTAL*!
+
+    // cat_id: only -1 is supported (Special)
+    public function add_feed($cat_id, $title, $icon, $sender) {
+        if (!$this->feeds[$cat_id]) $this->feeds[$cat_id] = array();
+
+        $id = count($this->feeds[$cat_id]);
+
+        array_push($this->feeds[$cat_id],
+            array('id' => $id, 'title' => $title, 'sender' => $sender, 'icon' => $icon));
+
+        return $id;
+    }
+
+    public function get_feeds($cat_id) {
+        return $this->feeds[$cat_id];
+    }
+
+    // convert feed_id (e.g. -129) to pfeed_id first
+    public function get_feed_handler($pfeed_id) {
+        foreach ($this->feeds as $cat) {
+            foreach ($cat as $feed) {
+                if ($feed['id'] == $pfeed_id) {
+                    return $feed['sender'];
+                }
+            }
+        }
+    }
+
+    public static function pfeed_to_feed_id($label) {
+        return PLUGIN_FEED_BASE_INDEX - 1 - abs($label);
+    }
+
+    public static function feed_to_pfeed_id($feed) {
+        return PLUGIN_FEED_BASE_INDEX - 1 + abs($feed);
+    }
+
+    public function add_api_method($name, $sender) {
+        if ($this->is_system($sender)) {
+            $this->api_methods[strtolower($name)] = $sender;
+        }
+    }
+
+    public function get_api_method($name) {
+        return $this->api_methods[$name];
+    }
+
+    public function add_filter_action($sender, $action_name, $action_desc) {
+        $sender_class = get_class($sender);
+
+        if (!isset($this->plugin_actions[$sender_class]))
+            $this->plugin_actions[$sender_class] = array();
+
+        array_push($this->plugin_actions[$sender_class],
+            array("action" => $action_name, "description" => $action_desc, "sender" => $sender));
+    }
+
+    public function get_filter_actions() {
+        return $this->plugin_actions;
+    }
+
+    public function get_owner_uid() {
+        return $this->owner_uid;
+    }
+
+    // handled by classes/pluginhandler.php, requires valid session
+    public function get_method_url($sender, $method, $params)  {
+        return get_self_url_prefix() . "/backend.php?" .
+            http_build_query(
+                array_merge(
+                    [
+                        "op" => "pluginhandler",
+                        "plugin" => strtolower(get_class($sender)),
+                        "method" => $method
+                    ],
+                    $params));
+    }
+
+    // WARNING: endpoint in public.php, exposed to unauthenticated users
+    public function get_public_method_url($sender, $method, $params)  {
+        if ($sender->is_public_method($method)) {
+            return get_self_url_prefix() . "/public.php?" .
+                http_build_query(
+                    array_merge(
+                        [
+                            "op" => "pluginhandler",
+                            "plugin" => strtolower(get_class($sender)),
+                            "pmethod" => $method
+                        ],
+                        $params));
+        } else {
+            user_error("get_public_method_url: requested method '$method' of '" . get_class($sender) . "' is private.");
+        }
+    }
 }

Spacing +18 added lines, -18 removed lines

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