codysnider / tt-rss

lib/accept-to-gettext.php

Spacing +51 added lines, -53 removed lines

@@ -69,17 +69,17 @@ 
 
 /* not really important, this one; perhaps I could've put it inline with
  * the rest. */
-function find_match($curlscore,$curcscore,$curgtlang,$langval,$charval,
+function find_match($curlscore, $curcscore, $curgtlang, $langval, $charval,
                     $gtlang)
 {
-  if($curlscore < $langval) {
-    $curlscore=$langval;
-    $curcscore=$charval;
-    $curgtlang=$gtlang;
+  if ($curlscore < $langval) {
+    $curlscore = $langval;
+    $curcscore = $charval;
+    $curgtlang = $gtlang;
   } else if ($curlscore == $langval) {
-    if($curcscore < $charval) {
-      $curcscore=$charval;
-      $curgtlang=$gtlang;
+    if ($curcscore < $charval) {
+      $curcscore = $charval;
+      $curgtlang = $gtlang;
     }
   }
   return array($curlscore, $curcscore, $curgtlang);
@@ -87,22 +87,20 @@ 
 
 function al2gt($gettextlangs, $mime) {
   /* default to "everything is acceptable", as RFC2616 specifies */
-  $acceptLang=(($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' :
-      $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
-  $acceptChar=(($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' :
-      $_SERVER["HTTP_ACCEPT_CHARSET"]);
-  $alparts=@preg_split("/,/",$acceptLang);
-  $acparts=@preg_split("/,/",$acceptChar);
+  $acceptLang = (($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
+  $acceptChar = (($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_CHARSET"]);
+  $alparts = @preg_split("/,/", $acceptLang);
+  $acparts = @preg_split("/,/", $acceptChar);
   
   /* Parse the contents of the Accept-Language header.*/
-  foreach($alparts as $part) {
-    $part=trim($part);
-    if(preg_match("/;/", $part)) {
-      $lang=@preg_split("/;/",$part);
-      $score=@preg_split("/=/",$lang[1]);
-      $alscores[$lang[0]]=$score[1];
+  foreach ($alparts as $part) {
+    $part = trim($part);
+    if (preg_match("/;/", $part)) {
+      $lang = @preg_split("/;/", $part);
+      $score = @preg_split("/=/", $lang[1]);
+      $alscores[$lang[0]] = $score[1];
     } else {
-      $alscores[$part]=1;
+      $alscores[$part] = 1;
     }
   }
 
@@ -116,20 +114,20 @@ 
    * Making it 2 for the time being, so that we
    * can distinguish between "not specified" and "specified as 1" later
    * on. */
-  $acscores["ISO-8859-1"]=2;
+  $acscores["ISO-8859-1"] = 2;
 
-  foreach($acparts as $part) {
-    $part=trim($part);
-    if(preg_match("/;/", $part)) {
-      $cs=@preg_split("/;/",$part);
-      $score=@preg_split("/=/",$cs[1]);
-      $acscores[strtoupper($cs[0])]=$score[1];
+  foreach ($acparts as $part) {
+    $part = trim($part);
+    if (preg_match("/;/", $part)) {
+      $cs = @preg_split("/;/", $part);
+      $score = @preg_split("/=/", $cs[1]);
+      $acscores[strtoupper($cs[0])] = $score[1];
     } else {
-      $acscores[strtoupper($part)]=1;
+      $acscores[strtoupper($part)] = 1;
     }
   }
-  if($acscores["ISO-8859-1"]==2) {
-    $acscores["ISO-8859-1"]=(isset($acscores["*"])?$acscores["*"]:1);
+  if ($acscores["ISO-8859-1"] == 2) {
+    $acscores["ISO-8859-1"] = (isset($acscores["*"]) ? $acscores["*"] : 1);
   }
 
   /* 
@@ -137,18 +135,18 @@ 
    * with the highest score, excluding the ones with a charset the user
    * did not include.
    */
-  $curlscore=0;
-  $curcscore=0;
-  $curgtlang=NULL;
-  foreach($gettextlangs as $gtlang) {
+  $curlscore = 0;
+  $curcscore = 0;
+  $curgtlang = NULL;
+  foreach ($gettextlangs as $gtlang) {
 
-    $tmp1=preg_replace("/\_/","-",$gtlang);
-    $tmp2=@preg_split("/\./",$tmp1);
-    $allang=strtolower($tmp2[0]);
-    $gtcs=strtoupper($tmp2[1]);
-    $noct=@preg_split("/-/",$allang);
+    $tmp1 = preg_replace("/\_/", "-", $gtlang);
+    $tmp2 = @preg_split("/\./", $tmp1);
+    $allang = strtolower($tmp2[0]);
+    $gtcs = strtoupper($tmp2[1]);
+    $noct = @preg_split("/-/", $allang);
 
-    $testvals=array(
+    $testvals = array(
          array(@$alscores[$allang], @$acscores[$gtcs]),
      array(@$alscores[$noct[0]], @$acscores[$gtcs]),
      array(@$alscores[$allang], @$acscores["*"]),
@@ -156,15 +154,15 @@ 
      array(@$alscores["*"], @$acscores[$gtcs]),
      array(@$alscores["*"], @$acscores["*"]));
 
-    $found=FALSE;
-    foreach($testvals as $tval) {
-      if(!$found && isset($tval[0]) && isset($tval[1])) {
-        $arr=find_match($curlscore, $curcscore, $curgtlang, $tval[0],
+    $found = FALSE;
+    foreach ($testvals as $tval) {
+      if (!$found && isset($tval[0]) && isset($tval[1])) {
+        $arr = find_match($curlscore, $curcscore, $curgtlang, $tval[0],
               $tval[1], $gtlang);
-        $curlscore=$arr[0];
-        $curcscore=$arr[1];
-        $curgtlang=$arr[2];
-    $found=TRUE;
+        $curlscore = $arr[0];
+        $curcscore = $arr[1];
+        $curgtlang = $arr[2];
+    $found = TRUE;
       }
     }
   }
@@ -172,10 +170,10 @@ 
   /* We must re-parse the gettext-string now, since we may have found it
    * through a "*" qualifier.*/
   
-  $gtparts=@preg_split("/\./",$curgtlang);
-  $tmp=strtolower($gtparts[0]);
-  $lang=preg_replace("/\_/", "-", $tmp);
-  $charset=$gtparts[1];
+  $gtparts = @preg_split("/\./", $curgtlang);
+  $tmp = strtolower($gtparts[0]);
+  $lang = preg_replace("/\_/", "-", $tmp);
+  $charset = $gtparts[1];
 
   header("Content-Language: $lang");
   header("Content-Type: $mime; charset=$charset");

lib/gettext/gettext.inc

Spacing +10 added lines, -10 removed lines

@@ -35,7 +35,7 @@ 
 // LC_MESSAGES is not available if php-gettext is not loaded
 // while the other constants are already available from session extension.
 if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES',	5);
+  define('LC_MESSAGES', 5);
 }
 
 require('streams.php');
@@ -77,7 +77,7 @@ 
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code
                    ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
+                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
                    $locale, $matches)) {
 
       if (isset($matches["lang"])) $lang = $matches["lang"];
@@ -113,7 +113,7 @@ 
 /**
  * Utility function to get a StreamReader for the given text domain.
  */
-function _get_reader($domain=null, $category=5, $enable_cache=true) {
+function _get_reader($domain = null, $category = 5, $enable_cache = true) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
     if (!isset($domain)) $domain = $default_domain;
     if (!isset($text_domains[$domain]->l10n)) {
@@ -121,12 +121,12 @@ 
         $locale = _setlocale(LC_MESSAGES, 0);
         $bound_path = isset($text_domains[$domain]->path) ?
           $text_domains[$domain]->path : './';
-        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
+        $subpath = $LC_CATEGORIES[$category]."/$domain.mo";
 
         $locale_names = get_list_of_locales($locale);
         $input = null;
         foreach ($locale_names as $locale) {
-          $full_path = $bound_path . $locale . "/" . $subpath;
+          $full_path = $bound_path.$locale."/".$subpath;
           if (file_exists($full_path)) {
             $input = new FileReader($full_path);
             break;
@@ -154,7 +154,7 @@ 
 /**
  * Checks if the current locale is supported on this system.
  */
-function _check_locale_and_function($function=false) {
+function _check_locale_and_function($function = false) {
     global $EMULATEGETTEXT;
     if ($function and !function_exists($function))
         return false;
@@ -164,10 +164,10 @@ 
 /**
  * Get the codeset for the given domain.
  */
-function _get_codeset($domain=null) {
+function _get_codeset($domain = null) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
     if (!isset($domain)) $domain = $default_domain;
-    return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
+    return (isset($text_domains[$domain]->codeset)) ? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
 }
 
 /**
@@ -241,10 +241,10 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
+      if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
         $path .= '\\';
     } else {
-      if ($path[strlen($path)-1] != '/')
+      if ($path[strlen($path) - 1] != '/')
         $path .= '/';
     }
     if (!array_key_exists($domain, $text_domains)) {

lib/gettext/streams.php

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
   var $_pos;
   var $_str;
 
-  function StringReader($str='') {
+  function StringReader($str = '') {
     $this->_str = $str;
     $this->_pos = 0;
   }
@@ -57,7 +57,7 @@ 
   function read($bytes) {
     $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
-    if (strlen($this->_str)<$this->_pos)
+    if (strlen($this->_str) < $this->_pos)
       $this->_pos = strlen($this->_str);
 
     return $data;
@@ -65,7 +65,7 @@ 
 
   function seekto($pos) {
     $this->_pos = $pos;
-    if (strlen($this->_str)<$this->_pos)
+    if (strlen($this->_str) < $this->_pos)
       $this->_pos = strlen($this->_str);
     return $this->_pos;
   }
@@ -89,9 +89,9 @@ 
   function FileReader($filename) {
     if (file_exists($filename)) {
 
-      $this->_length=filesize($filename);
+      $this->_length = filesize($filename);
       $this->_pos = 0;
-      $this->_fd = fopen($filename,'rb');
+      $this->_fd = fopen($filename, 'rb');
       if (!$this->_fd) {
         $this->error = 3; // Cannot read file, probably permissions
         return false;
@@ -146,8 +146,8 @@ 
   function CachedFileReader($filename) {
     if (file_exists($filename)) {
 
-      $length=filesize($filename);
-      $fd = fopen($filename,'rb');
+      $length = filesize($filename);
+      $fd = fopen($filename, 'rb');
 
       if (!$fd) {
         $this->error = 3; // Cannot read file, probably permissions

lib/gettext/gettext.php

Spacing +27 added lines, -27 removed lines

@@ -38,17 +38,17 @@ 
    var $error = 0; // public variable that holds error code (0 if no error)
 
    //private:
-  var $BYTEORDER = 0;        // 0: low endian, 1: big endian
+  var $BYTEORDER = 0; // 0: low endian, 1: big endian
   var $STREAM = NULL;
   var $short_circuit = false;
   var $enable_cache = false;
-  var $originals = NULL;      // offset of original table
-  var $translations = NULL;    // offset of translation table
-  var $pluralheader = NULL;    // cache header field for plural forms
-  var $total = 0;          // total string count
-  var $table_originals = NULL;  // table for original strings (offsets)
-  var $table_translations = NULL;  // table for translated strings (offsets)
-  var $cache_translations = NULL;  // original -> translation mapping
+  var $originals = NULL; // offset of original table
+  var $translations = NULL; // offset of translation table
+  var $pluralheader = NULL; // cache header field for plural forms
+  var $total = 0; // total string count
+  var $table_originals = NULL; // table for original strings (offsets)
+  var $table_translations = NULL; // table for translated strings (offsets)
+  var $cache_translations = NULL; // original -> translation mapping
 
 
   /* Methods */
@@ -63,11 +63,11 @@ 
   function readint() {
       if ($this->BYTEORDER == 0) {
         // low endian
-        $input=unpack('V', $this->STREAM->read(4));
+        $input = unpack('V', $this->STREAM->read(4));
         return array_shift($input);
       } else {
         // big endian
-        $input=unpack('N', $this->STREAM->read(4));
+        $input = unpack('N', $this->STREAM->read(4));
         return array_shift($input);
       }
     }
@@ -100,7 +100,7 @@ 
    */
   function __construct($Reader, $enable_cache = true) {
     // If there isn't a StreamReader, turn on short circuit mode.
-    if (! $Reader || isset($Reader->error) ) {
+    if (!$Reader || isset($Reader->error)) {
       $this->short_circuit = true;
       return;
     }
@@ -154,7 +154,7 @@ 
     }
 
     if ($this->enable_cache) {
-      $this->cache_translations = array ();
+      $this->cache_translations = array();
       /* read all strings in the cache */
       for ($i = 0; $i < $this->total; $i++) {
         $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
@@ -176,11 +176,11 @@ 
   function get_original_string($num) {
     $length = $this->table_originals[$num * 2 + 1];
     $offset = $this->table_originals[$num * 2 + 2];
-    if (! $length)
+    if (!$length)
       return '';
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
-    return (string)$data;
+    return (string) $data;
   }
 
   /**
@@ -193,11 +193,11 @@ 
   function get_translation_string($num) {
     $length = $this->table_translations[$num * 2 + 1];
     $offset = $this->table_translations[$num * 2 + 2];
-    if (! $length)
+    if (!$length)
       return '';
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
-    return (string)$data;
+    return (string) $data;
   }
 
   /**
@@ -227,7 +227,7 @@ 
       return $this->find_string($string, $end, $start);
     } else {
       // Divide table in two parts
-      $half = (int)(($start + $end) / 2);
+      $half = (int) (($start + $end) / 2);
       $cmp = strcmp($string, $this->get_original_string($half));
       if ($cmp == 0)
         // string is exactly in the middle => return it
@@ -294,7 +294,7 @@ 
         $res .= ') : (';
         break;
       case ';':
-        $res .= str_repeat( ')', $p) . ';';
+        $res .= str_repeat(')', $p).';';
         $p = 0;
         break;
       default:
@@ -330,7 +330,7 @@ 
     $this->load_tables();
 
     // cache header field for plural forms
-    if (! is_string($this->pluralheader)) {
+    if (!is_string($this->pluralheader)) {
       if ($this->enable_cache) {
         $header = $this->cache_translations[""];
       } else {
@@ -352,12 +352,12 @@ 
   function select_string($n) {
     if (!is_int($n)) {
       throw new InvalidArgumentException(
-        "Select_string only accepts integers: " . $n);
+        "Select_string only accepts integers: ".$n);
     }
     $string = $this->get_plural_forms();
-    $string = str_replace('nplurals',"\$total",$string);
-    $string = str_replace("n",$n,$string);
-    $string = str_replace('plural',"\$plural",$string);
+    $string = str_replace('nplurals', "\$total", $string);
+    $string = str_replace("n", $n, $string);
+    $string = str_replace('plural', "\$plural", $string);
 
     $total = 0;
     $plural = 0;
@@ -388,11 +388,11 @@ 
     $select = $this->select_string($number);
 
     // this should contains all strings separated by NULLs
-    $key = $single . chr(0) . $plural;
+    $key = $single.chr(0).$plural;
 
 
     if ($this->enable_cache) {
-      if (! array_key_exists($key, $this->cache_translations)) {
+      if (!array_key_exists($key, $this->cache_translations)) {
         return ($number != 1) ? $plural : $single;
       } else {
         $result = $this->cache_translations[$key];
@@ -412,7 +412,7 @@ 
   }
 
   function pgettext($context, $msgid) {
-    $key = $context . chr(4) . $msgid;
+    $key = $context.chr(4).$msgid;
     $ret = $this->translate($key);
     if (strpos($ret, "\004") !== FALSE) {
       return $msgid;
@@ -422,7 +422,7 @@ 
   }
 
   function npgettext($context, $singular, $plural, $number) {
-    $key = $context . chr(4) . $singular;
+    $key = $context.chr(4).$singular;
     $ret = $this->ngettext($key, $plural, $number);
     if (strpos($ret, "\004") !== FALSE) {
       return $singular;

index.php

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 	// we need a separate check here because functions.php might get parsed
 	// incorrectly before 5.3 because of :: syntax.
 	if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-		print "<b>Fatal Error</b>: PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".\n";
+		print "<b>Fatal Error</b>: PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".\n";
 		exit;
 	}
 
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	require_once "autoload.php";

plugins/no_title_counters/init.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	}
 
 	function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	function api_version() {

plugins/af_zz_noautoplay/init.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	}
 
 	function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	function api_version() {

plugins/no_url_hashes/init.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	}
 
 	function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	function api_version() {

classes/pref/feeds.php

Spacing +81 added lines, -81 removed lines

@@ -60,8 +60,8 @@ 
 		while ($line = $sth->fetch()) {
 
 			$cat = array();
-			$cat['id'] = 'CAT:' . $line['id'];
-			$cat['bare_id'] = (int)$line['id'];
+			$cat['id'] = 'CAT:'.$line['id'];
+			$cat['bare_id'] = (int) $line['id'];
 			$cat['name'] = $line['title'];
 			$cat['items'] = array();
 			$cat['checkbox'] = false;
@@ -93,8 +93,8 @@ 
 
 		while ($feed_line = $fsth->fetch()) {
 			$feed = array();
-			$feed['id'] = 'FEED:' . $feed_line['id'];
-			$feed['bare_id'] = (int)$feed_line['id'];
+			$feed['id'] = 'FEED:'.$feed_line['id'];
+			$feed['bare_id'] = (int) $feed_line['id'];
 			$feed['auxcounter'] = -1;
 			$feed['name'] = $feed_line['title'];
 			$feed['checkbox'] = false;
@@ -103,7 +103,7 @@ 
 			$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
 			$feed['param'] = make_local_datetime(
 				$feed_line['last_updated'], true);
-			$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+			$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 			array_push($items, $feed);
 		}
@@ -151,8 +151,8 @@ 
 					$feed_id = PluginHost::pfeed_to_feed_id($feed['id']);
 
 					$item = array();
-					$item['id'] = 'FEED:' . $feed_id;
-					$item['bare_id'] = (int)$feed_id;
+					$item['id'] = 'FEED:'.$feed_id;
+					$item['bare_id'] = (int) $feed_id;
 					$item['auxcounter'] = -1;
 					$item['name'] = $feed['title'];
 					$item['checkbox'] = false;
@@ -216,8 +216,8 @@ 
 
 			while ($line = $sth->fetch()) {
 				$cat = array();
-				$cat['id'] = 'CAT:' . $line['id'];
-				$cat['bare_id'] = (int)$line['id'];
+				$cat['id'] = 'CAT:'.$line['id'];
+				$cat['bare_id'] = (int) $line['id'];
 				$cat['auxcounter'] = -1;
 				$cat['name'] = $line['title'];
 				$cat['items'] = array();
@@ -261,8 +261,8 @@ 
 
 			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
+				$feed['id'] = 'FEED:'.$feed_line['id'];
+				$feed['bare_id'] = (int) $feed_line['id'];
 				$feed['auxcounter'] = -1;
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
@@ -272,7 +272,7 @@ 
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 				array_push($cat['items'], $feed);
 			}
@@ -296,8 +296,8 @@ 
 
 			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
+				$feed['id'] = 'FEED:'.$feed_line['id'];
+				$feed['bare_id'] = (int) $feed_line['id'];
 				$feed['auxcounter'] = -1;
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
@@ -307,7 +307,7 @@ 
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 				array_push($root['items'], $feed);
 			}
@@ -348,11 +348,11 @@ 
 
 		Debug::log("$prefix C: $item_id P: $parent_id");
 
-		$bare_item_id = substr($item_id, strpos($item_id, ':')+1);
+		$bare_item_id = substr($item_id, strpos($item_id, ':') + 1);
 
 		if ($item_id != 'root') {
 			if ($parent_id && $parent_id != 'root') {
-				$parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
+				$parent_bare_id = substr($parent_id, strpos($parent_id, ':') + 1);
 				$parent_qpart = $parent_bare_id;
 			} else {
 				$parent_qpart = null;
@@ -371,7 +371,7 @@ 
 		if ($cat && is_array($cat)) {
 			foreach ($cat as $item) {
 				$id = $item['_reference'];
-				$bare_id = substr($id, strpos($id, ':')+1);
+				$bare_id = substr($id, strpos($id, ':') + 1);
 
 				Debug::log("$prefix [$order_id] $id/$bare_id");
 
@@ -389,7 +389,7 @@ 
 
 					} else if (strpos($id, "CAT:") === 0) {
 						$this->process_category_order($data_map, $item['_reference'], $item_id,
-							$nest_level+1);
+							$nest_level + 1);
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 								SET order_id = ? WHERE id = ? AND
@@ -446,7 +446,7 @@ 
 		$sth->execute([$feed_id, $_SESSION['uid']]);
 
 		if ($sth->fetch()) {
-			@unlink(ICONS_DIR . "/$feed_id.ico");
+			@unlink(ICONS_DIR."/$feed_id.ico");
 
 			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?");
 			$sth->execute([$feed_id]);
@@ -457,7 +457,7 @@ 
 		header("Content-type: text/html");
 
 		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
+			$tmp_file = tempnam(CACHE_DIR.'/upload', 'icon');
 
 			$result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
 				$tmp_file);
@@ -480,8 +480,8 @@ 
 				$sth->execute([$feed_id, $_SESSION['uid']]);
 
 				if ($sth->fetch()) {
-					@unlink(ICONS_DIR . "/$feed_id.ico");
-					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
+					@unlink(ICONS_DIR."/$feed_id.ico");
+					if (rename($icon_file, ICONS_DIR."/$feed_id.ico")) {
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?");
 						$sth->execute([$feed_id]);
@@ -540,7 +540,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('URL:') . "</label> ";
+			print "<label>".__('URL:')."</label> ";
 			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
@@ -563,7 +563,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Place in category:') . "</label> ";
+				print "<label>".__('Place in category:')."</label> ";
 
 				print_feed_cat_select("cat_id", $cat_id,
 					'dojoType="fox.form.Select"');
@@ -577,7 +577,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Site URL:') . "</label> ";
+			print "<label>".__('Site URL:')."</label> ";
 			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Site URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
@@ -595,7 +595,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Language:') . "</label> ";
+				print "<label>".__('Language:')."</label> ";
 				print_select("feed_language", $feed_language, $this::get_ts_languages(),
 					'dojoType="fox.form.Select"');
 
@@ -626,10 +626,10 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+			print "<label>".__('Article purging:')."</label> ";
 
 			print_select_hash("purge_interval", $purge_interval, $purge_intervals,
-				'dojoType="fox.form.Select" ' .
+				'dojoType="fox.form.Select" '.
 				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
 
 			print "</fieldset>";
@@ -736,7 +736,7 @@ 
 			print "<fieldset class='narrow'>";
 
 			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
-				name='cache_images' $checked> ". __('Cache media')."</label>";
+				name='cache_images' $checked> ".__('Cache media')."</label>";
 
 			print "</fieldset>";
 
@@ -818,7 +818,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Place in category:') . "</label> ";
+			print "<label>".__('Place in category:')."</label> ";
 
 			print_feed_cat_select("cat_id", false,
 				'disabled="1" dojoType="fox.form.Select"');
@@ -833,7 +833,7 @@ 
 		if (DB_TYPE == "pgsql") {
 			print "<fieldset>";
 
-			print "<label>" . __('Language:') . "</label> ";
+			print "<label>".__('Language:')."</label> ";
 			print_select("feed_language", "", $this::get_ts_languages(),
 				'disabled="1" dojoType="fox.form.Select"');
 
@@ -866,7 +866,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+			print "<label>".__('Article purging:')."</label> ";
 
 			print_select_hash("purge_interval", "", $purge_intervals,
 				'disabled="1" dojoType="fox.form.Select"');
@@ -1026,12 +1026,12 @@ 
 					":purge_intl" => $purge_intl,
 					":auth_login" => $auth_login,
 					":auth_pass" => $auth_pass,
-					":private" => (int)$private,
-					":cache_images" => (int)$cache_images,
-					":hide_images" => (int)$hide_images,
-					":include_in_digest" => (int)$include_in_digest,
-					":always_display_enclosures" => (int)$always_display_enclosures,
-					":mark_unread_on_update" => (int)$mark_unread_on_update,
+					":private" => (int) $private,
+					":cache_images" => (int) $cache_images,
+					":hide_images" => (int) $hide_images,
+					":include_in_digest" => (int) $include_in_digest,
+					":always_display_enclosures" => (int) $always_display_enclosures,
+					":mark_unread_on_update" => (int) $mark_unread_on_update,
 					":feed_language" => $feed_language,
 					":id" => $feed_id,
 					":uid" => $_SESSION['uid']]);
@@ -1062,57 +1062,57 @@ 
 
 				switch ($k) {
 					case "title":
-						$qpart = "title = " . $this->pdo->quote($feed_title);
+						$qpart = "title = ".$this->pdo->quote($feed_title);
 						break;
 
 					case "feed_url":
-						$qpart = "feed_url = " . $this->pdo->quote($feed_url);
+						$qpart = "feed_url = ".$this->pdo->quote($feed_url);
 						break;
 
 					case "update_interval":
-						$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
+						$qpart = "update_interval = ".$this->pdo->quote($upd_intl);
 						break;
 
 					case "purge_interval":
-						$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
+						$qpart = "purge_interval =".$this->pdo->quote($purge_intl);
 						break;
 
 					case "auth_login":
-						$qpart = "auth_login = " . $this->pdo->quote($auth_login);
+						$qpart = "auth_login = ".$this->pdo->quote($auth_login);
 						break;
 
 					case "auth_pass":
-						$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
+						$qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
 						break;
 
 					case "private":
-						$qpart = "private = " . $this->pdo->quote($private);
+						$qpart = "private = ".$this->pdo->quote($private);
 						break;
 
 					case "include_in_digest":
-						$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
+						$qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
 						break;
 
 					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
+						$qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
 						break;
 
 					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
+						$qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
 						break;
 
 					case "cache_images":
-						$qpart = "cache_images = " . $this->pdo->quote($cache_images);
+						$qpart = "cache_images = ".$this->pdo->quote($cache_images);
 						break;
 
 					case "hide_images":
-						$qpart = "hide_images = " . $this->pdo->quote($hide_images);
+						$qpart = "hide_images = ".$this->pdo->quote($hide_images);
 						break;
 
 					case "cat_id":
 						if (get_pref('ENABLE_FEED_CATS')) {
 							if ($cat_id) {
-								$qpart = "cat_id = " . $this->pdo->quote($cat_id);
+								$qpart = "cat_id = ".$this->pdo->quote($cat_id);
 							} else {
 								$qpart = 'cat_id = NULL';
 							}
@@ -1123,7 +1123,7 @@ 
 						break;
 
 					case "feed_language":
-						$qpart = "feed_language = " . $this->pdo->quote($feed_language);
+						$qpart = "feed_language = ".$this->pdo->quote($feed_language);
 						break;
 
 				}
@@ -1184,14 +1184,14 @@ 
 
 			$error_button = "<button dojoType=\"dijit.form.Button\"
 			  		onclick=\"CommonDialogs.showFeedsWithErrors()\" id=\"errorButton\">" .
-				__("Feeds with errors") . "</button>";
+				__("Feeds with errors")."</button>";
 		}
 
 		$inactive_button = "<button dojoType=\"dijit.form.Button\"
 				id=\"pref_feeds_inactive_btn\"
 				style=\"display : none\"
 				onclick=\"dijit.byId('feedTree').showInactiveFeeds()\">" .
-				__("Inactive feeds") . "</button>";
+				__("Inactive feeds")."</button>";
 
 		$feed_search = clean($_REQUEST["search"]);
 
@@ -1213,7 +1213,7 @@ 
 			</div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -1222,7 +1222,7 @@ 
 		print "</div></div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Feeds')."</span>";
+				"<span>".__('Feeds')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"CommonDialogs.quickAddFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
@@ -1238,7 +1238,7 @@ 
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 			print "<div dojoType=\"fox.form.DropDownButton\">".
-					"<span>" . __('Categories')."</span>";
+					"<span>".__('Categories')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 			print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
 				dojoType=\"dijit.MenuItem\">".__('Add category')."</div>";
@@ -1305,7 +1305,7 @@ 
 		print "<div dojoType='dijit.layout.AccordionPane'
 			title='<i class=\"material-icons\">import_export</i> ".__('OPML')."'>";
 
-		print "<h3>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "</h3>";
+		print "<h3>".__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.")."</h3>";
 
 		print_notice("Only main settings profile can be migrated using OPML.");
 
@@ -1322,7 +1322,7 @@ 
 			<input type='hidden' name='op' value='dlg'>
 			<input type='hidden' name='method' value='importOpml'>
 			<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return Helpers.OPML.import();\" type=\"submit\">" .
-			__('Import OPML') . "</button>";
+			__('Import OPML')."</button>";
 
 		print "</form>";
 
@@ -1330,22 +1330,22 @@ 
 
 		print "<button dojoType='dijit.form.Button'
 			onclick='Helpers.OPML.export()' >" .
-			__('Export OPML') . "</button>";
+			__('Export OPML')."</button>";
 
 		print " <label class='checkbox'>";
 		print_checkbox("include_settings", true, "1", "");
-		print " " . __("Include settings");
+		print " ".__("Include settings");
 		print "</label>";
 
 		print "</form>";
 
 		print "<p/>";
 
-		print "<h2>" . __("Published OPML") . "</h2>";
+		print "<h2>".__("Published OPML")."</h2>";
 
-		print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') .
-			" " .
-			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>";
+		print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.').
+			" ".
+			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.")."</p>";
 
 		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
 			__('Display published OPML URL')."</button> ";
@@ -1358,10 +1358,10 @@ 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>share</i> ".__('Published & shared articles / Generated feeds')."\">";
 
-		print "<h3>" . __('Published articles can be subscribed by anyone who knows the following URL:') . "</h3>";
+		print "<h3>".__('Published articles can be subscribed by anyone who knows the following URL:')."</h3>";
 
-		$rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
-				"/public.php?op=rss&id=-2&view-mode=all_articles");;
+		$rss_url = '-2::'.htmlspecialchars(get_self_url_prefix().
+				"/public.php?op=rss&id=-2&view-mode=all_articles"); ;
 
 		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
@@ -1390,7 +1390,7 @@ 
 			$cat_unread = Feeds::getCategoryUnread($cat_id);
 		}
 
-		$obj['id'] = 'CAT:' . $cat_id;
+		$obj['id'] = 'CAT:'.$cat_id;
 		$obj['items'] = array();
 		$obj['name'] = Feeds::getCategoryTitle($cat_id);
 		$obj['type'] = 'category';
@@ -1410,7 +1410,7 @@ 
 		if ($unread === false)
 			$unread = getFeedUnread($feed_id, false);
 
-		$obj['id'] = 'FEED:' . $feed_id;
+		$obj['id'] = 'FEED:'.$feed_id;
 		$obj['name'] = $title;
 		$obj['unread'] = (int) $unread;
 		$obj['type'] = 'feed';
@@ -1446,7 +1446,7 @@ 
 
 		print "<div dojoType='fox.Toolbar'>";
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('inactive-feeds-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -1503,7 +1503,7 @@ 
 
 		print "<div dojoType=\"fox.Toolbar\">";
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"Tables.select('error-feeds-list', true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -1567,7 +1567,7 @@ 
 
 	static function remove_feed($id, $owner_uid) {
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
-			if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
+			if (!$p->hook_unsubscribe_feed($id, $owner_uid)) {
                 user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
                 return;
 			}
@@ -1599,7 +1599,7 @@ 
 					$res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
 					$row = $res->fetch();
 
-					$new_feed_id = (int)$row['id'] + 1;
+					$new_feed_id = (int) $row['id'] + 1;
 
 					$sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
@@ -1631,8 +1631,8 @@ 
 
 			$pdo->commit();
 
-			if (file_exists(ICONS_DIR . "/$id.ico")) {
-				unlink(ICONS_DIR . "/$id.ico");
+			if (file_exists(ICONS_DIR."/$id.ico")) {
+				unlink(ICONS_DIR."/$id.ico");
 			}
 
 			CCache::remove($id, $owner_uid);
@@ -1656,7 +1656,7 @@ 
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 			print "<fieldset>";
-			print "<label>" . __('Place in category:') . "</label> ";
+			print "<label>".__('Place in category:')."</label> ";
 			print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
 			print "</fieldset>";
 		}
@@ -1665,7 +1665,7 @@ 
 
 		print "<div id='feedDlg_loginContainer' style='display : none'>";
 
-		print "<header>" . __("Authentication") . "</header>";
+		print "<header>".__("Authentication")."</header>";
 		print "<section>";
 
 		print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
@@ -1784,12 +1784,12 @@ 
 		$sth->execute([$_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
-			print (int)$row["num_inactive"];
+			print (int) $row["num_inactive"];
 		}
 	}
 
 	static function subscribe_to_feed_url() {
-		$url_path = get_self_url_prefix() .
+		$url_path = get_self_url_prefix().
 			"/public.php?op=subscribe&feed_url=%s";
 		return $url_path;
 	}