codysnider / tt-rss

classes/logger/sql.php

Braces +3 added lines, -2 removed lines

@@ -24,8 +24,9 @@
 			];
 
 			foreach ($server_params as $n => $p) {
-				if (isset($_SERVER[$p]))
-					$context .= "\n$n: ".$_SERVER[$p];
+				if (isset($_SERVER[$p])) {
+									$context .= "\n$n: ".$_SERVER[$p];
+				}
 			}
 
 			// passed error message may contain invalid unicode characters, failing to insert an error here

Indentation +29 added lines, -29 removed lines

@@ -1,47 +1,47 @@
 <?php
 class Logger_SQL {
 
-	private $pdo;
+    private $pdo;
 
-	public function log_error($errno, $errstr, $file, $line, $context) {
+    public function log_error($errno, $errstr, $file, $line, $context) {
 
-		// separate PDO connection object is used for logging
-		if (!$this->pdo) {
-		    $this->pdo = Db::instance()->pdo_connect();
-		}
+        // separate PDO connection object is used for logging
+        if (!$this->pdo) {
+            $this->pdo = Db::instance()->pdo_connect();
+        }
 
-		if ($this->pdo && get_schema_version() > 117) {
+        if ($this->pdo && get_schema_version() > 117) {
 
-			$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : null;
+            $owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : null;
 
-			// limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge
-			$context = mb_substr($context, 0, 8192);
+            // limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge
+            $context = mb_substr($context, 0, 8192);
 
-			$server_params = [
-				"IP" => "REMOTE_ADDR",
-				"Request URI" => "REQUEST_URI",
-				"User agent" => "HTTP_USER_AGENT",
-			];
+            $server_params = [
+                "IP" => "REMOTE_ADDR",
+                "Request URI" => "REQUEST_URI",
+                "User agent" => "HTTP_USER_AGENT",
+            ];
 
-			foreach ($server_params as $n => $p) {
-				if (isset($_SERVER[$p]))
-					$context .= "\n$n: ".$_SERVER[$p];
-			}
+            foreach ($server_params as $n => $p) {
+                if (isset($_SERVER[$p]))
+                    $context .= "\n$n: ".$_SERVER[$p];
+            }
 
-			// passed error message may contain invalid unicode characters, failing to insert an error here
-			// would break the execution entirely by generating an actual fatal error instead of a E_WARNING etc
-			$errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8');
-			$context = UConverter::transcode($context, 'UTF-8', 'UTF-8');
+            // passed error message may contain invalid unicode characters, failing to insert an error here
+            // would break the execution entirely by generating an actual fatal error instead of a E_WARNING etc
+            $errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8');
+            $context = UConverter::transcode($context, 'UTF-8', 'UTF-8');
 
-			$sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
+            $sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
 				(errno, errstr, filename, lineno, context, owner_uid, created_at) VALUES
 				(?, ?, ?, ?, ?, ?, NOW())");
-			$sth->execute([$errno, $errstr, $file, $line, $context, $owner_uid]);
+            $sth->execute([$errno, $errstr, $file, $line, $context, $owner_uid]);
 
-			return $sth->rowCount();
-		}
+            return $sth->rowCount();
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 }

classes/feeditem/common.php

Braces +3 added lines, -2 removed lines

@@ -186,8 +186,9 @@
 			$cat = clean(trim(mb_strtolower($srccat)));
 
 			// we don't support numeric tags
-			if (is_numeric($cat))
-				$cat = 't:'.$cat;
+			if (is_numeric($cat)) {
+							$cat = 't:'.$cat;
+			}
 
 			$cat = preg_replace('/[,\'\"]/', "", $cat);
 

Indentation +166 added lines, -166 removed lines

@@ -1,209 +1,209 @@
 <?php
 abstract class FeedItem_Common extends FeedItem {
-	protected $elem;
-	protected $xpath;
-	protected $doc;
-
-	public function __construct($elem, $doc, $xpath) {
-		$this->elem = $elem;
-		$this->xpath = $xpath;
-		$this->doc = $doc;
-
-		try {
+    protected $elem;
+    protected $xpath;
+    protected $doc;
+
+    public function __construct($elem, $doc, $xpath) {
+        $this->elem = $elem;
+        $this->xpath = $xpath;
+        $this->doc = $doc;
+
+        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);
-			}
-
-			$email = $author->getElementsByTagName("email")->item(0);
-
-			if ($email) {
-			    return clean($email->nodeValue);
-			}
-
-			if ($author->nodeValue) {
-							return clean($author->nodeValue);
-			}
-		}
-
-		$author_elems = $this->xpath->query("dc:creator", $this->elem);
-		$authors = [];
-
-		foreach ($author_elems as $author) {
-			array_push($authors, clean($author->nodeValue));
-		}
-
-		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);
+            if ($name) {
+                return clean($name->nodeValue);
+            }
+
+            $email = $author->getElementsByTagName("email")->item(0);
+
+            if ($email) {
+                return clean($email->nodeValue);
+            }
+
+            if ($author->nodeValue) {
+                            return clean($author->nodeValue);
+            }
+        }
+
+        $author_elems = $this->xpath->query("dc:creator", $this->elem);
+        $authors = [];
+
+        foreach ($author_elems as $author) {
+            array_push($authors, clean($author->nodeValue));
+        }
+
+        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);
 
-		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);
-
-		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);
-
-		if ($comments) {
-			return clean($comments->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);
+
+        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);
+
+        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);
+    }
 }

