codysnider / tt-rss

include/colors.php

Spacing +28 added lines, -28 removed lines

@@ -183,7 +183,7 @@ 
 ### HSL >> RGB
 function _color_hsl2rgb($hsl) {
     $h = $hsl[0]; $s = $hsl[1]; $l = $hsl[2];
-    $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
+    $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l * $s;
     $m1 = $l * 2 - $m2;
     return array(_color_hue2rgb($m1, $m2, $h + 0.33333),
         _color_hue2rgb($m1, $m2, $h),
@@ -208,7 +208,7 @@ 
         $hex = substr($hex, 1);
 
     if (strlen($hex) == 4) {
-        $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
+        $hex = $hex[1].$hex[1].$hex[2].$hex[2].$hex[3].$hex[3];
     }
     $c = hexdec($hex);
     for ($i = 16; $i >= 0; $i -= 8) {
@@ -220,7 +220,7 @@ 
 function _color_pack($rgb, $normalize = false) {
     foreach ($rgb as $k => $v) {
         $out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8));
-    }return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
+    }return '#'.str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
 }
 
 function rgb2hsl($arr) {
@@ -244,13 +244,13 @@ 
     } else {
         $s = $del_Max / $var_Max;
 
-        $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-        $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-        $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+        $del_R = ((($var_Max - $var_R) / 6) + ($del_Max / 2)) / $del_Max;
+        $del_G = ((($var_Max - $var_G) / 6) + ($del_Max / 2)) / $del_Max;
+        $del_B = ((($var_Max - $var_B) / 6) + ($del_Max / 2)) / $del_Max;
 
-        if      ($var_R == $var_Max) $h = $del_B - $del_G;
-        else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
-        else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
+        if ($var_R == $var_Max) $h = $del_B - $del_G;
+        else if ($var_G == $var_Max) $h = (1 / 3) + $del_R - $del_B;
+        else if ($var_B == $var_Max) $h = (2 / 3) + $del_G - $del_R;
 
         if ($h < 0) $h++;
         if ($h > 1) $h--;
@@ -264,21 +264,21 @@ 
     $s = $arr[1];
     $v = $arr[2];
 
-    if($s == 0) {
+    if ($s == 0) {
         $r = $g = $B = $v * 255;
     } else {
         $var_H = $h * 6;
-        $var_i = floor($var_H );
-        $var_1 = $v * (1 - $s );
-        $var_2 = $v * (1 - $s * ($var_H - $var_i ) );
-        $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
-
-        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
-        else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
-        else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
-        else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
-        else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
-        else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+        $var_i = floor($var_H);
+        $var_1 = $v * (1 - $s);
+        $var_2 = $v * (1 - $s * ($var_H - $var_i));
+        $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i)));
+
+        if ($var_i == 0) { $var_R = $v; $var_G = $var_3; $var_B = $var_1; }
+        else if ($var_i == 1) { $var_R = $var_2; $var_G = $v; $var_B = $var_1; }
+        else if ($var_i == 2) { $var_R = $var_1; $var_G = $v; $var_B = $var_3; }
+        else if ($var_i == 3) { $var_R = $var_1; $var_G = $var_2; $var_B = $v; }
+        else if ($var_i == 4) { $var_R = $var_3; $var_G = $var_1; $var_B = $v; }
+        else { $var_R = $v; $var_G = $var_1; $var_B = $var_2; }
 
         $r = $var_R * 255;
         $g = $var_G * 255;
@@ -288,7 +288,7 @@ 
 }
 
 function colorPalette($imageFile, $numColors, $granularity = 5) {
-    $granularity = max(1, abs((int)$granularity));
+    $granularity = max(1, abs((int) $granularity));
     $colors = array();
 
     $size = @getimagesize($imageFile);
@@ -301,10 +301,10 @@ 
             $ico = new floIcon();
             @$ico->readICO($imageFile);
 
-            if(count($ico->images)==0)
+            if (count($ico->images) == 0)
                 return false;
             else
-                $img = @$ico->images[count($ico->images)-1]->getImageResource();
+                $img = @$ico->images[count($ico->images) - 1]->getImageResource();
 
         } else {
             return false;
@@ -316,17 +316,17 @@ 
 
     if (!$img) return false;
 
-    for($x = 0; $x < $size[0]; $x += $granularity) {
-        for($y = 0; $y < $size[1]; $y += $granularity) {
+    for ($x = 0; $x < $size[0]; $x += $granularity) {
+        for ($y = 0; $y < $size[1]; $y += $granularity) {
             $thisColor = imagecolorat($img, $x, $y);
             $rgb = imagecolorsforindex($img, $thisColor);
             $red = round(round(($rgb['red'] / 0x33)) * 0x33);
             $green = round(round(($rgb['green'] / 0x33)) * 0x33);
             $blue = round(round(($rgb['blue'] / 0x33)) * 0x33);
             $thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue);
-            if(array_key_exists($thisRGB, $colors)) {
+            if (array_key_exists($thisRGB, $colors)) {
                 $colors[$thisRGB]++;
-            } else{
+            } else {
                 $colors[$thisRGB] = 1;
             }
         }

Braces +51 added lines, -31 removed lines

@@ -157,11 +157,12 @@ 
 
     $color = strtolower($color);
 
-    if (isset($htmlcolors[$color]))
-        return $htmlcolors[$color];
-    else
-        return $color;
-}
+    if (isset($htmlcolors[$color])) {
+            return $htmlcolors[$color];
+    } else {
+            return $color;
+    }
+    }
 
 ### RGB >> HSL
 function _color_rgb2hsl($rgb) {
@@ -173,9 +174,15 @@ 
     }
     $h = 0;
     if ($delta > 0) {
-        if ($max == $r && $max != $g) $h += ($g - $b) / $delta;
-        if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta);
-        if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta);
+        if ($max == $r && $max != $g) {
+            $h += ($g - $b) / $delta;
+        }
+        if ($max == $g && $max != $b) {
+            $h += (2 + ($b - $r) / $delta);
+        }
+        if ($max == $b && $max != $r) {
+            $h += (4 + ($r - $g) / $delta);
+        }
         $h /= 6;
     } return array($h, $s, $l);
 }
@@ -193,19 +200,26 @@ 
 ### Helper function for _color_hsl2rgb().
 function _color_hue2rgb($m1, $m2, $h) {
     $h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
-    if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
-    if ($h * 2 < 1) return $m2;
-    if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+    if ($h * 6 < 1) {
+        return $m1 + ($m2 - $m1) * $h * 6;
+    }
+    if ($h * 2 < 1) {
+        return $m2;
+    }
+    if ($h * 3 < 2) {
+        return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+    }
     return $m1;
 }
 
 ### Convert a hex color into an RGB triplet.
 function _color_unpack($hex, $normalize = false) {
 
-    if (strpos($hex, '#') !== 0)
-        $hex = _resolve_htmlcolor($hex);
-    else
-        $hex = substr($hex, 1);
+    if (strpos($hex, '#') !== 0) {
+            $hex = _resolve_htmlcolor($hex);
+    } else {
+            $hex = substr($hex, 1);
+    }
 
     if (strlen($hex) == 4) {
         $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
@@ -248,12 +262,20 @@ 
         $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
         $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
 
-        if      ($var_R == $var_Max) $h = $del_B - $del_G;
-        else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
-        else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
+        if      ($var_R == $var_Max) {
+            $h = $del_B - $del_G;
+        } else if ($var_G == $var_Max) {
+            $h = (1 / 3 ) + $del_R - $del_B;
+        } else if ($var_B == $var_Max) {
+            $h = (2 / 3 ) + $del_G - $del_R;
+        }
 
-        if ($h < 0) $h++;
-        if ($h > 1) $h--;
+        if ($h < 0) {
+            $h++;
+        }
+        if ($h > 1) {
+            $h--;
+        }
     }
 
     return array($h, $s, $v);
@@ -273,12 +295,7 @@ 
         $var_2 = $v * (1 - $s * ($var_H - $var_i ) );
         $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
 
-        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
-        else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
-        else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
-        else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
-        else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
-        else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; } else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; } else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; } else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; } else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; } else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
 
         $r = $var_R * 255;
         $g = $var_G * 255;
@@ -301,10 +318,11 @@ 
             $ico = new floIcon();
             @$ico->readICO($imageFile);
 
-            if(count($ico->images)==0)
-                return false;
-            else
-                $img = @$ico->images[count($ico->images)-1]->getImageResource();
+            if(count($ico->images)==0) {
+                            return false;
+            } else {
+                            $img = @$ico->images[count($ico->images)-1]->getImageResource();
+            }
 
         } else {
             return false;
@@ -314,7 +332,9 @@ 
         $img = @imagecreatefromstring(file_get_contents($imageFile));
     }
 
-    if (!$img) return false;
+    if (!$img) {
+        return false;
+    }
 
     for($x = 0; $x < $size[0]; $x += $granularity) {
         for($y = 0; $y < $size[1]; $y += $granularity) {

include/functions.php

Spacing +53 added lines, -54 removed lines

@@ -5,7 +5,7 @@ 
 define('LABEL_BASE_INDEX', -1024);
 define('PLUGIN_FEED_BASE_INDEX', -128);
 
-define('COOKIE_LIFETIME_LONG', 86400*365);
+define('COOKIE_LIFETIME_LONG', 86400 * 365);
 
 $fetch_last_error = false;
 $fetch_last_error_code = false;
@@ -57,13 +57,13 @@ 
 // feed limit for one update batch
 define_default('DAEMON_SLEEP_INTERVAL', 120);
 // default sleep interval between feed updates (sec)
-define_default('MAX_CACHE_FILE_SIZE', 64*1024*1024);
+define_default('MAX_CACHE_FILE_SIZE', 64 * 1024 * 1024);
 // do not cache files larger than that (bytes)
-define_default('MAX_DOWNLOAD_FILE_SIZE', 16*1024*1024);
+define_default('MAX_DOWNLOAD_FILE_SIZE', 16 * 1024 * 1024);
 // do not download general files larger than that (bytes)
 define_default('CACHE_MAX_DAYS', 7);
 // max age in days for various automatically cached (temporary) files
-define_default('MAX_CONDITIONAL_INTERVAL', 3600*12);
+define_default('MAX_CONDITIONAL_INTERVAL', 3600 * 12);
 // max interval between forced unconditional updates for servers
 // not complying with http if-modified-since (seconds)
 define_default('MAX_FETCH_REQUESTS_PER_HOST', 25);
@@ -157,7 +157,7 @@ 
 require_once 'db-prefs.php';
 require_once 'controls.php';
 
-define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . get_version() . ' (http://tt-rss.org/)');
+define('SELF_USER_AGENT', 'Tiny Tiny RSS/'.get_version().' (http://tt-rss.org/)');
 ini_set('user_agent', SELF_USER_AGENT);
 
 $schema_version = false;
@@ -201,7 +201,7 @@ 
     if (!is_array($options)) {
 
         // falling back on compatibility shim
-        $option_names = [ "url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent" ];
+        $option_names = ["url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent"];
         $tmp = [];
 
         for ($i = 0; $i < func_num_args(); $i++) {
@@ -228,13 +228,13 @@ 
     $url = str_replace(' ', '%20', $url);
 
     if (strpos($url, "//") === 0)
-        $url = 'http:' . $url;
+        $url = 'http:'.$url;
 
     $url_host = parse_url($url, PHP_URL_HOST);
     $fetch_domain_hits[$url_host] += 1;
 
     if ($fetch_domain_hits[$url_host] > MAX_FETCH_REQUESTS_PER_HOST) {
-        user_error("Exceeded fetch request quota for $url_host: " . $fetch_domain_hits[$url_host], E_USER_WARNING);
+        user_error("Exceeded fetch request quota for $url_host: ".$fetch_domain_hits[$url_host], E_USER_WARNING);
         #return false;
     }
 
@@ -250,7 +250,7 @@ 
             array_push($curl_http_headers, "If-Modified-Since: $last_modified");
 
         if ($http_accept)
-            array_push($curl_http_headers, "Accept: " . $http_accept);
+            array_push($curl_http_headers, "Accept: ".$http_accept);
 
         if (count($curl_http_headers) > 0)
             curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
@@ -263,11 +263,10 @@ 
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HEADER, true);
         curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-        curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent :
-            SELF_USER_AGENT);
+        curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent : SELF_USER_AGENT);
         curl_setopt($ch, CURLOPT_ENCODING, "");
 
