codysnider / tt-rss

classes/diskcache.php

Spacing +6 added lines, -6 removed lines

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

Braces +26 added lines, -20 removed lines

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

Indentation +148 added lines, -148 removed lines

@@ -1,151 +1,151 @@
 <?php
 class DiskCache {
-	private $dir;
-
-	public function __construct($dir) {
-		$this->dir = CACHE_DIR . "/" . clean_filename($dir);
-	}
-
-	public function getDir() {
-		return $this->dir;
-	}
-
-	public function makeDir() {
-		if (!is_dir($this->dir)) {
-			return mkdir($this->dir);
-		}
-	}
-
-	public function isWritable($filename = "") {
-		if ($filename) {
-			if (file_exists($this->getFullPath($filename)))
-				return is_writable($this->getFullPath($filename));
-			else
-				return is_writable($this->dir);
-		} else {
-			return is_writable($this->dir);
-		}
-	}
-
-	public function exists($filename) {
-		return file_exists($this->getFullPath($filename));
-	}
-
-	public function getSize($filename) {
-		if ($this->exists($filename))
-			return filesize($this->getFullPath($filename));
-		else
-			return -1;
-	}
-
-	public function getFullPath($filename) {
-		$filename = clean_filename($filename);
-
-		return $this->dir . "/" . $filename;
-	}
-
-	public function put($filename, $data) {
-		return file_put_contents($this->getFullPath($filename), $data);
-	}
-
-	public function touch($filename) {
-		return touch($this->getFullPath($filename));
-	}
-
-	public function get($filename) {
-		if ($this->exists($filename))
-			return file_get_contents($this->getFullPath($filename));
-		else
-			return null;
-	}
-
-	public function getMimeType($filename) {
-		if ($this->exists($filename))
-			return mime_content_type($this->getFullPath($filename));
-		else
-			return null;
-	}
-
-	public function send($filename) {
-		header("Content-Disposition: inline; filename=\"$filename\"");
-
-		return send_local_file($this->getFullPath($filename));
-	}
-
-	public function getUrl($filename) {
-		return get_self_url_prefix() . "/public.php?op=cached_url&file=" . basename($this->dir) . "/" . $filename;
-	}
-
-	// check for locally cached (media) URLs and rewrite to local versions
-	// this is called separately after sanitize() and plugin render article hooks to allow
-	// plugins work on original source URLs used before caching
-	static public function rewriteUrls($str)
-	{
-		$res = trim($str);
-		if (!$res) return '';
-
-		$doc = new DOMDocument();
-		if ($doc->loadHTML('<?xml encoding="UTF-8">' . $res)) {
-			$xpath = new DOMXPath($doc);
-			$cache = new DiskCache("images");
-
-			$entries = $xpath->query('(//img[@src]|//picture/source[@src]|//video[@poster]|//video/source[@src]|//audio/source[@src])');
-
-			$need_saving = false;
-
-			foreach ($entries as $entry) {
-
-				if ($entry->hasAttribute('src') || $entry->hasAttribute('poster')) {
-
-					// should be already absolutized because this is called after sanitize()
-					$src = $entry->hasAttribute('poster') ? $entry->getAttribute('poster') : $entry->getAttribute('src');
-					$cached_filename = sha1($src);
-
-					if ($cache->exists($cached_filename)) {
-
-						$src = $cache->getUrl(sha1($src));
-
-						if ($entry->hasAttribute('poster'))
-							$entry->setAttribute('poster', $src);
-						else {
-							$entry->setAttribute('src', $src);
-							$entry->removeAttribute("srcset");
-						}
-
-						$need_saving = true;
-					}
-				}
-			}
-
-			if ($need_saving) {
-				$doc->removeChild($doc->firstChild); //remove doctype
-				$res = $doc->saveHTML();
-			}
-		}
-		return $res;
-	}
-
-	public static function expire() {
-		$dirs = array_filter(glob(CACHE_DIR . "/*"), "is_dir");
-
-		foreach ($dirs as $cache_dir) {
-			$num_deleted = 0;
-
-			if (is_writable($cache_dir) && !file_exists("$cache_dir/.no-auto-expiry")) {
-				$files = glob("$cache_dir/*");
-
-				if ($files) {
-					foreach ($files as $file) {
-						if (time() - filemtime($file) > 86400*CACHE_MAX_DAYS) {
-							unlink($file);
-
-							++$num_deleted;
-						}
-					}
-				}
-
-				Debug::log("expired $cache_dir: removed $num_deleted files.");
-			}
-		}
-	}
+    private $dir;
+
+    public function __construct($dir) {
+        $this->dir = CACHE_DIR . "/" . clean_filename($dir);
+    }
+
+    public function getDir() {
+        return $this->dir;
+    }
+
+    public function makeDir() {
+        if (!is_dir($this->dir)) {
+            return mkdir($this->dir);
+        }
+    }
+
+    public function isWritable($filename = "") {
+        if ($filename) {
+            if (file_exists($this->getFullPath($filename)))
+                return is_writable($this->getFullPath($filename));
+            else
+                return is_writable($this->dir);
+        } else {
+            return is_writable($this->dir);
+        }
+    }
+
+    public function exists($filename) {
+        return file_exists($this->getFullPath($filename));
+    }
+
+    public function getSize($filename) {
+        if ($this->exists($filename))
+            return filesize($this->getFullPath($filename));
+        else
+            return -1;
+    }
+
+    public function getFullPath($filename) {
+        $filename = clean_filename($filename);
+
+        return $this->dir . "/" . $filename;
+    }
+
+    public function put($filename, $data) {
+        return file_put_contents($this->getFullPath($filename), $data);
+    }
+
+    public function touch($filename) {
+        return touch($this->getFullPath($filename));
+    }
+
+    public function get($filename) {
+        if ($this->exists($filename))
+            return file_get_contents($this->getFullPath($filename));
+        else
+            return null;
+    }
+
+    public function getMimeType($filename) {
+        if ($this->exists($filename))
+            return mime_content_type($this->getFullPath($filename));
+        else
+            return null;
+    }
+
+    public function send($filename) {
+        header("Content-Disposition: inline; filename=\"$filename\"");
+
+        return send_local_file($this->getFullPath($filename));
+    }
+
+    public function getUrl($filename) {
+        return get_self_url_prefix() . "/public.php?op=cached_url&file=" . basename($this->dir) . "/" . $filename;
+    }
+
+    // check for locally cached (media) URLs and rewrite to local versions
+    // this is called separately after sanitize() and plugin render article hooks to allow
+    // plugins work on original source URLs used before caching
+    static public function rewriteUrls($str)
+    {
+        $res = trim($str);
+        if (!$res) return '';
+
+        $doc = new DOMDocument();
+        if ($doc->loadHTML('<?xml encoding="UTF-8">' . $res)) {
+            $xpath = new DOMXPath($doc);
+            $cache = new DiskCache("images");
+
+            $entries = $xpath->query('(//img[@src]|//picture/source[@src]|//video[@poster]|//video/source[@src]|//audio/source[@src])');
+
+            $need_saving = false;
+
+            foreach ($entries as $entry) {
+
+                if ($entry->hasAttribute('src') || $entry->hasAttribute('poster')) {
+
+                    // should be already absolutized because this is called after sanitize()
+                    $src = $entry->hasAttribute('poster') ? $entry->getAttribute('poster') : $entry->getAttribute('src');
+                    $cached_filename = sha1($src);
+
+                    if ($cache->exists($cached_filename)) {
+
+                        $src = $cache->getUrl(sha1($src));
+
+                        if ($entry->hasAttribute('poster'))
+                            $entry->setAttribute('poster', $src);
+                        else {
+                            $entry->setAttribute('src', $src);
+                            $entry->removeAttribute("srcset");
+                        }
+
+                        $need_saving = true;
+                    }
+                }
+            }
+
+            if ($need_saving) {
+                $doc->removeChild($doc->firstChild); //remove doctype
+                $res = $doc->saveHTML();
+            }
+        }
+        return $res;
+    }
+
+    public static function expire() {
+        $dirs = array_filter(glob(CACHE_DIR . "/*"), "is_dir");
+
+        foreach ($dirs as $cache_dir) {
+            $num_deleted = 0;
+
+            if (is_writable($cache_dir) && !file_exists("$cache_dir/.no-auto-expiry")) {
+                $files = glob("$cache_dir/*");
+
+                if ($files) {
+                    foreach ($files as $file) {
+                        if (time() - filemtime($file) > 86400*CACHE_MAX_DAYS) {
+                            unlink($file);
+
+                            ++$num_deleted;
+                        }
+                    }
+                }
+
+                Debug::log("expired $cache_dir: removed $num_deleted files.");
+            }
+        }
+    }
 }

classes/opml.php

Spacing +14 added lines, -14 removed lines