plugins/mailto/init.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		while ($line = $sth->fetch()) {
 
 			if (!$subject) {
-							$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+							$subject = __("[Forwarded]")." ".htmlspecialchars($line["title"]);
 			}
 
 			$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));

Indentation +60 added lines, -60 removed lines

@@ -1,96 +1,96 @@
 <?php
 class MailTo extends Plugin {
-	private $host;
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Share article via email (using mailto: links, invoking your mail client)",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Share article via email (using mailto: links, invoking your mail client)",
+            "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__)."/init.js");
-	}
+    public function get_js() {
+        return file_get_contents(dirname(__FILE__)."/init.js");
+    }
 
-	public function hook_article_button($line) {
-		return "<i class='material-icons' style=\"cursor : pointer\"
+    public function hook_article_button($line) {
+        return "<i class='material-icons' style=\"cursor : pointer\"
 					onclick=\"Plugins.Mailto.send(".$line["id"].")\"
 					title='".__('Forward by email')."'>mail_outline</i>";
-	}
+    }
 
-	public function emailArticle() {
+    public function emailArticle() {
 
-		$ids = explode(",", $_REQUEST['param']);
-		$ids_qmarks = arr_qmarks($ids);
+        $ids = explode(",", $_REQUEST['param']);
+        $ids_qmarks = arr_qmarks($ids);
 
-		require_once "lib/MiniTemplator.class.php";
+        require_once "lib/MiniTemplator.class.php";
 
-		$tpl = new MiniTemplator;
+        $tpl = new MiniTemplator;
 
-		$tpl->readTemplateFromFile("templates/email_article_template.txt");
+        $tpl->readTemplateFromFile("templates/email_article_template.txt");
 
-		$tpl->setVariable('USER_NAME', $_SESSION["name"], true);
-		//$tpl->setVariable('USER_EMAIL', $user_email, true);
-		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
+        $tpl->setVariable('USER_NAME', $_SESSION["name"], true);
+        //$tpl->setVariable('USER_EMAIL', $user_email, true);
+        $tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
 
-		$sth = $this->pdo->prepare("SELECT DISTINCT link, content, title
+        $sth = $this->pdo->prepare("SELECT DISTINCT link, content, title
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
 			id IN ($ids_qmarks) AND owner_uid = ?");
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
-		if (count($ids) > 1) {
-			$subject = __("[Forwarded]")." ".__("Multiple articles");
-		} else {
-			$subject = "";
-		}
+        if (count($ids) > 1) {
+            $subject = __("[Forwarded]")." ".__("Multiple articles");
+        } else {
+            $subject = "";
+        }
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			if (!$subject) {
-							$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
-			}
+            if (!$subject) {
+                            $subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+            }
 
-			$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
-			$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
+            $tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
+            $tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
 
-			$tpl->addBlock('article');
-		}
+            $tpl->addBlock('article');
+        }
 
-		$tpl->addBlock('email');
+        $tpl->addBlock('email');
 
-		$content = "";
-		$tpl->generateOutputToString($content);
+        $content = "";
+        $tpl->generateOutputToString($content);
 
-		$mailto_link = htmlspecialchars("mailto:?subject=".rawurlencode($subject).
-			"&body=".rawurlencode($content));
+        $mailto_link = htmlspecialchars("mailto:?subject=".rawurlencode($subject).
+            "&body=".rawurlencode($content));
 
-		print __("Clicking the following link to invoke your mail client:");
+        print __("Clicking the following link to invoke your mail client:");
 
-		print "<div class='panel text-center'>";
-		print "<a target=\"_blank\" href=\"$mailto_link\">".
-			__("Forward selected article(s) by email.")."</a>";
-		print "</div>";
+        print "<div class='panel text-center'>";
+        print "<a target=\"_blank\" href=\"$mailto_link\">".
+            __("Forward selected article(s) by email.")."</a>";
+        print "</div>";
 
-		print __("You should be able to edit the message before sending in your mail client.");
+        print __("You should be able to edit the message before sending in your mail client.");
 
-		print "<p>";
+        print "<p>";
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Close this dialog')."</button>";
-		print "</footer>";
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Close this dialog')."</button>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

plugins/mail/init.php

Braces +3 added lines, -2 removed lines

@@ -124,8 +124,9 @@
 
 		while ($line = $sth->fetch()) {
 
-			if (!$subject)
-				$subject = __("[Forwarded]")." ".htmlspecialchars($line["title"]);
+			if (!$subject) {
+							$subject = __("[Forwarded]")." ".htmlspecialchars($line["title"]);
+			}
 
 			$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
 			$tnote = strip_tags($line["note"]);

Indentation +126 added lines, -126 removed lines

@@ -1,47 +1,47 @@ 
 <?php
 class Mail extends Plugin {
 
-	/* @var PluginHost $host */
-	private $host;
+    /* @var PluginHost $host */
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Share article via email",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Share article via email",
+            "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_PREFS_TAB, $this);
-	}
+        $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+        $host->add_hook($host::HOOK_PREFS_TAB, $this);
+    }
 
-	public function get_js() {
-		return file_get_contents(dirname(__FILE__)."/mail.js");
-	}
+    public function get_js() {
+        return file_get_contents(dirname(__FILE__)."/mail.js");
+    }
 
-	public function save() {
-		$addresslist = $_POST["addresslist"];
+    public function save() {
+        $addresslist = $_POST["addresslist"];
 
-		$this->host->set($this, "addresslist", $addresslist);
+        $this->host->set($this, "addresslist", $addresslist);
 
-		echo __("Mail addresses saved.");
-	}
+        echo __("Mail addresses saved.");
+    }
 
-	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'>mail</i> ".__('Mail plugin')."\">";
 
-		print "<p>".__("You can set predefined email addressed here (comma-separated list):")."</p>";
+        print "<p>".__("You can set predefined email addressed here (comma-separated list):")."</p>";
 
-		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()) {
 				console.log(dojo.objectToQuery(this.getValues()));
@@ -55,140 +55,140 @@ 
 			}
 			</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "mail");
