codysnider / tt-rss

plugins/search_sphinx/sphinxapi.php

Braces +241 added lines, -134 removed lines

@@ -133,14 +133,16 @@ 
     }
 
     // x32, int
-    if (is_int($v))
-        return pack("NN", $v < 0 ? -1 : 0, $v);
+    if (is_int($v)) {
+            return pack("NN", $v < 0 ? -1 : 0, $v);
+    }
 
     // x32, bcmath
     if (function_exists("bcmul"))
     {
-        if (bccomp($v, 0) == -1)
-            $v = bcadd("18446744073709551616", $v);
+        if (bccomp($v, 0) == -1) {
+                    $v = bcadd("18446744073709551616", $v);
+        }
         $h = bcdiv($v, "4294967296", 0);
         $l = bcmod($v, "4294967296");
         return pack("NN", (float) $h, (float) $l); // conversion to float is intentional; int would lose 31st bit
@@ -158,9 +160,9 @@ 
 
     if ($v < 0)
     {
-        if ($l == 0)
-            $h = 4294967296.0 - $h;
-        else
+        if ($l == 0) {
+                    $h = 4294967296.0 - $h;
+        } else
         {
             $h = 4294967295.0 - $h;
             $l = 4294967296.0 - $l;
@@ -180,8 +182,9 @@ 
         assert($v >= 0);
 
         // x64, int
-        if (is_int($v))
-            return pack("NN", $v >> 32, $v & 0xFFFFFFFF);
+        if (is_int($v)) {
+                    return pack("NN", $v >> 32, $v & 0xFFFFFFFF);
+        }
 
         // x64, bcmath
         if (function_exists("bcmul"))
@@ -204,8 +207,9 @@ 
     }
 
     // x32, int
-    if (is_int($v))
-        return pack("NN", 0, $v);
+    if (is_int($v)) {
+            return pack("NN", 0, $v);
+    }
 
     // x32, bcmath
     if (function_exists("bcmul"))
@@ -235,16 +239,23 @@ 
 
     if (PHP_INT_SIZE >= 8)
     {
-        if ($hi < 0) $hi += (1 << 32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-        if ($lo < 0) $lo += (1 << 32);
+        if ($hi < 0) {
+            $hi += (1 << 32);
+        }
+        // because php 5.2.2 to 5.2.5 is totally fucked up again
+        if ($lo < 0) {
+            $lo += (1 << 32);
+        }
 
         // x64, int
-        if ($hi <= 2147483647)
-            return ($hi << 32) + $lo;
+        if ($hi <= 2147483647) {
+                    return ($hi << 32) + $lo;
+        }
 
         // x64, bcmath
-        if (function_exists("bcmul"))
-            return bcadd($lo, bcmul($hi, "4294967296"));
+        if (function_exists("bcmul")) {
+                    return bcadd($lo, bcmul($hi, "4294967296"));
+        }
 
         // x64, no-bcmath
         $C = 100000;
@@ -256,16 +267,18 @@ 
             $l  = $l % $C;
         }
 
-        if ($h == 0)
-            return $l;
+        if ($h == 0) {
+                    return $l;
+        }
         return sprintf("%d%05d", $h, $l);
     }
 
     // x32, int
     if ($hi == 0)
     {
-        if ($lo > 0)
-            return $lo;
+        if ($lo > 0) {
+                    return $lo;
+        }
         return sprintf("%u", $lo);
     }
 
@@ -273,8 +286,9 @@ 
     $lo = sprintf("%u", $lo);
 
     // x32, bcmath
-    if (function_exists("bcmul"))
-        return bcadd($lo, bcmul($hi, "4294967296"));
+    if (function_exists("bcmul")) {
+            return bcadd($lo, bcmul($hi, "4294967296"));
+    }
 
     // x32, no-bcmath
     $hi = (float) $hi;
@@ -289,8 +303,9 @@ 
 
     $h = sprintf("%.0f", $h);
     $l = sprintf("%07.0f", $l);
-    if ($h == "0")
-        return sprintf("%.0f", (float) $l);
+    if ($h == "0") {
+            return sprintf("%.0f", (float) $l);
+    }
     return $h.$l;
 }
 
@@ -302,8 +317,13 @@ 
     // x64
     if (PHP_INT_SIZE >= 8)
     {
-        if ($hi < 0) $hi += (1 << 32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-        if ($lo < 0) $lo += (1 << 32);
+        if ($hi < 0) {
+            $hi += (1 << 32);
+        }
+        // because php 5.2.2 to 5.2.5 is totally fucked up again
+        if ($lo < 0) {
+            $lo += (1 << 32);
+        }
 
         return ($hi << 32) + $lo;
     }
@@ -311,15 +331,17 @@ 
     // x32, int
     if ($hi == 0)
     {
-        if ($lo > 0)
-            return $lo;
+        if ($lo > 0) {
+                    return $lo;
+        }
         return sprintf("%u", $lo);
     }
     // x32, int
     elseif ($hi == -1)
     {
-        if ($lo < 0)
-            return $lo;
+        if ($lo < 0) {
+                    return $lo;
+        }
         return sprintf("%.0f", $lo - 4294967296.0);
     }
 
@@ -337,8 +359,9 @@ 
     $lo = sprintf("%u", $lo);
 
     // x32, bcmath
-    if (function_exists("bcmul"))
-        return $neg.bcadd(bcadd($lo, bcmul($hi, "4294967296")), $c);
+    if (function_exists("bcmul")) {
+            return $neg.bcadd(bcadd($lo, bcmul($hi, "4294967296")), $c);
+    }
 
     // x32, no-bcmath
     $hi = (float) $hi;
@@ -358,8 +381,9 @@ 
 
     $h = sprintf("%.0f", $h);
     $l = sprintf("%07.0f", $l);
-    if ($h == "0")
-        return $neg.sprintf("%.0f", (float) $l);
+    if ($h == "0") {
+            return $neg.sprintf("%.0f", (float) $l);
+    }
     return $neg.$h.$l;
 }
 
@@ -369,10 +393,11 @@ 
     if (PHP_INT_SIZE >= 8)
     {
         // x64 route, workaround broken unpack() in 5.2.2+
-        if ($value < 0) $value += (1 << 32);
+        if ($value < 0) {
+            $value += (1 << 32);
+        }
         return $value;
-    }
-    else
+    } else
     {
         // x32 route, workaround php signed/unsigned braindamage
         return sprintf("%u", $value);
@@ -470,8 +495,9 @@ 
 
     public function __destruct()
     {
-        if ($this->_socket !== false)
-            fclose($this->_socket);
+        if ($this->_socket !== false) {
+                    fclose($this->_socket);
+        }
     }
 
     /// get last error message (string)
@@ -549,8 +575,9 @@ 
     /// leave mbstring workaround mode
     public function _MBPop()
     {
-        if ($this->_mbenc)
-            mb_internal_encoding($this->_mbenc);
+        if ($this->_mbenc) {
+                    mb_internal_encoding($this->_mbenc);
+        }
     }
 
     /// connect to searchd server
@@ -560,8 +587,9 @@ 
         {
             // we are in persistent connection mode, so we have a socket
             // however, need to check whether it's still alive
-            if (!@feof($this->_socket))
-                return $this->_socket;
+            if (!@feof($this->_socket)) {
+                            return $this->_socket;
+            }
 
             // force reopen
             $this->_socket = false;
@@ -575,24 +603,25 @@ 
         {
             $host = $this->_path;
             $port = 0;
-        }
-        else
+        } else
         {
             $host = $this->_host;
             $port = $this->_port;
         }
 
-        if ($this->_timeout <= 0)
-            $fp = @fsockopen($host, $port, $errno, $errstr);
-        else
-            $fp = @fsockopen($host, $port, $errno, $errstr, $this->_timeout);
+        if ($this->_timeout <= 0) {
+                    $fp = @fsockopen($host, $port, $errno, $errstr);
+        } else {
+                    $fp = @fsockopen($host, $port, $errno, $errstr, $this->_timeout);
+        }
 
         if (!$fp)
         {
-            if ($this->_path)
-                $location = $this->_path;
-            else
-                $location = "{$this->_host}:{$this->_port}";
+            if ($this->_path) {
+                            $location = $this->_path;
+            } else {
+                            $location = "{$this->_host}:{$this->_port}";
+            }
 
             $errstr = trim($errstr);
             $this->_error = "connection to $location failed (errno=$errno, msg=$errstr)";
@@ -645,8 +674,9 @@ 
                 }
             }
         }