@@ -70,7 +70,7 @@ 
 			$cat_title = htmlspecialchars($row['title']);
 
 			if ($include_settings) {
-				$order_id = (int)$row["order_id"];
+				$order_id = (int) $row["order_id"];
 				$ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\"";
 			}
 		} else {
@@ -103,8 +103,8 @@ 
 			$site_url = htmlspecialchars($fline["site_url"]);
 
 			if ($include_settings) {
-				$update_interval = (int)$fline["update_interval"];
-				$order_id = (int)$fline["order_id"];
+				$update_interval = (int) $fline["update_interval"];
+				$order_id = (int) $fline["order_id"];
 
 				$ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\" ttrssUpdateInterval=\"$update_interval\"";
 			} else {
@@ -130,7 +130,7 @@ 
 
 		if (!isset($_REQUEST["debug"])) {
 			header("Content-type: application/xml+opml");
-			header("Content-Disposition: attachment; filename=" . $name );
+			header("Content-Disposition: attachment; filename=".$name);
 		} else {
 			header("Content-type: text/xml");
 		}
@@ -139,7 +139,7 @@ 
 
 		$out .= "<opml version=\"1.0\">";
 		$out .= "<head>
-			<dateCreated>" . date("r", time()) . "</dateCreated>
+			<dateCreated>" . date("r", time())."</dateCreated>
 			<title>Tiny Tiny RSS Feed Export</title>
 		</head>";
 		$out .= "<body>";
@@ -214,7 +214,7 @@ 
 					    foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
 
                             if (strpos($feed_id, "CAT:") === 0) {
-                                $feed_id = (int)substr($feed_id, 4);
+                                $feed_id = (int) substr($feed_id, 4);
                                 if ($feed_id) {
                                     array_push($match, [Feeds::getCategoryTitle($feed_id), true, false]);
                                 } else {
@@ -222,7 +222,7 @@ 
                                 }
                             } else {
                                 if ($feed_id) {
-                                    array_push($match, [Feeds::getFeedTitle((int)$feed_id), false, false]);
+                                    array_push($match, [Feeds::getFeedTitle((int) $feed_id), false, false]);
                                 } else {
                                     array_push($match, [0, false, true]);
                                 }
@@ -409,7 +409,7 @@ 
 						        list ($name, $is_cat, $is_id) = $match;
 
 						        if ($is_id) {
-						            array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
+						            array_push($match_on, ($is_cat ? "CAT:" : "").$name);
                                 } else {
 
                                     if (!$is_cat) {
@@ -438,7 +438,7 @@ 
                             }
 
                             $reg_exp = $rule["reg_exp"];
-                            $filter_type = (int)$rule["filter_type"];
+                            $filter_type = (int) $rule["filter_type"];
                             $inverse = bool_to_sql_bool($rule["inverse"]);
                             $match_on = json_encode($match_on);
 
@@ -472,7 +472,7 @@ 
 
                             $cat_filter = bool_to_sql_bool($rule["cat_filter"]);
                             $reg_exp = $rule["reg_exp"];
-                            $filter_type = (int)$rule["filter_type"];
+                            $filter_type = (int) $rule["filter_type"];
                             $inverse = bool_to_sql_bool($rule["inverse"]);
 
                             $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
@@ -485,7 +485,7 @@ 
 
 					foreach ($filter["actions"] as $action) {
 
-						$action_id = (int)$action["action_id"];
+						$action_id = (int) $action["action_id"];
 						$action_param = $action["action_param"];
 
 						$usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_actions
@@ -585,7 +585,7 @@ 
 		}
 
 		if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'opml');
+			$tmp_file = tempnam(CACHE_DIR.'/upload', 'opml');
 
 			$result = move_uploaded_file($_FILES['opml_file']['tmp_name'],
 				$tmp_file);
@@ -623,10 +623,10 @@ 
 		print "$msg<br/>";
 	}
 
-	public static function opml_publish_url(){
+	public static function opml_publish_url() {
 
 		$url_path = get_self_url_prefix();
-		$url_path .= "/opml.php?op=publish&key=" .
+		$url_path .= "/opml.php?op=publish&key=".
 			Feeds::get_feed_access_key('OPML:Publish', false, $_SESSION["uid"]);
 
 		return $url_path;

Indentation +401 added lines, -401 removed lines

@@ -1,28 +1,28 @@ 
 <?php
 class Opml extends Handler_Protected {
 
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("export", "import");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("export", "import");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public function export() {
-		$output_name = "tt-rss_".date("Y-m-d").".opml";
-		$include_settings = $_REQUEST["include_settings"] == "1";
-		$owner_uid = $_SESSION["uid"];
+    public function export() {
+        $output_name = "tt-rss_".date("Y-m-d").".opml";
+        $include_settings = $_REQUEST["include_settings"] == "1";
+        $owner_uid = $_SESSION["uid"];
 
-		$rc = $this->opml_export($output_name, $owner_uid, false, $include_settings);
+        $rc = $this->opml_export($output_name, $owner_uid, false, $include_settings);
 
-		return $rc;
-	}
+        return $rc;
+    }
 
-	public function import() {
-		$owner_uid = $_SESSION["uid"];
+    public function import() {
+        $owner_uid = $_SESSION["uid"];
 
-		header('Content-Type: text/html; charset=utf-8');
+        header('Content-Type: text/html; charset=utf-8');
 
-		print "<html>
+        print "<html>
 			<head>
 				".stylesheet_tag("css/default.css")."
 				<title>".__("OPML Utility")."</title>
@@ -31,177 +31,177 @@ 
 			<body class='claro ttrss_utility'>
 			<h1>".__('OPML Utility')."</h1><div class='content'>";
 
-		Feeds::add_feed_category("Imported feeds");
+        Feeds::add_feed_category("Imported feeds");
 
-		$this->opml_notice(__("Importing OPML..."));
+        $this->opml_notice(__("Importing OPML..."));
 
-		$this->opml_import($owner_uid);
+        $this->opml_import($owner_uid);
 
-		print "<br><form method=\"GET\" action=\"prefs.php\">
+        print "<br><form method=\"GET\" action=\"prefs.php\">
 			<input type=\"submit\" value=\"".__("Return to preferences")."\">
 			</form>";
 
-		print "</div></body></html>";
+        print "</div></body></html>";
 
 
-	}
+    }
 
-	// Export
+    // Export
 
-	private function opml_export_category($owner_uid, $cat_id, $hide_private_feeds = false, $include_settings = true) {
+    private function opml_export_category($owner_uid, $cat_id, $hide_private_feeds = false, $include_settings = true) {
 
-		$cat_id = (int) $cat_id;
+        $cat_id = (int) $cat_id;
 
-		if ($hide_private_feeds)
-			$hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
-		else
-			$hide_qpart = "true";
+        if ($hide_private_feeds)
+            $hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
+        else
+            $hide_qpart = "true";
 
-		$out = "";
+        $out = "";
 
-		$ttrss_specific_qpart = "";
+        $ttrss_specific_qpart = "";
 
-		if ($cat_id) {
-			$sth = $this->pdo->prepare("SELECT title,order_id
+        if ($cat_id) {
+            $sth = $this->pdo->prepare("SELECT title,order_id
 				FROM ttrss_feed_categories WHERE id = ?
 					AND owner_uid = ?");
-			$sth->execute([$cat_id, $owner_uid]);
-			$row = $sth->fetch();
-			$cat_title = htmlspecialchars($row['title']);
+            $sth->execute([$cat_id, $owner_uid]);
+            $row = $sth->fetch();
+            $cat_title = htmlspecialchars($row['title']);
 
-			if ($include_settings) {
-				$order_id = (int)$row["order_id"];
-				$ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\"";
-			}
-		} else {
-			$cat_title = "";
-		}
+            if ($include_settings) {
+                $order_id = (int)$row["order_id"];
+                $ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\"";
+            }
+        } else {
+            $cat_title = "";
+        }
 
-		if ($cat_title) $out .= "<outline text=\"$cat_title\" $ttrss_specific_qpart>\n";
+        if ($cat_title) $out .= "<outline text=\"$cat_title\" $ttrss_specific_qpart>\n";
 
-		$sth = $this->pdo->prepare("SELECT id,title
+        $sth = $this->pdo->prepare("SELECT id,title
 			FROM ttrss_feed_categories WHERE
 				(parent_cat = :cat OR (:cat = 0 AND parent_cat IS NULL)) AND
 				owner_uid = :uid ORDER BY order_id, title");
 
-		$sth->execute([':cat' => $cat_id, ':uid' => $owner_uid]);
+        $sth->execute([':cat' => $cat_id, ':uid' => $owner_uid]);
 
-		while ($line = $sth->fetch()) {
-			$out .= $this->opml_export_category($owner_uid, $line["id"], $hide_private_feeds, $include_settings);
-		}
+        while ($line = $sth->fetch()) {
+            $out .= $this->opml_export_category($owner_uid, $line["id"], $hide_private_feeds, $include_settings);
+        }
 
-		$fsth = $this->pdo->prepare("select title, feed_url, site_url, update_interval, order_id
+        $fsth = $this->pdo->prepare("select title, feed_url, site_url, update_interval, order_id
 				FROM ttrss_feeds WHERE
 					(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL)) AND owner_uid = :uid AND $hide_qpart
 				ORDER BY order_id, title");
 
-		$fsth->execute([':cat' => $cat_id, ':uid' => $owner_uid]);
+        $fsth->execute([':cat' => $cat_id, ':uid' => $owner_uid]);
 
-		while ($fline = $fsth->fetch()) {
-			$title = htmlspecialchars($fline["title"]);
-			$url = htmlspecialchars($fline["feed_url"]);
-			$site_url = htmlspecialchars($fline["site_url"]);
+        while ($fline = $fsth->fetch()) {
+            $title = htmlspecialchars($fline["title"]);
+            $url = htmlspecialchars($fline["feed_url"]);
+            $site_url = htmlspecialchars($fline["site_url"]);
 
-			if ($include_settings) {
-				$update_interval = (int)$fline["update_interval"];
-				$order_id = (int)$fline["order_id"];
+            if ($include_settings) {
+                $update_interval = (int)$fline["update_interval"];
+                $order_id = (int)$fline["order_id"];
 
-				$ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\" ttrssUpdateInterval=\"$update_interval\"";
-			} else {
-				$ttrss_specific_qpart = "";
-			}
+                $ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\" ttrssUpdateInterval=\"$update_interval\"";
+            } else {
+                $ttrss_specific_qpart = "";
+            }
 
-			if ($site_url) {
-				$html_url_qpart = "htmlUrl=\"$site_url\"";
-			} else {
-				$html_url_qpart = "";
-			}
+            if ($site_url) {
+                $html_url_qpart = "htmlUrl=\"$site_url\"";
+            } else {
+                $html_url_qpart = "";
+            }
 
-			$out .= "<outline type=\"rss\" text=\"$title\" xmlUrl=\"$url\" $ttrss_specific_qpart $html_url_qpart/>\n";
-		}
+            $out .= "<outline type=\"rss\" text=\"$title\" xmlUrl=\"$url\" $ttrss_specific_qpart $html_url_qpart/>\n";
+        }
 
-		if ($cat_title) $out .= "</outline>\n";
+        if ($cat_title) $out .= "</outline>\n";
 
-		return $out;
-	}
+        return $out;
+    }
 
-	public function opml_export($name, $owner_uid, $hide_private_feeds = false, $include_settings = true) {
-		if (!$owner_uid) return;
+    public function opml_export($name, $owner_uid, $hide_private_feeds = false, $include_settings = true) {
+        if (!$owner_uid) return;
 
-		if (!isset($_REQUEST["debug"])) {
-			header("Content-type: application/xml+opml");
-			header("Content-Disposition: attachment; filename=" . $name );
-		} else {
-			header("Content-type: text/xml");
-		}
+        if (!isset($_REQUEST["debug"])) {
+            header("Content-type: application/xml+opml");
+            header("Content-Disposition: attachment; filename=" . $name );
+        } else {
+            header("Content-type: text/xml");
+        }
 
-		$out = "<?xml version=\"1.0\" encoding=\"utf-8\"?".">";
+        $out = "<?xml version=\"1.0\" encoding=\"utf-8\"?".">";
 
-		$out .= "<opml version=\"1.0\">";
-		$out .= "<head>
+        $out .= "<opml version=\"1.0\">";
+        $out .= "<head>
 			<dateCreated>" . date("r", time()) . "</dateCreated>
 			<title>Tiny Tiny RSS Feed Export</title>
 		</head>";
-		$out .= "<body>";
+        $out .= "<body>";
 
-		$out .= $this->opml_export_category($owner_uid, 0, $hide_private_feeds, $include_settings);
+        $out .= $this->opml_export_category($owner_uid, 0, $hide_private_feeds, $include_settings);
 
-		# export tt-rss settings
+        # export tt-rss settings
 
-		if ($include_settings) {
-			$out .= "<outline text=\"tt-rss-prefs\" schema-version=\"".SCHEMA_VERSION."\">";
+        if ($include_settings) {
+            $out .= "<outline text=\"tt-rss-prefs\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$sth = $this->pdo->prepare("SELECT pref_name, value FROM ttrss_user_prefs WHERE
+            $sth = $this->pdo->prepare("SELECT pref_name, value FROM ttrss_user_prefs WHERE
 			   profile IS NULL AND owner_uid = ? ORDER BY pref_name");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				$name = $line["pref_name"];
-				$value = htmlspecialchars($line["value"]);
+            while ($line = $sth->fetch()) {
+                $name = $line["pref_name"];
+                $value = htmlspecialchars($line["value"]);
 
-				$out .= "<outline pref-name=\"$name\" value=\"$value\"/>";
-			}
+                $out .= "<outline pref-name=\"$name\" value=\"$value\"/>";
+            }
 
-			$out .= "</outline>";
+            $out .= "</outline>";
 
-			$out .= "<outline text=\"tt-rss-labels\" schema-version=\"".SCHEMA_VERSION."\">";
+            $out .= "<outline text=\"tt-rss-labels\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$sth = $this->pdo->prepare("SELECT * FROM ttrss_labels2 WHERE
+            $sth = $this->pdo->prepare("SELECT * FROM ttrss_labels2 WHERE
 				owner_uid = ?");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				$name = htmlspecialchars($line['caption']);
-				$fg_color = htmlspecialchars($line['fg_color']);
-				$bg_color = htmlspecialchars($line['bg_color']);
+            while ($line = $sth->fetch()) {
+                $name = htmlspecialchars($line['caption']);
+                $fg_color = htmlspecialchars($line['fg_color']);
+                $bg_color = htmlspecialchars($line['bg_color']);
 
-				$out .= "<outline label-name=\"$name\" label-fg-color=\"$fg_color\" label-bg-color=\"$bg_color\"/>";
+                $out .= "<outline label-name=\"$name\" label-fg-color=\"$fg_color\" label-bg-color=\"$bg_color\"/>";
 
-			}
+            }
 
-			$out .= "</outline>";
+            $out .= "</outline>";
 
-			$out .= "<outline text=\"tt-rss-filters\" schema-version=\"".SCHEMA_VERSION."\">";
+            $out .= "<outline text=\"tt-rss-filters\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2
+            $sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2
 				WHERE owner_uid = ? ORDER BY id");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				$line["rules"] = array();
-				$line["actions"] = array();
+            while ($line = $sth->fetch()) {
+                $line["rules"] = array();
+                $line["actions"] = array();
 
-				$tmph = $this->pdo->prepare("SELECT * FROM ttrss_filters2_rules
+                $tmph = $this->pdo->prepare("SELECT * FROM ttrss_filters2_rules
 					WHERE filter_id = ?");
-				$tmph->execute([$line['id']]);
+                $tmph->execute([$line['id']]);
 
-				while ($tmp_line = $tmph->fetch(PDO::FETCH_ASSOC)) {
-					unset($tmp_line["id"]);
-					unset($tmp_line["filter_id"]);
+                while ($tmp_line = $tmph->fetch(PDO::FETCH_ASSOC)) {
+                    unset($tmp_line["id"]);
+                    unset($tmp_line["filter_id"]);
 
-					$cat_filter = $tmp_line["cat_filter"];
+                    $cat_filter = $tmp_line["cat_filter"];
 
-					if (!$tmp_line["match_on"]) {
+                    if (!$tmp_line["match_on"]) {
                         if ($cat_filter && $tmp_line["cat_id"] || $tmp_line["feed_id"]) {
                             $tmp_line["feed"] = Feeds::getFeedTitle(
                                 $cat_filter ? $tmp_line["cat_id"] : $tmp_line["feed_id"],
@@ -210,8 +210,8 @@ 
                             $tmp_line["feed"] = "";
                         }
                     } else {
-					    $match = [];
-					    foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
+                        $match = [];
+                        foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
 
                             if (strpos($feed_id, "CAT:") === 0) {
                                 $feed_id = (int)substr($feed_id, 4);
@@ -230,56 +230,56 @@ 
                         }
 
                         $tmp_line["match"] = $match;
-					    unset($tmp_line["match_on"]);
+                        unset($tmp_line["match_on"]);
                     }
 
-					unset($tmp_line["feed_id"]);
-					unset($tmp_line["cat_id"]);
+                    unset($tmp_line["feed_id"]);
+                    unset($tmp_line["cat_id"]);
 
-					array_push($line["rules"], $tmp_line);
-				}
+                    array_push($line["rules"], $tmp_line);
+                }
 
-				$tmph = $this->pdo->prepare("SELECT * FROM ttrss_filters2_actions
+                $tmph = $this->pdo->prepare("SELECT * FROM ttrss_filters2_actions
 					WHERE filter_id = ?");
-				$tmph->execute([$line['id']]);
+                $tmph->execute([$line['id']]);
 
-				while ($tmp_line = $tmph->fetch(PDO::FETCH_ASSOC)) {
-					unset($tmp_line["id"]);
-					unset($tmp_line["filter_id"]);
+                while ($tmp_line = $tmph->fetch(PDO::FETCH_ASSOC)) {
+                    unset($tmp_line["id"]);
+                    unset($tmp_line["filter_id"]);
 
-					array_push($line["actions"], $tmp_line);
-				}
+                    array_push($line["actions"], $tmp_line);
+                }
 
-				unset($line["id"]);
-				unset($line["owner_uid"]);
-				$filter = json_encode($line);
+                unset($line["id"]);
+                unset($line["owner_uid"]);
+                $filter = json_encode($line);
 
-				$out .= "<outline filter-type=\"2\"><![CDATA[$filter]]></outline>";
+                $out .= "<outline filter-type=\"2\"><![CDATA[$filter]]></outline>";
 
-			}
+            }
 
 
-			$out .= "</outline>";
-		}
+            $out .= "</outline>";
+        }
 
-		$out .= "</body></opml>";
+        $out .= "</body></opml>";
 
-		// Format output.
-		$doc = new DOMDocument();
-		$doc->formatOutput = true;
-		$doc->preserveWhiteSpace = false;
-		$doc->loadXML($out);
+        // Format output.
+        $doc = new DOMDocument();
+        $doc->formatOutput = true;
+        $doc->preserveWhiteSpace = false;
+        $doc->loadXML($out);
 
-		$xpath = new DOMXpath($doc);
-		$outlines = $xpath->query("//outline[@title]");
+        $xpath = new DOMXpath($doc);
+        $outlines = $xpath->query("//outline[@title]");
 
-		// cleanup empty categories
-		foreach ($outlines as $node) {
-			if ($node->getElementsByTagName('outline')->length == 0)
-				$node->parentNode->removeChild($node);
-		}
+        // cleanup empty categories
+        foreach ($outlines as $node) {
+            if ($node->getElementsByTagName('outline')->length == 0)
+                $node->parentNode->removeChild($node);
+        }
 
-		$res = $doc->saveXML();
+        $res = $doc->saveXML();
 
 /*		// saveXML uses a two-space indent.  Change to tabs.
 		$res = preg_replace_callback('/^(?:  )+/mu',
@@ -288,128 +288,128 @@ 
 				'return str_repeat("\t", intval(strlen($matches[0])/2));'),
 			$res); */
 
-		print $res;
-	}
+        print $res;
+    }
 
-	// Import
+    // Import
 
-	private function opml_import_feed($node, $cat_id, $owner_uid) {
-		$attrs = $node->attributes;
+    private function opml_import_feed($node, $cat_id, $owner_uid) {
+        $attrs = $node->attributes;
 
-		$feed_title = mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250);
-		if (!$feed_title) $feed_title = mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250);
+        $feed_title = mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250);
+        if (!$feed_title) $feed_title = mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250);
 
-		$feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
-		if (!$feed_url) $feed_url = $attrs->getNamedItem('xmlURL')->nodeValue;
+        $feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
+        if (!$feed_url) $feed_url = $attrs->getNamedItem('xmlURL')->nodeValue;
 
-		$site_url = mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250);
+        $site_url = mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250);
 
-		if ($feed_url) {
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+        if ($feed_url) {
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 				feed_url = ? AND owner_uid = ?");
-			$sth->execute([$feed_url, $owner_uid]);
+            $sth->execute([$feed_url, $owner_uid]);
 
-			if (!$feed_title) $feed_title = '[Unknown]';
+            if (!$feed_title) $feed_title = '[Unknown]';
 
-			if (!$sth->fetch()) {
-				#$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
-				$this->opml_notice(T_sprintf("Adding feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
+            if (!$sth->fetch()) {
+                #$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
+                $this->opml_notice(T_sprintf("Adding feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
 
-				if (!$cat_id) $cat_id = null;
+                if (!$cat_id) $cat_id = null;
 
-				$update_interval = (int) $attrs->getNamedItem('ttrssUpdateInterval')->nodeValue;
-				if (!$update_interval) $update_interval = 0;
+                $update_interval = (int) $attrs->getNamedItem('ttrssUpdateInterval')->nodeValue;
+                if (!$update_interval) $update_interval = 0;
 
-				$order_id = (int) $attrs->getNamedItem('ttrssSortOrder')->nodeValue;
-				if (!$order_id) $order_id = 0;
+                $order_id = (int) $attrs->getNamedItem('ttrssSortOrder')->nodeValue;
+                if (!$order_id) $order_id = 0;
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 					(title, feed_url, owner_uid, cat_id, site_url, order_id, update_interval) VALUES
 					(?, ?, ?, ?, ?, ?, ?)");
 
-				$sth->execute([$feed_title, $feed_url, $owner_uid, $cat_id, $site_url, $order_id, $update_interval]);
+                $sth->execute([$feed_title, $feed_url, $owner_uid, $cat_id, $site_url, $order_id, $update_interval]);
 
-			} else {
-				$this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
-			}
-		}
-	}
+            } else {
+                $this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
+            }
+        }
+    }
 
-	private function opml_import_label($node, $owner_uid) {
-		$attrs = $node->attributes;
-		$label_name = $attrs->getNamedItem('label-name')->nodeValue;
+    private function opml_import_label($node, $owner_uid) {
+        $attrs = $node->attributes;
+        $label_name = $attrs->getNamedItem('label-name')->nodeValue;
 
-		if ($label_name) {
-			$fg_color = $attrs->getNamedItem('label-fg-color')->nodeValue;
-			$bg_color = $attrs->getNamedItem('label-bg-color')->nodeValue;
+        if ($label_name) {
+            $fg_color = $attrs->getNamedItem('label-fg-color')->nodeValue;
+            $bg_color = $attrs->getNamedItem('label-bg-color')->nodeValue;
 
-			if (!Labels::find_id($label_name, $_SESSION['uid'])) {
-				$this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)));
-				Labels::create($label_name, $fg_color, $bg_color, $owner_uid);
-			} else {
-				$this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)));
-			}
-		}
-	}
+            if (!Labels::find_id($label_name, $_SESSION['uid'])) {
+                $this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)));
+                Labels::create($label_name, $fg_color, $bg_color, $owner_uid);
+            } else {
+                $this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)));
+            }
+        }
+    }
 
-	private function opml_import_preference($node) {
-		$attrs = $node->attributes;
-		$pref_name = $attrs->getNamedItem('pref-name')->nodeValue;
+    private function opml_import_preference($node) {
+        $attrs = $node->attributes;
+        $pref_name = $attrs->getNamedItem('pref-name')->nodeValue;
 
-		if ($pref_name) {
-			$pref_value = $attrs->getNamedItem('value')->nodeValue;
+        if ($pref_name) {
+            $pref_value = $attrs->getNamedItem('value')->nodeValue;
 
-			$this->opml_notice(T_sprintf("Setting preference key %s to %s",
-				$pref_name, $pref_value));
+            $this->opml_notice(T_sprintf("Setting preference key %s to %s",
+                $pref_name, $pref_value));
 
-			set_pref($pref_name, $pref_value);
-		}
-	}
+            set_pref($pref_name, $pref_value);
+        }
+    }
 
-	private function opml_import_filter($node) {
-		$attrs = $node->attributes;
+    private function opml_import_filter($node) {
+        $attrs = $node->attributes;
 
-		$filter_type = $attrs->getNamedItem('filter-type')->nodeValue;
+        $filter_type = $attrs->getNamedItem('filter-type')->nodeValue;
 
-		if ($filter_type == '2') {
-			$filter = json_decode($node->nodeValue, true);
+        if ($filter_type == '2') {
+            $filter = json_decode($node->nodeValue, true);
 
-			if ($filter) {
-				$match_any_rule = bool_to_sql_bool($filter["match_any_rule"]);
-				$enabled = bool_to_sql_bool($filter["enabled"]);
-				$inverse = bool_to_sql_bool($filter["inverse"]);
-				$title = $filter["title"];
+            if ($filter) {
+                $match_any_rule = bool_to_sql_bool($filter["match_any_rule"]);
+                $enabled = bool_to_sql_bool($filter["enabled"]);
+                $inverse = bool_to_sql_bool($filter["inverse"]);
+                $title = $filter["title"];
 
-				//print "F: $title, $inverse, $enabled, $match_any_rule";
+                //print "F: $title, $inverse, $enabled, $match_any_rule";
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_filters2 (match_any_rule,enabled,inverse,title,owner_uid)
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_filters2 (match_any_rule,enabled,inverse,title,owner_uid)
 					VALUES (?, ?, ?, ?, ?)");
 
-				$sth->execute([$match_any_rule, $enabled, $inverse, $title, $_SESSION['uid']]);
+                $sth->execute([$match_any_rule, $enabled, $inverse, $title, $_SESSION['uid']]);
 
-				$sth = $this->pdo->prepare("SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
+                $sth = $this->pdo->prepare("SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
 					owner_uid = ?");
-				$sth->execute([$_SESSION['uid']]);
+                $sth->execute([$_SESSION['uid']]);
 
-				$row = $sth->fetch();
-				$filter_id = $row['id'];
+                $row = $sth->fetch();
+                $filter_id = $row['id'];
 
-				if ($filter_id) {
-					$this->opml_notice(T_sprintf("Adding filter %s...", $title));
+                if ($filter_id) {
+                    $this->opml_notice(T_sprintf("Adding filter %s...", $title));
 
-					foreach ($filter["rules"] as $rule) {
-						$feed_id = null;
-						$cat_id = null;
+                    foreach ($filter["rules"] as $rule) {
+                        $feed_id = null;
+                        $cat_id = null;
 
-						if ($rule["match"]) {
+                        if ($rule["match"]) {
 
                             $match_on = [];
 
-						    foreach ($rule["match"] as $match) {
-						        list ($name, $is_cat, $is_id) = $match;
+                            foreach ($rule["match"] as $match) {
+                                list ($name, $is_cat, $is_id) = $match;
 
-						        if ($is_id) {
-						            array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
+                                if ($is_id) {
+                                    array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
                                 } else {
 
                                     if (!$is_cat) {
@@ -421,18 +421,18 @@ 
                                         if ($row = $tsth->fetch()) {
                                             $match_id = $row['id'];
 
-											array_push($match_on, $match_id);
+                                            array_push($match_on, $match_id);
                                         }
                                     } else {
                                         $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
                                     		WHERE title = ? AND owner_uid = ?");
-										$tsth->execute([$name, $_SESSION['uid']]);
+                                        $tsth->execute([$name, $_SESSION['uid']]);
 
-										if ($row = $tsth->fetch()) {
-											$match_id = $row['id'];
+                                        if ($row = $tsth->fetch()) {
+                                            $match_id = $row['id'];
 
-											array_push($match_on, "CAT:$match_id");
-										}
+                                            array_push($match_on, "CAT:$match_id");
+                                        }
                                     }
                                 }
                             }
@@ -460,14 +460,14 @@ 
                                     $feed_id = $row['id'];
                                 }
                             } else {
-								$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
+                                $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
                                     WHERE title = ? AND owner_uid = ?");
 
-								$tsth->execute([$rule['feed'], $_SESSION['uid']]);
+                                $tsth->execute([$rule['feed'], $_SESSION['uid']]);
 
-								if ($row = $tsth->fetch()) {
-									$feed_id = $row['id'];
-								}
+                                if ($row = $tsth->fetch()) {
+                                    $feed_id = $row['id'];
+                                }
                             }
 
                             $cat_filter = bool_to_sql_bool($rule["cat_filter"]);
@@ -481,174 +481,174 @@ 
                                 (?, ?, ?, ?, ?, ?, ?)");
                             $usth->execute([$feed_id, $cat_id, $filter_id, $filter_type, $reg_exp, $cat_filter, $inverse]);
                         }
-					}
+                    }
 
-					foreach ($filter["actions"] as $action) {
+                    foreach ($filter["actions"] as $action) {
 
-						$action_id = (int)$action["action_id"];
-						$action_param = $action["action_param"];
+                        $action_id = (int)$action["action_id"];
+                        $action_param = $action["action_param"];
 
-						$usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_actions
+                        $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_actions
 							(filter_id,action_id,action_param)
 							VALUES
 							(?, ?, ?)");
-						$usth->execute([$filter_id, $action_id, $action_param]);
-					}
-				}
-			}
-		}
-	}
-
-	private function opml_import_category($doc, $root_node, $owner_uid, $parent_id) {
-		$default_cat_id = (int) $this->get_feed_category('Imported feeds', false);
-
-		if ($root_node) {
-			$cat_title = mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250);
-
-			if (!$cat_title)
-				$cat_title = mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250);
-
-			if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
-				$cat_id = $this->get_feed_category($cat_title, $parent_id);
-
-				if ($cat_id === false) {
-					$order_id = (int) $root_node->attributes->getNamedItem('ttrssSortOrder')->nodeValue;
-					if (!$order_id) $order_id = 0;
-
-					Feeds::add_feed_category($cat_title, $parent_id, $order_id);
-					$cat_id = $this->get_feed_category($cat_title, $parent_id);
-				}
-
-			} else {
-				$cat_id = 0;
-			}
-
-			$outlines = $root_node->childNodes;
-
-		} else {
-			$xpath = new DOMXpath($doc);
-			$outlines = $xpath->query("//opml/body/outline");
-
-			$cat_id = 0;
-		}
-
-		#$this->opml_notice("[CAT] $cat_title id: $cat_id P_id: $parent_id");
-		$this->opml_notice(T_sprintf("Processing category: %s", $cat_title ? $cat_title : __("Uncategorized")));
-
-		foreach ($outlines as $node) {
-			if ($node->hasAttributes() && strtolower($node->tagName) == "outline") {
-				$attrs = $node->attributes;
-				$node_cat_title = $attrs->getNamedItem('text')->nodeValue;
-
-				if (!$node_cat_title)
-					$node_cat_title = $attrs->getNamedItem('title')->nodeValue;
-
-				$node_feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
-
-				if ($node_cat_title && !$node_feed_url) {
-					$this->opml_import_category($doc, $node, $owner_uid, $cat_id);
-				} else {
-
-					if (!$cat_id) {
-						$dst_cat_id = $default_cat_id;
-					} else {
-						$dst_cat_id = $cat_id;
-					}
-
-					switch ($cat_title) {
-					case "tt-rss-prefs":
-						$this->opml_import_preference($node);
-						break;
-					case "tt-rss-labels":
-						$this->opml_import_label($node, $owner_uid);
-						break;
-					case "tt-rss-filters":
-						$this->opml_import_filter($node);
-						break;
-					default:
-						$this->opml_import_feed($node, $dst_cat_id, $owner_uid);
-					}
-				}
-			}
-		}
-	}
-
-	public function opml_import($owner_uid) {
-		if (!$owner_uid) return;
-
-		$doc = false;
-
-		if ($_FILES['opml_file']['error'] != 0) {
-			print_error(T_sprintf("Upload failed with error code %d",
-				$_FILES['opml_file']['error']));
-			return;
-		}
-
-		if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'opml');
-
-			$result = move_uploaded_file($_FILES['opml_file']['tmp_name'],
-				$tmp_file);
-
-			if (!$result) {
-				print_error(__("Unable to move uploaded file."));
-				return;
-			}
-		} else {
-			print_error(__('Error: please upload OPML file.'));
-			return;
-		}
-
-		if (is_file($tmp_file)) {
-			$doc = new DOMDocument();
-			libxml_disable_entity_loader(false);
-			$doc->load($tmp_file);
-			libxml_disable_entity_loader(true);
-			unlink($tmp_file);
-		} else if (!$doc) {
-			print_error(__('Error: unable to find moved OPML file.'));
-			return;
-		}
-
-		if ($doc) {
-			$this->pdo->beginTransaction();
-			$this->opml_import_category($doc, false, $owner_uid, false);
-			$this->pdo->commit();
-		} else {
-			print_error(__('Error while parsing document.'));
-		}
-	}
-
-	private function opml_notice($msg) {
-		print "$msg<br/>";
-	}
-
-	public static function opml_publish_url(){
-
-		$url_path = get_self_url_prefix();
-		$url_path .= "/opml.php?op=publish&key=" .
-			Feeds::get_feed_access_key('OPML:Publish', false, $_SESSION["uid"]);
-
-		return $url_path;
-	}
-
-	public function get_feed_category($feed_cat, $parent_cat_id = false) {
-
-		$parent_cat_id = (int) $parent_cat_id;
-
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
+                        $usth->execute([$filter_id, $action_id, $action_param]);
+                    }
+                }
+            }
+        }
+    }
+
+    private function opml_import_category($doc, $root_node, $owner_uid, $parent_id) {
+        $default_cat_id = (int) $this->get_feed_category('Imported feeds', false);
+
+        if ($root_node) {
+            $cat_title = mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250);
+
+            if (!$cat_title)
+                $cat_title = mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250);
+
+            if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
+                $cat_id = $this->get_feed_category($cat_title, $parent_id);
+
+                if ($cat_id === false) {
+                    $order_id = (int) $root_node->attributes->getNamedItem('ttrssSortOrder')->nodeValue;
+                    if (!$order_id) $order_id = 0;
+
+                    Feeds::add_feed_category($cat_title, $parent_id, $order_id);
+                    $cat_id = $this->get_feed_category($cat_title, $parent_id);
+                }
+
+            } else {
+                $cat_id = 0;
+            }
+
+            $outlines = $root_node->childNodes;
+
+        } else {
+            $xpath = new DOMXpath($doc);
+            $outlines = $xpath->query("//opml/body/outline");
+
+            $cat_id = 0;
+        }
+
+        #$this->opml_notice("[CAT] $cat_title id: $cat_id P_id: $parent_id");
+        $this->opml_notice(T_sprintf("Processing category: %s", $cat_title ? $cat_title : __("Uncategorized")));
+
+        foreach ($outlines as $node) {
+            if ($node->hasAttributes() && strtolower($node->tagName) == "outline") {
+                $attrs = $node->attributes;
+                $node_cat_title = $attrs->getNamedItem('text')->nodeValue;
+
+                if (!$node_cat_title)
+                    $node_cat_title = $attrs->getNamedItem('title')->nodeValue;
+
+                $node_feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
+
+                if ($node_cat_title && !$node_feed_url) {
+                    $this->opml_import_category($doc, $node, $owner_uid, $cat_id);
+                } else {
+
+                    if (!$cat_id) {
+                        $dst_cat_id = $default_cat_id;
+                    } else {
+                        $dst_cat_id = $cat_id;
+                    }
+
+                    switch ($cat_title) {
+                    case "tt-rss-prefs":
+                        $this->opml_import_preference($node);
+                        break;
+                    case "tt-rss-labels":
+                        $this->opml_import_label($node, $owner_uid);
+                        break;
+                    case "tt-rss-filters":
+                        $this->opml_import_filter($node);
+                        break;
+                    default:
+                        $this->opml_import_feed($node, $dst_cat_id, $owner_uid);
+                    }
+                }
+            }
+        }
+    }
+
+    public function opml_import($owner_uid) {
+        if (!$owner_uid) return;
+
+        $doc = false;
+
+        if ($_FILES['opml_file']['error'] != 0) {
+            print_error(T_sprintf("Upload failed with error code %d",
+                $_FILES['opml_file']['error']));
+            return;
+        }
+
+        if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) {
+            $tmp_file = tempnam(CACHE_DIR . '/upload', 'opml');
+
+            $result = move_uploaded_file($_FILES['opml_file']['tmp_name'],
+                $tmp_file);
+
+            if (!$result) {
+                print_error(__("Unable to move uploaded file."));
+                return;
+            }
+        } else {
+            print_error(__('Error: please upload OPML file.'));
+            return;
+        }
+
+        if (is_file($tmp_file)) {
+            $doc = new DOMDocument();
+            libxml_disable_entity_loader(false);
+            $doc->load($tmp_file);
+            libxml_disable_entity_loader(true);
+            unlink($tmp_file);
+        } else if (!$doc) {
+            print_error(__('Error: unable to find moved OPML file.'));
+            return;
+        }
+
+        if ($doc) {
+            $this->pdo->beginTransaction();
+            $this->opml_import_category($doc, false, $owner_uid, false);
+            $this->pdo->commit();
+        } else {
+            print_error(__('Error while parsing document.'));
+        }
+    }
+
+    private function opml_notice($msg) {
+        print "$msg<br/>";
+    }
+
+    public static function opml_publish_url(){
+
+        $url_path = get_self_url_prefix();
+        $url_path .= "/opml.php?op=publish&key=" .
+            Feeds::get_feed_access_key('OPML:Publish', false, $_SESSION["uid"]);
+
+        return $url_path;
+    }
+
+    public function get_feed_category($feed_cat, $parent_cat_id = false) {
+
+        $parent_cat_id = (int) $parent_cat_id;
+
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
 			WHERE title = :title
 			AND (parent_cat = :parent OR (:parent = 0 AND parent_cat IS NULL))
 			AND owner_uid = :uid");
 
-		$sth->execute([':title' => $feed_cat, ':parent' => $parent_cat_id, ':uid' => $_SESSION['uid']]);
+        $sth->execute([':title' => $feed_cat, ':parent' => $parent_cat_id, ':uid' => $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			return $row['id'];
-		} else {
-			return false;
-		}
-	}
+        if ($row = $sth->fetch()) {
+            return $row['id'];
+        } else {
+            return false;
+        }
+    }
 
 
 }