+            print_hidden("op", "pluginhandler");
+            print_hidden("method", "save");
+            print_hidden("plugin", "mail");
 
-			$addresslist = $this->host->get($this, "addresslist");
+            $addresslist = $this->host->get($this, "addresslist");
 
-			print "<textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 50%' rows=\"3\"
+            print "<textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 50%' rows=\"3\"
 				name='addresslist'>$addresslist</textarea>";
 
-			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>";
-	}
+        print "</div>";
+    }
 
-	public function hook_article_button($line) {
-		return "<i class='material-icons' style=\"cursor : pointer\"
+    public function hook_article_button($line) {
+        return "<i class='material-icons' style=\"cursor : pointer\"
 					onclick=\"Plugins.Mail.send(".$line["id"].")\"
 					title='".__('Forward by email')."'>mail</i>";
-	}
+    }
 
-	public function emailArticle() {
+    public function emailArticle() {
 
-		$ids = explode(",", $_REQUEST['param']);
-		$ids_qmarks = arr_qmarks($ids);
+        $ids = explode(",", $_REQUEST['param']);
+        $ids_qmarks = arr_qmarks($ids);
 
-		print_hidden("op", "pluginhandler");
-		print_hidden("plugin", "mail");
-		print_hidden("method", "sendEmail");
+        print_hidden("op", "pluginhandler");
+        print_hidden("plugin", "mail");
+        print_hidden("method", "sendEmail");
 
-		$sth = $this->pdo->prepare("SELECT email, full_name FROM ttrss_users WHERE
+        $sth = $this->pdo->prepare("SELECT email, full_name FROM ttrss_users WHERE
 			id = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$user_email = htmlspecialchars($row['email']);
-			$user_name = htmlspecialchars($row['full_name']);
-		}
+        if ($row = $sth->fetch()) {
+            $user_email = htmlspecialchars($row['email']);
+            $user_name = htmlspecialchars($row['full_name']);
+        }
 
-		if (!$user_name) {
-		    $user_name = $_SESSION['name'];
-		}
+        if (!$user_name) {
+            $user_name = $_SESSION['name'];
+        }
 
-		print_hidden("from_email", "$user_email");
-		print_hidden("from_name", "$user_name");
+        print_hidden("from_email", "$user_email");
+        print_hidden("from_name", "$user_name");
 
-		require_once "lib/MiniTemplator.class.php";
+        require_once "lib/MiniTemplator.class.php";
 
-		$tpl = new MiniTemplator;
+        $tpl = new MiniTemplator;
 
-		$tpl->readTemplateFromFile("templates/email_article_template.txt");
+        $tpl->readTemplateFromFile("templates/email_article_template.txt");
 
-		$tpl->setVariable('USER_NAME', $_SESSION["name"], true);
-		$tpl->setVariable('USER_EMAIL', $user_email, true);
-		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
+        $tpl->setVariable('USER_NAME', $_SESSION["name"], true);
+        $tpl->setVariable('USER_EMAIL', $user_email, true);
+        $tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
-		$sth = $this->pdo->prepare("SELECT DISTINCT link, content, title, note
+        $sth = $this->pdo->prepare("SELECT DISTINCT link, content, title, note
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
 			id IN ($ids_qmarks) AND owner_uid = ?");
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
-		if (count($ids) > 1) {
-			$subject = __("[Forwarded]")." ".__("Multiple articles");
-		}
+        if (count($ids) > 1) {
+            $subject = __("[Forwarded]")." ".__("Multiple articles");
+        }
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			if (!$subject)
-				$subject = __("[Forwarded]")." ".htmlspecialchars($line["title"]);
+            if (!$subject)
+                $subject = __("[Forwarded]")." ".htmlspecialchars($line["title"]);
 
-			$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
-			$tnote = strip_tags($line["note"]);
-			if ($tnote != '') {
-				$tpl->setVariable('ARTICLE_NOTE', $tnote, true);
-				$tpl->addBlock('note');
-			}
-			$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
+            $tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
+            $tnote = strip_tags($line["note"]);
+            if ($tnote != '') {
+                $tpl->setVariable('ARTICLE_NOTE', $tnote, true);
+                $tpl->addBlock('note');
+            }
+            $tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
 
-			$tpl->addBlock('article');
-		}
+            $tpl->addBlock('article');
+        }
 
-		$tpl->addBlock('email');
+        $tpl->addBlock('email');
 
-		$content = "";
-		$tpl->generateOutputToString($content);
+        $content = "";
+        $tpl->generateOutputToString($content);
 
-		print "<table width='100%'><tr><td>";
+        print "<table width='100%'><tr><td>";
 
-		$addresslist = explode(",", $this->host->get($this, "addresslist"));
+        $addresslist = explode(",", $this->host->get($this, "addresslist"));
 
-		print __('To:');
+        print __('To:');
 
-		print "</td><td>";
+        print "</td><td>";
 
 /*		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
 				style=\"width : 30em;\"
 				name=\"destination\" id=\"emailArticleDlg_destination\">"; */
 
-		print_select("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.ComboBox"');
+        print_select("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.ComboBox"');
 
 /*		print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
 	style=\"z-index: 30; display : none\"></div>"; */
 
-		print "</td></tr><tr><td>";
+        print "</td></tr><tr><td>";
 
-		print __('Subject:');
+        print __('Subject:');
 
-		print "</td><td>";
+        print "</td><td>";
 
-		print "<input dojoType='dijit.form.ValidationTextBox' required='true'
+        print "<input dojoType='dijit.form.ValidationTextBox' required='true'
 				style='width : 30em;' name='subject' value=\"$subject\" id='subject'>";
 
-		print "</td></tr>";
+        print "</td></tr>";
 
-		print "<tr><td colspan='2'><textarea dojoType='dijit.form.SimpleTextarea'
+        print "<tr><td colspan='2'><textarea dojoType='dijit.form.SimpleTextarea'
 			style='height : 200px; font-size : 12px; width : 98%' rows=\"20\"
 			name='content'>$content</textarea>";
 
-		print "</td></tr></table>";
+        print "</td></tr></table>";
 
-		print "<footer>";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
-		print "</footer>";
+        print "<footer>";
+        print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
+        print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function sendEmail() {
-		$reply = array();
+    public function sendEmail() {
+        $reply = array();
 
-		/*$mail->AddReplyTo(strip_tags($_REQUEST['from_email']),
+        /*$mail->AddReplyTo(strip_tags($_REQUEST['from_email']),
 			strip_tags($_REQUEST['from_name']));
 		//$mail->AddAddress($_REQUEST['destination']);
 		$addresses = explode(';', $_REQUEST['destination']);
@@ -201,29 +201,29 @@ 
 
 		$rc = $mail->Send(); */
 
-		$to = $_REQUEST["destination"];
-		$subject = strip_tags($_REQUEST["subject"]);
-		$message = strip_tags($_REQUEST["content"]);
-		$from = strip_tags($_REQUEST["from_email"]);
+        $to = $_REQUEST["destination"];
+        $subject = strip_tags($_REQUEST["subject"]);
+        $message = strip_tags($_REQUEST["content"]);
+        $from = strip_tags($_REQUEST["from_email"]);
 
-		$mailer = new Mailer();
+        $mailer = new Mailer();
 
-		$rc = $mailer->mail(["to_address" => $to,
-			"headers" => ["Reply-To: $from"],
-			"subject" => $subject,
-			"message" => $message]);
+        $rc = $mailer->mail(["to_address" => $to,
+            "headers" => ["Reply-To: $from"],
+            "subject" => $subject,
+            "message" => $message]);
 
-		if (!$rc) {
-			$reply['error'] = $mailer->error();
-		} else {
-			//save_email_address($destination);
-			$reply['message'] = "UPDATE_COUNTERS";
-		}
+        if (!$rc) {
+            $reply['error'] = $mailer->error();
+        } else {
+            //save_email_address($destination);
+            $reply['message'] = "UPDATE_COUNTERS";
+        }
 
-		print json_encode($reply);
-	}
+        print json_encode($reply);
+    }
 
-	/* function completeEmails() {
+    /* function completeEmails() {
 		$search = $_REQUEST["search"];
 
 		print "<ul>";
@@ -237,8 +237,8 @@ 
 		print "</ul>";
 	} */
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

backend.php

Indentation +132 added lines, -132 removed lines

@@ -1,133 +1,133 @@
 <?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);

plugins/af_comics/init.php

Indentation +141 added lines, -141 removed lines

@@ -1,197 +1,197 @@
 <?php
 class Af_Comics extends Plugin {
 
-	private $host;
-	private $filters = array();
+    private $host;
+    private $filters = array();
 
-	public function about() {
-		return array(2.0,
-			"Fixes RSS feeds of assorted comic strips",
-			"fox");
-	}
+    public function about() {
+        return array(2.0,
+            "Fixes RSS feeds of assorted comic strips",
+            "fox");
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public function init($host) {
+        $this->host = $host;
 
-		$host->add_hook($host::HOOK_FETCH_FEED, $this);
-		$host->add_hook($host::HOOK_FEED_BASIC_INFO, $this);
-		$host->add_hook($host::HOOK_SUBSCRIBE_FEED, $this);
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-		$host->add_hook($host::HOOK_PREFS_TAB, $this);
+        $host->add_hook($host::HOOK_FETCH_FEED, $this);
+        $host->add_hook($host::HOOK_FEED_BASIC_INFO, $this);
+        $host->add_hook($host::HOOK_SUBSCRIBE_FEED, $this);
+        $host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
+        $host->add_hook($host::HOOK_PREFS_TAB, $this);
 
-		require_once __DIR__."/filter_base.php";
+        require_once __DIR__."/filter_base.php";
 
-		$filters = array_merge(glob(__DIR__."/filters.local/*.php"), glob(__DIR__."/filters/*.php"));
-		$names = [];
+        $filters = array_merge(glob(__DIR__."/filters.local/*.php"), glob(__DIR__."/filters/*.php"));
+        $names = [];
 
-		foreach ($filters as $file) {
-			$filter_name = preg_replace("/\..*$/", "", basename($file));
+        foreach ($filters as $file) {
+            $filter_name = preg_replace("/\..*$/", "", basename($file));
 
-			if (array_search($filter_name, $names) === false) {
-				if (!class_exists($filter_name)) {
-					require_once $file;
-				}
+            if (array_search($filter_name, $names) === false) {
+                if (!class_exists($filter_name)) {
+                    require_once $file;
+                }
 
-				array_push($names, $filter_name);
+                array_push($names, $filter_name);
 
-				$filter = new $filter_name();
+                $filter = new $filter_name();
 
-				if (is_subclass_of($filter, "Af_ComicFilter")) {
-					array_push($this->filters, $filter);
-					array_push($names, $filter_name);
-				}
-			}
-		}
-	}
+                if (is_subclass_of($filter, "Af_ComicFilter")) {
+                    array_push($this->filters, $filter);
+                    array_push($names, $filter_name);
+                }
+            }
+        }
+    }
 
-	public function hook_prefs_tab($args) {
-		if ($args != "prefFeeds") {
-		    return;
-		}
+    public function hook_prefs_tab($args) {
+        if ($args != "prefFeeds") {
+            return;
+        }
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>photo</i> ".__('Feeds supported by af_comics')."\">";
 
-		print "<p>".__("The following comics are currently supported:")."</p>";
+        print "<p>".__("The following comics are currently supported:")."</p>";
 
-		$comics = array("GoComics");
+        $comics = array("GoComics");
 
-		foreach ($this->filters as $f) {
-			foreach ($f->supported() as $comic) {
-				array_push($comics, $comic);
-			}
-		}
+        foreach ($this->filters as $f) {
+            foreach ($f->supported() as $comic) {
+                array_push($comics, $comic);
+            }
+        }
 
-		asort($comics);
+        asort($comics);
 
-		print "<ul class='panel panel-scrollable list list-unstyled'>";
-		foreach ($comics as $comic) {
-			print "<li>$comic</li>";
-		}
-		print "</ul>";
+        print "<ul class='panel panel-scrollable list list-unstyled'>";
+        foreach ($comics as $comic) {
+            print "<li>$comic</li>";
+        }
+        print "</ul>";
 
-		print "<p>".__("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).")."</p>";
+        print "<p>".__("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).")."</p>";
 
-		print "<p>".__('Drop any updated filters into <code>filters.local</code> in plugin directory.')."</p>";
+        print "<p>".__('Drop any updated filters into <code>filters.local</code> in plugin directory.')."</p>";
 
-		print "</div>";
-	}
+        print "</div>";
+    }
 
-	public function hook_article_filter($article) {
-		foreach ($this->filters as $f) {
-			if ($f->process($article)) {
-							break;
-			}
-		}
+    public function hook_article_filter($article) {
+        foreach ($this->filters as $f) {
+            if ($f->process($article)) {
+                            break;
+            }
+        }
 
-		return $article;
-	}
+        return $article;
+    }
 
-	// GoComics dropped feed support so it needs to be handled when fetching the feed.
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public function hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass) {
-		if ($auth_login || $auth_pass) {
-					return $feed_data;
-		}
+    // GoComics dropped feed support so it needs to be handled when fetching the feed.
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass) {
+        if ($auth_login || $auth_pass) {
+                    return $feed_data;
+        }
 
-		if (preg_match('#^https?://(?:feeds\.feedburner\.com/uclick|www\.gocomics\.com)/([-a-z0-9]+)$#i', $fetch_url, $comic)) {
-			$site_url = 'https://www.gocomics.com/'.$comic[1];
+        if (preg_match('#^https?://(?:feeds\.feedburner\.com/uclick|www\.gocomics\.com)/([-a-z0-9]+)$#i', $fetch_url, $comic)) {
+            $site_url = 'https://www.gocomics.com/'.$comic[1];
 
-			$article_link = $site_url.date('/Y/m/d');
+            $article_link = $site_url.date('/Y/m/d');
 
-			$body = fetch_file_contents(array('url' => $article_link, 'type' => 'text/html', 'followlocation' => false));
+            $body = fetch_file_contents(array('url' => $article_link, 'type' => 'text/html', 'followlocation' => false));
 
-			require_once 'lib/MiniTemplator.class.php';
+            require_once 'lib/MiniTemplator.class.php';
 
-			$feed_title = htmlspecialchars($comic[1]);
-			$site_url = htmlspecialchars($site_url);
-			$article_link = htmlspecialchars($article_link);
+            $feed_title = htmlspecialchars($comic[1]);
+            $site_url = htmlspecialchars($site_url);
+            $article_link = htmlspecialchars($article_link);
 
-			$tpl = new MiniTemplator();
+            $tpl = new MiniTemplator();
 
-			$tpl->readTemplateFromFile('templates/generated_feed.txt');
+            $tpl->readTemplateFromFile('templates/generated_feed.txt');
 
-			$tpl->setVariable('FEED_TITLE', $feed_title, true);
-			$tpl->setVariable('VERSION', get_version(), true);
-			$tpl->setVariable('FEED_URL', htmlspecialchars($fetch_url), true);
-			$tpl->setVariable('SELF_URL', $site_url, true);
+            $tpl->setVariable('FEED_TITLE', $feed_title, true);
+            $tpl->setVariable('VERSION', get_version(), true);
+            $tpl->setVariable('FEED_URL', htmlspecialchars($fetch_url), true);
+            $tpl->setVariable('SELF_URL', $site_url, true);
 
-			if ($body) {
-				$doc = new DOMDocument();
+            if ($body) {
+                $doc = new DOMDocument();
 
-				if (@$doc->loadHTML($body)) {
-					$xpath = new DOMXPath($doc);
+                if (@$doc->loadHTML($body)) {
+                    $xpath = new DOMXPath($doc);
 
-					$node = $xpath->query('//picture[contains(@class, "item-comic-image")]/img')->item(0);
+                    $node = $xpath->query('//picture[contains(@class, "item-comic-image")]/img')->item(0);
 
-					if ($node) {
-						$title = $xpath->query('//h1')->item(0);
+                    if ($node) {
+                        $title = $xpath->query('//h1')->item(0);
 
-						if ($title) {
-							$title = clean(trim($title->nodeValue));
-						} else {
-							$title = date('l, F d, Y');
-						}
+                        if ($title) {
+                            $title = clean(trim($title->nodeValue));
+                        } else {
+                            $title = date('l, F d, Y');
+                        }
 
-						foreach (['srcset', 'sizes', 'data-srcset', 'width'] as $attr) {
-							$node->removeAttribute($attr);
-						}
+                        foreach (['srcset', 'sizes', 'data-srcset', 'width'] as $attr) {
+                            $node->removeAttribute($attr);
+                        }
 
-						$tpl->setVariable('ARTICLE_ID', $article_link, true);
-						$tpl->setVariable('ARTICLE_LINK', $article_link, true);
-						$tpl->setVariable('ARTICLE_UPDATED_ATOM', date('c', mktime(11, 0, 0)), true);
-						$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($title), true);
-						$tpl->setVariable('ARTICLE_EXCERPT', '', true);
-						$tpl->setVariable('ARTICLE_CONTENT', $doc->saveHTML($node), true);
+                        $tpl->setVariable('ARTICLE_ID', $article_link, true);
+                        $tpl->setVariable('ARTICLE_LINK', $article_link, true);
+                        $tpl->setVariable('ARTICLE_UPDATED_ATOM', date('c', mktime(11, 0, 0)), true);
+                        $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($title), true);
+                        $tpl->setVariable('ARTICLE_EXCERPT', '', true);
+                        $tpl->setVariable('ARTICLE_CONTENT', $doc->saveHTML($node), true);
 
-						$tpl->setVariable('ARTICLE_AUTHOR', '', true);
-						$tpl->setVariable('ARTICLE_SOURCE_LINK', $site_url, true);
-						$tpl->setVariable('ARTICLE_SOURCE_TITLE', $feed_title, true);
+                        $tpl->setVariable('ARTICLE_AUTHOR', '', true);
+                        $tpl->setVariable('ARTICLE_SOURCE_LINK', $site_url, true);
+                        $tpl->setVariable('ARTICLE_SOURCE_TITLE', $feed_title, true);
 
-						$tpl->addBlock('entry');
-					}
-				}
-			}
+                        $tpl->addBlock('entry');
+                    }
+                }
+            }
 
-			$tpl->addBlock('feed');
+            $tpl->addBlock('feed');
 
-			if ($tpl->generateOutputToString($tmp_data)) {
-							$feed_data = $tmp_data;
-			}
-		}
+            if ($tpl->generateOutputToString($tmp_data)) {
+                            $feed_data = $tmp_data;
+            }
+        }
 
-		return $feed_data;
-	}
+        return $feed_data;
+    }
 
-	public function hook_subscribe_feed($contents, $url, $auth_login, $auth_pass) {
-		if ($auth_login || $auth_pass) {
-					return $contents;
-		}
+    public function hook_subscribe_feed($contents, $url, $auth_login, $auth_pass) {
+        if ($auth_login || $auth_pass) {
+                    return $contents;
+        }
 
-		if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $url)) {
-					return '<?xml version="1.0" encoding="utf-8"?>';
-		}
-		// Get is_html() to return false.
+        if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $url)) {
+                    return '<?xml version="1.0" encoding="utf-8"?>';
+        }
+        // Get is_html() to return false.
 