-        if  ($http_referrer)
+        if ($http_referrer)
             curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
 
         if ($max_size) {
@@ -276,7 +275,7 @@ 
 
             // holy shit closures in php
             // download & upload are *expected* sizes respectively, could be zero
-            curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use( &$max_size) {
+            curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use(&$max_size) {
                 Debug::log("[curl progressfunction] $downloaded $max_size", Debug::$LOG_EXTENDED);
 
                 return ($downloaded > $max_size) ? 1 : 0; // if max size is set, abort when exceeding it
@@ -336,7 +335,7 @@ 
         if ($http_code != 200 || $type && strpos($fetch_last_content_type, "$type") === false) {
 
             if (curl_errno($ch) != 0) {
-                $fetch_last_error .=  "; " . curl_errno($ch) . " " . curl_error($ch);
+                $fetch_last_error .= "; ".curl_errno($ch)." ".curl_error($ch);
             }
 
             $fetch_last_error_content = $contents;
@@ -345,7 +344,7 @@ 
         }
 
         if (!$contents) {
-            $fetch_last_error = curl_errno($ch) . " " . curl_error($ch);
+            $fetch_last_error = curl_errno($ch)." ".curl_error($ch);
             curl_close($ch);
             return false;
         }
@@ -365,7 +364,7 @@ 
 
         $fetch_curl_used = false;
 
-        if ($login && $pass){
+        if ($login && $pass) {
             $url_parts = array();
 
             preg_match("/(^[^:]*):\/\/(.*)/", $url, $url_parts);
@@ -373,7 +372,7 @@ 
             $pass = urlencode($pass);
 
             if ($url_parts[1] && $url_parts[2]) {
-                $url = $url_parts[1] . "://$login:$pass@" . $url_parts[2];
+                $url = $url_parts[1]."://$login:$pass@".$url_parts[2];
             }
         }
 
@@ -441,7 +440,7 @@ 
             $error = error_get_last();
 
             if ($error['message'] != $old_error['message']) {
-                $fetch_last_error .= "; " . $error["message"];
+                $fetch_last_error .= "; ".$error["message"];
             }
 
             $fetch_last_error_content = $data;
@@ -516,15 +515,15 @@ 
 
 function get_ssl_certificate_id() {
     if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]) {
-        return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] .
-            $_SERVER["REDIRECT_SSL_CLIENT_V_START"] .
-            $_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
+        return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"].
+            $_SERVER["REDIRECT_SSL_CLIENT_V_START"].
+            $_SERVER["REDIRECT_SSL_CLIENT_V_END"].
             $_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
     }
     if ($_SERVER["SSL_CLIENT_M_SERIAL"]) {
-        return sha1($_SERVER["SSL_CLIENT_M_SERIAL"] .
-            $_SERVER["SSL_CLIENT_V_START"] .
-            $_SERVER["SSL_CLIENT_V_END"] .
+        return sha1($_SERVER["SSL_CLIENT_M_SERIAL"].
+            $_SERVER["SSL_CLIENT_V_START"].
+            $_SERVER["SSL_CLIENT_V_END"].
             $_SERVER["SSL_CLIENT_S_DN"]);
     }
     return "";
@@ -659,7 +658,7 @@ 
 function logout_user() {
     @session_destroy();
     if (isset($_COOKIE[session_name()])) {
-       setcookie(session_name(), '', time()-42000, '/');
+       setcookie(session_name(), '', time() - 42000, '/');
     }
     session_commit();
 }
@@ -743,7 +742,7 @@ 
 
 function truncate_string($str, $max_len, $suffix = '&hellip;') {
     if (mb_strlen($str, "utf-8") > $max_len) {
-        return mb_substr($str, 0, $max_len, "utf-8") . $suffix;
+        return mb_substr($str, 0, $max_len, "utf-8").$suffix;
     } else {
         return $str;
     }
@@ -753,7 +752,7 @@ 
     $startString = mb_substr($original, 0, $position, "UTF-8");
     $endString = mb_substr($original, $position + $length, mb_strlen($original), "UTF-8");
 
-    $out = $startString . $replacement . $endString;
+    $out = $startString.$replacement.$endString;
 
     return $out;
 }
@@ -891,9 +890,9 @@ 
 }
 
 function file_is_locked($filename) {
-    if (file_exists(LOCK_DIRECTORY . "/$filename")) {
+    if (file_exists(LOCK_DIRECTORY."/$filename")) {
         if (function_exists('flock')) {
-            $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
+            $fp = @fopen(LOCK_DIRECTORY."/$filename", "r");
             if ($fp) {
                 if (flock($fp, LOCK_EX | LOCK_NB)) {
                     flock($fp, LOCK_UN);
@@ -914,11 +913,11 @@ 
 
 
 function make_lockfile($filename) {
-    $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+    $fp = fopen(LOCK_DIRECTORY."/$filename", "w");
 
     if ($fp && flock($fp, LOCK_EX | LOCK_NB)) {
         $stat_h = fstat($fp);
-        $stat_f = stat(LOCK_DIRECTORY . "/$filename");
+        $stat_f = stat(LOCK_DIRECTORY."/$filename");
 
         if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
             if ($stat_h["ino"] != $stat_f["ino"] ||
@@ -929,7 +928,7 @@ 
         }
 
         if (function_exists('posix_getpid')) {
-            fwrite($fp, posix_getpid() . "\n");
+            fwrite($fp, posix_getpid()."\n");
         }
         return $fp;
     } else {
@@ -938,10 +937,10 @@ 
 }
 
 function make_stampfile($filename) {
-    $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+    $fp = fopen(LOCK_DIRECTORY."/$filename", "w");
 
     if (flock($fp, LOCK_EX | LOCK_NB)) {
-        fwrite($fp, time() . "\n");
+        fwrite($fp, time()."\n");
         flock($fp, LOCK_UN);
         fclose($fp);
         return true;
@@ -991,7 +990,7 @@ 
     $params["is_default_pw"] = Pref_Prefs::isdefaultpassword();
     $params["label_base_index"] = (int) LABEL_BASE_INDEX;
 
-    $theme = get_pref( "USER_CSS_THEME", false, false);
+    $theme = get_pref("USER_CSS_THEME", false, false);
     $params["theme"] = theme_exists($theme) ? $theme : "";
 
     $params["plugins"] = implode(", ", PluginHost::getInstance()->get_plugin_names());
@@ -1215,13 +1214,13 @@ 
         }
     }
 
-    if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+    if (file_exists(LOCK_DIRECTORY."/update_daemon.lock")) {
 
         $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
 
         if (time() - $_SESSION["daemon_stamp_check"] > 30) {
 
-            $stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+            $stamp = (int) @file_get_contents(LOCK_DIRECTORY."/update_daemon.stamp");
 
             if ($stamp) {
                 $stamp_delta = time() - $stamp;
@@ -1264,7 +1263,7 @@ 
     $res = trim($str); if (!$res) return '';
 
     $doc = new DOMDocument();
-    $doc->loadHTML('<?xml encoding="UTF-8">' . $res);
+    $doc->loadHTML('<?xml encoding="UTF-8">'.$res);
     $xpath = new DOMXPath($doc);
 
     $rewrite_base_url = $site_url ? $site_url : get_self_url_prefix();
@@ -1363,7 +1362,7 @@ 
         'ol', 'p', 'picture', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section',
         'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary',
         'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
-        'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
+        'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace');
 
     if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
 
@@ -1498,8 +1497,8 @@ 
 
 // this returns SELF_URL_PATH sans ending slash
 function get_self_url_prefix() {
-    if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH)-1) {
-        return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH)-1);
+    if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH) - 1) {
+        return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH) - 1);
     } else {
         return SELF_URL_PATH;
     }
@@ -1508,11 +1507,11 @@ 
 /* TODO: This needs to use bcrypt */
 function encrypt_password($pass, $salt = '', $mode2 = false) {
     if ($salt && $mode2) {
-        return "MODE2:" . hash('sha256', $salt . $pass);
+        return "MODE2:".hash('sha256', $salt.$pass);
     } else if ($salt) {
-        return "SHA1X:" . sha1("$salt:$pass");
+        return "SHA1X:".sha1("$salt:$pass");
     } else {
-        return "SHA1:" . sha1($pass);
+        return "SHA1:".sha1($pass);
     }
 }
 
@@ -1523,7 +1522,7 @@ 
 }
 
 function build_url($parts) {
-    return $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
+    return $parts['scheme']."://".$parts['host'].$parts['path'];
 }
 
 function cleanup_url_path($path) {
@@ -1567,7 +1566,7 @@ 
             $dir = dirname($parts['path']);
             $dir !== '/' && $dir .= '/';
         }
-        $parts['path'] = $dir . $rel_url;
+        $parts['path'] = $dir.$rel_url;
         $parts['path'] = cleanup_url_path($parts['path']);
 
         return build_url($parts);
@@ -1654,12 +1653,12 @@ 
 
         for ($i = 0; $i < $l10n->total; $i++) {
             $orig = $l10n->get_original_string($i);
-            if(strpos($orig, "\000") !== FALSE) { // Plural forms
+            if (strpos($orig, "\000") !== FALSE) { // Plural forms
                 $key = explode(chr(0), $orig);
                 print T_js_decl($key[0], _ngettext($key[0], $key[1], 1)); // Singular
                 print T_js_decl($key[1], _ngettext($key[0], $key[1], 2)); // Plural
             } else {
-                $translation = _dgettext($domain,$orig);
+                $translation = _dgettext($domain, $orig);
                 print T_js_decl($orig, $translation);
             }
         }
@@ -1715,7 +1714,7 @@ 
     if (file_exists($filename)) {
         $ext = pathinfo($filename, PATHINFO_EXTENSION);
 
-        return "data:image/$ext;base64," . base64_encode(file_get_contents($filename));
+        return "data:image/$ext;base64,".base64_encode(file_get_contents($filename));
     } else {
         return "";
     }
@@ -1752,7 +1751,7 @@ 
 
         header("Content-type: $mimetype");
 
-        $stamp = gmdate("D, d M Y H:i:s", filemtime($filename)) . " GMT";
+        $stamp = gmdate("D, d M Y H:i:s", filemtime($filename))." GMT";
         header("Last-Modified: $stamp", true);
 
         return readfile($filename);
@@ -1762,7 +1761,7 @@ 
 }
 
 function arr_qmarks($arr) {
-    return str_repeat('?,', count($arr) - 1) . '?';
+    return str_repeat('?,', count($arr) - 1).'?';
 }
 
 function get_scripts_timestamp() {
@@ -1797,7 +1796,7 @@ 
     } else if (PHP_OS === "Darwin") {
         $ttrss_version = "UNKNOWN (Unsupported, Darwin)";
     } else if (file_exists("$root_dir/version_static.txt")) {
-        $ttrss_version = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)";
+        $ttrss_version = trim(file_get_contents("$root_dir/version_static.txt"))." (Unsupported)";
     } else if (is_dir("$root_dir/.git")) {
         $rc = 0;
         $output = [];
@@ -1815,10 +1814,10 @@ 
                 $git_commit = $commit;
                 $git_timestamp = $timestamp;
 
-                $ttrss_version = strftime("%y.%m", $timestamp) . "-$commit";
+                $ttrss_version = strftime("%y.%m", $timestamp)."-$commit";
             }
         } else {
-            user_error("Unable to determine version (using $root_dir): " . implode("\n", $output), E_USER_WARNING);
+            user_error("Unable to determine version (using $root_dir): ".implode("\n", $output), E_USER_WARNING);
         }
     }
 

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -307,7 +307,7 @@ 
         $contents = substr($ret, $headers_length);
 
         foreach ($headers as $header) {
-            if (strstr($header, ": ") !== FALSE) {
+            if (strstr($header, ": ") !== false) {
                 list ($key, $value) = explode(": ", $header);
 
                 if (strtolower($key) == "last-modified") {
@@ -414,7 +414,7 @@ 
 
         if (isset($http_response_header) && is_array($http_response_header)) {
             foreach ($http_response_header as $header) {
-                if (strstr($header, ": ") !== FALSE) {
+                if (strstr($header, ": ") !== false) {
                     list ($key, $value) = explode(": ", $header);
 
                     $key = strtolower($key);
@@ -491,7 +491,7 @@ 
     }
 
     while ($line = $sth->fetch()) {
-        if (array_search($line["pref_name"], $active_prefs) === FALSE) {
+        if (array_search($line["pref_name"], $active_prefs) === false) {
 //				print "adding " . $line["pref_name"] . "<br>";
 
             if (get_schema_version() < 63) {
@@ -1654,7 +1654,7 @@ 
 
         for ($i = 0; $i < $l10n->total; $i++) {
             $orig = $l10n->get_original_string($i);
-            if(strpos($orig, "\000") !== FALSE) { // Plural forms
+            if(strpos($orig, "\000") !== false) { // Plural forms
                 $key = explode(chr(0), $orig);
                 print T_js_decl($key[0], _ngettext($key[0], $key[1], 1)); // Singular
                 print T_js_decl($key[1], _ngettext($key[0], $key[1], 2)); // Plural

Indentation +8 added lines, -8 removed lines

@@ -379,8 +379,8 @@ 
 
         // TODO: should this support POST requests or not? idk
 
-         $context_options = array(
-              'http' => array(
+            $context_options = array(
+                'http' => array(
                     'header' => array(
                         'Connection: close'
                     ),
@@ -388,7 +388,7 @@ 
                     'ignore_errors' => true,
                     'timeout' => $timeout ? $timeout : FILE_FETCH_TIMEOUT,
                     'protocol_version'=> 1.1)
-              );
+                );
 
         if (!$post_query && $last_modified)
             array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
@@ -659,7 +659,7 @@ 
 function logout_user() {
     @session_destroy();
     if (isset($_COOKIE[session_name()])) {
-       setcookie(session_name(), '', time()-42000, '/');
+        setcookie(session_name(), '', time()-42000, '/');
     }
     session_commit();
 }
@@ -699,7 +699,7 @@ 
             if (AUTH_AUTO_LOGIN && authenticate_user(null, null)) {
                 $_SESSION["ref_schema_version"] = get_schema_version(true);
             } else {
-                 authenticate_user(null, null, true);
+                    authenticate_user(null, null, true);
             }
 
             if (!$_SESSION["uid"]) {
@@ -974,9 +974,9 @@ 
     $params = array();
 
     foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
-                 "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
-                 "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
-                 "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
+                    "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
+                    "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
+                    "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
 
         $params[strtolower($param)] = (int) get_pref($param);
     }

Braces +128 added lines, -65 removed lines

@@ -18,7 +18,9 @@ 
 libxml_use_internal_errors(true);
 
 // separate test because this is included before sanity checks
-if (function_exists("mb_internal_encoding")) mb_internal_encoding("UTF-8");
+if (function_exists("mb_internal_encoding")) {
+    mb_internal_encoding("UTF-8");
+}
 
 date_default_timezone_set('UTC');
 if (defined('E_DEPRECATED')) {
@@ -195,8 +197,9 @@ 
     $fetch_last_modified = "";
     $fetch_effective_url = "";
 
-    if (!is_array($fetch_domain_hits))
-        $fetch_domain_hits = [];
+    if (!is_array($fetch_domain_hits)) {
+            $fetch_domain_hits = [];
+    }
 
     if (!is_array($options)) {
 
@@ -227,8 +230,9 @@ 
     $url = ltrim($url, ' ');
     $url = str_replace(' ', '%20', $url);
 
-    if (strpos($url, "//") === 0)
-        $url = 'http:' . $url;
+    if (strpos($url, "//") === 0) {
+            $url = 'http:' . $url;
+    }
 
     $url_host = parse_url($url, PHP_URL_HOST);
     $fetch_domain_hits[$url_host] += 1;
@@ -246,14 +250,17 @@ 
 
         $curl_http_headers = [];
 
-        if ($last_modified && !$post_query)
-            array_push($curl_http_headers, "If-Modified-Since: $last_modified");
+        if ($last_modified && !$post_query) {
+                    array_push($curl_http_headers, "If-Modified-Since: $last_modified");
+        }
 
-        if ($http_accept)
-            array_push($curl_http_headers, "Accept: " . $http_accept);
+        if ($http_accept) {
+                    array_push($curl_http_headers, "Accept: " . $http_accept);
+        }
 
-        if (count($curl_http_headers) > 0)
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
+        if (count($curl_http_headers) > 0) {
+                    curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
+        }
 
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
@@ -267,8 +274,9 @@ 
             SELF_USER_AGENT);
         curl_setopt($ch, CURLOPT_ENCODING, "");
 
-        if  ($http_referrer)
-            curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
+        if  ($http_referrer) {
+                    curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
+        }
 
         if ($max_size) {
             curl_setopt($ch, CURLOPT_NOPROGRESS, false);
@@ -297,8 +305,9 @@ 
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query);
         }
 
-        if ($login && $pass)
-            curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
+        if ($login && $pass) {
+                    curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
+        }
 
         $ret = @curl_exec($ch);
 
@@ -357,7 +366,9 @@ 
         if ($is_gzipped) {
             $tmp = @gzdecode($contents);
 
-            if ($tmp) $contents = $tmp;
+            if ($tmp) {
+                $contents = $tmp;
+            }
         }
 
         return $contents;
@@ -390,14 +401,17 @@ 
                     'protocol_version'=> 1.1)
               );
 
-        if (!$post_query && $last_modified)
-            array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
+        if (!$post_query && $last_modified) {
+                    array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
+        }
 
-        if ($http_accept)
-            array_push($context_options['http']['header'], "Accept: $http_accept");
+        if ($http_accept) {
+                    array_push($context_options['http']['header'], "Accept: $http_accept");
+        }
 
-        if ($http_referrer)
-            array_push($context_options['http']['header'], "Referer: $http_referrer");
+        if ($http_referrer) {
+                    array_push($context_options['http']['header'], "Referer: $http_referrer");
+        }
 
         if (defined('_HTTP_PROXY')) {
             $context_options['http']['request_fulluri'] = true;
@@ -454,7 +468,9 @@ 
         if ($is_gzipped) {
             $tmp = @gzdecode($data);
 
-            if ($tmp) $data = $tmp;
+            if ($tmp) {
+                $data = $tmp;
+            }
         }
 
         return $data;
@@ -464,7 +480,9 @@ 
 
 function initialize_user_prefs($uid, $profile = false) {
 
-    if (get_schema_version() < 63) $profile_qpart = "";
+    if (get_schema_version() < 63) {
+        $profile_qpart = "";
+    }
 
     $pdo = DB::pdo();
     $in_nested_tr = false;
@@ -477,7 +495,9 @@ 
 
     $sth = $pdo->query("SELECT pref_name,def_value FROM ttrss_prefs");
 
-    if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+    if (!is_numeric($profile) || !$profile || get_schema_version() < 63) {
+        $profile = null;
+    }
 
     $u_sth = $pdo->prepare("SELECT pref_name
         FROM ttrss_user_prefs WHERE owner_uid = :uid AND
@@ -510,7 +530,9 @@ 
         }
     }
 
-    if (!$in_nested_tr) $pdo->commit();
+    if (!$in_nested_tr) {
+        $pdo->commit();
+    }
 
 }
 
@@ -670,7 +692,9 @@ 
 
 function load_user_plugins($owner_uid, $pluginhost = false) {
 
-    if (!$pluginhost) $pluginhost = PluginHost::getInstance();
+    if (!$pluginhost) {
+        $pluginhost = PluginHost::getInstance();
+    }
 
     if ($owner_uid && SCHEMA_VERSION >= 100) {
         $plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
@@ -692,7 +716,9 @@ 
         startup_gettext();
         load_user_plugins($_SESSION["uid"]);
     } else {
-        if (!validate_session()) $_SESSION["uid"] = false;
+        if (!validate_session()) {
+            $_SESSION["uid"] = false;
+        }
 
         if (!$_SESSION["uid"]) {
 
@@ -787,13 +813,19 @@ 
 function make_local_datetime($timestamp, $long, $owner_uid = false,
                 $no_smart_dt = false, $eta_min = false) {
 
-    if (!$owner_uid) $owner_uid = $_SESSION['uid'];
-    if (!$timestamp) $timestamp = '1970-01-01 0:00';
+    if (!$owner_uid) {
+        $owner_uid = $_SESSION['uid'];
+    }
+    if (!$timestamp) {
+        $timestamp = '1970-01-01 0:00';
+    }
 
     global $utc_tz;
     global $user_tz;
 
-    if (!$utc_tz) $utc_tz = new DateTimeZone('UTC');
+    if (!$utc_tz) {
+        $utc_tz = new DateTimeZone('UTC');
+    }
 
     $timestamp = substr($timestamp, 0, 19);
 
@@ -805,7 +837,9 @@ 
     if ($user_tz_string != 'Automatic') {
 
         try {
-            if (!$user_tz) $user_tz = new DateTimeZone($user_tz_string);
+            if (!$user_tz) {
+                $user_tz = new DateTimeZone($user_tz_string);
+            }
         } catch (Exception $e) {
             $user_tz = $utc_tz;
         }
@@ -821,26 +855,30 @@ 
         return smart_date_time($user_timestamp,
             $tz_offset, $owner_uid, $eta_min);
     } else {
-        if ($long)
-            $format = get_pref('LONG_DATE_FORMAT', $owner_uid);
-        else
-            $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
+        if ($long) {
+                    $format = get_pref('LONG_DATE_FORMAT', $owner_uid);
+        } else {
+                    $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
+        }
 
         return date($format, $user_timestamp);
     }
 }
 
 function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false, $eta_min = false) {
-    if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+    if (!$owner_uid) {
+        $owner_uid = $_SESSION['uid'];
+    }
 
     if ($eta_min && time() + $tz_offset - $timestamp < 3600) {
         return T_sprintf("%d min", date("i", time() + $tz_offset - $timestamp));
     } else if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) {
         $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
-        if (strpos((strtolower($format)), "a") === false)
-            return date("G:i", $timestamp);
-        else
-            return date("g:i a", $timestamp);
+        if (strpos((strtolower($format)), "a") === false) {
+                    return date("G:i", $timestamp);
+        } else {
+                    return date("g:i a", $timestamp);
+        }
     } else if (date("Y", $timestamp) == date("Y", time() + $tz_offset)) {
         $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
         return date($format, $timestamp);
@@ -1250,8 +1288,9 @@ 
 
     if ($src) {
         foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_IFRAME_WHITELISTED) as $plugin) {
-            if ($plugin->hook_iframe_whitelisted($src))
-                return true;
+            if ($plugin->hook_iframe_whitelisted($src)) {
+                            return true;
+            }
         }
     }
 
@@ -1259,9 +1298,13 @@ 
 }
 
 function sanitize($str, $force_remove_images = false, $owner = false, $site_url = false, $highlight_words = false, $article_id = false) {
-    if (!$owner) $owner = $_SESSION["uid"];
+    if (!$owner) {
+        $owner = $_SESSION["uid"];
+    }
 
-    $res = trim($str); if (!$res) return '';
+    $res = trim($str); if (!$res) {
+        return '';
+    }
 
     $doc = new DOMDocument();
     $doc->loadHTML('<?xml encoding="UTF-8">' . $res);
@@ -1323,13 +1366,15 @@ 
 
             if ($entry->nodeName == 'source') {
 
-                if ($entry->parentNode && $entry->parentNode->parentNode)
-                    $entry->parentNode->parentNode->replaceChild($p, $entry->parentNode);
+                if ($entry->parentNode && $entry->parentNode->parentNode) {
+                                    $entry->parentNode->parentNode->replaceChild($p, $entry->parentNode);
+                }
 
             } else if ($entry->nodeName == 'img') {
 
-                if ($entry->parentNode)
-                    $entry->parentNode->replaceChild($p, $entry);
+                if ($entry->parentNode) {
+                                    $entry->parentNode->replaceChild($p, $entry);
+                }
 
             }
         }
@@ -1365,7 +1410,9 @@ 
         'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
         'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
 
-    if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
+    if ($_SESSION['hasSandbox']) {
+        $allowed_elements[] = 'iframe';
+    }
 
     $disallowed_attributes = array('id', 'style', 'class');
 
@@ -1405,7 +1452,9 @@ 
                     $text = mb_substr($text, $pos + mb_strlen($word));
                 }
 
-                if (!empty($text)) $fragment->appendChild(new DomText($text));
+                if (!empty($text)) {
+                    $fragment->appendChild(new DomText($text));
+                }
 
                 $child->parentNode->replaceChild($fragment, $child);
             }
@@ -1596,8 +1645,9 @@ 
     } else {
         $output = "";
 
-        for ($i = 0; $i < $length; $i++)
-            $output .= chr(mt_rand(0, 255));
+        for ($i = 0; $i < $length; $i++) {
+                    $output .= chr(mt_rand(0, 255));
+        }
 
         return $output;
     }
@@ -1667,15 +1717,20 @@ 
 }
 
 function get_theme_path($theme) {
-    if ($theme == "default.php")
-        return "css/default.css";
+    if ($theme == "default.php") {
+            return "css/default.css";
+    }
 
     $check = "themes/$theme";
-    if (file_exists($check)) return $check;
+    if (file_exists($check)) {
+        return $check;
+    }
 
     $check = "themes.local/$theme";
-    if (file_exists($check)) return $check;
-}
+    if (file_exists($check)) {
+        return $check;
+    }
+    }
 
 function theme_exists($theme) {
     return file_exists("themes/$theme") || file_exists("themes.local/$theme");
@@ -1731,7 +1786,9 @@ 
 function send_local_file($filename) {
     if (file_exists($filename)) {
 
-        if (is_writable($filename)) touch($filename);
+        if (is_writable($filename)) {
+            touch($filename);
+        }
 
         $tmppluginhost = new PluginHost();
 
@@ -1739,7 +1796,9 @@ 
         $tmppluginhost->load_data();
 
         foreach ($tmppluginhost->get_hooks(PluginHost::HOOK_SEND_LOCAL_FILE) as $plugin) {
-            if ($plugin->hook_send_local_file($filename)) return true;
+            if ($plugin->hook_send_local_file($filename)) {
+                return true;
+            }
         }
 
         $mimetype = mime_content_type($filename);
@@ -1747,8 +1806,9 @@ 
         // this is hardly ideal but 1) only media is cached in images/ and 2) seemingly only mp4
         // video files are detected as octet-stream by mime_content_type()
 
-        if ($mimetype == "application/octet-stream")
-            $mimetype = "video/mp4";
+        if ($mimetype == "application/octet-stream") {
+                    $mimetype = "video/mp4";
+        }
 
         header("Content-type: $mimetype");
 
@@ -1771,7 +1831,9 @@ 
 
     foreach ($files as $file) {
         $file_ts = filemtime($file);
-        if ($file_ts > $ts) $ts = $file_ts;
+        if ($file_ts > $ts) {
+            $ts = $file_ts;
+        }
     }
 
     return $ts;
@@ -1784,8 +1846,9 @@ 
 function get_version(&$git_commit = false, &$git_timestamp = false) {
     global $ttrss_version;
 
-    if (isset($ttrss_version))
-        return $ttrss_version;
+    if (isset($ttrss_version)) {
+            return $ttrss_version;
+    }
 
     $ttrss_version = "UNKNOWN (Unsupported)";
 

include/sessions.php

Spacing +6 added lines, -6 removed lines

@@ -78,11 +78,11 @@ 
     return true;
 }
 
-function ttrss_open () {
+function ttrss_open() {
     return true;
 }
 
-function ttrss_read ($id){
+function ttrss_read($id) {
     global $session_expire;
 
     $sth = Db::pdo()->prepare("SELECT data FROM ttrss_sessions WHERE id=?");
@@ -101,7 +101,7 @@ 
     }
 }
 
-function ttrss_write ($id, $data) {
+function ttrss_write($id, $data) {
     global $session_expire;
 
     $data = base64_encode($data);
@@ -121,7 +121,7 @@ 
     return true;
 }
 
-function ttrss_close () {
+function ttrss_close() {
     return true;
 }
 
@@ -132,8 +132,8 @@ 
     return true;
 }
 
-function ttrss_gc () {
-    Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
+function ttrss_gc() {
+    Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < ".time());
 
     return true;
 }

Indentation +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
             __("Session failed to validate (schema version changed)");
         return false;
     }
-      $pdo = Db::pdo();
+        $pdo = Db::pdo();
 
     if ($_SESSION["uid"]) {
 
@@ -56,21 +56,21 @@ 
 
         // user not found
         if ($row = $sth->fetch()) {
-                 $pwd_hash = $row["pwd_hash"];
+                    $pwd_hash = $row["pwd_hash"];
 
-                 if ($pwd_hash != $_SESSION["pwd_hash"]) {
+                    if ($pwd_hash != $_SESSION["pwd_hash"]) {
 
-                      $_SESSION["login_error_msg"] =
+                        $_SESSION["login_error_msg"] =
                             __("Session failed to validate (password changed)");
 
-                      return false;
-                 }
+                        return false;
+                    }
         } else {
 
-                 $_SESSION["login_error_msg"] =
-                      __("Session failed to validate (user not found)");
+                    $_SESSION["login_error_msg"] =
+                        __("Session failed to validate (user not found)");
 
-                 return false;
+                    return false;
 
         }
     }

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 }
 
 function validate_session() {
-    if (SINGLE_USER_MODE) return true;
+    if (SINGLE_USER_MODE) {
+        return true;
+    }
 
     if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) {
         $_SESSION["login_error_msg"] =

api/index.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
         return;
     }
 
-    load_user_plugins( $_SESSION["uid"]);
+    load_user_plugins($_SESSION["uid"]);
 }
 
 $method = strtolower($_REQUEST["op"]);
@@ -84,6 +84,6 @@ 
     $handler->after();
 }
 
-header("Api-Content-Length: " . ob_get_length());
+header("Api-Content-Length: ".ob_get_length());
 
 ob_end_flush();

Braces +6 added lines, -2 removed lines

@@ -38,7 +38,9 @@ 
     // fallback on HTTP parameters
     if ($input) {
         $input = json_decode($input, true);
-        if ($input) $_REQUEST = $input;
+        if ($input) {
+            $_REQUEST = $input;
+        }
     }
 } else {
     // Accept JSON only
@@ -55,7 +57,9 @@ 
 
 startup_gettext();
 
-if (!init_plugins()) return;
+if (!init_plugins()) {
+    return;
+}
 
 if ($_SESSION["uid"]) {
     if (!validate_session()) {

update_daemon2.php

Spacing +14 added lines, -14 removed lines

@@ -1,9 +1,9 @@ 
 #!/usr/bin/env php
 <?php
-set_include_path(dirname(__FILE__) .DIRECTORY_SEPARATOR."include" . PATH_SEPARATOR .
+set_include_path(dirname(__FILE__).DIRECTORY_SEPARATOR."include".PATH_SEPARATOR.
     get_include_path());
 
-declare(ticks = 1);
+declare(ticks=1);
 chdir(dirname(__FILE__));
 
 define('DISABLE_SESSIONS', true);
@@ -93,9 +93,9 @@ 
 
 function shutdown($caller_pid) {
     if ($caller_pid == posix_getpid()) {
-        if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+        if (file_exists(LOCK_DIRECTORY."/update_daemon.lock")) {
             Debug::log("removing lockfile (master)...");
-            unlink(LOCK_DIRECTORY . "/update_daemon.lock");
+            unlink(LOCK_DIRECTORY."/update_daemon.lock");
         }
     }
 }
@@ -103,9 +103,9 @@ 
 function task_shutdown() {
     $pid = posix_getpid();
 
-    if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) {
+    if (file_exists(LOCK_DIRECTORY."/update_daemon-$pid.lock")) {
         Debug::log("removing lockfile ($pid)...");
-        unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock");
+        unlink(LOCK_DIRECTORY."/update_daemon-$pid.lock");
     }
 }
 
@@ -134,15 +134,15 @@ 
 
 $options = getopt("", $longopts);
 
-if (isset($options["help"]) ) {
+if (isset($options["help"])) {
     print "Tiny Tiny RSS update daemon.\n\n";
     print "Options:\n";
     print "  --log FILE           - log messages to FILE\n";
     print "  --log-level N        - log verbosity level\n";
     print "  --tasks N            - amount of update tasks to spawn\n";
-    print "                         default: " . MAX_JOBS . "\n";
+    print "                         default: ".MAX_JOBS."\n";
     print "  --interval N         - task spawn interval\n";
-    print "                         default: " . SPAWN_INTERVAL . " seconds.\n";
+    print "                         default: ".SPAWN_INTERVAL." seconds.\n";
     print "  --quiet              - don't output messages to stdout\n";
     return;
 }
@@ -150,13 +150,13 @@ 
 Debug::set_enabled(true);
 
 if (isset($options["log-level"])) {
-    Debug::set_loglevel((int)$options["log-level"]);
+    Debug::set_loglevel((int) $options["log-level"]);
 }
 
 if (isset($options["log"])) {
     Debug::set_quiet(isset($options['quiet']));
     Debug::set_logfile($options["log"]);
-    Debug::log("Logging to " . $options["log"]);
+    Debug::log("Logging to ".$options["log"]);
 } else {
     if (isset($options['quiet'])) {
         Debug::set_loglevel(Debug::$LOG_DISABLED);
@@ -164,14 +164,14 @@ 
 }
 
 if (isset($options["tasks"])) {
-    Debug::log("Set to spawn " . $options["tasks"] . " children.");
+    Debug::log("Set to spawn ".$options["tasks"]." children.");
     $max_jobs = $options["tasks"];
 } else {
     $max_jobs = MAX_JOBS;
 }
 
 if (isset($options["interval"])) {
-    Debug::log("Spawn interval: " . $options["interval"] . " seconds.");
+    Debug::log("Spawn interval: ".$options["interval"]." seconds.");
     $spawn_interval = $options["interval"];
 } else {
     $spawn_interval = SPAWN_INTERVAL;
@@ -246,7 +246,7 @@ 
 
                 $my_pid = posix_getpid();
 
-                passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
+                passthru(PHP_EXECUTABLE." update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
 
                 sleep(1);
 

update.php

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 #!/usr/bin/env php
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	define('DISABLE_SESSIONS', true);
@@ -88,7 +88,7 @@ 
 			"help");
 
 	foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
-		array_push($longopts, $command . $data["suffix"]);
+		array_push($longopts, $command.$data["suffix"]);
 	}
 
 	$options = getopt("", $longopts);
@@ -119,7 +119,7 @@ 
 		exit;
 	}
 
-	if (count($options) == 0 || isset($options["help"]) ) {
+	if (count($options) == 0 || isset($options["help"])) {
 		print "Tiny Tiny RSS data update script.\n\n";
 		print "Options:\n";
 		print "  --feeds              - update feeds\n";
@@ -165,13 +165,13 @@ 
 	Debug::set_enabled(true);
 
 	if (isset($options["log-level"])) {
-	    Debug::set_loglevel((int)$options["log-level"]);
+	    Debug::set_loglevel((int) $options["log-level"]);
     }
 
 	if (isset($options["log"])) {
 		Debug::set_quiet(isset($options['quiet']));
 		Debug::set_logfile($options["log"]);
-        Debug::log("Logging to " . $options["log"]);
+        Debug::log("Logging to ".$options["log"]);
     } else {
 	    if (isset($options['quiet'])) {
 			Debug::set_loglevel(Debug::$LOG_DISABLED);
@@ -185,8 +185,8 @@ 
 	}
 
 	if (isset($options["task"])) {
-		Debug::log("Using task id " . $options["task"]);
-		$lock_filename = $lock_filename . "-task_" . $options["task"];
+		Debug::log("Using task id ".$options["task"]);
+		$lock_filename = $lock_filename."-task_".$options["task"];
 	}
 
 	if (isset($options["pidlock"])) {
@@ -215,7 +215,7 @@ 
 	if (isset($options["force-update"])) {
 		Debug::log("marking all feeds as needing update...");
 
-		$pdo->query( "UPDATE ttrss_feeds SET
+		$pdo->query("UPDATE ttrss_feeds SET
           last_update_started = '1970-01-01', last_updated = '1970-01-01'");
 	}
 
@@ -232,7 +232,7 @@ 
             $log = isset($options['log']) ? '--log '.$options['log'] : '';
             $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : '';
 
-			passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
+			passthru(PHP_EXECUTABLE." ".$argv[0]." --daemon-loop $quiet $log $log_level");
 
 			// let's enforce a minimum spawn interval as to not forkbomb the host
 			$spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
@@ -256,7 +256,7 @@ 
 	}
 
 	if (isset($options["cleanup-tags"])) {
-		$rc = cleanup_tags( 14, 50000);
+		$rc = cleanup_tags(14, 50000);
 		Debug::log("$rc tags deleted.\n");
 	}
 
@@ -270,18 +270,18 @@ 
 		Debug::log("clearing existing indexes...");
 
 		if (DB_TYPE == "pgsql") {
-			$sth = $pdo->query( "SELECT relname FROM
+			$sth = $pdo->query("SELECT relname FROM
 				pg_catalog.pg_class WHERE relname LIKE 'ttrss_%'
 					AND relname NOT LIKE '%_pkey'
 				AND relkind = 'i'");
 		} else {
-			$sth = $pdo->query( "SELECT index_name,table_name FROM
+			$sth = $pdo->query("SELECT index_name,table_name FROM
 				information_schema.statistics WHERE index_name LIKE 'ttrss_%'");
 		}
 
 		while ($line = $sth->fetch()) {
 			if (DB_TYPE == "pgsql") {
-				$statement = "DROP INDEX " . $line["relname"];
+				$statement = "DROP INDEX ".$line["relname"];
 				Debug::log($statement);
 			} else {
 				$statement = "ALTER TABLE ".
@@ -291,9 +291,9 @@ 
 			$pdo->query($statement);
 		}
 
-		Debug::log("reading indexes from schema for: " . DB_TYPE);
+		Debug::log("reading indexes from schema for: ".DB_TYPE);
 
-		$fp = fopen("schema/ttrss_schema_" . DB_TYPE . ".sql", "r");
+		$fp = fopen("schema/ttrss_schema_".DB_TYPE.".sql", "r");
 		if ($fp) {
 			while ($line = fgets($fp)) {
 				$matches = array();
@@ -336,9 +336,9 @@ 
 				$filter = array();
 
 				if (sql_bool_to_bool($line["cat_filter"])) {
-					$feed_id = "CAT:" . (int)$line["cat_id"];
+					$feed_id = "CAT:".(int) $line["cat_id"];
 				} else {
-					$feed_id = (int)$line["feed_id"];
+					$feed_id = (int) $line["feed_id"];
 				}
 
 				$filter["enabled"] = $line["enabled"] ? "on" : "off";
@@ -367,12 +367,12 @@ 
 	}
 
 	if (isset($options["update-schema"])) {
-		Debug::log("Checking for updates (" . DB_TYPE . ")...");
+		Debug::log("Checking for updates (".DB_TYPE.")...");
 
 		$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
 
 		if ($updater->isUpdateRequired()) {
-			Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
+			Debug::log("Schema update required, version ".$updater->getSchemaVersion()." to ".SCHEMA_VERSION);
 
 			if (DB_TYPE == "mysql")
 				Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
@@ -385,7 +385,7 @@ 
 			if (read_stdin() != 'yes')
 				exit;
 
-			Debug::log("Performing updates to version " . SCHEMA_VERSION);
+			Debug::log("Performing updates to version ".SCHEMA_VERSION);
 
 			for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
 				Debug::log("* Updating to version $i...");
@@ -428,7 +428,7 @@ 
 		while (true) {
 
 			while ($line = $sth->fetch()) {
-				$tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
+				$tsvector_combined = mb_substr(strip_tags($line["title"]." ".$line["content"]), 0, 1000000);
 
 				$usth->execute([$tsvector_combined, $line['id']]);
 
@@ -485,7 +485,7 @@ 
 
 	PluginHost::getInstance()->run_commands($options);
 
-	if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
+	if (file_exists(LOCK_DIRECTORY."/$lock_filename"))
 		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
 			fclose($lock_handle);
-		unlink(LOCK_DIRECTORY . "/$lock_filename");
+		unlink(LOCK_DIRECTORY."/$lock_filename");

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -435,7 +435,7 @@
 				$processed++;
 			}
 
-			print "Processed $processed articles...\n";
+			print "processed $processed articles...\n";
 
 			if ($processed < $limit) {
 				echo "All done.\n";

Indentation +363 added lines, -363 removed lines

@@ -1,107 +1,107 @@ 
 #!/usr/bin/env php
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
-		get_include_path());
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+        get_include_path());
 
-	define('DISABLE_SESSIONS', true);
+    define('DISABLE_SESSIONS', true);
 
-	chdir(dirname(__FILE__));
+    chdir(dirname(__FILE__));
 
-	require_once "autoload.php";
-	require_once "functions.php";
-	require_once "config.php";
-	require_once "sanity_check.php";
-	require_once "db.php";
-	require_once "db-prefs.php";
+    require_once "autoload.php";
+    require_once "functions.php";
+    require_once "config.php";
+    require_once "sanity_check.php";
+    require_once "db.php";
+    require_once "db-prefs.php";
 
-	function cleanup_tags($days = 14, $limit = 1000) {
+    function cleanup_tags($days = 14, $limit = 1000) {
 
-		$days = (int) $days;
+        $days = (int) $days;
 
-		if (DB_TYPE == "pgsql") {
-			$interval_query = "date_updated < NOW() - INTERVAL '$days days'";
-		} else if (DB_TYPE == "mysql") {
-			$interval_query = "date_updated < DATE_SUB(NOW(), INTERVAL $days DAY)";
-		}
+        if (DB_TYPE == "pgsql") {
+            $interval_query = "date_updated < NOW() - INTERVAL '$days days'";
+        } else if (DB_TYPE == "mysql") {
+            $interval_query = "date_updated < DATE_SUB(NOW(), INTERVAL $days DAY)";
+        }
 
-		$tags_deleted = 0;
+        $tags_deleted = 0;
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		while ($limit > 0) {
-			$limit_part = 500;
+        while ($limit > 0) {
+            $limit_part = 500;
 
-			$sth = $pdo->prepare("SELECT ttrss_tags.id AS id
+            $sth = $pdo->prepare("SELECT ttrss_tags.id AS id
 						FROM ttrss_tags, ttrss_user_entries, ttrss_entries
 						WHERE post_int_id = int_id AND $interval_query AND
 						ref_id = ttrss_entries.id AND tag_cache != '' LIMIT ?");
-			$sth->bindValue(1, $limit_part, PDO::PARAM_INT);
-			$sth->execute();
-
-			$ids = array();
-
-			while ($line = $sth->fetch()) {
-				array_push($ids, $line['id']);
-			}
-
-			if (count($ids) > 0) {
-				$ids = join(",", $ids);
-
-				$usth = $pdo->query("DELETE FROM ttrss_tags WHERE id IN ($ids)");
-				$tags_deleted = $usth->rowCount();
-			} else {
-				break;
-			}
-
-			$limit -= $limit_part;
-		}
-
-		return $tags_deleted;
-	}
-
-	if (!defined('PHP_EXECUTABLE'))
-		define('PHP_EXECUTABLE', '/usr/bin/php');
-
-	$pdo = Db::pdo();
-
-	init_plugins();
-
-	$longopts = array("feeds",
-			"daemon",
-			"daemon-loop",
-			"send-digests",
-			"task:",
-			"cleanup-tags",
-			"quiet",
-			"log:",
-			"log-level:",
-			"indexes",
-			"pidlock:",
-			"update-schema",
-			"convert-filters",
-			"force-update",
-			"gen-search-idx",
-			"list-plugins",
-			"debug-feed:",
-			"force-refetch",
-			"force-rehash",
-			"help");
-
-	foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
-		array_push($longopts, $command . $data["suffix"]);
-	}
-
-	$options = getopt("", $longopts);
-
-	if (!is_array($options)) {
-		die("error: getopt() failed. ".
-			"Most probably you are using PHP CGI to run this script ".
-			"instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
-			"additional information.\n");
-	}
-
-	if (count($options) == 0 && !defined('STDIN')) {
-		?>
+            $sth->bindValue(1, $limit_part, PDO::PARAM_INT);
+            $sth->execute();
+
+            $ids = array();
+
+            while ($line = $sth->fetch()) {
+                array_push($ids, $line['id']);
+            }
+
+            if (count($ids) > 0) {
+                $ids = join(",", $ids);
+
+                $usth = $pdo->query("DELETE FROM ttrss_tags WHERE id IN ($ids)");
+                $tags_deleted = $usth->rowCount();
+            } else {
+                break;
+            }
+
+            $limit -= $limit_part;
+        }
+
+        return $tags_deleted;
+    }
+
+    if (!defined('PHP_EXECUTABLE'))
+        define('PHP_EXECUTABLE', '/usr/bin/php');
+
+    $pdo = Db::pdo();
+
+    init_plugins();
+
+    $longopts = array("feeds",
+            "daemon",
+            "daemon-loop",
+            "send-digests",
+            "task:",
+            "cleanup-tags",
+            "quiet",
+            "log:",
+            "log-level:",
+            "indexes",
+            "pidlock:",
+            "update-schema",
+            "convert-filters",
+            "force-update",
+            "gen-search-idx",
+            "list-plugins",
+            "debug-feed:",
+            "force-refetch",
+            "force-rehash",
+            "help");
+
+    foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
+        array_push($longopts, $command . $data["suffix"]);
+    }
+
+    $options = getopt("", $longopts);
+
+    if (!is_array($options)) {
+        die("error: getopt() failed. ".
+            "Most probably you are using PHP CGI to run this script ".
+            "instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
+            "additional information.\n");
+    }
+
+    if (count($options) == 0 && !defined('STDIN')) {
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
@@ -116,376 +116,376 @@ 
 
 		</body></html>
 	<?php
-		exit;
-	}
-
-	if (count($options) == 0 || isset($options["help"]) ) {
-		print "Tiny Tiny RSS data update script.\n\n";
-		print "Options:\n";
-		print "  --feeds              - update feeds\n";
-		print "  --daemon             - start single-process update daemon\n";
-		print "  --task N             - create lockfile using this task id\n";
-		print "  --cleanup-tags       - perform tags table maintenance\n";
-		print "  --quiet              - don't output messages to stdout\n";
-		print "  --log FILE           - log messages to FILE\n";
-		print "  --log-level N        - log verbosity level\n";
-		print "  --indexes            - recreate missing schema indexes\n";
-		print "  --update-schema      - update database schema\n";
-		print "  --gen-search-idx     - generate basic PostgreSQL fulltext search index\n";
-		print "  --convert-filters    - convert type1 filters to type2\n";
-		print "  --send-digests       - send pending email digests\n";
-		print "  --force-update       - force update of all feeds\n";
-		print "  --list-plugins       - list all available plugins\n";
-		print "  --debug-feed N       - perform debug update of feed N\n";
-		print "  --force-refetch      - debug update: force refetch feed data\n";
-		print "  --force-rehash       - debug update: force rehash articles\n";
-		print "  --help               - show this help\n";
-		print "Plugin options:\n";
-
-		foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
-			$args = $data['arghelp'];
-			printf(" --%-19s - %s\n", "$command $args", $data["description"]);
-		}
-
-		return;
-	}
-
-	if (!isset($options['daemon'])) {
-		require_once "errorhandler.php";
-	}
-
-	if (!isset($options['update-schema'])) {
-		$schema_version = get_schema_version();
-
-		if ($schema_version != SCHEMA_VERSION) {
-			die("Schema version is wrong, please upgrade the database (--update-schema).\n");
-		}
-	}
-
-	Debug::set_enabled(true);
-
-	if (isset($options["log-level"])) {
-	    Debug::set_loglevel((int)$options["log-level"]);
+        exit;
+    }
+
+    if (count($options) == 0 || isset($options["help"]) ) {
+        print "Tiny Tiny RSS data update script.\n\n";
+        print "Options:\n";
+        print "  --feeds              - update feeds\n";
+        print "  --daemon             - start single-process update daemon\n";
+        print "  --task N             - create lockfile using this task id\n";
+        print "  --cleanup-tags       - perform tags table maintenance\n";
+        print "  --quiet              - don't output messages to stdout\n";
+        print "  --log FILE           - log messages to FILE\n";
+        print "  --log-level N        - log verbosity level\n";
+        print "  --indexes            - recreate missing schema indexes\n";
+        print "  --update-schema      - update database schema\n";
+        print "  --gen-search-idx     - generate basic PostgreSQL fulltext search index\n";
+        print "  --convert-filters    - convert type1 filters to type2\n";
+        print "  --send-digests       - send pending email digests\n";
+        print "  --force-update       - force update of all feeds\n";
+        print "  --list-plugins       - list all available plugins\n";
+        print "  --debug-feed N       - perform debug update of feed N\n";
+        print "  --force-refetch      - debug update: force refetch feed data\n";
+        print "  --force-rehash       - debug update: force rehash articles\n";
+        print "  --help               - show this help\n";
+        print "Plugin options:\n";
+
+        foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
+            $args = $data['arghelp'];
+            printf(" --%-19s - %s\n", "$command $args", $data["description"]);
+        }
+
+        return;
+    }
+
+    if (!isset($options['daemon'])) {
+        require_once "errorhandler.php";
+    }
+
+    if (!isset($options['update-schema'])) {
+        $schema_version = get_schema_version();
+
+        if ($schema_version != SCHEMA_VERSION) {
+            die("Schema version is wrong, please upgrade the database (--update-schema).\n");
+        }
+    }
+
+    Debug::set_enabled(true);
+
+    if (isset($options["log-level"])) {
+        Debug::set_loglevel((int)$options["log-level"]);
     }
 
-	if (isset($options["log"])) {
-		Debug::set_quiet(isset($options['quiet']));
-		Debug::set_logfile($options["log"]);
+    if (isset($options["log"])) {
+        Debug::set_quiet(isset($options['quiet']));
+        Debug::set_logfile($options["log"]);
         Debug::log("Logging to " . $options["log"]);
     } else {
-	    if (isset($options['quiet'])) {
-			Debug::set_loglevel(Debug::$LOG_DISABLED);
+        if (isset($options['quiet'])) {
+            Debug::set_loglevel(Debug::$LOG_DISABLED);
         }
     }
 
-	if (!isset($options["daemon"])) {
-		$lock_filename = "update.lock";
-	} else {
-		$lock_filename = "update_daemon.lock";
-	}
+    if (!isset($options["daemon"])) {
+        $lock_filename = "update.lock";
+    } else {
+        $lock_filename = "update_daemon.lock";
+    }
 
-	if (isset($options["task"])) {
-		Debug::log("Using task id " . $options["task"]);
-		$lock_filename = $lock_filename . "-task_" . $options["task"];
-	}
+    if (isset($options["task"])) {
+        Debug::log("Using task id " . $options["task"]);
+        $lock_filename = $lock_filename . "-task_" . $options["task"];
+    }
 
-	if (isset($options["pidlock"])) {
-		$my_pid = $options["pidlock"];
-		$lock_filename = "update_daemon-$my_pid.lock";
+    if (isset($options["pidlock"])) {
+        $my_pid = $options["pidlock"];
+        $lock_filename = "update_daemon-$my_pid.lock";
 
-	}
+    }
 
-	Debug::log("Lock: $lock_filename");
+    Debug::log("Lock: $lock_filename");
 
-	$lock_handle = make_lockfile($lock_filename);
-	$must_exit = false;
+    $lock_handle = make_lockfile($lock_filename);
+    $must_exit = false;
 
-	if (isset($options["task"]) && isset($options["pidlock"])) {
-		$waits = $options["task"] * 5;
-		Debug::log("Waiting before update ($waits)");
-		sleep($waits);
-	}
+    if (isset($options["task"]) && isset($options["pidlock"])) {
+        $waits = $options["task"] * 5;
+        Debug::log("Waiting before update ($waits)");
+        sleep($waits);
+    }
 
-	// Try to lock a file in order to avoid concurrent update.
-	if (!$lock_handle) {
-		die("error: Can't create lockfile ($lock_filename). ".
-			"Maybe another update process is already running.\n");
-	}
+    // Try to lock a file in order to avoid concurrent update.
+    if (!$lock_handle) {
+        die("error: Can't create lockfile ($lock_filename). ".
+            "Maybe another update process is already running.\n");
+    }
 
-	if (isset($options["force-update"])) {
-		Debug::log("marking all feeds as needing update...");
+    if (isset($options["force-update"])) {
+        Debug::log("marking all feeds as needing update...");
 
-		$pdo->query( "UPDATE ttrss_feeds SET
+        $pdo->query( "UPDATE ttrss_feeds SET
           last_update_started = '1970-01-01', last_updated = '1970-01-01'");
-	}
+    }
 
-	if (isset($options["feeds"])) {
-		RSSUtils::update_daemon_common();
-		RSSUtils::housekeeping_common(true);
+    if (isset($options["feeds"])) {
+        RSSUtils::update_daemon_common();
+        RSSUtils::housekeeping_common(true);
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
-	}
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+    }
 
-	if (isset($options["daemon"])) {
-		while (true) {
-			$quiet = (isset($options["quiet"])) ? "--quiet" : "";
+    if (isset($options["daemon"])) {
+        while (true) {
+            $quiet = (isset($options["quiet"])) ? "--quiet" : "";
             $log = isset($options['log']) ? '--log '.$options['log'] : '';
             $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : '';
 
-			passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
+            passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
 
-			// let's enforce a minimum spawn interval as to not forkbomb the host
-			$spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
+            // let's enforce a minimum spawn interval as to not forkbomb the host
+            $spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
 
-			Debug::log("Sleeping for $spawn_interval seconds...");
-			sleep($spawn_interval);
-		}
-	}
+            Debug::log("Sleeping for $spawn_interval seconds...");
+            sleep($spawn_interval);
+        }
+    }
 
-	if (isset($options["daemon-loop"])) {
-		if (!make_stampfile('update_daemon.stamp')) {
-			Debug::log("warning: unable to create stampfile\n");
-		}
+    if (isset($options["daemon-loop"])) {
+        if (!make_stampfile('update_daemon.stamp')) {
+            Debug::log("warning: unable to create stampfile\n");
+        }
 
-		RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
+        RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
 
-		if (!isset($options["pidlock"]) || $options["task"] == 0)
-			RSSUtils::housekeeping_common(true);
+        if (!isset($options["pidlock"]) || $options["task"] == 0)
+            RSSUtils::housekeeping_common(true);
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
-	}
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+    }
 
-	if (isset($options["cleanup-tags"])) {
-		$rc = cleanup_tags( 14, 50000);
-		Debug::log("$rc tags deleted.\n");
-	}
+    if (isset($options["cleanup-tags"])) {
+        $rc = cleanup_tags( 14, 50000);
+        Debug::log("$rc tags deleted.\n");
+    }
 
-	if (isset($options["indexes"])) {
-		Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
-		Debug::log("Type 'yes' to continue.");
+    if (isset($options["indexes"])) {
+        Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
+        Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+        if (read_stdin() != 'yes')
+            exit;
 
-		Debug::log("clearing existing indexes...");
+        Debug::log("clearing existing indexes...");
 
-		if (DB_TYPE == "pgsql") {
-			$sth = $pdo->query( "SELECT relname FROM
+        if (DB_TYPE == "pgsql") {
+            $sth = $pdo->query( "SELECT relname FROM
 				pg_catalog.pg_class WHERE relname LIKE 'ttrss_%'
 					AND relname NOT LIKE '%_pkey'
 				AND relkind = 'i'");
-		} else {
-			$sth = $pdo->query( "SELECT index_name,table_name FROM
+        } else {
+            $sth = $pdo->query( "SELECT index_name,table_name FROM
 				information_schema.statistics WHERE index_name LIKE 'ttrss_%'");
-		}
-
-		while ($line = $sth->fetch()) {
-			if (DB_TYPE == "pgsql") {
-				$statement = "DROP INDEX " . $line["relname"];
-				Debug::log($statement);
-			} else {
-				$statement = "ALTER TABLE ".
-					$line['table_name']." DROP INDEX ".$line['index_name'];
-				Debug::log($statement);
-			}
-			$pdo->query($statement);
-		}
+        }
 
-		Debug::log("reading indexes from schema for: " . DB_TYPE);
+        while ($line = $sth->fetch()) {
+            if (DB_TYPE == "pgsql") {
+                $statement = "DROP INDEX " . $line["relname"];
+                Debug::log($statement);
+            } else {
+                $statement = "ALTER TABLE ".
+                    $line['table_name']." DROP INDEX ".$line['index_name'];
+                Debug::log($statement);
+            }
+            $pdo->query($statement);
+        }
 
-		$fp = fopen("schema/ttrss_schema_" . DB_TYPE . ".sql", "r");
-		if ($fp) {
-			while ($line = fgets($fp)) {
-				$matches = array();
+        Debug::log("reading indexes from schema for: " . DB_TYPE);
 
-				if (preg_match("/^create index ([^ ]+) on ([^ ]+)$/i", $line, $matches)) {
-					$index = $matches[1];
-					$table = $matches[2];
+        $fp = fopen("schema/ttrss_schema_" . DB_TYPE . ".sql", "r");
+        if ($fp) {
+            while ($line = fgets($fp)) {
+                $matches = array();
 
-					$statement = "CREATE INDEX $index ON $table";
+                if (preg_match("/^create index ([^ ]+) on ([^ ]+)$/i", $line, $matches)) {
+                    $index = $matches[1];
+                    $table = $matches[2];
 
-					Debug::log($statement);
-					$pdo->query($statement);
-				}
-			}
-			fclose($fp);
-		} else {
-			Debug::log("unable to open schema file.");
-		}
-		Debug::log("all done.");
-	}
+                    $statement = "CREATE INDEX $index ON $table";
 
-	if (isset($options["convert-filters"])) {
-		Debug::log("WARNING: this will remove all existing type2 filters.");
-		Debug::log("Type 'yes' to continue.");
+                    Debug::log($statement);
+                    $pdo->query($statement);
+                }
+            }
+            fclose($fp);
+        } else {
+            Debug::log("unable to open schema file.");
+        }
+        Debug::log("all done.");
+    }
 
-		if (read_stdin() != 'yes')
-			exit;
+    if (isset($options["convert-filters"])) {
+        Debug::log("WARNING: this will remove all existing type2 filters.");
+        Debug::log("Type 'yes' to continue.");
 
-		Debug::log("converting filters...");
+        if (read_stdin() != 'yes')
+            exit;
 
-		$pdo->query("DELETE FROM ttrss_filters2");
+        Debug::log("converting filters...");
 
-		$res = $pdo->query("SELECT * FROM ttrss_filters ORDER BY id");
+        $pdo->query("DELETE FROM ttrss_filters2");
 
-		while ($line = $res->fetch()) {
-			$owner_uid = $line["owner_uid"];
+        $res = $pdo->query("SELECT * FROM ttrss_filters ORDER BY id");
 
-			// date filters are removed
-			if ($line["filter_type"] != 5) {
-				$filter = array();
+        while ($line = $res->fetch()) {
+            $owner_uid = $line["owner_uid"];
 
-				if (sql_bool_to_bool($line["cat_filter"])) {
-					$feed_id = "CAT:" . (int)$line["cat_id"];
-				} else {
-					$feed_id = (int)$line["feed_id"];
-				}
+            // date filters are removed
+            if ($line["filter_type"] != 5) {
+                $filter = array();
 
-				$filter["enabled"] = $line["enabled"] ? "on" : "off";
-				$filter["rule"] = array(
-					json_encode(array(
-						"reg_exp" => $line["reg_exp"],
-						"feed_id" => $feed_id,
-						"filter_type" => $line["filter_type"])));
+                if (sql_bool_to_bool($line["cat_filter"])) {
+                    $feed_id = "CAT:" . (int)$line["cat_id"];
+                } else {
+                    $feed_id = (int)$line["feed_id"];
+                }
 
-				$filter["action"] = array(
-					json_encode(array(
-						"action_id" => $line["action_id"],
-						"action_param_label" => $line["action_param"],
-						"action_param" => $line["action_param"])));
+                $filter["enabled"] = $line["enabled"] ? "on" : "off";
+                $filter["rule"] = array(
+                    json_encode(array(
+                        "reg_exp" => $line["reg_exp"],
+                        "feed_id" => $feed_id,
+                        "filter_type" => $line["filter_type"])));
 
-				// Oh god it's full of hacks
+                $filter["action"] = array(
+                    json_encode(array(
+                        "action_id" => $line["action_id"],
+                        "action_param_label" => $line["action_param"],
+                        "action_param" => $line["action_param"])));
 
-				$_REQUEST = $filter;
-				$_SESSION["uid"] = $owner_uid;
+                // Oh god it's full of hacks
 
-				$filters = new Pref_Filters($_REQUEST);
-				$filters->add();
-			}
-		}
+                $_REQUEST = $filter;
+                $_SESSION["uid"] = $owner_uid;
 
-	}
+                $filters = new Pref_Filters($_REQUEST);
+                $filters->add();
+            }
+        }
 
-	if (isset($options["update-schema"])) {
-		Debug::log("Checking for updates (" . DB_TYPE . ")...");
+    }
+
+    if (isset($options["update-schema"])) {
+        Debug::log("Checking for updates (" . DB_TYPE . ")...");
 
-		$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
+        $updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
 
-		if ($updater->isUpdateRequired()) {
-			Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
+        if ($updater->isUpdateRequired()) {
+            Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
 
-			if (DB_TYPE == "mysql")
-				Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
-					"Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
-			else
-				Debug::log("WARNING: please backup your database before continuing.");
+            if (DB_TYPE == "mysql")
+                Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
+                    "Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
+            else
+                Debug::log("WARNING: please backup your database before continuing.");
 
-			Debug::log("Type 'yes' to continue.");
+            Debug::log("Type 'yes' to continue.");
 
-			if (read_stdin() != 'yes')
-				exit;
+            if (read_stdin() != 'yes')
+                exit;
 
-			Debug::log("Performing updates to version " . SCHEMA_VERSION);
+            Debug::log("Performing updates to version " . SCHEMA_VERSION);
 
-			for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
-				Debug::log("* Updating to version $i...");
+            for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+                Debug::log("* Updating to version $i...");
 
-				$result = $updater->performUpdateTo($i, false);
+                $result = $updater->performUpdateTo($i, false);
 
-				if ($result) {
-					Debug::log("* Completed.");
-				} else {
-					Debug::log("One of the updates failed. Either retry the process or perform updates manually.");
-					return;
-				}
+                if ($result) {
+                    Debug::log("* Completed.");
+                } else {
+                    Debug::log("One of the updates failed. Either retry the process or perform updates manually.");
+                    return;
+                }
 
-			}
-		} else {
-			Debug::log("Update not required.");
-		}
+            }
+        } else {
+            Debug::log("Update not required.");
+        }
 
-	}
+    }
 
-	if (isset($options["gen-search-idx"])) {
-		echo "Generating search index (stemming set to English)...\n";
+    if (isset($options["gen-search-idx"])) {
+        echo "Generating search index (stemming set to English)...\n";
 
-		$res = $pdo->query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL");
-		$row = $res->fetch();
-		$count = $row['count'];
+        $res = $pdo->query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL");
+        $row = $res->fetch();
+        $count = $row['count'];
 
-		print "Articles to process: $count.\n";
+        print "Articles to process: $count.\n";
 
-		$limit = 500;
-		$processed = 0;
+        $limit = 500;
+        $processed = 0;
 
-		$sth = $pdo->prepare("SELECT id, title, content FROM ttrss_entries WHERE
+        $sth = $pdo->prepare("SELECT id, title, content FROM ttrss_entries WHERE
           tsvector_combined IS NULL ORDER BY id LIMIT ?");
-		$sth->execute([$limit]);
+        $sth->execute([$limit]);
 
-		$usth = $pdo->prepare("UPDATE ttrss_entries
+        $usth = $pdo->prepare("UPDATE ttrss_entries
           SET tsvector_combined = to_tsvector('english', ?) WHERE id = ?");
 
-		while (true) {
+        while (true) {
 
-			while ($line = $sth->fetch()) {
-				$tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
+            while ($line = $sth->fetch()) {
+                $tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
 
-				$usth->execute([$tsvector_combined, $line['id']]);
+                $usth->execute([$tsvector_combined, $line['id']]);
 
-				$processed++;
-			}
+                $processed++;
+            }
 
-			print "Processed $processed articles...\n";
+            print "Processed $processed articles...\n";
 
-			if ($processed < $limit) {
-				echo "All done.\n";
-				break;
-			}
-		}
-	}
+            if ($processed < $limit) {
+                echo "All done.\n";
+                break;
+            }
+        }
+    }
 
-	if (isset($options["list-plugins"])) {
-		$tmppluginhost = new PluginHost();
-		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, false);
-		$enabled = array_map("trim", explode(",", PLUGINS));
+    if (isset($options["list-plugins"])) {
+        $tmppluginhost = new PluginHost();
+        $tmppluginhost->load_all($tmppluginhost::KIND_ALL, false);
+        $enabled = array_map("trim", explode(",", PLUGINS));
 
-		echo "List of all available plugins:\n";
+        echo "List of all available plugins:\n";
 
-		foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
-			$about = $plugin->about();
+        foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
+            $about = $plugin->about();
 
-			$status = $about[3] ? "system" : "user";
+            $status = $about[3] ? "system" : "user";
 
-			if (in_array($name, $enabled)) $name .= "*";
+            if (in_array($name, $enabled)) $name .= "*";
 
-			printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
-				$name, $status, $about[0], $about[2], $about[1]);
-		}
+            printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
+                $name, $status, $about[0], $about[2], $about[1]);
+        }
 
-		echo "Plugins marked by * are currently enabled for all users.\n";
+        echo "Plugins marked by * are currently enabled for all users.\n";
 
-	}
+    }
 
-	if (isset($options["debug-feed"])) {
-		$feed = $options["debug-feed"];
+    if (isset($options["debug-feed"])) {
+        $feed = $options["debug-feed"];
 
-		if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
-		if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
+        if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
+        if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
 
-		Debug::set_loglevel(Debug::$LOG_EXTENDED);
+        Debug::set_loglevel(Debug::$LOG_EXTENDED);
 
-		$rc = RSSUtils::update_rss_feed($feed) != false ? 0 : 1;
+        $rc = RSSUtils::update_rss_feed($feed) != false ? 0 : 1;
 
-		exit($rc);
-	}
+        exit($rc);
+    }
 
-	if (isset($options["send-digests"])) {
-		Digest::send_headlines_digests();
-	}
+    if (isset($options["send-digests"])) {
+        Digest::send_headlines_digests();
+    }
 
-	PluginHost::getInstance()->run_commands($options);
+    PluginHost::getInstance()->run_commands($options);
 
-	if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
-		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
-			fclose($lock_handle);
-		unlink(LOCK_DIRECTORY . "/$lock_filename");
+    if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
+        if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
+            fclose($lock_handle);
+        unlink(LOCK_DIRECTORY . "/$lock_filename");

Braces +32 added lines, -19 removed lines

@@ -59,8 +59,9 @@ 
 		return $tags_deleted;
 	}
 
-	if (!defined('PHP_EXECUTABLE'))
-		define('PHP_EXECUTABLE', '/usr/bin/php');
+	if (!defined('PHP_EXECUTABLE')) {
+			define('PHP_EXECUTABLE', '/usr/bin/php');
+	}
 
 	$pdo = Db::pdo();
 
@@ -249,8 +250,9 @@ 
 
 		RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
 
-		if (!isset($options["pidlock"]) || $options["task"] == 0)
-			RSSUtils::housekeeping_common(true);
+		if (!isset($options["pidlock"]) || $options["task"] == 0) {
+					RSSUtils::housekeeping_common(true);
+		}
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 	}
@@ -264,8 +266,9 @@ 
 		Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
 		Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+		if (read_stdin() != 'yes') {
+					exit;
+		}
 
 		Debug::log("clearing existing indexes...");
 
@@ -319,8 +322,9 @@ 
 		Debug::log("WARNING: this will remove all existing type2 filters.");
 		Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+		if (read_stdin() != 'yes') {
+					exit;
+		}
 
 		Debug::log("converting filters...");
 
@@ -374,16 +378,18 @@ 
 		if ($updater->isUpdateRequired()) {
 			Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
 
-			if (DB_TYPE == "mysql")
-				Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
+			if (DB_TYPE == "mysql") {
+							Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
 					"Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
-			else
-				Debug::log("WARNING: please backup your database before continuing.");
+			} else {
+							Debug::log("WARNING: please backup your database before continuing.");
+			}
 
 			Debug::log("Type 'yes' to continue.");
 
-			if (read_stdin() != 'yes')
-				exit;
+			if (read_stdin() != 'yes') {
+							exit;
+			}
 
 			Debug::log("Performing updates to version " . SCHEMA_VERSION);
 
@@ -456,7 +462,9 @@ 
 
 			$status = $about[3] ? "system" : "user";
 
-			if (in_array($name, $enabled)) $name .= "*";
+			if (in_array($name, $enabled)) {
+			    $name .= "*";
+			}
 
 			printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
 				$name, $status, $about[0], $about[2], $about[1]);
@@ -469,8 +477,12 @@ 
 	if (isset($options["debug-feed"])) {
 		$feed = $options["debug-feed"];
 
-		if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
-		if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
+		if (isset($options["force-refetch"])) {
+		    $_REQUEST["force_refetch"] = true;
+		}
+		if (isset($options["force-rehash"])) {
+		    $_REQUEST["force_rehash"] = true;
+		}
 
 		Debug::set_loglevel(Debug::$LOG_EXTENDED);
 
@@ -485,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");

include/login_form.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 					   class="input input-text"
 					   value="<?php echo $_SESSION["fake_password"] ?>"/>
 			</fieldset>
-			<?php if (strpos(PLUGINS, "auth_internal") !== FALSE) { ?>
+			<?php if (strpos(PLUGINS, "auth_internal") !== false) { ?>
 				<fieldset class="align-right">
 					<a href="public.php?op=forgotpass"><?php echo __("I forgot my password") ?></a>
 				</fieldset>

Indentation +7 added lines, -7 removed lines

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

lib/phpqrcode/qrlib.php

Indentation +13 added lines, -13 removed lines

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

  */

 	

-	$QR_BASEDIR = dirname(__FILE__).DIRECTORY_SEPARATOR;

+    $QR_BASEDIR = dirname(__FILE__).DIRECTORY_SEPARATOR;

 	

-	// Required libs

+    // Required libs

 	

-	include $QR_BASEDIR."qrconst.php";

-	include $QR_BASEDIR."qrconfig.php";

-	include $QR_BASEDIR."qrtools.php";

-	include $QR_BASEDIR."qrspec.php";

-	include $QR_BASEDIR."qrimage.php";

-	include $QR_BASEDIR."qrinput.php";

-	include $QR_BASEDIR."qrbitstream.php";

-	include $QR_BASEDIR."qrsplit.php";

-	include $QR_BASEDIR."qrrscode.php";

-	include $QR_BASEDIR."qrmask.php";

-	include $QR_BASEDIR."qrencode.php";

+    include $QR_BASEDIR."qrconst.php";

+    include $QR_BASEDIR."qrconfig.php";

+    include $QR_BASEDIR."qrtools.php";

+    include $QR_BASEDIR."qrspec.php";

+    include $QR_BASEDIR."qrimage.php";

+    include $QR_BASEDIR."qrinput.php";

+    include $QR_BASEDIR."qrbitstream.php";

+    include $QR_BASEDIR."qrsplit.php";

+    include $QR_BASEDIR."qrrscode.php";

+    include $QR_BASEDIR."qrmask.php";

+    include $QR_BASEDIR."qrencode.php";

 

lib/phpqrcode/tools/merged_header.php

Indentation +1 added lines, -1 removed lines

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

  */

  

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