Braces +47 added lines, -21 removed lines

@@ -52,10 +52,11 @@ 
 
 		$cat_id = (int) $cat_id;
 
-		if ($hide_private_feeds)
-			$hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
-		else
-			$hide_qpart = "true";
+		if ($hide_private_feeds) {
+					$hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
+		} else {
+					$hide_qpart = "true";
+		}
 
 		$out = "";
 
@@ -77,7 +78,9 @@ 
 			$cat_title = "";
 		}
 
-		if ($cat_title) $out .= "<outline text=\"$cat_title\" $ttrss_specific_qpart>\n";
+		if ($cat_title) {
+		    $out .= "<outline text=\"$cat_title\" $ttrss_specific_qpart>\n";
+		}
 
 		$sth = $this->pdo->prepare("SELECT id,title
 			FROM ttrss_feed_categories WHERE
@@ -120,13 +123,17 @@ 
 			$out .= "<outline type=\"rss\" text=\"$title\" xmlUrl=\"$url\" $ttrss_specific_qpart $html_url_qpart/>\n";
 		}
 
-		if ($cat_title) $out .= "</outline>\n";
+		if ($cat_title) {
+		    $out .= "</outline>\n";
+		}
 
 		return $out;
 	}
 
 	public function opml_export($name, $owner_uid, $hide_private_feeds = false, $include_settings = true) {
-		if (!$owner_uid) return;
+		if (!$owner_uid) {
+		    return;
+		}
 
 		if (!isset($_REQUEST["debug"])) {
 			header("Content-type: application/xml+opml");
@@ -275,8 +282,9 @@ 
 
 		// cleanup empty categories
 		foreach ($outlines as $node) {
-			if ($node->getElementsByTagName('outline')->length == 0)
-				$node->parentNode->removeChild($node);
+			if ($node->getElementsByTagName('outline')->length == 0) {
+							$node->parentNode->removeChild($node);
+			}
 		}
 
 		$res = $doc->saveXML();
@@ -297,10 +305,14 @@ 
 		$attrs = $node->attributes;
 
 		$feed_title = mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250);
-		if (!$feed_title) $feed_title = mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250);
+		if (!$feed_title) {
+		    $feed_title = mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250);
+		}
 
 		$feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
-		if (!$feed_url) $feed_url = $attrs->getNamedItem('xmlURL')->nodeValue;
+		if (!$feed_url) {
+		    $feed_url = $attrs->getNamedItem('xmlURL')->nodeValue;
+		}
 
 		$site_url = mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250);
 
@@ -309,19 +321,27 @@ 
 				feed_url = ? AND owner_uid = ?");
 			$sth->execute([$feed_url, $owner_uid]);
 
-			if (!$feed_title) $feed_title = '[Unknown]';
+			if (!$feed_title) {
+			    $feed_title = '[Unknown]';
+			}
 
 			if (!$sth->fetch()) {
 				#$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
 				$this->opml_notice(T_sprintf("Adding feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
 
-				if (!$cat_id) $cat_id = null;
+				if (!$cat_id) {
+				    $cat_id = null;
+				}
 
 				$update_interval = (int) $attrs->getNamedItem('ttrssUpdateInterval')->nodeValue;
-				if (!$update_interval) $update_interval = 0;
+				if (!$update_interval) {
+				    $update_interval = 0;
+				}
 
 				$order_id = (int) $attrs->getNamedItem('ttrssSortOrder')->nodeValue;
-				if (!$order_id) $order_id = 0;
+				if (!$order_id) {
+				    $order_id = 0;
+				}
 
 				$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 					(title, feed_url, owner_uid, cat_id, site_url, order_id, update_interval) VALUES
@@ -505,15 +525,18 @@ 
 		if ($root_node) {
 			$cat_title = mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250);
 
-			if (!$cat_title)
-				$cat_title = mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250);
+			if (!$cat_title) {
+							$cat_title = mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250);
+			}
 
 			if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
 				$cat_id = $this->get_feed_category($cat_title, $parent_id);
 
 				if ($cat_id === false) {
 					$order_id = (int) $root_node->attributes->getNamedItem('ttrssSortOrder')->nodeValue;
-					if (!$order_id) $order_id = 0;
+					if (!$order_id) {
+					    $order_id = 0;
+					}
 
 					Feeds::add_feed_category($cat_title, $parent_id, $order_id);
 					$cat_id = $this->get_feed_category($cat_title, $parent_id);
@@ -540,8 +563,9 @@ 
 				$attrs = $node->attributes;
 				$node_cat_title = $attrs->getNamedItem('text')->nodeValue;
 
-				if (!$node_cat_title)
-					$node_cat_title = $attrs->getNamedItem('title')->nodeValue;
+				if (!$node_cat_title) {
+									$node_cat_title = $attrs->getNamedItem('title')->nodeValue;
+				}
 
 				$node_feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
 
@@ -574,7 +598,9 @@ 
 	}
 
 	public function opml_import($owner_uid) {
-		if (!$owner_uid) return;
+		if (!$owner_uid) {
+		    return;
+		}
 
 		$doc = false;
 

include/colors.php

Spacing +28 added lines, -28 removed lines

@@ -183,7 +183,7 @@ 
 ### HSL >> RGB
 function _color_hsl2rgb($hsl) {
     $h = $hsl[0]; $s = $hsl[1]; $l = $hsl[2];
-    $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
+    $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l * $s;
     $m1 = $l * 2 - $m2;
     return array(_color_hue2rgb($m1, $m2, $h + 0.33333),
         _color_hue2rgb($m1, $m2, $h),
@@ -208,7 +208,7 @@ 
         $hex = substr($hex, 1);
 
     if (strlen($hex) == 4) {
-        $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
+        $hex = $hex[1].$hex[1].$hex[2].$hex[2].$hex[3].$hex[3];
     }
     $c = hexdec($hex);
     for ($i = 16; $i >= 0; $i -= 8) {
@@ -220,7 +220,7 @@ 
 function _color_pack($rgb, $normalize = false) {
     foreach ($rgb as $k => $v) {
         $out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8));
-    }return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
+    }return '#'.str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
 }
 
 function rgb2hsl($arr) {
@@ -244,13 +244,13 @@ 
     } else {
         $s = $del_Max / $var_Max;
 
-        $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-        $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-        $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+        $del_R = ((($var_Max - $var_R) / 6) + ($del_Max / 2)) / $del_Max;
+        $del_G = ((($var_Max - $var_G) / 6) + ($del_Max / 2)) / $del_Max;
+        $del_B = ((($var_Max - $var_B) / 6) + ($del_Max / 2)) / $del_Max;
 
-        if      ($var_R == $var_Max) $h = $del_B - $del_G;
-        else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
-        else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
+        if ($var_R == $var_Max) $h = $del_B - $del_G;
+        else if ($var_G == $var_Max) $h = (1 / 3) + $del_R - $del_B;
+        else if ($var_B == $var_Max) $h = (2 / 3) + $del_G - $del_R;
 
         if ($h < 0) $h++;
         if ($h > 1) $h--;
@@ -264,21 +264,21 @@ 
     $s = $arr[1];
     $v = $arr[2];
 
-    if($s == 0) {
+    if ($s == 0) {
         $r = $g = $B = $v * 255;
     } else {
         $var_H = $h * 6;
-        $var_i = floor($var_H );
-        $var_1 = $v * (1 - $s );
-        $var_2 = $v * (1 - $s * ($var_H - $var_i ) );
-        $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
-
-        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
-        else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
-        else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
-        else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
-        else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
-        else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+        $var_i = floor($var_H);
+        $var_1 = $v * (1 - $s);
+        $var_2 = $v * (1 - $s * ($var_H - $var_i));
+        $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i)));
+
+        if ($var_i == 0) { $var_R = $v; $var_G = $var_3; $var_B = $var_1; }
+        else if ($var_i == 1) { $var_R = $var_2; $var_G = $v; $var_B = $var_1; }
+        else if ($var_i == 2) { $var_R = $var_1; $var_G = $v; $var_B = $var_3; }
+        else if ($var_i == 3) { $var_R = $var_1; $var_G = $var_2; $var_B = $v; }
+        else if ($var_i == 4) { $var_R = $var_3; $var_G = $var_1; $var_B = $v; }
+        else { $var_R = $v; $var_G = $var_1; $var_B = $var_2; }
 
         $r = $var_R * 255;
         $g = $var_G * 255;
@@ -288,7 +288,7 @@ 
 }
 
 function colorPalette($imageFile, $numColors, $granularity = 5) {
-    $granularity = max(1, abs((int)$granularity));
+    $granularity = max(1, abs((int) $granularity));
     $colors = array();
 
     $size = @getimagesize($imageFile);
@@ -301,10 +301,10 @@ 
             $ico = new floIcon();
             @$ico->readICO($imageFile);
 
-            if(count($ico->images)==0)
+            if (count($ico->images) == 0)
                 return false;
             else
-                $img = @$ico->images[count($ico->images)-1]->getImageResource();
+                $img = @$ico->images[count($ico->images) - 1]->getImageResource();
 
         } else {
             return false;
@@ -316,17 +316,17 @@ 
 
     if (!$img) return false;
 
-    for($x = 0; $x < $size[0]; $x += $granularity) {
-        for($y = 0; $y < $size[1]; $y += $granularity) {
+    for ($x = 0; $x < $size[0]; $x += $granularity) {
+        for ($y = 0; $y < $size[1]; $y += $granularity) {
             $thisColor = imagecolorat($img, $x, $y);
             $rgb = imagecolorsforindex($img, $thisColor);
             $red = round(round(($rgb['red'] / 0x33)) * 0x33);
             $green = round(round(($rgb['green'] / 0x33)) * 0x33);
             $blue = round(round(($rgb['blue'] / 0x33)) * 0x33);
             $thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue);
-            if(array_key_exists($thisRGB, $colors)) {
+            if (array_key_exists($thisRGB, $colors)) {
                 $colors[$thisRGB]++;
-            } else{
+            } else {
                 $colors[$thisRGB] = 1;
             }
         }

Braces +51 added lines, -31 removed lines

@@ -157,11 +157,12 @@ 
 
     $color = strtolower($color);
 
-    if (isset($htmlcolors[$color]))
-        return $htmlcolors[$color];
-    else
-        return $color;
-}
+    if (isset($htmlcolors[$color])) {
+            return $htmlcolors[$color];
+    } else {
+            return $color;
+    }
+    }
 
 ### RGB >> HSL
 function _color_rgb2hsl($rgb) {
@@ -173,9 +174,15 @@ 
     }
     $h = 0;
     if ($delta > 0) {
-        if ($max == $r && $max != $g) $h += ($g - $b) / $delta;
-        if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta);
-        if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta);
+        if ($max == $r && $max != $g) {
+            $h += ($g - $b) / $delta;
+        }
+        if ($max == $g && $max != $b) {
+            $h += (2 + ($b - $r) / $delta);
+        }
+        if ($max == $b && $max != $r) {
+            $h += (4 + ($r - $g) / $delta);
+        }
         $h /= 6;
     } return array($h, $s, $l);
 }
@@ -193,19 +200,26 @@ 
 ### Helper function for _color_hsl2rgb().
 function _color_hue2rgb($m1, $m2, $h) {
     $h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
-    if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
-    if ($h * 2 < 1) return $m2;
-    if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+    if ($h * 6 < 1) {
+        return $m1 + ($m2 - $m1) * $h * 6;
+    }
+    if ($h * 2 < 1) {
+        return $m2;
+    }
+    if ($h * 3 < 2) {
+        return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+    }
     return $m1;
 }
 
 ### Convert a hex color into an RGB triplet.
 function _color_unpack($hex, $normalize = false) {
 
-    if (strpos($hex, '#') !== 0)
-        $hex = _resolve_htmlcolor($hex);
-    else
-        $hex = substr($hex, 1);
+    if (strpos($hex, '#') !== 0) {
+            $hex = _resolve_htmlcolor($hex);
+    } else {
+            $hex = substr($hex, 1);
+    }
 
     if (strlen($hex) == 4) {
         $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
@@ -248,12 +262,20 @@ 
         $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
         $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
 
-        if      ($var_R == $var_Max) $h = $del_B - $del_G;
-        else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
-        else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
+        if      ($var_R == $var_Max) {
+            $h = $del_B - $del_G;
+        } else if ($var_G == $var_Max) {
+            $h = (1 / 3 ) + $del_R - $del_B;
+        } else if ($var_B == $var_Max) {
+            $h = (2 / 3 ) + $del_G - $del_R;
+        }
 
-        if ($h < 0) $h++;
-        if ($h > 1) $h--;
+        if ($h < 0) {
+            $h++;
+        }
+        if ($h > 1) {
+            $h--;
+        }
     }
 
     return array($h, $s, $v);
@@ -273,12 +295,7 @@ 
         $var_2 = $v * (1 - $s * ($var_H - $var_i ) );
         $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
 
-        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
-        else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
-        else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
-        else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
-        else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
-        else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; } else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; } else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; } else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; } else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; } else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
 
         $r = $var_R * 255;
         $g = $var_G * 255;
@@ -301,10 +318,11 @@ 
             $ico = new floIcon();
             @$ico->readICO($imageFile);
 
-            if(count($ico->images)==0)
-                return false;
-            else
-                $img = @$ico->images[count($ico->images)-1]->getImageResource();
+            if(count($ico->images)==0) {
+                            return false;
+            } else {
+                            $img = @$ico->images[count($ico->images)-1]->getImageResource();
+            }
 
         } else {
             return false;
@@ -314,7 +332,9 @@ 
         $img = @imagecreatefromstring(file_get_contents($imageFile));
     }
 
-    if (!$img) return false;
+    if (!$img) {
+        return false;
+    }
 
     for($x = 0; $x < $size[0]; $x += $granularity) {
         for($y = 0; $y < $size[1]; $y += $granularity) {

include/sessions.php

Spacing +6 added lines, -6 removed lines

@@ -78,11 +78,11 @@ 
     return true;
 }
 
-function ttrss_open () {
+function ttrss_open() {
     return true;
 }
 
-function ttrss_read ($id){
+function ttrss_read($id) {
     global $session_expire;
 
     $sth = Db::pdo()->prepare("SELECT data FROM ttrss_sessions WHERE id=?");
@@ -101,7 +101,7 @@ 
     }
 }
 
-function ttrss_write ($id, $data) {
+function ttrss_write($id, $data) {
     global $session_expire;
 
     $data = base64_encode($data);
@@ -121,7 +121,7 @@ 
     return true;
 }
 
-function ttrss_close () {
+function ttrss_close() {
     return true;
 }
 
@@ -132,8 +132,8 @@ 
     return true;
 }
 
-function ttrss_gc () {
-    Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
+function ttrss_gc() {
+    Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < ".time());
 
     return true;
 }

Indentation +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
             __("Session failed to validate (schema version changed)");
         return false;
     }
-      $pdo = Db::pdo();
+        $pdo = Db::pdo();
 
     if ($_SESSION["uid"]) {
 
@@ -56,21 +56,21 @@ 
 
         // user not found
         if ($row = $sth->fetch()) {
-                 $pwd_hash = $row["pwd_hash"];
+                    $pwd_hash = $row["pwd_hash"];
 
-                 if ($pwd_hash != $_SESSION["pwd_hash"]) {
+                    if ($pwd_hash != $_SESSION["pwd_hash"]) {
 
-                      $_SESSION["login_error_msg"] =
+                        $_SESSION["login_error_msg"] =
                             __("Session failed to validate (password changed)");
 
-                      return false;
-                 }
+                        return false;
+                    }
         } else {
 
-                 $_SESSION["login_error_msg"] =
-                      __("Session failed to validate (user not found)");
+                    $_SESSION["login_error_msg"] =
+                        __("Session failed to validate (user not found)");
 
-                 return false;
+                    return false;
 
         }
     }

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 }
 
 function validate_session() {
-    if (SINGLE_USER_MODE) return true;
+    if (SINGLE_USER_MODE) {
+        return true;
+    }
 
     if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) {
         $_SESSION["login_error_msg"] =

plugins/nsfw/init.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	}
 
 	public function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/init.js");
+		return file_get_contents(dirname(__FILE__)."/init.js");
 	}
 
 	public function hook_render_article($article) {

Indentation +62 added lines, -62 removed lines

@@ -1,64 +1,64 @@ 
 <?php
 class NSFW extends Plugin {
-	private $host;
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Hide article content based on tags",
-			"fox",
-			false);
-	}
+    public function about() {
+        return array(1.0,
+            "Hide article content based on tags",
+            "fox",
+            false);
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public function init($host) {
+        $this->host = $host;
 
-		$host->add_hook($host::HOOK_RENDER_ARTICLE, $this);
-		$host->add_hook($host::HOOK_RENDER_ARTICLE_CDM, $this);
-		$host->add_hook($host::HOOK_PREFS_TAB, $this);
+        $host->add_hook($host::HOOK_RENDER_ARTICLE, $this);
+        $host->add_hook($host::HOOK_RENDER_ARTICLE_CDM, $this);
+        $host->add_hook($host::HOOK_PREFS_TAB, $this);
 
-	}
+    }
 
-	public function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/init.js");
-	}
+    public function get_js() {
+        return file_get_contents(dirname(__FILE__) . "/init.js");
+    }
 