-		return $contents;
-	}
+        return $contents;
+    }
 
-	public function hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass) {
-		if ($auth_login || $auth_pass) {
-					return $basic_info;
-		}
+    public function hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass) {
+        if ($auth_login || $auth_pass) {
+                    return $basic_info;
+        }
 
-		if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $fetch_url, $matches)) {
-					$basic_info = array('title' => ucfirst($matches[1]), 'site_url' => $matches[0]);
-		}
+        if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $fetch_url, $matches)) {
+                    $basic_info = array('title' => ucfirst($matches[1]), 'site_url' => $matches[0]);
+        }
 
-		return $basic_info;
-	}
+        return $basic_info;
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

plugins/af_comics/filters/af_comics_whomp.php

Indentation +24 added lines, -24 removed lines

@@ -1,37 +1,37 @@
 <?php
 class Af_Comics_Whomp extends Af_ComicFilter {
 
-	public function supported() {
-		return array("Whomp!");
-	}
+    public function supported() {
+        return array("Whomp!");
+    }
 
-	public function process(&$article) {
-		if (strpos($article["guid"], "whompcomic.com") !== false) {
+    public function process(&$article) {
+        if (strpos($article["guid"], "whompcomic.com") !== false) {
 
-			$res = fetch_file_contents($article["link"], false, false, false,
-				 false, false, 0,
-				 "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)");
+            $res = fetch_file_contents($article["link"], false, false, false,
+                    false, false, 0,
+                    "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)");
 
-			global $fetch_last_error_content;
+            global $fetch_last_error_content;
 
-			if (!$res && $fetch_last_error_content) {
-							$res = $fetch_last_error_content;
-			}
+            if (!$res && $fetch_last_error_content) {
+                            $res = $fetch_last_error_content;
+            }
 
-			$doc = new DOMDocument();
+            $doc = new DOMDocument();
 
-			if (@$doc->loadHTML($res)) {
-				$xpath = new DOMXPath($doc);
-				$basenode = $xpath->query('//img[@id="cc-comic"]')->item(0);
+            if (@$doc->loadHTML($res)) {
+                $xpath = new DOMXPath($doc);
+                $basenode = $xpath->query('//img[@id="cc-comic"]')->item(0);
 
-				if ($basenode) {
-					$article["content"] = $doc->saveHTML($basenode);
-				}
-			}
+                if ($basenode) {
+                    $article["content"] = $doc->saveHTML($basenode);
+                }
+            }
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

plugins/af_comics/filters/af_comics_pa.php

Indentation +46 added lines, -46 removed lines

@@ -1,68 +1,68 @@
 <?php
 class Af_Comics_Pa extends Af_ComicFilter {
 
-	public function supported() {
-		return array("Penny Arcade");
-	}
+    public function supported() {
+        return array("Penny Arcade");
+    }
 
-	public function process(&$article) {
-		if (strpos($article["link"], "penny-arcade.com") !== false && strpos($article["title"], "Comic:") !== false) {
+    public function process(&$article) {
+        if (strpos($article["link"], "penny-arcade.com") !== false && strpos($article["title"], "Comic:") !== false) {
 
-				$doc = new DOMDocument();
+                $doc = new DOMDocument();
 
-				if ($doc->loadHTML(fetch_file_contents($article["link"]))) {
-					$xpath = new DOMXPath($doc);
-					$basenode = $xpath->query('(//div[@id="comicFrame"])')->item(0);
+                if ($doc->loadHTML(fetch_file_contents($article["link"]))) {
+                    $xpath = new DOMXPath($doc);
+                    $basenode = $xpath->query('(//div[@id="comicFrame"])')->item(0);
 
-					if ($basenode) {
-						$article["content"] = $doc->saveHTML($basenode);
-					}
-				}
+                    if ($basenode) {
+                        $article["content"] = $doc->saveHTML($basenode);
+                    }
+                }
 
-			return true;
-		}
+            return true;
+        }
 
-		if (strpos($article["link"], "penny-arcade.com") !== false && strpos($article["title"], "News Post:") !== false) {
-				$doc = new DOMDocument();
+        if (strpos($article["link"], "penny-arcade.com") !== false && strpos($article["title"], "News Post:") !== false) {
+                $doc = new DOMDocument();
 
-				if ($doc->loadHTML(fetch_file_contents($article["link"]))) {
-					$xpath = new DOMXPath($doc);
-					$entries = $xpath->query('(//div[@class="post"])');
+                if ($doc->loadHTML(fetch_file_contents($article["link"]))) {
+                    $xpath = new DOMXPath($doc);
+                    $entries = $xpath->query('(//div[@class="post"])');
 
-					$basenode = false;
+                    $basenode = false;
 
-					foreach ($entries as $entry) {
-						$basenode = $entry;
-					}
+                    foreach ($entries as $entry) {
+                        $basenode = $entry;
+                    }
 
-					$meta = $xpath->query('(//div[@class="meta"])')->item(0);
-					if ($meta->parentNode) { $meta->parentNode->removeChild($meta); }
+                    $meta = $xpath->query('(//div[@class="meta"])')->item(0);
+                    if ($meta->parentNode) { $meta->parentNode->removeChild($meta); }
 
-					$header = $xpath->query('(//div[@class="postBody"]/h2)')->item(0);
-					if ($header->parentNode) { $header->parentNode->removeChild($header); }
+                    $header = $xpath->query('(//div[@class="postBody"]/h2)')->item(0);
+                    if ($header->parentNode) { $header->parentNode->removeChild($header); }
 
-					$header = $xpath->query('(//div[@class="postBody"]/div[@class="comicPost"])')->item(0);
-					if ($header->parentNode) { $header->parentNode->removeChild($header); }
+                    $header = $xpath->query('(//div[@class="postBody"]/div[@class="comicPost"])')->item(0);
+                    if ($header->parentNode) { $header->parentNode->removeChild($header); }
 
-					$avatar = $xpath->query('(//div[@class="avatar"]//img)')->item(0);
+                    $avatar = $xpath->query('(//div[@class="avatar"]//img)')->item(0);
 
-					if ($basenode) {
-											$basenode->insertBefore($avatar, $basenode->firstChild);
-					}
+                    if ($basenode) {
+                                            $basenode->insertBefore($avatar, $basenode->firstChild);
+                    }
 
-					$uninteresting = $xpath->query('(//div[@class="avatar"])');
-					foreach ($uninteresting as $i) {
-						$i->parentNode->removeChild($i);
-					}
+                    $uninteresting = $xpath->query('(//div[@class="avatar"])');
+                    foreach ($uninteresting as $i) {
+                        $i->parentNode->removeChild($i);
+                    }
 
-					if ($basenode) {
-						$article["content"] = $doc->saveHTML($basenode);
-					}
-				}
+                    if ($basenode) {
+                        $article["content"] = $doc->saveHTML($basenode);
+                    }
+                }
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

plugins/af_comics/filters/af_comics_darklegacy.php

Indentation +24 added lines, -24 removed lines

@@ -1,39 +1,39 @@
 <?php
 class Af_Comics_DarkLegacy extends Af_ComicFilter {
 
-	public function supported() {
-		return array("Dark Legacy Comics");
-	}
+    public function supported() {
+        return array("Dark Legacy Comics");
+    }
 
-	public function process(&$article) {
+    public function process(&$article) {
 
-		if (strpos($article["guid"], "darklegacycomics.com") !== false) {
+        if (strpos($article["guid"], "darklegacycomics.com") !== false) {
 
-				$res = fetch_file_contents($article["link"], false, false, false,
-					 false, false, 0,
-					 "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)");
+                $res = fetch_file_contents($article["link"], false, false, false,
+                        false, false, 0,
+                        "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)");
 
-				global $fetch_last_error_content;
+                global $fetch_last_error_content;
 
-				if (!$res && $fetch_last_error_content) {
-									$res = $fetch_last_error_content;
-				}
+                if (!$res && $fetch_last_error_content) {
+                                    $res = $fetch_last_error_content;
+                }
 
-				$doc = new DOMDocument();
+                $doc = new DOMDocument();
 
-				if (@$doc->loadHTML($res)) {
-					$xpath = new DOMXPath($doc);
-					$basenode = $xpath->query('//div[@class="comic"]')->item(0);
+                if (@$doc->loadHTML($res)) {
+                    $xpath = new DOMXPath($doc);
+                    $basenode = $xpath->query('//div[@class="comic"]')->item(0);
 
-					if ($basenode) {
+                    if ($basenode) {
 
-						$article["content"] = $doc->saveHTML($basenode);
-					}
-				}
+                        $article["content"] = $doc->saveHTML($basenode);
+                    }
+                }
 
-			 return true;
-		}
+                return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }