Passed
Pull Request — master (#5)
by Cody
03:17
created
classes/ihandler.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 interface IHandler {
3
-	public function csrf_ignore($method);
4
-	public function before($method);
5
-	public function after();
3
+    public function csrf_ignore($method);
4
+    public function before($method);
5
+    public function after();
6 6
 }
Please login to merge, or discard this patch.
classes/plugin.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -2,59 +2,59 @@
 block discarded – undo
2 2
 
3 3
 abstract class Plugin {
4 4
 
5
-	const API_VERSION_COMPAT = 1;
5
+    const API_VERSION_COMPAT = 1;
6 6
 
7
-	/**
8
-	 * @var PDO
9
-	 */
10
-	protected $pdo;
7
+    /**
8
+     * @var PDO
9
+     */
10
+    protected $pdo;
11 11
 
12
-	abstract function init(PluginHost $host);
12
+    abstract function init(PluginHost $host);
13 13
 
14
-	/**
15
-	 * @return array(version, name, description, author, false)
16
-	 */
17
-	abstract function about();
14
+    /**
15
+     * @return array(version, name, description, author, false)
16
+     */
17
+    abstract function about();
18 18
 
19
-	public function __construct() {
20
-		$this->pdo = Db::pdo();
21
-	}
19
+    public function __construct() {
20
+        $this->pdo = Db::pdo();
21
+    }
22 22
 
23
-	public function flags() {
24
-		/* associative array, possible keys:
23
+    public function flags() {
24
+        /* associative array, possible keys:
25 25
 			needs_curl = boolean
26 26
 		*/
27
-		return array();
28
-	}
27
+        return array();
28
+    }
29 29
 
30
-	public function is_public_method() {
31
-		return false;
32
-	}
30
+    public function is_public_method() {
31
+        return false;
32
+    }
33 33
 
34
-	public function get_js() {
35
-		return "";
36
-	}
34
+    public function get_js() {
35
+        return "";
36
+    }
37 37
 
38
-	public function get_prefs_js() {
39
-		return "";
40
-	}
38
+    public function get_prefs_js() {
39
+        return "";
40
+    }
41 41
 
42
-	public function api_version() {
43
-		return Plugin::API_VERSION_COMPAT;
44
-	}
42
+    public function api_version() {
43
+        return Plugin::API_VERSION_COMPAT;
44
+    }
45 45
 
46
-	public function __($msgid) {
47
-		return _dgettext(PluginHost::object_to_domain($this), $msgid);
48
-	}
46
+    public function __($msgid) {
47
+        return _dgettext(PluginHost::object_to_domain($this), $msgid);
48
+    }
49 49
 
50
-	public function _ngettext($singular, $plural, $number) {
51
-		return _dngettext(PluginHost::object_to_domain($this), $singular, $plural, $number);
52
-	}
50
+    public function _ngettext($singular, $plural, $number) {
51
+        return _dngettext(PluginHost::object_to_domain($this), $singular, $plural, $number);
52
+    }
53 53
 
54
-	public function T_sprintf() {
55
-		$args = func_get_args();
56
-		$msgid = array_shift($args);
54
+    public function T_sprintf() {
55
+        $args = func_get_args();
56
+        $msgid = array_shift($args);
57 57
 
58
-		return vsprintf($this->__($msgid), $args);
59
-	}
58
+        return vsprintf($this->__($msgid), $args);
59
+    }
60 60
 }
Please login to merge, or discard this patch.
classes/handler/protected.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 class Handler_Protected extends Handler {
3 3
 
4
-	public function before($method) {
5
-		return parent::before($method) && $_SESSION['uid'];
6
-	}
4
+    public function before($method) {
5
+        return parent::before($method) && $_SESSION['uid'];
6
+    }
7 7
 }
Please login to merge, or discard this patch.
classes/feedenclosure.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 class FeedEnclosure {
3
-	public $link;
4
-	public $type;
5
-	public $length;
6
-	public $title;
7
-	public $height;
8
-	public $width;
3
+    public $link;
4
+    public $type;
5
+    public $length;
6
+    public $title;
7
+    public $height;
8
+    public $width;
9 9
 }
10 10
 
Please login to merge, or discard this patch.
classes/iauthmodule.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1 1
 <?php
2 2
 interface IAuthModule {
3
-	public function authenticate($login, $password); // + optional third parameter: $service
3
+    public function authenticate($login, $password); // + optional third parameter: $service
4 4
 }
Please login to merge, or discard this patch.
classes/pluginhandler.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,23 +1,23 @@
 block discarded – undo
1 1
 <?php
2 2
 class PluginHandler extends Handler_Protected {
3
-	public function csrf_ignore($method) {
4
-		return true;
5
-	}
3
+    public function csrf_ignore($method) {
4
+        return true;
5
+    }
6 6
 
7
-	public function catchall($method) {
8
-		$plugin_name = clean($_REQUEST["plugin"]);
9
-		$plugin = PluginHost::getInstance()->get_plugin($plugin_name);
7
+    public function catchall($method) {
8
+        $plugin_name = clean($_REQUEST["plugin"]);
9
+        $plugin = PluginHost::getInstance()->get_plugin($plugin_name);
10 10
 
11
-		if ($plugin) {
12
-			if (method_exists($plugin, $method)) {
13
-				$plugin->$method();
14
-			} else {
15
-				user_error("PluginHandler: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
16
-				print error_json(13);
17
-			}
18
-		} else {
19
-			user_error("PluginHandler: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
20
-			print error_json(14);
21
-		}
22
-	}
11
+        if ($plugin) {
12
+            if (method_exists($plugin, $method)) {
13
+                $plugin->$method();
14
+            } else {
15
+                user_error("PluginHandler: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
16
+                print error_json(13);
17
+            }
18
+        } else {
19
+            user_error("PluginHandler: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
20
+            print error_json(14);
21
+        }
22
+    }
23 23
 }
Please login to merge, or discard this patch.
classes/auth/base.php 2 patches
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -1,48 +1,48 @@
 block discarded – undo
1 1
 <?php
2 2
 class Auth_Base {
3
-	private $pdo;
3
+    private $pdo;
4 4
 
5
-	const AUTH_SERVICE_API = '_api';
5
+    const AUTH_SERVICE_API = '_api';
6 6
 
7
-	public function __construct() {
8
-		$this->pdo = Db::pdo();
9
-	}
7
+    public function __construct() {
8
+        $this->pdo = Db::pdo();
9
+    }
10 10
 
11
-	// Auto-creates specified user if allowed by system configuration
12
-	// Can be used instead of find_user_by_login() by external auth modules
13
-	public function auto_create_user($login, $password = false) {
14
-		if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
15
-			$user_id = $this->find_user_by_login($login);
11
+    // Auto-creates specified user if allowed by system configuration
12
+    // Can be used instead of find_user_by_login() by external auth modules
13
+    public function auto_create_user($login, $password = false) {
14
+        if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
15
+            $user_id = $this->find_user_by_login($login);
16 16
 
17
-			if (!$password) $password = make_password();
17
+            if (!$password) $password = make_password();
18 18
 
19
-			if (!$user_id) {
20
-				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
21
-				$pwd_hash = encrypt_password($password, $salt, true);
19
+            if (!$user_id) {
20
+                $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
21
+                $pwd_hash = encrypt_password($password, $salt, true);
22 22
 
23
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_users
23
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_users
24 24
 						(login,access_level,last_login,created,pwd_hash,salt)
25 25
 						VALUES (?, 0, null, NOW(), ?,?)");
26
-				$sth->execute([$login, $pwd_hash, $salt]);
26
+                $sth->execute([$login, $pwd_hash, $salt]);
27 27
 
28
-				return $this->find_user_by_login($login);
28
+                return $this->find_user_by_login($login);
29 29
 
30
-			} else {
31
-				return $user_id;
32
-			}
33
-		}
30
+            } else {
31
+                return $user_id;
32
+            }
33
+        }
34 34
 
35
-		return $this->find_user_by_login($login);
36
-	}
35
+        return $this->find_user_by_login($login);
36
+    }
37 37
 
38
-	public function find_user_by_login($login) {
39
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
40
-		$sth->execute([$login]);
38
+    public function find_user_by_login($login) {
39
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
40
+        $sth->execute([$login]);
41 41
 
42
-		if ($row = $sth->fetch()) {
43
-			return $row["id"];
44
-		} else {
45
-			return false;
46
-		}
47
-	}
42
+        if ($row = $sth->fetch()) {
43
+            return $row["id"];
44
+        } else {
45
+            return false;
46
+        }
47
+    }
48 48
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,9 @@
 block discarded – undo
14 14
 		if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
15 15
 			$user_id = $this->find_user_by_login($login);
16 16
 
17
-			if (!$password) $password = make_password();
17
+			if (!$password) {
18
+			    $password = make_password();
19
+			}
18 20
 
19 21
 			if (!$user_id) {
20 22
 				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
Please login to merge, or discard this patch.
classes/feeditem/rss.php 1 patch
Indentation   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -1,147 +1,147 @@
 block discarded – undo
1 1
 <?php
2 2
 class FeedItem_RSS extends FeedItem_Common {
3
-	public function get_id() {
4
-		$id = $this->elem->getElementsByTagName("guid")->item(0);
3
+    public function get_id() {
4
+        $id = $this->elem->getElementsByTagName("guid")->item(0);
5 5
 
6
-		if ($id) {
7
-			return clean($id->nodeValue);
8
-		} else {
9
-			return clean($this->get_link());
10
-		}
11
-	}
6
+        if ($id) {
7
+            return clean($id->nodeValue);
8
+        } else {
9
+            return clean($this->get_link());
10
+        }
11
+    }
12 12
 
13
-	public function get_date() {
14
-		$pubDate = $this->elem->getElementsByTagName("pubDate")->item(0);
13
+    public function get_date() {
14
+        $pubDate = $this->elem->getElementsByTagName("pubDate")->item(0);
15 15
 
16
-		if ($pubDate) {
17
-			return strtotime($pubDate->nodeValue);
18
-		}
16
+        if ($pubDate) {
17
+            return strtotime($pubDate->nodeValue);
18
+        }
19 19
 
20
-		$date = $this->xpath->query("dc:date", $this->elem)->item(0);
20
+        $date = $this->xpath->query("dc:date", $this->elem)->item(0);
21 21
 
22
-		if ($date) {
23
-			return strtotime($date->nodeValue);
24
-		}
25
-	}
22
+        if ($date) {
23
+            return strtotime($date->nodeValue);
24
+        }
25
+    }
26 26
 
27
-	public function get_link() {
28
-		$links = $this->xpath->query("atom:link", $this->elem);
27
+    public function get_link() {
28
+        $links = $this->xpath->query("atom:link", $this->elem);
29 29
 
30
-		foreach ($links as $link) {
31
-			if ($link && $link->hasAttribute("href") &&
32
-				(!$link->hasAttribute("rel")
33
-					|| $link->getAttribute("rel") == "alternate"
34
-					|| $link->getAttribute("rel") == "standout")) {
30
+        foreach ($links as $link) {
31
+            if ($link && $link->hasAttribute("href") &&
32
+                (!$link->hasAttribute("rel")
33
+                    || $link->getAttribute("rel") == "alternate"
34
+                    || $link->getAttribute("rel") == "standout")) {
35 35
 
36
-				return clean(trim($link->getAttribute("href")));
37
-			}
38
-		}
36
+                return clean(trim($link->getAttribute("href")));
37
+            }
38
+        }
39 39
 
40
-		$link = $this->elem->getElementsByTagName("guid")->item(0);
40
+        $link = $this->elem->getElementsByTagName("guid")->item(0);
41 41
 
42
-		if ($link && $link->hasAttributes() && $link->getAttribute("isPermaLink") == "true") {
43
-			return clean(trim($link->nodeValue));
44
-		}
42
+        if ($link && $link->hasAttributes() && $link->getAttribute("isPermaLink") == "true") {
43
+            return clean(trim($link->nodeValue));
44
+        }
45 45
 
46
-		$link = $this->elem->getElementsByTagName("link")->item(0);
46
+        $link = $this->elem->getElementsByTagName("link")->item(0);
47 47
 
48
-		if ($link) {
49
-			return clean(trim($link->nodeValue));
50
-		}
51
-	}
48
+        if ($link) {
49
+            return clean(trim($link->nodeValue));
50
+        }
51
+    }
52 52
 
53
-	public function get_title() {
54
-		$title = $this->xpath->query("title", $this->elem)->item(0);
53
+    public function get_title() {
54
+        $title = $this->xpath->query("title", $this->elem)->item(0);
55 55
 
56
-		if ($title) {
57
-			return clean(trim($title->nodeValue));
58
-		}
56
+        if ($title) {
57
+            return clean(trim($title->nodeValue));
58
+        }
59 59
 
60
-		// if the document has a default namespace then querying for
61
-		// title would fail because of reasons so let's try the old way
62
-		$title = $this->elem->getElementsByTagName("title")->item(0);
60
+        // if the document has a default namespace then querying for
61
+        // title would fail because of reasons so let's try the old way
62
+        $title = $this->elem->getElementsByTagName("title")->item(0);
63 63
 
64
-		if ($title) {
65
-			return clean(trim($title->nodeValue));
66
-		}
67
-	}
64
+        if ($title) {
65
+            return clean(trim($title->nodeValue));
66
+        }
67
+    }
68 68
 
69
-	public function get_content() {
70
-		$contentA = $this->xpath->query("content:encoded", $this->elem)->item(0);
71
-		$contentB = $this->elem->getElementsByTagName("description")->item(0);
69
+    public function get_content() {
70
+        $contentA = $this->xpath->query("content:encoded", $this->elem)->item(0);
71
+        $contentB = $this->elem->getElementsByTagName("description")->item(0);
72 72
 
73
-		if ($contentA && !$contentB) {
74
-			return $this->subtree_or_text($contentA);
75
-		}
73
+        if ($contentA && !$contentB) {
74
+            return $this->subtree_or_text($contentA);
75
+        }
76 76
 
77 77
 
78
-		if ($contentB && !$contentA) {
79
-			return $this->subtree_or_text($contentB);
80
-		}
78
+        if ($contentB && !$contentA) {
79
+            return $this->subtree_or_text($contentB);
80
+        }
81 81
 
82
-		if ($contentA && $contentB) {
83
-			$resultA = $this->subtree_or_text($contentA);
84
-			$resultB = $this->subtree_or_text($contentB);
82
+        if ($contentA && $contentB) {
83
+            $resultA = $this->subtree_or_text($contentA);
84
+            $resultB = $this->subtree_or_text($contentB);
85 85
 
86
-			return mb_strlen($resultA) > mb_strlen($resultB) ? $resultA : $resultB;
87
-		}
88
-	}
86
+            return mb_strlen($resultA) > mb_strlen($resultB) ? $resultA : $resultB;
87
+        }
88
+    }
89 89
 
90
-	public function get_description() {
91
-		$summary = $this->elem->getElementsByTagName("description")->item(0);
90
+    public function get_description() {
91
+        $summary = $this->elem->getElementsByTagName("description")->item(0);
92 92
 
93
-		if ($summary) {
94
-			return $summary->nodeValue;
95
-		}
96
-	}
93
+        if ($summary) {
94
+            return $summary->nodeValue;
95
+        }
96
+    }
97 97
 
98
-	public function get_categories() {
99
-		$categories = $this->elem->getElementsByTagName("category");
100
-		$cats = [];
98
+    public function get_categories() {
99
+        $categories = $this->elem->getElementsByTagName("category");
100
+        $cats = [];
101 101
 
102
-		foreach ($categories as $cat) {
103
-			array_push($cats, $cat->nodeValue);
104
-		}
102
+        foreach ($categories as $cat) {
103
+            array_push($cats, $cat->nodeValue);
104
+        }
105 105
 
106
-		$categories = $this->xpath->query("dc:subject", $this->elem);
106
+        $categories = $this->xpath->query("dc:subject", $this->elem);
107 107
 
108
-		foreach ($categories as $cat) {
109
-			array_push($cats, $cat->nodeValue);
110
-		}
108
+        foreach ($categories as $cat) {
109
+            array_push($cats, $cat->nodeValue);
110
+        }
111 111
 
112
-		return $this->normalize_categories($cats);
113
-	}
112
+        return $this->normalize_categories($cats);
113
+    }
114 114
 
115
-	public function get_enclosures() {
116
-		$enclosures = $this->elem->getElementsByTagName("enclosure");
115
+    public function get_enclosures() {
116
+        $enclosures = $this->elem->getElementsByTagName("enclosure");
117 117
 
118
-		$encs = array();
118
+        $encs = array();
119 119
 
120
-		foreach ($enclosures as $enclosure) {
121
-			$enc = new FeedEnclosure();
120
+        foreach ($enclosures as $enclosure) {
121
+            $enc = new FeedEnclosure();
122 122
 
123
-			$enc->type = clean($enclosure->getAttribute("type"));
124
-			$enc->link = clean($enclosure->getAttribute("url"));
125
-			$enc->length = clean($enclosure->getAttribute("length"));
126
-			$enc->height = clean($enclosure->getAttribute("height"));
127
-			$enc->width = clean($enclosure->getAttribute("width"));
123
+            $enc->type = clean($enclosure->getAttribute("type"));
124
+            $enc->link = clean($enclosure->getAttribute("url"));
125
+            $enc->length = clean($enclosure->getAttribute("length"));
126
+            $enc->height = clean($enclosure->getAttribute("height"));
127
+            $enc->width = clean($enclosure->getAttribute("width"));
128 128
 
129
-			array_push($encs, $enc);
130
-		}
129
+            array_push($encs, $enc);
130
+        }
131 131
 
132
-		$encs = array_merge($encs, parent::get_enclosures());
132
+        $encs = array_merge($encs, parent::get_enclosures());
133 133
 
134
-		return $encs;
135
-	}
134
+        return $encs;
135
+    }
136 136
 
137
-	public function get_language() {
138
-		$languages = $this->doc->getElementsByTagName('language');
137
+    public function get_language() {
138
+        $languages = $this->doc->getElementsByTagName('language');
139 139
 
140
-		if (count($languages) == 0) {
141
-			return "";
142
-		}
140
+        if (count($languages) == 0) {
141
+            return "";
142
+        }
143 143
 
144
-		return clean($languages[0]->textContent);
145
-	}
144
+        return clean($languages[0]->textContent);
145
+    }
146 146
 
147 147
 }
Please login to merge, or discard this patch.
classes/idb.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <?php
2 2
 interface IDb {
3
-	public function connect($host, $user, $pass, $db, $port);
4
-	public function escape_string($s, $strip_tags = true);
5
-	public function query($query, $die_on_error = true);
6
-	public function fetch_assoc($result);
7
-	public function num_rows($result);
8
-	public function fetch_result($result, $row, $param);
9
-	public function close();
10
-	public function affected_rows($result);
11
-	public function last_error();
12
-	public function last_query_error();
3
+    public function connect($host, $user, $pass, $db, $port);
4
+    public function escape_string($s, $strip_tags = true);
5
+    public function query($query, $die_on_error = true);
6
+    public function fetch_assoc($result);
7
+    public function num_rows($result);
8
+    public function fetch_result($result, $row, $param);
9
+    public function close();
10
+    public function affected_rows($result);
11
+    public function last_error();
12
+    public function last_query_error();
13 13
 }
Please login to merge, or discard this patch.