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

lib/phpqrcode/qrlib.php

Indentation +13 added lines, -13 removed lines

@@ -25,19 +25,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

 	

-	$QR_BASEDIR = dirname(__FILE__).DIRECTORY_SEPARATOR;

+    $QR_BASEDIR = dirname(__FILE__).DIRECTORY_SEPARATOR;

 	

-	// Required libs

+    // Required libs

 	

-	include $QR_BASEDIR."qrconst.php";

-	include $QR_BASEDIR."qrconfig.php";

-	include $QR_BASEDIR."qrtools.php";

-	include $QR_BASEDIR."qrspec.php";

-	include $QR_BASEDIR."qrimage.php";

-	include $QR_BASEDIR."qrinput.php";

-	include $QR_BASEDIR."qrbitstream.php";

-	include $QR_BASEDIR."qrsplit.php";

-	include $QR_BASEDIR."qrrscode.php";

-	include $QR_BASEDIR."qrmask.php";

-	include $QR_BASEDIR."qrencode.php";

+    include $QR_BASEDIR."qrconst.php";

+    include $QR_BASEDIR."qrconfig.php";

+    include $QR_BASEDIR."qrtools.php";

+    include $QR_BASEDIR."qrspec.php";

+    include $QR_BASEDIR."qrimage.php";

+    include $QR_BASEDIR."qrinput.php";

+    include $QR_BASEDIR."qrbitstream.php";

+    include $QR_BASEDIR."qrsplit.php";

+    include $QR_BASEDIR."qrrscode.php";

+    include $QR_BASEDIR."qrmask.php";

+    include $QR_BASEDIR."qrencode.php";

 

lib/phpqrcode/tools/merge.php

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         $outputCode .= "\n\n".$anotherCode."\n\n";

     }

     

-	$versionDataEx = explode("\n", file_get_contents($versionFile));

+    $versionDataEx = explode("\n", file_get_contents($versionFile));

 	

     $outputContents = file_get_contents($headerFile);

     $outputContents .= "\n\n/*\n * Version: ".trim($versionDataEx[0])."\n * Build: ".trim($versionDataEx[1])."\n */\n\n";

lib/phpqrcode/tools/merged_header.php

Indentation +1 added lines, -1 removed lines

@@ -33,4 +33,4 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

- 
\ No newline at end of file
+    
\ No newline at end of file

lib/phpqrcode/qrspec.php

Indentation +2 added lines, -2 removed lines

@@ -335,10 +335,10 @@
 

         // Version information pattern -----------------------------------------

 

-		// Version information pattern (BCH coded).

+        // Version information pattern (BCH coded).

         // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.

         

-		// size: [QRSPEC_VERSION_MAX - 6]

+        // size: [QRSPEC_VERSION_MAX - 6]

 		

         public static $versionPattern = array(

             0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,

Braces +24 added lines, -16 removed lines

@@ -115,8 +115,9 @@ 
 

             for ($i = 1; $i <= QRSPEC_VERSION_MAX; $i++) {

                 $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];

-                if ($words >= $size) 

-                    return $i;

+                if ($words >= $size) {
+                                    return $i;
+                }
             }

 

             return -1;

@@ -152,8 +153,9 @@ 
         //----------------------------------------------------------------------

         public static function maximumWords($mode, $version)

         {

-            if ($mode == QR_MODE_STRUCTURE) 

-                return 3;

+            if ($mode == QR_MODE_STRUCTURE) {
+                            return 3;
+            }
                 

             if ($version <= 9) {

                 $l = 0;

@@ -299,8 +301,9 @@ 
         //----------------------------------------------------------------------

         public static function putAlignmentPattern($version, &$frame, $width)

         {

-            if ($version < 2)

-                return;

+            if ($version < 2) {
+                            return;
+            }
 

             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];

             if ($d < 0) {

@@ -352,8 +355,9 @@ 
         //----------------------------------------------------------------------

         public static function getVersionPattern($version)

         {

-            if ($version < 7 || $version > QRSPEC_VERSION_MAX)

-                return 0;

+            if ($version < 7 || $version > QRSPEC_VERSION_MAX) {
+                            return 0;
+            }
 

             return self::$versionPattern[$version - 7];

         }

@@ -370,11 +374,13 @@ 
 

         public static function getFormatInfo($mask, $level)

         {

-            if ($mask < 0 || $mask > 7)

-                return 0;

+            if ($mask < 0 || $mask > 7) {
+                            return 0;
+            }
                 

-            if ($level < 0 || $level > 3)

-                return 0;                

+            if ($level < 0 || $level > 3) {
+                            return 0;
+            }
 

             return self::$formatInfo[$level][$mask];

         }

@@ -554,8 +560,9 @@ 
         //----------------------------------------------------------------------

         public static function newFrame($version)

         {

-            if ($version < 1 || $version > QRSPEC_VERSION_MAX) 

-                return null;

+            if ($version < 1 || $version > QRSPEC_VERSION_MAX) {
+                            return null;
+            }
 

             if (!isset(self::$frames[$version])) {

                 

@@ -573,8 +580,9 @@ 
                 }

             }

             

-            if (is_null(self::$frames[$version]))

-                return null;

+            if (is_null(self::$frames[$version])) {
+                            return null;
+            }
 

             return self::$frames[$version];

         }

lib/phpqrcode/qrmask.php

Indentation +8 added lines, -8 removed lines

@@ -25,17 +25,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-	define('N1', 3);

-	define('N2', 3);

-	define('N3', 40);

-	define('N4', 10);

+    define('N1', 3);

+    define('N2', 3);

+    define('N3', 40);

+    define('N4', 10);

 

-	class QRmask {

+    class QRmask {

 	

-		public $runLength = array();

+        public $runLength = array();

 		

-		//----------------------------------------------------------------------

-		public function __construct() 

+        //----------------------------------------------------------------------

+        public function __construct() 

         {

             $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);

         }

Braces +3 added lines, -2 removed lines

@@ -230,8 +230,9 @@
                 

                 $frameY = $frame[$y];

                 

-                if ($y > 0)

-                    $frameYM = $frame[$y - 1];

+                if ($y > 0) {
+                                    $frameYM = $frame[$y - 1];
+                }
                 

                 for ($x = 0; $x < $width; $x++) {

                     if (($x > 0) && ($y > 0)) {

classes/feeditem.php

Indentation +12 added lines, -12 removed lines

@@ -1,16 +1,16 @@
 <?php
 abstract class FeedItem {
-	abstract function get_id();
-	abstract function get_date();
-	abstract function get_link();
-	abstract function get_title();
-	abstract function get_description();
-	abstract function get_content();
-	abstract function get_comments_url();
-	abstract function get_comments_count();
-	abstract function get_categories();
-	abstract function get_enclosures();
-	abstract function get_author();
-	abstract function get_language();
+    abstract function get_id();
+    abstract function get_date();
+    abstract function get_link();
+    abstract function get_title();
+    abstract function get_description();
+    abstract function get_content();
+    abstract function get_comments_url();
+    abstract function get_comments_count();
+    abstract function get_categories();
+    abstract function get_enclosures();
+    abstract function get_author();
+    abstract function get_language();
 }