codysnider / tt-rss

classes/feeditem/common.php

Indentation +141 added lines, -141 removed lines

@@ -1,196 +1,196 @@
 <?php
 abstract class FeedItem_Common extends FeedItem {
-	protected $elem;
-	protected $xpath;
-	protected $doc;
+    protected $elem;
+    protected $xpath;
+    protected $doc;
 
-	public function __construct($elem, $doc, $xpath) {
-		$this->elem = $elem;
-		$this->xpath = $xpath;
-		$this->doc = $doc;
+    public function __construct($elem, $doc, $xpath) {
+        $this->elem = $elem;
+        $this->xpath = $xpath;
+        $this->doc = $doc;
 
-		try {
+        try {
 
-			$source = $elem->getElementsByTagName("source")->item(0);
+            $source = $elem->getElementsByTagName("source")->item(0);
 
-			// we don't need <source> element
-			if ($source)
-				$elem->removeChild($source);
-		} catch (DOMException $e) {
-			//
-		}
-	}
+            // we don't need <source> element
+            if ($source)
+                $elem->removeChild($source);
+        } catch (DOMException $e) {
+            //
+        }
+    }
 
-	public function get_element() {
-		return $this->elem;
-	}
+    public function get_element() {
+        return $this->elem;
+    }
 
-	public function get_author() {
-		$author = $this->elem->getElementsByTagName("author")->item(0);
+    public function get_author() {
+        $author = $this->elem->getElementsByTagName("author")->item(0);
 
-		if ($author) {
-			$name = $author->getElementsByTagName("name")->item(0);
+        if ($author) {
+            $name = $author->getElementsByTagName("name")->item(0);
 
-			if ($name) return clean($name->nodeValue);
+            if ($name) return clean($name->nodeValue);
 
-			$email = $author->getElementsByTagName("email")->item(0);
+            $email = $author->getElementsByTagName("email")->item(0);
 
-			if ($email) return clean($email->nodeValue);
+            if ($email) return clean($email->nodeValue);
 
-			if ($author->nodeValue)
-				return clean($author->nodeValue);
-		}
+            if ($author->nodeValue)
+                return clean($author->nodeValue);
+        }
 
-		$author_elems = $this->xpath->query("dc:creator", $this->elem);
-		$authors = [];
+        $author_elems = $this->xpath->query("dc:creator", $this->elem);
+        $authors = [];
 
-		foreach ($author_elems as $author) {
-			array_push($authors, clean($author->nodeValue));
-		}
+        foreach ($author_elems as $author) {
+            array_push($authors, clean($author->nodeValue));
+        }
 
-		return implode(", ", $authors);
-	}
+        return implode(", ", $authors);
+    }
 
-	public function get_comments_url() {
-		//RSS only. Use a query here to avoid namespace clashes (e.g. with slash).
-		//might give a wrong result if a default namespace was declared (possible with XPath 2.0)
-		$com_url = $this->xpath->query("comments", $this->elem)->item(0);
+    public function get_comments_url() {
+        //RSS only. Use a query here to avoid namespace clashes (e.g. with slash).
+        //might give a wrong result if a default namespace was declared (possible with XPath 2.0)
+        $com_url = $this->xpath->query("comments", $this->elem)->item(0);
 
-		if ($com_url)
-			return clean($com_url->nodeValue);
+        if ($com_url)
+            return clean($com_url->nodeValue);
 
-		//Atom Threading Extension (RFC 4685) stuff. Could be used in RSS feeds, so it's in common.
-		//'text/html' for type is too restrictive?
-		$com_url = $this->xpath->query("atom:link[@rel='replies' and contains(@type,'text/html')]/@href", $this->elem)->item(0);
+        //Atom Threading Extension (RFC 4685) stuff. Could be used in RSS feeds, so it's in common.
+        //'text/html' for type is too restrictive?
+        $com_url = $this->xpath->query("atom:link[@rel='replies' and contains(@type,'text/html')]/@href", $this->elem)->item(0);
 
-		if ($com_url)
-			return clean($com_url->nodeValue);
-	}
+        if ($com_url)
+            return clean($com_url->nodeValue);
+    }
 
-	public function get_comments_count() {
-		//also query for ATE stuff here
-		$query = "slash:comments|thread:total|atom:link[@rel='replies']/@thread:count";
-		$comments = $this->xpath->query($query, $this->elem)->item(0);
+    public function get_comments_count() {
+        //also query for ATE stuff here
+        $query = "slash:comments|thread:total|atom:link[@rel='replies']/@thread:count";
+        $comments = $this->xpath->query($query, $this->elem)->item(0);
 
-		if ($comments) {
-			return clean($comments->nodeValue);
-		}
-	}
+        if ($comments) {
+            return clean($comments->nodeValue);
+        }
+    }
 
-	// this is common for both Atom and RSS types and deals with various media: elements
-	public function get_enclosures() {
-		$encs = [];
+    // this is common for both Atom and RSS types and deals with various media: elements
+    public function get_enclosures() {
+        $encs = [];
 
-		$enclosures = $this->xpath->query("media:content", $this->elem);
+        $enclosures = $this->xpath->query("media:content", $this->elem);
 
-		foreach ($enclosures as $enclosure) {
-			$enc = new FeedEnclosure();
+        foreach ($enclosures as $enclosure) {
+            $enc = new FeedEnclosure();
 
-			$enc->type = clean($enclosure->getAttribute("type"));
-			$enc->link = clean($enclosure->getAttribute("url"));
-			$enc->length = clean($enclosure->getAttribute("length"));
-			$enc->height = clean($enclosure->getAttribute("height"));
-			$enc->width = clean($enclosure->getAttribute("width"));
+            $enc->type = clean($enclosure->getAttribute("type"));
+            $enc->link = clean($enclosure->getAttribute("url"));
+            $enc->length = clean($enclosure->getAttribute("length"));
+            $enc->height = clean($enclosure->getAttribute("height"));
+            $enc->width = clean($enclosure->getAttribute("width"));
 
-			$medium = clean($enclosure->getAttribute("medium"));
-			if (!$enc->type && $medium) {
-				$enc->type = strtolower("$medium/generic");
-			}
+            $medium = clean($enclosure->getAttribute("medium"));
+            if (!$enc->type && $medium) {
+                $enc->type = strtolower("$medium/generic");
+            }
 
-			$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-			if ($desc) $enc->title = clean($desc->nodeValue);
+            $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+            if ($desc) $enc->title = clean($desc->nodeValue);
 
-			array_push($encs, $enc);
-		}
+            array_push($encs, $enc);
+        }
 
-		$enclosures = $this->xpath->query("media:group", $this->elem);
+        $enclosures = $this->xpath->query("media:group", $this->elem);
 
-		foreach ($enclosures as $enclosure) {
-			$enc = new FeedEnclosure();
+        foreach ($enclosures as $enclosure) {
+            $enc = new FeedEnclosure();
 
-			$content = $this->xpath->query("media:content", $enclosure)->item(0);
+            $content = $this->xpath->query("media:content", $enclosure)->item(0);
 
-			if ($content) {
-				$enc->type = clean($content->getAttribute("type"));
-				$enc->link = clean($content->getAttribute("url"));
-				$enc->length = clean($content->getAttribute("length"));
-				$enc->height = clean($content->getAttribute("height"));
-				$enc->width = clean($content->getAttribute("width"));
+            if ($content) {
+                $enc->type = clean($content->getAttribute("type"));
+                $enc->link = clean($content->getAttribute("url"));
+                $enc->length = clean($content->getAttribute("length"));
+                $enc->height = clean($content->getAttribute("height"));
+                $enc->width = clean($content->getAttribute("width"));
 
-				$medium = clean($content->getAttribute("medium"));
-				if (!$enc->type && $medium) {
-					$enc->type = strtolower("$medium/generic");
-				}
+                $medium = clean($content->getAttribute("medium"));
+                if (!$enc->type && $medium) {
+                    $enc->type = strtolower("$medium/generic");
+                }
 
-				$desc = $this->xpath->query("media:description", $content)->item(0);
-				if ($desc) {
-					$enc->title = clean($desc->nodeValue);
-				} else {
-					$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-					if ($desc) $enc->title = clean($desc->nodeValue);
-				}
+                $desc = $this->xpath->query("media:description", $content)->item(0);
+                if ($desc) {
+                    $enc->title = clean($desc->nodeValue);
+                } else {
+                    $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+                    if ($desc) $enc->title = clean($desc->nodeValue);
+                }
 
-				array_push($encs, $enc);
-			}
-		}
+                array_push($encs, $enc);
+            }
+        }
 
-		$enclosures = $this->xpath->query("media:thumbnail", $this->elem);
+        $enclosures = $this->xpath->query("media:thumbnail", $this->elem);
 
-		foreach ($enclosures as $enclosure) {
-			$enc = new FeedEnclosure();
+        foreach ($enclosures as $enclosure) {
+            $enc = new FeedEnclosure();
 
-			$enc->type = "image/generic";
-			$enc->link = clean($enclosure->getAttribute("url"));
-			$enc->height = clean($enclosure->getAttribute("height"));
-			$enc->width = clean($enclosure->getAttribute("width"));
+            $enc->type = "image/generic";
+            $enc->link = clean($enclosure->getAttribute("url"));
+            $enc->height = clean($enclosure->getAttribute("height"));
+            $enc->width = clean($enclosure->getAttribute("width"));
 
-			array_push($encs, $enc);
-		}
+            array_push($encs, $enc);
+        }
 
-		return $encs;
-	}
+        return $encs;
+    }
 
-	public function count_children($node) {
-		return $node->getElementsByTagName("*")->length;
-	}
+    public function count_children($node) {
+        return $node->getElementsByTagName("*")->length;
+    }
 
-	public function subtree_or_text($node) {
-		if ($this->count_children($node) == 0) {
-			return $node->nodeValue;
-		} else {
-			return $node->c14n();
-		}
-	}
+    public function subtree_or_text($node) {
+        if ($this->count_children($node) == 0) {
+            return $node->nodeValue;
+        } else {
+            return $node->c14n();
+        }
+    }
 
-	public static function normalize_categories($cats) {
+    public static function normalize_categories($cats) {
 
-		$tmp = [];
+        $tmp = [];
 
-		foreach ($cats as $rawcat) {
-			$tmp = array_merge($tmp, explode(",", $rawcat));
-		}
+        foreach ($cats as $rawcat) {
+            $tmp = array_merge($tmp, explode(",", $rawcat));
+        }
 
-		$tmp = array_map(function($srccat) {
-			$cat = clean(trim(mb_strtolower($srccat)));
+        $tmp = array_map(function($srccat) {
+            $cat = clean(trim(mb_strtolower($srccat)));
 
-			// we don't support numeric tags
-			if (is_numeric($cat))
-				$cat = 't:' . $cat;
+            // we don't support numeric tags
+            if (is_numeric($cat))
+                $cat = 't:' . $cat;
 
-			$cat = preg_replace('/[,\'\"]/', "", $cat);
+            $cat = preg_replace('/[,\'\"]/', "", $cat);
 
-			if (DB_TYPE == "mysql") {
-				$cat = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $cat);
-			}
+            if (DB_TYPE == "mysql") {
+                $cat = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $cat);
+            }
 
-			if (mb_strlen($cat) > 250)
-				$cat = mb_substr($cat, 0, 250);
+            if (mb_strlen($cat) > 250)
+                $cat = mb_substr($cat, 0, 250);
 
-			return $cat;
-		}, $tmp);
+            return $cat;
+        }, $tmp);
 
-		asort($tmp);
+        asort($tmp);
 
-		return array_unique($tmp);
-	}
+        return array_unique($tmp);
+    }
 }