-        if ($this->_socket === false)
-            fclose($fp);
+        if ($this->_socket === false) {
+                    fclose($fp);
+        }
 
         // check response
         $read = strlen($response);
@@ -706,10 +736,12 @@ 
         assert($max >= 0);
         $this->_offset = $offset;
         $this->_limit = $limit;
-        if ($max > 0)
-            $this->_maxmatches = $max;
-        if ($cutoff > 0)
-            $this->_cutoff = $cutoff;
+        if ($max > 0) {
+                    $this->_maxmatches = $max;
+        }
+        if ($cutoff > 0) {
+                    $this->_cutoff = $cutoff;
+        }
     }
 
     /// set maximum query time, in milliseconds, per-index
@@ -763,8 +795,9 @@ 
     public function SetWeights($weights)
     {
         assert(is_array($weights));
-        foreach ($weights as $weight)
-            assert(is_int($weight));
+        foreach ($weights as $weight) {
+                    assert(is_int($weight));
+        }
 
         $this->_weights = $weights;
     }
@@ -814,8 +847,9 @@ 
 
         if (is_array($values) && count($values))
         {
-            foreach ($values as $value)
-                assert(is_numeric($value));
+            foreach ($values as $value) {
+                            assert(is_numeric($value));
+            }
 
             $this->_filters[] = array("type"=>SPH_FILTER_VALUES, "attr"=>$attribute, "exclude"=>$exclude, "values"=>$values);
         }
@@ -954,15 +988,18 @@ 
         $results = $this->RunQueries();
         $this->_reqs = array(); // just in case it failed too early
 
-        if (!is_array($results))
-            return false; // probably network error; error message should be already filled
+        if (!is_array($results)) {
+                    return false;
+        }
+        // probably network error; error message should be already filled
 
         $this->_error = $results[0]["error"];
         $this->_warning = $results[0]["warning"];
-        if ($results[0]["status"] == SEARCHD_ERROR)
-            return false;
-        else
-            return $results[0];
+        if ($results[0]["status"] == SEARCHD_ERROR) {
+                    return false;
+        } else {
+                    return $results[0];
+        }
     }
 
     /// helper to pack floats in network byte order
@@ -989,8 +1026,9 @@ 
         $req .= pack("N", strlen($this->_sortby)).$this->_sortby;
         $req .= pack("N", strlen($query)).$query; // query itself
         $req .= pack("N", count($this->_weights)); // weights
-        foreach ($this->_weights as $weight)
-            $req .= pack("N", (int) $weight);
+        foreach ($this->_weights as $weight) {
+                    $req .= pack("N", (int) $weight);
+        }
         $req .= pack("N", strlen($index)).$index; // indexes
         $req .= pack("N", 1); // id64 range marker
         $req .= sphPackU64($this->_min_id).sphPackU64($this->_max_id); // id64 range
@@ -1005,8 +1043,9 @@ 
             {
                 case SPH_FILTER_VALUES:
                     $req .= pack("N", count($filter["values"]));
-                    foreach ($filter["values"] as $value)
-                        $req .= sphPackI64($value);
+                    foreach ($filter["values"] as $value) {
+                                            $req .= sphPackI64($value);
+                    }
                     break;
 
                 case SPH_FILTER_RANGE:
@@ -1045,16 +1084,18 @@ 
 
         // per-index weights
         $req .= pack("N", count($this->_indexweights));
-        foreach ($this->_indexweights as $idx=>$weight)
-            $req .= pack("N", strlen($idx)).$idx.pack("N", $weight);
+        foreach ($this->_indexweights as $idx=>$weight) {
+                    $req .= pack("N", strlen($idx)).$idx.pack("N", $weight);
+        }
 
         // max query time
         $req .= pack("N", $this->_maxquerytime);
 
         // per-field weights
         $req .= pack("N", count($this->_fieldweights));
-        foreach ($this->_fieldweights as $field=>$weight)
-            $req .= pack("N", strlen($field)).$field.pack("N", $weight);
+        foreach ($this->_fieldweights as $field=>$weight) {
+                    $req .= pack("N", strlen($field)).$field.pack("N", $weight);
+        }
 
         // comment
         $req .= pack("N", strlen($comment)).$comment;
@@ -1200,8 +1241,7 @@ 
                 {
                     $doc = sphUnpackU64(substr($response, $p, 8)); $p += 8;
                     list(,$weight) = unpack("N*", substr($response, $p, 4)); $p += 4;
-                }
-                else
+                } else
                 {
                     list ($doc, $weight) = array_values(unpack("N*N*",
                         substr($response, $p, 8)));
@@ -1211,10 +1251,11 @@ 
                 $weight = sprintf("%u", $weight);
 
                 // create match entry
-                if ($this->_arrayresult)
-                    $result["matches"][$idx] = array("id"=>$doc, "weight"=>$weight);
-                else
-                    $result["matches"][$doc]["weight"] = $weight;
+                if ($this->_arrayresult) {
+                                    $result["matches"][$idx] = array("id"=>$doc, "weight"=>$weight);
+                } else {
+                                    $result["matches"][$doc]["weight"] = $weight;
+                }
 
                 // parse and create attributes
                 $attrvals = array();
@@ -1257,10 +1298,11 @@ 
                     }
                 }
 