-	public function hook_render_article($article) {
-		$tags = array_map("trim", explode(",", $this->host->get($this, "tags")));
-		$a_tags = array_map("trim", explode(",", $article["tag_cache"]));
+    public function hook_render_article($article) {
+        $tags = array_map("trim", explode(",", $this->host->get($this, "tags")));
+        $a_tags = array_map("trim", explode(",", $article["tag_cache"]));
 
-		if (count(array_intersect($tags, $a_tags)) > 0) {
-			$article["content"] = "<div class='nswf wrapper'><button onclick=\"nsfwShow(this)\">".__("Not work safe (click to toggle)")."</button>
+        if (count(array_intersect($tags, $a_tags)) > 0) {
+            $article["content"] = "<div class='nswf wrapper'><button onclick=\"nsfwShow(this)\">".__("Not work safe (click to toggle)")."</button>
 				<div class='nswf content' style='display : none'>".$article["content"]."</div></div>";
-		}
+        }
 
-		return $article;
-	}
+        return $article;
+    }
 
-	public function hook_render_article_cdm($article) {
-		$tags = array_map("trim", explode(",", $this->host->get($this, "tags")));
-		$a_tags = array_map("trim", explode(",", $article["tag_cache"]));
+    public function hook_render_article_cdm($article) {
+        $tags = array_map("trim", explode(",", $this->host->get($this, "tags")));
+        $a_tags = array_map("trim", explode(",", $article["tag_cache"]));
 
-		if (count(array_intersect($tags, $a_tags)) > 0) {
-			$article["content"] = "<div class='nswf wrapper'><button onclick=\"nsfwShow(this)\">".__("Not work safe (click to toggle)")."</button>
+        if (count(array_intersect($tags, $a_tags)) > 0) {
+            $article["content"] = "<div class='nswf wrapper'><button onclick=\"nsfwShow(this)\">".__("Not work safe (click to toggle)")."</button>
 				<div class='nswf content' style='display : none'>".$article["content"]."</div></div>";
-		}
+        }
 
-		return $article;
-	}
+        return $article;
+    }
 