classes/feeditem/atom.php

Indentation +140 added lines, -140 removed lines

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

classes/idb.php

Indentation +10 added lines, -10 removed lines

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

classes/counters.php

Indentation +122 added lines, -122 removed lines

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

classes/handler.php

Indentation +15 added lines, -15 removed lines

@@ -1,23 +1,23 @@
 <?php
 class Handler implements IHandler {
-	protected $pdo;
-	protected $args;
+    protected $pdo;
+    protected $args;
 
-	public function __construct($args) {
-		$this->pdo = Db::pdo();
-		$this->args = $args;
-	}
+    public function __construct($args) {
+        $this->pdo = Db::pdo();
+        $this->args = $args;
+    }
 
-	public function csrf_ignore($method) {
-		return true;
-	}
+    public function csrf_ignore($method) {
+        return true;
+    }
 
-	public function before($method) {
-		return true;
-	}
+    public function before($method) {
+        return true;
+    }
 
-	public function after() {
-		return true;
-	}
+    public function after() {
+        return true;
+    }
 
 }

classes/opml.php

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

backend.php

Indentation +129 added lines, -129 removed lines

@@ -1,130 +1,130 @@
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	$op = $_REQUEST["op"];
-	@$method = $_REQUEST['subop'] ? $_REQUEST['subop'] : $_REQUEST["method"];
-
-	if (!$method)
-		$method = 'index';
-	else
-		$method = strtolower($method);
-
-	/* Public calls compatibility shim */
-
-	$public_calls = array("globalUpdateFeeds", "rss", "getUnread", "getProfiles", "share",
-		"fbexport", "logout", "pubsub");
-
-	if (array_search($op, $public_calls) !== false) {
-		header("Location: public.php?" . $_SERVER['QUERY_STRING']);
-		return;
-	}
-
-	@$csrf_token = $_REQUEST['csrf_token'];
-
-	require_once "autoload.php";
-	require_once "sessions.php";
-	require_once "functions.php";
-	require_once "config.php";
-	require_once "db.php";
-	require_once "db-prefs.php";
-
-	startup_gettext();
-
-	$script_started = microtime(true);
-
-	if (!init_plugins()) return;
-
-	header("Content-Type: text/json; charset=utf-8");
-
-	if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
-		ob_start("ob_gzhandler");
-	}
-
-	if (SINGLE_USER_MODE) {
-		authenticate_user( "admin", null);
-	}
-
-	if ($_SESSION["uid"]) {
-		if (!validate_session()) {
-			header("Content-Type: text/json");
-			print error_json(6);
-			return;
-		}
-		load_user_plugins( $_SESSION["uid"]);
-	}
-
-	$purge_intervals = array(
-		0  => __("Use default"),
-		-1 => __("Never purge"),
-		5  => __("1 week old"),
-		14 => __("2 weeks old"),
-		31 => __("1 month old"),
-		60 => __("2 months old"),
-		90 => __("3 months old"));
-
-	$update_intervals = array(
-		0   => __("Default interval"),
-		-1  => __("Disable updates"),
-		15  => __("15 minutes"),
-		30  => __("30 minutes"),
-		60  => __("Hourly"),
-		240 => __("4 hours"),
-		720 => __("12 hours"),
-		1440 => __("Daily"),
-		10080 => __("Weekly"));
-
-	$update_intervals_nodefault = array(
-		-1  => __("Disable updates"),
-		15  => __("15 minutes"),
-		30  => __("30 minutes"),
-		60  => __("Hourly"),
-		240 => __("4 hours"),
-		720 => __("12 hours"),
-		1440 => __("Daily"),
-		10080 => __("Weekly"));
-
-	$access_level_names = array(
-		0 => __("User"),
-		5 => __("Power User"),
-		10 => __("Administrator"));
-
-	$op = str_replace("-", "_", $op);
-
-	$override = PluginHost::getInstance()->lookup_handler($op, $method);
-
-	if (class_exists($op) || $override) {
-
-		if ($override) {
-			$handler = $override;
-		} else {
-			$handler = new $op($_REQUEST);
-		}
-
-		if ($handler && implements_interface($handler, 'IHandler')) {
-			if (validate_csrf($csrf_token) || $handler->csrf_ignore($method)) {
-				if ($handler->before($method)) {
-					if ($method && method_exists($handler, $method)) {
-						$handler->$method();
-					} else {
-						if (method_exists($handler, "catchall")) {
-							$handler->catchall($method);
-						}
-					}
-					$handler->after();
-					return;
-				} else {
-					header("Content-Type: text/json");
-					print error_json(6);
-					return;
-				}
-			} else {
-				header("Content-Type: text/json");
-				print error_json(6);
-				return;
-			}
-		}
-	}
-
-	header("Content-Type: text/json");
-	print error_json(13);
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+        get_include_path());
+
+    $op = $_REQUEST["op"];
+    @$method = $_REQUEST['subop'] ? $_REQUEST['subop'] : $_REQUEST["method"];
+
+    if (!$method)
+        $method = 'index';
+    else
+        $method = strtolower($method);
+
+    /* Public calls compatibility shim */
+
+    $public_calls = array("globalUpdateFeeds", "rss", "getUnread", "getProfiles", "share",
+        "fbexport", "logout", "pubsub");
+
+    if (array_search($op, $public_calls) !== false) {
+        header("Location: public.php?" . $_SERVER['QUERY_STRING']);
+        return;
+    }
+
+    @$csrf_token = $_REQUEST['csrf_token'];
+
+    require_once "autoload.php";
+    require_once "sessions.php";
+    require_once "functions.php";
+    require_once "config.php";
+    require_once "db.php";
+    require_once "db-prefs.php";
+
+    startup_gettext();
+
+    $script_started = microtime(true);
+
+    if (!init_plugins()) return;
+
+    header("Content-Type: text/json; charset=utf-8");
+
+    if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
+        ob_start("ob_gzhandler");
+    }
+
+    if (SINGLE_USER_MODE) {
+        authenticate_user( "admin", null);
+    }
+
+    if ($_SESSION["uid"]) {
+        if (!validate_session()) {
+            header("Content-Type: text/json");
+            print error_json(6);
+            return;
+        }
+        load_user_plugins( $_SESSION["uid"]);
+    }
+
+    $purge_intervals = array(
+        0  => __("Use default"),
+        -1 => __("Never purge"),
+        5  => __("1 week old"),
+        14 => __("2 weeks old"),
+        31 => __("1 month old"),
+        60 => __("2 months old"),
+        90 => __("3 months old"));
+
+    $update_intervals = array(
+        0   => __("Default interval"),
+        -1  => __("Disable updates"),
+        15  => __("15 minutes"),
+        30  => __("30 minutes"),
+        60  => __("Hourly"),
+        240 => __("4 hours"),
+        720 => __("12 hours"),
+        1440 => __("Daily"),
+        10080 => __("Weekly"));
+
+    $update_intervals_nodefault = array(
+        -1  => __("Disable updates"),
+        15  => __("15 minutes"),
+        30  => __("30 minutes"),
+        60  => __("Hourly"),
+        240 => __("4 hours"),
+        720 => __("12 hours"),
+        1440 => __("Daily"),
+        10080 => __("Weekly"));
+
+    $access_level_names = array(
+        0 => __("User"),
+        5 => __("Power User"),
+        10 => __("Administrator"));
+
+    $op = str_replace("-", "_", $op);
+
+    $override = PluginHost::getInstance()->lookup_handler($op, $method);
+
+    if (class_exists($op) || $override) {
+
+        if ($override) {
+            $handler = $override;
+        } else {
+            $handler = new $op($_REQUEST);
+        }
+
+        if ($handler && implements_interface($handler, 'IHandler')) {
+            if (validate_csrf($csrf_token) || $handler->csrf_ignore($method)) {
+                if ($handler->before($method)) {
+                    if ($method && method_exists($handler, $method)) {
+                        $handler->$method();
+                    } else {
+                        if (method_exists($handler, "catchall")) {
+                            $handler->catchall($method);
+                        }
+                    }
+                    $handler->after();
+                    return;
+                } else {
+                    header("Content-Type: text/json");
+                    print error_json(6);
+                    return;
+                }
+            } else {
+                header("Content-Type: text/json");
+                print error_json(6);
+                return;
+            }
+        }
+    }
+
+    header("Content-Type: text/json");
+    print error_json(13);

