codysnider / tt-rss

plugins/search_sphinx/sphinxapi.php

Switch Indentation +19 added lines, -19 removed lines

@@ -1003,22 +1003,22 @@ 
             $req .= pack("N", $filter["type"]);
             switch ($filter["type"])
             {
-                case SPH_FILTER_VALUES:
-                    $req .= pack("N", count($filter["values"]));
-                    foreach ($filter["values"] as $value)
-                        $req .= sphPackI64($value);
-                    break;
-
-                case SPH_FILTER_RANGE:
-                    $req .= sphPackI64($filter["min"]).sphPackI64($filter["max"]);
-                    break;
-
-                case SPH_FILTER_FLOATRANGE:
-                    $req .= $this->_PackFloat($filter["min"]).$this->_PackFloat($filter["max"]);
-                    break;
-
-                default:
-                    assert(0 && "internal error: unhandled filter type");
+            case SPH_FILTER_VALUES:
+                $req .= pack("N", count($filter["values"]));
+                foreach ($filter["values"] as $value)
+                    $req .= sphPackI64($value);
+                break;
+
+            case SPH_FILTER_RANGE:
+                $req .= sphPackI64($filter["min"]).sphPackI64($filter["max"]);
+                break;
+
+            case SPH_FILTER_FLOATRANGE:
+                $req .= $this->_PackFloat($filter["min"]).$this->_PackFloat($filter["max"]);
+                break;
+
+            default:
+                assert(0 && "internal error: unhandled filter type");
             }
             $req .= pack("N", $filter["exclude"]);
         }
@@ -1073,9 +1073,9 @@ 
                 $req .= sphPackU64($id);
                 switch ($entry["type"])
                 {
-                    case SPH_ATTR_FLOAT:	$req .= $this->_PackFloat($val); break;
-                    case SPH_ATTR_BIGINT:	$req .= sphPackI64($val); break;
-                    default:				$req .= pack("N", $val); break;
+                case SPH_ATTR_FLOAT:	$req .= $this->_PackFloat($val); break;
+                case SPH_ATTR_BIGINT:	$req .= sphPackI64($val); break;
+                default:				$req .= pack("N", $val); break;
                 }
             }
         }

plugins/mailto/init.php

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

Indentation +78 added lines, -78 removed lines

@@ -55,141 +55,141 @@
 			}
 			</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']);

classes/pref/feeds.php

Switch Indentation +60 added lines, -60 removed lines

@@ -1071,70 +1071,70 @@
                 $qpart = "";
 
                 switch ($k) {
-                    case "title":
-                        $qpart = "title = ".$this->pdo->quote($feed_title);
-                        break;
-
-                    case "feed_url":
-                        $qpart = "feed_url = ".$this->pdo->quote($feed_url);
-                        break;
-
-                    case "update_interval":
-                        $qpart = "update_interval = ".$this->pdo->quote($upd_intl);
-                        break;
-
-                    case "purge_interval":
-                        $qpart = "purge_interval =".$this->pdo->quote($purge_intl);
-                        break;
-
-                    case "auth_login":
-                        $qpart = "auth_login = ".$this->pdo->quote($auth_login);
-                        break;
-
-                    case "auth_pass":
-                        $qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
-                        break;
-
-                    case "private":
-                        $qpart = "private = ".$this->pdo->quote($private);
-                        break;
-
-                    case "include_in_digest":
-                        $qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
-                        break;
-
-                    case "always_display_enclosures":
-                        $qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
-                        break;
-
-                    case "mark_unread_on_update":
-                        $qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
-                        break;
-
-                    case "cache_images":
-                        $qpart = "cache_images = ".$this->pdo->quote($cache_images);
-                        break;
-
-                    case "hide_images":
-                        $qpart = "hide_images = ".$this->pdo->quote($hide_images);
-                        break;
-
-                    case "cat_id":
-                        if (get_pref('ENABLE_FEED_CATS')) {
-                            if ($cat_id) {
-                                $qpart = "cat_id = ".$this->pdo->quote($cat_id);
-                            } else {
-                                $qpart = 'cat_id = NULL';
-                            }
+                case "title":
+                    $qpart = "title = ".$this->pdo->quote($feed_title);
+                    break;
+
+                case "feed_url":
+                    $qpart = "feed_url = ".$this->pdo->quote($feed_url);
+                    break;
+
+                case "update_interval":
+                    $qpart = "update_interval = ".$this->pdo->quote($upd_intl);
+                    break;
+
+                case "purge_interval":
+                    $qpart = "purge_interval =".$this->pdo->quote($purge_intl);
+                    break;
+
+                case "auth_login":
+                    $qpart = "auth_login = ".$this->pdo->quote($auth_login);
+                    break;
+
+                case "auth_pass":
+                    $qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
+                    break;
+
+                case "private":
+                    $qpart = "private = ".$this->pdo->quote($private);
+                    break;
+
+                case "include_in_digest":
+                    $qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
+                    break;
+
+                case "always_display_enclosures":
+                    $qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
+                    break;
+
+                case "mark_unread_on_update":
+                    $qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
+                    break;
+
+                case "cache_images":
+                    $qpart = "cache_images = ".$this->pdo->quote($cache_images);
+                    break;
+
+                case "hide_images":
+                    $qpart = "hide_images = ".$this->pdo->quote($hide_images);
+                    break;
+
+                case "cat_id":
+                    if (get_pref('ENABLE_FEED_CATS')) {
+                        if ($cat_id) {
+                            $qpart = "cat_id = ".$this->pdo->quote($cat_id);
                         } else {
-                            $qpart = "";
+                            $qpart = 'cat_id = NULL';
                         }
+                    } else {
+                        $qpart = "";
+                    }
 
-                        break;
+                    break;
 
-                    case "feed_language":
-                        $qpart = "feed_language = ".$this->pdo->quote($feed_language);
-                        break;
+                case "feed_language":
+                    $qpart = "feed_language = ".$this->pdo->quote($feed_language);
+                    break;
 
                 }
 

classes/pref/prefs.php

Switch Indentation +16 added lines, -16 removed lines

@@ -172,26 +172,26 @@
             $value = $_POST[$pref_name];
 
             switch ($pref_name) {
-                case 'DIGEST_PREFERRED_TIME':
-                    if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
+            case 'DIGEST_PREFERRED_TIME':
+                if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
 
-                        $sth = $this->pdo->prepare("UPDATE ttrss_users SET
+                    $sth = $this->pdo->prepare("UPDATE ttrss_users SET
 						last_digest_sent = NULL WHERE id = ?");
-                        $sth->execute([$_SESSION['uid']]);
+                    $sth->execute([$_SESSION['uid']]);
 
-                    }
-                    break;
-                case 'USER_LANGUAGE':
-                    if (!$need_reload) {
-                        $need_reload = $_SESSION["language"] != $value;
-                    }
-                    break;
+                }
+                break;
+            case 'USER_LANGUAGE':
+                if (!$need_reload) {
+                    $need_reload = $_SESSION["language"] != $value;
+                }
+                break;
 
-                case 'USER_CSS_THEME':
-                    if (!$need_reload) {
-                        $need_reload = get_pref($pref_name) != $value;
-                    }
-                    break;
+            case 'USER_CSS_THEME':
+                if (!$need_reload) {
+                    $need_reload = get_pref($pref_name) != $value;
+                }
+                break;
             }
 
             set_pref($pref_name, $value);

classes/logger/sql.php

Indentation +30 added lines, -30 removed lines

@@ -1,48 +1,48 @@
 <?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/feeds.php

Switch Indentation +141 added lines, -141 removed lines

@@ -412,21 +412,21 @@ 
                     $message = $query_error_override;
                 } else {
                     switch ($view_mode) {
-                        case "unread":
-                            $message = __("No unread articles found to display.");
-                            break;
-                        case "updated":
-                            $message = __("No updated articles found to display.");
-                            break;
-                        case "marked":
-                            $message = __("No starred articles found to display.");
-                            break;
-                        default:
-                            if ($feed < LABEL_BASE_INDEX) {
-                                $message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter.");
-                            } else {
-                                $message = __("No articles found to display.");
-                            }
+                    case "unread":
+                        $message = __("No unread articles found to display.");
+                        break;
+                    case "updated":
+                        $message = __("No updated articles found to display.");
+                        break;
+                    case "marked":
+                        $message = __("No starred articles found to display.");
+                        break;
+                    default:
+                        if ($feed < LABEL_BASE_INDEX) {
+                            $message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter.");
+                        } else {
+                            $message = __("No articles found to display.");
+                        }
                     }
                 }
 
@@ -893,29 +893,29 @@ 
         // TODO: all this interval stuff needs some generic generator function
 
         switch ($mode) {
-            case "1day":
-                if (DB_TYPE == "pgsql") {
-                    $date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
-                } else {
-                    $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
-                }
-                break;
-            case "1week":
-                if (DB_TYPE == "pgsql") {
-                    $date_qpart = "date_entered < NOW() - INTERVAL '1 week' ";
-                } else {
-                    $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
-                }
-                break;
-            case "2week":
-                if (DB_TYPE == "pgsql") {
-                    $date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
-                } else {
-                    $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) ";
-                }
-                break;
-            default:
-                $date_qpart = "true";
+        case "1day":
+            if (DB_TYPE == "pgsql") {
+                $date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
+            } else {
+                $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
+            }
+            break;
+        case "1week":
+            if (DB_TYPE == "pgsql") {
+                $date_qpart = "date_entered < NOW() - INTERVAL '1 week' ";
+            } else {
+                $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
+            }
+            break;
+        case "2week":
+            if (DB_TYPE == "pgsql") {
+                $date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
+            } else {
+                $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) ";
+            }
+            break;
+        default:
+            $date_qpart = "true";
         }
 
         if (is_numeric($feed)) {
@@ -1237,28 +1237,28 @@ 
 
     public static function getFeedIcon($id) {
         switch ($id) {
-            case 0:
-                return "archive";
-            case -1:
-                return "star";
-            case -2:
-                return "rss_feed";
-            case -3:
-                return "whatshot";
-            case -4:
-                return "inbox";
-            case -6:
-                return "restore";
-            default:
-                if ($id < LABEL_BASE_INDEX) {
-                    return "label";
-                } else {
-                    $icon = self::getIconFile($id);
+        case 0:
+            return "archive";
+        case -1:
+            return "star";
+        case -2:
+            return "rss_feed";
+        case -3:
+            return "whatshot";
+        case -4:
+            return "inbox";
+        case -6:
+            return "restore";
+        default:
+            if ($id < LABEL_BASE_INDEX) {
+                return "label";
+            } else {
+                $icon = self::getIconFile($id);
 
-                    if ($icon && file_exists($icon)) {
-                        return ICONS_URL."/".basename($icon)."?".filemtime($icon);
-                    }
+                if ($icon && file_exists($icon)) {
+                    return ICONS_URL."/".basename($icon)."?".filemtime($icon);
                 }
+            }
         }
 
         return false;
@@ -2263,104 +2263,104 @@ 
             $commandpair = explode(":", mb_strtolower($k), 2);
 
             switch ($commandpair[0]) {
-                case "title":
-                    if ($commandpair[1]) {
-                        array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
-                            $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+            case "title":
+                if ($commandpair[1]) {
+                    array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
+                        $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        array_push($search_words, $k);
-                    }
-                    break;
-                case "author":
-                    if ($commandpair[1]) {
-                        array_push($query_keywords, "($not (LOWER(author) LIKE ".
-                            $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+                    array_push($search_words, $k);
+                }
+                break;
+            case "author":
+                if ($commandpair[1]) {
+                    array_push($query_keywords, "($not (LOWER(author) LIKE ".
+                        $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        array_push($search_words, $k);
-                    }
-                    break;
-                case "note":
-                    if ($commandpair[1]) {
-                        if ($commandpair[1] == "true")
-                            array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
-                        else if ($commandpair[1] == "false")
-                            array_push($query_keywords, "($not (note IS NULL OR note = ''))");
-                        else
-                            array_push($query_keywords, "($not (LOWER(note) LIKE ".
-                                $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                    array_push($search_words, $k);
+                }
+                break;
+            case "note":
+                if ($commandpair[1]) {
+                    if ($commandpair[1] == "true")
+                        array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
+                    else if ($commandpair[1] == "false")
+                        array_push($query_keywords, "($not (note IS NULL OR note = ''))");
+                    else
+                        array_push($query_keywords, "($not (LOWER(note) LIKE ".
+                            $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        if (!$not) array_push($search_words, $k);
-                    }
-                    break;
-                case "star":
-
-                    if ($commandpair[1]) {
-                        if ($commandpair[1] == "true")
-                            array_push($query_keywords, "($not (marked = true))");
-                        else
-                            array_push($query_keywords, "($not (marked = false))");
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                    if (!$not) array_push($search_words, $k);
+                }
+                break;
+            case "star":
+
+                if ($commandpair[1]) {
+                    if ($commandpair[1] == "true")
+                        array_push($query_keywords, "($not (marked = true))");
+                    else
+                        array_push($query_keywords, "($not (marked = false))");
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        if (!$not) array_push($search_words, $k);
-                    }
-                    break;
-                case "pub":
-                    if ($commandpair[1]) {
-                        if ($commandpair[1] == "true")
-                            array_push($query_keywords, "($not (published = true))");
-                        else
-                            array_push($query_keywords, "($not (published = false))");
+                    if (!$not) array_push($search_words, $k);
+                }
+                break;
+            case "pub":
+                if ($commandpair[1]) {
+                    if ($commandpair[1] == "true")
+                        array_push($query_keywords, "($not (published = true))");
+                    else
+                        array_push($query_keywords, "($not (published = false))");
 
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        if (!$not) array_push($search_words, $k);
-                    }
-                    break;
-                case "unread":
-                    if ($commandpair[1]) {
-                        if ($commandpair[1] == "true")
-                            array_push($query_keywords, "($not (unread = true))");
-                        else
-                            array_push($query_keywords, "($not (unread = false))");
+                    if (!$not) array_push($search_words, $k);
+                }
+                break;
+            case "unread":
+                if ($commandpair[1]) {
+                    if ($commandpair[1] == "true")
+                        array_push($query_keywords, "($not (unread = true))");
+                    else
+                        array_push($query_keywords, "($not (unread = false))");
 
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        if (!$not) array_push($search_words, $k);
-                    }
-                    break;
-                default:
-                    if (strpos($k, "@") === 0) {
+                    if (!$not) array_push($search_words, $k);
+                }
+                break;
+            default:
+                if (strpos($k, "@") === 0) {
 
-                        $user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']);
-                        $orig_ts = strtotime(substr($k, 1));
-                        $k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
+                    $user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']);
+                    $orig_ts = strtotime(substr($k, 1));
+                    $k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
 
-                        //$k = date("Y-m-d", strtotime(substr($k, 1)));
+                    //$k = date("Y-m-d", strtotime(substr($k, 1)));
 
-                        array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
-                    } else {
+                    array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
+                } else {
 
-                        if (DB_TYPE == "pgsql") {
-                            $k = mb_strtolower($k);
-                            array_push($search_query_leftover, $not ? "!$k" : $k);
-                        } else {
-                            array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                    if (DB_TYPE == "pgsql") {
+                        $k = mb_strtolower($k);
+                        array_push($search_query_leftover, $not ? "!$k" : $k);
+                    } else {
+                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        }
+                    }
 
-                        if (!$not) {
-                            array_push($search_words, $k);
-                        }
+                    if (!$not) {
+                        array_push($search_words, $k);
                     }
+                }
             }
         }
 

classes/db.php

Switch Indentation +8 added lines, -8 removed lines

@@ -24,14 +24,14 @@
         $er = error_reporting(E_ALL);
 
         switch (DB_TYPE) {
-            case "mysql":
-                $this->adapter = new Db_Mysqli();
-                break;
-            case "pgsql":
-                $this->adapter = new Db_Pgsql();
-                break;
-            default:
-                die("Unknown DB_TYPE: ".DB_TYPE);
+        case "mysql":
+            $this->adapter = new Db_Mysqli();
+            break;
+        case "pgsql":
+            $this->adapter = new Db_Pgsql();
+            break;
+        default:
+            die("Unknown DB_TYPE: ".DB_TYPE);
         }
 
         if (!$this->adapter) {

classes/rssutils.php

Switch Indentation +26 added lines, -26 removed lines

@@ -1364,35 +1364,35 @@
                 }
 
                 switch ($rule["type"]) {
-                    case "title":
-                        $match = @preg_match("/$reg_exp/iu", $title);
-                        break;
-                    case "content":
-                        // we don't need to deal with multiline regexps
-                        $content = preg_replace("/[\r\n\t]/", "", $content);
+                case "title":
+                    $match = @preg_match("/$reg_exp/iu", $title);
+                    break;
+                case "content":
+                    // we don't need to deal with multiline regexps
+                    $content = preg_replace("/[\r\n\t]/", "", $content);
 
-                        $match = @preg_match("/$reg_exp/iu", $content);
-                        break;
-                    case "both":
-                        // we don't need to deal with multiline regexps
-                        $content = preg_replace("/[\r\n\t]/", "", $content);
+                    $match = @preg_match("/$reg_exp/iu", $content);
+                    break;
+                case "both":
+                    // we don't need to deal with multiline regexps
+                    $content = preg_replace("/[\r\n\t]/", "", $content);
 
-                        $match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
-                        break;
-                    case "link":
-                        $match = @preg_match("/$reg_exp/iu", $link);
-                        break;
-                    case "author":
-                        $match = @preg_match("/$reg_exp/iu", $author);
-                        break;
-                    case "tag":
-                        foreach ($tags as $tag) {
-                            if (@preg_match("/$reg_exp/iu", $tag)) {
-                                $match = true;
-                                break;
-                            }
+                    $match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
+                    break;
+                case "link":
+                    $match = @preg_match("/$reg_exp/iu", $link);
+                    break;
+                case "author":
+                    $match = @preg_match("/$reg_exp/iu", $author);
+                    break;
+                case "tag":
+                    foreach ($tags as $tag) {
+                        if (@preg_match("/$reg_exp/iu", $tag)) {
+                            $match = true;
+                            break;
                         }
-                        break;
+                    }
+                    break;
                 }
 
                 if ($rule_inverse) {