-                if ($this->_arrayresult)
-                    $result["matches"][$idx]["attrs"] = $attrvals;
-                else
-                    $result["matches"][$doc]["attrs"] = $attrvals;
+                if ($this->_arrayresult) {
+                                    $result["matches"][$idx]["attrs"] = $attrvals;
+                } else {
+                                    $result["matches"][$doc]["attrs"] = $attrvals;
+                }
             }
 
             list ($total, $total_found, $msecs, $words) =
@@ -1311,25 +1353,63 @@ 
         // fixup options
         /////////////////
 
-        if (!isset($opts["before_match"]))		$opts["before_match"] = "<b>";
-        if (!isset($opts["after_match"]))			$opts["after_match"] = "</b>";
-        if (!isset($opts["chunk_separator"]))		$opts["chunk_separator"] = " ... ";
-        if (!isset($opts["limit"]))				$opts["limit"] = 256;
-        if (!isset($opts["limit_passages"]))		$opts["limit_passages"] = 0;
-        if (!isset($opts["limit_words"]))			$opts["limit_words"] = 0;
-        if (!isset($opts["around"]))				$opts["around"] = 5;
-        if (!isset($opts["exact_phrase"]))		$opts["exact_phrase"] = false;
-        if (!isset($opts["single_passage"]))		$opts["single_passage"] = false;
-        if (!isset($opts["use_boundaries"]))		$opts["use_boundaries"] = false;
-        if (!isset($opts["weight_order"]))		$opts["weight_order"] = false;
-        if (!isset($opts["query_mode"]))			$opts["query_mode"] = false;
-        if (!isset($opts["force_all_words"]))		$opts["force_all_words"] = false;
-        if (!isset($opts["start_passage_id"]))	$opts["start_passage_id"] = 1;
-        if (!isset($opts["load_files"]))			$opts["load_files"] = false;
-        if (!isset($opts["html_strip_mode"]))		$opts["html_strip_mode"] = "index";
-        if (!isset($opts["allow_empty"]))			$opts["allow_empty"] = false;
-        if (!isset($opts["passage_boundary"]))	$opts["passage_boundary"] = "none";
-        if (!isset($opts["emit_zones"]))			$opts["emit_zones"] = false;
+        if (!isset($opts["before_match"])) {
+            $opts["before_match"] = "<b>";
+        }
+        if (!isset($opts["after_match"])) {
+            $opts["after_match"] = "</b>";
+        }
+        if (!isset($opts["chunk_separator"])) {
+            $opts["chunk_separator"] = " ... ";
+        }
+        if (!isset($opts["limit"])) {
+            $opts["limit"] = 256;
+        }
+        if (!isset($opts["limit_passages"])) {
+            $opts["limit_passages"] = 0;
+        }
+        if (!isset($opts["limit_words"])) {
+            $opts["limit_words"] = 0;
+        }
+        if (!isset($opts["around"])) {
+            $opts["around"] = 5;
+        }
+        if (!isset($opts["exact_phrase"])) {
+            $opts["exact_phrase"] = false;
+        }
+        if (!isset($opts["single_passage"])) {
+            $opts["single_passage"] = false;
+        }
+        if (!isset($opts["use_boundaries"])) {
+            $opts["use_boundaries"] = false;
+        }
+        if (!isset($opts["weight_order"])) {
+            $opts["weight_order"] = false;
+        }
+        if (!isset($opts["query_mode"])) {
+            $opts["query_mode"] = false;
+        }
+        if (!isset($opts["force_all_words"])) {
+            $opts["force_all_words"] = false;
+        }
+        if (!isset($opts["start_passage_id"])) {
+            $opts["start_passage_id"] = 1;
+        }
+        if (!isset($opts["load_files"])) {
+            $opts["load_files"] = false;
+        }
+        if (!isset($opts["html_strip_mode"])) {
+            $opts["html_strip_mode"] = "index";
+        }
+        if (!isset($opts["allow_empty"])) {
+            $opts["allow_empty"] = false;
+        }
+        if (!isset($opts["passage_boundary"])) {
+            $opts["passage_boundary"] = "none";
+        }
+        if (!isset($opts["emit_zones"])) {
+            $opts["emit_zones"] = false;
+        }
 
         /////////////////
         // build request
@@ -1337,15 +1417,33 @@ 
 
         // v.1.2 req
         $flags = 1; // remove spaces
-        if ($opts["exact_phrase"])	$flags |= 2;
-        if ($opts["single_passage"])	$flags |= 4;
-        if ($opts["use_boundaries"])	$flags |= 8;
-        if ($opts["weight_order"])	$flags |= 16;
-        if ($opts["query_mode"])		$flags |= 32;
-        if ($opts["force_all_words"])	$flags |= 64;
-        if ($opts["load_files"])		$flags |= 128;
-        if ($opts["allow_empty"])		$flags |= 256;
-        if ($opts["emit_zones"])		$flags |= 512;
+        if ($opts["exact_phrase"]) {
+            $flags |= 2;
+        }
+        if ($opts["single_passage"]) {
+            $flags |= 4;
+        }
+        if ($opts["use_boundaries"]) {
+            $flags |= 8;
+        }
+        if ($opts["weight_order"]) {
+            $flags |= 16;
+        }
+        if ($opts["query_mode"]) {
+            $flags |= 32;
+        }
+        if ($opts["force_all_words"]) {
+            $flags |= 64;
+        }
+        if ($opts["load_files"]) {
+            $flags |= 128;
+        }
+        if ($opts["allow_empty"]) {
+            $flags |= 256;
+        }
+        if ($opts["emit_zones"]) {
+            $flags |= 512;
+        }
         $req = pack("NN", 0, $flags); // mode=0, flags=$flags
         $req .= pack("N", strlen($index)).$index; // req index
         $req .= pack("N", strlen($words)).$words; // req words
@@ -1512,8 +1610,9 @@ 
         assert(is_bool($mva));
 
         assert(is_array($attrs));
-        foreach ($attrs as $attr)
-            assert(is_string($attr));
+        foreach ($attrs as $attr) {
+                    assert(is_string($attr));
+        }
 
         assert(is_array($values));
         foreach ($values as $id=>$entry)
@@ -1526,10 +1625,12 @@ 
                 if ($mva)
                 {
                     assert(is_array($v));
-                    foreach ($v as $vv)
-                        assert(is_int($vv));
-                } else
-                    assert(is_int($v));
+                    foreach ($v as $vv) {
+                                            assert(is_int($vv));
+                    }
+                } else {
+                                    assert(is_int($v));
+                }
             }
         }
 
@@ -1551,9 +1652,10 @@ 
             foreach ($entry as $v)
             {
                 $req .= pack("N", $mva ? count($v) : $v);
-                if ($mva)
-                    foreach ($v as $vv)
+                if ($mva) {
+                                    foreach ($v as $vv)
                         $req .= pack("N", $vv);
+                }
             }
         }
 
@@ -1595,13 +1697,15 @@ 
             $this->_error = 'already connected';
             return false;
         }
-        if (!$fp = $this->_Connect())
-            return false;
+        if (!$fp = $this->_Connect()) {
+                    return false;
+        }
 
         // command, command version = 0, body length = 4, body = 1
         $req = pack("nnNN", SEARCHD_COMMAND_PERSIST, 0, 4, 1);
-        if (!$this->_Send($fp, $req, 12))
-            return false;
+        if (!$this->_Send($fp, $req, 12)) {
+                    return false;
+        }
 
         $this->_socket = $fp;
         return true;
@@ -1647,8 +1751,10 @@ 
         list ($rows, $cols) = array_values(unpack("N*N*", substr($response, $p, 8))); $p += 8;
 
         $res = array();
-        for ($i = 0; $i < $rows; $i++)
-            for ($j = 0; $j < $cols; $j++)
+        for ($i = 0; $i < $rows; $i++) {
+                    for ($j = 0;
+        }
+        $j < $cols; $j++)
         {
             list(,$len) = unpack("N*", substr($response, $p, 4)); $p += 4;
             $res[$i][] = substr($response, $p, $len); $p += $len;
@@ -1680,10 +1786,11 @@ 
         }
 
         $tag = -1;
-        if (strlen($response) == 4)
-            list(,$tag) = unpack("N*", $response);
-        else
-            $this->_error = "unexpected response length";
+        if (strlen($response) == 4) {
+                    list(,$tag) = unpack("N*", $response);
+        } else {
+                    $this->_error = "unexpected response length";
+        }
 
         $this->_MBPop();
         return $tag;

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']);

update.php

Braces +3 added lines, -2 removed lines

@@ -497,7 +497,8 @@
 
     PluginHost::getInstance()->run_commands($options);
 
-    if (file_exists(LOCK_DIRECTORY."/$lock_filename"))
-        if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
+    if (file_exists(LOCK_DIRECTORY."/$lock_filename")) {
+            if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
             fclose($lock_handle);
+    }
         unlink(LOCK_DIRECTORY."/$lock_filename");

classes/pref/filters.php

Braces +18 added lines, -8 removed lines

@@ -99,12 +99,16 @@ 
             }
         }
 
-        if (count($scope_qparts) == 0) $scope_qparts = ["true"];
+        if (count($scope_qparts) == 0) {
+            $scope_qparts = ["true"];
+        }
 
         $glue = $filter['match_any_rule'] ? " OR " : " AND ";
         $scope_qpart = join($glue, $scope_qparts);
 
-        if (!$scope_qpart) $scope_qpart = "true";
+        if (!$scope_qpart) {
+            $scope_qpart = "true";
+        }
 
         $rv = array();
 
@@ -583,8 +587,9 @@ 
             $title = __($row["description"]);
 
             if ($action["action_id"] == 4 || $action["action_id"] == 6 ||
-                $action["action_id"] == 7)
-                $title .= ": ".$action["action_param"];
+                $action["action_id"] == 7) {
+                            $title .= ": ".$action["action_param"];
+            }
 
             if ($action["action_id"] == 9) {
                 list ($pfclass, $pfaction) = explode(":", $action["action_param"]);
@@ -1169,11 +1174,16 @@ 
                 $num_actions -= 1;
             }
 
-            if ($match_any_rule) $title .= " (".__("matches any rule").")";
-            if ($inverse) $title .= " (".__("inverse").")";
+            if ($match_any_rule) {
+                $title .= " (".__("matches any rule").")";
+            }
+            if ($inverse) {
+                $title .= " (".__("inverse").")";
+            }
 
-            if ($num_actions > 0)
-                $actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
+            if ($num_actions > 0) {
+                            $actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
+            }
 
             return [$title, $actions];
         }

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

Braces +37 added lines, -24 removed lines

@@ -50,8 +50,9 @@ 
             $reply .= strip_tags($feed_title);
         }
 
-        if ($error)
-            $reply .= " <i title=\"".htmlspecialchars($error)."\" class='material-icons icon-error'>error</i>";
+        if ($error) {
+                    $reply .= " <i title=\"".htmlspecialchars($error)."\" class='material-icons icon-error'>error</i>";
+        }
 
         $reply .= "</span>";
         $reply .= "<span id='feed_current_unread' style='display: none'></span>";
@@ -2285,56 +2286,68 @@ 
                     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 ".
+                        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);
+                        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))");
+                        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);
+                        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 ($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%')
 								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);
+                        }
                     }
                     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 ($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%").")
 								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);
+                        }
                     }
                     break;
                 default:

classes/feedparser.php

Braces +3 added lines, -1 removed lines

@@ -26,8 +26,10 @@
         if ($error) {
             foreach (libxml_get_errors() as $error) {
                 if ($error->level == LIBXML_ERR_FATAL) {
-                    if (!isset($this->error)) //currently only the first error is reported
+                    if (!isset($this->error)) {
+                        //currently only the first error is reported
                         $this->error = $this->format_error($error);
+                    }
                     $this->libxml_errors [] = $this->format_error($error);
                 }
             }

classes/rssutils.php

Braces +7 added lines, -2 removed lines

@@ -616,10 +616,15 @@
                 Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
                 Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
 
-                if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp); ;
+                if (!$entry_title) {
+                    $entry_title = date("Y-m-d H:i:s", $entry_timestamp);
+                }
+                ;
 
                 $entry_content = $item->get_content();
-                if (!$entry_content) $entry_content = $item->get_description();
+                if (!$entry_content) {
+                    $entry_content = $item->get_description();
+                }
 
                 if (Debug::get_loglevel() >= 3) {
                     print "content: ";