include/db.php

Indentation +9 added lines, -9 removed lines

@@ -1,38 +1,38 @@
 <?php
 
 function db_escape_string($s, $strip_tags = true) {
-	return Db::get()->escape_string($s, $strip_tags);
+    return Db::get()->escape_string($s, $strip_tags);
 }
 
 function db_query($query, $die_on_error = true) {
-	return Db::get()->query($query, $die_on_error);
+    return Db::get()->query($query, $die_on_error);
 }
 
 function db_fetch_assoc($result) {
-	return Db::get()->fetch_assoc($result);
+    return Db::get()->fetch_assoc($result);
 }
 
 
 function db_num_rows($result) {
-	return Db::get()->num_rows($result);
+    return Db::get()->num_rows($result);
 }
 
 function db_fetch_result($result, $row, $param) {
-	return Db::get()->fetch_result($result, $row, $param);
+    return Db::get()->fetch_result($result, $row, $param);
 }
 
 function db_affected_rows($result) {
-	return Db::get()->affected_rows($result);
+    return Db::get()->affected_rows($result);
 }
 
 function db_last_error() {
-	return Db::get()->last_error();
+    return Db::get()->last_error();
 }
 
 function db_last_query_error() {
-	return Db::get()->last_query_error();
+    return Db::get()->last_query_error();
 }
 
 function db_quote($str){
-	return Db::get()->quote($str);
+    return Db::get()->quote($str);
 }

include/login_form.php

Indentation +7 added lines, -7 removed lines

@@ -7,15 +7,15 @@
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<?php
-	foreach (array("lib/prototype.js",
-				"lib/dojo/dojo.js",
-				"lib/dojo/tt-rss-layer.js",
-				"js/common.js",
-				"errors.php?mode=js") as $jsfile) {
+    foreach (array("lib/prototype.js",
+                "lib/dojo/dojo.js",
+                "lib/dojo/tt-rss-layer.js",
+                "js/common.js",
+                "errors.php?mode=js") as $jsfile) {
 
-		echo javascript_tag($jsfile);
+        echo javascript_tag($jsfile);
 
-	} ?>
+    } ?>
 
 	<script type="text/javascript">
 		require({cache:{}});