-	public function hook_prefs_tab($args) {
-		if ($args != "prefPrefs") return;
+    public function hook_prefs_tab($args) {
+        if ($args != "prefPrefs") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>extension</i> ".__("NSFW Plugin")."\">";
 
-		print "<br/>";
+        print "<br/>";
 
-		$tags = $this->host->get($this, "tags");
+        $tags = $this->host->get($this, "tags");
 
-		print "<form dojoType=\"dijit.form.Form\">";
+        print "<form dojoType=\"dijit.form.Form\">";
 
-		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
+        print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 			evt.preventDefault();
 			if (this.validate()) {
 				new Ajax.Request('backend.php', {
@@ -71,38 +71,38 @@ 
 			}
 			</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "nsfw");
+            print_hidden("op", "pluginhandler");
+            print_hidden("method", "save");
+            print_hidden("plugin", "nsfw");
 
-			print "<table width=\"100%\" class=\"prefPrefsList\">";
+            print "<table width=\"100%\" class=\"prefPrefsList\">";
 
-			print "<tr><td width=\"40%\">".__("Tags to consider NSFW (comma-separated)")."</td>";
-			print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"tags\" value=\"$tags\"></td></tr>";
+            print "<tr><td width=\"40%\">".__("Tags to consider NSFW (comma-separated)")."</td>";
+            print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"tags\" value=\"$tags\"></td></tr>";
 
-			print "</table>";
+            print "</table>";
 
-			print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
-				__("Save")."</button>";
+            print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
+                __("Save")."</button>";
 
-			print "</form>";
+            print "</form>";
 
-			print "</div>"; #pane
-	}
+            print "</div>"; #pane
+    }
 
-	public function save() {
-		$tags = explode(",", $_POST["tags"]);
-		$tags = array_map("trim", $tags);
-		$tags = array_map("mb_strtolower", $tags);
-		$tags = join(", ", $tags);
+    public function save() {
+        $tags = explode(",", $_POST["tags"]);
+        $tags = array_map("trim", $tags);
+        $tags = array_map("mb_strtolower", $tags);
+        $tags = join(", ", $tags);
 
-		$this->host->set($this, "tags", $tags);
+        $this->host->set($this, "tags", $tags);
 
-		echo __("Configuration saved.");
-	}
+        echo __("Configuration saved.");
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
 	}
 
 	public function hook_prefs_tab($args) {
-		if ($args != "prefPrefs") return;
+		if ($args != "prefPrefs") {
+		    return;
+		}
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>extension</i> ".__("NSFW Plugin")."\">";

plugins/auth_remote/init.php

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 	}
 
 	/* @var PluginHost $host */
-	public function init($host ) {
+	public function init($host) {
 		$this->host = $host;
 		$this->base = new Auth_Base();
 
@@ -59,16 +59,16 @@ 
 				$_SESSION["hide_logout"] = true;
 
 				// LemonLDAP can send user informations via HTTP HEADER
-				if (defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE){
+				if (defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
 					// update user name
 					$fullname = $_SERVER['HTTP_USER_NAME'] ? $_SERVER['HTTP_USER_NAME'] : $_SERVER['AUTHENTICATE_CN'];
-					if ($fullname){
+					if ($fullname) {
 						$sth = $this->pdo->prepare("UPDATE ttrss_users SET full_name = ? WHERE id = ?");
 						$sth->execute([$fullname, $user_id]);
 					}
 					// update user mail
 					$email = $_SERVER['HTTP_USER_MAIL'] ? $_SERVER['HTTP_USER_MAIL'] : $_SERVER['AUTHENTICATE_MAIL'];
-					if ($email){
+					if ($email) {
 						$sth = $this->pdo->prepare("UPDATE ttrss_users SET email = ? WHERE id = ?");
 						$sth->execute([$email, $user_id]);
 					}

Indentation +81 added lines, -81 removed lines

@@ -1,88 +1,88 @@
 <?php
 class Auth_Remote extends Plugin implements IAuthModule {
 
-	private $host;
-	/* @var Auth_Base $base */
-	private $base;
-
-	public function about() {
-		return array(1.0,
-			"Authenticates against remote password (e.g. supplied by Apache)",
-			"fox",
-			true);
-	}
-
-	/* @var PluginHost $host */
-	public function init($host ) {
-		$this->host = $host;
-		$this->base = new Auth_Base();
-
-		$host->add_hook($host::HOOK_AUTH_USER, $this);
-	}
-
-	public function get_login_by_ssl_certificate() {
-		$cert_serial = get_ssl_certificate_id();
-
-		if ($cert_serial) {
-			$sth = $this->pdo->prepare("SELECT login FROM ttrss_user_prefs, ttrss_users
+    private $host;
+    /* @var Auth_Base $base */
+    private $base;
+
+    public function about() {
+        return array(1.0,
+            "Authenticates against remote password (e.g. supplied by Apache)",
+            "fox",
+            true);
+    }
+
+    /* @var PluginHost $host */
+    public function init($host ) {
+        $this->host = $host;
+        $this->base = new Auth_Base();
+
+        $host->add_hook($host::HOOK_AUTH_USER, $this);
+    }
+
+    public function get_login_by_ssl_certificate() {
+        $cert_serial = get_ssl_certificate_id();
+
+        if ($cert_serial) {
+            $sth = $this->pdo->prepare("SELECT login FROM ttrss_user_prefs, ttrss_users
 				WHERE pref_name = 'SSL_CERT_SERIAL' AND value = ? AND
 				owner_uid = ttrss_users.id");
-			$sth->execute([$cert_serial]);
-
-			if ($row = $sth->fetch()) {
-				return $row['login'];
-			}
-		}
-
-		return "";
-	}
-
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public function authenticate($login, $password) {
-		$try_login = $_SERVER["REMOTE_USER"];
-
-		// php-cgi
-		if (!$try_login) $try_login = $_SERVER["REDIRECT_REMOTE_USER"];
-		if (!$try_login) $try_login = $_SERVER["PHP_AUTH_USER"];
-
-		if (!$try_login) $try_login = $this->get_login_by_ssl_certificate();
-
-		if ($try_login) {
-			$user_id = $this->base->auto_create_user($try_login, $password);
-
-			if ($user_id) {
-				$_SESSION["fake_login"] = $try_login;
-				$_SESSION["fake_password"] = "******";
-				$_SESSION["hide_hello"] = true;
-				$_SESSION["hide_logout"] = true;
-
-				// LemonLDAP can send user informations via HTTP HEADER
-				if (defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE){
-					// update user name
-					$fullname = $_SERVER['HTTP_USER_NAME'] ? $_SERVER['HTTP_USER_NAME'] : $_SERVER['AUTHENTICATE_CN'];
-					if ($fullname){
-						$sth = $this->pdo->prepare("UPDATE ttrss_users SET full_name = ? WHERE id = ?");
-						$sth->execute([$fullname, $user_id]);
-					}
-					// update user mail
-					$email = $_SERVER['HTTP_USER_MAIL'] ? $_SERVER['HTTP_USER_MAIL'] : $_SERVER['AUTHENTICATE_MAIL'];
-					if ($email){
-						$sth = $this->pdo->prepare("UPDATE ttrss_users SET email = ? WHERE id = ?");
-						$sth->execute([$email, $user_id]);
-					}
-				}
-
-				return $user_id;
-			}
-		}
-
-		return false;
-	}
-
-	public function api_version() {
-		return 2;
-	}
+            $sth->execute([$cert_serial]);
+
+            if ($row = $sth->fetch()) {
+                return $row['login'];
+            }
+        }
+
+        return "";
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function authenticate($login, $password) {
+        $try_login = $_SERVER["REMOTE_USER"];
+
+        // php-cgi
+        if (!$try_login) $try_login = $_SERVER["REDIRECT_REMOTE_USER"];
+        if (!$try_login) $try_login = $_SERVER["PHP_AUTH_USER"];
+
+        if (!$try_login) $try_login = $this->get_login_by_ssl_certificate();
+
+        if ($try_login) {
+            $user_id = $this->base->auto_create_user($try_login, $password);
+
+            if ($user_id) {
+                $_SESSION["fake_login"] = $try_login;
+                $_SESSION["fake_password"] = "******";
+                $_SESSION["hide_hello"] = true;
+                $_SESSION["hide_logout"] = true;
+
+                // LemonLDAP can send user informations via HTTP HEADER
+                if (defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE){
+                    // update user name
+                    $fullname = $_SERVER['HTTP_USER_NAME'] ? $_SERVER['HTTP_USER_NAME'] : $_SERVER['AUTHENTICATE_CN'];
+                    if ($fullname){
+                        $sth = $this->pdo->prepare("UPDATE ttrss_users SET full_name = ? WHERE id = ?");
+                        $sth->execute([$fullname, $user_id]);
+                    }
+                    // update user mail
+                    $email = $_SERVER['HTTP_USER_MAIL'] ? $_SERVER['HTTP_USER_MAIL'] : $_SERVER['AUTHENTICATE_MAIL'];
+                    if ($email){
+                        $sth = $this->pdo->prepare("UPDATE ttrss_users SET email = ? WHERE id = ?");
+                        $sth->execute([$email, $user_id]);
+                    }
+                }
+
+                return $user_id;
+            }
+        }
+
+        return false;
+    }
+
+    public function api_version() {
+        return 2;
+    }
 
 }

Braces +9 added lines, -3 removed lines

@@ -44,10 +44,16 @@
 		$try_login = $_SERVER["REMOTE_USER"];
 
 		// php-cgi
-		if (!$try_login) $try_login = $_SERVER["REDIRECT_REMOTE_USER"];
-		if (!$try_login) $try_login = $_SERVER["PHP_AUTH_USER"];
+		if (!$try_login) {
+		    $try_login = $_SERVER["REDIRECT_REMOTE_USER"];
+		}
+		if (!$try_login) {
+		    $try_login = $_SERVER["PHP_AUTH_USER"];
+		}
 
-		if (!$try_login) $try_login = $this->get_login_by_ssl_certificate();
+		if (!$try_login) {
+		    $try_login = $this->get_login_by_ssl_certificate();
+		}
 
 		if ($try_login) {
 			$user_id = $this->base->auto_create_user($try_login, $password);

plugins/bookmarklets/init.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>bookmark</i> ".__('Bookmarklets')."\">";
 
-		print "<h3>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</h3>";
+		print "<h3>".__("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.")."</h3>";
 
 		$bm_subscribe_url = str_replace('%s', '', Pref_Feeds::subscribe_to_feed_url());
 
@@ -31,14 +31,14 @@ 
 		$bm_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+window.location.href}");
 
 		print "<p><label class='dijitButton'>";
-		print "<a href=\"$bm_url\">" . __('Subscribe in Tiny Tiny RSS'). "</a>";
+		print "<a href=\"$bm_url\">".__('Subscribe in Tiny Tiny RSS')."</a>";
 		print "</label></p>";
 
-		print "<h3>" . __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") . "</h3>";
+		print "<h3>".__("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS")."</h3>";
 
 		print "<label class='dijitButton'>";
 		$bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
-		print "<a href=\"$bm_url\">" . __('Share with Tiny Tiny RSS'). "</a>";
+		print "<a href=\"$bm_url\">".__('Share with Tiny Tiny RSS')."</a>";
 		print "</label>";
 
 		print "<button dojoType='dijit.form.Button' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/ShareAnything\")'>

Indentation +30 added lines, -30 removed lines

@@ -1,56 +1,56 @@
 <?php
 class Bookmarklets extends Plugin {
-  private $host;
+    private $host;
 
-  function about() {
+    function about() {
     return array(1.0,
-		 "Easy feed subscription and web page sharing using bookmarklets",
-		 "fox",
-	     false,
-		 "https://git.tt-rss.org/fox/tt-rss/wiki/ShareAnything");
-  }
+            "Easy feed subscription and web page sharing using bookmarklets",
+            "fox",
+            false,
+            "https://git.tt-rss.org/fox/tt-rss/wiki/ShareAnything");
+    }
 
-  function init($host) {
+    function init($host) {
     $this->host = $host;
 
     $host->add_hook($host::HOOK_PREFS_TAB, $this);
-  }
+    }
 
-  function hook_prefs_tab($args) {
+    function hook_prefs_tab($args) {
     if ($args == "prefFeeds") {
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>bookmark</i> ".__('Bookmarklets')."\">";
 
-		print "<h3>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</h3>";
+        print "<h3>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</h3>";
 
-		$bm_subscribe_url = str_replace('%s', '', Pref_Feeds::subscribe_to_feed_url());
+        $bm_subscribe_url = str_replace('%s', '', Pref_Feeds::subscribe_to_feed_url());
 
-		$confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?'));
+        $confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?'));
 
-		$bm_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+window.location.href}");
+        $bm_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+window.location.href}");
 
-		print "<p><label class='dijitButton'>";
-		print "<a href=\"$bm_url\">" . __('Subscribe in Tiny Tiny RSS'). "</a>";
-		print "</label></p>";
+        print "<p><label class='dijitButton'>";
+        print "<a href=\"$bm_url\">" . __('Subscribe in Tiny Tiny RSS'). "</a>";
+        print "</label></p>";
 
-		print "<h3>" . __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") . "</h3>";
+        print "<h3>" . __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") . "</h3>";
 
-		print "<label class='dijitButton'>";
-		$bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
-		print "<a href=\"$bm_url\">" . __('Share with Tiny Tiny RSS'). "</a>";
-		print "</label>";
+        print "<label class='dijitButton'>";
+        $bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
+        print "<a href=\"$bm_url\">" . __('Share with Tiny Tiny RSS'). "</a>";
+        print "</label>";
 
-		print "<button dojoType='dijit.form.Button' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/ShareAnything\")'>
+        print "<button dojoType='dijit.form.Button' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/ShareAnything\")'>
 					<i class='material-icons'>help</i> ".__("More info...")."</button>";
 
-		print "</div>"; #pane
+        print "</div>"; #pane
 
-	 }
-  }
+        }
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

plugins/note/init.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	}
 
 	public function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/note.js");
+		return file_get_contents(dirname(__FILE__)."/note.js");
 	}
 
 

Indentation +46 added lines, -46 removed lines

@@ -1,78 +1,78 @@
 <?php
 class Note extends Plugin {
 
-	/* @var PluginHost $host */
-	private $host;
+    /* @var PluginHost $host */
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Adds support for setting article notes",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Adds support for setting article notes",
+            "fox");
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public function init($host) {
+        $this->host = $host;
 
-		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
-	}
+        $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+    }
 
-	public function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/note.js");
-	}
+    public function get_js() {
+        return file_get_contents(dirname(__FILE__) . "/note.js");
+    }
 
 
-	public function hook_article_button($line) {
-		return "<i class='material-icons' onclick=\"Plugins.Note.edit(".$line["id"].")\"
+    public function hook_article_button($line) {
+        return "<i class='material-icons' onclick=\"Plugins.Note.edit(".$line["id"].")\"
 			style='cursor : pointer' title='".__('Edit article note')."'>note</i>";
-	}
+    }
 
-	public function edit() {
-		$param = $_REQUEST['param'];
+    public function edit() {
+        $param = $_REQUEST['param'];
 
-		$sth = $this->pdo->prepare("SELECT note FROM ttrss_user_entries WHERE
+        $sth = $this->pdo->prepare("SELECT note FROM ttrss_user_entries WHERE
 			ref_id = ? AND owner_uid = ?");
-		$sth->execute([$param, $_SESSION['uid']]);
+        $sth->execute([$param, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			$note = $row['note'];
+            $note = $row['note'];
 
-			print_hidden("id", "$param");
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "setNote");
-			print_hidden("plugin", "note");
+            print_hidden("id", "$param");
+            print_hidden("op", "pluginhandler");
+            print_hidden("method", "setNote");
+            print_hidden("plugin", "note");
 
-			print "<textarea dojoType='dijit.form.SimpleTextarea'
+            print "<textarea dojoType='dijit.form.SimpleTextarea'
 				style='font-size : 12px; width : 98%; height: 100px;'
 				name='note'>$note</textarea>";
 
-		}
+        }
 
-		print "<footer class='text-center'>";
-		print "<button dojoType=\"dijit.form.Button\"
+        print "<footer class='text-center'>";
+        print "<button dojoType=\"dijit.form.Button\"
 			onclick=\"dijit.byId('editNoteDlg').execute()\">".__('Save')."</button> ";
-		print "<button dojoType=\"dijit.form.Button\"
+        print "<button dojoType=\"dijit.form.Button\"
 			onclick=\"dijit.byId('editNoteDlg').hide()\">".__('Cancel')."</button>";
-		print "</footer>";
+        print "</footer>";
 
-	}
+    }
 
-	public function setNote() {
-		$id = $_REQUEST["id"];
-		$note = trim(strip_tags($_REQUEST["note"]));
+    public function setNote() {
+        $id = $_REQUEST["id"];
+        $note = trim(strip_tags($_REQUEST["note"]));
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET note = ?
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET note = ?
 			WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$note, $id, $_SESSION['uid']]);
+        $sth->execute([$note, $id, $_SESSION['uid']]);
 
-		$formatted_note = Article::format_article_note($id, $note);
+        $formatted_note = Article::format_article_note($id, $note);
 
-		print json_encode(array("note" => $formatted_note,
-				"raw_length" => mb_strlen($note)));
-	}
+        print json_encode(array("note" => $formatted_note,
+                "raw_length" => mb_strlen($note)));
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

plugins/no_title_counters/init.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	}
 
 	public function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	public function api_version() {

Indentation +15 added lines, -15 removed lines

@@ -1,24 +1,24 @@
 <?php
 class No_Title_Counters extends Plugin {
-	private $host;
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Remove counters from window title (prevents tab flashing on new articles)",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Remove counters from window title (prevents tab flashing on new articles)",
+            "fox");
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public function init($host) {
+        $this->host = $host;
 
-	}
+    }
 
-	public function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
-	}
+    public function get_js() {
+        return file_get_contents(__DIR__ . "/init.js");
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }