codysnider / tt-rss

plugins/search_sphinx/sphinxapi.php

Switch Indentation +19 added lines, -19 removed lines

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

Indentation +1534 added lines, -1534 removed lines

@@ -123,1571 +123,1571 @@
 /// pack 64-bit signed
 function sphPackI64 ( $v )
 {
-	assert ( is_numeric($v) );
-
-	// x64
-	if ( PHP_INT_SIZE>=8 )
-	{
-		$v = (int)$v;
-		return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
-	}
-
-	// x32, int
-	if ( is_int($v) )
-		return pack ( "NN", $v < 0 ? -1 : 0, $v );
-
-	// x32, bcmath
-	if ( function_exists("bcmul") )
-	{
-		if ( bccomp ( $v, 0 ) == -1 )
-			$v = bcadd ( "18446744073709551616", $v );
-		$h = bcdiv ( $v, "4294967296", 0 );
-		$l = bcmod ( $v, "4294967296" );
-		return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
-	}
-
-	// x32, no-bcmath
-	$p = max(0, strlen($v) - 13);
-	$lo = abs((float)substr($v, $p));
-	$hi = abs((float)substr($v, 0, $p));
-
-	$m = $lo + $hi*1316134912.0; // (10 ^ 13) % (1 << 32) = 1316134912
-	$q = floor($m/4294967296.0);
-	$l = $m - ($q*4294967296.0);
-	$h = $hi*2328.0 + $q; // (10 ^ 13) / (1 << 32) = 2328
-
-	if ( $v<0 )
-	{
-		if ( $l==0 )
-			$h = 4294967296.0 - $h;
-		else
-		{
-			$h = 4294967295.0 - $h;
-			$l = 4294967296.0 - $l;
-		}
-	}
-	return pack ( "NN", $h, $l );
+    assert ( is_numeric($v) );
+
+    // x64
+    if ( PHP_INT_SIZE>=8 )
+    {
+        $v = (int)$v;
+        return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
+    }
+
+    // x32, int
+    if ( is_int($v) )
+        return pack ( "NN", $v < 0 ? -1 : 0, $v );
+
+    // x32, bcmath
+    if ( function_exists("bcmul") )
+    {
+        if ( bccomp ( $v, 0 ) == -1 )
+            $v = bcadd ( "18446744073709551616", $v );
+        $h = bcdiv ( $v, "4294967296", 0 );
+        $l = bcmod ( $v, "4294967296" );
+        return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
+    }
+
+    // x32, no-bcmath
+    $p = max(0, strlen($v) - 13);
+    $lo = abs((float)substr($v, $p));
+    $hi = abs((float)substr($v, 0, $p));
+
+    $m = $lo + $hi*1316134912.0; // (10 ^ 13) % (1 << 32) = 1316134912
+    $q = floor($m/4294967296.0);
+    $l = $m - ($q*4294967296.0);
+    $h = $hi*2328.0 + $q; // (10 ^ 13) / (1 << 32) = 2328
+
+    if ( $v<0 )
+    {
+        if ( $l==0 )
+            $h = 4294967296.0 - $h;
+        else
+        {
+            $h = 4294967295.0 - $h;
+            $l = 4294967296.0 - $l;
+        }
+    }
+    return pack ( "NN", $h, $l );
 }
 
 /// pack 64-bit unsigned
 function sphPackU64 ( $v )
 {
-	assert ( is_numeric($v) );
-
-	// x64
-	if ( PHP_INT_SIZE>=8 )
-	{
-		assert ( $v>=0 );
-
-		// x64, int
-		if ( is_int($v) )
-			return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
-
-		// x64, bcmath
-		if ( function_exists("bcmul") )
-		{
-			$h = bcdiv ( $v, 4294967296, 0 );
-			$l = bcmod ( $v, 4294967296 );
-			return pack ( "NN", $h, $l );
-		}
-
-		// x64, no-bcmath
-		$p = max ( 0, strlen($v) - 13 );
-		$lo = (int)substr ( $v, $p );
-		$hi = (int)substr ( $v, 0, $p );
-
-		$m = $lo + $hi*1316134912;
-		$l = $m % 4294967296;
-		$h = $hi*2328 + (int)($m/4294967296);
-
-		return pack ( "NN", $h, $l );
-	}
-
-	// x32, int
-	if ( is_int($v) )
-		return pack ( "NN", 0, $v );
-
-	// x32, bcmath
-	if ( function_exists("bcmul") )
-	{
-		$h = bcdiv ( $v, "4294967296", 0 );
-		$l = bcmod ( $v, "4294967296" );
-		return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
-	}
-
-	// x32, no-bcmath
-	$p = max(0, strlen($v) - 13);
-	$lo = (float)substr($v, $p);
-	$hi = (float)substr($v, 0, $p);
-
-	$m = $lo + $hi*1316134912.0;
-	$q = floor($m / 4294967296.0);
-	$l = $m - ($q * 4294967296.0);
-	$h = $hi*2328.0 + $q;
-
-	return pack ( "NN", $h, $l );
+    assert ( is_numeric($v) );
+
+    // x64
+    if ( PHP_INT_SIZE>=8 )
+    {
+        assert ( $v>=0 );
+
+        // x64, int
+        if ( is_int($v) )
+            return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
+
+        // x64, bcmath
+        if ( function_exists("bcmul") )
+        {
+            $h = bcdiv ( $v, 4294967296, 0 );
+            $l = bcmod ( $v, 4294967296 );
+            return pack ( "NN", $h, $l );
+        }
+
+        // x64, no-bcmath
+        $p = max ( 0, strlen($v) - 13 );
+        $lo = (int)substr ( $v, $p );
+        $hi = (int)substr ( $v, 0, $p );
+
+        $m = $lo + $hi*1316134912;
+        $l = $m % 4294967296;
+        $h = $hi*2328 + (int)($m/4294967296);
+
+        return pack ( "NN", $h, $l );
+    }
+
+    // x32, int
+    if ( is_int($v) )
+        return pack ( "NN", 0, $v );
+
+    // x32, bcmath
+    if ( function_exists("bcmul") )
+    {
+        $h = bcdiv ( $v, "4294967296", 0 );
+        $l = bcmod ( $v, "4294967296" );
+        return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
+    }
+
+    // x32, no-bcmath
+    $p = max(0, strlen($v) - 13);
+    $lo = (float)substr($v, $p);
+    $hi = (float)substr($v, 0, $p);
+
+    $m = $lo + $hi*1316134912.0;
+    $q = floor($m / 4294967296.0);
+    $l = $m - ($q * 4294967296.0);
+    $h = $hi*2328.0 + $q;
+
+    return pack ( "NN", $h, $l );
 }
 
 // unpack 64-bit unsigned
 function sphUnpackU64 ( $v )
 {
-	list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
-
-	if ( PHP_INT_SIZE>=8 )
-	{
-		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-		if ( $lo<0 ) $lo += (1<<32);
-
-		// x64, int
-		if ( $hi<=2147483647 )
-			return ($hi<<32) + $lo;
-
-		// x64, bcmath
-		if ( function_exists("bcmul") )
-			return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
-
-		// x64, no-bcmath
-		$C = 100000;
-		$h = ((int)($hi / $C) << 32) + (int)($lo / $C);
-		$l = (($hi % $C) << 32) + ($lo % $C);
-		if ( $l>$C )
-		{
-			$h += (int)($l / $C);
-			$l  = $l % $C;
-		}
-
-		if ( $h==0 )
-			return $l;
-		return sprintf ( "%d%05d", $h, $l );
-	}
-
-	// x32, int
-	if ( $hi==0 )
-	{
-		if ( $lo>0 )
-			return $lo;
-		return sprintf ( "%u", $lo );
-	}
-
-	$hi = sprintf ( "%u", $hi );
-	$lo = sprintf ( "%u", $lo );
-
-	// x32, bcmath
-	if ( function_exists("bcmul") )
-		return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
-
-	// x32, no-bcmath
-	$hi = (float)$hi;
-	$lo = (float)$lo;
-
-	$q = floor($hi/10000000.0);
-	$r = $hi - $q*10000000.0;
-	$m = $lo + $r*4967296.0;
-	$mq = floor($m/10000000.0);
-	$l = $m - $mq*10000000.0;
-	$h = $q*4294967296.0 + $r*429.0 + $mq;
-
-	$h = sprintf ( "%.0f", $h );
-	$l = sprintf ( "%07.0f", $l );
-	if ( $h=="0" )
-		return sprintf( "%.0f", (float)$l );
-	return $h . $l;
+    list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
+
+    if ( PHP_INT_SIZE>=8 )
+    {
+        if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
+        if ( $lo<0 ) $lo += (1<<32);
+
+        // x64, int
+        if ( $hi<=2147483647 )
+            return ($hi<<32) + $lo;
+
+        // x64, bcmath
+        if ( function_exists("bcmul") )
+            return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+
+        // x64, no-bcmath
+        $C = 100000;
+        $h = ((int)($hi / $C) << 32) + (int)($lo / $C);
+        $l = (($hi % $C) << 32) + ($lo % $C);
+        if ( $l>$C )
+        {
+            $h += (int)($l / $C);
+            $l  = $l % $C;
+        }
+
+        if ( $h==0 )
+            return $l;
+        return sprintf ( "%d%05d", $h, $l );
+    }
+
+    // x32, int
+    if ( $hi==0 )
+    {
+        if ( $lo>0 )
+            return $lo;
+        return sprintf ( "%u", $lo );
+    }
+
+    $hi = sprintf ( "%u", $hi );
+    $lo = sprintf ( "%u", $lo );
+
+    // x32, bcmath
+    if ( function_exists("bcmul") )
+        return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+
+    // x32, no-bcmath
+    $hi = (float)$hi;
+    $lo = (float)$lo;
+
+    $q = floor($hi/10000000.0);
+    $r = $hi - $q*10000000.0;
+    $m = $lo + $r*4967296.0;
+    $mq = floor($m/10000000.0);
+    $l = $m - $mq*10000000.0;
+    $h = $q*4294967296.0 + $r*429.0 + $mq;
+
+    $h = sprintf ( "%.0f", $h );
+    $l = sprintf ( "%07.0f", $l );
+    if ( $h=="0" )
+        return sprintf( "%.0f", (float)$l );
+    return $h . $l;
 }
 
 // unpack 64-bit signed
 function sphUnpackI64 ( $v )
 {
-	list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
-
-	// x64
-	if ( PHP_INT_SIZE>=8 )
-	{
-		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-		if ( $lo<0 ) $lo += (1<<32);
-
-		return ($hi<<32) + $lo;
-	}
-
-	// x32, int
-	if ( $hi==0 )
-	{
-		if ( $lo>0 )
-			return $lo;
-		return sprintf ( "%u", $lo );
-	}
-	// x32, int
-	elseif ( $hi==-1 )
-	{
-		if ( $lo<0 )
-			return $lo;
-		return sprintf ( "%.0f", $lo - 4294967296.0 );
-	}
-
-	$neg = "";
-	$c = 0;
-	if ( $hi<0 )
-	{
-		$hi = ~$hi;
-		$lo = ~$lo;
-		$c = 1;
-		$neg = "-";
-	}
-
-	$hi = sprintf ( "%u", $hi );
-	$lo = sprintf ( "%u", $lo );
-
-	// x32, bcmath
-	if ( function_exists("bcmul") )
-		return $neg . bcadd ( bcadd ( $lo, bcmul ( $hi, "4294967296" ) ), $c );
-
-	// x32, no-bcmath
-	$hi = (float)$hi;
-	$lo = (float)$lo;
-
-	$q = floor($hi/10000000.0);
-	$r = $hi - $q*10000000.0;
-	$m = $lo + $r*4967296.0;
-	$mq = floor($m/10000000.0);
-	$l = $m - $mq*10000000.0 + $c;
-	$h = $q*4294967296.0 + $r*429.0 + $mq;
-	if ( $l==10000000 )
-	{
-		$l = 0;
-		$h += 1;
-	}
-
-	$h = sprintf ( "%.0f", $h );
-	$l = sprintf ( "%07.0f", $l );
-	if ( $h=="0" )
-		return $neg . sprintf( "%.0f", (float)$l );
-	return $neg . $h . $l;
+    list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
+
+    // x64
+    if ( PHP_INT_SIZE>=8 )
+    {
+        if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
+        if ( $lo<0 ) $lo += (1<<32);
+
+        return ($hi<<32) + $lo;
+    }
+
+    // x32, int
+    if ( $hi==0 )
+    {
+        if ( $lo>0 )
+            return $lo;
+        return sprintf ( "%u", $lo );
+    }
+    // x32, int
+    elseif ( $hi==-1 )
+    {
+        if ( $lo<0 )
+            return $lo;
+        return sprintf ( "%.0f", $lo - 4294967296.0 );
+    }
+
+    $neg = "";
+    $c = 0;
+    if ( $hi<0 )
+    {
+        $hi = ~$hi;
+        $lo = ~$lo;
+        $c = 1;
+        $neg = "-";
+    }
+
+    $hi = sprintf ( "%u", $hi );
+    $lo = sprintf ( "%u", $lo );
+
+    // x32, bcmath
+    if ( function_exists("bcmul") )
+        return $neg . bcadd ( bcadd ( $lo, bcmul ( $hi, "4294967296" ) ), $c );
+
+    // x32, no-bcmath
+    $hi = (float)$hi;
+    $lo = (float)$lo;
+
+    $q = floor($hi/10000000.0);
+    $r = $hi - $q*10000000.0;
+    $m = $lo + $r*4967296.0;
+    $mq = floor($m/10000000.0);
+    $l = $m - $mq*10000000.0 + $c;
+    $h = $q*4294967296.0 + $r*429.0 + $mq;
+    if ( $l==10000000 )
+    {
+        $l = 0;
+        $h += 1;
+    }
+
+    $h = sprintf ( "%.0f", $h );
+    $l = sprintf ( "%07.0f", $l );
+    if ( $h=="0" )
+        return $neg . sprintf( "%.0f", (float)$l );
+    return $neg . $h . $l;
 }
 
 
 function sphFixUint ( $value )
 {
-	if ( PHP_INT_SIZE>=8 )
-	{
-		// x64 route, workaround broken unpack() in 5.2.2+
-		if ( $value<0 ) $value += (1<<32);
-		return $value;
-	}
-	else
-	{
-		// x32 route, workaround php signed/unsigned braindamage
-		return sprintf ( "%u", $value );
-	}
+    if ( PHP_INT_SIZE>=8 )
+    {
+        // x64 route, workaround broken unpack() in 5.2.2+
+        if ( $value<0 ) $value += (1<<32);
+        return $value;
+    }
+    else
+    {
+        // x32 route, workaround php signed/unsigned braindamage
+        return sprintf ( "%u", $value );
+    }
 }
 
 
 /// sphinx searchd client class
 class SphinxClient
 {
-	var $_host;			///< searchd host (default is "localhost")
-	var $_port;			///< searchd port (default is 9312)
-	var $_offset;		///< how many records to seek from result-set start (default is 0)
-	var $_limit;		///< how many records to return from result-set starting at offset (default is 20)
-	var $_mode;			///< query matching mode (default is SPH_MATCH_ALL)
-	var $_weights;		///< per-field weights (default is 1 for all fields)
-	var $_sort;			///< match sorting mode (default is SPH_SORT_RELEVANCE)
-	var $_sortby;		///< attribute to sort by (defualt is "")
-	var $_min_id;		///< min ID to match (default is 0, which means no limit)
-	var $_max_id;		///< max ID to match (default is 0, which means no limit)
-	var $_filters;		///< search filters
-	var $_groupby;		///< group-by attribute name
-	var $_groupfunc;	///< group-by function (to pre-process group-by attribute value with)
-	var $_groupsort;	///< group-by sorting clause (to sort groups in result set with)
-	var $_groupdistinct;///< group-by count-distinct attribute
-	var $_maxmatches;	///< max matches to retrieve
-	var $_cutoff;		///< cutoff to stop searching at (default is 0)
-	var $_retrycount;	///< distributed retries count
-	var $_retrydelay;	///< distributed retries delay
-	var $_anchor;		///< geographical anchor point
-	var $_indexweights;	///< per-index weights
-	var $_ranker;		///< ranking mode (default is SPH_RANK_PROXIMITY_BM25)
-	var $_maxquerytime;	///< max query time, milliseconds (default is 0, do not limit)
-	var $_fieldweights;	///< per-field-name weights
-	var $_overrides;	///< per-query attribute values overrides
-	var $_select;		///< select-list (attributes or expressions, with optional aliases)
-
-	var $_error;		///< last error message
-	var $_warning;		///< last warning message
-	var $_connerror;		///< connection error vs remote error flag
-
-	var $_reqs;			///< requests array for multi-query
-	var $_mbenc;		///< stored mbstring encoding
-	var $_arrayresult;	///< whether $result["matches"] should be a hash or an array
-	var $_timeout;		///< connect timeout
-
-	/////////////////////////////////////////////////////////////////////////////
-	// common stuff
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// create a new client object and fill defaults
-	public function __construct()
-	{
-		// per-client-object settings
-		$this->_host		= "localhost";
-		$this->_port		= 9312;
-		$this->_path		= false;
-		$this->_socket		= false;
-
-		// per-query settings
-		$this->_offset		= 0;
-		$this->_limit		= 20;
-		$this->_mode		= SPH_MATCH_ALL;
-		$this->_weights		= array ();
-		$this->_sort		= SPH_SORT_RELEVANCE;
-		$this->_sortby		= "";
-		$this->_min_id		= 0;
-		$this->_max_id		= 0;
-		$this->_filters		= array ();
-		$this->_groupby		= "";
-		$this->_groupfunc	= SPH_GROUPBY_DAY;
-		$this->_groupsort	= "@group desc";
-		$this->_groupdistinct= "";
-		$this->_maxmatches	= 1000;
-		$this->_cutoff		= 0;
-		$this->_retrycount	= 0;
-		$this->_retrydelay	= 0;
-		$this->_anchor		= array ();
-		$this->_indexweights= array ();
-		$this->_ranker		= SPH_RANK_PROXIMITY_BM25;
-		$this->_maxquerytime= 0;
-		$this->_fieldweights= array();
-		$this->_overrides 	= array();
-		$this->_select		= "*";
-
-		$this->_error		= ""; // per-reply fields (for single-query case)
-		$this->_warning		= "";
-		$this->_connerror	= false;
-
-		$this->_reqs		= array ();	// requests storage (for multi-query case)
-		$this->_mbenc		= "";
-		$this->_arrayresult	= false;
-		$this->_timeout		= 0;
-	}
-
-	public function __destruct()
-	{
-		if ( $this->_socket !== false )
-			fclose ( $this->_socket );
-	}
-
-	/// get last error message (string)
-	public function GetLastError ()
-	{
-		return $this->_error;
-	}
-
-	/// get last warning message (string)
-	public function GetLastWarning ()
-	{
-		return $this->_warning;
-	}
-
-	/// get last error flag (to tell network connection errors from searchd errors or broken responses)
-	public function IsConnectError()
-	{
-		return $this->_connerror;
-	}
-
-	/// set searchd host name (string) and port (integer)
-	public function SetServer ( $host, $port = 0 )
-	{
-		assert ( is_string($host) );
-		if ( $host[0] == '/')
-		{
-			$this->_path = 'unix://' . $host;
-			return;
-		}
-		if ( substr ( $host, 0, 7 )=="unix://" )
-		{
-			$this->_path = $host;
-			return;
-		}
-
-		assert ( is_int($port) );
-		$this->_host = $host;
-		$this->_port = $port;
-		$this->_path = '';
-
-	}
-
-	/// set server connection timeout (0 to remove)
-	public function SetConnectTimeout ( $timeout )
-	{
-		assert ( is_numeric($timeout) );
-		$this->_timeout = $timeout;
-	}
-
-
-	public function _Send ( $handle, $data, $length )
-	{
-		if ( feof($handle) || fwrite ( $handle, $data, $length ) !== $length )
-		{
-			$this->_error = 'connection unexpectedly closed (timed out?)';
-			$this->_connerror = true;
-			return false;
-		}
-		return true;
-	}
-
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// enter mbstring workaround mode
-	public function _MBPush ()
-	{
-		$this->_mbenc = "";
-		if ( ini_get ( "mbstring.func_overload" ) & 2 )
-		{
-			$this->_mbenc = mb_internal_encoding();
-			mb_internal_encoding ( "latin1" );
-		}
+    var $_host;			///< searchd host (default is "localhost")
+    var $_port;			///< searchd port (default is 9312)
+    var $_offset;		///< how many records to seek from result-set start (default is 0)
+    var $_limit;		///< how many records to return from result-set starting at offset (default is 20)
+    var $_mode;			///< query matching mode (default is SPH_MATCH_ALL)
+    var $_weights;		///< per-field weights (default is 1 for all fields)
+    var $_sort;			///< match sorting mode (default is SPH_SORT_RELEVANCE)
+    var $_sortby;		///< attribute to sort by (defualt is "")
+    var $_min_id;		///< min ID to match (default is 0, which means no limit)
+    var $_max_id;		///< max ID to match (default is 0, which means no limit)
+    var $_filters;		///< search filters
+    var $_groupby;		///< group-by attribute name
+    var $_groupfunc;	///< group-by function (to pre-process group-by attribute value with)
+    var $_groupsort;	///< group-by sorting clause (to sort groups in result set with)
+    var $_groupdistinct;///< group-by count-distinct attribute
+    var $_maxmatches;	///< max matches to retrieve
+    var $_cutoff;		///< cutoff to stop searching at (default is 0)
+    var $_retrycount;	///< distributed retries count
+    var $_retrydelay;	///< distributed retries delay
+    var $_anchor;		///< geographical anchor point
+    var $_indexweights;	///< per-index weights
+    var $_ranker;		///< ranking mode (default is SPH_RANK_PROXIMITY_BM25)
+    var $_maxquerytime;	///< max query time, milliseconds (default is 0, do not limit)
+    var $_fieldweights;	///< per-field-name weights
+    var $_overrides;	///< per-query attribute values overrides
+    var $_select;		///< select-list (attributes or expressions, with optional aliases)
+
+    var $_error;		///< last error message
+    var $_warning;		///< last warning message
+    var $_connerror;		///< connection error vs remote error flag
+
+    var $_reqs;			///< requests array for multi-query
+    var $_mbenc;		///< stored mbstring encoding
+    var $_arrayresult;	///< whether $result["matches"] should be a hash or an array
+    var $_timeout;		///< connect timeout
+
+    /////////////////////////////////////////////////////////////////////////////
+    // common stuff
+    /////////////////////////////////////////////////////////////////////////////
+
+    /// create a new client object and fill defaults
+    public function __construct()
+    {
+        // per-client-object settings
+        $this->_host		= "localhost";
+        $this->_port		= 9312;
+        $this->_path		= false;
+        $this->_socket		= false;
+
+        // per-query settings
+        $this->_offset		= 0;
+        $this->_limit		= 20;
+        $this->_mode		= SPH_MATCH_ALL;
+        $this->_weights		= array ();
+        $this->_sort		= SPH_SORT_RELEVANCE;
+        $this->_sortby		= "";
+        $this->_min_id		= 0;
+        $this->_max_id		= 0;
+        $this->_filters		= array ();
+        $this->_groupby		= "";
+        $this->_groupfunc	= SPH_GROUPBY_DAY;
+        $this->_groupsort	= "@group desc";
+        $this->_groupdistinct= "";
+        $this->_maxmatches	= 1000;
+        $this->_cutoff		= 0;
+        $this->_retrycount	= 0;
+        $this->_retrydelay	= 0;
+        $this->_anchor		= array ();
+        $this->_indexweights= array ();
+        $this->_ranker		= SPH_RANK_PROXIMITY_BM25;
+        $this->_maxquerytime= 0;
+        $this->_fieldweights= array();
+        $this->_overrides 	= array();
+        $this->_select		= "*";
+
+        $this->_error		= ""; // per-reply fields (for single-query case)
+        $this->_warning		= "";
+        $this->_connerror	= false;
+
+        $this->_reqs		= array ();	// requests storage (for multi-query case)
+        $this->_mbenc		= "";
+        $this->_arrayresult	= false;
+        $this->_timeout		= 0;
+    }
+
+    public function __destruct()
+    {
+        if ( $this->_socket !== false )
+            fclose ( $this->_socket );
+    }
+
+    /// get last error message (string)
+    public function GetLastError ()
+    {
+        return $this->_error;
+    }
+
+    /// get last warning message (string)
+    public function GetLastWarning ()
+    {
+        return $this->_warning;
+    }
+
+    /// get last error flag (to tell network connection errors from searchd errors or broken responses)
+    public function IsConnectError()
+    {
+        return $this->_connerror;
+    }
+
+    /// set searchd host name (string) and port (integer)
+    public function SetServer ( $host, $port = 0 )
+    {
+        assert ( is_string($host) );
+        if ( $host[0] == '/')
+        {
+            $this->_path = 'unix://' . $host;
+            return;
+        }
+        if ( substr ( $host, 0, 7 )=="unix://" )
+        {
+            $this->_path = $host;
+            return;
+        }
+
+        assert ( is_int($port) );
+        $this->_host = $host;
+        $this->_port = $port;
+        $this->_path = '';
+
+    }
+
+    /// set server connection timeout (0 to remove)
+    public function SetConnectTimeout ( $timeout )
+    {
+        assert ( is_numeric($timeout) );
+        $this->_timeout = $timeout;
+    }
+
+
+    public function _Send ( $handle, $data, $length )
+    {
+        if ( feof($handle) || fwrite ( $handle, $data, $length ) !== $length )
+        {
+            $this->_error = 'connection unexpectedly closed (timed out?)';
+            $this->_connerror = true;
+            return false;
+        }
+        return true;
+    }
+
+    /////////////////////////////////////////////////////////////////////////////
+
+    /// enter mbstring workaround mode
+    public function _MBPush ()
+    {
+        $this->_mbenc = "";
+        if ( ini_get ( "mbstring.func_overload" ) & 2 )
+        {
+            $this->_mbenc = mb_internal_encoding();
+            mb_internal_encoding ( "latin1" );
+        }
+    }
+
+    /// leave mbstring workaround mode
+    public function _MBPop ()
+    {
+        if ( $this->_mbenc )
+            mb_internal_encoding ( $this->_mbenc );
+    }
+
+    /// connect to searchd server
+    public function _Connect ()
+    {
+        if ( $this->_socket!==false )
+        {
+            // we are in persistent connection mode, so we have a socket
+            // however, need to check whether it's still alive
+            if ( !@feof ( $this->_socket ) )
+                return $this->_socket;
+
+            // force reopen
+            $this->_socket = false;
+        }
+
+        $errno = 0;
+        $errstr = "";
+        $this->_connerror = false;
+
+        if ( $this->_path )
+        {
+            $host = $this->_path;
+            $port = 0;
+        }
+        else
+        {
+            $host = $this->_host;
+            $port = $this->_port;
+        }
+
+        if ( $this->_timeout<=0 )
+            $fp = @fsockopen ( $host, $port, $errno, $errstr );
+        else
+            $fp = @fsockopen ( $host, $port, $errno, $errstr, $this->_timeout );
+
+        if ( !$fp )
+        {
+            if ( $this->_path )
+                $location = $this->_path;
+            else
+                $location = "{$this->_host}:{$this->_port}";
+
+            $errstr = trim ( $errstr );
+            $this->_error = "connection to $location failed (errno=$errno, msg=$errstr)";
+            $this->_connerror = true;
+            return false;
+        }
+
+        // send my version
+        // this is a subtle part. we must do it before (!) reading back from searchd.
+        // because otherwise under some conditions (reported on FreeBSD for instance)
+        // TCP stack could throttle write-write-read pattern because of Nagle.
+        if ( !$this->_Send ( $fp, pack ( "N", 1 ), 4 ) )
+        {
+            fclose ( $fp );
+            $this->_error = "failed to send client protocol version";
+            return false;
+        }
+
+        // check version
+        list(,$v) = unpack ( "N*", fread ( $fp, 4 ) );
+        $v = (int)$v;
+        if ( $v<1 )
+        {
+            fclose ( $fp );
+            $this->_error = "expected searchd protocol version 1+, got version '$v'";
+            return false;
+        }
+
+        return $fp;
+    }
+
+    /// get and check response packet from searchd server
+    public function _GetResponse ( $fp, $client_ver )
+    {
+        $response = "";
+        $len = 0;
+
+        $header = fread ( $fp, 8 );
+        if ( strlen($header)==8 )
+        {
+            list ( $status, $ver, $len ) = array_values ( unpack ( "n2a/Nb", $header ) );
+            $left = $len;
+            while ( $left>0 && !feof($fp) )
+            {
+                $chunk = fread ( $fp, min ( 8192, $left ) );
+                if ( $chunk )
+                {
+                    $response .= $chunk;
+                    $left -= strlen($chunk);
+                }
+            }
+        }
+        if ( $this->_socket === false )
+            fclose ( $fp );
+
+        // check response
+        $read = strlen ( $response );
+        if ( !$response || $read!=$len )
+        {
+            $this->_error = $len
+                ? "failed to read searchd response (status=$status, ver=$ver, len=$len, read=$read)"
+                : "received zero-sized searchd response";
+            return false;
+        }
+
+        // check status
+        if ( $status==SEARCHD_WARNING )
+        {
+            list(,$wlen) = unpack ( "N*", substr ( $response, 0, 4 ) );
+            $this->_warning = substr ( $response, 4, $wlen );
+            return substr ( $response, 4+$wlen );
+        }
+        if ( $status==SEARCHD_ERROR )
+        {
+            $this->_error = "searchd error: " . substr ( $response, 4 );
+            return false;
+        }
+        if ( $status==SEARCHD_RETRY )
+        {
+            $this->_error = "temporary searchd error: " . substr ( $response, 4 );
+            return false;
+        }
+        if ( $status!=SEARCHD_OK )
+        {
+            $this->_error = "unknown status code '$status'";
+            return false;
+        }
+
+        // check version
+        if ( $ver<$client_ver )
+        {
+            $this->_warning = sprintf ( "searchd command v.%d.%d older than client's v.%d.%d, some options might not work",
+                $ver>>8, $ver&0xff, $client_ver>>8, $client_ver&0xff );
+        }
+
+        return $response;
+    }
+
+    /////////////////////////////////////////////////////////////////////////////
+    // searching
+    /////////////////////////////////////////////////////////////////////////////
+
+    /// set offset and count into result set,
+    /// and optionally set max-matches and cutoff limits
+    public function SetLimits ( $offset, $limit, $max=0, $cutoff=0 )
+    {
+        assert ( is_int($offset) );
+        assert ( is_int($limit) );
+        assert ( $offset>=0 );
+        assert ( $limit>0 );
+        assert ( $max>=0 );
+        $this->_offset = $offset;
+        $this->_limit = $limit;
+        if ( $max>0 )
+            $this->_maxmatches = $max;
+        if ( $cutoff>0 )
+            $this->_cutoff = $cutoff;
+    }
+
+    /// set maximum query time, in milliseconds, per-index
+    /// integer, 0 means "do not limit"
+    public function SetMaxQueryTime ( $max )
+    {
+        assert ( is_int($max) );
+        assert ( $max>=0 );
+        $this->_maxquerytime = $max;
+    }
+
+    /// set matching mode
+    public function SetMatchMode ( $mode )
+    {
+        assert ( $mode==SPH_MATCH_ALL
+            || $mode==SPH_MATCH_ANY
+            || $mode==SPH_MATCH_PHRASE
+            || $mode==SPH_MATCH_BOOLEAN
+            || $mode==SPH_MATCH_EXTENDED
+            || $mode==SPH_MATCH_FULLSCAN
+            || $mode==SPH_MATCH_EXTENDED2 );
+        $this->_mode = $mode;
+    }
+
+    /// set ranking mode
+    public function SetRankingMode ( $ranker )
+    {
+        assert ( $ranker>=0 && $ranker<SPH_RANK_TOTAL );
+        $this->_ranker = $ranker;
+    }
+
+    /// set matches sorting mode
+    public function SetSortMode ( $mode, $sortby="" )
+    {
+        assert (
+            $mode==SPH_SORT_RELEVANCE ||
+            $mode==SPH_SORT_ATTR_DESC ||
+            $mode==SPH_SORT_ATTR_ASC ||
+            $mode==SPH_SORT_TIME_SEGMENTS ||
+            $mode==SPH_SORT_EXTENDED ||
+            $mode==SPH_SORT_EXPR );
+        assert ( is_string($sortby) );
+        assert ( $mode==SPH_SORT_RELEVANCE || strlen($sortby)>0 );
+
+        $this->_sort = $mode;
+        $this->_sortby = $sortby;
+    }
+
+    /// bind per-field weights by order
+    /// DEPRECATED; use SetFieldWeights() instead
+    public function SetWeights ( $weights )
+    {
+        assert ( is_array($weights) );
+        foreach ( $weights as $weight )
+            assert ( is_int($weight) );
+
+        $this->_weights = $weights;
+    }
+
+    /// bind per-field weights by name
+    public function SetFieldWeights ( $weights )
+    {
+        assert ( is_array($weights) );
+        foreach ( $weights as $name=>$weight )
+        {
+            assert ( is_string($name) );
+            assert ( is_int($weight) );
+        }
+        $this->_fieldweights = $weights;
+    }
+
+    /// bind per-index weights by name
+    public function SetIndexWeights ( $weights )
+    {
+        assert ( is_array($weights) );
+        foreach ( $weights as $index=>$weight )
+        {
+            assert ( is_string($index) );
+            assert ( is_int($weight) );
+        }
+        $this->_indexweights = $weights;
+    }
+
+    /// set IDs range to match
+    /// only match records if document ID is beetwen $min and $max (inclusive)
+    public function SetIDRange ( $min, $max )
+    {
+        assert ( is_numeric($min) );
+        assert ( is_numeric($max) );
+        assert ( $min<=$max );
+        $this->_min_id = $min;
+        $this->_max_id = $max;
+    }
+
+    /// set values set filter
+    /// only match records where $attribute value is in given set
+    public function SetFilter ( $attribute, $values, $exclude=false )
+    {
+        assert ( is_string($attribute) );
+        assert ( is_array($values) );
+        assert ( count($values) );
+
+        if ( is_array($values) && count($values) )
+        {
+            foreach ( $values as $value )
+                assert ( is_numeric($value) );
+
+            $this->_filters[] = array ( "type"=>SPH_FILTER_VALUES, "attr"=>$attribute, "exclude"=>$exclude, "values"=>$values );
+        }
+    }
+
+    /// set range filter
+    /// only match records if $attribute value is beetwen $min and $max (inclusive)
+    public function SetFilterRange ( $attribute, $min, $max, $exclude=false )
+    {
+        assert ( is_string($attribute) );
+        assert ( is_numeric($min) );
+        assert ( is_numeric($max) );
+        assert ( $min<=$max );
+
+        $this->_filters[] = array ( "type"=>SPH_FILTER_RANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max );
+    }
+
+    /// set float range filter
+    /// only match records if $attribute value is beetwen $min and $max (inclusive)
+    public function SetFilterFloatRange ( $attribute, $min, $max, $exclude=false )
+    {
+        assert ( is_string($attribute) );
+        assert ( is_float($min) );
+        assert ( is_float($max) );
+        assert ( $min<=$max );
+
+        $this->_filters[] = array ( "type"=>SPH_FILTER_FLOATRANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max );
+    }
+
+    /// setup anchor point for geosphere distance calculations
+    /// required to use @geodist in filters and sorting
+    /// latitude and longitude must be in radians
+    public function SetGeoAnchor ( $attrlat, $attrlong, $lat, $long )
+    {
+        assert ( is_string($attrlat) );
+        assert ( is_string($attrlong) );
+        assert ( is_float($lat) );
+        assert ( is_float($long) );
+
+        $this->_anchor = array ( "attrlat"=>$attrlat, "attrlong"=>$attrlong, "lat"=>$lat, "long"=>$long );
+    }
+
+    /// set grouping attribute and function
+    public function SetGroupBy ( $attribute, $func, $groupsort="@group desc" )
+    {
+        assert ( is_string($attribute) );
+        assert ( is_string($groupsort) );
+        assert ( $func==SPH_GROUPBY_DAY
+            || $func==SPH_GROUPBY_WEEK
+            || $func==SPH_GROUPBY_MONTH
+            || $func==SPH_GROUPBY_YEAR
+            || $func==SPH_GROUPBY_ATTR
+            || $func==SPH_GROUPBY_ATTRPAIR );
+
+        $this->_groupby = $attribute;
+        $this->_groupfunc = $func;
+        $this->_groupsort = $groupsort;
+    }
+
+    /// set count-distinct attribute for group-by queries
+    public function SetGroupDistinct ( $attribute )
+    {
+        assert ( is_string($attribute) );
+        $this->_groupdistinct = $attribute;
+    }
+
+    /// set distributed retries count and delay
+    public function SetRetries ( $count, $delay=0 )
+    {
+        assert ( is_int($count) && $count>=0 );
+        assert ( is_int($delay) && $delay>=0 );
+        $this->_retrycount = $count;
+        $this->_retrydelay = $delay;
+    }
+
+    /// set result set format (hash or array; hash by default)
+    /// PHP specific; needed for group-by-MVA result sets that may contain duplicate IDs
+    public function SetArrayResult ( $arrayresult )
+    {
+        assert ( is_bool($arrayresult) );
+        $this->_arrayresult = $arrayresult;
+    }
+
+    /// set attribute values override
+    /// there can be only one override per attribute
+    /// $values must be a hash that maps document IDs to attribute values
+    public function SetOverride ( $attrname, $attrtype, $values )
+    {
+        assert ( is_string ( $attrname ) );
+        assert ( in_array ( $attrtype, array ( SPH_ATTR_INTEGER, SPH_ATTR_TIMESTAMP, SPH_ATTR_BOOL, SPH_ATTR_FLOAT, SPH_ATTR_BIGINT ) ) );
+        assert ( is_array ( $values ) );
+
+        $this->_overrides[$attrname] = array ( "attr"=>$attrname, "type"=>$attrtype, "values"=>$values );
+    }
+
+    /// set select-list (attributes or expressions), SQL-like syntax
+    public function SetSelect ( $select )
+    {
+        assert ( is_string ( $select ) );
+        $this->_select = $select;
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+
+    /// clear all filters (for multi-queries)
+    public function ResetFilters ()
+    {
+        $this->_filters = array();
+        $this->_anchor = array();
+    }
+
+    /// clear groupby settings (for multi-queries)
+    public function ResetGroupBy ()
+    {
+        $this->_groupby		= "";
+        $this->_groupfunc	= SPH_GROUPBY_DAY;
+        $this->_groupsort	= "@group desc";
+        $this->_groupdistinct= "";
     }
 
-	/// leave mbstring workaround mode
-	public function _MBPop ()
-	{
-		if ( $this->_mbenc )
-			mb_internal_encoding ( $this->_mbenc );
-	}
-
-	/// connect to searchd server
-	public function _Connect ()
-	{
-		if ( $this->_socket!==false )
-		{
-			// we are in persistent connection mode, so we have a socket
-			// however, need to check whether it's still alive
-			if ( !@feof ( $this->_socket ) )
-				return $this->_socket;
-
-			// force reopen
-			$this->_socket = false;
-		}
-
-		$errno = 0;
-		$errstr = "";
-		$this->_connerror = false;
-
-		if ( $this->_path )
-		{
-			$host = $this->_path;
-			$port = 0;
-		}
-		else
-		{
-			$host = $this->_host;
-			$port = $this->_port;
-		}
-
-		if ( $this->_timeout<=0 )
-			$fp = @fsockopen ( $host, $port, $errno, $errstr );
-		else
-			$fp = @fsockopen ( $host, $port, $errno, $errstr, $this->_timeout );
-
-		if ( !$fp )
-		{
-			if ( $this->_path )
-				$location = $this->_path;
-			else
-				$location = "{$this->_host}:{$this->_port}";
-
-			$errstr = trim ( $errstr );
-			$this->_error = "connection to $location failed (errno=$errno, msg=$errstr)";
-			$this->_connerror = true;
-			return false;
-		}
-
-		// send my version
-		// this is a subtle part. we must do it before (!) reading back from searchd.
-		// because otherwise under some conditions (reported on FreeBSD for instance)
-		// TCP stack could throttle write-write-read pattern because of Nagle.
-		if ( !$this->_Send ( $fp, pack ( "N", 1 ), 4 ) )
-		{
-			fclose ( $fp );
-			$this->_error = "failed to send client protocol version";
-			return false;
-		}
-
-		// check version
-		list(,$v) = unpack ( "N*", fread ( $fp, 4 ) );
-		$v = (int)$v;
-		if ( $v<1 )
-		{
-			fclose ( $fp );
-			$this->_error = "expected searchd protocol version 1+, got version '$v'";
-			return false;
-		}
-
-		return $fp;
-	}
-
-	/// get and check response packet from searchd server
-	public function _GetResponse ( $fp, $client_ver )
-	{
-		$response = "";
-		$len = 0;
-
-		$header = fread ( $fp, 8 );
-		if ( strlen($header)==8 )
-		{
-			list ( $status, $ver, $len ) = array_values ( unpack ( "n2a/Nb", $header ) );
-			$left = $len;
-			while ( $left>0 && !feof($fp) )
-			{
-				$chunk = fread ( $fp, min ( 8192, $left ) );
-				if ( $chunk )
-				{
-					$response .= $chunk;
-					$left -= strlen($chunk);
-				}
-			}
-		}
-		if ( $this->_socket === false )
-			fclose ( $fp );
-
-		// check response
-		$read = strlen ( $response );
-		if ( !$response || $read!=$len )
-		{
-			$this->_error = $len
-				? "failed to read searchd response (status=$status, ver=$ver, len=$len, read=$read)"
-				: "received zero-sized searchd response";
-			return false;
-		}
-
-		// check status
-		if ( $status==SEARCHD_WARNING )
-		{
-			list(,$wlen) = unpack ( "N*", substr ( $response, 0, 4 ) );
-			$this->_warning = substr ( $response, 4, $wlen );
-			return substr ( $response, 4+$wlen );
-		}
-		if ( $status==SEARCHD_ERROR )
-		{
-			$this->_error = "searchd error: " . substr ( $response, 4 );
-			return false;
-		}
-		if ( $status==SEARCHD_RETRY )
-		{
-			$this->_error = "temporary searchd error: " . substr ( $response, 4 );
-			return false;
-		}
-		if ( $status!=SEARCHD_OK )
-		{
-			$this->_error = "unknown status code '$status'";
-			return false;
-		}
-
-		// check version
-		if ( $ver<$client_ver )
-		{
-			$this->_warning = sprintf ( "searchd command v.%d.%d older than client's v.%d.%d, some options might not work",
-				$ver>>8, $ver&0xff, $client_ver>>8, $client_ver&0xff );
-		}
-
-		return $response;
-	}
-
-	/////////////////////////////////////////////////////////////////////////////
-	// searching
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// set offset and count into result set,
-	/// and optionally set max-matches and cutoff limits
-	public function SetLimits ( $offset, $limit, $max=0, $cutoff=0 )
-	{
-		assert ( is_int($offset) );
-		assert ( is_int($limit) );
-		assert ( $offset>=0 );
-		assert ( $limit>0 );
-		assert ( $max>=0 );
-		$this->_offset = $offset;
-		$this->_limit = $limit;
-		if ( $max>0 )
-			$this->_maxmatches = $max;
-		if ( $cutoff>0 )
-			$this->_cutoff = $cutoff;
-	}
-
-	/// set maximum query time, in milliseconds, per-index
-	/// integer, 0 means "do not limit"
-	public function SetMaxQueryTime ( $max )
-	{
-		assert ( is_int($max) );
-		assert ( $max>=0 );
-		$this->_maxquerytime = $max;
-	}
-
-	/// set matching mode
-	public function SetMatchMode ( $mode )
-	{
-		assert ( $mode==SPH_MATCH_ALL
-			|| $mode==SPH_MATCH_ANY
-			|| $mode==SPH_MATCH_PHRASE
-			|| $mode==SPH_MATCH_BOOLEAN
-			|| $mode==SPH_MATCH_EXTENDED
-			|| $mode==SPH_MATCH_FULLSCAN
-			|| $mode==SPH_MATCH_EXTENDED2 );
-		$this->_mode = $mode;
-	}
-
-	/// set ranking mode
-	public function SetRankingMode ( $ranker )
-	{
-		assert ( $ranker>=0 && $ranker<SPH_RANK_TOTAL );
-		$this->_ranker = $ranker;
-	}
-
-	/// set matches sorting mode
-	public function SetSortMode ( $mode, $sortby="" )
-	{
-		assert (
-			$mode==SPH_SORT_RELEVANCE ||
-			$mode==SPH_SORT_ATTR_DESC ||
-			$mode==SPH_SORT_ATTR_ASC ||
-			$mode==SPH_SORT_TIME_SEGMENTS ||
-			$mode==SPH_SORT_EXTENDED ||
-			$mode==SPH_SORT_EXPR );
-		assert ( is_string($sortby) );
-		assert ( $mode==SPH_SORT_RELEVANCE || strlen($sortby)>0 );
-
-		$this->_sort = $mode;
-		$this->_sortby = $sortby;
-	}
-
-	/// bind per-field weights by order
-	/// DEPRECATED; use SetFieldWeights() instead
-	public function SetWeights ( $weights )
-	{
-		assert ( is_array($weights) );
-		foreach ( $weights as $weight )
-			assert ( is_int($weight) );
-
-		$this->_weights = $weights;
-	}
-
-	/// bind per-field weights by name
-	public function SetFieldWeights ( $weights )
-	{
-		assert ( is_array($weights) );
-		foreach ( $weights as $name=>$weight )
-		{
-			assert ( is_string($name) );
-			assert ( is_int($weight) );
-		}
-		$this->_fieldweights = $weights;
-	}
-
-	/// bind per-index weights by name
-	public function SetIndexWeights ( $weights )
-	{
-		assert ( is_array($weights) );
-		foreach ( $weights as $index=>$weight )
-		{
-			assert ( is_string($index) );
-			assert ( is_int($weight) );
-		}
-		$this->_indexweights = $weights;
-	}
-
-	/// set IDs range to match
-	/// only match records if document ID is beetwen $min and $max (inclusive)
-	public function SetIDRange ( $min, $max )
-	{
-		assert ( is_numeric($min) );
-		assert ( is_numeric($max) );
-		assert ( $min<=$max );
-		$this->_min_id = $min;
-		$this->_max_id = $max;
-	}
-
-	/// set values set filter
-	/// only match records where $attribute value is in given set
-	public function SetFilter ( $attribute, $values, $exclude=false )
-	{
-		assert ( is_string($attribute) );
-		assert ( is_array($values) );
-		assert ( count($values) );
-
-		if ( is_array($values) && count($values) )
-		{
-			foreach ( $values as $value )
-				assert ( is_numeric($value) );
-
-			$this->_filters[] = array ( "type"=>SPH_FILTER_VALUES, "attr"=>$attribute, "exclude"=>$exclude, "values"=>$values );
-		}
-	}
-
-	/// set range filter
-	/// only match records if $attribute value is beetwen $min and $max (inclusive)
-	public function SetFilterRange ( $attribute, $min, $max, $exclude=false )
-	{
-		assert ( is_string($attribute) );
-		assert ( is_numeric($min) );
-		assert ( is_numeric($max) );
-		assert ( $min<=$max );
-
-		$this->_filters[] = array ( "type"=>SPH_FILTER_RANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max );
-	}
-
-	/// set float range filter
-	/// only match records if $attribute value is beetwen $min and $max (inclusive)
-	public function SetFilterFloatRange ( $attribute, $min, $max, $exclude=false )
-	{
-		assert ( is_string($attribute) );
-		assert ( is_float($min) );
-		assert ( is_float($max) );
-		assert ( $min<=$max );
-
-		$this->_filters[] = array ( "type"=>SPH_FILTER_FLOATRANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max );
-	}
-
-	/// setup anchor point for geosphere distance calculations
-	/// required to use @geodist in filters and sorting
-	/// latitude and longitude must be in radians
-	public function SetGeoAnchor ( $attrlat, $attrlong, $lat, $long )
-	{
-		assert ( is_string($attrlat) );
-		assert ( is_string($attrlong) );
-		assert ( is_float($lat) );
-		assert ( is_float($long) );
-
-		$this->_anchor = array ( "attrlat"=>$attrlat, "attrlong"=>$attrlong, "lat"=>$lat, "long"=>$long );
-	}
-
-	/// set grouping attribute and function
-	public function SetGroupBy ( $attribute, $func, $groupsort="@group desc" )
-	{
-		assert ( is_string($attribute) );
-		assert ( is_string($groupsort) );
-		assert ( $func==SPH_GROUPBY_DAY
-			|| $func==SPH_GROUPBY_WEEK
-			|| $func==SPH_GROUPBY_MONTH
-			|| $func==SPH_GROUPBY_YEAR
-			|| $func==SPH_GROUPBY_ATTR
-			|| $func==SPH_GROUPBY_ATTRPAIR );
-
-		$this->_groupby = $attribute;
-		$this->_groupfunc = $func;
-		$this->_groupsort = $groupsort;
-	}
-
-	/// set count-distinct attribute for group-by queries
-	public function SetGroupDistinct ( $attribute )
-	{
-		assert ( is_string($attribute) );
-		$this->_groupdistinct = $attribute;
-	}
-
-	/// set distributed retries count and delay
-	public function SetRetries ( $count, $delay=0 )
-	{
-		assert ( is_int($count) && $count>=0 );
-		assert ( is_int($delay) && $delay>=0 );
-		$this->_retrycount = $count;
-		$this->_retrydelay = $delay;
-	}
-
-	/// set result set format (hash or array; hash by default)
-	/// PHP specific; needed for group-by-MVA result sets that may contain duplicate IDs
-	public function SetArrayResult ( $arrayresult )
-	{
-		assert ( is_bool($arrayresult) );
-		$this->_arrayresult = $arrayresult;
-	}
-
-	/// set attribute values override
-	/// there can be only one override per attribute
-	/// $values must be a hash that maps document IDs to attribute values
-	public function SetOverride ( $attrname, $attrtype, $values )
-	{
-		assert ( is_string ( $attrname ) );
-		assert ( in_array ( $attrtype, array ( SPH_ATTR_INTEGER, SPH_ATTR_TIMESTAMP, SPH_ATTR_BOOL, SPH_ATTR_FLOAT, SPH_ATTR_BIGINT ) ) );
-		assert ( is_array ( $values ) );
-
-		$this->_overrides[$attrname] = array ( "attr"=>$attrname, "type"=>$attrtype, "values"=>$values );
-	}
-
-	/// set select-list (attributes or expressions), SQL-like syntax
-	public function SetSelect ( $select )
-	{
-		assert ( is_string ( $select ) );
-		$this->_select = $select;
-	}
-
-	//////////////////////////////////////////////////////////////////////////////
-
-	/// clear all filters (for multi-queries)
-	public function ResetFilters ()
-	{
-		$this->_filters = array();
-		$this->_anchor = array();
-	}
-
-	/// clear groupby settings (for multi-queries)
-	public function ResetGroupBy ()
-	{
-		$this->_groupby		= "";
-		$this->_groupfunc	= SPH_GROUPBY_DAY;
-		$this->_groupsort	= "@group desc";
-		$this->_groupdistinct= "";
-	}
-
-	/// clear all attribute value overrides (for multi-queries)
-	public function ResetOverrides ()
+    /// clear all attribute value overrides (for multi-queries)
+    public function ResetOverrides ()
     {
-    	$this->_overrides = array ();
+        $this->_overrides = array ();
     }
 
-	//////////////////////////////////////////////////////////////////////////////
-
-	/// connect to searchd server, run given search query through given indexes,
-	/// and return the search results
-	public function Query ( $query, $index="*", $comment="" )
-	{
-		assert ( empty($this->_reqs) );
-
-		$this->AddQuery ( $query, $index, $comment );
-		$results = $this->RunQueries ();
-		$this->_reqs = array (); // just in case it failed too early
-
-		if ( !is_array($results) )
-			return false; // probably network error; error message should be already filled
-
-		$this->_error = $results[0]["error"];
-		$this->_warning = $results[0]["warning"];
-		if ( $results[0]["status"]==SEARCHD_ERROR )
-			return false;
-		else
-			return $results[0];
-	}
-
-	/// helper to pack floats in network byte order
-	public function _PackFloat ( $f )
-	{
-		$t1 = pack ( "f", $f ); // machine order
-		list(,$t2) = unpack ( "L*", $t1 ); // int in machine order
-		return pack ( "N", $t2 );
-	}
-
-	/**
-	 * @SuppressWarnings(unused)
-	 */
-
-	/// add query to multi-query batch
-	/// returns index into results array from RunQueries() call
-	public function AddQuery ( $query, $index="*", $comment="" )
-	{
-		// mbstring workaround
-		$this->_MBPush ();
-
-		// build request
-		$req = pack ( "NNNNN", $this->_offset, $this->_limit, $this->_mode, $this->_ranker, $this->_sort ); // mode and limits
-		$req .= pack ( "N", strlen($this->_sortby) ) . $this->_sortby;
-		$req .= pack ( "N", strlen($query) ) . $query; // query itself
-		$req .= pack ( "N", count($this->_weights) ); // weights
-		foreach ( $this->_weights as $weight )
-			$req .= pack ( "N", (int)$weight );
-		$req .= pack ( "N", strlen($index) ) . $index; // indexes
-		$req .= pack ( "N", 1 ); // id64 range marker
-		$req .= sphPackU64 ( $this->_min_id ) . sphPackU64 ( $this->_max_id ); // id64 range
-
-		// filters
-		$req .= pack ( "N", count($this->_filters) );
-		foreach ( $this->_filters as $filter )
-		{
-			$req .= pack ( "N", strlen($filter["attr"]) ) . $filter["attr"];
-			$req .= pack ( "N", $filter["type"] );
-			switch ( $filter["type"] )
-			{
-				case SPH_FILTER_VALUES:
-					$req .= pack ( "N", count($filter["values"]) );
-					foreach ( $filter["values"] as $value )
-						$req .= sphPackI64 ( $value );
-					break;
-
-				case SPH_FILTER_RANGE:
-					$req .= sphPackI64 ( $filter["min"] ) . sphPackI64 ( $filter["max"] );
-					break;
-
-				case SPH_FILTER_FLOATRANGE:
-					$req .= $this->_PackFloat ( $filter["min"] ) . $this->_PackFloat ( $filter["max"] );
-					break;
-
-				default:
-					assert ( 0 && "internal error: unhandled filter type" );
-			}
-			$req .= pack ( "N", $filter["exclude"] );
-		}
-
-		// group-by clause, max-matches count, group-sort clause, cutoff count
-		$req .= pack ( "NN", $this->_groupfunc, strlen($this->_groupby) ) . $this->_groupby;
-		$req .= pack ( "N", $this->_maxmatches );
-		$req .= pack ( "N", strlen($this->_groupsort) ) . $this->_groupsort;
-		$req .= pack ( "NNN", $this->_cutoff, $this->_retrycount, $this->_retrydelay );
-		$req .= pack ( "N", strlen($this->_groupdistinct) ) . $this->_groupdistinct;
-
-		// anchor point
-		if ( empty($this->_anchor) )
-		{
-			$req .= pack ( "N", 0 );
-		} else
-		{
-			$a =& $this->_anchor;
-			$req .= pack ( "N", 1 );
-			$req .= pack ( "N", strlen($a["attrlat"]) ) . $a["attrlat"];
-			$req .= pack ( "N", strlen($a["attrlong"]) ) . $a["attrlong"];
-			$req .= $this->_PackFloat ( $a["lat"] ) . $this->_PackFloat ( $a["long"] );
-		}
-
-		// per-index weights
-		$req .= pack ( "N", count($this->_indexweights) );
-		foreach ( $this->_indexweights as $idx=>$weight )
-			$req .= pack ( "N", strlen($idx) ) . $idx . pack ( "N", $weight );
-
-		// max query time
-		$req .= pack ( "N", $this->_maxquerytime );
-
-		// per-field weights
-		$req .= pack ( "N", count($this->_fieldweights) );
-		foreach ( $this->_fieldweights as $field=>$weight )
-			$req .= pack ( "N", strlen($field) ) . $field . pack ( "N", $weight );
-
-		// comment
-		$req .= pack ( "N", strlen($comment) ) . $comment;
-
-		// attribute overrides
-		$req .= pack ( "N", count($this->_overrides) );
-		foreach ( $this->_overrides as $key => $entry )
-		{
-			$req .= pack ( "N", strlen($entry["attr"]) ) . $entry["attr"];
-			$req .= pack ( "NN", $entry["type"], count($entry["values"]) );
-			foreach ( $entry["values"] as $id=>$val )
-			{
-				assert ( is_numeric($id) );
-				assert ( is_numeric($val) );
-
-				$req .= sphPackU64 ( $id );
-				switch ( $entry["type"] )
-				{
-					case SPH_ATTR_FLOAT:	$req .= $this->_PackFloat ( $val ); break;
-					case SPH_ATTR_BIGINT:	$req .= sphPackI64 ( $val ); break;
-					default:				$req .= pack ( "N", $val ); break;
-				}
-			}
-		}
-
-		// select-list
-		$req .= pack ( "N", strlen($this->_select) ) . $this->_select;
-
-		// mbstring workaround
-		$this->_MBPop ();
-
-		// store request to requests array
-		$this->_reqs[] = $req;
-		return count($this->_reqs)-1;
-	}
-
-	/// connect to searchd, run queries batch, and return an array of result sets
-	public function RunQueries ()
-	{
-		if ( empty($this->_reqs) )
-		{
-			$this->_error = "no queries defined, issue AddQuery() first";
-			return false;
-		}
-
-		// mbstring workaround
-		$this->_MBPush ();
-
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop ();
-			return false;
-		}
-
-		// send query, get response
-		$nreqs = count($this->_reqs);
-		$req = join ( "", $this->_reqs );
-		$len = 8+strlen($req);
-		$req = pack ( "nnNNN", SEARCHD_COMMAND_SEARCH, VER_COMMAND_SEARCH, $len, 0, $nreqs ) . $req; // add header
-
-		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_SEARCH ) ) )
-		{
-			$this->_MBPop ();
-			return false;
-		}
-
-		// query sent ok; we can reset reqs now
-		$this->_reqs = array ();
-
-		// parse and return response
-		return $this->_ParseSearchResponse ( $response, $nreqs );
-	}
-
-	/// parse and return search query (or queries) response
-	public function _ParseSearchResponse ( $response, $nreqs )
-	{
-		$p = 0; // current position
-		$max = strlen($response); // max position for checks, to protect against broken responses
-
-		$results = array ();
-		for ( $ires=0; $ires<$nreqs && $p<$max; $ires++ )
-		{
-			$results[] = array();
-			$result =& $results[$ires];
-
-			$result["error"] = "";
-			$result["warning"] = "";
-
-			// extract status
-			list(,$status) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			$result["status"] = $status;
-			if ( $status!=SEARCHD_OK )
-			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$message = substr ( $response, $p, $len ); $p += $len;
-
-				if ( $status==SEARCHD_WARNING )
-				{
-					$result["warning"] = $message;
-				} else
-				{
-					$result["error"] = $message;
-					continue;
-				}
-			}
-
-			// read schema
-			$fields = array ();
-			$attrs = array ();
-
-			list(,$nfields) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			while ( $nfields-->0 && $p<$max )
-			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$fields[] = substr ( $response, $p, $len ); $p += $len;
-			}
-			$result["fields"] = $fields;
-
-			list(,$nattrs) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			while ( $nattrs-->0 && $p<$max  )
-			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$attr = substr ( $response, $p, $len ); $p += $len;
-				list(,$type) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$attrs[$attr] = $type;
-			}
-			$result["attrs"] = $attrs;
-
-			// read match count
-			list(,$count) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			list(,$id64) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-
-			// read matches
-			$idx = -1;
-			while ( $count-->0 && $p<$max )
-			{
-				// index into result array
-				$idx++;
-
-				// parse document id and weight
-				if ( $id64 )
-				{
-					$doc = sphUnpackU64 ( substr ( $response, $p, 8 ) ); $p += 8;
-					list(,$weight) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				}
-				else
-				{
-					list ( $doc, $weight ) = array_values ( unpack ( "N*N*",
-						substr ( $response, $p, 8 ) ) );
-					$p += 8;
-					$doc = sphFixUint($doc);
-				}
-				$weight = sprintf ( "%u", $weight );
-
-				// create match entry
-				if ( $this->_arrayresult )
-					$result["matches"][$idx] = array ( "id"=>$doc, "weight"=>$weight );
-				else
-					$result["matches"][$doc]["weight"] = $weight;
-
-				// parse and create attributes
-				$attrvals = array ();
-				foreach ( $attrs as $attr=>$type )
-				{
-					// handle 64bit ints
-					if ( $type==SPH_ATTR_BIGINT )
-					{
-						$attrvals[$attr] = sphUnpackI64 ( substr ( $response, $p, 8 ) ); $p += 8;
-						continue;
-					}
-
-					// handle floats
-					if ( $type==SPH_ATTR_FLOAT )
-					{
-						list(,$uval) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-						list(,$fval) = unpack ( "f*", pack ( "L", $uval ) );
-						$attrvals[$attr] = $fval;
-						continue;
-					}
-
-					// handle everything else as unsigned ints
-					list(,$val) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-					if ( $type & SPH_ATTR_MULTI )
-					{
-						$attrvals[$attr] = array ();
-						$nvalues = $val;
-						while ( $nvalues-->0 && $p<$max )
-						{
-							list(,$val) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-							$attrvals[$attr][] = sphFixUint($val);
-						}
-					} else if ( $type==SPH_ATTR_STRING )
-					{
-						$attrvals[$attr] = substr ( $response, $p, $val );
-						$p += $val;
-					} else
-					{
-						$attrvals[$attr] = sphFixUint($val);
-					}
-				}
-
-				if ( $this->_arrayresult )
-					$result["matches"][$idx]["attrs"] = $attrvals;
-				else
-					$result["matches"][$doc]["attrs"] = $attrvals;
-			}
-
-			list ( $total, $total_found, $msecs, $words ) =
-				array_values ( unpack ( "N*N*N*N*", substr ( $response, $p, 16 ) ) );
-			$result["total"] = sprintf ( "%u", $total );
-			$result["total_found"] = sprintf ( "%u", $total_found );
-			$result["time"] = sprintf ( "%.3f", $msecs/1000 );
-			$p += 16;
-
-			while ( $words-->0 && $p<$max )
-			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$word = substr ( $response, $p, $len ); $p += $len;
-				list ( $docs, $hits ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
-				$result["words"][$word] = array (
-					"docs"=>sprintf ( "%u", $docs ),
-					"hits"=>sprintf ( "%u", $hits ) );
-			}
-		}
-
-		$this->_MBPop ();
-		return $results;
-	}
-
-	/////////////////////////////////////////////////////////////////////////////
-	// excerpts generation
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// connect to searchd server, and generate exceprts (snippets)
-	/// of given documents for given query. returns false on failure,
-	/// an array of snippets on success
-	public function BuildExcerpts ( $docs, $index, $words, $opts=array() )
-	{
-		assert ( is_array($docs) );
-		assert ( is_string($index) );
-		assert ( is_string($words) );
-		assert ( is_array($opts) );
-
-		$this->_MBPush ();
-
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop();
-			return false;
-		}
-
-		/////////////////
-		// fixup options
-		/////////////////
-
-		if ( !isset($opts["before_match"]) )		$opts["before_match"] = "<b>";
-		if ( !isset($opts["after_match"]) )			$opts["after_match"] = "</b>";
-		if ( !isset($opts["chunk_separator"]) )		$opts["chunk_separator"] = " ... ";
-		if ( !isset($opts["limit"]) )				$opts["limit"] = 256;
-		if ( !isset($opts["limit_passages"]) )		$opts["limit_passages"] = 0;
-		if ( !isset($opts["limit_words"]) )			$opts["limit_words"] = 0;
-		if ( !isset($opts["around"]) )				$opts["around"] = 5;
-		if ( !isset($opts["exact_phrase"]) )		$opts["exact_phrase"] = false;
-		if ( !isset($opts["single_passage"]) )		$opts["single_passage"] = false;
-		if ( !isset($opts["use_boundaries"]) )		$opts["use_boundaries"] = false;
-		if ( !isset($opts["weight_order"]) )		$opts["weight_order"] = false;
-		if ( !isset($opts["query_mode"]) )			$opts["query_mode"] = false;
-		if ( !isset($opts["force_all_words"]) )		$opts["force_all_words"] = false;
-		if ( !isset($opts["start_passage_id"]) )	$opts["start_passage_id"] = 1;
-		if ( !isset($opts["load_files"]) )			$opts["load_files"] = false;
-		if ( !isset($opts["html_strip_mode"]) )		$opts["html_strip_mode"] = "index";
-		if ( !isset($opts["allow_empty"]) )			$opts["allow_empty"] = false;
-		if ( !isset($opts["passage_boundary"]) )	$opts["passage_boundary"] = "none";
-		if ( !isset($opts["emit_zones"]) )			$opts["emit_zones"] = false;
-
-		/////////////////
-		// build request
-		/////////////////
-
-		// v.1.2 req
-		$flags = 1; // remove spaces
-		if ( $opts["exact_phrase"] )	$flags |= 2;
-		if ( $opts["single_passage"] )	$flags |= 4;
-		if ( $opts["use_boundaries"] )	$flags |= 8;
-		if ( $opts["weight_order"] )	$flags |= 16;
-		if ( $opts["query_mode"] )		$flags |= 32;
-		if ( $opts["force_all_words"] )	$flags |= 64;
-		if ( $opts["load_files"] )		$flags |= 128;
-		if ( $opts["allow_empty"] )		$flags |= 256;
-		if ( $opts["emit_zones"] )		$flags |= 512;
-		$req = pack ( "NN", 0, $flags ); // mode=0, flags=$flags
-		$req .= pack ( "N", strlen($index) ) . $index; // req index
-		$req .= pack ( "N", strlen($words) ) . $words; // req words
-
-		// options
-		$req .= pack ( "N", strlen($opts["before_match"]) ) . $opts["before_match"];
-		$req .= pack ( "N", strlen($opts["after_match"]) ) . $opts["after_match"];
-		$req .= pack ( "N", strlen($opts["chunk_separator"]) ) . $opts["chunk_separator"];
-		$req .= pack ( "NN", (int)$opts["limit"], (int)$opts["around"] );
-		$req .= pack ( "NNN", (int)$opts["limit_passages"], (int)$opts["limit_words"], (int)$opts["start_passage_id"] ); // v.1.2
-		$req .= pack ( "N", strlen($opts["html_strip_mode"]) ) . $opts["html_strip_mode"];
-		$req .= pack ( "N", strlen($opts["passage_boundary"]) ) . $opts["passage_boundary"];
-
-		// documents
-		$req .= pack ( "N", count($docs) );
-		foreach ( $docs as $doc )
-		{
-			assert ( is_string($doc) );
-			$req .= pack ( "N", strlen($doc) ) . $doc;
-		}
-
-		////////////////////////////
-		// send query, get response
-		////////////////////////////
-
-		$len = strlen($req);
-		$req = pack ( "nnN", SEARCHD_COMMAND_EXCERPT, VER_COMMAND_EXCERPT, $len ) . $req; // add header
-		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_EXCERPT ) ) )
-		{
-			$this->_MBPop ();
-			return false;
-		}
-
-		//////////////////
-		// parse response
-		//////////////////
-
-		$pos = 0;
-		$res = array ();
-		$rlen = strlen($response);
-		for ( $i=0; $i<count($docs); $i++ )
-		{
-			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );
-			$pos += 4;
-
-			if ( $pos+$len > $rlen )
-			{
-				$this->_error = "incomplete reply";
-				$this->_MBPop ();
-				return false;
-			}
-			$res[] = $len ? substr ( $response, $pos, $len ) : "";
-			$pos += $len;
-		}
-
-		$this->_MBPop ();
-		return $res;
-	}
-
-
-	/////////////////////////////////////////////////////////////////////////////
-	// keyword generation
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// connect to searchd server, and generate keyword list for a given query
-	/// returns false on failure,
-	/// an array of words on success
-	public function BuildKeywords ( $query, $index, $hits )
-	{
-		assert ( is_string($query) );
-		assert ( is_string($index) );
-		assert ( is_bool($hits) );
-
-		$this->_MBPush ();
-
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop();
-			return false;
-		}
-
-		/////////////////
-		// build request
-		/////////////////
-
-		// v.1.0 req
-		$req  = pack ( "N", strlen($query) ) . $query; // req query
-		$req .= pack ( "N", strlen($index) ) . $index; // req index
-		$req .= pack ( "N", (int)$hits );
-
-		////////////////////////////
-		// send query, get response
-		////////////////////////////
-
-		$len = strlen($req);
-		$req = pack ( "nnN", SEARCHD_COMMAND_KEYWORDS, VER_COMMAND_KEYWORDS, $len ) . $req; // add header
-		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_KEYWORDS ) ) )
-		{
-			$this->_MBPop ();
-			return false;
-		}
-
-		//////////////////
-		// parse response
-		//////////////////
-
-		$pos = 0;
-		$res = array ();
-		$rlen = strlen($response);
-		list(,$nwords) = unpack ( "N*", substr ( $response, $pos, 4 ) );
-		$pos += 4;
-		for ( $i=0; $i<$nwords; $i++ )
-		{
-			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
-			$tokenized = $len ? substr ( $response, $pos, $len ) : "";
-			$pos += $len;
-
-			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
-			$normalized = $len ? substr ( $response, $pos, $len ) : "";
-			$pos += $len;
-
-			$res[] = array ( "tokenized"=>$tokenized, "normalized"=>$normalized );
-
-			if ( $hits )
-			{
-				list($ndocs,$nhits) = array_values ( unpack ( "N*N*", substr ( $response, $pos, 8 ) ) );
-				$pos += 8;
-				$res [$i]["docs"] = $ndocs;
-				$res [$i]["hits"] = $nhits;
-			}
-
-			if ( $pos > $rlen )
-			{
-				$this->_error = "incomplete reply";
-				$this->_MBPop ();
-				return false;
-			}
-		}
-
-		$this->_MBPop ();
-		return $res;
-	}
-
-	public function EscapeString ( $string )
-	{
-		$from = array ( '\\', '(',')','|','-','!','@','~','"','&', '/', '^', '$', '=' );
-		$to   = array ( '\\\\', '\(','\)','\|','\-','\!','\@','\~','\"', '\&', '\/', '\^', '\$', '\=' );
-
-		return str_replace ( $from, $to, $string );
-	}
-
-	/////////////////////////////////////////////////////////////////////////////
-	// attribute updates
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// batch update given attributes in given rows in given indexes
-	/// returns amount of updated documents (0 or more) on success, or -1 on failure
-	public function UpdateAttributes ( $index, $attrs, $values, $mva=false )
-	{
-		// verify everything
-		assert ( is_string($index) );
-		assert ( is_bool($mva) );
-
-		assert ( is_array($attrs) );
-		foreach ( $attrs as $attr )
-			assert ( is_string($attr) );
-
-		assert ( is_array($values) );
-		foreach ( $values as $id=>$entry )
-		{
-			assert ( is_numeric($id) );
-			assert ( is_array($entry) );
-			assert ( count($entry)==count($attrs) );
-			foreach ( $entry as $v )
-			{
-				if ( $mva )
-				{
-					assert ( is_array($v) );
-					foreach ( $v as $vv )
-						assert ( is_int($vv) );
-				} else
-					assert ( is_int($v) );
-			}
-		}
-
-		// build request
-		$this->_MBPush ();
-		$req = pack ( "N", strlen($index) ) . $index;
-
-		$req .= pack ( "N", count($attrs) );
-		foreach ( $attrs as $attr )
-		{
-			$req .= pack ( "N", strlen($attr) ) . $attr;
-			$req .= pack ( "N", $mva ? 1 : 0 );
-		}
-
-		$req .= pack ( "N", count($values) );
-		foreach ( $values as $id=>$entry )
-		{
-			$req .= sphPackU64 ( $id );
-			foreach ( $entry as $v )
-			{
-				$req .= pack ( "N", $mva ? count($v) : $v );
-				if ( $mva )
-					foreach ( $v as $vv )
-						$req .= pack ( "N", $vv );
-			}
-		}
-
-		// connect, send query, get response
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop ();
-			return -1;
-		}
-
-		$len = strlen($req);
-		$req = pack ( "nnN", SEARCHD_COMMAND_UPDATE, VER_COMMAND_UPDATE, $len ) . $req; // add header
-		if ( !$this->_Send ( $fp, $req, $len+8 ) )
-		{
-			$this->_MBPop ();
-			return -1;
-		}
-
-		if (!( $response = $this->_GetResponse ( $fp, VER_COMMAND_UPDATE ) ))
-		{
-			$this->_MBPop ();
-			return -1;
-		}
-
-		// parse response
-		list(,$updated) = unpack ( "N*", substr ( $response, 0, 4 ) );
-		$this->_MBPop ();
-		return $updated;
-	}
-
-	/////////////////////////////////////////////////////////////////////////////
-	// persistent connections
-	/////////////////////////////////////////////////////////////////////////////
-
-	public function Open()
-	{
-		if ( $this->_socket !== false )
-		{
-			$this->_error = 'already connected';
-			return false;
-		}
-		if ( !$fp = $this->_Connect() )
-			return false;
-
-		// command, command version = 0, body length = 4, body = 1
-		$req = pack ( "nnNN", SEARCHD_COMMAND_PERSIST, 0, 4, 1 );
-		if ( !$this->_Send ( $fp, $req, 12 ) )
-			return false;
-
-		$this->_socket = $fp;
-		return true;
-	}
-
-	public function Close()
-	{
-		if ( $this->_socket === false )
-		{
-			$this->_error = 'not connected';
-			return false;
-		}
-
-		fclose ( $this->_socket );
-		$this->_socket = false;
-
-		return true;
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// status
-	//////////////////////////////////////////////////////////////////////////
-
-	public function Status ()
-	{
-		$this->_MBPush ();
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop();
-			return false;
-		}
-
-		$req = pack ( "nnNN", SEARCHD_COMMAND_STATUS, VER_COMMAND_STATUS, 4, 1 ); // len=4, body=1
-		if ( !( $this->_Send ( $fp, $req, 12 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_STATUS ) ) )
-		{
-			$this->_MBPop ();
-			return false;
-		}
-
-		$res = substr ( $response, 4 ); // just ignore length, error handling, etc
-		$p = 0;
-		list ( $rows, $cols ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
-
-		$res = array();
-		for ( $i=0; $i<$rows; $i++ )
-			for ( $j=0; $j<$cols; $j++ )
-		{
-			list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			$res[$i][] = substr ( $response, $p, $len ); $p += $len;
-		}
-
-		$this->_MBPop ();
-		return $res;
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// flush
-	//////////////////////////////////////////////////////////////////////////
-
-	public function FlushAttributes ()
-	{
-		$this->_MBPush ();
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop();
-			return -1;
-		}
-
-		$req = pack ( "nnN", SEARCHD_COMMAND_FLUSHATTRS, VER_COMMAND_FLUSHATTRS, 0 ); // len=0
-		if ( !( $this->_Send ( $fp, $req, 8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_FLUSHATTRS ) ) )
-		{
-			$this->_MBPop ();
-			return -1;
-		}
-
-		$tag = -1;
-		if ( strlen($response)==4 )
-			list(,$tag) = unpack ( "N*", $response );
-		else
-			$this->_error = "unexpected response length";
-
-		$this->_MBPop ();
-		return $tag;
-	}
+    //////////////////////////////////////////////////////////////////////////////
+
+    /// connect to searchd server, run given search query through given indexes,
+    /// and return the search results
+    public function Query ( $query, $index="*", $comment="" )
+    {
+        assert ( empty($this->_reqs) );
+
+        $this->AddQuery ( $query, $index, $comment );
+        $results = $this->RunQueries ();
+        $this->_reqs = array (); // just in case it failed too early
+
+        if ( !is_array($results) )
+            return false; // probably network error; error message should be already filled
+
+        $this->_error = $results[0]["error"];
+        $this->_warning = $results[0]["warning"];
+        if ( $results[0]["status"]==SEARCHD_ERROR )
+            return false;
+        else
+            return $results[0];
+    }
+
+    /// helper to pack floats in network byte order
+    public function _PackFloat ( $f )
+    {
+        $t1 = pack ( "f", $f ); // machine order
+        list(,$t2) = unpack ( "L*", $t1 ); // int in machine order
+        return pack ( "N", $t2 );
+    }
+
+    /**
+     * @SuppressWarnings(unused)
+     */
+
+    /// add query to multi-query batch
+    /// returns index into results array from RunQueries() call
+    public function AddQuery ( $query, $index="*", $comment="" )
+    {
+        // mbstring workaround
+        $this->_MBPush ();
+
+        // build request
+        $req = pack ( "NNNNN", $this->_offset, $this->_limit, $this->_mode, $this->_ranker, $this->_sort ); // mode and limits
+        $req .= pack ( "N", strlen($this->_sortby) ) . $this->_sortby;
+        $req .= pack ( "N", strlen($query) ) . $query; // query itself
+        $req .= pack ( "N", count($this->_weights) ); // weights
+        foreach ( $this->_weights as $weight )
+            $req .= pack ( "N", (int)$weight );
+        $req .= pack ( "N", strlen($index) ) . $index; // indexes
+        $req .= pack ( "N", 1 ); // id64 range marker
+        $req .= sphPackU64 ( $this->_min_id ) . sphPackU64 ( $this->_max_id ); // id64 range
+
+        // filters
+        $req .= pack ( "N", count($this->_filters) );
+        foreach ( $this->_filters as $filter )
+        {
+            $req .= pack ( "N", strlen($filter["attr"]) ) . $filter["attr"];
+            $req .= pack ( "N", $filter["type"] );
+            switch ( $filter["type"] )
+            {
+                case SPH_FILTER_VALUES:
+                    $req .= pack ( "N", count($filter["values"]) );
+                    foreach ( $filter["values"] as $value )
+                        $req .= sphPackI64 ( $value );
+                    break;
+
+                case SPH_FILTER_RANGE:
+                    $req .= sphPackI64 ( $filter["min"] ) . sphPackI64 ( $filter["max"] );
+                    break;
+
+                case SPH_FILTER_FLOATRANGE:
+                    $req .= $this->_PackFloat ( $filter["min"] ) . $this->_PackFloat ( $filter["max"] );
+                    break;
+
+                default:
+                    assert ( 0 && "internal error: unhandled filter type" );
+            }
+            $req .= pack ( "N", $filter["exclude"] );
+        }
+
+        // group-by clause, max-matches count, group-sort clause, cutoff count
+        $req .= pack ( "NN", $this->_groupfunc, strlen($this->_groupby) ) . $this->_groupby;
+        $req .= pack ( "N", $this->_maxmatches );
+        $req .= pack ( "N", strlen($this->_groupsort) ) . $this->_groupsort;
+        $req .= pack ( "NNN", $this->_cutoff, $this->_retrycount, $this->_retrydelay );
+        $req .= pack ( "N", strlen($this->_groupdistinct) ) . $this->_groupdistinct;
+
+        // anchor point
+        if ( empty($this->_anchor) )
+        {
+            $req .= pack ( "N", 0 );
+        } else
+        {
+            $a =& $this->_anchor;
+            $req .= pack ( "N", 1 );
+            $req .= pack ( "N", strlen($a["attrlat"]) ) . $a["attrlat"];
+            $req .= pack ( "N", strlen($a["attrlong"]) ) . $a["attrlong"];
+            $req .= $this->_PackFloat ( $a["lat"] ) . $this->_PackFloat ( $a["long"] );
+        }
+
+        // per-index weights
+        $req .= pack ( "N", count($this->_indexweights) );
+        foreach ( $this->_indexweights as $idx=>$weight )
+            $req .= pack ( "N", strlen($idx) ) . $idx . pack ( "N", $weight );
+
+        // max query time
+        $req .= pack ( "N", $this->_maxquerytime );
+
+        // per-field weights
+        $req .= pack ( "N", count($this->_fieldweights) );
+        foreach ( $this->_fieldweights as $field=>$weight )
+            $req .= pack ( "N", strlen($field) ) . $field . pack ( "N", $weight );
+
+        // comment
+        $req .= pack ( "N", strlen($comment) ) . $comment;
+
+        // attribute overrides
+        $req .= pack ( "N", count($this->_overrides) );
+        foreach ( $this->_overrides as $key => $entry )
+        {
+            $req .= pack ( "N", strlen($entry["attr"]) ) . $entry["attr"];
+            $req .= pack ( "NN", $entry["type"], count($entry["values"]) );
+            foreach ( $entry["values"] as $id=>$val )
+            {
+                assert ( is_numeric($id) );
+                assert ( is_numeric($val) );
+
+                $req .= sphPackU64 ( $id );
+                switch ( $entry["type"] )
+                {
+                    case SPH_ATTR_FLOAT:	$req .= $this->_PackFloat ( $val ); break;
+                    case SPH_ATTR_BIGINT:	$req .= sphPackI64 ( $val ); break;
+                    default:				$req .= pack ( "N", $val ); break;
+                }
+            }
+        }
+
+        // select-list
+        $req .= pack ( "N", strlen($this->_select) ) . $this->_select;
+
+        // mbstring workaround
+        $this->_MBPop ();
+
+        // store request to requests array
+        $this->_reqs[] = $req;
+        return count($this->_reqs)-1;
+    }
+
+    /// connect to searchd, run queries batch, and return an array of result sets
+    public function RunQueries ()
+    {
+        if ( empty($this->_reqs) )
+        {
+            $this->_error = "no queries defined, issue AddQuery() first";
+            return false;
+        }
+
+        // mbstring workaround
+        $this->_MBPush ();
+
+        if (!( $fp = $this->_Connect() ))
+        {
+            $this->_MBPop ();
+            return false;
+        }
+
+        // send query, get response
+        $nreqs = count($this->_reqs);
+        $req = join ( "", $this->_reqs );
+        $len = 8+strlen($req);
+        $req = pack ( "nnNNN", SEARCHD_COMMAND_SEARCH, VER_COMMAND_SEARCH, $len, 0, $nreqs ) . $req; // add header
+
+        if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
+             !( $response = $this->_GetResponse ( $fp, VER_COMMAND_SEARCH ) ) )
+        {
+            $this->_MBPop ();
+            return false;
+        }
+
+        // query sent ok; we can reset reqs now
+        $this->_reqs = array ();
+
+        // parse and return response
+        return $this->_ParseSearchResponse ( $response, $nreqs );
+    }
+
+    /// parse and return search query (or queries) response
+    public function _ParseSearchResponse ( $response, $nreqs )
+    {
+        $p = 0; // current position
+        $max = strlen($response); // max position for checks, to protect against broken responses
+
+        $results = array ();
+        for ( $ires=0; $ires<$nreqs && $p<$max; $ires++ )
+        {
+            $results[] = array();
+            $result =& $results[$ires];
+
+            $result["error"] = "";
+            $result["warning"] = "";
+
+            // extract status
+            list(,$status) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+            $result["status"] = $status;
+            if ( $status!=SEARCHD_OK )
+            {
+                list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+                $message = substr ( $response, $p, $len ); $p += $len;
+
+                if ( $status==SEARCHD_WARNING )
+                {
+                    $result["warning"] = $message;
+                } else
+                {
+                    $result["error"] = $message;
+                    continue;
+                }
+            }
+
+            // read schema
+            $fields = array ();
+            $attrs = array ();
+
+            list(,$nfields) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+            while ( $nfields-->0 && $p<$max )
+            {
+                list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+                $fields[] = substr ( $response, $p, $len ); $p += $len;
+            }
+            $result["fields"] = $fields;
+
+            list(,$nattrs) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+            while ( $nattrs-->0 && $p<$max  )
+            {
+                list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+                $attr = substr ( $response, $p, $len ); $p += $len;
+                list(,$type) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+                $attrs[$attr] = $type;
+            }
+            $result["attrs"] = $attrs;
+
+            // read match count
+            list(,$count) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+            list(,$id64) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+
+            // read matches
+            $idx = -1;
+            while ( $count-->0 && $p<$max )
+            {
+                // index into result array
+                $idx++;
+
+                // parse document id and weight
+                if ( $id64 )
+                {
+                    $doc = sphUnpackU64 ( substr ( $response, $p, 8 ) ); $p += 8;
+                    list(,$weight) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+                }
+                else
+                {
+                    list ( $doc, $weight ) = array_values ( unpack ( "N*N*",
+                        substr ( $response, $p, 8 ) ) );
+                    $p += 8;
+                    $doc = sphFixUint($doc);
+                }
+                $weight = sprintf ( "%u", $weight );
+
+                // create match entry
+                if ( $this->_arrayresult )
+                    $result["matches"][$idx] = array ( "id"=>$doc, "weight"=>$weight );
+                else
+                    $result["matches"][$doc]["weight"] = $weight;
+
+                // parse and create attributes
+                $attrvals = array ();
+                foreach ( $attrs as $attr=>$type )
+                {
+                    // handle 64bit ints
+                    if ( $type==SPH_ATTR_BIGINT )
+                    {
+                        $attrvals[$attr] = sphUnpackI64 ( substr ( $response, $p, 8 ) ); $p += 8;
+                        continue;
+                    }
+
+                    // handle floats
+                    if ( $type==SPH_ATTR_FLOAT )
+                    {
+                        list(,$uval) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+                        list(,$fval) = unpack ( "f*", pack ( "L", $uval ) );
+                        $attrvals[$attr] = $fval;
+                        continue;
+                    }
+
+                    // handle everything else as unsigned ints
+                    list(,$val) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+                    if ( $type & SPH_ATTR_MULTI )
+                    {
+                        $attrvals[$attr] = array ();
+                        $nvalues = $val;
+                        while ( $nvalues-->0 && $p<$max )
+                        {
+                            list(,$val) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+                            $attrvals[$attr][] = sphFixUint($val);
+                        }
+                    } else if ( $type==SPH_ATTR_STRING )
+                    {
+                        $attrvals[$attr] = substr ( $response, $p, $val );
+                        $p += $val;
+                    } else
+                    {
+                        $attrvals[$attr] = sphFixUint($val);
+                    }
+                }
+
+                if ( $this->_arrayresult )
+                    $result["matches"][$idx]["attrs"] = $attrvals;
+                else
+                    $result["matches"][$doc]["attrs"] = $attrvals;
+            }
+
+            list ( $total, $total_found, $msecs, $words ) =
+                array_values ( unpack ( "N*N*N*N*", substr ( $response, $p, 16 ) ) );
+            $result["total"] = sprintf ( "%u", $total );
+            $result["total_found"] = sprintf ( "%u", $total_found );
+            $result["time"] = sprintf ( "%.3f", $msecs/1000 );
+            $p += 16;
+
+            while ( $words-->0 && $p<$max )
+            {
+                list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+                $word = substr ( $response, $p, $len ); $p += $len;
+                list ( $docs, $hits ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
+                $result["words"][$word] = array (
+                    "docs"=>sprintf ( "%u", $docs ),
+                    "hits"=>sprintf ( "%u", $hits ) );
+            }
+        }
+
+        $this->_MBPop ();
+        return $results;
+    }
+
+    /////////////////////////////////////////////////////////////////////////////
+    // excerpts generation
+    /////////////////////////////////////////////////////////////////////////////
+
+    /// connect to searchd server, and generate exceprts (snippets)
+    /// of given documents for given query. returns false on failure,
+    /// an array of snippets on success
+    public function BuildExcerpts ( $docs, $index, $words, $opts=array() )
+    {
+        assert ( is_array($docs) );
+        assert ( is_string($index) );
+        assert ( is_string($words) );
+        assert ( is_array($opts) );
+
+        $this->_MBPush ();
+
+        if (!( $fp = $this->_Connect() ))
+        {
+            $this->_MBPop();
+            return false;
+        }
+
+        /////////////////
+        // fixup options
+        /////////////////
+
+        if ( !isset($opts["before_match"]) )		$opts["before_match"] = "<b>";
+        if ( !isset($opts["after_match"]) )			$opts["after_match"] = "</b>";
+        if ( !isset($opts["chunk_separator"]) )		$opts["chunk_separator"] = " ... ";
+        if ( !isset($opts["limit"]) )				$opts["limit"] = 256;
+        if ( !isset($opts["limit_passages"]) )		$opts["limit_passages"] = 0;
+        if ( !isset($opts["limit_words"]) )			$opts["limit_words"] = 0;
+        if ( !isset($opts["around"]) )				$opts["around"] = 5;
+        if ( !isset($opts["exact_phrase"]) )		$opts["exact_phrase"] = false;
+        if ( !isset($opts["single_passage"]) )		$opts["single_passage"] = false;
+        if ( !isset($opts["use_boundaries"]) )		$opts["use_boundaries"] = false;
+        if ( !isset($opts["weight_order"]) )		$opts["weight_order"] = false;
+        if ( !isset($opts["query_mode"]) )			$opts["query_mode"] = false;
+        if ( !isset($opts["force_all_words"]) )		$opts["force_all_words"] = false;
+        if ( !isset($opts["start_passage_id"]) )	$opts["start_passage_id"] = 1;
+        if ( !isset($opts["load_files"]) )			$opts["load_files"] = false;
+        if ( !isset($opts["html_strip_mode"]) )		$opts["html_strip_mode"] = "index";
+        if ( !isset($opts["allow_empty"]) )			$opts["allow_empty"] = false;
+        if ( !isset($opts["passage_boundary"]) )	$opts["passage_boundary"] = "none";
+        if ( !isset($opts["emit_zones"]) )			$opts["emit_zones"] = false;
+
+        /////////////////
+        // build request
+        /////////////////
+
+        // v.1.2 req
+        $flags = 1; // remove spaces
+        if ( $opts["exact_phrase"] )	$flags |= 2;
+        if ( $opts["single_passage"] )	$flags |= 4;
+        if ( $opts["use_boundaries"] )	$flags |= 8;
+        if ( $opts["weight_order"] )	$flags |= 16;
+        if ( $opts["query_mode"] )		$flags |= 32;
+        if ( $opts["force_all_words"] )	$flags |= 64;
+        if ( $opts["load_files"] )		$flags |= 128;
+        if ( $opts["allow_empty"] )		$flags |= 256;
+        if ( $opts["emit_zones"] )		$flags |= 512;
+        $req = pack ( "NN", 0, $flags ); // mode=0, flags=$flags
+        $req .= pack ( "N", strlen($index) ) . $index; // req index
+        $req .= pack ( "N", strlen($words) ) . $words; // req words
+
+        // options
+        $req .= pack ( "N", strlen($opts["before_match"]) ) . $opts["before_match"];
+        $req .= pack ( "N", strlen($opts["after_match"]) ) . $opts["after_match"];
+        $req .= pack ( "N", strlen($opts["chunk_separator"]) ) . $opts["chunk_separator"];
+        $req .= pack ( "NN", (int)$opts["limit"], (int)$opts["around"] );
+        $req .= pack ( "NNN", (int)$opts["limit_passages"], (int)$opts["limit_words"], (int)$opts["start_passage_id"] ); // v.1.2
+        $req .= pack ( "N", strlen($opts["html_strip_mode"]) ) . $opts["html_strip_mode"];
+        $req .= pack ( "N", strlen($opts["passage_boundary"]) ) . $opts["passage_boundary"];
+
+        // documents
+        $req .= pack ( "N", count($docs) );
+        foreach ( $docs as $doc )
+        {
+            assert ( is_string($doc) );
+            $req .= pack ( "N", strlen($doc) ) . $doc;
+        }
+
+        ////////////////////////////
+        // send query, get response
+        ////////////////////////////
+
+        $len = strlen($req);
+        $req = pack ( "nnN", SEARCHD_COMMAND_EXCERPT, VER_COMMAND_EXCERPT, $len ) . $req; // add header
+        if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
+             !( $response = $this->_GetResponse ( $fp, VER_COMMAND_EXCERPT ) ) )
+        {
+            $this->_MBPop ();
+            return false;
+        }
+
+        //////////////////
+        // parse response
+        //////////////////
+
+        $pos = 0;
+        $res = array ();
+        $rlen = strlen($response);
+        for ( $i=0; $i<count($docs); $i++ )
+        {
+            list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );
+            $pos += 4;
+
+            if ( $pos+$len > $rlen )
+            {
+                $this->_error = "incomplete reply";
+                $this->_MBPop ();
+                return false;
+            }
+            $res[] = $len ? substr ( $response, $pos, $len ) : "";
+            $pos += $len;
+        }
+
+        $this->_MBPop ();
+        return $res;
+    }
+
+
+    /////////////////////////////////////////////////////////////////////////////
+    // keyword generation
+    /////////////////////////////////////////////////////////////////////////////
+
+    /// connect to searchd server, and generate keyword list for a given query
+    /// returns false on failure,
+    /// an array of words on success
+    public function BuildKeywords ( $query, $index, $hits )
+    {
+        assert ( is_string($query) );
+        assert ( is_string($index) );
+        assert ( is_bool($hits) );
+
+        $this->_MBPush ();
+
+        if (!( $fp = $this->_Connect() ))
+        {
+            $this->_MBPop();
+            return false;
+        }
+
+        /////////////////
+        // build request
+        /////////////////
+
+        // v.1.0 req
+        $req  = pack ( "N", strlen($query) ) . $query; // req query
+        $req .= pack ( "N", strlen($index) ) . $index; // req index
+        $req .= pack ( "N", (int)$hits );
+
+        ////////////////////////////
+        // send query, get response
+        ////////////////////////////
+
+        $len = strlen($req);
+        $req = pack ( "nnN", SEARCHD_COMMAND_KEYWORDS, VER_COMMAND_KEYWORDS, $len ) . $req; // add header
+        if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
+             !( $response = $this->_GetResponse ( $fp, VER_COMMAND_KEYWORDS ) ) )
+        {
+            $this->_MBPop ();
+            return false;
+        }
+
+        //////////////////
+        // parse response
+        //////////////////
+
+        $pos = 0;
+        $res = array ();
+        $rlen = strlen($response);
+        list(,$nwords) = unpack ( "N*", substr ( $response, $pos, 4 ) );
+        $pos += 4;
+        for ( $i=0; $i<$nwords; $i++ )
+        {
+            list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
+            $tokenized = $len ? substr ( $response, $pos, $len ) : "";
+            $pos += $len;
+
+            list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
+            $normalized = $len ? substr ( $response, $pos, $len ) : "";
+            $pos += $len;
+
+            $res[] = array ( "tokenized"=>$tokenized, "normalized"=>$normalized );
+
+            if ( $hits )
+            {
+                list($ndocs,$nhits) = array_values ( unpack ( "N*N*", substr ( $response, $pos, 8 ) ) );
+                $pos += 8;
+                $res [$i]["docs"] = $ndocs;
+                $res [$i]["hits"] = $nhits;
+            }
+
+            if ( $pos > $rlen )
+            {
+                $this->_error = "incomplete reply";
+                $this->_MBPop ();
+                return false;
+            }
+        }
+
+        $this->_MBPop ();
+        return $res;
+    }
+
+    public function EscapeString ( $string )
+    {
+        $from = array ( '\\', '(',')','|','-','!','@','~','"','&', '/', '^', '$', '=' );
+        $to   = array ( '\\\\', '\(','\)','\|','\-','\!','\@','\~','\"', '\&', '\/', '\^', '\$', '\=' );
+
+        return str_replace ( $from, $to, $string );
+    }
+
+    /////////////////////////////////////////////////////////////////////////////
+    // attribute updates
+    /////////////////////////////////////////////////////////////////////////////
+
+    /// batch update given attributes in given rows in given indexes
+    /// returns amount of updated documents (0 or more) on success, or -1 on failure
+    public function UpdateAttributes ( $index, $attrs, $values, $mva=false )
+    {
+        // verify everything
+        assert ( is_string($index) );
+        assert ( is_bool($mva) );
+
+        assert ( is_array($attrs) );
+        foreach ( $attrs as $attr )
+            assert ( is_string($attr) );
+
+        assert ( is_array($values) );
+        foreach ( $values as $id=>$entry )
+        {
+            assert ( is_numeric($id) );
+            assert ( is_array($entry) );
+            assert ( count($entry)==count($attrs) );
+            foreach ( $entry as $v )
+            {
+                if ( $mva )
+                {
+                    assert ( is_array($v) );
+                    foreach ( $v as $vv )
+                        assert ( is_int($vv) );
+                } else
+                    assert ( is_int($v) );
+            }
+        }
+
+        // build request
+        $this->_MBPush ();
+        $req = pack ( "N", strlen($index) ) . $index;
+
+        $req .= pack ( "N", count($attrs) );
+        foreach ( $attrs as $attr )
+        {
+            $req .= pack ( "N", strlen($attr) ) . $attr;
+            $req .= pack ( "N", $mva ? 1 : 0 );
+        }
+
+        $req .= pack ( "N", count($values) );
+        foreach ( $values as $id=>$entry )
+        {
+            $req .= sphPackU64 ( $id );
+            foreach ( $entry as $v )
+            {
+                $req .= pack ( "N", $mva ? count($v) : $v );
+                if ( $mva )
+                    foreach ( $v as $vv )
+                        $req .= pack ( "N", $vv );
+            }
+        }
+
+        // connect, send query, get response
+        if (!( $fp = $this->_Connect() ))
+        {
+            $this->_MBPop ();
+            return -1;
+        }
+
+        $len = strlen($req);
+        $req = pack ( "nnN", SEARCHD_COMMAND_UPDATE, VER_COMMAND_UPDATE, $len ) . $req; // add header
+        if ( !$this->_Send ( $fp, $req, $len+8 ) )
+        {
+            $this->_MBPop ();
+            return -1;
+        }
+
+        if (!( $response = $this->_GetResponse ( $fp, VER_COMMAND_UPDATE ) ))
+        {
+            $this->_MBPop ();
+            return -1;
+        }
+
+        // parse response
+        list(,$updated) = unpack ( "N*", substr ( $response, 0, 4 ) );
+        $this->_MBPop ();
+        return $updated;
+    }
+
+    /////////////////////////////////////////////////////////////////////////////
+    // persistent connections
+    /////////////////////////////////////////////////////////////////////////////
+
+    public function Open()
+    {
+        if ( $this->_socket !== false )
+        {
+            $this->_error = 'already connected';
+            return false;
+        }
+        if ( !$fp = $this->_Connect() )
+            return false;
+
+        // command, command version = 0, body length = 4, body = 1
+        $req = pack ( "nnNN", SEARCHD_COMMAND_PERSIST, 0, 4, 1 );
+        if ( !$this->_Send ( $fp, $req, 12 ) )
+            return false;
+
+        $this->_socket = $fp;
+        return true;
+    }
+
+    public function Close()
+    {
+        if ( $this->_socket === false )
+        {
+            $this->_error = 'not connected';
+            return false;
+        }
+
+        fclose ( $this->_socket );
+        $this->_socket = false;
+
+        return true;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // status
+    //////////////////////////////////////////////////////////////////////////
+
+    public function Status ()
+    {
+        $this->_MBPush ();
+        if (!( $fp = $this->_Connect() ))
+        {
+            $this->_MBPop();
+            return false;
+        }
+
+        $req = pack ( "nnNN", SEARCHD_COMMAND_STATUS, VER_COMMAND_STATUS, 4, 1 ); // len=4, body=1
+        if ( !( $this->_Send ( $fp, $req, 12 ) ) ||
+             !( $response = $this->_GetResponse ( $fp, VER_COMMAND_STATUS ) ) )
+        {
+            $this->_MBPop ();
+            return false;
+        }
+
+        $res = substr ( $response, 4 ); // just ignore length, error handling, etc
+        $p = 0;
+        list ( $rows, $cols ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
+
+        $res = array();
+        for ( $i=0; $i<$rows; $i++ )
+            for ( $j=0; $j<$cols; $j++ )
+        {
+            list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+            $res[$i][] = substr ( $response, $p, $len ); $p += $len;
+        }
+
+        $this->_MBPop ();
+        return $res;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // flush
+    //////////////////////////////////////////////////////////////////////////
+
+    public function FlushAttributes ()
+    {
+        $this->_MBPush ();
+        if (!( $fp = $this->_Connect() ))
+        {
+            $this->_MBPop();
+            return -1;
+        }
+
+        $req = pack ( "nnN", SEARCHD_COMMAND_FLUSHATTRS, VER_COMMAND_FLUSHATTRS, 0 ); // len=0
+        if ( !( $this->_Send ( $fp, $req, 8 ) ) ||
+             !( $response = $this->_GetResponse ( $fp, VER_COMMAND_FLUSHATTRS ) ) )
+        {
+            $this->_MBPop ();
+            return -1;
+        }
+
+        $tag = -1;
+        if ( strlen($response)==4 )
+            list(,$tag) = unpack ( "N*", $response );
+        else
+            $this->_error = "unexpected response length";
+
+        $this->_MBPop ();
+        return $tag;
+    }
 }
 
 //

plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMNodeList.php

Switch Indentation +4 added lines, -4 removed lines

@@ -32,10 +32,10 @@
     public function __get($name)
     {
         switch ($name) {
-            case 'length':
-                return $this->length;
-            default:
-                trigger_error(sprintf('Undefined property: %s::%s', static::class, $name));
+        case 'length':
+            return $this->length;
+        default:
+            trigger_error(sprintf('Undefined property: %s::%s', static::class, $name));
         }
     }
 

plugins/af_readability/vendor/andreskrey/Readability/Nodes/NodeTrait.php

Switch Indentation +30 added lines, -30 removed lines

@@ -121,36 +121,36 @@
             $contentScore = 0;
 
             switch ($this->nodeName) {
-                case 'div':
-                    $contentScore += 5;
-                    break;
-
-                case 'pre':
-                case 'td':
-                case 'blockquote':
-                    $contentScore += 3;
-                    break;
-
-                case 'address':
-                case 'ol':
-                case 'ul':
-                case 'dl':
-                case 'dd':
-                case 'dt':
-                case 'li':
-                case 'form':
-                    $contentScore -= 3;
-                    break;
-
-                case 'h1':
-                case 'h2':
-                case 'h3':
-                case 'h4':
-                case 'h5':
-                case 'h6':
-                case 'th':
-                    $contentScore -= 5;
-                    break;
+            case 'div':
+                $contentScore += 5;
+                break;
+
+            case 'pre':
+            case 'td':
+            case 'blockquote':
+                $contentScore += 3;
+                break;
+
+            case 'address':
+            case 'ol':
+            case 'ul':
+            case 'dl':
+            case 'dd':
+            case 'dt':
+            case 'li':
+            case 'form':
+                $contentScore -= 3;
+                break;
+
+            case 'h1':
+            case 'h2':
+            case 'h3':
+            case 'h4':
+            case 'h5':
+            case 'h6':
+            case 'th':
+                $contentScore -= 5;
+                break;
             }
 
             $this->contentScore = $contentScore + ($weightClasses ? $this->getClassWeight() : 0);

classes/db.php

Switch Indentation +8 added lines, -8 removed lines

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

Indentation +82 added lines, -82 removed lines

@@ -2,115 +2,115 @@
 class Db
 {
 
-	/* @var Db $instance */
-	private static $instance;
+    /* @var Db $instance */
+    private static $instance;
 
-	/* @var IDb $adapter */
-	private $adapter;
+    /* @var IDb $adapter */
+    private $adapter;
 
-	private $link;
+    private $link;
 
-	/* @var PDO $pdo */
-	private $pdo;
+    /* @var PDO $pdo */
+    private $pdo;
 
-	private function __clone() {
-		//
-	}
+    private function __clone() {
+        //
+    }
 
-	private function legacy_connect() {
+    private function legacy_connect() {
 
-		user_error("Legacy connect requested to " . DB_TYPE, E_USER_NOTICE);
+        user_error("Legacy connect requested to " . DB_TYPE, E_USER_NOTICE);
 
-		$er = error_reporting(E_ALL);
+        $er = error_reporting(E_ALL);
 
-		switch (DB_TYPE) {
-			case "mysql":
-				$this->adapter = new Db_Mysqli();
-				break;
-			case "pgsql":
-				$this->adapter = new Db_Pgsql();
-				break;
-			default:
-				die("Unknown DB_TYPE: " . DB_TYPE);
-		}
+        switch (DB_TYPE) {
+            case "mysql":
+                $this->adapter = new Db_Mysqli();
+                break;
+            case "pgsql":
+                $this->adapter = new Db_Pgsql();
+                break;
+            default:
+                die("Unknown DB_TYPE: " . DB_TYPE);
+        }
 
-		if (!$this->adapter) {
-			print("Error initializing database adapter for " . DB_TYPE);
-			exit(100);
-		}
+        if (!$this->adapter) {
+            print("Error initializing database adapter for " . DB_TYPE);
+            exit(100);
+        }
 
-		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
+        $this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
 
-		if (!$this->link) {
-			print("Error connecting through adapter: " . $this->adapter->last_error());
-			exit(101);
-		}
+        if (!$this->link) {
+            print("Error connecting through adapter: " . $this->adapter->last_error());
+            exit(101);
+        }
 
-		error_reporting($er);
-	}
+        error_reporting($er);
+    }
 
-	// this really shouldn't be used unless a separate PDO connection is needed
-	// normal usage is Db::pdo()->prepare(...) etc
-	public function pdo_connect() {
+    // this really shouldn't be used unless a separate PDO connection is needed
+    // normal usage is Db::pdo()->prepare(...) etc
+    public function pdo_connect() {
 
-		$db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : '';
-		$db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
+        $db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : '';
+        $db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
 
-		try {
-			$pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port,
-				DB_USER,
-				DB_PASS);
-		} catch (Exception $e) {
-			print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>";
-			exit(101);
-		}
+        try {
+            $pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port,
+                DB_USER,
+                DB_PASS);
+        } catch (Exception $e) {
+            print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>";
+            exit(101);
+        }
 
-		$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
-		if (DB_TYPE == "pgsql") {
+        if (DB_TYPE == "pgsql") {
 
-			$pdo->query("set client_encoding = 'UTF-8'");
-			$pdo->query("set datestyle = 'ISO, european'");
-			$pdo->query("set TIME ZONE 0");
-			$pdo->query("set cpu_tuple_cost = 0.5");
+            $pdo->query("set client_encoding = 'UTF-8'");
+            $pdo->query("set datestyle = 'ISO, european'");
+            $pdo->query("set TIME ZONE 0");
+            $pdo->query("set cpu_tuple_cost = 0.5");
 
-		} else if (DB_TYPE == "mysql") {
-			$pdo->query("SET time_zone = '+0:0'");
+        } else if (DB_TYPE == "mysql") {
+            $pdo->query("SET time_zone = '+0:0'");
 
-			if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-				$pdo->query("SET NAMES " . MYSQL_CHARSET);
-			}
-		}
+            if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                $pdo->query("SET NAMES " . MYSQL_CHARSET);
+            }
+        }
 
-		return $pdo;
-	}
+        return $pdo;
+    }
 
-	public static function instance() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function instance() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
-	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function get() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		if (!self::$instance->adapter) {
-			self::$instance->legacy_connect();
-		}
+        if (!self::$instance->adapter) {
+            self::$instance->legacy_connect();
+        }
 
-		return self::$instance->adapter;
-	}
+        return self::$instance->adapter;
+    }
 
-	public static function pdo() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function pdo() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		if (!self::$instance->pdo) {
-			self::$instance->pdo = self::$instance->pdo_connect();
-		}
+        if (!self::$instance->pdo) {
+            self::$instance->pdo = self::$instance->pdo_connect();
+        }
 
-		return self::$instance->pdo;
-	}
+        return self::$instance->pdo;
+    }
 }

classes/backend.php

Switch Indentation +8 added lines, -8 removed lines

@@ -126,14 +126,14 @@
 										$tmp = '';
 										foreach (str_split($keys[$i]) as $c) {
 											switch ($c) {
-												case '*':
-													$tmp .= __('Shift') . '+';
-													break;
-												case '^':
-													$tmp .= __('Ctrl') . '+';
-													break;
-												default:
-													$tmp .= $c;
+											case '*':
+												$tmp .= __('Shift') . '+';
+												break;
+											case '^':
+												$tmp .= __('Ctrl') . '+';
+												break;
+											default:
+												$tmp .= $c;
 											}
 										}
 										$keys[$i] = $tmp;

Indentation +92 added lines, -92 removed lines

@@ -1,97 +1,97 @@
 <?php
 class Backend extends Handler {
-	public function loading() {
-		header("Content-type: text/html");
-		print __("Loading, please wait...") . " " .
-			"<img src='images/indicator_tiny.gif'>";
-	}
-
-	public function digestTest() {
-		if (isset($_SESSION['uid'])) {
-			header("Content-type: text/html");
-
-			$rv = Digest::prepare_headlines_digest($_SESSION['uid'], 1, 1000);
-
-			print "<h1>HTML</h1>";
-			print $rv[0];
-			print "<h1>Plain text</h1>";
-			print "<pre>".$rv[3]."</pre>";
-		} else {
-			print error_json(6);
-		}
-	}
-
-	public function help() {
-		$topic = clean_filename($_REQUEST["topic"]); // only one for now
-
-		if ($topic == "main") {
-			$info = get_hotkeys_info();
-			$imap = get_hotkeys_map();
-			$omap = array();
-
-			foreach ($imap[1] as $sequence => $action) {
-				if (!isset($omap[$action])) $omap[$action] = array();
-
-				array_push($omap[$action], $sequence);
-			}
-
-			print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>";
-
-			$cur_section = "";
-			foreach ($info as $section => $hotkeys) {
-
-				if ($cur_section) print "<li>&nbsp;</li>";
-				print "<li><h3>" . $section . "</h3></li>";
-				$cur_section = $section;
-
-				foreach ($hotkeys as $action => $description) {
-
-					if (is_array($omap[$action])) {
-						foreach ($omap[$action] as $sequence) {
-							if (strpos($sequence, "|") !== false) {
-								$sequence = substr($sequence,
-									strpos($sequence, "|")+1,
-									strlen($sequence));
-							} else {
-								$keys = explode(" ", $sequence);
-
-								for ($i = 0; $i < count($keys); $i++) {
-									if (strlen($keys[$i]) > 1) {
-										$tmp = '';
-										foreach (str_split($keys[$i]) as $c) {
-											switch ($c) {
-												case '*':
-													$tmp .= __('Shift') . '+';
-													break;
-												case '^':
-													$tmp .= __('Ctrl') . '+';
-													break;
-												default:
-													$tmp .= $c;
-											}
-										}
-										$keys[$i] = $tmp;
-									}
-								}
-								$sequence = join(" ", $keys);
-							}
-
-							print "<li>";
-							print "<div class='hk'><code>$sequence</code></div>";
-							print "<div class='desc'>$description</div>";
-							print "</li>";
-						}
-					}
-				}
-			}
-
-			print "</ul>";
-		}
-
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button'
+    public function loading() {
+        header("Content-type: text/html");
+        print __("Loading, please wait...") . " " .
+            "<img src='images/indicator_tiny.gif'>";
+    }
+
+    public function digestTest() {
+        if (isset($_SESSION['uid'])) {
+            header("Content-type: text/html");
+
+            $rv = Digest::prepare_headlines_digest($_SESSION['uid'], 1, 1000);
+
+            print "<h1>HTML</h1>";
+            print $rv[0];
+            print "<h1>Plain text</h1>";
+            print "<pre>".$rv[3]."</pre>";
+        } else {
+            print error_json(6);
+        }
+    }
+
+    public function help() {
+        $topic = clean_filename($_REQUEST["topic"]); // only one for now
+
+        if ($topic == "main") {
+            $info = get_hotkeys_info();
+            $imap = get_hotkeys_map();
+            $omap = array();
+
+            foreach ($imap[1] as $sequence => $action) {
+                if (!isset($omap[$action])) $omap[$action] = array();
+
+                array_push($omap[$action], $sequence);
+            }
+
+            print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>";
+
+            $cur_section = "";
+            foreach ($info as $section => $hotkeys) {
+
+                if ($cur_section) print "<li>&nbsp;</li>";
+                print "<li><h3>" . $section . "</h3></li>";
+                $cur_section = $section;
+
+                foreach ($hotkeys as $action => $description) {
+
+                    if (is_array($omap[$action])) {
+                        foreach ($omap[$action] as $sequence) {
+                            if (strpos($sequence, "|") !== false) {
+                                $sequence = substr($sequence,
+                                    strpos($sequence, "|")+1,
+                                    strlen($sequence));
+                            } else {
+                                $keys = explode(" ", $sequence);
+
+                                for ($i = 0; $i < count($keys); $i++) {
+                                    if (strlen($keys[$i]) > 1) {
+                                        $tmp = '';
+                                        foreach (str_split($keys[$i]) as $c) {
+                                            switch ($c) {
+                                                case '*':
+                                                    $tmp .= __('Shift') . '+';
+                                                    break;
+                                                case '^':
+                                                    $tmp .= __('Ctrl') . '+';
+                                                    break;
+                                                default:
+                                                    $tmp .= $c;
+                                            }
+                                        }
+                                        $keys[$i] = $tmp;
+                                    }
+                                }
+                                $sequence = join(" ", $keys);
+                            }
+
+                            print "<li>";
+                            print "<div class='hk'><code>$sequence</code></div>";
+                            print "<div class='desc'>$description</div>";
+                            print "</li>";
+                        }
+                    }
+                }
+            }
+
+            print "</ul>";
+        }
+
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"return dijit.byId('helpDlg').hide()\">".__('Close this window')."</button>";
-		print "</footer>";
+        print "</footer>";
 
-	}
+    }
 }

classes/pref/prefs.php

Switch Indentation +13 added lines, -13 removed lines

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

Indentation +839 added lines, -839 removed lines

@@ -2,278 +2,278 @@ 
 
 class Pref_Prefs extends Handler_Protected {
 
-	private $pref_help = [];
-	private $pref_item_map = [];
-	private $pref_blacklist = [];
-	private $profile_blacklist = [];
-
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("index", "updateself", "customizecss", "editprefprofiles");
-
-		return array_search($method, $csrf_ignored) !== false;
-	}
-
-	public function __construct($args) {
-		parent::__construct($args);
-
-		$this->pref_item_map = [
-			__('General') => [
-				'USER_LANGUAGE',
-				'USER_TIMEZONE',
-				'BLOCK_SEPARATOR',
-				'USER_CSS_THEME',
-				'BLOCK_SEPARATOR',
-				'ENABLE_API_ACCESS',
-			],
-			__('Feeds') => [
-				'DEFAULT_UPDATE_INTERVAL',
-				'FRESH_ARTICLE_MAX_AGE',
-				'DEFAULT_SEARCH_LANGUAGE',
-				'BLOCK_SEPARATOR',
-				'ENABLE_FEED_CATS',
-				'BLOCK_SEPARATOR',
-				'CONFIRM_FEED_CATCHUP',
-				'ON_CATCHUP_SHOW_NEXT_FEED',
-				'BLOCK_SEPARATOR',
-				'HIDE_READ_FEEDS',
-				'HIDE_READ_SHOWS_SPECIAL',
-			],
-			__('Articles') => [
-				'PURGE_OLD_DAYS',
-				'PURGE_UNREAD_ARTICLES',
-				'BLOCK_SEPARATOR',
-				'COMBINED_DISPLAY_MODE',
-				'CDM_EXPANDED',
-				'BLOCK_SEPARATOR',
-				'CDM_AUTO_CATCHUP',
-				'VFEED_GROUP_BY_FEED',
-				'BLOCK_SEPARATOR',
-				'SHOW_CONTENT_PREVIEW',
-				'STRIP_IMAGES',
-			],
-			__('Digest') => [
-				'DIGEST_ENABLE',
-				'DIGEST_CATCHUP',
-				'DIGEST_PREFERRED_TIME',
-			],
-			__('Advanced') => [
-				'BLACKLISTED_TAGS',
-				'BLOCK_SEPARATOR',
-				'LONG_DATE_FORMAT',
-				'SHORT_DATE_FORMAT',
-				'BLOCK_SEPARATOR',
-				'SSL_CERT_SERIAL',
-			]
-		];
-
-		$this->pref_help = [
-			"ALLOW_DUPLICATE_POSTS" => array(__("Allow duplicate articles"), ""),
-			"BLACKLISTED_TAGS" => array(__("Blacklisted tags"), __("Never apply these tags automatically (comma-separated list).")),
-			"DEFAULT_SEARCH_LANGUAGE" => array(__("Default language"), __("Used for full-text search")),
-			"CDM_AUTO_CATCHUP" => array(__("Mark read on scroll"), __("Mark articles as read as you scroll past them")),
-			"CDM_EXPANDED" => array(__("Always expand articles")),
-			"COMBINED_DISPLAY_MODE" => array(__("Combined mode"), __("Show flat list of articles instead of separate panels")),
-			"CONFIRM_FEED_CATCHUP" => array(__("Confirm marking feeds as read")),
-			"DEFAULT_ARTICLE_LIMIT" => array(__("Amount of articles to display at once")),
-			"DEFAULT_UPDATE_INTERVAL" => array(__("Default update interval")),
-			"DIGEST_CATCHUP" => array(__("Mark sent articles as read")),
-			"DIGEST_ENABLE" => array(__("Enable digest"), __("Send daily digest of new (and unread) headlines to your e-mail address")),
-			"DIGEST_PREFERRED_TIME" => array(__("Try to send around this time"), __("Time in UTC")),
-			"ENABLE_API_ACCESS" => array(__("Enable API"), __("Allows accessing this account through the API")),
-			"ENABLE_FEED_CATS" => array(__("Enable categories")),
-			"FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""),
-			"FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>" . __("hours") . "</strong>"),
-			"HIDE_READ_FEEDS" => array(__("Hide read feeds")),
-			"HIDE_READ_SHOWS_SPECIAL" => array(__("Always show special feeds"), __("While hiding read feeds")),
-			"LONG_DATE_FORMAT" => array(__("Long date format"), __("Syntax is identical to PHP <a href='http://php.net/manual/function.date.php'>date()</a> function.")),
-			"ON_CATCHUP_SHOW_NEXT_FEED" => array(__("Automatically show next feed"), __("After marking one as read")),
-			"PURGE_OLD_DAYS" => array(__("Purge articles older than"), __("<strong>days</strong> (0 disables)")),
-			"PURGE_UNREAD_ARTICLES" => array(__("Purge unread articles")),
-			"REVERSE_HEADLINES" => array(__("Reverse headline order (oldest first)")),
-			"SHORT_DATE_FORMAT" => array(__("Short date format")),
-			"SHOW_CONTENT_PREVIEW" => array(__("Show content preview in headlines")),
-			"SORT_HEADLINES_BY_FEED_DATE" => array(__("Sort headlines by feed date"), __("Use feed-specified date to sort headlines instead of local import date.")),
-			"SSL_CERT_SERIAL" => array(__("SSL client certificate")),
-			"STRIP_IMAGES" => array(__("Do not embed media")),
-			"STRIP_UNSAFE_TAGS" => array(__("Strip unsafe tags from articles"), __("Strip all but most common HTML tags when reading articles.")),
-			"USER_STYLESHEET" => array(__("Customize stylesheet")),
-			"USER_TIMEZONE" => array(__("Time zone")),
-			"VFEED_GROUP_BY_FEED" => array(__("Group by feed"), __("Group multiple-feed output by originating feed")),
-			"USER_LANGUAGE" => array(__("Language")),
-			"USER_CSS_THEME" => array(__("Theme"))
-		];
-
-		$this->pref_blacklist = ["ALLOW_DUPLICATE_POSTS", "STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES",
-			"SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT",
-			"FEEDS_SORT_BY_UNREAD", "USER_STYLESHEET"];
-
-		/* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */
-
-		$this->profile_blacklist = ["ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS",
-			"PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",
-			"BLACKLISTED_TAGS", "ENABLE_API_ACCESS", "UPDATE_POST_ON_CHECKSUM_CHANGE",
-			"DEFAULT_UPDATE_INTERVAL", "USER_TIMEZONE", "SORT_HEADLINES_BY_FEED_DATE",
-			"SSL_CERT_SERIAL", "DIGEST_PREFERRED_TIME"];
-	}
-
-	public function changepassword() {
-
-		if (defined('_TTRSS_DEMO_INSTANCE')) {
-			print "ERROR: ".format_error("Disabled in demo version.");
-			return;
-		}
-
-		$old_pw = clean($_POST["old_password"]);
-		$new_pw = clean($_POST["new_password"]);
-		$con_pw = clean($_POST["confirm_password"]);
-
-		if ($old_pw == $new_pw) {
-			print "ERROR: ".format_error("New password must be different from the old one.");
-			return;
-		}
-
-		if ($old_pw == "") {
-			print "ERROR: ".format_error("Old password cannot be blank.");
-			return;
-		}
-
-		if ($new_pw == "") {
-			print "ERROR: ".format_error("New password cannot be blank.");
-			return;
-		}
-
-		if ($new_pw != $con_pw) {
-			print "ERROR: ".format_error("Entered passwords do not match.");
-			return;
-		}
-
-		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
-
-		if (method_exists($authenticator, "change_password")) {
-			print format_notice($authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw));
-		} else {
-			print "ERROR: ".format_error("Function not supported by authentication module.");
-		}
-	}
-
-	public function saveconfig() {
-		$boolean_prefs = explode(",", clean($_POST["boolean_prefs"]));
-
-		foreach ($boolean_prefs as $pref) {
-			if (!isset($_POST[$pref])) $_POST[$pref] = 'false';
-		}
-
-		$need_reload = false;
-
-		foreach (array_keys($_POST) as $pref_name) {
-
-			$value = $_POST[$pref_name];
-
-			switch ($pref_name) {
-				case 'DIGEST_PREFERRED_TIME':
-					if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
-
-						$sth = $this->pdo->prepare("UPDATE ttrss_users SET
+    private $pref_help = [];
+    private $pref_item_map = [];
+    private $pref_blacklist = [];
+    private $profile_blacklist = [];
+
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("index", "updateself", "customizecss", "editprefprofiles");
+
+        return array_search($method, $csrf_ignored) !== false;
+    }
+
+    public function __construct($args) {
+        parent::__construct($args);
+
+        $this->pref_item_map = [
+            __('General') => [
+                'USER_LANGUAGE',
+                'USER_TIMEZONE',
+                'BLOCK_SEPARATOR',
+                'USER_CSS_THEME',
+                'BLOCK_SEPARATOR',
+                'ENABLE_API_ACCESS',
+            ],
+            __('Feeds') => [
+                'DEFAULT_UPDATE_INTERVAL',
+                'FRESH_ARTICLE_MAX_AGE',
+                'DEFAULT_SEARCH_LANGUAGE',
+                'BLOCK_SEPARATOR',
+                'ENABLE_FEED_CATS',
+                'BLOCK_SEPARATOR',
+                'CONFIRM_FEED_CATCHUP',
+                'ON_CATCHUP_SHOW_NEXT_FEED',
+                'BLOCK_SEPARATOR',
+                'HIDE_READ_FEEDS',
+                'HIDE_READ_SHOWS_SPECIAL',
+            ],
+            __('Articles') => [
+                'PURGE_OLD_DAYS',
+                'PURGE_UNREAD_ARTICLES',
+                'BLOCK_SEPARATOR',
+                'COMBINED_DISPLAY_MODE',
+                'CDM_EXPANDED',
+                'BLOCK_SEPARATOR',
+                'CDM_AUTO_CATCHUP',
+                'VFEED_GROUP_BY_FEED',
+                'BLOCK_SEPARATOR',
+                'SHOW_CONTENT_PREVIEW',
+                'STRIP_IMAGES',
+            ],
+            __('Digest') => [
+                'DIGEST_ENABLE',
+                'DIGEST_CATCHUP',
+                'DIGEST_PREFERRED_TIME',
+            ],
+            __('Advanced') => [
+                'BLACKLISTED_TAGS',
+                'BLOCK_SEPARATOR',
+                'LONG_DATE_FORMAT',
+                'SHORT_DATE_FORMAT',
+                'BLOCK_SEPARATOR',
+                'SSL_CERT_SERIAL',
+            ]
+        ];
+
+        $this->pref_help = [
+            "ALLOW_DUPLICATE_POSTS" => array(__("Allow duplicate articles"), ""),
+            "BLACKLISTED_TAGS" => array(__("Blacklisted tags"), __("Never apply these tags automatically (comma-separated list).")),
+            "DEFAULT_SEARCH_LANGUAGE" => array(__("Default language"), __("Used for full-text search")),
+            "CDM_AUTO_CATCHUP" => array(__("Mark read on scroll"), __("Mark articles as read as you scroll past them")),
+            "CDM_EXPANDED" => array(__("Always expand articles")),
+            "COMBINED_DISPLAY_MODE" => array(__("Combined mode"), __("Show flat list of articles instead of separate panels")),
+            "CONFIRM_FEED_CATCHUP" => array(__("Confirm marking feeds as read")),
+            "DEFAULT_ARTICLE_LIMIT" => array(__("Amount of articles to display at once")),
+            "DEFAULT_UPDATE_INTERVAL" => array(__("Default update interval")),
+            "DIGEST_CATCHUP" => array(__("Mark sent articles as read")),
+            "DIGEST_ENABLE" => array(__("Enable digest"), __("Send daily digest of new (and unread) headlines to your e-mail address")),
+            "DIGEST_PREFERRED_TIME" => array(__("Try to send around this time"), __("Time in UTC")),
+            "ENABLE_API_ACCESS" => array(__("Enable API"), __("Allows accessing this account through the API")),
+            "ENABLE_FEED_CATS" => array(__("Enable categories")),
+            "FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""),
+            "FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>" . __("hours") . "</strong>"),
+            "HIDE_READ_FEEDS" => array(__("Hide read feeds")),
+            "HIDE_READ_SHOWS_SPECIAL" => array(__("Always show special feeds"), __("While hiding read feeds")),
+            "LONG_DATE_FORMAT" => array(__("Long date format"), __("Syntax is identical to PHP <a href='http://php.net/manual/function.date.php'>date()</a> function.")),
+            "ON_CATCHUP_SHOW_NEXT_FEED" => array(__("Automatically show next feed"), __("After marking one as read")),
+            "PURGE_OLD_DAYS" => array(__("Purge articles older than"), __("<strong>days</strong> (0 disables)")),
+            "PURGE_UNREAD_ARTICLES" => array(__("Purge unread articles")),
+            "REVERSE_HEADLINES" => array(__("Reverse headline order (oldest first)")),
+            "SHORT_DATE_FORMAT" => array(__("Short date format")),
+            "SHOW_CONTENT_PREVIEW" => array(__("Show content preview in headlines")),
+            "SORT_HEADLINES_BY_FEED_DATE" => array(__("Sort headlines by feed date"), __("Use feed-specified date to sort headlines instead of local import date.")),
+            "SSL_CERT_SERIAL" => array(__("SSL client certificate")),
+            "STRIP_IMAGES" => array(__("Do not embed media")),
+            "STRIP_UNSAFE_TAGS" => array(__("Strip unsafe tags from articles"), __("Strip all but most common HTML tags when reading articles.")),
+            "USER_STYLESHEET" => array(__("Customize stylesheet")),
+            "USER_TIMEZONE" => array(__("Time zone")),
+            "VFEED_GROUP_BY_FEED" => array(__("Group by feed"), __("Group multiple-feed output by originating feed")),
+            "USER_LANGUAGE" => array(__("Language")),
+            "USER_CSS_THEME" => array(__("Theme"))
+        ];
+
+        $this->pref_blacklist = ["ALLOW_DUPLICATE_POSTS", "STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES",
+            "SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT",
+            "FEEDS_SORT_BY_UNREAD", "USER_STYLESHEET"];
+
+        /* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */
+
+        $this->profile_blacklist = ["ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS",
+            "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",
+            "BLACKLISTED_TAGS", "ENABLE_API_ACCESS", "UPDATE_POST_ON_CHECKSUM_CHANGE",
+            "DEFAULT_UPDATE_INTERVAL", "USER_TIMEZONE", "SORT_HEADLINES_BY_FEED_DATE",
+            "SSL_CERT_SERIAL", "DIGEST_PREFERRED_TIME"];
+    }
+
+    public function changepassword() {
+
+        if (defined('_TTRSS_DEMO_INSTANCE')) {
+            print "ERROR: ".format_error("Disabled in demo version.");
+            return;
+        }
+
+        $old_pw = clean($_POST["old_password"]);
+        $new_pw = clean($_POST["new_password"]);
+        $con_pw = clean($_POST["confirm_password"]);
+
+        if ($old_pw == $new_pw) {
+            print "ERROR: ".format_error("New password must be different from the old one.");
+            return;
+        }
+
+        if ($old_pw == "") {
+            print "ERROR: ".format_error("Old password cannot be blank.");
+            return;
+        }
+
+        if ($new_pw == "") {
+            print "ERROR: ".format_error("New password cannot be blank.");
+            return;
+        }
+
+        if ($new_pw != $con_pw) {
+            print "ERROR: ".format_error("Entered passwords do not match.");
+            return;
+        }
+
+        $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
+
+        if (method_exists($authenticator, "change_password")) {
+            print format_notice($authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw));
+        } else {
+            print "ERROR: ".format_error("Function not supported by authentication module.");
+        }
+    }
+
+    public function saveconfig() {
+        $boolean_prefs = explode(",", clean($_POST["boolean_prefs"]));
+
+        foreach ($boolean_prefs as $pref) {
+            if (!isset($_POST[$pref])) $_POST[$pref] = 'false';
+        }
+
+        $need_reload = false;
+
+        foreach (array_keys($_POST) as $pref_name) {
+
+            $value = $_POST[$pref_name];
+
+            switch ($pref_name) {
+                case 'DIGEST_PREFERRED_TIME':
+                    if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
+
+                        $sth = $this->pdo->prepare("UPDATE ttrss_users SET
 						last_digest_sent = NULL WHERE id = ?");
-						$sth->execute([$_SESSION['uid']]);
+                        $sth->execute([$_SESSION['uid']]);
 
-					}
-					break;
-				case 'USER_LANGUAGE':
-					if (!$need_reload) $need_reload = $_SESSION["language"] != $value;
-					break;
-
-				case 'USER_CSS_THEME':
-					if (!$need_reload) $need_reload = get_pref($pref_name) != $value;
-					break;
-			}
+                    }
+                    break;
+                case 'USER_LANGUAGE':
+                    if (!$need_reload) $need_reload = $_SESSION["language"] != $value;
+                    break;
 
-			set_pref($pref_name, $value);
-		}
+                case 'USER_CSS_THEME':
+                    if (!$need_reload) $need_reload = get_pref($pref_name) != $value;
+                    break;
+            }
 
-		if ($need_reload) {
-			print "PREFS_NEED_RELOAD";
-		} else {
-			print __("The configuration was saved.");
-		}
-	}
+            set_pref($pref_name, $value);
+        }
 
-	public function changeemail() {
+        if ($need_reload) {
+            print "PREFS_NEED_RELOAD";
+        } else {
+            print __("The configuration was saved.");
+        }
+    }
 
-		$email = clean($_POST["email"]);
-		$full_name = clean($_POST["full_name"]);
-		$active_uid = $_SESSION["uid"];
+    public function changeemail() {
 
-		$sth = $this->pdo->prepare("SELECT email, login, full_name FROM ttrss_users WHERE id = ?");
-		$sth->execute([$active_uid]);
+        $email = clean($_POST["email"]);
+        $full_name = clean($_POST["full_name"]);
+        $active_uid = $_SESSION["uid"];
 
-		if ($row = $sth->fetch()) {
-			$old_email = $row["email"];
+        $sth = $this->pdo->prepare("SELECT email, login, full_name FROM ttrss_users WHERE id = ?");
+        $sth->execute([$active_uid]);
 
-			if ($old_email != $email) {
-				$mailer = new Mailer();
+        if ($row = $sth->fetch()) {
+            $old_email = $row["email"];
 
-				require_once "lib/MiniTemplator.class.php";
+            if ($old_email != $email) {
+                $mailer = new Mailer();
 
-				$tpl = new MiniTemplator;
+                require_once "lib/MiniTemplator.class.php";
 
-				$tpl->readTemplateFromFile("templates/mail_change_template.txt");
+                $tpl = new MiniTemplator;
 
-				$tpl->setVariable('LOGIN', $row["login"]);
-				$tpl->setVariable('NEWMAIL', $email);
-				$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+                $tpl->readTemplateFromFile("templates/mail_change_template.txt");
 
-				$tpl->addBlock('message');
+                $tpl->setVariable('LOGIN', $row["login"]);
+                $tpl->setVariable('NEWMAIL', $email);
+                $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-				$tpl->generateOutputToString($message);
+                $tpl->addBlock('message');
 
-				$mailer->mail(["to_name" => $row["login"],
-					"to_address" => $row["email"],
-					"subject" => "[tt-rss] Mail address change notification",
-					"message" => $message]);
+                $tpl->generateOutputToString($message);
 
-			}
-		}
+                $mailer->mail(["to_name" => $row["login"],
+                    "to_address" => $row["email"],
+                    "subject" => "[tt-rss] Mail address change notification",
+                    "message" => $message]);
+
+            }
+        }
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_users SET email = ?,
+        $sth = $this->pdo->prepare("UPDATE ttrss_users SET email = ?,
 			full_name = ? WHERE id = ?");
-		$sth->execute([$email, $full_name, $active_uid]);
+        $sth->execute([$email, $full_name, $active_uid]);
 
-		print __("Your personal data has been saved.");
+        print __("Your personal data has been saved.");
 
-		return;
-	}
+        return;
+    }
 
-	public function resetconfig() {
+    public function resetconfig() {
 
-		$_SESSION["prefs_op_result"] = "reset-to-defaults";
+        $_SESSION["prefs_op_result"] = "reset-to-defaults";
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_user_prefs
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_user_prefs
 			WHERE (profile = :profile OR (:profile IS NULL AND profile IS NULL))
 				AND owner_uid = :uid");
-		$sth->execute([":profile" => $_SESSION['profile'], ":uid" => $_SESSION['uid']]);
+        $sth->execute([":profile" => $_SESSION['profile'], ":uid" => $_SESSION['uid']]);
 
-		initialize_user_prefs($_SESSION["uid"], $_SESSION["profile"]);
+        initialize_user_prefs($_SESSION["uid"], $_SESSION["profile"]);
 
-		echo __("Your preferences are now set to default values.");
-	}
+        echo __("Your preferences are now set to default values.");
+    }
 
-	public function index() {
+    public function index() {
 
-		global $access_level_names;
+        global $access_level_names;
 
-		$_SESSION["prefs_op_result"] = "";
+        $_SESSION["prefs_op_result"] = "";
 
-		print "<div dojoType='dijit.layout.AccordionContainer' region='center'>";
-		print "<div dojoType='dijit.layout.AccordionPane'
+        print "<div dojoType='dijit.layout.AccordionContainer' region='center'>";
+        print "<div dojoType='dijit.layout.AccordionPane'
 			title=\"<i class='material-icons'>person</i> ".__('Personal data / Authentication')."\">";
 
-		print "<div dojoType='dijit.layout.TabContainer'>";
-		print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Personal data')."\">";
+        print "<div dojoType='dijit.layout.TabContainer'>";
+        print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Personal data')."\">";
 
-		print "<form dojoType='dijit.form.Form' id='changeUserdataForm'>";
+        print "<form dojoType='dijit.form.Form' id='changeUserdataForm'>";
 
-		print "<script type='dojo/method' event='onSubmit' args='evt'>
+        print "<script type='dojo/method' event='onSubmit' args='evt'>
 		evt.preventDefault();
 		if (this.validate()) {
 			Notify.progress('Saving data...', true);
@@ -287,61 +287,61 @@ 
 		}
 		</script>";
 
-		$sth = $this->pdo->prepare("SELECT email,full_name,otp_enabled,
+        $sth = $this->pdo->prepare("SELECT email,full_name,otp_enabled,
 			access_level FROM ttrss_users
 			WHERE id = ?");
-		$sth->execute([$_SESSION["uid"]]);
-		$row = $sth->fetch();
-
-		$email = htmlspecialchars($row["email"]);
-		$full_name = htmlspecialchars($row["full_name"]);
-		$otp_enabled = sql_bool_to_bool($row["otp_enabled"]);
-
-		print "<fieldset>";
-		print "<label>".__('Full name:')."</label>";
-		print "<input dojoType='dijit.form.ValidationTextBox' name='full_name' required='1' value='$full_name'>";
-		print "</fieldset>";
-
-		print "<fieldset>";
-		print "<label>".__('E-mail:')."</label>";
-		print "<input dojoType='dijit.form.ValidationTextBox' name='email' required='1' value='$email'>";
-		print "</fieldset>";
-
-		if (!SINGLE_USER_MODE && !$_SESSION["hide_hello"]) {
-
-			$access_level = $row["access_level"];
-			print "<fieldset>";
-			print "<label>".__('Access level:')."</label>";
-			print $access_level_names[$access_level];
-			print "</fieldset>";
-		}
+        $sth->execute([$_SESSION["uid"]]);
+        $row = $sth->fetch();
 
-		print_hidden("op", "pref-prefs");
-		print_hidden("method", "changeemail");
+        $email = htmlspecialchars($row["email"]);
+        $full_name = htmlspecialchars($row["full_name"]);
+        $otp_enabled = sql_bool_to_bool($row["otp_enabled"]);
 
-		print "<hr/>";
+        print "<fieldset>";
+        print "<label>".__('Full name:')."</label>";
+        print "<input dojoType='dijit.form.ValidationTextBox' name='full_name' required='1' value='$full_name'>";
+        print "</fieldset>";
 
-		print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
-			__("Save data")."</button>";
+        print "<fieldset>";
+        print "<label>".__('E-mail:')."</label>";
+        print "<input dojoType='dijit.form.ValidationTextBox' name='email' required='1' value='$email'>";
+        print "</fieldset>";
 
-		print "</form>";
+        if (!SINGLE_USER_MODE && !$_SESSION["hide_hello"]) {
 
-		print "</div>"; # content pane
-		print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Password')."\">";
+            $access_level = $row["access_level"];
+            print "<fieldset>";
+            print "<label>".__('Access level:')."</label>";
+            print $access_level_names[$access_level];
+            print "</fieldset>";
+        }
 
-		if ($_SESSION["auth_module"]) {
-			$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
-		} else {
-			$authenticator = false;
-		}
+        print_hidden("op", "pref-prefs");
+        print_hidden("method", "changeemail");
 
-		if ($authenticator && method_exists($authenticator, "change_password")) {
+        print "<hr/>";
 
-			print "<div style='display : none' id='pwd_change_infobox'></div>";
+        print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
+            __("Save data")."</button>";
 
-			print "<form dojoType='dijit.form.Form'>";
+        print "</form>";
 
-			print "<script type='dojo/method' event='onSubmit' args='evt'>
+        print "</div>"; # content pane
+        print "<div dojoType='dijit.layout.ContentPane' title=\"".__('Password')."\">";
+
+        if ($_SESSION["auth_module"]) {
+            $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
+        } else {
+            $authenticator = false;
+        }
+
+        if ($authenticator && method_exists($authenticator, "change_password")) {
+
+            print "<div style='display : none' id='pwd_change_infobox'></div>";
+
+            print "<form dojoType='dijit.form.Form'>";
+
+            print "<script type='dojo/method' event='onSubmit' args='evt'>
 			evt.preventDefault();
 			if (this.validate()) {
 				Notify.progress('Changing password...', true);
@@ -370,71 +370,71 @@ 
 			}
 			</script>";
 
-			if ($otp_enabled) {
-				print_notice(__("Changing your current password will disable OTP."));
-			}
+            if ($otp_enabled) {
+                print_notice(__("Changing your current password will disable OTP."));
+            }
 
-			print "<fieldset>";
-			print "<label>".__("Old password:")."</label>";
-			print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='old_password'>";
-			print "</fieldset>";
+            print "<fieldset>";
+            print "<label>".__("Old password:")."</label>";
+            print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='old_password'>";
+            print "</fieldset>";
 
-			print "<fieldset>";
-			print "<label>".__("New password:")."</label>";
-			print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='new_password'>";
-			print "</fieldset>";
+            print "<fieldset>";
+            print "<label>".__("New password:")."</label>";
+            print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='new_password'>";
+            print "</fieldset>";
 
-			print "<fieldset>";
-			print "<label>".__("Confirm password:")."</label>";
-			print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='confirm_password'>";
-			print "</fieldset>";
+            print "<fieldset>";
+            print "<label>".__("Confirm password:")."</label>";
+            print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='confirm_password'>";
+            print "</fieldset>";
 
-			print_hidden("op", "pref-prefs");
-			print_hidden("method", "changepassword");
+            print_hidden("op", "pref-prefs");
+            print_hidden("method", "changepassword");
 
-			print "<hr/>";
+            print "<hr/>";
 
-			print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
-				__("Change password")."</button>";
+            print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
+                __("Change password")."</button>";
 
-			print "</form>";
+            print "</form>";
 
-			print "</div>"; # content pane
+            print "</div>"; # content pane
 
-			if ($_SESSION["auth_module"] == "auth_internal") {
+            if ($_SESSION["auth_module"] == "auth_internal") {
 
-				print "<div dojoType='dijit.layout.ContentPane' title=\"" . __('App passwords') . "\">";
+                print "<div dojoType='dijit.layout.ContentPane' title=\"" . __('App passwords') . "\">";
 
-				print_notice("You can create separate passwords for API clients. Using one is required if you enable OTP.");
+                print_notice("You can create separate passwords for API clients. Using one is required if you enable OTP.");
 
-				print "<div id='app_passwords_holder'>";
-				$this->appPasswordList();
-				print "</div>";
+                print "<div id='app_passwords_holder'>";
+                $this->appPasswordList();
+                print "</div>";
 
-				print "<hr>";
+                print "<hr>";
 
-				print "<button style='float : left' class='alt-primary' dojoType='dijit.form.Button'
+                print "<button style='float : left' class='alt-primary' dojoType='dijit.form.Button'
 					onclick=\"Helpers.AppPasswords.generate()\">" .
-					__('Generate new password') . "</button> ";
+                    __('Generate new password') . "</button> ";
 
-				print "<button style='float : left' class='alt-danger' dojoType='dijit.form.Button'
+                print "<button style='float : left' class='alt-danger' dojoType='dijit.form.Button'
 					onclick=\"Helpers.AppPasswords.removeSelected()\">" .
-					__('Remove selected passwords') . "</button>";
+                    __('Remove selected passwords') . "</button>";
 
-				print "</div>"; # content pane
-			}
+                print "</div>"; # content pane
+            }
 
-			print "<div dojoType='dijit.layout.ContentPane' title=\"".__('One time passwords / Authenticator')."\">";
+            print "<div dojoType='dijit.layout.ContentPane' title=\"".__('One time passwords / Authenticator')."\">";
 
-			if ($_SESSION["auth_module"] == "auth_internal") {
+            if ($_SESSION["auth_module"] == "auth_internal") {
 
-				if ($otp_enabled) {
+                if ($otp_enabled) {
 
-					print_warning("One time passwords are currently enabled. Enter your current password below to disable.");
+                    print_warning("One time passwords are currently enabled. Enter your current password below to disable.");
 
-					print "<form dojoType='dijit.form.Form'>";
+                    print "<form dojoType='dijit.form.Form'>";
 
-					print "<script type='dojo/method' event='onSubmit' args='evt'>
+                    print "<script type='dojo/method' event='onSubmit' args='evt'>
 					evt.preventDefault();
 					if (this.validate()) {
 						Notify.progress('Disabling OTP', true);
@@ -453,49 +453,49 @@ 
 					}
 					</script>";
 
-					print "<fieldset>";
-					print "<label>".__("Your password:")."</label>";
-					print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='password'>";
-					print "</fieldset>";
+                    print "<fieldset>";
+                    print "<label>".__("Your password:")."</label>";
+                    print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1' name='password'>";
+                    print "</fieldset>";
 
-					print_hidden("op", "pref-prefs");
-					print_hidden("method", "otpdisable");
+                    print_hidden("op", "pref-prefs");
+                    print_hidden("method", "otpdisable");
 
-					print "<hr/>";
+                    print "<hr/>";
 
-					print "<button dojoType='dijit.form.Button' type='submit'>".
-						__("Disable OTP")."</button>";
+                    print "<button dojoType='dijit.form.Button' type='submit'>".
+                        __("Disable OTP")."</button>";
 
-					print "</form>";
+                    print "</form>";
 
-				} else {
+                } else {
 
-					print_warning("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.");
-					print_notice("You will need to generate app passwords for the API clients if you enable OTP.");
+                    print_warning("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.");
+                    print_notice("You will need to generate app passwords for the API clients if you enable OTP.");
 
-					if (function_exists("imagecreatefromstring")) {
-						print "<h3>" . __("Scan the following code by the Authenticator application or copy the key manually") . "</h3>";
+                    if (function_exists("imagecreatefromstring")) {
+                        print "<h3>" . __("Scan the following code by the Authenticator application or copy the key manually") . "</h3>";
 
-						$csrf_token = $_SESSION["csrf_token"];
-						print "<img alt='otp qr-code' src='backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token'>";
-					} else {
-						print_error("PHP GD functions are required to generate QR codes.");
-						print "<h3>" . __("Use the following OTP key with a compatible Authenticator application") . "</h3>";
-					}
+                        $csrf_token = $_SESSION["csrf_token"];
+                        print "<img alt='otp qr-code' src='backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token'>";
+                    } else {
+                        print_error("PHP GD functions are required to generate QR codes.");
+                        print "<h3>" . __("Use the following OTP key with a compatible Authenticator application") . "</h3>";
+                    }
 
-					print "<form dojoType='dijit.form.Form' id='changeOtpForm'>";
+                    print "<form dojoType='dijit.form.Form' id='changeOtpForm'>";
 
-					$otp_secret = $this->otpsecret();
+                    $otp_secret = $this->otpsecret();
 
-					print "<fieldset>";
-					print "<label>".__("OTP Key:")."</label>";
-					print "<input dojoType='dijit.form.ValidationTextBox' disabled='disabled' value='$otp_secret' size='32'>";
-					print "</fieldset>";
+                    print "<fieldset>";
+                    print "<label>".__("OTP Key:")."</label>";
+                    print "<input dojoType='dijit.form.ValidationTextBox' disabled='disabled' value='$otp_secret' size='32'>";
+                    print "</fieldset>";
 
-					print_hidden("op", "pref-prefs");
-					print_hidden("method", "otpenable");
+                    print_hidden("op", "pref-prefs");
+                    print_hidden("method", "otpenable");
 
-					print "<script type='dojo/method' event='onSubmit' args='evt'>
+                    print "<script type='dojo/method' event='onSubmit' args='evt'>
 					evt.preventDefault();
 					if (this.validate()) {
 						Notify.progress('Saving data...', true);
@@ -514,43 +514,43 @@ 
 					}
 					</script>";
 
-					print "<fieldset>";
-					print "<label>".__("Your password:")."</label>";
-					print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1'
+                    print "<fieldset>";
+                    print "<label>".__("Your password:")."</label>";
+                    print "<input dojoType='dijit.form.ValidationTextBox' type='password' required='1'
 						name='password'>";
-					print "</fieldset>";
+                    print "</fieldset>";
 
-					print "<fieldset>";
-					print "<label>".__("One time password:")."</label>";
-					print "<input dojoType='dijit.form.ValidationTextBox' autocomplete='off'
+                    print "<fieldset>";
+                    print "<label>".__("One time password:")."</label>";
+                    print "<input dojoType='dijit.form.ValidationTextBox' autocomplete='off'
 						required='1' name='otp'>";
-					print "</fieldset>";
+                    print "</fieldset>";
 
-					print "<hr/>";
-					print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
-						__("Enable OTP")."</button>";
+                    print "<hr/>";
+                    print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
+                        __("Enable OTP")."</button>";
 
-					print "</form>";
+                    print "</form>";
 
-				}
-			}
+                }
+            }
 
-			print "</div>"; # content pane
-			print "</div>"; # tab container
+            print "</div>"; # content pane
+            print "</div>"; # tab container
 
-		}
+        }
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefPrefsAuth");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefPrefsAuth");
 
-		print "</div>"; #pane
+        print "</div>"; #pane
 
-		print "<div dojoType='dijit.layout.AccordionPane' selected='true'
+        print "<div dojoType='dijit.layout.AccordionPane' selected='true'
 			title=\"<i class='material-icons'>settings</i> ".__('Preferences')."\">";
 
-		print "<form dojoType='dijit.form.Form' id='changeSettingsForm'>";
+        print "<form dojoType='dijit.form.Form' id='changeSettingsForm'>";
 
-		print "<script type='dojo/method' event='onSubmit' args='evt, quit'>
+        print "<script type='dojo/method' event='onSubmit' args='evt, quit'>
 		if (evt) evt.preventDefault();
 		if (this.validate()) {
 			console.log(dojo.objectToQuery(this.getValues()));
@@ -572,23 +572,23 @@ 
 		}
 		</script>";
 
-		print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
+        print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
 
-		print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">';
+        print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">';
 
-		$profile = $_SESSION["profile"];
+        $profile = $_SESSION["profile"];
 
-		if ($profile) {
-			print_notice(__("Some preferences are only available in default profile."));
+        if ($profile) {
+            print_notice(__("Some preferences are only available in default profile."));
 
-			initialize_user_prefs($_SESSION["uid"], $profile);
-		} else {
-			initialize_user_prefs($_SESSION["uid"]);
-		}
+            initialize_user_prefs($_SESSION["uid"], $profile);
+        } else {
+            initialize_user_prefs($_SESSION["uid"]);
+        }
 
-		$prefs_available = [];
+        $prefs_available = [];
 
-		$sth = $this->pdo->prepare("SELECT DISTINCT
+        $sth = $this->pdo->prepare("SELECT DISTINCT
 			ttrss_user_prefs.pref_name,value,type_name,
 			ttrss_prefs_sections.order_id,
 			def_value,section_id
@@ -599,230 +599,230 @@ 
 				ttrss_user_prefs.pref_name = ttrss_prefs.pref_name AND
 				owner_uid = :uid
 			ORDER BY ttrss_prefs_sections.order_id,pref_name");
-		$sth->execute([":uid" => $_SESSION['uid'], ":profile" => $profile]);
+        $sth->execute([":uid" => $_SESSION['uid'], ":profile" => $profile]);
 
-		$listed_boolean_prefs = [];
+        $listed_boolean_prefs = [];
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			if (in_array($line["pref_name"], $this->pref_blacklist)) {
-				continue;
-			}
+            if (in_array($line["pref_name"], $this->pref_blacklist)) {
+                continue;
+            }
 
-			if ($profile && in_array($line["pref_name"], $this->profile_blacklist)) {
-				continue;
-			}
+            if ($profile && in_array($line["pref_name"], $this->profile_blacklist)) {
+                continue;
+            }
 
-			$pref_name = $line["pref_name"];
-			$short_desc = $this->getShortDesc($pref_name);
+            $pref_name = $line["pref_name"];
+            $short_desc = $this->getShortDesc($pref_name);
 
-			if (!$short_desc)
-				continue;
+            if (!$short_desc)
+                continue;
 
-			$prefs_available[$pref_name] = [
-				'type_name' => $line["type_name"],
-				'value' => $line['value'],
-				'help_text' => $this->getHelpText($pref_name),
-				'short_desc' => $short_desc
-			];
-		}
+            $prefs_available[$pref_name] = [
+                'type_name' => $line["type_name"],
+                'value' => $line['value'],
+                'help_text' => $this->getHelpText($pref_name),
+                'short_desc' => $short_desc
+            ];
+        }
 
-		foreach (array_keys($this->pref_item_map) as $section) {
+        foreach (array_keys($this->pref_item_map) as $section) {
 
-			print "<h2>$section</h2>";
+            print "<h2>$section</h2>";
 
-			foreach ($this->pref_item_map[$section] as $pref_name) {
+            foreach ($this->pref_item_map[$section] as $pref_name) {
 
-				if ($pref_name == 'BLOCK_SEPARATOR' && !$profile) {
-					print "<hr/>";
-					continue;
-				}
+                if ($pref_name == 'BLOCK_SEPARATOR' && !$profile) {
+                    print "<hr/>";
+                    continue;
+                }
 
-				if ($pref_name == "DEFAULT_SEARCH_LANGUAGE" && DB_TYPE != "pgsql") {
-					continue;
-				}
+                if ($pref_name == "DEFAULT_SEARCH_LANGUAGE" && DB_TYPE != "pgsql") {
+                    continue;
+                }
 
-				if ($item = $prefs_available[$pref_name]) {
+                if ($item = $prefs_available[$pref_name]) {
 
-					print "<fieldset class='prefs'>";
+                    print "<fieldset class='prefs'>";
 
-					print "<label for='CB_$pref_name'>";
-					print $item['short_desc'] . ":";
-					print "</label>";
+                    print "<label for='CB_$pref_name'>";
+                    print $item['short_desc'] . ":";
+                    print "</label>";
 
-					$value = $item['value'];
-					$type_name = $item['type_name'];
+                    $value = $item['value'];
+                    $type_name = $item['type_name'];
 
-					if ($pref_name == "USER_LANGUAGE") {
-						print_select_hash($pref_name, $value, get_translations(),
-							"style='width : 220px; margin : 0px' dojoType='fox.form.Select'");
+                    if ($pref_name == "USER_LANGUAGE") {
+                        print_select_hash($pref_name, $value, get_translations(),
+                            "style='width : 220px; margin : 0px' dojoType='fox.form.Select'");
 
-					} else if ($pref_name == "USER_TIMEZONE") {
+                    } else if ($pref_name == "USER_TIMEZONE") {
 
-						$timezones = explode("\n", file_get_contents("lib/timezones.txt"));
+                        $timezones = explode("\n", file_get_contents("lib/timezones.txt"));
 
-						print_select($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"');
-					} else if ($pref_name == "USER_CSS_THEME") {
+                        print_select($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"');
+                    } else if ($pref_name == "USER_CSS_THEME") {
 
-						$themes = array_merge(glob("themes/*.php"), glob("themes/*.css"), glob("themes.local/*.css"));
-						$themes = array_map("basename", $themes);
-						$themes = array_filter($themes, "theme_exists");
-						asort($themes);
+                        $themes = array_merge(glob("themes/*.php"), glob("themes/*.css"), glob("themes.local/*.css"));
+                        $themes = array_map("basename", $themes);
+                        $themes = array_filter($themes, "theme_exists");
+                        asort($themes);
 
-						if (!theme_exists($value)) $value = "default.php";
+                        if (!theme_exists($value)) $value = "default.php";
 
-						print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>";
+                        print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>";
 
-						$issel = $value == "default.php" ? "selected='selected'" : "";
-						print "<option $issel value='default.php'>".__("default")."</option>";
+                        $issel = $value == "default.php" ? "selected='selected'" : "";
+                        print "<option $issel value='default.php'>".__("default")."</option>";
 
-						foreach ($themes as $theme) {
-							$issel = $value == $theme ? "selected='selected'" : "";
-							print "<option $issel value='$theme'>$theme</option>";
-						}
+                        foreach ($themes as $theme) {
+                            $issel = $value == $theme ? "selected='selected'" : "";
+                            print "<option $issel value='$theme'>$theme</option>";
+                        }
 
-						print "</select>";
+                        print "</select>";
 
-						print " <button dojoType=\"dijit.form.Button\" class='alt-info'
+                        print " <button dojoType=\"dijit.form.Button\" class='alt-info'
 							onclick=\"Helpers.customizeCSS()\">" . __('Customize') . "</button>";
 
-						print " <button dojoType='dijit.form.Button' onclick='window.open(\"https://tt-rss.org/wiki/Themes\")'>
+                        print " <button dojoType='dijit.form.Button' onclick='window.open(\"https://tt-rss.org/wiki/Themes\")'>
 							<i class='material-icons'>open_in_new</i> ".__("More themes...")."</button>";
 
-					} else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") {
+                    } else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") {
 
-						global $update_intervals_nodefault;
+                        global $update_intervals_nodefault;
 
-						print_select_hash($pref_name, $value, $update_intervals_nodefault,
-							'dojoType="fox.form.Select"');
-					} else if ($pref_name == "DEFAULT_SEARCH_LANGUAGE") {
+                        print_select_hash($pref_name, $value, $update_intervals_nodefault,
+                            'dojoType="fox.form.Select"');
+                    } else if ($pref_name == "DEFAULT_SEARCH_LANGUAGE") {
 
-						print_select($pref_name, $value, Pref_Feeds::get_ts_languages(),
-							'dojoType="fox.form.Select"');
+                        print_select($pref_name, $value, Pref_Feeds::get_ts_languages(),
+                            'dojoType="fox.form.Select"');
 
-					} else if ($type_name == "bool") {
+                    } else if ($type_name == "bool") {
 
-						array_push($listed_boolean_prefs, $pref_name);
+                        array_push($listed_boolean_prefs, $pref_name);
 
-						$checked = ($value == "true") ? "checked=\"checked\"" : "";
+                        $checked = ($value == "true") ? "checked=\"checked\"" : "";
 
-						if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) {
-							$disabled = "disabled=\"1\"";
-							$checked = "checked=\"checked\"";
-						} else {
-							$disabled = "";
-						}
+                        if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) {
+                            $disabled = "disabled=\"1\"";
+                            $checked = "checked=\"checked\"";
+                        } else {
+                            $disabled = "";
+                        }
 
-						print "<input type='checkbox' name='$pref_name' $checked $disabled
+                        print "<input type='checkbox' name='$pref_name' $checked $disabled
 							dojoType='dijit.form.CheckBox' id='CB_$pref_name' value='1'>";
 
-					} else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE',
-							'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) {
+                    } else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE',
+                            'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) {
 
-						$regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
+                        $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
 
-						if ($pref_name == "PURGE_OLD_DAYS" && FORCE_ARTICLE_PURGE != 0) {
-							$disabled = "disabled='1'";
-							$value = FORCE_ARTICLE_PURGE;
-						} else {
-							$disabled = "";
-						}
+                        if ($pref_name == "PURGE_OLD_DAYS" && FORCE_ARTICLE_PURGE != 0) {
+                            $disabled = "disabled='1'";
+                            $value = FORCE_ARTICLE_PURGE;
+                        } else {
+                            $disabled = "";
+                        }
 
-						if ($type_name == 'integer')
-							print "<input dojoType=\"dijit.form.NumberSpinner\"
+                        if ($type_name == 'integer')
+                            print "<input dojoType=\"dijit.form.NumberSpinner\"
 								required='1' $disabled
 								name=\"$pref_name\" value=\"$value\">";
-						else
-							print "<input dojoType=\"dijit.form.TextBox\"
+                        else
+                            print "<input dojoType=\"dijit.form.TextBox\"
 								required='1' $regexp $disabled
 								name=\"$pref_name\" value=\"$value\">";
 
-					} else if ($pref_name == "SSL_CERT_SERIAL") {
+                    } else if ($pref_name == "SSL_CERT_SERIAL") {
 
-						print "<input dojoType='dijit.form.ValidationTextBox'
+                        print "<input dojoType='dijit.form.ValidationTextBox'
 							id='SSL_CERT_SERIAL' readonly='1'
 							name=\"$pref_name\" value=\"$value\">";
 
-						$cert_serial = htmlspecialchars(get_ssl_certificate_id());
-						$has_serial = ($cert_serial) ? "false" : "true";
+                        $cert_serial = htmlspecialchars(get_ssl_certificate_id());
+                        $has_serial = ($cert_serial) ? "false" : "true";
 
-						print "<button dojoType='dijit.form.Button' disabled='$has_serial'
+                        print "<button dojoType='dijit.form.Button' disabled='$has_serial'
 							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">" .
-							__('Register') . "</button>";
+                            __('Register') . "</button>";
 
-						print "<button dojoType='dijit.form.Button' class='alt-danger'
+                        print "<button dojoType='dijit.form.Button' class='alt-danger'
 							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '')\">" .
-							__('Clear') . "</button>";
+                            __('Clear') . "</button>";
 
-						print "<button dojoType='dijit.form.Button' class='alt-info'
+                        print "<button dojoType='dijit.form.Button' class='alt-info'
 							onclick='window.open(\"https://tt-rss.org/wiki/SSL%20Certificate%20Authentication\")'>
 							<i class='material-icons'>help</i> ".__("More info...")."</button>";
 
-					} else if ($pref_name == 'DIGEST_PREFERRED_TIME') {
-						print "<input dojoType=\"dijit.form.ValidationTextBox\"
+                    } else if ($pref_name == 'DIGEST_PREFERRED_TIME') {
+                        print "<input dojoType=\"dijit.form.ValidationTextBox\"
 							id=\"$pref_name\" regexp=\"[012]?\d:\d\d\" placeHolder=\"12:00\"
 							name=\"$pref_name\" value=\"$value\">";
 
-						$item['help_text'] .= ". " . T_sprintf("Current server time: %s", date("H:i"));
-					} else {
-						$regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
+                        $item['help_text'] .= ". " . T_sprintf("Current server time: %s", date("H:i"));
+                    } else {
+                        $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
 
-						print "<input dojoType=\"dijit.form.ValidationTextBox\" $regexp name=\"$pref_name\" value=\"$value\">";
-					}
+                        print "<input dojoType=\"dijit.form.ValidationTextBox\" $regexp name=\"$pref_name\" value=\"$value\">";
+                    }
 
-					if ($item['help_text'])
-						print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>";
+                    if ($item['help_text'])
+                        print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>";
 
-					print "</fieldset>";
-				}
-			}
-		}
+                    print "</fieldset>";
+                }
+            }
+        }
 
-		$listed_boolean_prefs = htmlspecialchars(join(",", $listed_boolean_prefs));
+        $listed_boolean_prefs = htmlspecialchars(join(",", $listed_boolean_prefs));
 
-		print_hidden("boolean_prefs", "$listed_boolean_prefs");
+        print_hidden("boolean_prefs", "$listed_boolean_prefs");
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefPrefsPrefsInside");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefPrefsPrefsInside");
 
-		print '</div>'; # inside pane
-		print '<div dojoType="dijit.layout.ContentPane" region="bottom">';
+        print '</div>'; # inside pane
+        print '<div dojoType="dijit.layout.ContentPane" region="bottom">';
 
-		print_hidden("op", "pref-prefs");
-		print_hidden("method", "saveconfig");
+        print_hidden("op", "pref-prefs");
+        print_hidden("method", "saveconfig");
 
-		print "<div dojoType=\"fox.form.ComboButton\" type=\"submit\" class=\"alt-primary\">
+        print "<div dojoType=\"fox.form.ComboButton\" type=\"submit\" class=\"alt-primary\">
 			<span>".__('Save configuration')."</span>
 			<div dojoType=\"dijit.DropDownMenu\">
 				<div dojoType=\"dijit.MenuItem\"
 					onclick=\"dijit.byId('changeSettingsForm').onSubmit(null, true)\">".
-				__("Save and exit preferences")."</div>
+                __("Save and exit preferences")."</div>
 			</div>
 			</div>";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Helpers.editProfiles()\">".
-			__('Manage profiles')."</button> ";
+        print "<button dojoType=\"dijit.form.Button\" onclick=\"return Helpers.editProfiles()\">".
+            __('Manage profiles')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" class=\"alt-danger\" onclick=\"return Helpers.confirmReset()\">".
-			__('Reset to defaults')."</button>";
+        print "<button dojoType=\"dijit.form.Button\" class=\"alt-danger\" onclick=\"return Helpers.confirmReset()\">".
+            __('Reset to defaults')."</button>";
 
-		print "&nbsp;";
+        print "&nbsp;";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefPrefsPrefsOutside");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefPrefsPrefsOutside");
 
-		print "</form>";
-		print '</div>'; # inner pane
-		print '</div>'; # border container
+        print "</form>";
+        print '</div>'; # inner pane
+        print '</div>'; # border container
 
-		print "</div>"; #pane
+        print "</div>"; #pane
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>extension</i> ".__('Plugins')."\">";
 
-		print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">";
+        print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">";
 
-		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
+        print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 		evt.preventDefault();
 		if (this.validate()) {
 			Notify.progress('Saving data...', true);
@@ -839,383 +839,383 @@ 
 		}
 		</script>";
 
-		print_hidden("op", "pref-prefs");
-		print_hidden("method", "setplugins");
+        print_hidden("op", "pref-prefs");
+        print_hidden("method", "setplugins");
 
-		print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
-		print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">';
+        print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
+        print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">';
 
-		if (ini_get("open_basedir") && function_exists("curl_init") && !defined("NO_CURL")) {
-			print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly.");
-		}
+        if (ini_get("open_basedir") && function_exists("curl_init") && !defined("NO_CURL")) {
+            print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly.");
+        }
 
-		$feed_handler_whitelist = [ "Af_Comics" ];
+        $feed_handler_whitelist = [ "Af_Comics" ];
 
-		$feed_handlers = array_merge(
-			PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED),
-			PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_PARSED),
-			PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FETCH_FEED));
+        $feed_handlers = array_merge(
+            PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED),
+            PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_PARSED),
+            PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FETCH_FEED));
 
-		$feed_handlers = array_filter($feed_handlers, function($plugin) use ($feed_handler_whitelist) {
-			return in_array(get_class($plugin), $feed_handler_whitelist) === false; });
+        $feed_handlers = array_filter($feed_handlers, function($plugin) use ($feed_handler_whitelist) {
+            return in_array(get_class($plugin), $feed_handler_whitelist) === false; });
 
-		if (count($feed_handlers) > 0) {
-			print_error(
-				T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>" ,
-					implode(", ", array_map(function($plugin) { return get_class($plugin); }, $feed_handlers))
-				) . " (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)"
-			);
-		}
+        if (count($feed_handlers) > 0) {
+            print_error(
+                T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>" ,
+                    implode(", ", array_map(function($plugin) { return get_class($plugin); }, $feed_handlers))
+                ) . " (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)"
+            );
+        }
 
-		print "<h2>".__("System plugins")."</h2>";
-		print_notice("System plugins are enabled in <strong>config.php</strong> for all users.");
+        print "<h2>".__("System plugins")."</h2>";
+        print_notice("System plugins are enabled in <strong>config.php</strong> for all users.");
 
-		$system_enabled = array_map("trim", explode(",", PLUGINS));
-		$user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
+        $system_enabled = array_map("trim", explode(",", PLUGINS));
+        $user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
 
-		$tmppluginhost = new PluginHost();
-		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true);
-		$tmppluginhost->load_data();
+        $tmppluginhost = new PluginHost();
+        $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true);
+        $tmppluginhost->load_data();
 
-		foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
-			$about = $plugin->about();
+        foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
+            $about = $plugin->about();
 
-			if ($about[3]) {
-				if (in_array($name, $system_enabled)) {
-					$checked = "checked='1'";
-				} else {
-					$checked = "";
-				}
+            if ($about[3]) {
+                if (in_array($name, $system_enabled)) {
+                    $checked = "checked='1'";
+                } else {
+                    $checked = "";
+                }
 
-				print "<fieldset class='prefs plugin'>
+                print "<fieldset class='prefs plugin'>
 					<label>$name:</label>
 					<label class='checkbox description text-muted' id='PLABEL-$name'>
 						<input disabled='1'
 							dojoType='dijit.form.CheckBox' $checked type='checkbox'>
 						".htmlspecialchars($about[1]). "</label>";
 
-					if (@$about[4]) {
-						print "<button dojoType='dijit.form.Button' class='alt-info'
+                    if (@$about[4]) {
+                        print "<button dojoType='dijit.form.Button' class='alt-info'
 							onclick='window.open(\"".htmlspecialchars($about[4])."\")'>
 								<i class='material-icons'>open_in_new</i> ".__("More info...")."</button>";
-					}
+                    }
 
-					print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>".
-						htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])).
-						"</div>";
+                    print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>".
+                        htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])).
+                        "</div>";
 
-				print "</fieldset>";
+                print "</fieldset>";
 
-			}
-		}
+            }
+        }
 
-		print "<h2>".__("User plugins")."</h2>";
+        print "<h2>".__("User plugins")."</h2>";
 
-		foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
-			$about = $plugin->about();
+        foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
+            $about = $plugin->about();
 
-			if (!$about[3]) {
+            if (!$about[3]) {
 
-				$checked = "";
-				$disabled = "";
+                $checked = "";
+                $disabled = "";
 
-				if (in_array($name, $system_enabled)) {
-					$checked = "checked='1'";
-					$disabled = "disabled='1'";
-				} else if (in_array($name, $user_enabled)) {
-					$checked = "checked='1'";
-				}
+                if (in_array($name, $system_enabled)) {
+                    $checked = "checked='1'";
+                    $disabled = "disabled='1'";
+                } else if (in_array($name, $user_enabled)) {
+                    $checked = "checked='1'";
+                }
 
-				print "<fieldset class='prefs plugin'>
+                print "<fieldset class='prefs plugin'>
 					<label>$name:</label>
 					<label class='checkbox description text-muted' id='PLABEL-$name'>
 						<input name='plugins[]' value='$name' dojoType='dijit.form.CheckBox' $checked $disabled type='checkbox'>
 						".htmlspecialchars($about[1])."</label>";
 
-				if (count($tmppluginhost->get_all($plugin)) > 0) {
-					if (in_array($name, $system_enabled) || in_array($name, $user_enabled)) {
-						print " <button dojoType='dijit.form.Button'
+                if (count($tmppluginhost->get_all($plugin)) > 0) {
+                    if (in_array($name, $system_enabled) || in_array($name, $user_enabled)) {
+                        print " <button dojoType='dijit.form.Button'
 							onclick=\"Helpers.clearPluginData('$name')\">
 								<i class='material-icons'>clear</i> ".__("Clear data")."</button>";
-					}
-				}
+                    }
+                }
 
-				if (@$about[4]) {
-					print " <button dojoType='dijit.form.Button' class='alt-info'
+                if (@$about[4]) {
+                    print " <button dojoType='dijit.form.Button' class='alt-info'
 							onclick='window.open(\"".htmlspecialchars($about[4])."\")'>
 								<i class='material-icons'>open_in_new</i> ".__("More info...")."</button>";
-				}
+                }
 
-				print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>".
-					htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])).
-					"</div>";
+                print "<div dojoType='dijit.Tooltip' connectId='PLABEL-$name' position='after'>".
+                    htmlspecialchars(T_sprintf("v%.2f, by %s", $about[0], $about[2])).
+                    "</div>";
 
-				print "</fieldset>";
-			}
-		}
+                print "</fieldset>";
+            }
+        }
 
-		print "</div>"; #content-pane
-		print '<div dojoType="dijit.layout.ContentPane" region="bottom">';
+        print "</div>"; #content-pane
+        print '<div dojoType="dijit.layout.ContentPane" region="bottom">';
 
-		print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/Plugins\")'>
+        print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/Plugins\")'>
 			<i class='material-icons'>help</i> ".__("More info...")."</button>";
 
-		print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit'>".
-			__("Enable selected plugins")."</button>";
-		print "</div>"; #pane
+        print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit'>".
+            __("Enable selected plugins")."</button>";
+        print "</div>"; #pane
 
-		print "</div>"; #pane
-		print "</div>"; #border-container
+        print "</div>"; #pane
+        print "</div>"; #border-container
 
-		print "</form>";
+        print "</form>";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-			"hook_prefs_tab", "prefPrefs");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+            "hook_prefs_tab", "prefPrefs");
 
-		print "</div>"; #container
+        print "</div>"; #container
 
-	}
+    }
 
-	public function toggleAdvanced() {
-		$_SESSION["prefs_show_advanced"] = !$_SESSION["prefs_show_advanced"];
-	}
+    public function toggleAdvanced() {
+        $_SESSION["prefs_show_advanced"] = !$_SESSION["prefs_show_advanced"];
+    }
 
-	public function otpsecret() {
-		$sth = $this->pdo->prepare("SELECT salt, otp_enabled
+    public function otpsecret() {
+        $sth = $this->pdo->prepare("SELECT salt, otp_enabled
 			FROM ttrss_users
 			WHERE id = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$otp_enabled = sql_bool_to_bool($row["otp_enabled"]);
+        if ($row = $sth->fetch()) {
+            $otp_enabled = sql_bool_to_bool($row["otp_enabled"]);
 
-			if (!$otp_enabled) {
-				$base32 = new \OTPHP\Base32();
-				$secret = $base32->encode(mb_substr(sha1($row["salt"]), 0, 12), false);
+            if (!$otp_enabled) {
+                $base32 = new \OTPHP\Base32();
+                $secret = $base32->encode(mb_substr(sha1($row["salt"]), 0, 12), false);
 
-				return $secret;
-			}
-		}
+                return $secret;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	public function otpqrcode() {
-		require_once "lib/phpqrcode/phpqrcode.php";
+    public function otpqrcode() {
+        require_once "lib/phpqrcode/phpqrcode.php";
 
-		$sth = $this->pdo->prepare("SELECT login
+        $sth = $this->pdo->prepare("SELECT login
 			FROM ttrss_users
 			WHERE id = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$secret = $this->otpsecret();
-			$login = $row['login'];
+        if ($row = $sth->fetch()) {
+            $secret = $this->otpsecret();
+            $login = $row['login'];
 
-			if ($secret) {
-				QRcode::png("otpauth://totp/".urlencode($login).
-					"?secret=$secret&issuer=".urlencode("Tiny Tiny RSS"));
-			}
-		}
-	}
+            if ($secret) {
+                QRcode::png("otpauth://totp/".urlencode($login).
+                    "?secret=$secret&issuer=".urlencode("Tiny Tiny RSS"));
+            }
+        }
+    }
 
-	public function otpenable() {
+    public function otpenable() {
 
-		$password = clean($_REQUEST["password"]);
-		$otp = clean($_REQUEST["otp"]);
+        $password = clean($_REQUEST["password"]);
+        $otp = clean($_REQUEST["otp"]);
 
-		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
+        $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
-		if ($authenticator->check_password($_SESSION["uid"], $password)) {
+        if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-			$secret = $this->otpsecret();
+            $secret = $this->otpsecret();
 
-			if ($secret) {
-				$topt = new \OTPHP\TOTP($secret);
-				$otp_check = $topt->now();
+            if ($secret) {
+                $topt = new \OTPHP\TOTP($secret);
+                $otp_check = $topt->now();
 
-				if ($otp == $otp_check) {
-					$sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = true WHERE id = ?");
+                if ($otp == $otp_check) {
+                    $sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = true WHERE id = ?");
 
-					$sth->execute([$_SESSION['uid']]);
+                    $sth->execute([$_SESSION['uid']]);
 
-					print "OK";
-				} else {
-					print "ERROR:".__("Incorrect one time password");
-				}
-			}
+                    print "OK";
+                } else {
+                    print "ERROR:".__("Incorrect one time password");
+                }
+            }
 
-		} else {
-			print "ERROR:".__("Incorrect password");
-		}
+        } else {
+            print "ERROR:".__("Incorrect password");
+        }
 
-	}
+    }
 
-	public static function isdefaultpassword() {
-		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
+    public static function isdefaultpassword() {
+        $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
-		if ($authenticator &&
+        if ($authenticator &&
                 method_exists($authenticator, "check_password") &&
                 $authenticator->check_password($_SESSION["uid"], "password")) {
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	public function otpdisable() {
-		$password = clean($_REQUEST["password"]);
+    public function otpdisable() {
+        $password = clean($_REQUEST["password"]);
 
-		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
+        $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
-		if ($authenticator->check_password($_SESSION["uid"], $password)) {
+        if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-			$sth = $this->pdo->prepare("SELECT email, login FROM ttrss_users WHERE id = ?");
-			$sth->execute([$_SESSION['uid']]);
+            $sth = $this->pdo->prepare("SELECT email, login FROM ttrss_users WHERE id = ?");
+            $sth->execute([$_SESSION['uid']]);
 
-			if ($row = $sth->fetch()) {
-				$mailer = new Mailer();
+            if ($row = $sth->fetch()) {
+                $mailer = new Mailer();
 
-				require_once "lib/MiniTemplator.class.php";
+                require_once "lib/MiniTemplator.class.php";
 
-				$tpl = new MiniTemplator;
+                $tpl = new MiniTemplator;
 
-				$tpl->readTemplateFromFile("templates/otp_disabled_template.txt");
+                $tpl->readTemplateFromFile("templates/otp_disabled_template.txt");
 
-				$tpl->setVariable('LOGIN', $row["login"]);
-				$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+                $tpl->setVariable('LOGIN', $row["login"]);
+                $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-				$tpl->addBlock('message');
+                $tpl->addBlock('message');
 
-				$tpl->generateOutputToString($message);
+                $tpl->generateOutputToString($message);
 
-				$mailer->mail(["to_name" => $row["login"],
-					"to_address" => $row["email"],
-					"subject" => "[tt-rss] OTP change notification",
-					"message" => $message]);
-			}
+                $mailer->mail(["to_name" => $row["login"],
+                    "to_address" => $row["email"],
+                    "subject" => "[tt-rss] OTP change notification",
+                    "message" => $message]);
+            }
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = false WHERE
+            $sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = false WHERE
 				id = ?");
-			$sth->execute([$_SESSION['uid']]);
+            $sth->execute([$_SESSION['uid']]);
 
-			print "OK";
-		} else {
-			print "ERROR: ".__("Incorrect password");
-		}
+            print "OK";
+        } else {
+            print "ERROR: ".__("Incorrect password");
+        }
 
-	}
+    }
 
-	public function setplugins() {
-		if (is_array(clean($_REQUEST["plugins"])))
-			$plugins = join(",", clean($_REQUEST["plugins"]));
-		else
-			$plugins = "";
+    public function setplugins() {
+        if (is_array(clean($_REQUEST["plugins"])))
+            $plugins = join(",", clean($_REQUEST["plugins"]));
+        else
+            $plugins = "";
 
-		set_pref("_ENABLED_PLUGINS", $plugins);
-	}
+        set_pref("_ENABLED_PLUGINS", $plugins);
+    }
 
-	public function clearplugindata() {
-		$name = clean($_REQUEST["name"]);
+    public function clearplugindata() {
+        $name = clean($_REQUEST["name"]);
 
-		PluginHost::getInstance()->clear_data(PluginHost::getInstance()->get_plugin($name));
-	}
+        PluginHost::getInstance()->clear_data(PluginHost::getInstance()->get_plugin($name));
+    }
 
-	public function customizeCSS() {
-		$value = get_pref("USER_STYLESHEET");
-		$value = str_replace("<br/>", "\n", $value);
+    public function customizeCSS() {
+        $value = get_pref("USER_STYLESHEET");
+        $value = str_replace("<br/>", "\n", $value);
 
-		print_notice(__("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here."));
+        print_notice(__("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here."));
 
-		print_hidden("op", "rpc");
-		print_hidden("method", "setpref");
-		print_hidden("key", "USER_STYLESHEET");
+        print_hidden("op", "rpc");
+        print_hidden("method", "setpref");
+        print_hidden("key", "USER_STYLESHEET");
 
-		print "<div id='css_edit_apply_msg' style='display : none'>";
-		print_warning(__("User CSS has been applied, you might need to reload the page to see all changes."));
-		print "</div>";
+        print "<div id='css_edit_apply_msg' style='display : none'>";
+        print_warning(__("User CSS has been applied, you might need to reload the page to see all changes."));
+        print "</div>";
 
-		print "<textarea class='panel user-css-editor' dojoType='dijit.form.SimpleTextarea'
+        print "<textarea class='panel user-css-editor' dojoType='dijit.form.SimpleTextarea'
 			style='font-size : 12px;' name='value'>$value</textarea>";
 
-		print "<footer>";
-		print "<button dojoType='dijit.form.Button' class='alt-success'
+        print "<footer>";
+        print "<button dojoType='dijit.form.Button' class='alt-success'
 			onclick=\"dijit.byId('cssEditDlg').apply()\">".__('Apply')."</button> ";
-		print "<button dojoType='dijit.form.Button' class='alt-primary'
+        print "<button dojoType='dijit.form.Button' class='alt-primary'
 			onclick=\"dijit.byId('cssEditDlg').execute()\">".__('Save and reload')."</button> ";
-		print "<button dojoType='dijit.form.Button'
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('cssEditDlg').hide()\">".__('Cancel')."</button>";
-		print "</footer>";
+        print "</footer>";
 
-	}
+    }
 
-	public function editPrefProfiles() {
-		print "<div dojoType='fox.Toolbar'>";
+    public function editPrefProfiles() {
+        print "<div dojoType='fox.Toolbar'>";
 
-		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
-		print "<div dojoType='dijit.Menu' style='display: none'>";
-		print "<div onclick=\"Tables.select('pref-profiles-list', true)\"
+        print "<div dojoType='fox.form.DropDownButton'>".
+                "<span>" . __('Select')."</span>";
+        print "<div dojoType='dijit.Menu' style='display: none'>";
+        print "<div onclick=\"Tables.select('pref-profiles-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
-		print "<div onclick=\"Tables.select('pref-profiles-list', false)\"
+        print "<div onclick=\"Tables.select('pref-profiles-list', false)\"
 			dojoType='dijit.MenuItem'>".__('None')."</div>";
-		print "</div></div>";
+        print "</div></div>";
 
-		print "<div style='float : right'>";
+        print "<div style='float : right'>";
 
-		print "<input name='newprofile' dojoType='dijit.form.ValidationTextBox'
+        print "<input name='newprofile' dojoType='dijit.form.ValidationTextBox'
 				required='1'>
 			<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('profileEditDlg').addProfile()\">".
-				__('Create profile')."</button></div>";
+                __('Create profile')."</button></div>";
 
-		print "</div>";
+        print "</div>";
 
-		$sth = $this->pdo->prepare("SELECT title,id FROM ttrss_settings_profiles
+        $sth = $this->pdo->prepare("SELECT title,id FROM ttrss_settings_profiles
 			WHERE owner_uid = ? ORDER BY title");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		print "<div class='panel panel-scrollable'>";
+        print "<div class='panel panel-scrollable'>";
 
-		print "<form id='profile_edit_form' onsubmit='return false'>";
+        print "<form id='profile_edit_form' onsubmit='return false'>";
 
-		print "<table width='100%' id='pref-profiles-list'>";
+        print "<table width='100%' id='pref-profiles-list'>";
 
-		print "<tr>"; # data-row-id='0' <-- no point, shouldn't be removed
+        print "<tr>"; # data-row-id='0' <-- no point, shouldn't be removed
 
-		print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
+        print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
 
-		if (!$_SESSION["profile"]) {
-			$is_active = __("(active)");
-		} else {
-			$is_active = "";
-		}
+        if (!$_SESSION["profile"]) {
+            $is_active = __("(active)");
+        } else {
+            $is_active = "";
+        }
 
-		print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>";
+        print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>";
 
-		print "</tr>";
+        print "</tr>";
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$profile_id = $line["id"];
+            $profile_id = $line["id"];
 
-			print "<tr data-row-id='$profile_id'>";
+            print "<tr data-row-id='$profile_id'>";
 
-			$edit_title = htmlspecialchars($line["title"]);
+            $edit_title = htmlspecialchars($line["title"]);
 
-			print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
+            print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
 
-			if ($_SESSION["profile"] == $line["id"]) {
-				$is_active = __("(active)");
-			} else {
-				$is_active = "";
-			}
+            if ($_SESSION["profile"] == $line["id"]) {
+                $is_active = __("(active)");
+            } else {
+                $is_active = "";
+            }
 
-			print "<td><span dojoType='dijit.InlineEditBox'
+            print "<td><span dojoType='dijit.InlineEditBox'
 				width='300px' autoSave='false'
 				profile-id='$profile_id'>" . $edit_title .
-				"<script type='dojo/method' event='onChange' args='item'>
+                "<script type='dojo/method' event='onChange' args='item'>
 					var elem = this;
 					dojo.xhrPost({
 						url: 'backend.php',
@@ -1229,118 +1229,118 @@ 
 				</script>
 			</span> $is_active</td>";
 
-			print "</tr>";
-		}
+            print "</tr>";
+        }
 
-		print "</table>";
-		print "</form>";
-		print "</div>";
+        print "</table>";
+        print "</form>";
+        print "</div>";
 
-		print "<footer>
+        print "<footer>
 			<button style='float : left' class='alt-danger' dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').removeSelected()\">".
-			__('Remove selected profiles')."</button>
+            __('Remove selected profiles')."</button>
 			<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick=\"dijit.byId('profileEditDlg').activateProfile()\">".
-			__('Activate profile')."</button>
+            __('Activate profile')."</button>
 			<button dojoType='dijit.form.Button' onclick=\"dijit.byId('profileEditDlg').hide()\">".
-			__('Cancel')."</button>";
-		print "</footer>";
-
-	}
-
-	private function getShortDesc($pref_name) {
-		if (isset($this->pref_help[$pref_name])) {
-			return $this->pref_help[$pref_name][0];
-		}
-		return "";
-	}
-
-	private function getHelpText($pref_name) {
-		if (isset($this->pref_help[$pref_name])) {
-			return $this->pref_help[$pref_name][1];
-		}
-		return "";
-	}
-
-	private function appPasswordList() {
-		print "<div dojoType='fox.Toolbar'>";
-		print "<div dojoType='fox.form.DropDownButton'>" .
-			"<span>" . __('Select') . "</span>";
-		print "<div dojoType='dijit.Menu' style='display: none'>";
-		print "<div onclick=\"Tables.select('app-password-list', true)\"
+            __('Cancel')."</button>";
+        print "</footer>";
+
+    }
+
+    private function getShortDesc($pref_name) {
+        if (isset($this->pref_help[$pref_name])) {
+            return $this->pref_help[$pref_name][0];
+        }
+        return "";
+    }
+
+    private function getHelpText($pref_name) {
+        if (isset($this->pref_help[$pref_name])) {
+            return $this->pref_help[$pref_name][1];
+        }
+        return "";
+    }
+
+    private function appPasswordList() {
+        print "<div dojoType='fox.Toolbar'>";
+        print "<div dojoType='fox.form.DropDownButton'>" .
+            "<span>" . __('Select') . "</span>";
+        print "<div dojoType='dijit.Menu' style='display: none'>";
+        print "<div onclick=\"Tables.select('app-password-list', true)\"
 				dojoType=\"dijit.MenuItem\">" . __('All') . "</div>";
-		print "<div onclick=\"Tables.select('app-password-list', false)\"
+        print "<div onclick=\"Tables.select('app-password-list', false)\"
 				dojoType=\"dijit.MenuItem\">" . __('None') . "</div>";
-		print "</div></div>";
-		print "</div>"; #toolbar
-
-		print "<div class='panel panel-scrollable'>";
-		print "<table width='100%' id='app-password-list'>";
-		print "<tr>";
-		print "<th width='2%'></th>";
-		print "<th align='left'>".__("Description")."</th>";
-		print "<th align='right'>".__("Created")."</th>";
-		print "<th align='right'>".__("Last used")."</th>";
-		print "</tr>";
-
-		$sth = $this->pdo->prepare("SELECT id, title, created, last_used
+        print "</div></div>";
+        print "</div>"; #toolbar
+
+        print "<div class='panel panel-scrollable'>";
+        print "<table width='100%' id='app-password-list'>";
+        print "<tr>";
+        print "<th width='2%'></th>";
+        print "<th align='left'>".__("Description")."</th>";
+        print "<th align='right'>".__("Created")."</th>";
+        print "<th align='right'>".__("Last used")."</th>";
+        print "</tr>";
+
+        $sth = $this->pdo->prepare("SELECT id, title, created, last_used
 			FROM ttrss_app_passwords WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($row = $sth->fetch()) {
+        while ($row = $sth->fetch()) {
 
-			$row_id = $row["id"];
+            $row_id = $row["id"];
 
-			print "<tr data-row-id='$row_id'>";
+            print "<tr data-row-id='$row_id'>";
 
-			print "<td align='center'>
+            print "<td align='center'>
 						<input onclick='Tables.onRowChecked(this)' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
-			print "<td>" . htmlspecialchars($row["title"]) . "</td>";
+            print "<td>" . htmlspecialchars($row["title"]) . "</td>";
 
-			print "<td align='right' class='text-muted'>";
-			print make_local_datetime($row['created'], false);
-			print "</td>";
+            print "<td align='right' class='text-muted'>";
+            print make_local_datetime($row['created'], false);
+            print "</td>";
 
-			print "<td align='right' class='text-muted'>";
-			print make_local_datetime($row['last_used'], false);
-			print "</td>";
+            print "<td align='right' class='text-muted'>";
+            print make_local_datetime($row['last_used'], false);
+            print "</td>";
 
-			print "</tr>";
-		}
+            print "</tr>";
+        }
 
-		print "</table>";
-		print "</div>";
-	}
+        print "</table>";
+        print "</div>";
+    }
 
-	private function encryptAppPassword($password) {
-		$salt = substr(bin2hex(get_random_bytes(24)), 0, 24);
+    private function encryptAppPassword($password) {
+        $salt = substr(bin2hex(get_random_bytes(24)), 0, 24);
 
-		return "SSHA-512:".hash('sha512', $salt . $password). ":$salt";
-	}
+        return "SSHA-512:".hash('sha512', $salt . $password). ":$salt";
+    }
 
-	public function deleteAppPassword() {
-		$ids = explode(",", clean($_REQUEST['ids']));
-		$ids_qmarks = arr_qmarks($ids);
+    public function deleteAppPassword() {
+        $ids = explode(",", clean($_REQUEST['ids']));
+        $ids_qmarks = arr_qmarks($ids);
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_app_passwords WHERE id IN ($ids_qmarks) AND owner_uid = ?");
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_app_passwords WHERE id IN ($ids_qmarks) AND owner_uid = ?");
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
-		$this->appPasswordList();
-	}
+        $this->appPasswordList();
+    }
 
-	public function generateAppPassword() {
-		$title = clean($_REQUEST['title']);
-		$new_password = make_password(16);
-		$new_password_hash = $this->encryptAppPassword($new_password);
+    public function generateAppPassword() {
+        $title = clean($_REQUEST['title']);
+        $new_password = make_password(16);
+        $new_password_hash = $this->encryptAppPassword($new_password);
 
-		print_warning(T_sprintf("Generated password <strong>%s</strong> for %s. Please remember it for future reference.", $new_password, $title));
+        print_warning(T_sprintf("Generated password <strong>%s</strong> for %s. Please remember it for future reference.", $new_password, $title));
 
-		$sth = $this->pdo->prepare("INSERT INTO ttrss_app_passwords
+        $sth = $this->pdo->prepare("INSERT INTO ttrss_app_passwords
     			(title, pwd_hash, service, created, owner_uid)
     		 VALUES
     		    (?, ?, ?, NOW(), ?)");
 
-		$sth->execute([$title, $new_password_hash, Auth_Base::AUTH_SERVICE_API, $_SESSION['uid']]);
+        $sth->execute([$title, $new_password_hash, Auth_Base::AUTH_SERVICE_API, $_SESSION['uid']]);
 
-		$this->appPasswordList();
-	}
+        $this->appPasswordList();
+    }
 }

classes/pref/feeds.php

Switch Indentation +60 added lines, -60 removed lines

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

Indentation +1153 added lines, -1153 removed lines

@@ -1,87 +1,87 @@ 
 <?php
 class Pref_Feeds extends Handler_Protected {
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("index", "getfeedtree", "add", "editcats", "editfeed",
-			"savefeedorder", "uploadicon", "feedswitherrors", "inactivefeeds",
-			"batchsubscribe");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("index", "getfeedtree", "add", "editcats", "editfeed",
+            "savefeedorder", "uploadicon", "feedswitherrors", "inactivefeeds",
+            "batchsubscribe");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public static function get_ts_languages() {
-		$rv = [];
+    public static function get_ts_languages() {
+        $rv = [];
 
-		if (DB_TYPE == "pgsql") {
-			$dbh = Db::pdo();
+        if (DB_TYPE == "pgsql") {
+            $dbh = Db::pdo();
 
-			$res = $dbh->query("SELECT cfgname FROM pg_ts_config");
+            $res = $dbh->query("SELECT cfgname FROM pg_ts_config");
 
-			while ($row = $res->fetch()) {
-				array_push($rv, ucfirst($row['cfgname']));
-			}
-		}
+            while ($row = $res->fetch()) {
+                array_push($rv, ucfirst($row['cfgname']));
+            }
+        }
 
-		return $rv;
-	}
+        return $rv;
+    }
 
-	public function batch_edit_cbox($elem, $label = false) {
-		print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\"
+    public function batch_edit_cbox($elem, $label = false) {
+        print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\"
 			onchange=\"dijit.byId('feedEditDlg').toggleField(this, '$elem', '$label')\">";
-	}
+    }
 
-	public function renamecat() {
-		$title = clean($_REQUEST['title']);
-		$id = clean($_REQUEST['id']);
+    public function renamecat() {
+        $title = clean($_REQUEST['title']);
+        $id = clean($_REQUEST['id']);
 
-		if ($title) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories SET
+        if ($title) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories SET
 				title = ? WHERE id = ? AND owner_uid = ?");
-			$sth->execute([$title, $id, $_SESSION['uid']]);
-		}
-	}
+            $sth->execute([$title, $id, $_SESSION['uid']]);
+        }
+    }
 
-	private function get_category_items($cat_id) {
+    private function get_category_items($cat_id) {
 
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
+        if (clean($_REQUEST['mode']) != 2)
+            $search = $_SESSION["prefs_feed_search"];
+        else
+            $search = "";
 
-		// first one is set by API
-		$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
-			(clean($_REQUEST['mode']) != 2 && !$search);
+        // first one is set by API
+        $show_empty_cats = clean($_REQUEST['force_show_empty']) ||
+            (clean($_REQUEST['mode']) != 2 && !$search);
 
-		$items = array();
+        $items = array();
 
-		$sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
+        $sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
 				WHERE owner_uid = ? AND parent_cat = ? ORDER BY order_id, title");
-		$sth->execute([$_SESSION['uid'], $cat_id]);
+        $sth->execute([$_SESSION['uid'], $cat_id]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$cat = array();
-			$cat['id'] = 'CAT:' . $line['id'];
-			$cat['bare_id'] = (int)$line['id'];
-			$cat['name'] = $line['title'];
-			$cat['items'] = array();
-			$cat['checkbox'] = false;
-			$cat['type'] = 'category';
-			$cat['unread'] = -1;
-			$cat['child_unread'] = -1;
-			$cat['auxcounter'] = -1;
-			$cat['parent_id'] = $cat_id;
+            $cat = array();
+            $cat['id'] = 'CAT:' . $line['id'];
+            $cat['bare_id'] = (int)$line['id'];
+            $cat['name'] = $line['title'];
+            $cat['items'] = array();
+            $cat['checkbox'] = false;
+            $cat['type'] = 'category';
+            $cat['unread'] = -1;
+            $cat['child_unread'] = -1;
+            $cat['auxcounter'] = -1;
+            $cat['parent_id'] = $cat_id;
 
-			$cat['items'] = $this->get_category_items($line['id']);
+            $cat['items'] = $this->get_category_items($line['id']);
 
-			$num_children = $this->calculate_children_count($cat);
-			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
+            $num_children = $this->calculate_children_count($cat);
+            $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
-			if ($num_children > 0 || $show_empty_cats)
-				array_push($items, $cat);
+            if ($num_children > 0 || $show_empty_cats)
+                array_push($items, $cat);
 
-		}
+        }
 
-		$fsth = $this->pdo->prepare("SELECT id, title, last_error,
+        $fsth = $this->pdo->prepare("SELECT id, title, last_error,
 			".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 			FROM ttrss_feeds
 			WHERE cat_id = :cat AND
@@ -89,679 +89,679 @@ 
 			(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
 			ORDER BY order_id, title");
 
-		$fsth->execute([":cat" => $cat_id, ":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-		while ($feed_line = $fsth->fetch()) {
-			$feed = array();
-			$feed['id'] = 'FEED:' . $feed_line['id'];
-			$feed['bare_id'] = (int)$feed_line['id'];
-			$feed['auxcounter'] = -1;
-			$feed['name'] = $feed_line['title'];
-			$feed['checkbox'] = false;
-			$feed['unread'] = -1;
-			$feed['error'] = $feed_line['last_error'];
-			$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);
-
-			array_push($items, $feed);
-		}
-
-		return $items;
-	}
-
-	public function getfeedtree() {
-		print json_encode($this->makefeedtree());
-	}
-
-	public function makefeedtree() {
-
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
-
-		$root = array();
-		$root['id'] = 'root';
-		$root['name'] = __('Feeds');
-		$root['items'] = array();
-		$root['type'] = 'category';
-
-		$enable_cats = get_pref('ENABLE_FEED_CATS');
-
-		if (clean($_REQUEST['mode']) == 2) {
-
-			if ($enable_cats) {
-				$cat = $this->feedlist_init_cat(-1);
-			} else {
-				$cat['items'] = array();
-			}
-
-			foreach (array(-4, -3, -1, -2, 0, -6) as $i) {
-				array_push($cat['items'], $this->feedlist_init_feed($i));
-			}
-
-			/* Plugin feeds for -1 */
-
-			$feeds = PluginHost::getInstance()->get_feeds(-1);
-
-			if ($feeds) {
-				foreach ($feeds as $feed) {
-					$feed_id = PluginHost::pfeed_to_feed_id($feed['id']);
-
-					$item = array();
-					$item['id'] = 'FEED:' . $feed_id;
-					$item['bare_id'] = (int)$feed_id;
-					$item['auxcounter'] = -1;
-					$item['name'] = $feed['title'];
-					$item['checkbox'] = false;
-					$item['error'] = '';
-					$item['icon'] = $feed['icon'];
-
-					$item['param'] = '';
-					$item['unread'] = -1;
-					$item['type'] = 'feed';
-
-					array_push($cat['items'], $item);
-				}
-			}
-
-			if ($enable_cats) {
-				array_push($root['items'], $cat);
-			} else {
-				$root['items'] = array_merge($root['items'], $cat['items']);
-			}
-
-			$sth = $this->pdo->prepare("SELECT * FROM
+        $fsth->execute([":cat" => $cat_id, ":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
+
+        while ($feed_line = $fsth->fetch()) {
+            $feed = array();
+            $feed['id'] = 'FEED:' . $feed_line['id'];
+            $feed['bare_id'] = (int)$feed_line['id'];
+            $feed['auxcounter'] = -1;
+            $feed['name'] = $feed_line['title'];
+            $feed['checkbox'] = false;
+            $feed['unread'] = -1;
+            $feed['error'] = $feed_line['last_error'];
+            $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);
+
+            array_push($items, $feed);
+        }
+
+        return $items;
+    }
+
+    public function getfeedtree() {
+        print json_encode($this->makefeedtree());
+    }
+
+    public function makefeedtree() {
+
+        if (clean($_REQUEST['mode']) != 2)
+            $search = $_SESSION["prefs_feed_search"];
+        else
+            $search = "";
+
+        $root = array();
+        $root['id'] = 'root';
+        $root['name'] = __('Feeds');
+        $root['items'] = array();
+        $root['type'] = 'category';
+
+        $enable_cats = get_pref('ENABLE_FEED_CATS');
+
+        if (clean($_REQUEST['mode']) == 2) {
+
+            if ($enable_cats) {
+                $cat = $this->feedlist_init_cat(-1);
+            } else {
+                $cat['items'] = array();
+            }
+
+            foreach (array(-4, -3, -1, -2, 0, -6) as $i) {
+                array_push($cat['items'], $this->feedlist_init_feed($i));
+            }
+
+            /* Plugin feeds for -1 */
+
+            $feeds = PluginHost::getInstance()->get_feeds(-1);
+
+            if ($feeds) {
+                foreach ($feeds as $feed) {
+                    $feed_id = PluginHost::pfeed_to_feed_id($feed['id']);
+
+                    $item = array();
+                    $item['id'] = 'FEED:' . $feed_id;
+                    $item['bare_id'] = (int)$feed_id;
+                    $item['auxcounter'] = -1;
+                    $item['name'] = $feed['title'];
+                    $item['checkbox'] = false;
+                    $item['error'] = '';
+                    $item['icon'] = $feed['icon'];
+
+                    $item['param'] = '';
+                    $item['unread'] = -1;
+                    $item['type'] = 'feed';
+
+                    array_push($cat['items'], $item);
+                }
+            }
+
+            if ($enable_cats) {
+                array_push($root['items'], $cat);
+            } else {
+                $root['items'] = array_merge($root['items'], $cat['items']);
+            }
+
+            $sth = $this->pdo->prepare("SELECT * FROM
 				ttrss_labels2 WHERE owner_uid = ? ORDER by caption");
-			$sth->execute([$_SESSION['uid']]);
+            $sth->execute([$_SESSION['uid']]);
 
-			if (get_pref('ENABLE_FEED_CATS')) {
-				$cat = $this->feedlist_init_cat(-2);
-			} else {
-				$cat['items'] = array();
-			}
+            if (get_pref('ENABLE_FEED_CATS')) {
+                $cat = $this->feedlist_init_cat(-2);
+            } else {
+                $cat['items'] = array();
+            }
 
-			$num_labels = 0;
-			while ($line = $sth->fetch()) {
-				++$num_labels;
+            $num_labels = 0;
+            while ($line = $sth->fetch()) {
+                ++$num_labels;
 
-				$label_id = Labels::label_to_feed_id($line['id']);
+                $label_id = Labels::label_to_feed_id($line['id']);
 
-				$feed = $this->feedlist_init_feed($label_id, false, 0);
+                $feed = $this->feedlist_init_feed($label_id, false, 0);
 
-				$feed['fg_color'] = $line['fg_color'];
-				$feed['bg_color'] = $line['bg_color'];
+                $feed['fg_color'] = $line['fg_color'];
+                $feed['bg_color'] = $line['bg_color'];
 
-				array_push($cat['items'], $feed);
-			}
+                array_push($cat['items'], $feed);
+            }
 
-			if ($num_labels) {
-				if ($enable_cats) {
-					array_push($root['items'], $cat);
-				} else {
-					$root['items'] = array_merge($root['items'], $cat['items']);
-				}
-			}
-		}
+            if ($num_labels) {
+                if ($enable_cats) {
+                    array_push($root['items'], $cat);
+                } else {
+                    $root['items'] = array_merge($root['items'], $cat['items']);
+                }
+            }
+        }
 
-		if ($enable_cats) {
-			$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
-				(clean($_REQUEST['mode']) != 2 && !$search);
+        if ($enable_cats) {
+            $show_empty_cats = clean($_REQUEST['force_show_empty']) ||
+                (clean($_REQUEST['mode']) != 2 && !$search);
 
-			$sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
+            $sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
 				WHERE owner_uid = ? AND parent_cat IS NULL ORDER BY order_id, title");
-			$sth->execute([$_SESSION['uid']]);
-
-			while ($line = $sth->fetch()) {
-				$cat = array();
-				$cat['id'] = 'CAT:' . $line['id'];
-				$cat['bare_id'] = (int)$line['id'];
-				$cat['auxcounter'] = -1;
-				$cat['name'] = $line['title'];
-				$cat['items'] = array();
-				$cat['checkbox'] = false;
-				$cat['type'] = 'category';
-				$cat['unread'] = -1;
-				$cat['child_unread'] = -1;
-
-				$cat['items'] = $this->get_category_items($line['id']);
-
-				$num_children = $this->calculate_children_count($cat);
-				$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
-
-				if ($num_children > 0 || $show_empty_cats)
-					array_push($root['items'], $cat);
-
-				$root['param'] += count($cat['items']);
-			}
-
-			/* Uncategorized is a special case */
-
-			$cat = array();
-			$cat['id'] = 'CAT:0';
-			$cat['bare_id'] = 0;
-			$cat['auxcounter'] = -1;
-			$cat['name'] = __("Uncategorized");
-			$cat['items'] = array();
-			$cat['type'] = 'category';
-			$cat['checkbox'] = false;
-			$cat['unread'] = -1;
-			$cat['child_unread'] = -1;
-
-			$fsth = $this->pdo->prepare("SELECT id, title,last_error,
+            $sth->execute([$_SESSION['uid']]);
+
+            while ($line = $sth->fetch()) {
+                $cat = array();
+                $cat['id'] = 'CAT:' . $line['id'];
+                $cat['bare_id'] = (int)$line['id'];
+                $cat['auxcounter'] = -1;
+                $cat['name'] = $line['title'];
+                $cat['items'] = array();
+                $cat['checkbox'] = false;
+                $cat['type'] = 'category';
+                $cat['unread'] = -1;
+                $cat['child_unread'] = -1;
+
+                $cat['items'] = $this->get_category_items($line['id']);
+
+                $num_children = $this->calculate_children_count($cat);
+                $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
+
+                if ($num_children > 0 || $show_empty_cats)
+                    array_push($root['items'], $cat);
+
+                $root['param'] += count($cat['items']);
+            }
+
+            /* Uncategorized is a special case */
+
+            $cat = array();
+            $cat['id'] = 'CAT:0';
+            $cat['bare_id'] = 0;
+            $cat['auxcounter'] = -1;
+            $cat['name'] = __("Uncategorized");
+            $cat['items'] = array();
+            $cat['type'] = 'category';
+            $cat['checkbox'] = false;
+            $cat['unread'] = -1;
+            $cat['child_unread'] = -1;
+
+            $fsth = $this->pdo->prepare("SELECT id, title,last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 				FROM ttrss_feeds
 				WHERE cat_id IS NULL AND
 				owner_uid = :uid AND
 				(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
 				ORDER BY order_id, title");
-			$fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-			while ($feed_line = $fsth->fetch()) {
-				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
-				$feed['auxcounter'] = -1;
-				$feed['name'] = $feed_line['title'];
-				$feed['checkbox'] = false;
-				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
-				$feed['param'] = make_local_datetime(
-					$feed_line['last_updated'], true);
-				$feed['unread'] = -1;
-				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
-
-				array_push($cat['items'], $feed);
-			}
-
-			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
-
-			if (count($cat['items']) > 0 || $show_empty_cats)
-				array_push($root['items'], $cat);
-
-			$num_children = $this->calculate_children_count($root);
-			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
-
-		} else {
-			$fsth = $this->pdo->prepare("SELECT id, title, last_error,
+            $fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
+
+            while ($feed_line = $fsth->fetch()) {
+                $feed = array();
+                $feed['id'] = 'FEED:' . $feed_line['id'];
+                $feed['bare_id'] = (int)$feed_line['id'];
+                $feed['auxcounter'] = -1;
+                $feed['name'] = $feed_line['title'];
+                $feed['checkbox'] = false;
+                $feed['error'] = $feed_line['last_error'];
+                $feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
+                $feed['param'] = make_local_datetime(
+                    $feed_line['last_updated'], true);
+                $feed['unread'] = -1;
+                $feed['type'] = 'feed';
+                $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+
+                array_push($cat['items'], $feed);
+            }
+
+            $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
+
+            if (count($cat['items']) > 0 || $show_empty_cats)
+                array_push($root['items'], $cat);
+
+            $num_children = $this->calculate_children_count($root);
+            $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
+
+        } else {
+            $fsth = $this->pdo->prepare("SELECT id, title, last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 				FROM ttrss_feeds
 				WHERE owner_uid = :uid AND
 				(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
 				ORDER BY order_id, title");
-			$fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
-
-			while ($feed_line = $fsth->fetch()) {
-				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
-				$feed['auxcounter'] = -1;
-				$feed['name'] = $feed_line['title'];
-				$feed['checkbox'] = false;
-				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
-				$feed['param'] = make_local_datetime(
-					$feed_line['last_updated'], true);
-				$feed['unread'] = -1;
-				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
-
-				array_push($root['items'], $feed);
-			}
-
-			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items']));
-		}
-
-		$fl = array();
-		$fl['identifier'] = 'id';
-		$fl['label'] = 'name';
-
-		if (clean($_REQUEST['mode']) != 2) {
-			$fl['items'] = array($root);
-		} else {
-			$fl['items'] = $root['items'];
-		}
-
-		return $fl;
-	}
-
-	public function catsortreset() {
-		$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+            $fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
+
+            while ($feed_line = $fsth->fetch()) {
+                $feed = array();
+                $feed['id'] = 'FEED:' . $feed_line['id'];
+                $feed['bare_id'] = (int)$feed_line['id'];
+                $feed['auxcounter'] = -1;
+                $feed['name'] = $feed_line['title'];
+                $feed['checkbox'] = false;
+                $feed['error'] = $feed_line['last_error'];
+                $feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
+                $feed['param'] = make_local_datetime(
+                    $feed_line['last_updated'], true);
+                $feed['unread'] = -1;
+                $feed['type'] = 'feed';
+                $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+
+                array_push($root['items'], $feed);
+            }
+
+            $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($root['items'])), count($root['items']));
+        }
+
+        $fl = array();
+        $fl['identifier'] = 'id';
+        $fl['label'] = 'name';
+
+        if (clean($_REQUEST['mode']) != 2) {
+            $fl['items'] = array($root);
+        } else {
+            $fl['items'] = $root['items'];
+        }
+
+        return $fl;
+    }
+
+    public function catsortreset() {
+        $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 				SET order_id = 0 WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-	}
+        $sth->execute([$_SESSION['uid']]);
+    }
 
-	public function feedsortreset() {
-		$sth = $this->pdo->prepare("UPDATE ttrss_feeds
+    public function feedsortreset() {
+        $sth = $this->pdo->prepare("UPDATE ttrss_feeds
 				SET order_id = 0 WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-	}
+        $sth->execute([$_SESSION['uid']]);
+    }
 
-	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
+    private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
 
-		$prefix = "";
-		for ($i = 0; $i < $nest_level; $i++)
-			$prefix .= "   ";
+        $prefix = "";
+        for ($i = 0; $i < $nest_level; $i++)
+            $prefix .= "   ";
 
-		Debug::log("$prefix C: $item_id P: $parent_id");
+        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_qpart = $parent_bare_id;
-			} else {
-				$parent_qpart = null;
-			}
+        if ($item_id != 'root') {
+            if ($parent_id && $parent_id != 'root') {
+                $parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
+                $parent_qpart = $parent_bare_id;
+            } else {
+                $parent_qpart = null;
+            }
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+            $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 				SET parent_cat = ? WHERE id = ? AND
 				owner_uid = ?");
-			$sth->execute([$parent_qpart, $bare_item_id, $_SESSION['uid']]);
-		}
+            $sth->execute([$parent_qpart, $bare_item_id, $_SESSION['uid']]);
+        }
 
-		$order_id = 1;
+        $order_id = 1;
 
-		$cat = $data_map[$item_id];
+        $cat = $data_map[$item_id];
 
-		if ($cat && is_array($cat)) {
-			foreach ($cat as $item) {
-				$id = $item['_reference'];
-				$bare_id = substr($id, strpos($id, ':')+1);
+        if ($cat && is_array($cat)) {
+            foreach ($cat as $item) {
+                $id = $item['_reference'];
+                $bare_id = substr($id, strpos($id, ':')+1);
 
-				Debug::log("$prefix [$order_id] $id/$bare_id");
+                Debug::log("$prefix [$order_id] $id/$bare_id");
 
-				if ($item['_reference']) {
+                if ($item['_reference']) {
 
-					if (strpos($id, "FEED") === 0) {
+                    if (strpos($id, "FEED") === 0) {
 
-						$cat_id = ($item_id != "root") ? $bare_item_id : null;
+                        $cat_id = ($item_id != "root") ? $bare_item_id : null;
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_feeds
+                        $sth = $this->pdo->prepare("UPDATE ttrss_feeds
 							SET order_id = ?, cat_id = ?
 							WHERE id = ? AND owner_uid = ?");
 
-						$sth->execute([$order_id, $cat_id ? $cat_id : null, $bare_id, $_SESSION['uid']]);
+                        $sth->execute([$order_id, $cat_id ? $cat_id : null, $bare_id, $_SESSION['uid']]);
 
-					} else if (strpos($id, "CAT:") === 0) {
-						$this->process_category_order($data_map, $item['_reference'], $item_id,
-							$nest_level+1);
+                    } else if (strpos($id, "CAT:") === 0) {
+                        $this->process_category_order($data_map, $item['_reference'], $item_id,
+                            $nest_level+1);
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+                        $sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 								SET order_id = ? WHERE id = ? AND
 								owner_uid = ?");
-						$sth->execute([$order_id, $bare_id, $_SESSION['uid']]);
-					}
-				}
+                        $sth->execute([$order_id, $bare_id, $_SESSION['uid']]);
+                    }
+                }
 
-				++$order_id;
-			}
-		}
-	}
+                ++$order_id;
+            }
+        }
+    }
 
-	public function savefeedorder() {
-		$data = json_decode($_POST['payload'], true);
+    public function savefeedorder() {
+        $data = json_decode($_POST['payload'], true);
 
-		#file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
-		#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
+        #file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
+        #$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
 
-		if (!is_array($data['items']))
-			$data['items'] = json_decode($data['items'], true);
+        if (!is_array($data['items']))
+            $data['items'] = json_decode($data['items'], true);
 
 #		print_r($data['items']);
 
-		if (is_array($data) && is_array($data['items'])) {
+        if (is_array($data) && is_array($data['items'])) {
 #			$cat_order_id = 0;
 
-			$data_map = array();
-			$root_item = false;
+            $data_map = array();
+            $root_item = false;
 
-			foreach ($data['items'] as $item) {
+            foreach ($data['items'] as $item) {
 
 #				if ($item['id'] != 'root') {
-					if (is_array($item['items'])) {
-						if (isset($item['items']['_reference'])) {
-							$data_map[$item['id']] = array($item['items']);
-						} else {
-							$data_map[$item['id']] = $item['items'];
-						}
-					}
-				if ($item['id'] == 'root') {
-					$root_item = $item['id'];
-				}
-			}
-
-			$this->process_category_order($data_map, $root_item);
-		}
-	}
-
-	public function removeicon() {
-		$feed_id = clean($_REQUEST["feed_id"]);
-
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
-		$sth->execute([$feed_id, $_SESSION['uid']]);
-
-		if ($sth->fetch()) {
-			@unlink(ICONS_DIR . "/$feed_id.ico");
-
-			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?");
-			$sth->execute([$feed_id]);
-		}
-	}
-
-	public function uploadicon() {
-		header("Content-type: text/html");
-
-		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
-
-			$result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
-				$tmp_file);
-
-			if (!$result) {
-				return;
-			}
-		} else {
-			return;
-		}
+                    if (is_array($item['items'])) {
+                        if (isset($item['items']['_reference'])) {
+                            $data_map[$item['id']] = array($item['items']);
+                        } else {
+                            $data_map[$item['id']] = $item['items'];
+                        }
+                    }
+                if ($item['id'] == 'root') {
+                    $root_item = $item['id'];
+                }
+            }
+
+            $this->process_category_order($data_map, $root_item);
+        }
+    }
+
+    public function removeicon() {
+        $feed_id = clean($_REQUEST["feed_id"]);
+
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
+        $sth->execute([$feed_id, $_SESSION['uid']]);
+
+        if ($sth->fetch()) {
+            @unlink(ICONS_DIR . "/$feed_id.ico");
+
+            $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL where id = ?");
+            $sth->execute([$feed_id]);
+        }
+    }
+
+    public function uploadicon() {
+        header("Content-type: text/html");
+
+        if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
+            $tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
+
+            $result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
+                $tmp_file);
+
+            if (!$result) {
+                return;
+            }
+        } else {
+            return;
+        }
 
-		$icon_file = $tmp_file;
-		$feed_id = clean($_REQUEST["feed_id"]);
-		$rc = 2; // failed
+        $icon_file = $tmp_file;
+        $feed_id = clean($_REQUEST["feed_id"]);
+        $rc = 2; // failed
 
-		if (is_file($icon_file) && $feed_id) {
-			if (filesize($icon_file) < 65535) {
+        if (is_file($icon_file) && $feed_id) {
+            if (filesize($icon_file) < 65535) {
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$feed_id, $_SESSION['uid']]);
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
+                $sth->execute([$feed_id, $_SESSION['uid']]);
 
-				if ($sth->fetch()) {
-					@unlink(ICONS_DIR . "/$feed_id.ico");
-					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
+                if ($sth->fetch()) {
+                    @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]);
+                        $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = '' WHERE id = ?");
+                        $sth->execute([$feed_id]);
 
-						$rc = 0;
-					}
-				}
-			} else {
-				$rc = 1;
-			}
-		}
+                        $rc = 0;
+                    }
+                }
+            } else {
+                $rc = 1;
+            }
+        }
 
-		if (is_file($icon_file)) @unlink($icon_file);
+        if (is_file($icon_file)) @unlink($icon_file);
 
-		print $rc;
-		return;
-	}
+        print $rc;
+        return;
+    }
 
-	public function editfeed() {
-		global $purge_intervals;
-		global $update_intervals;
+    public function editfeed() {
+        global $purge_intervals;
+        global $update_intervals;
 
 
-		$feed_id = clean($_REQUEST["id"]);
+        $feed_id = clean($_REQUEST["id"]);
 
-		$sth = $this->pdo->prepare("SELECT * FROM ttrss_feeds WHERE id = ? AND
+        $sth = $this->pdo->prepare("SELECT * FROM ttrss_feeds WHERE id = ? AND
 				owner_uid = ?");
-		$sth->execute([$feed_id, $_SESSION['uid']]);
+        $sth->execute([$feed_id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
+        if ($row = $sth->fetch()) {
+            print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
         		<div dojoType="dijit.layout.ContentPane" title="'.__('General').'">';
 
-			$title = htmlspecialchars($row["title"]);
+            $title = htmlspecialchars($row["title"]);
 
-			print_hidden("id", "$feed_id");
-			print_hidden("op", "pref-feeds");
-			print_hidden("method", "editSave");
+            print_hidden("id", "$feed_id");
+            print_hidden("op", "pref-feeds");
+            print_hidden("method", "editSave");
 
-			print "<header>".__("Feed")."</header>";
-			print "<section>";
+            print "<header>".__("Feed")."</header>";
+            print "<section>";
 
-			/* Title */
+            /* Title */
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
+            print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed Title")."\"
 				style='font-size : 16px; width: 500px' name='title' value=\"$title\">";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* Feed URL */
+            /* Feed URL */
 
-			$feed_url = htmlspecialchars($row["feed_url"]);
+            $feed_url = htmlspecialchars($row["feed_url"]);
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>" . __('URL:') . "</label> ";
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
+            print "<label>" . __('URL:') . "</label> ";
+            print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
 				name='feed_url' value=\"$feed_url\">";
 
-			$last_error = $row["last_error"];
+            $last_error = $row["last_error"];
 
-			if ($last_error) {
-				print "&nbsp;<i class=\"material-icons\"
+            if ($last_error) {
+                print "&nbsp;<i class=\"material-icons\"
 					title=\"".htmlspecialchars($last_error)."\">error</i>";
-			}
+            }
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* Category */
+            /* Category */
 
-			if (get_pref('ENABLE_FEED_CATS')) {
+            if (get_pref('ENABLE_FEED_CATS')) {
 
-				$cat_id = $row["cat_id"];
+                $cat_id = $row["cat_id"];
 
-				print "<fieldset>";
+                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"');
+                print_feed_cat_select("cat_id", $cat_id,
+                    'dojoType="fox.form.Select"');
 
-				print "</fieldset>";
-			}
+                print "</fieldset>";
+            }
 
-			/* Site URL  */
+            /* Site URL  */
 
-			$site_url = htmlspecialchars($row["site_url"]);
+            $site_url = htmlspecialchars($row["site_url"]);
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>" . __('Site URL:') . "</label> ";
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
+            print "<label>" . __('Site URL:') . "</label> ";
+            print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Site URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
 				name='site_url' value=\"$site_url\">";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* FTS Stemming Language */
+            /* FTS Stemming Language */
 
-			if (DB_TYPE == "pgsql") {
-				$feed_language = $row["feed_language"];
+            if (DB_TYPE == "pgsql") {
+                $feed_language = $row["feed_language"];
 
-				if (!$feed_language)
-					$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
+                if (!$feed_language)
+                    $feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
 
-				print "<fieldset>";
+                print "<fieldset>";
 
-				print "<label>" . __('Language:') . "</label> ";
-				print_select("feed_language", $feed_language, $this::get_ts_languages(),
-					'dojoType="fox.form.Select"');
+                print "<label>" . __('Language:') . "</label> ";
+                print_select("feed_language", $feed_language, $this::get_ts_languages(),
+                    'dojoType="fox.form.Select"');
 
-				print "</fieldset>";
-			}
+                print "</fieldset>";
+            }
 
-			print "</section>";
+            print "</section>";
 
-			print "<header>".__("Update")."</header>";
-			print "<section>";
+            print "<header>".__("Update")."</header>";
+            print "<section>";
 
-			/* Update Interval */
+            /* Update Interval */
 
-			$update_interval = $row["update_interval"];
+            $update_interval = $row["update_interval"];
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<label>".__("Interval:")."</label> ";
+            print "<label>".__("Interval:")."</label> ";
 
-			print_select_hash("update_interval", $update_interval, $update_intervals,
-				'dojoType="fox.form.Select"');
+            print_select_hash("update_interval", $update_interval, $update_intervals,
+                'dojoType="fox.form.Select"');
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			/* Purge intl */
+            /* Purge intl */
 
-			$purge_interval = $row["purge_interval"];
+            $purge_interval = $row["purge_interval"];
 
-			print "<fieldset>";
+            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" ' .
-				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
+            print_select_hash("purge_interval", $purge_interval, $purge_intervals,
+                'dojoType="fox.form.Select" ' .
+                ((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			print "</section>";
+            print "</section>";
 
-			$auth_login = htmlspecialchars($row["auth_login"]);
-			$auth_pass = htmlspecialchars($row["auth_pass"]);
+            $auth_login = htmlspecialchars($row["auth_login"]);
+            $auth_pass = htmlspecialchars($row["auth_pass"]);
 
-			$auth_enabled = $auth_login !== '' || $auth_pass !== '';
+            $auth_enabled = $auth_login !== '' || $auth_pass !== '';
 
-			$auth_style = $auth_enabled ? '' : 'display: none';
-			print "<div id='feedEditDlg_loginContainer' style='$auth_style'>";
-			print "<header>".__("Authentication")."</header>";
-			print "<section>";
+            $auth_style = $auth_enabled ? '' : 'display: none';
+            print "<div id='feedEditDlg_loginContainer' style='$auth_style'>";
+            print "<header>".__("Authentication")."</header>";
+            print "<section>";
 
-			print "<fieldset>";
+            print "<fieldset>";
 
-			print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login'
+            print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login'
 				placeHolder='".__("Login")."'
 				autocomplete='new-password'
 				name='auth_login' value=\"$auth_login\">";
 
-			print "</fieldset><fieldset>";
+            print "</fieldset><fieldset>";
 
-			print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
+            print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
 				autocomplete='new-password'
 				placeHolder='".__("Password")."'
 				value=\"$auth_pass\">";
 
-			print "<div dojoType='dijit.Tooltip' connectId='feedEditDlg_login' position='below'>
+            print "<div dojoType='dijit.Tooltip' connectId='feedEditDlg_login' position='below'>
 				".__('<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')."
 				</div>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			print "</section></div>";
+            print "</section></div>";
 
-			$auth_checked = $auth_enabled ? 'checked' : '';
-			print "<label class='checkbox'>
+            $auth_checked = $auth_enabled ? 'checked' : '';
+            print "<label class='checkbox'>
 				<input type='checkbox' $auth_checked name='need_auth' dojoType='dijit.form.CheckBox' id='feedEditDlg_loginCheck'
 						onclick='displayIfChecked(this, \"feedEditDlg_loginContainer\")'>
 					".__('This feed requires authentication.')."</label>";
 
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">';
+            print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">';
 
-			print "<section class='narrow'>";
+            print "<section class='narrow'>";
 
-			$include_in_digest = $row["include_in_digest"];
+            $include_in_digest = $row["include_in_digest"];
 
-			if ($include_in_digest) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
+            if ($include_in_digest) {
+                $checked = "checked=\"1\"";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
+            print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
 				name=\"include_in_digest\"
 				$checked> ".__('Include in e-mail digest')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$always_display_enclosures = $row["always_display_enclosures"];
+            $always_display_enclosures = $row["always_display_enclosures"];
 
-			if ($always_display_enclosures) {
-				$checked = "checked";
-			} else {
-				$checked = "";
-			}
+            if ($always_display_enclosures) {
+                $checked = "checked";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
+            print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
 				name=\"always_display_enclosures\"
 				$checked> ".__('Always display image attachments')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$hide_images = $row["hide_images"];
+            $hide_images = $row["hide_images"];
 
-			if ($hide_images) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
+            if ($hide_images) {
+                $checked = "checked=\"1\"";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images'
+            print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images'
 				name='hide_images' $checked> ".__('Do not embed media')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$cache_images = $row["cache_images"];
+            $cache_images = $row["cache_images"];
 
-			if ($cache_images) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
+            if ($cache_images) {
+                $checked = "checked=\"1\"";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
+            print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
 				name='cache_images' $checked> ". __('Cache media')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			$mark_unread_on_update = $row["mark_unread_on_update"];
+            $mark_unread_on_update = $row["mark_unread_on_update"];
 
-			if ($mark_unread_on_update) {
-				$checked = "checked";
-			} else {
-				$checked = "";
-			}
+            if ($mark_unread_on_update) {
+                $checked = "checked";
+            } else {
+                $checked = "";
+            }
 
-			print "<fieldset class='narrow'>";
+            print "<fieldset class='narrow'>";
 
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update'
+            print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update'
 				name='mark_unread_on_update' $checked> ".__('Mark updated articles as unread')."</label>";
 
-			print "</fieldset>";
+            print "</fieldset>";
 
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">';
+            print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">';
 
-			/* Icon */
+            /* Icon */
 
-			print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::getFeedIcon($feed_id)."\">";
+            print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::getFeedIcon($feed_id)."\">";
 
-			print "<form onsubmit='return false;' id='feed_icon_upload_form'
+            print "<form onsubmit='return false;' id='feed_icon_upload_form'
 				enctype='multipart/form-data' method='POST'>
 			<label class='dijitButton'>".__("Choose file...")."
 				<input style='display: none' id='icon_file' size='10' name='icon_file' type='file'>
@@ -775,231 +775,231 @@ 
 				type='submit'>".__('Remove')."</button>
 			</form>";
 
-			print "</section>";
+            print "</section>";
 
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">';
+            print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">';
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
-				"hook_prefs_edit_feed", $feed_id);
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
+                "hook_prefs_edit_feed", $feed_id);
 
-			print "</div></div>";
+            print "</div></div>";
 
-			$title = htmlspecialchars($title, ENT_QUOTES);
+            $title = htmlspecialchars($title, ENT_QUOTES);
 
-			print "<footer>
+            print "<footer>
 				<button style='float : left' class='alt-danger' dojoType='dijit.form.Button' onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
-					__('Unsubscribe')."</button>
+                    __('Unsubscribe')."</button>
 				<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return dijit.byId('feedEditDlg').execute()\">".__('Save')."</button>
 				<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button>
 				</footer>";
-		}
-	}
+        }
+    }
 
-	public function editfeeds() {
-		global $purge_intervals;
-		global $update_intervals;
+    public function editfeeds() {
+        global $purge_intervals;
+        global $update_intervals;
 
-		$feed_ids = clean($_REQUEST["ids"]);
+        $feed_ids = clean($_REQUEST["ids"]);
 
-		print_notice("Enable the options you wish to apply using checkboxes on the right:");
+        print_notice("Enable the options you wish to apply using checkboxes on the right:");
 
-		print "<p>";
+        print "<p>";
 
-		print_hidden("ids", "$feed_ids");
-		print_hidden("op", "pref-feeds");
-		print_hidden("method", "batchEditSave");
+        print_hidden("ids", "$feed_ids");
+        print_hidden("op", "pref-feeds");
+        print_hidden("method", "batchEditSave");
 
-		print "<header>".__("Feed")."</header>";
-		print "<section>";
+        print "<header>".__("Feed")."</header>";
+        print "<section>";
 
-		/* Category */
+        /* Category */
 
-		if (get_pref('ENABLE_FEED_CATS')) {
+        if (get_pref('ENABLE_FEED_CATS')) {
 
-			print "<fieldset>";
+            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"');
+            print_feed_cat_select("cat_id", false,
+                'disabled="1" dojoType="fox.form.Select"');
 
-			$this->batch_edit_cbox("cat_id");
+            $this->batch_edit_cbox("cat_id");
 
-			print "</fieldset>";
-		}
+            print "</fieldset>";
+        }
 
-		/* FTS Stemming Language */
+        /* FTS Stemming Language */
 
-		if (DB_TYPE == "pgsql") {
-			print "<fieldset>";
+        if (DB_TYPE == "pgsql") {
+            print "<fieldset>";
 
-			print "<label>" . __('Language:') . "</label> ";
-			print_select("feed_language", "", $this::get_ts_languages(),
-				'disabled="1" dojoType="fox.form.Select"');
+            print "<label>" . __('Language:') . "</label> ";
+            print_select("feed_language", "", $this::get_ts_languages(),
+                'disabled="1" dojoType="fox.form.Select"');
 
-			$this->batch_edit_cbox("feed_language");
+            $this->batch_edit_cbox("feed_language");
 
-			print "</fieldset>";
-		}
+            print "</fieldset>";
+        }
 
-		print "</section>";
+        print "</section>";
 
-		print "<header>".__("Update")."</header>";
-		print "<section>";
+        print "<header>".__("Update")."</header>";
+        print "<section>";
 
-		/* Update Interval */
+        /* Update Interval */
 
-		print "<fieldset>";
+        print "<fieldset>";
 
-		print "<label>".__("Interval:")."</label> ";
+        print "<label>".__("Interval:")."</label> ";
 
-		print_select_hash("update_interval", "", $update_intervals,
-			'disabled="1" dojoType="fox.form.Select"');
+        print_select_hash("update_interval", "", $update_intervals,
+            'disabled="1" dojoType="fox.form.Select"');
 
-		$this->batch_edit_cbox("update_interval");
+        $this->batch_edit_cbox("update_interval");
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		/* Purge intl */
+        /* Purge intl */
 
-		if (FORCE_ARTICLE_PURGE == 0) {
+        if (FORCE_ARTICLE_PURGE == 0) {
 
-			print "<fieldset>";
+            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"');
+            print_select_hash("purge_interval", "", $purge_intervals,
+                'disabled="1" dojoType="fox.form.Select"');
 
-			$this->batch_edit_cbox("purge_interval");
+            $this->batch_edit_cbox("purge_interval");
 
-			print "</fieldset>";
-		}
+            print "</fieldset>";
+        }
 
-		print "</section>";
-		print "<header>".__("Authentication")."</header>";
-		print "<section>";
+        print "</section>";
+        print "<header>".__("Authentication")."</header>";
+        print "<section>";
 
-		print "<fieldset>";
+        print "<fieldset>";
 
-		print "<input dojoType='dijit.form.TextBox'
+        print "<input dojoType='dijit.form.TextBox'
 			placeHolder=\"".__("Login")."\" disabled='1'
 			autocomplete='new-password'
 			name='auth_login' value=''>";
 
-		$this->batch_edit_cbox("auth_login");
+        $this->batch_edit_cbox("auth_login");
 
-		print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
+        print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
 			autocomplete='new-password'
 			placeHolder=\"".__("Password")."\" disabled='1'
 			value=''>";
 
-		$this->batch_edit_cbox("auth_pass");
+        $this->batch_edit_cbox("auth_pass");
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		print "</section>";
-		print "<header>".__("Options")."</header>";
-		print "<section>";
+        print "</section>";
+        print "<header>".__("Options")."</header>";
+        print "<section>";
 
-		print "<fieldset class='narrow'>";
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='include_in_digest'
+        print "<fieldset class='narrow'>";
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='include_in_digest'
 			name='include_in_digest' dojoType='dijit.form.CheckBox'>&nbsp;".__('Include in e-mail digest')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l");
+        print "&nbsp;"; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='always_display_enclosures'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='always_display_enclosures'
 			name='always_display_enclosures' dojoType='dijit.form.CheckBox'>&nbsp;".__('Always display image attachments')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l");
+        print "&nbsp;"; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='hide_images'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='hide_images'
 			name='hide_images' dojoType='dijit.form.CheckBox'>&nbsp;". __('Do not embed media')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("hide_images", "hide_images_l");
+        print "&nbsp;"; $this->batch_edit_cbox("hide_images", "hide_images_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='cache_images'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='cache_images'
 			name='cache_images' dojoType='dijit.form.CheckBox'>&nbsp;".__('Cache media')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("cache_images", "cache_images_l");
+        print "&nbsp;"; $this->batch_edit_cbox("cache_images", "cache_images_l");
 
-		print "</fieldset><fieldset class='narrow'>";
+        print "</fieldset><fieldset class='narrow'>";
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='mark_unread_on_update'
+        print "<label class='checkbox'><input disabled='1' type='checkbox' id='mark_unread_on_update'
 			name='mark_unread_on_update' dojoType='dijit.form.CheckBox'>&nbsp;".__('Mark updated articles as unread')."</label>";
 
-		print "&nbsp;"; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l");
+        print "&nbsp;"; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l");
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		print "</section>";
+        print "</section>";
 
-		print "<footer>
+        print "<footer>
 			<button dojoType='dijit.form.Button' type='submit' class='alt-primary'
 				onclick=\"return dijit.byId('feedEditDlg').execute()\">".
-				__('Save')."</button>
+                __('Save')."</button>
 			<button dojoType='dijit.form.Button'
 			onclick=\"return dijit.byId('feedEditDlg').hide()\">".
-				__('Cancel')."</button>
+                __('Cancel')."</button>
 			</footer>";
 
-		return;
-	}
-
-	public function batchEditSave() {
-		return $this->editsaveops(true);
-	}
-
-	public function editSave() {
-		return $this->editsaveops(false);
-	}
-
-	public function editsaveops($batch) {
-
-		$feed_title = trim(clean($_POST["title"]));
-		$feed_url = trim(clean($_POST["feed_url"]));
-		$site_url = trim(clean($_POST["site_url"]));
-		$upd_intl = (int) clean($_POST["update_interval"]);
-		$purge_intl = (int) clean($_POST["purge_interval"]);
-		$feed_id = (int) clean($_POST["id"]); /* editSave */
-		$feed_ids = explode(",", clean($_POST["ids"])); /* batchEditSave */
-		$cat_id = (int) clean($_POST["cat_id"]);
-		$auth_login = trim(clean($_POST["auth_login"]));
-		$auth_pass = trim(clean($_POST["auth_pass"]));
-		$private = checkbox_to_sql_bool(clean($_POST["private"]));
-		$include_in_digest = checkbox_to_sql_bool(
-			clean($_POST["include_in_digest"]));
-		$cache_images = checkbox_to_sql_bool(
-			clean($_POST["cache_images"]));
-		$hide_images = checkbox_to_sql_bool(
-			clean($_POST["hide_images"]));
-		$always_display_enclosures = checkbox_to_sql_bool(
-			clean($_POST["always_display_enclosures"]));
-
-		$mark_unread_on_update = checkbox_to_sql_bool(
-			clean($_POST["mark_unread_on_update"]));
-
-		$feed_language = trim(clean($_POST["feed_language"]));
-
-		if (!$batch) {
-			if (clean($_POST["need_auth"]) !== 'on') {
-				$auth_login = '';
-				$auth_pass = '';
-			}
-
-			/* $sth = $this->pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?");
+        return;
+    }
+
+    public function batchEditSave() {
+        return $this->editsaveops(true);
+    }
+
+    public function editSave() {
+        return $this->editsaveops(false);
+    }
+
+    public function editsaveops($batch) {
+
+        $feed_title = trim(clean($_POST["title"]));
+        $feed_url = trim(clean($_POST["feed_url"]));
+        $site_url = trim(clean($_POST["site_url"]));
+        $upd_intl = (int) clean($_POST["update_interval"]);
+        $purge_intl = (int) clean($_POST["purge_interval"]);
+        $feed_id = (int) clean($_POST["id"]); /* editSave */
+        $feed_ids = explode(",", clean($_POST["ids"])); /* batchEditSave */
+        $cat_id = (int) clean($_POST["cat_id"]);
+        $auth_login = trim(clean($_POST["auth_login"]));
+        $auth_pass = trim(clean($_POST["auth_pass"]));
+        $private = checkbox_to_sql_bool(clean($_POST["private"]));
+        $include_in_digest = checkbox_to_sql_bool(
+            clean($_POST["include_in_digest"]));
+        $cache_images = checkbox_to_sql_bool(
+            clean($_POST["cache_images"]));
+        $hide_images = checkbox_to_sql_bool(
+            clean($_POST["hide_images"]));
+        $always_display_enclosures = checkbox_to_sql_bool(
+            clean($_POST["always_display_enclosures"]));
+
+        $mark_unread_on_update = checkbox_to_sql_bool(
+            clean($_POST["mark_unread_on_update"]));
+
+        $feed_language = trim(clean($_POST["feed_language"]));
+
+        if (!$batch) {
+            if (clean($_POST["need_auth"]) !== 'on') {
+                $auth_login = '';
+                $auth_pass = '';
+            }
+
+            /* $sth = $this->pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?");
 			$sth->execute([$feed_id]);
 			$row = $sth->fetch();$orig_feed_url = $row["feed_url"];
 
 			$reset_basic_info = $orig_feed_url != $feed_url; */
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET
+            $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET
 				cat_id = :cat_id,
 				title = :title,
 				feed_url = :feed_url,
@@ -1018,253 +1018,253 @@ 
 				feed_language = :feed_language
 			WHERE id = :id AND owner_uid = :uid");
 
-			$sth->execute([":title" => $feed_title,
-					":cat_id" => $cat_id ? $cat_id : null,
-					":feed_url" => $feed_url,
-					":site_url" => $site_url,
-					":upd_intl" => $upd_intl,
-					":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,
-					":feed_language" => $feed_language,
-					":id" => $feed_id,
-					":uid" => $_SESSION['uid']]);
+            $sth->execute([":title" => $feed_title,
+                    ":cat_id" => $cat_id ? $cat_id : null,
+                    ":feed_url" => $feed_url,
+                    ":site_url" => $site_url,
+                    ":upd_intl" => $upd_intl,
+                    ":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,
+                    ":feed_language" => $feed_language,
+                    ":id" => $feed_id,
+                    ":uid" => $_SESSION['uid']]);
 
 /*			if ($reset_basic_info) {
 				RSSUtils::set_basic_feed_info($feed_id);
 			} */
 
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED,
-				"hook_prefs_save_feed", $feed_id);
+            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED,
+                "hook_prefs_save_feed", $feed_id);
 
-		} else {
-			$feed_data = array();
+        } else {
+            $feed_data = array();
 
-			foreach (array_keys($_POST) as $k) {
-				if ($k != "op" && $k != "method" && $k != "ids") {
-					$feed_data[$k] = clean($_POST[$k]);
-				}
-			}
+            foreach (array_keys($_POST) as $k) {
+                if ($k != "op" && $k != "method" && $k != "ids") {
+                    $feed_data[$k] = clean($_POST[$k]);
+                }
+            }
 
-			$this->pdo->beginTransaction();
+            $this->pdo->beginTransaction();
 
-			$feed_ids_qmarks = arr_qmarks($feed_ids);
+            $feed_ids_qmarks = arr_qmarks($feed_ids);
 
-			foreach (array_keys($feed_data) as $k) {
+            foreach (array_keys($feed_data) as $k) {
 
-				$qpart = "";
+                $qpart = "";
 
-				switch ($k) {
-					case "title":
-						$qpart = "title = " . $this->pdo->quote($feed_title);
-						break;
+                switch ($k) {
+                    case "title":
+                        $qpart = "title = " . $this->pdo->quote($feed_title);
+                        break;
 
-					case "feed_url":
-						$qpart = "feed_url = " . $this->pdo->quote($feed_url);
-						break;
+                    case "feed_url":
+                        $qpart = "feed_url = " . $this->pdo->quote($feed_url);
+                        break;
 
-					case "update_interval":
-						$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
-						break;
+                    case "update_interval":
+                        $qpart = "update_interval = " . $this->pdo->quote($upd_intl);
+                        break;
 
-					case "purge_interval":
-						$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
-						break;
+                    case "purge_interval":
+                        $qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
+                        break;
 
-					case "auth_login":
-						$qpart = "auth_login = " . $this->pdo->quote($auth_login);
-						break;
+                    case "auth_login":
+                        $qpart = "auth_login = " . $this->pdo->quote($auth_login);
+                        break;
 
-					case "auth_pass":
-						$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
-						break;
+                    case "auth_pass":
+                        $qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
+                        break;
 
-					case "private":
-						$qpart = "private = " . $this->pdo->quote($private);
-						break;
+                    case "private":
+                        $qpart = "private = " . $this->pdo->quote($private);
+                        break;
 
-					case "include_in_digest":
-						$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
-						break;
+                    case "include_in_digest":
+                        $qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
+                        break;
 
-					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
-						break;
+                    case "always_display_enclosures":
+                        $qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
+                        break;
 
-					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
-						break;
+                    case "mark_unread_on_update":
+                        $qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
+                        break;
 
-					case "cache_images":
-						$qpart = "cache_images = " . $this->pdo->quote($cache_images);
-						break;
+                    case "cache_images":
+                        $qpart = "cache_images = " . $this->pdo->quote($cache_images);
+                        break;
 
-					case "hide_images":
-						$qpart = "hide_images = " . $this->pdo->quote($hide_images);
-						break;
+                    case "hide_images":
+                        $qpart = "hide_images = " . $this->pdo->quote($hide_images);
+                        break;
 
-					case "cat_id":
-						if (get_pref('ENABLE_FEED_CATS')) {
-							if ($cat_id) {
-								$qpart = "cat_id = " . $this->pdo->quote($cat_id);
-							} else {
-								$qpart = 'cat_id = NULL';
-							}
-						} else {
-							$qpart = "";
-						}
+                    case "cat_id":
+                        if (get_pref('ENABLE_FEED_CATS')) {
+                            if ($cat_id) {
+                                $qpart = "cat_id = " . $this->pdo->quote($cat_id);
+                            } else {
+                                $qpart = 'cat_id = NULL';
+                            }
+                        } else {
+                            $qpart = "";
+                        }
 
-						break;
+                        break;
 
-					case "feed_language":
-						$qpart = "feed_language = " . $this->pdo->quote($feed_language);
-						break;
+                    case "feed_language":
+                        $qpart = "feed_language = " . $this->pdo->quote($feed_language);
+                        break;
 
-				}
+                }
 
-				if ($qpart) {
-					$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids_qmarks)
+                if ($qpart) {
+                    $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids_qmarks)
 						AND owner_uid = ?");
-					$sth->execute(array_merge($feed_ids, [$_SESSION['uid']]));
-				}
-			}
+                    $sth->execute(array_merge($feed_ids, [$_SESSION['uid']]));
+                }
+            }
 
-			$this->pdo->commit();
-		}
-		return;
-	}
+            $this->pdo->commit();
+        }
+        return;
+    }
 
-	public function remove() {
+    public function remove() {
 
-		$ids = explode(",", clean($_REQUEST["ids"]));
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			Pref_Feeds::remove_feed($id, $_SESSION["uid"]);
-		}
+        foreach ($ids as $id) {
+            Pref_Feeds::remove_feed($id, $_SESSION["uid"]);
+        }
 
-		return;
-	}
+        return;
+    }
 
-	public function removeCat() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		foreach ($ids as $id) {
-			$this->remove_feed_category($id, $_SESSION["uid"]);
-		}
-	}
+    public function removeCat() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        foreach ($ids as $id) {
+            $this->remove_feed_category($id, $_SESSION["uid"]);
+        }
+    }
 
-	public function addCat() {
-		$feed_cat = trim(clean($_REQUEST["cat"]));
+    public function addCat() {
+        $feed_cat = trim(clean($_REQUEST["cat"]));
 
-		Feeds::add_feed_category($feed_cat);
-	}
+        Feeds::add_feed_category($feed_cat);
+    }
 
-	public function index() {
+    public function index() {
 
-		print "<div dojoType='dijit.layout.AccordionContainer' region='center'>";
-		print "<div style='padding : 0px' dojoType='dijit.layout.AccordionPane'
+        print "<div dojoType='dijit.layout.AccordionContainer' region='center'>";
+        print "<div style='padding : 0px' dojoType='dijit.layout.AccordionPane'
 			title=\"<i class='material-icons'>rss_feed</i> ".__('Feeds')."\">";
 
-		$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
+        $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$num_errors = $row["num_errors"];
-		} else {
-			$num_errors = 0;
-		}
+        if ($row = $sth->fetch()) {
+            $num_errors = $row["num_errors"];
+        } else {
+            $num_errors = 0;
+        }
 
-		if ($num_errors > 0) {
+        if ($num_errors > 0) {
 
-			$error_button = "<button dojoType=\"dijit.form.Button\"
+            $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\"
+        $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"]);
+        $feed_search = clean($_REQUEST["search"]);
 
-		if (array_key_exists("search", $_REQUEST)) {
-			$_SESSION["prefs_feed_search"] = $feed_search;
-		} else {
-			$feed_search = $_SESSION["prefs_feed_search"];
-		}
+        if (array_key_exists("search", $_REQUEST)) {
+            $_SESSION["prefs_feed_search"] = $feed_search;
+        } else {
+            $feed_search = $_SESSION["prefs_feed_search"];
+        }
 
-		print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
+        print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
 
-		print "<div region='top' dojoType=\"fox.Toolbar\">"; #toolbar
+        print "<div region='top' dojoType=\"fox.Toolbar\">"; #toolbar
 
-		print "<div style='float : right; padding-right : 4px;'>
+        print "<div style='float : right; padding-right : 4px;'>
 			<input dojoType=\"dijit.form.TextBox\" id=\"feed_search\" size=\"20\" type=\"search\"
 				value=\"$feed_search\">
 			<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedTree').reload()\">".
-				__('Search')."</button>
+                __('Search')."</button>
 			</div>";
 
-		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\"
+        print "<div dojoType=\"fox.form.DropDownButton\">".
+                "<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>";
-		print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\"
+        print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\"
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-		print "</div></div>";
+        print "</div></div>";
 
-		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Feeds')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"CommonDialogs.quickAddFeed()\"
+        print "<div dojoType=\"fox.form.DropDownButton\">".
+                "<span>" . __('Feeds')."</span>";
+        print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+        print "<div onclick=\"CommonDialogs.quickAddFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
-		print "<div onclick=\"dijit.byId('feedTree').editSelectedFeed()\"
+        print "<div onclick=\"dijit.byId('feedTree').editSelectedFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Edit selected feeds')."</div>";
-		print "<div onclick=\"dijit.byId('feedTree').resetFeedOrder()\"
+        print "<div onclick=\"dijit.byId('feedTree').resetFeedOrder()\"
 			dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
-		print "<div onclick=\"dijit.byId('feedTree').batchSubscribe()\"
+        print "<div onclick=\"dijit.byId('feedTree').batchSubscribe()\"
 			dojoType=\"dijit.MenuItem\">".__('Batch subscribe')."</div>";
-		print "<div dojoType=\"dijit.MenuItem\" onclick=\"dijit.byId('feedTree').removeSelectedFeeds()\">"
-			.__('Unsubscribe')."</div> ";
-		print "</div></div>";
-
-		if (get_pref('ENABLE_FEED_CATS')) {
-			print "<div dojoType=\"fox.form.DropDownButton\">".
-					"<span>" . __('Categories')."</span>";
-			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-			print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
+        print "<div dojoType=\"dijit.MenuItem\" onclick=\"dijit.byId('feedTree').removeSelectedFeeds()\">"
+            .__('Unsubscribe')."</div> ";
+        print "</div></div>";
+
+        if (get_pref('ENABLE_FEED_CATS')) {
+            print "<div dojoType=\"fox.form.DropDownButton\">".
+                    "<span>" . __('Categories')."</span>";
+            print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+            print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
 				dojoType=\"dijit.MenuItem\">".__('Add category')."</div>";
-			print "<div onclick=\"dijit.byId('feedTree').resetCatOrder()\"
+            print "<div onclick=\"dijit.byId('feedTree').resetCatOrder()\"
 				dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
-			print "<div onclick=\"dijit.byId('feedTree').removeSelectedCategories()\"
+            print "<div onclick=\"dijit.byId('feedTree').removeSelectedCategories()\"
 				dojoType=\"dijit.MenuItem\">".__('Remove selected')."</div>";
-			print "</div></div>";
+            print "</div></div>";
 
-		}
+        }
 
-		print $error_button;
-		print $inactive_button;
+        print $error_button;
+        print $inactive_button;
 
-		print "</div>"; # toolbar
+        print "</div>"; # toolbar
 
-		//print '</div>';
-		print '<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">';
+        //print '</div>';
+        print '<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">';
 
-		print "<div id=\"feedlistLoading\">
+        print "<div id=\"feedlistLoading\">
 		<img src='images/indicator_tiny.gif'>".
-		 __("Loading, please wait...")."</div>";
+            __("Loading, please wait...")."</div>";
 
-		$auto_expand = $feed_search != "" ? "true" : "false";
+        $auto_expand = $feed_search != "" ? "true" : "false";
 
-		print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\"
+        print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\"
 			url=\"backend.php?op=pref-feeds&method=getfeedtree\">
 		</div>
 		<div dojoType=\"lib.CheckBoxStoreModel\" jsId=\"feedModel\" store=\"feedStore\"
@@ -1297,23 +1297,23 @@ 
 #			".__('<b>Hint:</b> you can drag feeds and categories around.')."
 #			</div>";
 
-		print '</div>';
-		print '</div>';
+        print '</div>';
+        print '</div>';
 
-		print "</div>"; # feeds pane
+        print "</div>"; # feeds pane
 
-		print "<div dojoType='dijit.layout.AccordionPane'
+        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.");
+        print_notice("Only main settings profile can be migrated using OPML.");
 
-		print "<iframe id=\"upload_iframe\"
+        print "<iframe id=\"upload_iframe\"
 			name=\"upload_iframe\" onload=\"Helpers.OPML.onImportComplete(this)\"
 			style=\"width: 400px; height: 100px; display: none;\"></iframe>";
 
-		print "<form  name='opml_form' style='display : inline-block' target='upload_iframe'
+        print "<form  name='opml_form' style='display : inline-block' target='upload_iframe'
 			enctype='multipart/form-data' method='POST'
 			action='backend.php'>
 			<label class='dijitButton'>".__("Choose file...")."
@@ -1322,116 +1322,116 @@ 
 			<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>";
+        print "</form>";
 
-		print "<form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'>";
+        print "<form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'>";
 
-		print "<button dojoType='dijit.form.Button'
+        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 "</label>";
+        print " <label class='checkbox'>";
+        print_checkbox("include_settings", true, "1", "");
+        print " " . __("Include settings");
+        print "</label>";
 
-		print "</form>";
+        print "</form>";
 
-		print "<p/>";
+        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> ";
+        print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
+            __('Display published OPML URL')."</button> ";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefFeedsOPML");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefFeedsOPML");
 
-		print "</div>"; # pane
+        print "</div>"; # pane
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        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> ";
+        print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
+            __('Display URL')."</button> ";
 
-		print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">".
-			__('Clear all generated URLs')."</button> ";
+        print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">".
+            __('Clear all generated URLs')."</button> ";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
-			"hook_prefs_tab_section", "prefFeedsPublishedGenerated");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
+            "hook_prefs_tab_section", "prefFeedsPublishedGenerated");
 
-		print "</div>"; #pane
+        print "</div>"; #pane
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-			"hook_prefs_tab", "prefFeeds");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+            "hook_prefs_tab", "prefFeeds");
 
-		print "</div>"; #container
-	}
+        print "</div>"; #container
+    }
 
-	private function feedlist_init_cat($cat_id) {
-		$obj = array();
-		$cat_id = (int) $cat_id;
+    private function feedlist_init_cat($cat_id) {
+        $obj = array();
+        $cat_id = (int) $cat_id;
 
-		if ($cat_id > 0) {
-			$cat_unread = CCache::find($cat_id, $_SESSION["uid"], true);
-		} else if ($cat_id == 0 || $cat_id == -2) {
-			$cat_unread = Feeds::getCategoryUnread($cat_id);
-		}
+        if ($cat_id > 0) {
+            $cat_unread = CCache::find($cat_id, $_SESSION["uid"], true);
+        } else if ($cat_id == 0 || $cat_id == -2) {
+            $cat_unread = Feeds::getCategoryUnread($cat_id);
+        }
 
-		$obj['id'] = 'CAT:' . $cat_id;
-		$obj['items'] = array();
-		$obj['name'] = Feeds::getCategoryTitle($cat_id);
-		$obj['type'] = 'category';
-		$obj['unread'] = (int) $cat_unread;
-		$obj['bare_id'] = $cat_id;
+        $obj['id'] = 'CAT:' . $cat_id;
+        $obj['items'] = array();
+        $obj['name'] = Feeds::getCategoryTitle($cat_id);
+        $obj['type'] = 'category';
+        $obj['unread'] = (int) $cat_unread;
+        $obj['bare_id'] = $cat_id;
 
-		return $obj;
-	}
+        return $obj;
+    }
 
-	private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') {
-		$obj = array();
-		$feed_id = (int) $feed_id;
+    private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') {
+        $obj = array();
+        $feed_id = (int) $feed_id;
 
-		if (!$title)
-			$title = Feeds::getFeedTitle($feed_id, false);
+        if (!$title)
+            $title = Feeds::getFeedTitle($feed_id, false);
 
-		if ($unread === false)
-			$unread = getFeedUnread($feed_id, false);
+        if ($unread === false)
+            $unread = getFeedUnread($feed_id, false);
 
-		$obj['id'] = 'FEED:' . $feed_id;
-		$obj['name'] = $title;
-		$obj['unread'] = (int) $unread;
-		$obj['type'] = 'feed';
-		$obj['error'] = $error;
-		$obj['updated'] = $updated;
-		$obj['icon'] = Feeds::getFeedIcon($feed_id);
-		$obj['bare_id'] = $feed_id;
-		$obj['auxcounter'] = 0;
+        $obj['id'] = 'FEED:' . $feed_id;
+        $obj['name'] = $title;
+        $obj['unread'] = (int) $unread;
+        $obj['type'] = 'feed';
+        $obj['error'] = $error;
+        $obj['updated'] = $updated;
+        $obj['icon'] = Feeds::getFeedIcon($feed_id);
+        $obj['bare_id'] = $feed_id;
+        $obj['auxcounter'] = 0;
 
-		return $obj;
-	}
+        return $obj;
+    }
 
-	public function inactiveFeeds() {
+    public function inactiveFeeds() {
 
-		if (DB_TYPE == "pgsql") {
-			$interval_qpart = "NOW() - INTERVAL '3 months'";
-		} else {
-			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
-		}
+        if (DB_TYPE == "pgsql") {
+            $interval_qpart = "NOW() - INTERVAL '3 months'";
+        } else {
+            $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
+        }
 
-		$sth = $this->pdo->prepare("SELECT ttrss_feeds.title, ttrss_feeds.site_url,
+        $sth = $this->pdo->prepare("SELECT ttrss_feeds.title, ttrss_feeds.site_url,
 		  		ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article
 			FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE
 				(SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
@@ -1442,356 +1442,356 @@ 
 				ttrss_entries.id = ref_id
 			GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url
 			ORDER BY last_article");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		print "<div dojoType='fox.Toolbar'>";
-		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
-		print "<div dojoType='dijit.Menu' style='display: none'>";
-		print "<div onclick=\"Tables.select('inactive-feeds-list', true)\"
+        print "<div dojoType='fox.Toolbar'>";
+        print "<div dojoType='fox.form.DropDownButton'>".
+                "<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>";
-		print "<div onclick=\"Tables.select('inactive-feeds-list', false)\"
+        print "<div onclick=\"Tables.select('inactive-feeds-list', false)\"
 			dojoType='dijit.MenuItem'>".__('None')."</div>";
-		print "</div></div>";
-		print "</div>"; #toolbar
+        print "</div></div>";
+        print "</div>"; #toolbar
 
-		print "<div class='panel panel-scrollable'>";
-		print "<table width='100%' id='inactive-feeds-list'>";
+        print "<div class='panel panel-scrollable'>";
+        print "<table width='100%' id='inactive-feeds-list'>";
 
-		$lnum = 1;
+        $lnum = 1;
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$feed_id = $line["id"];
+            $feed_id = $line["id"];
 
-			print "<tr data-row-id='$feed_id'>";
+            print "<tr data-row-id='$feed_id'>";
 
-			print "<td width='5%' align='center'><input
+            print "<td width='5%' align='center'><input
 				onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox'
 				type='checkbox'></td>";
-			print "<td>";
+            print "<td>";
 
-			print "<a href='#' ".
-				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
-				htmlspecialchars($line["title"])."</a>";
+            print "<a href='#' ".
+                "title=\"".__("Click to edit feed")."\" ".
+                "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
+                htmlspecialchars($line["title"])."</a>";
 
-			print "</td><td class='text-muted' align='right'>";
-			print make_local_datetime($line['last_article'], false);
-			print "</td>";
-			print "</tr>";
+            print "</td><td class='text-muted' align='right'>";
+            print make_local_datetime($line['last_article'], false);
+            print "</td>";
+            print "</tr>";
 
-			++$lnum;
-		}
+            ++$lnum;
+        }
 
-		print "</table>";
-		print "</div>";
+        print "</table>";
+        print "</div>";
 
-		print "<footer>
+        print "<footer>
 			<button style='float : left' class=\"alt-danger\" dojoType='dijit.form.Button' onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
-			.__('Unsubscribe from selected feeds')."</button>
+            .__('Unsubscribe from selected feeds')."</button>
 			<button dojoType='dijit.form.Button' onclick=\"dijit.byId('inactiveFeedsDlg').hide()\">"
-			.__('Close this window')."</button>
+            .__('Close this window')."</button>
 			</footer>";
 
-	}
+    }
 
-	public function feedsWithErrors() {
-		$sth = $this->pdo->prepare("SELECT id,title,feed_url,last_error,site_url
+    public function feedsWithErrors() {
+        $sth = $this->pdo->prepare("SELECT id,title,feed_url,last_error,site_url
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		print "<div dojoType=\"fox.Toolbar\">";
-		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
-		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"Tables.select('error-feeds-list', true)\"
+        print "<div dojoType=\"fox.Toolbar\">";
+        print "<div dojoType=\"fox.form.DropDownButton\">".
+                "<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>";
-		print "<div onclick=\"Tables.select('error-feeds-list', false)\"
+        print "<div onclick=\"Tables.select('error-feeds-list', false)\"
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-		print "</div></div>";
-		print "</div>"; #toolbar
+        print "</div></div>";
+        print "</div>"; #toolbar
 
-		print "<div class='panel panel-scrollable'>";
-		print "<table width='100%' id='error-feeds-list'>";
+        print "<div class='panel panel-scrollable'>";
+        print "<table width='100%' id='error-feeds-list'>";
 
-		$lnum = 1;
+        $lnum = 1;
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$feed_id = $line["id"];
+            $feed_id = $line["id"];
 
-			print "<tr data-row-id='$feed_id'>";
+            print "<tr data-row-id='$feed_id'>";
 
-			print "<td width='5%' align='center'><input
+            print "<td width='5%' align='center'><input
 				onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\"
 				type=\"checkbox\"></td>";
-			print "<td>";
+            print "<td>";
 
-			print "<a class=\"visibleLink\" href=\"#\" ".
-				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
-				htmlspecialchars($line["title"])."</a>: ";
+            print "<a class=\"visibleLink\" href=\"#\" ".
+                "title=\"".__("Click to edit feed")."\" ".
+                "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
+                htmlspecialchars($line["title"])."</a>: ";
 
-			print "<span class=\"text-muted\">";
-			print htmlspecialchars($line["last_error"]);
-			print "</span>";
+            print "<span class=\"text-muted\">";
+            print htmlspecialchars($line["last_error"]);
+            print "</span>";
 
-			print "</td>";
-			print "</tr>";
+            print "</td>";
+            print "</tr>";
 
-			++$lnum;
-		}
+            ++$lnum;
+        }
 
-		print "</table>";
-		print "</div>";
+        print "</table>";
+        print "</div>";
 
-		print "<footer>";
-		print "<button style='float : left' class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
-			.__('Unsubscribe from selected feeds')."</button> ";
+        print "<footer>";
+        print "<button style='float : left' class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
+            .__('Unsubscribe from selected feeds')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">".
-			__('Close this window')."</button>";
+        print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">".
+            __('Close this window')."</button>";
 
-		print "</footer>";
-	}
+        print "</footer>";
+    }
 
-	private function remove_feed_category($id, $owner_uid) {
+    private function remove_feed_category($id, $owner_uid) {
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_feed_categories
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_feed_categories
 			WHERE id = ? AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		CCache::remove($id, $owner_uid, true);
-	}
+        CCache::remove($id, $owner_uid, true);
+    }
 
-	public 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)) {
+    public 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)) {
                 user_error("feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
                 return;
-			}
-		}
+            }
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if ($id > 0) {
-			$pdo->beginTransaction();
+        if ($id > 0) {
+            $pdo->beginTransaction();
 
-			/* save starred articles in Archived feed */
+            /* save starred articles in Archived feed */
 
-			/* prepare feed if necessary */
+            /* prepare feed if necessary */
 
-			$sth = $pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?
+            $sth = $pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?
 				AND owner_uid = ?");
-			$sth->execute([$id, $owner_uid]);
+            $sth->execute([$id, $owner_uid]);
 
-			if ($row = $sth->fetch()) {
-				$feed_url = $row["feed_url"];
+            if ($row = $sth->fetch()) {
+                $feed_url = $row["feed_url"];
 
-				$sth = $pdo->prepare("SELECT id FROM ttrss_archived_feeds
+                $sth = $pdo->prepare("SELECT id FROM ttrss_archived_feeds
 					WHERE feed_url = ? AND owner_uid = ?");
-				$sth->execute([$feed_url, $owner_uid]);
+                $sth->execute([$feed_url, $owner_uid]);
 
-				if ($row = $sth->fetch()) {
-					$archive_id = $row["id"];
-				} else {
-					$res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
-					$row = $res->fetch();
+                if ($row = $sth->fetch()) {
+                    $archive_id = $row["id"];
+                } else {
+                    $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
+                    $sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
 							SELECT ?, owner_uid, title, feed_url, site_url, NOW() from ttrss_feeds
 							WHERE id = ?");
-					$sth->execute([$new_feed_id, $id]);
+                    $sth->execute([$new_feed_id, $id]);
 
-					$archive_id = $new_feed_id;
-				}
+                    $archive_id = $new_feed_id;
+                }
 
-				$sth = $pdo->prepare("UPDATE ttrss_user_entries SET feed_id = NULL,
+                $sth = $pdo->prepare("UPDATE ttrss_user_entries SET feed_id = NULL,
 					orig_feed_id = ? WHERE feed_id = ? AND
 						marked = true AND owner_uid = ?");
 
-				$sth->execute([$archive_id, $id, $owner_uid]);
+                $sth->execute([$archive_id, $id, $owner_uid]);
 
-				/* Remove access key for the feed */
+                /* Remove access key for the feed */
 
-				$sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
+                $sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
 					feed_id = ? AND owner_uid = ?");
-				$sth->execute([$id, $owner_uid]);
+                $sth->execute([$id, $owner_uid]);
 
-				/* remove the feed */
+                /* remove the feed */
 
-				$sth = $pdo->prepare("DELETE FROM ttrss_feeds
+                $sth = $pdo->prepare("DELETE FROM ttrss_feeds
 					WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$id, $owner_uid]);
-			}
+                $sth->execute([$id, $owner_uid]);
+            }
 
-			$pdo->commit();
+            $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);
+            CCache::remove($id, $owner_uid);
 
-		} else {
-			Labels::remove(Labels::feed_to_label_id($id), $owner_uid);
-			//CCache::remove($id, $owner_uid); don't think labels are cached
-		}
-	}
+        } else {
+            Labels::remove(Labels::feed_to_label_id($id), $owner_uid);
+            //CCache::remove($id, $owner_uid); don't think labels are cached
+        }
+    }
 
-	public function batchSubscribe() {
-		print_hidden("op", "pref-feeds");
-		print_hidden("method", "batchaddfeeds");
+    public function batchSubscribe() {
+        print_hidden("op", "pref-feeds");
+        print_hidden("method", "batchaddfeeds");
 
-		print "<header class='horizontal'>".__("One valid feed per line (no detection is done)")."</header>";
-		print "<section>";
+        print "<header class='horizontal'>".__("One valid feed per line (no detection is done)")."</header>";
+        print "<section>";
 
-		print "<textarea
+        print "<textarea
 			style='font-size : 12px; width : 98%; height: 200px;'
 			dojoType='dijit.form.SimpleTextarea' name='feeds'></textarea>";
 
-		if (get_pref('ENABLE_FEED_CATS')) {
-			print "<fieldset>";
-			print "<label>" . __('Place in category:') . "</label> ";
-			print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
-			print "</fieldset>";
-		}
+        if (get_pref('ENABLE_FEED_CATS')) {
+            print "<fieldset>";
+            print "<label>" . __('Place in category:') . "</label> ";
+            print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
+            print "</fieldset>";
+        }
 
-		print "</section>";
+        print "</section>";
 
-		print "<div id='feedDlg_loginContainer' style='display : none'>";
+        print "<div id='feedDlg_loginContainer' style='display : none'>";
 
-		print "<header>" . __("Authentication") . "</header>";
-		print "<section>";
+        print "<header>" . __("Authentication") . "</header>";
+        print "<section>";
 
-		print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
+        print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
 			<input placeHolder=\"".__("Password")."\" dojoType=\"dijit.form.TextBox\" type='password'
 				autocomplete='new-password' name='pass''></div>";
 
-		print "</section>";
-		print "</div>";
+        print "</section>";
+        print "</div>";
 
-		print "<fieldset class='narrow'>
+        print "<fieldset class='narrow'>
 			<label class='checkbox'><input type='checkbox' name='need_auth' dojoType='dijit.form.CheckBox'
 					onclick='displayIfChecked(this, \"feedDlg_loginContainer\")'> ".
-				__('Feeds require authentication.')."</label></div>";
-		print "</fieldset>";
+                __('Feeds require authentication.')."</label></div>";
+        print "</fieldset>";
 
-		print "<footer>
+        print "<footer>
 			<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".__('Subscribe')."</button>
 			<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('batchSubDlg').hide()\">".__('Cancel')."</button>
 			</footer>";
-	}
+    }
 
-	public function batchAddFeeds() {
-		$cat_id = clean($_REQUEST['cat']);
-		$feeds = explode("\n", clean($_REQUEST['feeds']));
-		$login = clean($_REQUEST['login']);
-		$pass = trim(clean($_REQUEST['pass']));
+    public function batchAddFeeds() {
+        $cat_id = clean($_REQUEST['cat']);
+        $feeds = explode("\n", clean($_REQUEST['feeds']));
+        $login = clean($_REQUEST['login']);
+        $pass = trim(clean($_REQUEST['pass']));
 
-		$csth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
+        $csth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
 						WHERE feed_url = ? AND owner_uid = ?");
 
-		$isth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+        $isth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method,auth_pass_encrypted)
 						VALUES (?, ?, '[Unknown]', ?, ?, ?, 0, false)");
 
-		foreach ($feeds as $feed) {
-			$feed = trim($feed);
+        foreach ($feeds as $feed) {
+            $feed = trim($feed);
 
-			if (Feeds::validate_feed_url($feed)) {
+            if (Feeds::validate_feed_url($feed)) {
 
-				$this->pdo->beginTransaction();
+                $this->pdo->beginTransaction();
 
-				$csth->execute([$feed, $_SESSION['uid']]);
+                $csth->execute([$feed, $_SESSION['uid']]);
 
-				if (!$csth->fetch()) {
-					$isth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]);
-				}
+                if (!$csth->fetch()) {
+                    $isth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]);
+                }
 
-				$this->pdo->commit();
-			}
-		}
-	}
+                $this->pdo->commit();
+            }
+        }
+    }
 
-	public function regenOPMLKey() {
-		$this->update_feed_access_key('OPML:Publish',
-		false, $_SESSION["uid"]);
+    public function regenOPMLKey() {
+        $this->update_feed_access_key('OPML:Publish',
+        false, $_SESSION["uid"]);
 
-		$new_link = Opml::opml_publish_url();
+        $new_link = Opml::opml_publish_url();
 
-		print json_encode(array("link" => $new_link));
-	}
+        print json_encode(array("link" => $new_link));
+    }
 
-	public function regenFeedKey() {
-		$feed_id = clean($_REQUEST['id']);
-		$is_cat = clean($_REQUEST['is_cat']);
+    public function regenFeedKey() {
+        $feed_id = clean($_REQUEST['id']);
+        $is_cat = clean($_REQUEST['is_cat']);
 
-		$new_key = $this->update_feed_access_key($feed_id, $is_cat);
+        $new_key = $this->update_feed_access_key($feed_id, $is_cat);
 
-		print json_encode(["link" => $new_key]);
-	}
+        print json_encode(["link" => $new_key]);
+    }
 
 
-	private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+    private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
+        if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		// clear old value and generate new one
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys
+        // clear old value and generate new one
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys
 			WHERE feed_id = ? AND is_cat = ? AND owner_uid = ?");
-		$sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]);
+        $sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]);
 
-		return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid);
-	}
+        return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid);
+    }
 
-	// Silent
-	public function clearKeys() {
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys WHERE
+    // Silent
+    public function clearKeys() {
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys WHERE
 			owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-	}
-
-	private function calculate_children_count($cat) {
-		$c = 0;
-
-		foreach ($cat['items'] as $child) {
-			if ($child['type'] == 'category') {
-				$c += $this->calculate_children_count($child);
-			} else {
-				$c += 1;
-			}
-		}
-
-		return $c;
-	}
-
-	public function getinactivefeeds() {
-		if (DB_TYPE == "pgsql") {
-			$interval_qpart = "NOW() - INTERVAL '3 months'";
-		} else {
-			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
-		}
-
-		$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_inactive FROM ttrss_feeds WHERE
+        $sth->execute([$_SESSION['uid']]);
+    }
+
+    private function calculate_children_count($cat) {
+        $c = 0;
+
+        foreach ($cat['items'] as $child) {
+            if ($child['type'] == 'category') {
+                $c += $this->calculate_children_count($child);
+            } else {
+                $c += 1;
+            }
+        }
+
+        return $c;
+    }
+
+    public function getinactivefeeds() {
+        if (DB_TYPE == "pgsql") {
+            $interval_qpart = "NOW() - INTERVAL '3 months'";
+        } else {
+            $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
+        }
+
+        $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_inactive FROM ttrss_feeds WHERE
 				(SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
 					ttrss_entries.id = ref_id AND
 						ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart AND
 			  ttrss_feeds.owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-
-		if ($row = $sth->fetch()) {
-			print (int)$row["num_inactive"];
-		}
-	}
-
-	public static function subscribe_to_feed_url() {
-		$url_path = get_self_url_prefix() .
-			"/public.php?op=subscribe&feed_url=%s";
-		return $url_path;
-	}
+        $sth->execute([$_SESSION['uid']]);
+
+        if ($row = $sth->fetch()) {
+            print (int)$row["num_inactive"];
+        }
+    }
+
+    public static function subscribe_to_feed_url() {
+        $url_path = get_self_url_prefix() .
+            "/public.php?op=subscribe&feed_url=%s";
+        return $url_path;
+    }
 
 }

classes/rssutils.php

Switch Indentation +26 added lines, -26 removed lines

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

Indentation +1270 added lines, -1270 removed lines

@@ -1,50 +1,50 @@ 
 <?php
 class RSSUtils {
-	public static function calculate_article_hash($article, $pluginhost) {
-		$tmp = "";
-
-		foreach ($article as $k => $v) {
-			if ($k != "feed" && isset($v)) {
-				$x = strip_tags(is_array($v) ? implode(",", $v) : $v);
-
-				$tmp .= sha1("$k:" . sha1($x));
-			}
-		}
-
-		return sha1(implode(",", $pluginhost->get_plugin_names()) . $tmp);
-	}
-
-	// Strips utf8mb4 characters (i.e. emoji) for mysql
-	public static function strip_utf8mb4($str) {
-		return preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $str);
-	}
-
-	public static function cleanup_feed_browser() {
-		$pdo = Db::pdo();
-		$pdo->query("DELETE FROM ttrss_feedbrowser_cache");
-	}
-
-	public static function update_daemon_common($limit = DAEMON_FEED_LIMIT) {
-		$schema_version = get_schema_version();
-
-		if ($schema_version != SCHEMA_VERSION) {
-			die("Schema version is wrong, please upgrade the database.\n");
-		}
-
-		$pdo = Db::pdo();
-
-		if (!SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) {
-			if (DB_TYPE == "pgsql") {
-				$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
-			} else {
-				$login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
-			}
-		} else {
-			$login_thresh_qpart = "";
-		}
-
-		if (DB_TYPE == "pgsql") {
-			$update_limit_qpart = "AND ((
+    public static function calculate_article_hash($article, $pluginhost) {
+        $tmp = "";
+
+        foreach ($article as $k => $v) {
+            if ($k != "feed" && isset($v)) {
+                $x = strip_tags(is_array($v) ? implode(",", $v) : $v);
+
+                $tmp .= sha1("$k:" . sha1($x));
+            }
+        }
+
+        return sha1(implode(",", $pluginhost->get_plugin_names()) . $tmp);
+    }
+
+    // Strips utf8mb4 characters (i.e. emoji) for mysql
+    public static function strip_utf8mb4($str) {
+        return preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $str);
+    }
+
+    public static function cleanup_feed_browser() {
+        $pdo = Db::pdo();
+        $pdo->query("DELETE FROM ttrss_feedbrowser_cache");
+    }
+
+    public static function update_daemon_common($limit = DAEMON_FEED_LIMIT) {
+        $schema_version = get_schema_version();
+
+        if ($schema_version != SCHEMA_VERSION) {
+            die("Schema version is wrong, please upgrade the database.\n");
+        }
+
+        $pdo = Db::pdo();
+
+        if (!SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) {
+            if (DB_TYPE == "pgsql") {
+                $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
+            } else {
+                $login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
+            }
+        } else {
+            $login_thresh_qpart = "";
+        }
+
+        if (DB_TYPE == "pgsql") {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_user_prefs.value != '-1'
 					AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
@@ -55,8 +55,8 @@ 
 					AND ttrss_user_prefs.value != '-1')
 				OR (last_updated = '1970-01-01 00:00:00'
 					AND ttrss_user_prefs.value != '-1'))";
-		} else {
-			$update_limit_qpart = "AND ((
+        } else {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_user_prefs.value != '-1'
 					AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
@@ -67,22 +67,22 @@ 
 					AND ttrss_user_prefs.value != '-1')
 				OR (last_updated = '1970-01-01 00:00:00'
 					AND ttrss_user_prefs.value != '-1'))";
-		}
+        }
 
-		// Test if feed is currently being updated by another process.
-		if (DB_TYPE == "pgsql") {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '10 minutes')";
-		} else {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 10 MINUTE))";
-		}
+        // Test if feed is currently being updated by another process.
+        if (DB_TYPE == "pgsql") {
+            $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '10 minutes')";
+        } else {
+            $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 10 MINUTE))";
+        }
 
-		$query_limit = $limit ? sprintf("LIMIT %d", $limit) : "";
+        $query_limit = $limit ? sprintf("LIMIT %d", $limit) : "";
 
-		// Update the least recently updated feeds first
-		$query_order = "ORDER BY last_updated";
-		if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
+        // Update the least recently updated feeds first
+        $query_order = "ORDER BY last_updated";
+        if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
 
-		$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
+        $query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -94,32 +94,32 @@ 
 				$updstart_thresh_qpart
 				$query_order $query_limit";
 
-		$res = $pdo->query($query);
+        $res = $pdo->query($query);
 
-		$feeds_to_update = array();
-		while ($line = $res->fetch()) {
-			array_push($feeds_to_update, $line['feed_url']);
-		}
+        $feeds_to_update = array();
+        while ($line = $res->fetch()) {
+            array_push($feeds_to_update, $line['feed_url']);
+        }
 
-		Debug::log(sprintf("Scheduled %d feeds to update...", count($feeds_to_update)));
+        Debug::log(sprintf("Scheduled %d feeds to update...", count($feeds_to_update)));
 
-		// Update last_update_started before actually starting the batch
-		// in order to minimize collision risk for parallel daemon tasks
-		if (count($feeds_to_update) > 0) {
-			$feeds_qmarks = arr_qmarks($feeds_to_update);
+        // Update last_update_started before actually starting the batch
+        // in order to minimize collision risk for parallel daemon tasks
+        if (count($feeds_to_update) > 0) {
+            $feeds_qmarks = arr_qmarks($feeds_to_update);
 
-			$tmph = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
+            $tmph = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
 				WHERE feed_url IN ($feeds_qmarks)");
-			$tmph->execute($feeds_to_update);
-		}
+            $tmph->execute($feeds_to_update);
+        }
 
-		$nf = 0;
-		$bstarted = microtime(true);
+        $nf = 0;
+        $bstarted = microtime(true);
 
-		$batch_owners = array();
+        $batch_owners = array();
 
-		// since we have the data cached, we can deal with other feeds with the same url
-		$usth = $pdo->prepare("SELECT DISTINCT ttrss_feeds.id,last_updated,ttrss_feeds.owner_uid
+        // since we have the data cached, we can deal with other feeds with the same url
+        $usth = $pdo->prepare("SELECT DISTINCT ttrss_feeds.id,last_updated,ttrss_feeds.owner_uid
 			FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE
 				ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
 				ttrss_users.id = ttrss_user_prefs.owner_uid AND
@@ -130,715 +130,715 @@ 
 				$login_thresh_qpart
 			ORDER BY ttrss_feeds.id $query_limit");
 
-		foreach ($feeds_to_update as $feed) {
-			Debug::log("Base feed: $feed");
+        foreach ($feeds_to_update as $feed) {
+            Debug::log("Base feed: $feed");
 
-			$usth->execute([$feed]);
-			//update_rss_feed($line["id"], true);
+            $usth->execute([$feed]);
+            //update_rss_feed($line["id"], true);
 
-			if ($tline = $usth->fetch()) {
-				Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
+            if ($tline = $usth->fetch()) {
+                Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
 
-				if (array_search($tline["owner_uid"], $batch_owners) === false)
-					array_push($batch_owners, $tline["owner_uid"]);
+                if (array_search($tline["owner_uid"], $batch_owners) === false)
+                    array_push($batch_owners, $tline["owner_uid"]);
 
-				$fstarted = microtime(true);
+                $fstarted = microtime(true);
 
-				try {
-					RSSUtils::update_rss_feed($tline["id"], true, false);
-				} catch (PDOException $e) {
-					Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
+                try {
+                    RSSUtils::update_rss_feed($tline["id"], true, false);
+                } catch (PDOException $e) {
+                    Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
 
-					try {
-						$pdo->rollback();
-					} catch (PDOException $e) {
-						// it doesn't matter if there wasn't actually anything to rollback, PDO Exception can be
-						// thrown outside of an active transaction during feed update
-					}
-				}
+                    try {
+                        $pdo->rollback();
+                    } catch (PDOException $e) {
+                        // it doesn't matter if there wasn't actually anything to rollback, PDO Exception can be
+                        // thrown outside of an active transaction during feed update
+                    }
+                }
 
-				Debug::log(sprintf("    %.4f (sec)", microtime(true) - $fstarted));
+                Debug::log(sprintf("    %.4f (sec)", microtime(true) - $fstarted));
 
-				++$nf;
-			}
-		}
+                ++$nf;
+            }
+        }
 
-		if ($nf > 0) {
-			Debug::log(sprintf("Processed %d feeds in %.4f (sec), %.4f (sec/feed avg)", $nf,
-				microtime(true) - $bstarted, (microtime(true) - $bstarted) / $nf));
-		}
+        if ($nf > 0) {
+            Debug::log(sprintf("Processed %d feeds in %.4f (sec), %.4f (sec/feed avg)", $nf,
+                microtime(true) - $bstarted, (microtime(true) - $bstarted) / $nf));
+        }
 
-		foreach ($batch_owners as $owner_uid) {
-			Debug::log("Running housekeeping tasks for user $owner_uid...");
+        foreach ($batch_owners as $owner_uid) {
+            Debug::log("Running housekeeping tasks for user $owner_uid...");
 
-			RSSUtils::housekeeping_user($owner_uid);
-		}
+            RSSUtils::housekeeping_user($owner_uid);
+        }
 
-		// Send feed digests by email if needed.
-		Digest::send_headlines_digests();
+        // Send feed digests by email if needed.
+        Digest::send_headlines_digests();
 
-		return $nf;
-	}
+        return $nf;
+    }
 
-	// this is used when subscribing
-	public static function set_basic_feed_info($feed) {
+    // this is used when subscribing
+    public static function set_basic_feed_info($feed) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT owner_uid,feed_url,auth_pass,auth_login
+        $sth = $pdo->prepare("SELECT owner_uid,feed_url,auth_pass,auth_login
 				FROM ttrss_feeds WHERE id = ?");
-		$sth->execute([$feed]);
+        $sth->execute([$feed]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			$owner_uid = $row["owner_uid"];
-			$auth_login = $row["auth_login"];
-			$auth_pass = $row["auth_pass"];
-			$fetch_url = $row["feed_url"];
+            $owner_uid = $row["owner_uid"];
+            $auth_login = $row["auth_login"];
+            $auth_pass = $row["auth_pass"];
+            $fetch_url = $row["feed_url"];
 
-			$pluginhost = new PluginHost();
-			$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
+            $pluginhost = new PluginHost();
+            $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-			$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
-			$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
-			$pluginhost->load_data();
+            $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+            $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
+            $pluginhost->load_data();
 
-			$basic_info = array();
-			foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_BASIC_INFO) as $plugin) {
-				$basic_info = $plugin->hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass);
-			}
+            $basic_info = array();
+            foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_BASIC_INFO) as $plugin) {
+                $basic_info = $plugin->hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass);
+            }
 
-			if (!$basic_info) {
-				$feed_data = fetch_file_contents($fetch_url, false,
-					$auth_login, $auth_pass, false,
-					FEED_FETCH_TIMEOUT,
-					0);
+            if (!$basic_info) {
+                $feed_data = fetch_file_contents($fetch_url, false,
+                    $auth_login, $auth_pass, false,
+                    FEED_FETCH_TIMEOUT,
+                    0);
 
-				$feed_data = trim($feed_data);
+                $feed_data = trim($feed_data);
 
-				$rss = new FeedParser($feed_data);
-				$rss->init();
+                $rss = new FeedParser($feed_data);
+                $rss->init();
 
-				if (!$rss->error()) {
-					$basic_info = array(
-						'title' => mb_substr(clean($rss->get_title()), 0, 199),
-						'site_url' => mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245)
-					);
-				}
-			}
+                if (!$rss->error()) {
+                    $basic_info = array(
+                        'title' => mb_substr(clean($rss->get_title()), 0, 199),
+                        'site_url' => mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245)
+                    );
+                }
+            }
 
-			if ($basic_info && is_array($basic_info)) {
-				$sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
-				$sth->execute([$feed]);
+            if ($basic_info && is_array($basic_info)) {
+                $sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
+                $sth->execute([$feed]);
 
-				if ($row = $sth->fetch()) {
+                if ($row = $sth->fetch()) {
 
-					$registered_title = $row["title"];
-					$orig_site_url = $row["site_url"];
+                    $registered_title = $row["title"];
+                    $orig_site_url = $row["site_url"];
 
-					if ($basic_info['title'] && (!$registered_title || $registered_title == "[Unknown]")) {
+                    if ($basic_info['title'] && (!$registered_title || $registered_title == "[Unknown]")) {
 
-						$sth = $pdo->prepare("UPDATE ttrss_feeds SET
+                        $sth = $pdo->prepare("UPDATE ttrss_feeds SET
 							title = ? WHERE id = ?");
-						$sth->execute([$basic_info['title'], $feed]);
-					}
+                        $sth->execute([$basic_info['title'], $feed]);
+                    }
 
-					if ($basic_info['site_url'] && $orig_site_url != $basic_info['site_url']) {
-						$sth = $pdo->prepare("UPDATE ttrss_feeds SET
+                    if ($basic_info['site_url'] && $orig_site_url != $basic_info['site_url']) {
+                        $sth = $pdo->prepare("UPDATE ttrss_feeds SET
 							site_url = ? WHERE id = ?");
-						$sth->execute([$basic_info['site_url'], $feed]);
-					}
+                        $sth->execute([$basic_info['site_url'], $feed]);
+                    }
 
-				}
-			}
-		}
-	}
+                }
+            }
+        }
+    }
 
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public static function update_rss_feed($feed, $no_cache = false) {
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public static function update_rss_feed($feed, $no_cache = false) {
 
-		reset_fetch_domain_quota();
+        reset_fetch_domain_quota();
 
-		Debug::log("start", Debug::$LOG_VERBOSE);
+        Debug::log("start", Debug::$LOG_VERBOSE);
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
-		$sth->execute([$feed]);
+        $sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
+        $sth->execute([$feed]);
 
-		if (!$row = $sth->fetch()) {
-			Debug::log("feed $feed not found, skipping.");
-			user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
-			return false;
-		}
+        if (!$row = $sth->fetch()) {
+            Debug::log("feed $feed not found, skipping.");
+            user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
+            return false;
+        }
 
-		$title = $row["title"];
-		$site_url = $row["site_url"];
+        $title = $row["title"];
+        $site_url = $row["site_url"];
 
-		// feed was batch-subscribed or something, we need to get basic info
-		// this is not optimal currently as it fetches stuff separately TODO: optimize
-		if ($title == "[Unknown]" || !$title || !$site_url) {
-			Debug::log("setting basic feed info for $feed [$title, $site_url]...");
-			RSSUtils::set_basic_feed_info($feed);
-		}
+        // feed was batch-subscribed or something, we need to get basic info
+        // this is not optimal currently as it fetches stuff separately TODO: optimize
+        if ($title == "[Unknown]" || !$title || !$site_url) {
+            Debug::log("setting basic feed info for $feed [$title, $site_url]...");
+            RSSUtils::set_basic_feed_info($feed);
+        }
 
-		$sth = $pdo->prepare("SELECT id,update_interval,auth_login,
+        $sth = $pdo->prepare("SELECT id,update_interval,auth_login,
 			feed_url,auth_pass,cache_images,
 			mark_unread_on_update, owner_uid,
 			auth_pass_encrypted, feed_language,
 			last_modified,
 			".SUBSTRING_FOR_DATE."(last_unconditional, 1, 19) AS last_unconditional
 			FROM ttrss_feeds WHERE id = ?");
-		$sth->execute([$feed]);
+        $sth->execute([$feed]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			$owner_uid = $row["owner_uid"];
-			$mark_unread_on_update = $row["mark_unread_on_update"];
+            $owner_uid = $row["owner_uid"];
+            $mark_unread_on_update = $row["mark_unread_on_update"];
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
+            $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
 				WHERE id = ?");
-			$sth->execute([$feed]);
+            $sth->execute([$feed]);
 
-			$auth_login = $row["auth_login"];
-			$auth_pass = $row["auth_pass"];
-			$stored_last_modified = $row["last_modified"];
-			$last_unconditional = $row["last_unconditional"];
-			$cache_images = $row["cache_images"];
-			$fetch_url = $row["feed_url"];
+            $auth_login = $row["auth_login"];
+            $auth_pass = $row["auth_pass"];
+            $stored_last_modified = $row["last_modified"];
+            $last_unconditional = $row["last_unconditional"];
+            $cache_images = $row["cache_images"];
+            $fetch_url = $row["feed_url"];
 
-			$feed_language = mb_strtolower($row["feed_language"]);
+            $feed_language = mb_strtolower($row["feed_language"]);
 
-			if (!$feed_language)
-				$feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
+            if (!$feed_language)
+                $feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
 
-			if (!$feed_language)
-				$feed_language = 'simple';
+            if (!$feed_language)
+                $feed_language = 'simple';
 
-		} else {
-			return false;
-		}
+        } else {
+            return false;
+        }
 
-		$date_feed_processed = date('Y-m-d H:i');
+        $date_feed_processed = date('Y-m-d H:i');
 
-		$cache_filename = CACHE_DIR . "/feeds/" . sha1($fetch_url) . ".xml";
+        $cache_filename = CACHE_DIR . "/feeds/" . sha1($fetch_url) . ".xml";
 
-		$pluginhost = new PluginHost();
-		$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
+        $pluginhost = new PluginHost();
+        $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-		$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
-		$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
-		$pluginhost->load_data();
+        $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+        $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
+        $pluginhost->load_data();
 
-		$rss_hash = false;
+        $rss_hash = false;
 
-		$force_refetch = isset($_REQUEST["force_refetch"]);
-		$feed_data = "";
+        $force_refetch = isset($_REQUEST["force_refetch"]);
+        $feed_data = "";
 
-		Debug::log("running HOOK_FETCH_FEED handlers...", Debug::$LOG_VERBOSE);
+        Debug::log("running HOOK_FETCH_FEED handlers...", Debug::$LOG_VERBOSE);
 
-		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
-			$start = microtime(true);
-			$feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
-			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-		}
+        foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
+            Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+            $start = microtime(true);
+            $feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
+            Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+        }
 
-		if ($feed_data) {
-			Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
-		} else {
-			Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
-		}
+        if ($feed_data) {
+            Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
+        } else {
+            Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
+        }
 
-		// try cache
-		if (!$feed_data &&
-			file_exists($cache_filename) &&
-			is_readable($cache_filename) &&
-			!$auth_login && !$auth_pass &&
-			filemtime($cache_filename) > time() - 30) {
+        // try cache
+        if (!$feed_data &&
+            file_exists($cache_filename) &&
+            is_readable($cache_filename) &&
+            !$auth_login && !$auth_pass &&
+            filemtime($cache_filename) > time() - 30) {
 
-			Debug::log("using local cache [$cache_filename].", Debug::$LOG_VERBOSE);
+            Debug::log("using local cache [$cache_filename].", Debug::$LOG_VERBOSE);
 
-			@$feed_data = file_get_contents($cache_filename);
+            @$feed_data = file_get_contents($cache_filename);
 
-			if ($feed_data) {
-				$rss_hash = sha1($feed_data);
-			}
+            if ($feed_data) {
+                $rss_hash = sha1($feed_data);
+            }
 
-		} else {
-			Debug::log("local cache will not be used for this feed", Debug::$LOG_VERBOSE);
-		}
+        } else {
+            Debug::log("local cache will not be used for this feed", Debug::$LOG_VERBOSE);
+        }
 
-		global $fetch_last_modified;
+        global $fetch_last_modified;
 
-		// fetch feed from source
-		if (!$feed_data) {
-			Debug::log("last unconditional update request: $last_unconditional", Debug::$LOG_VERBOSE);
+        // fetch feed from source
+        if (!$feed_data) {
+            Debug::log("last unconditional update request: $last_unconditional", Debug::$LOG_VERBOSE);
 
-			if (ini_get("open_basedir") && function_exists("curl_init")) {
-				Debug::log("not using CURL due to open_basedir restrictions", Debug::$LOG_VERBOSE);
-			}
+            if (ini_get("open_basedir") && function_exists("curl_init")) {
+                Debug::log("not using CURL due to open_basedir restrictions", Debug::$LOG_VERBOSE);
+            }
 
-			if (time() - strtotime($last_unconditional) > MAX_CONDITIONAL_INTERVAL) {
-				Debug::log("maximum allowed interval for conditional requests exceeded, forcing refetch", Debug::$LOG_VERBOSE);
+            if (time() - strtotime($last_unconditional) > MAX_CONDITIONAL_INTERVAL) {
+                Debug::log("maximum allowed interval for conditional requests exceeded, forcing refetch", Debug::$LOG_VERBOSE);
 
-				$force_refetch = true;
-			} else {
-				Debug::log("stored last modified for conditional request: $stored_last_modified", Debug::$LOG_VERBOSE);
-			}
+                $force_refetch = true;
+            } else {
+                Debug::log("stored last modified for conditional request: $stored_last_modified", Debug::$LOG_VERBOSE);
+            }
 
-			Debug::log("fetching [$fetch_url] (force_refetch: $force_refetch)...", Debug::$LOG_VERBOSE);
+            Debug::log("fetching [$fetch_url] (force_refetch: $force_refetch)...", Debug::$LOG_VERBOSE);
 
-			$feed_data = fetch_file_contents([
-				"url" => $fetch_url,
-				"login" => $auth_login,
-				"pass" => $auth_pass,
-				"timeout" => $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
-				"last_modified" => $force_refetch ? "" : $stored_last_modified
-			]);
+            $feed_data = fetch_file_contents([
+                "url" => $fetch_url,
+                "login" => $auth_login,
+                "pass" => $auth_pass,
+                "timeout" => $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
+                "last_modified" => $force_refetch ? "" : $stored_last_modified
+            ]);
 
-			$feed_data = trim($feed_data);
+            $feed_data = trim($feed_data);
 
-			Debug::log("fetch done.", Debug::$LOG_VERBOSE);
-			Debug::log("source last modified: " . $fetch_last_modified, Debug::$LOG_VERBOSE);
+            Debug::log("fetch done.", Debug::$LOG_VERBOSE);
+            Debug::log("source last modified: " . $fetch_last_modified, Debug::$LOG_VERBOSE);
 
-			if ($feed_data && $fetch_last_modified != $stored_last_modified) {
-				$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_modified = ? WHERE id = ?");
-				$sth->execute([substr($fetch_last_modified, 0, 245), $feed]);
-			}
+            if ($feed_data && $fetch_last_modified != $stored_last_modified) {
+                $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_modified = ? WHERE id = ?");
+                $sth->execute([substr($fetch_last_modified, 0, 245), $feed]);
+            }
 
-			// cache vanilla feed data for re-use
-			if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/feeds")) {
-				$new_rss_hash = sha1($feed_data);
+            // cache vanilla feed data for re-use
+            if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/feeds")) {
+                $new_rss_hash = sha1($feed_data);
 
-				if ($new_rss_hash != $rss_hash) {
-					Debug::log("saving $cache_filename", Debug::$LOG_VERBOSE);
-					@file_put_contents($cache_filename, $feed_data);
-				}
-			}
-		}
+                if ($new_rss_hash != $rss_hash) {
+                    Debug::log("saving $cache_filename", Debug::$LOG_VERBOSE);
+                    @file_put_contents($cache_filename, $feed_data);
+                }
+            }
+        }
 
-		if (!$feed_data) {
-			global $fetch_last_error;
-			global $fetch_last_error_code;
+        if (!$feed_data) {
+            global $fetch_last_error;
+            global $fetch_last_error_code;
 
-			Debug::log("unable to fetch: $fetch_last_error [$fetch_last_error_code]", Debug::$LOG_VERBOSE);
+            Debug::log("unable to fetch: $fetch_last_error [$fetch_last_error_code]", Debug::$LOG_VERBOSE);
 
-			// If-Modified-Since
-			if ($fetch_last_error_code != 304) {
-				$error_message = $fetch_last_error;
-			} else {
-				Debug::log("source claims data not modified, nothing to do.", Debug::$LOG_VERBOSE);
-				$error_message = "";
-			}
+            // If-Modified-Since
+            if ($fetch_last_error_code != 304) {
+                $error_message = $fetch_last_error;
+            } else {
+                Debug::log("source claims data not modified, nothing to do.", Debug::$LOG_VERBOSE);
+                $error_message = "";
+            }
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
+            $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
 					last_updated = NOW() WHERE id = ?");
-			$sth->execute([$error_message, $feed]);
+            $sth->execute([$error_message, $feed]);
 
-			return;
-		}
+            return;
+        }
 
-		Debug::log("running HOOK_FEED_FETCHED handlers...", Debug::$LOG_VERBOSE);
-		$feed_data_checksum = md5($feed_data);
+        Debug::log("running HOOK_FEED_FETCHED handlers...", Debug::$LOG_VERBOSE);
+        $feed_data_checksum = md5($feed_data);
 
-		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
-			$start = microtime(true);
-			$feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed);
-			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-		}
+        foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) {
+            Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+            $start = microtime(true);
+            $feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed);
+            Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+        }
 
-		if (md5($feed_data) != $feed_data_checksum) {
-			Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
-		} else {
-			Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
-		}
+        if (md5($feed_data) != $feed_data_checksum) {
+            Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
+        } else {
+            Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
+        }
 
-		$rss = new FeedParser($feed_data);
-		$rss->init();
+        $rss = new FeedParser($feed_data);
+        $rss->init();
 
-		if (!$rss->error()) {
+        if (!$rss->error()) {
 
-			Debug::log("running HOOK_FEED_PARSED handlers...", Debug::$LOG_VERBOSE);
+            Debug::log("running HOOK_FEED_PARSED handlers...", Debug::$LOG_VERBOSE);
 
-			// We use local pluginhost here because we need to load different per-user feed plugins
+            // We use local pluginhost here because we need to load different per-user feed plugins
 
-			foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_PARSED) as $plugin) {
-				Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
-				$start = microtime(true);
-				$plugin->hook_feed_parsed($rss);
-				Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-			}
+            foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_PARSED) as $plugin) {
+                Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+                $start = microtime(true);
+                $plugin->hook_feed_parsed($rss);
+                Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+            }
 
-			Debug::log("language: $feed_language", Debug::$LOG_VERBOSE);
-			Debug::log("processing feed data...", Debug::$LOG_VERBOSE);
+            Debug::log("language: $feed_language", Debug::$LOG_VERBOSE);
+            Debug::log("processing feed data...", Debug::$LOG_VERBOSE);
 
-			if (DB_TYPE == "pgsql") {
-				$favicon_interval_qpart = "favicon_last_checked < NOW() - INTERVAL '12 hour'";
-			} else {
-				$favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
-			}
+            if (DB_TYPE == "pgsql") {
+                $favicon_interval_qpart = "favicon_last_checked < NOW() - INTERVAL '12 hour'";
+            } else {
+                $favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
+            }
 
-			$sth = $pdo->prepare("SELECT owner_uid,favicon_avg_color,
+            $sth = $pdo->prepare("SELECT owner_uid,favicon_avg_color,
 				(favicon_last_checked IS NULL OR $favicon_interval_qpart) AS
 						favicon_needs_check
 				FROM ttrss_feeds WHERE id = ?");
-			$sth->execute([$feed]);
+            $sth->execute([$feed]);
 
-			if ($row = $sth->fetch()) {
-				$favicon_needs_check = $row["favicon_needs_check"];
-				$favicon_avg_color = $row["favicon_avg_color"];
-				$owner_uid = $row["owner_uid"];
-			} else {
-				return false;
-			}
+            if ($row = $sth->fetch()) {
+                $favicon_needs_check = $row["favicon_needs_check"];
+                $favicon_avg_color = $row["favicon_avg_color"];
+                $owner_uid = $row["owner_uid"];
+            } else {
+                return false;
+            }
 
-			$site_url = mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245);
+            $site_url = mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245);
 
-			Debug::log("site_url: $site_url", Debug::$LOG_VERBOSE);
-			Debug::log("feed_title: " . clean($rss->get_title()), Debug::$LOG_VERBOSE);
+            Debug::log("site_url: $site_url", Debug::$LOG_VERBOSE);
+            Debug::log("feed_title: " . clean($rss->get_title()), Debug::$LOG_VERBOSE);
 
-			if ($favicon_needs_check || $force_refetch) {
+            if ($favicon_needs_check || $force_refetch) {
 
-				/* terrible hack: if we crash on floicon shit here, we won't check
+                /* terrible hack: if we crash on floicon shit here, we won't check
 				 * the icon avgcolor again (unless the icon got updated) */
 
-				$favicon_file = ICONS_DIR . "/$feed.ico";
-				$favicon_modified = @filemtime($favicon_file);
+                $favicon_file = ICONS_DIR . "/$feed.ico";
+                $favicon_modified = @filemtime($favicon_file);
 
-				Debug::log("checking favicon...", Debug::$LOG_VERBOSE);
+                Debug::log("checking favicon...", Debug::$LOG_VERBOSE);
 
-				RSSUtils::check_feed_favicon($site_url, $feed);
-				$favicon_modified_new = @filemtime($favicon_file);
+                RSSUtils::check_feed_favicon($site_url, $feed);
+                $favicon_modified_new = @filemtime($favicon_file);
 
-				if ($favicon_modified_new > $favicon_modified)
-					$favicon_avg_color = '';
+                if ($favicon_modified_new > $favicon_modified)
+                    $favicon_avg_color = '';
 
-				$favicon_colorstring = "";
-				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
-					require_once "colors.php";
+                $favicon_colorstring = "";
+                if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
+                    require_once "colors.php";
 
-					$sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
+                    $sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
 							id = ?");
-					$sth->execute([$feed]);
+                    $sth->execute([$feed]);
 
-					$favicon_color = calculate_avg_color($favicon_file);
+                    $favicon_color = calculate_avg_color($favicon_file);
 
-					$favicon_colorstring = ",favicon_avg_color = " . $pdo->quote($favicon_color);
+                    $favicon_colorstring = ",favicon_avg_color = " . $pdo->quote($favicon_color);
 
-				} else if ($favicon_avg_color == 'fail') {
-					Debug::log("floicon failed on this file, not trying to recalculate avg color", Debug::$LOG_VERBOSE);
-				}
+                } else if ($favicon_avg_color == 'fail') {
+                    Debug::log("floicon failed on this file, not trying to recalculate avg color", Debug::$LOG_VERBOSE);
+                }
 
-				$sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_last_checked = NOW()
+                $sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_last_checked = NOW()
 					$favicon_colorstring WHERE id = ?");
-				$sth->execute([$feed]);
-			}
+                $sth->execute([$feed]);
+            }
 
-			Debug::log("loading filters & labels...", Debug::$LOG_VERBOSE);
+            Debug::log("loading filters & labels...", Debug::$LOG_VERBOSE);
 
-			$filters = RSSUtils::load_filters($feed, $owner_uid);
+            $filters = RSSUtils::load_filters($feed, $owner_uid);
 
-			if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-				print_r($filters);
-			}
+            if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                print_r($filters);
+            }
 
-			Debug::log("" . count($filters) . " filters loaded.", Debug::$LOG_VERBOSE);
+            Debug::log("" . count($filters) . " filters loaded.", Debug::$LOG_VERBOSE);
 
-			$items = $rss->get_items();
+            $items = $rss->get_items();
 
-			if (!is_array($items)) {
-				Debug::log("no articles found.", Debug::$LOG_VERBOSE);
+            if (!is_array($items)) {
+                Debug::log("no articles found.", Debug::$LOG_VERBOSE);
 
-				$sth = $pdo->prepare("UPDATE ttrss_feeds
+                $sth = $pdo->prepare("UPDATE ttrss_feeds
 					SET last_updated = NOW(), last_unconditional = NOW(), last_error = '' WHERE id = ?");
-				$sth->execute([$feed]);
+                $sth->execute([$feed]);
 
-				return true; // no articles
-			}
+                return true; // no articles
+            }
 
-			Debug::log("processing articles...", Debug::$LOG_VERBOSE);
+            Debug::log("processing articles...", Debug::$LOG_VERBOSE);
 
-			$tstart = time();
+            $tstart = time();
 
-			foreach ($items as $item) {
-				$pdo->beginTransaction();
+            foreach ($items as $item) {
+                $pdo->beginTransaction();
 
-				if (Debug::get_loglevel() >= 3) {
-					print_r($item);
-				}
+                if (Debug::get_loglevel() >= 3) {
+                    print_r($item);
+                }
 
-				if (ini_get("max_execution_time") > 0 && time() - $tstart >= ini_get("max_execution_time") * 0.7) {
-					Debug::log("looks like there's too many articles to process at once, breaking out", Debug::$LOG_VERBOSE);
-					$pdo->commit();
-					break;
-				}
+                if (ini_get("max_execution_time") > 0 && time() - $tstart >= ini_get("max_execution_time") * 0.7) {
+                    Debug::log("looks like there's too many articles to process at once, breaking out", Debug::$LOG_VERBOSE);
+                    $pdo->commit();
+                    break;
+                }
 
-				$entry_guid = strip_tags($item->get_id());
-				if (!$entry_guid) $entry_guid = strip_tags($item->get_link());
-				if (!$entry_guid) $entry_guid = RSSUtils::make_guid_from_title($item->get_title());
+                $entry_guid = strip_tags($item->get_id());
+                if (!$entry_guid) $entry_guid = strip_tags($item->get_link());
+                if (!$entry_guid) $entry_guid = RSSUtils::make_guid_from_title($item->get_title());
 
-				if (!$entry_guid) {
-					$pdo->commit();
-					continue;
-				}
+                if (!$entry_guid) {
+                    $pdo->commit();
+                    continue;
+                }
 
-				$entry_guid = "$owner_uid,$entry_guid";
+                $entry_guid = "$owner_uid,$entry_guid";
 
-				$entry_guid_hashed = 'SHA1:' . sha1($entry_guid);
+                $entry_guid_hashed = 'SHA1:' . sha1($entry_guid);
 
-				Debug::log("guid $entry_guid / $entry_guid_hashed", Debug::$LOG_VERBOSE);
+                Debug::log("guid $entry_guid / $entry_guid_hashed", Debug::$LOG_VERBOSE);
 
-				$entry_timestamp = (int)$item->get_date();
+                $entry_timestamp = (int)$item->get_date();
 
-				Debug::log("orig date: " . $item->get_date(), Debug::$LOG_VERBOSE);
+                Debug::log("orig date: " . $item->get_date(), Debug::$LOG_VERBOSE);
 
-				$entry_title = strip_tags($item->get_title());
+                $entry_title = strip_tags($item->get_title());
 
-				$entry_link = rewrite_relative_url($site_url, clean($item->get_link()));
+                $entry_link = rewrite_relative_url($site_url, clean($item->get_link()));
 
-				$entry_language = mb_substr(trim($item->get_language()), 0, 2);
+                $entry_language = mb_substr(trim($item->get_language()), 0, 2);
 
-				Debug::log("title $entry_title", Debug::$LOG_VERBOSE);
-				Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
-				Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
+                Debug::log("title $entry_title", Debug::$LOG_VERBOSE);
+                Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
+                Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
 
-				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
+                if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
 
-				$entry_content = $item->get_content();
-				if (!$entry_content) $entry_content = $item->get_description();
+                $entry_content = $item->get_content();
+                if (!$entry_content) $entry_content = $item->get_description();
 
-				if (Debug::get_loglevel() >= 3) {
-					print "content: ";
-					print htmlspecialchars($entry_content);
-					print "\n";
-				}
+                if (Debug::get_loglevel() >= 3) {
+                    print "content: ";
+                    print htmlspecialchars($entry_content);
+                    print "\n";
+                }
 
-				$entry_comments = mb_substr(strip_tags($item->get_comments_url()), 0, 245);
-				$num_comments = (int) $item->get_comments_count();
+                $entry_comments = mb_substr(strip_tags($item->get_comments_url()), 0, 245);
+                $num_comments = (int) $item->get_comments_count();
 
-				$entry_author = strip_tags($item->get_author());
-				$entry_guid = mb_substr($entry_guid, 0, 245);
+                $entry_author = strip_tags($item->get_author());
+                $entry_guid = mb_substr($entry_guid, 0, 245);
 
-				Debug::log("author $entry_author", Debug::$LOG_VERBOSE);
-				Debug::log("looking for tags...", Debug::$LOG_VERBOSE);
+                Debug::log("author $entry_author", Debug::$LOG_VERBOSE);
+                Debug::log("looking for tags...", Debug::$LOG_VERBOSE);
 
-				$entry_tags = $item->get_categories();
-				Debug::log("tags found: " . join(", ", $entry_tags), Debug::$LOG_VERBOSE);
+                $entry_tags = $item->get_categories();
+                Debug::log("tags found: " . join(", ", $entry_tags), Debug::$LOG_VERBOSE);
 
-				Debug::log("done collecting data.", Debug::$LOG_VERBOSE);
+                Debug::log("done collecting data.", Debug::$LOG_VERBOSE);
 
-				$sth = $pdo->prepare("SELECT id, content_hash, lang FROM ttrss_entries
+                $sth = $pdo->prepare("SELECT id, content_hash, lang FROM ttrss_entries
 					WHERE guid = ? OR guid = ?");
-				$sth->execute([$entry_guid, $entry_guid_hashed]);
-
-				if ($row = $sth->fetch()) {
-					$base_entry_id = $row["id"];
-					$entry_stored_hash = $row["content_hash"];
-					$article_labels = Article::get_article_labels($base_entry_id, $owner_uid);
-
-					$existing_tags = Article::get_article_tags($base_entry_id, $owner_uid);
-					$entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
-				} else {
-					$base_entry_id = false;
-					$entry_stored_hash = "";
-					$article_labels = array();
-				}
-
-				$article = array("owner_uid" => $owner_uid, // read only
-					"guid" => $entry_guid, // read only
-					"guid_hashed" => $entry_guid_hashed, // read only
-					"title" => $entry_title,
-					"content" => $entry_content,
-					"link" => $entry_link,
-					"labels" => $article_labels, // current limitation: can add labels to article, can't remove them
-					"tags" => $entry_tags,
-					"author" => $entry_author,
-					"force_catchup" => false, // ugly hack for the time being
-					"score_modifier" => 0, // no previous value, plugin should recalculate score modifier based on content if needed
-					"language" => $entry_language,
-					"timestamp" => $entry_timestamp,
-					"num_comments" => $num_comments,
-					"feed" => array("id" => $feed,
-						"fetch_url" => $fetch_url,
-						"site_url" => $site_url,
-						"cache_images" => $cache_images)
-				);
-
-				$entry_plugin_data = "";
-				$entry_current_hash = RSSUtils::calculate_article_hash($article, $pluginhost);
-
-				Debug::log("article hash: $entry_current_hash [stored=$entry_stored_hash]", Debug::$LOG_VERBOSE);
-
-				if ($entry_current_hash == $entry_stored_hash && !isset($_REQUEST["force_rehash"])) {
-					Debug::log("stored article seems up to date [IID: $base_entry_id], updating timestamp only", Debug::$LOG_VERBOSE);
-
-					// we keep encountering the entry in feeds, so we need to
-					// update date_updated column so that we don't get horrible
-					// dupes when the entry gets purged and reinserted again e.g.
-					// in the case of SLOW SLOW OMG SLOW updating feeds
-
-					$sth = $pdo->prepare("UPDATE ttrss_entries SET date_updated = NOW()
+                $sth->execute([$entry_guid, $entry_guid_hashed]);
+
+                if ($row = $sth->fetch()) {
+                    $base_entry_id = $row["id"];
+                    $entry_stored_hash = $row["content_hash"];
+                    $article_labels = Article::get_article_labels($base_entry_id, $owner_uid);
+
+                    $existing_tags = Article::get_article_tags($base_entry_id, $owner_uid);
+                    $entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
+                } else {
+                    $base_entry_id = false;
+                    $entry_stored_hash = "";
+                    $article_labels = array();
+                }
+
+                $article = array("owner_uid" => $owner_uid, // read only
+                    "guid" => $entry_guid, // read only
+                    "guid_hashed" => $entry_guid_hashed, // read only
+                    "title" => $entry_title,
+                    "content" => $entry_content,
+                    "link" => $entry_link,
+                    "labels" => $article_labels, // current limitation: can add labels to article, can't remove them
+                    "tags" => $entry_tags,
+                    "author" => $entry_author,
+                    "force_catchup" => false, // ugly hack for the time being
+                    "score_modifier" => 0, // no previous value, plugin should recalculate score modifier based on content if needed
+                    "language" => $entry_language,
+                    "timestamp" => $entry_timestamp,
+                    "num_comments" => $num_comments,
+                    "feed" => array("id" => $feed,
+                        "fetch_url" => $fetch_url,
+                        "site_url" => $site_url,
+                        "cache_images" => $cache_images)
+                );
+
+                $entry_plugin_data = "";
+                $entry_current_hash = RSSUtils::calculate_article_hash($article, $pluginhost);
+
+                Debug::log("article hash: $entry_current_hash [stored=$entry_stored_hash]", Debug::$LOG_VERBOSE);
+
+                if ($entry_current_hash == $entry_stored_hash && !isset($_REQUEST["force_rehash"])) {
+                    Debug::log("stored article seems up to date [IID: $base_entry_id], updating timestamp only", Debug::$LOG_VERBOSE);
+
+                    // we keep encountering the entry in feeds, so we need to
+                    // update date_updated column so that we don't get horrible
+                    // dupes when the entry gets purged and reinserted again e.g.
+                    // in the case of SLOW SLOW OMG SLOW updating feeds
+
+                    $sth = $pdo->prepare("UPDATE ttrss_entries SET date_updated = NOW()
 						WHERE id = ?");
-					$sth->execute([$base_entry_id]);
+                    $sth->execute([$base_entry_id]);
 
-					$pdo->commit();
-					continue;
-				}
+                    $pdo->commit();
+                    continue;
+                }
 
-				Debug::log("hash differs, applying plugin filters:", Debug::$LOG_VERBOSE);
+                Debug::log("hash differs, applying plugin filters:", Debug::$LOG_VERBOSE);
 
-				foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
-					Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+                foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
+                    Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
 
-					$start = microtime(true);
-					$article = $plugin->hook_article_filter($article);
+                    $start = microtime(true);
+                    $article = $plugin->hook_article_filter($article);
 
-					Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+                    Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
 
-					$entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
-				}
+                    $entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
+                }
 
                 if (Debug::get_loglevel() >= 3) {
-					print "processed content: ";
-					print htmlspecialchars($article["content"]);
-					print "\n";
-				}
+                    print "processed content: ";
+                    print htmlspecialchars($article["content"]);
+                    print "\n";
+                }
 
-				Debug::log("plugin data: $entry_plugin_data", Debug::$LOG_VERBOSE);
+                Debug::log("plugin data: $entry_plugin_data", Debug::$LOG_VERBOSE);
 
-				// Workaround: 4-byte unicode requires utf8mb4 in MySQL. See https://tt-rss.org/forum/viewtopic.php?f=1&t=3377&p=20077#p20077
-				if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
-					foreach ($article as $k => $v) {
-						// i guess we'll have to take the risk of 4byte unicode labels & tags here
-						if (is_string($article[$k])) {
-							$article[$k] = RSSUtils::strip_utf8mb4($v);
-						}
-					}
-				}
+                // Workaround: 4-byte unicode requires utf8mb4 in MySQL. See https://tt-rss.org/forum/viewtopic.php?f=1&t=3377&p=20077#p20077
+                if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
+                    foreach ($article as $k => $v) {
+                        // i guess we'll have to take the risk of 4byte unicode labels & tags here
+                        if (is_string($article[$k])) {
+                            $article[$k] = RSSUtils::strip_utf8mb4($v);
+                        }
+                    }
+                }
 
-				/* Collect article tags here so we could filter by them: */
+                /* Collect article tags here so we could filter by them: */
 
-				$matched_rules = [];
-				$matched_filters = [];
+                $matched_rules = [];
+                $matched_filters = [];
 
-				$article_filters = RSSUtils::get_article_filters($filters, $article["title"],
-					$article["content"], $article["link"], $article["author"],
-					$article["tags"], $matched_rules, $matched_filters);
+                $article_filters = RSSUtils::get_article_filters($filters, $article["title"],
+                    $article["content"], $article["link"], $article["author"],
+                    $article["tags"], $matched_rules, $matched_filters);
 
-				// $article_filters should be renamed to something like $filter_actions; actual filter objects are in $matched_filters
-				foreach ($pluginhost->get_hooks(PluginHost::HOOK_FILTER_TRIGGERED) as $plugin) {
-					$plugin->hook_filter_triggered($feed, $owner_uid, $article, $matched_filters, $matched_rules, $article_filters);
-				}
+                // $article_filters should be renamed to something like $filter_actions; actual filter objects are in $matched_filters
+                foreach ($pluginhost->get_hooks(PluginHost::HOOK_FILTER_TRIGGERED) as $plugin) {
+                    $plugin->hook_filter_triggered($feed, $owner_uid, $article, $matched_filters, $matched_rules, $article_filters);
+                }
 
-				$matched_filter_ids = array_map(function($f) { return $f['id']; }, $matched_filters);
+                $matched_filter_ids = array_map(function($f) { return $f['id']; }, $matched_filters);
 
-				if (count($matched_filter_ids) > 0) {
-					$filter_ids_qmarks = arr_qmarks($matched_filter_ids);
+                if (count($matched_filter_ids) > 0) {
+                    $filter_ids_qmarks = arr_qmarks($matched_filter_ids);
 
-					$fsth = $pdo->prepare("UPDATE ttrss_filters2 SET last_triggered = NOW() WHERE
+                    $fsth = $pdo->prepare("UPDATE ttrss_filters2 SET last_triggered = NOW() WHERE
 							   id IN ($filter_ids_qmarks) AND owner_uid = ?");
 
-					$fsth->execute(array_merge($matched_filter_ids, [$owner_uid]));
-				}
+                    $fsth->execute(array_merge($matched_filter_ids, [$owner_uid]));
+                }
 
-				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-					Debug::log("matched filters: ", Debug::$LOG_VERBOSE);
+                if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                    Debug::log("matched filters: ", Debug::$LOG_VERBOSE);
 
-					if (count($matched_filters != 0)) {
-						print_r($matched_filters);
-					}
+                    if (count($matched_filters != 0)) {
+                        print_r($matched_filters);
+                    }
 
-					Debug::log("matched filter rules: ", Debug::$LOG_VERBOSE);
+                    Debug::log("matched filter rules: ", Debug::$LOG_VERBOSE);
 
-					if (count($matched_rules) != 0) {
-						print_r($matched_rules);
-					}
+                    if (count($matched_rules) != 0) {
+                        print_r($matched_rules);
+                    }
 
-					Debug::log("filter actions: ", Debug::$LOG_VERBOSE);
+                    Debug::log("filter actions: ", Debug::$LOG_VERBOSE);
 
-					if (count($article_filters) != 0) {
-						print_r($article_filters);
-					}
-				}
+                    if (count($article_filters) != 0) {
+                        print_r($article_filters);
+                    }
+                }
 
-				$plugin_filter_names = RSSUtils::find_article_filters($article_filters, "plugin");
-				$plugin_filter_actions = $pluginhost->get_filter_actions();
+                $plugin_filter_names = RSSUtils::find_article_filters($article_filters, "plugin");
+                $plugin_filter_actions = $pluginhost->get_filter_actions();
 
-				if (count($plugin_filter_names) > 0) {
-					Debug::log("applying plugin filter actions...", Debug::$LOG_VERBOSE);
+                if (count($plugin_filter_names) > 0) {
+                    Debug::log("applying plugin filter actions...", Debug::$LOG_VERBOSE);
 
-					foreach ($plugin_filter_names as $pfn) {
-						list($pfclass,$pfaction) = explode(":", $pfn["param"]);
+                    foreach ($plugin_filter_names as $pfn) {
+                        list($pfclass,$pfaction) = explode(":", $pfn["param"]);
 
-						if (isset($plugin_filter_actions[$pfclass])) {
-							$plugin = $pluginhost->get_plugin($pfclass);
+                        if (isset($plugin_filter_actions[$pfclass])) {
+                            $plugin = $pluginhost->get_plugin($pfclass);
 
-							Debug::log("... $pfclass: $pfaction", Debug::$LOG_VERBOSE);
+                            Debug::log("... $pfclass: $pfaction", Debug::$LOG_VERBOSE);
 
-							if ($plugin) {
-								$start = microtime(true);
-								$article = $plugin->hook_article_filter_action($article, $pfaction);
+                            if ($plugin) {
+                                $start = microtime(true);
+                                $article = $plugin->hook_article_filter_action($article, $pfaction);
 
-								Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-							} else {
-								Debug::log("??? $pfclass: plugin object not found.", Debug::$LOG_VERBOSE);
-							}
-						} else {
-							Debug::log("??? $pfclass: filter plugin not registered.", Debug::$LOG_VERBOSE);
-						}
-					}
-				}
+                                Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+                            } else {
+                                Debug::log("??? $pfclass: plugin object not found.", Debug::$LOG_VERBOSE);
+                            }
+                        } else {
+                            Debug::log("??? $pfclass: filter plugin not registered.", Debug::$LOG_VERBOSE);
+                        }
+                    }
+                }
 
-				$entry_tags = $article["tags"];
-				$entry_title = strip_tags($article["title"]);
-				$entry_author = mb_substr(strip_tags($article["author"]), 0, 245);
-				$entry_link = strip_tags($article["link"]);
-				$entry_content = $article["content"]; // escaped below
-				$entry_force_catchup = $article["force_catchup"];
-				$article_labels = $article["labels"];
-				$entry_score_modifier = (int) $article["score_modifier"];
-				$entry_language = $article["language"];
-				$entry_timestamp = $article["timestamp"];
-				$num_comments = $article["num_comments"];
+                $entry_tags = $article["tags"];
+                $entry_title = strip_tags($article["title"]);
+                $entry_author = mb_substr(strip_tags($article["author"]), 0, 245);
+                $entry_link = strip_tags($article["link"]);
+                $entry_content = $article["content"]; // escaped below
+                $entry_force_catchup = $article["force_catchup"];
+                $article_labels = $article["labels"];
+                $entry_score_modifier = (int) $article["score_modifier"];
+                $entry_language = $article["language"];
+                $entry_timestamp = $article["timestamp"];
+                $num_comments = $article["num_comments"];
 
-				if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
-					$entry_timestamp = time();
-				}
+                if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
+                    $entry_timestamp = time();
+                }
 
-				$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
+                $entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
 
-				Debug::log("date $entry_timestamp [$entry_timestamp_fmt]", Debug::$LOG_VERBOSE);
-				Debug::log("num_comments: $num_comments", Debug::$LOG_VERBOSE);
+                Debug::log("date $entry_timestamp [$entry_timestamp_fmt]", Debug::$LOG_VERBOSE);
+                Debug::log("num_comments: $num_comments", Debug::$LOG_VERBOSE);
 
-				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-					Debug::log("article labels:", Debug::$LOG_VERBOSE);
+                if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                    Debug::log("article labels:", Debug::$LOG_VERBOSE);
 
-					if (count($article_labels) != 0) {
-						print_r($article_labels);
-					}
-				}
+                    if (count($article_labels) != 0) {
+                        print_r($article_labels);
+                    }
+                }
 
-				Debug::log("force catchup: $entry_force_catchup", Debug::$LOG_VERBOSE);
+                Debug::log("force catchup: $entry_force_catchup", Debug::$LOG_VERBOSE);
 
-				if ($cache_images)
-					RSSUtils::cache_media($entry_content, $site_url);
+                if ($cache_images)
+                    RSSUtils::cache_media($entry_content, $site_url);
 
-				$csth = $pdo->prepare("SELECT id FROM ttrss_entries
+                $csth = $pdo->prepare("SELECT id FROM ttrss_entries
 					WHERE guid = ? OR guid = ?");
-				$csth->execute([$entry_guid, $entry_guid_hashed]);
+                $csth->execute([$entry_guid, $entry_guid_hashed]);
 
-				if (!$row = $csth->fetch()) {
+                if (!$row = $csth->fetch()) {
 
-					Debug::log("base guid [$entry_guid or $entry_guid_hashed] not found, creating...", Debug::$LOG_VERBOSE);
+                    Debug::log("base guid [$entry_guid or $entry_guid_hashed] not found, creating...", Debug::$LOG_VERBOSE);
 
-					// base post entry does not exist, create it
+                    // base post entry does not exist, create it
 
-					$usth = $pdo->prepare(
-						"INSERT INTO ttrss_entries
+                    $usth = $pdo->prepare(
+                        "INSERT INTO ttrss_entries
 							(title,
 							guid,
 							link,
@@ -859,110 +859,110 @@ 
 							NOW(),
 							?, ?, ?, ?,	?, ?)");
 
-						$usth->execute([$entry_title,
-							$entry_guid_hashed,
-							$entry_link,
-							$entry_timestamp_fmt,
-							"$entry_content",
-							$entry_current_hash,
-							$date_feed_processed,
-							$entry_comments,
-							(int)$num_comments,
-							$entry_plugin_data,
-							"$entry_language",
-							"$entry_author"]);
+                        $usth->execute([$entry_title,
+                            $entry_guid_hashed,
+                            $entry_link,
+                            $entry_timestamp_fmt,
+                            "$entry_content",
+                            $entry_current_hash,
+                            $date_feed_processed,
+                            $entry_comments,
+                            (int)$num_comments,
+                            $entry_plugin_data,
+                            "$entry_language",
+                            "$entry_author"]);
 
-				}
+                }
 
-				$csth->execute([$entry_guid, $entry_guid_hashed]);
+                $csth->execute([$entry_guid, $entry_guid_hashed]);
 
-				$entry_ref_id = 0;
-				$entry_int_id = 0;
+                $entry_ref_id = 0;
+                $entry_int_id = 0;
 
-				if ($row = $csth->fetch()) {
+                if ($row = $csth->fetch()) {
 
-					Debug::log("base guid found, checking for user record", Debug::$LOG_VERBOSE);
+                    Debug::log("base guid found, checking for user record", Debug::$LOG_VERBOSE);
 
-					$ref_id = $row['id'];
-					$entry_ref_id = $ref_id;
+                    $ref_id = $row['id'];
+                    $entry_ref_id = $ref_id;
 
-					if (RSSUtils::find_article_filter($article_filters, "filter")) {
-						Debug::log("article is filtered out, nothing to do.", Debug::$LOG_VERBOSE);
-						$pdo->commit();
-						continue;
-					}
+                    if (RSSUtils::find_article_filter($article_filters, "filter")) {
+                        Debug::log("article is filtered out, nothing to do.", Debug::$LOG_VERBOSE);
+                        $pdo->commit();
+                        continue;
+                    }
 
-					$score = RSSUtils::calculate_article_score($article_filters) + $entry_score_modifier;
+                    $score = RSSUtils::calculate_article_score($article_filters) + $entry_score_modifier;
 
-					Debug::log("initial score: $score [including plugin modifier: $entry_score_modifier]", Debug::$LOG_VERBOSE);
+                    Debug::log("initial score: $score [including plugin modifier: $entry_score_modifier]", Debug::$LOG_VERBOSE);
 
-					// check for user post link to main table
+                    // check for user post link to main table
 
-					$sth = $pdo->prepare("SELECT ref_id, int_id FROM ttrss_user_entries WHERE
+                    $sth = $pdo->prepare("SELECT ref_id, int_id FROM ttrss_user_entries WHERE
 							ref_id = ? AND owner_uid = ?");
-					$sth->execute([$ref_id, $owner_uid]);
-
-					// okay it doesn't exist - create user entry
-					if ($row = $sth->fetch()) {
-						$entry_ref_id = $row["ref_id"];
-						$entry_int_id = $row["int_id"];
-
-						Debug::log("user record FOUND: RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
-					} else {
-
-						Debug::log("user record not found, creating...", Debug::$LOG_VERBOSE);
-
-						if ($score >= -500 && !RSSUtils::find_article_filter($article_filters, 'catchup') && !$entry_force_catchup) {
-							$unread = 1;
-							$last_read_qpart = null;
-						} else {
-							$unread = 0;
-							$last_read_qpart = date("Y-m-d H:i"); // we can't use NOW() here because it gets quoted
-						}
-
-						if (RSSUtils::find_article_filter($article_filters, 'mark') || $score > 1000) {
-							$marked = 1;
-						} else {
-							$marked = 0;
-						}
-
-						if (RSSUtils::find_article_filter($article_filters, 'publish')) {
-							$published = 1;
-						} else {
-							$published = 0;
-						}
-
-						$last_marked = ($marked == 1) ? 'NOW()' : 'NULL';
-						$last_published = ($published == 1) ? 'NOW()' : 'NULL';
-
-						$sth = $pdo->prepare(
-							"INSERT INTO ttrss_user_entries
+                    $sth->execute([$ref_id, $owner_uid]);
+
+                    // okay it doesn't exist - create user entry
+                    if ($row = $sth->fetch()) {
+                        $entry_ref_id = $row["ref_id"];
+                        $entry_int_id = $row["int_id"];
+
+                        Debug::log("user record FOUND: RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
+                    } else {
+
+                        Debug::log("user record not found, creating...", Debug::$LOG_VERBOSE);
+
+                        if ($score >= -500 && !RSSUtils::find_article_filter($article_filters, 'catchup') && !$entry_force_catchup) {
+                            $unread = 1;
+                            $last_read_qpart = null;
+                        } else {
+                            $unread = 0;
+                            $last_read_qpart = date("Y-m-d H:i"); // we can't use NOW() here because it gets quoted
+                        }
+
+                        if (RSSUtils::find_article_filter($article_filters, 'mark') || $score > 1000) {
+                            $marked = 1;
+                        } else {
+                            $marked = 0;
+                        }
+
+                        if (RSSUtils::find_article_filter($article_filters, 'publish')) {
+                            $published = 1;
+                        } else {
+                            $published = 0;
+                        }
+
+                        $last_marked = ($marked == 1) ? 'NOW()' : 'NULL';
+                        $last_published = ($published == 1) ? 'NOW()' : 'NULL';
+
+                        $sth = $pdo->prepare(
+                            "INSERT INTO ttrss_user_entries
 								(ref_id, owner_uid, feed_id, unread, last_read, marked,
 								published, score, tag_cache, label_cache, uuid,
 								last_marked, last_published)
 							VALUES (?, ?, ?, ?, ?, ?, ?, ?, '', '', '', ".$last_marked.", ".$last_published.")");
 
-						$sth->execute([$ref_id, $owner_uid, $feed, $unread, $last_read_qpart, $marked,
-							$published, $score]);
+                        $sth->execute([$ref_id, $owner_uid, $feed, $unread, $last_read_qpart, $marked,
+                            $published, $score]);
 
-						$sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
+                        $sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
 								ref_id = ? AND owner_uid = ? AND
 								feed_id = ? LIMIT 1");
 
-						$sth->execute([$ref_id, $owner_uid, $feed]);
+                        $sth->execute([$ref_id, $owner_uid, $feed]);
 
-						if ($row = $sth->fetch())
-							$entry_int_id = $row['int_id'];
-					}
+                        if ($row = $sth->fetch())
+                            $entry_int_id = $row['int_id'];
+                    }
 
-					Debug::log("resulting RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
+                    Debug::log("resulting RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
 
-					if (DB_TYPE == "pgsql")
-						$tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
-					else
-						$tsvector_qpart = "";
+                    if (DB_TYPE == "pgsql")
+                        $tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
+                    else
+                        $tsvector_qpart = "";
 
-					$sth = $pdo->prepare("UPDATE ttrss_entries
+                    $sth = $pdo->prepare("UPDATE ttrss_entries
 						SET title = :title,
 							$tsvector_qpart
 							content = :content,
@@ -975,634 +975,634 @@ 
 							lang = :lang
 						WHERE id = :id");
 
-					$params = [":title" => $entry_title,
-						":content" => "$entry_content",
-						":content_hash" => $entry_current_hash,
-						":updated" => $entry_timestamp_fmt,
-						":num_comments" => (int)$num_comments,
-						":plugin_data" => $entry_plugin_data,
-						":author" => "$entry_author",
-						":lang" => $entry_language,
-						":id" => $ref_id];
-
-					if (DB_TYPE == "pgsql") {
-						$params[":ts_lang"] = $feed_language;
-						$params[":ts_content"] = mb_substr(strip_tags($entry_title . " " . $entry_content), 0, 900000);
-					}
-
-					$sth->execute($params);
-
-					// update aux data
-					$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                    $params = [":title" => $entry_title,
+                        ":content" => "$entry_content",
+                        ":content_hash" => $entry_current_hash,
+                        ":updated" => $entry_timestamp_fmt,
+                        ":num_comments" => (int)$num_comments,
+                        ":plugin_data" => $entry_plugin_data,
+                        ":author" => "$entry_author",
+                        ":lang" => $entry_language,
+                        ":id" => $ref_id];
+
+                    if (DB_TYPE == "pgsql") {
+                        $params[":ts_lang"] = $feed_language;
+                        $params[":ts_content"] = mb_substr(strip_tags($entry_title . " " . $entry_content), 0, 900000);
+                    }
+
+                    $sth->execute($params);
+
+                    // update aux data
+                    $sth = $pdo->prepare("UPDATE ttrss_user_entries
 							SET score = ? WHERE ref_id = ?");
-					$sth->execute([$score, $ref_id]);
+                    $sth->execute([$score, $ref_id]);
 
-					if ($mark_unread_on_update &&
-						!$entry_force_catchup &&
-						!RSSUtils::find_article_filter($article_filters, 'catchup')) {
+                    if ($mark_unread_on_update &&
+                        !$entry_force_catchup &&
+                        !RSSUtils::find_article_filter($article_filters, 'catchup')) {
 
-						Debug::log("article updated, marking unread as requested.", Debug::$LOG_VERBOSE);
+                        Debug::log("article updated, marking unread as requested.", Debug::$LOG_VERBOSE);
 
-						$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                        $sth = $pdo->prepare("UPDATE ttrss_user_entries
 							SET last_read = null, unread = true WHERE ref_id = ?");
-						$sth->execute([$ref_id]);
-					} else {
-						Debug::log("article updated, but we're forbidden to mark it unread.", Debug::$LOG_VERBOSE);
-					}
-				}
+                        $sth->execute([$ref_id]);
+                    } else {
+                        Debug::log("article updated, but we're forbidden to mark it unread.", Debug::$LOG_VERBOSE);
+                    }
+                }
 
-				Debug::log("assigning labels [other]...", Debug::$LOG_VERBOSE);
+                Debug::log("assigning labels [other]...", Debug::$LOG_VERBOSE);
 
-				foreach ($article_labels as $label) {
-					Labels::add_article($entry_ref_id, $label[1], $owner_uid);
-				}
+                foreach ($article_labels as $label) {
+                    Labels::add_article($entry_ref_id, $label[1], $owner_uid);
+                }
 
-				Debug::log("assigning labels [filters]...", Debug::$LOG_VERBOSE);
+                Debug::log("assigning labels [filters]...", Debug::$LOG_VERBOSE);
 
-				RSSUtils::assign_article_to_label_filters($entry_ref_id, $article_filters,
-					$owner_uid, $article_labels);
+                RSSUtils::assign_article_to_label_filters($entry_ref_id, $article_filters,
+                    $owner_uid, $article_labels);
 
-				Debug::log("looking for enclosures...", Debug::$LOG_VERBOSE);
+                Debug::log("looking for enclosures...", Debug::$LOG_VERBOSE);
 
-				// enclosures
+                // enclosures
 
-				$enclosures = array();
+                $enclosures = array();
 
-				$encs = $item->get_enclosures();
+                $encs = $item->get_enclosures();
 
-				if (is_array($encs)) {
-					foreach ($encs as $e) {
-						$e_item = array(
-							rewrite_relative_url($site_url, $e->link),
-							$e->type, $e->length, $e->title, $e->width, $e->height);
+                if (is_array($encs)) {
+                    foreach ($encs as $e) {
+                        $e_item = array(
+                            rewrite_relative_url($site_url, $e->link),
+                            $e->type, $e->length, $e->title, $e->width, $e->height);
 
-						// Yet another episode of "mysql utf8_general_ci is gimped"
-						if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
-							for ($i = 0; $i < count($e_item); $i++) {
-								if (is_string($e_item[$i])) {
-									$e_item[$i] = RSSUtils::strip_utf8mb4($e_item[$i]);
-								}
-							}
-						}
+                        // Yet another episode of "mysql utf8_general_ci is gimped"
+                        if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
+                            for ($i = 0; $i < count($e_item); $i++) {
+                                if (is_string($e_item[$i])) {
+                                    $e_item[$i] = RSSUtils::strip_utf8mb4($e_item[$i]);
+                                }
+                            }
+                        }
 
-						array_push($enclosures, $e_item);
-					}
-				}
+                        array_push($enclosures, $e_item);
+                    }
+                }
 
-				if ($cache_images)
-					RSSUtils::cache_enclosures($enclosures, $site_url);
+                if ($cache_images)
+                    RSSUtils::cache_enclosures($enclosures, $site_url);
 
-				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-					Debug::log("article enclosures:", Debug::$LOG_VERBOSE);
-					print_r($enclosures);
-				}
+                if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                    Debug::log("article enclosures:", Debug::$LOG_VERBOSE);
+                    print_r($enclosures);
+                }
 
-				$esth = $pdo->prepare("SELECT id FROM ttrss_enclosures
+                $esth = $pdo->prepare("SELECT id FROM ttrss_enclosures
 						WHERE content_url = ? AND content_type = ? AND post_id = ?");
 
-				$usth = $pdo->prepare("INSERT INTO ttrss_enclosures
+                $usth = $pdo->prepare("INSERT INTO ttrss_enclosures
 							(content_url, content_type, title, duration, post_id, width, height) VALUES
 							(?, ?, ?, ?, ?, ?, ?)");
 
-				foreach ($enclosures as $enc) {
-					$enc_url = $enc[0];
-					$enc_type = $enc[1];
-					$enc_dur = (int)$enc[2];
-					$enc_title = $enc[3];
-					$enc_width = intval($enc[4]);
-					$enc_height = intval($enc[5]);
+                foreach ($enclosures as $enc) {
+                    $enc_url = $enc[0];
+                    $enc_type = $enc[1];
+                    $enc_dur = (int)$enc[2];
+                    $enc_title = $enc[3];
+                    $enc_width = intval($enc[4]);
+                    $enc_height = intval($enc[5]);
 
-					$esth->execute([$enc_url, $enc_type, $entry_ref_id]);
+                    $esth->execute([$enc_url, $enc_type, $entry_ref_id]);
 
-					if (!$esth->fetch()) {
-						$usth->execute([$enc_url, $enc_type, (string)$enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
-					}
-				}
+                    if (!$esth->fetch()) {
+                        $usth->execute([$enc_url, $enc_type, (string)$enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
+                    }
+                }
 
-				// check for manual tags (we have to do it here since they're loaded from filters)
+                // check for manual tags (we have to do it here since they're loaded from filters)
 
-				foreach ($article_filters as $f) {
-					if ($f["type"] == "tag") {
+                foreach ($article_filters as $f) {
+                    if ($f["type"] == "tag") {
 
-						$manual_tags = trim_array(explode(",", $f["param"]));
+                        $manual_tags = trim_array(explode(",", $f["param"]));
 
-						foreach ($manual_tags as $tag) {
-							array_push($entry_tags, $tag);
-						}
-					}
-				}
+                        foreach ($manual_tags as $tag) {
+                            array_push($entry_tags, $tag);
+                        }
+                    }
+                }
 
-				// Skip boring tags
+                // Skip boring tags
 
-				$boring_tags = trim_array(explode(",", mb_strtolower(get_pref(
-					'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
+                $boring_tags = trim_array(explode(",", mb_strtolower(get_pref(
+                    'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
 
-				$filtered_tags = array();
-				$tags_to_cache = array();
+                $filtered_tags = array();
+                $tags_to_cache = array();
 
-				foreach ($entry_tags as $tag) {
-					if (array_search($tag, $boring_tags) === false) {
-						array_push($filtered_tags, $tag);
-					}
-				}
+                foreach ($entry_tags as $tag) {
+                    if (array_search($tag, $boring_tags) === false) {
+                        array_push($filtered_tags, $tag);
+                    }
+                }
 
-				$filtered_tags = array_unique($filtered_tags);
+                $filtered_tags = array_unique($filtered_tags);
 
-				if (Debug::get_loglevel() >= Debug::$LOG_VERBOSE) {
-					Debug::log("filtered tags: " . implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
+                if (Debug::get_loglevel() >= Debug::$LOG_VERBOSE) {
+                    Debug::log("filtered tags: " . implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
 
-				}
+                }
 
-				// Save article tags in the database
+                // Save article tags in the database
 
-				if (count($filtered_tags) > 0) {
+                if (count($filtered_tags) > 0) {
 
-					$tsth = $pdo->prepare("SELECT id FROM ttrss_tags
+                    $tsth = $pdo->prepare("SELECT id FROM ttrss_tags
 							WHERE tag_name = ? AND post_int_id = ? AND
 							owner_uid = ? LIMIT 1");
 
-					$usth = $pdo->prepare("INSERT INTO ttrss_tags
+                    $usth = $pdo->prepare("INSERT INTO ttrss_tags
 									(owner_uid,tag_name,post_int_id)
 									VALUES (?, ?, ?)");
 
-					$filtered_tags = FeedItem_Common::normalize_categories($filtered_tags);
+                    $filtered_tags = FeedItem_Common::normalize_categories($filtered_tags);
 
-					foreach ($filtered_tags as $tag) {
-						$tsth->execute([$tag, $entry_int_id, $owner_uid]);
+                    foreach ($filtered_tags as $tag) {
+                        $tsth->execute([$tag, $entry_int_id, $owner_uid]);
 
-						if (!$tsth->fetch()) {
-							$usth->execute([$owner_uid, $tag, $entry_int_id]);
-						}
+                        if (!$tsth->fetch()) {
+                            $usth->execute([$owner_uid, $tag, $entry_int_id]);
+                        }
 
-						array_push($tags_to_cache, $tag);
-					}
+                        array_push($tags_to_cache, $tag);
+                    }
 
-					/* update the cache */
-					$tags_str = join(",", $tags_to_cache);
+                    /* update the cache */
+                    $tags_str = join(",", $tags_to_cache);
 
-					$tsth = $pdo->prepare("UPDATE ttrss_user_entries
+                    $tsth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET tag_cache = ? WHERE ref_id = ?
 						AND owner_uid = ?");
-					$tsth->execute([$tags_str, $entry_ref_id, $owner_uid]);
-				}
+                    $tsth->execute([$tags_str, $entry_ref_id, $owner_uid]);
+                }
 
-				Debug::log("article processed", Debug::$LOG_VERBOSE);
+                Debug::log("article processed", Debug::$LOG_VERBOSE);
 
-				$pdo->commit();
-			}
+                $pdo->commit();
+            }
 
-			Debug::log("purging feed...", Debug::$LOG_VERBOSE);
+            Debug::log("purging feed...", Debug::$LOG_VERBOSE);
 
-			Feeds::purge_feed($feed, 0);
+            Feeds::purge_feed($feed, 0);
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds
+            $sth = $pdo->prepare("UPDATE ttrss_feeds
 				SET last_updated = NOW(), last_unconditional = NOW(), last_error = '' WHERE id = ?");
-			$sth->execute([$feed]);
+            $sth->execute([$feed]);
 
-		} else {
+        } else {
 
-			$error_msg = mb_substr($rss->error(), 0, 245);
+            $error_msg = mb_substr($rss->error(), 0, 245);
 
-			Debug::log("fetch error: $error_msg", Debug::$LOG_VERBOSE);
+            Debug::log("fetch error: $error_msg", Debug::$LOG_VERBOSE);
 
-			if (count($rss->errors()) > 1) {
-				foreach ($rss->errors() as $error) {
-					Debug::log("+ $error", Debug::$LOG_VERBOSE);
-				}
-			}
+            if (count($rss->errors()) > 1) {
+                foreach ($rss->errors() as $error) {
+                    Debug::log("+ $error", Debug::$LOG_VERBOSE);
+                }
+            }
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
+            $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
 				last_updated = NOW(), last_unconditional = NOW() WHERE id = ?");
-			$sth->execute([$error_msg, $feed]);
+            $sth->execute([$error_msg, $feed]);
 
-			unset($rss);
+            unset($rss);
 
-			Debug::log("update failed.", Debug::$LOG_VERBOSE);
-			return false;
-		}
+            Debug::log("update failed.", Debug::$LOG_VERBOSE);
+            return false;
+        }
 
-		Debug::log("update done.", Debug::$LOG_VERBOSE);
+        Debug::log("update done.", Debug::$LOG_VERBOSE);
 
-		return true;
-	}
+        return true;
+    }
 
-	public static function cache_enclosures($enclosures, $site_url) {
-		$cache = new DiskCache("images");
+    public static function cache_enclosures($enclosures, $site_url) {
+        $cache = new DiskCache("images");
 
-		if ($cache->isWritable()) {
-			foreach ($enclosures as $enc) {
+        if ($cache->isWritable()) {
+            foreach ($enclosures as $enc) {
 
-				if (preg_match("/(image|audio|video)/", $enc[1])) {
-					$src = rewrite_relative_url($site_url, $enc[0]);
+                if (preg_match("/(image|audio|video)/", $enc[1])) {
+                    $src = rewrite_relative_url($site_url, $enc[0]);
 
-					$local_filename = sha1($src);
+                    $local_filename = sha1($src);
 
-					Debug::log("cache_enclosures: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
+                    Debug::log("cache_enclosures: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
 
-					if (!$cache->exists($local_filename)) {
+                    if (!$cache->exists($local_filename)) {
 
-						global $fetch_last_error_code;
-						global $fetch_last_error;
+                        global $fetch_last_error_code;
+                        global $fetch_last_error;
 
-						$file_content = fetch_file_contents(array("url" => $src,
-							"http_referrer" => $src,
-							"max_size" => MAX_CACHE_FILE_SIZE));
+                        $file_content = fetch_file_contents(array("url" => $src,
+                            "http_referrer" => $src,
+                            "max_size" => MAX_CACHE_FILE_SIZE));
 
-						if ($file_content) {
-							$cache->put($local_filename, $file_content);
-						} else {
-							Debug::log("cache_enclosures: failed with $fetch_last_error_code: $fetch_last_error");
-						}
-					} else if (is_writable($local_filename)) {
-						$cache->touch($local_filename);
-					}
-				}
-			}
-		}
-	}
+                        if ($file_content) {
+                            $cache->put($local_filename, $file_content);
+                        } else {
+                            Debug::log("cache_enclosures: failed with $fetch_last_error_code: $fetch_last_error");
+                        }
+                    } else if (is_writable($local_filename)) {
+                        $cache->touch($local_filename);
+                    }
+                }
+            }
+        }
+    }
 
-	public static function cache_media($html, $site_url) {
-		$cache = new DiskCache("images");
+    public static function cache_media($html, $site_url) {
+        $cache = new DiskCache("images");
 
-		if ($cache->isWritable()) {
-			$doc = new DOMDocument();
-			if ($doc->loadHTML($html)) {
-				$xpath = new DOMXPath($doc);
+        if ($cache->isWritable()) {
+            $doc = new DOMDocument();
+            if ($doc->loadHTML($html)) {
+                $xpath = new DOMXPath($doc);
 
-				$entries = $xpath->query('(//img[@src])|(//video/source[@src])|(//audio/source[@src])');
+                $entries = $xpath->query('(//img[@src])|(//video/source[@src])|(//audio/source[@src])');
 
-				foreach ($entries as $entry) {
-					if ($entry->hasAttribute('src') && strpos($entry->getAttribute('src'), "data:") !== 0) {
-						$src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
+                foreach ($entries as $entry) {
+                    if ($entry->hasAttribute('src') && strpos($entry->getAttribute('src'), "data:") !== 0) {
+                        $src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
 
-						$local_filename = sha1($src);
+                        $local_filename = sha1($src);
 
-						Debug::log("cache_media: checking $src", Debug::$LOG_VERBOSE);
+                        Debug::log("cache_media: checking $src", Debug::$LOG_VERBOSE);
 
-						if (!$cache->exists($local_filename)) {
-							Debug::log("cache_media: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
+                        if (!$cache->exists($local_filename)) {
+                            Debug::log("cache_media: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
 
-							global $fetch_last_error_code;
-							global $fetch_last_error;
+                            global $fetch_last_error_code;
+                            global $fetch_last_error;
 
-							$file_content = fetch_file_contents(array("url" => $src,
-								"http_referrer" => $src,
-								"max_size" => MAX_CACHE_FILE_SIZE));
+                            $file_content = fetch_file_contents(array("url" => $src,
+                                "http_referrer" => $src,
+                                "max_size" => MAX_CACHE_FILE_SIZE));
 
-							if ($file_content) {
-								$cache->put($local_filename, $file_content);
-							} else {
-								Debug::log("cache_media: failed with $fetch_last_error_code: $fetch_last_error");
-							}
-						} else if ($cache->isWritable($local_filename)) {
-							$cache->touch($local_filename);
-						}
-					}
-				}
-			}
-		}
-	}
+                            if ($file_content) {
+                                $cache->put($local_filename, $file_content);
+                            } else {
+                                Debug::log("cache_media: failed with $fetch_last_error_code: $fetch_last_error");
+                            }
+                        } else if ($cache->isWritable($local_filename)) {
+                            $cache->touch($local_filename);
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	public static function expire_error_log() {
-		Debug::log("Removing old error log entries...");
+    public static function expire_error_log() {
+        Debug::log("Removing old error log entries...");
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if (DB_TYPE == "pgsql") {
-			$pdo->query("DELETE FROM ttrss_error_log
+        if (DB_TYPE == "pgsql") {
+            $pdo->query("DELETE FROM ttrss_error_log
 				WHERE created_at < NOW() - INTERVAL '7 days'");
-		} else {
-			$pdo->query("DELETE FROM ttrss_error_log
+        } else {
+            $pdo->query("DELETE FROM ttrss_error_log
 				WHERE created_at < DATE_SUB(NOW(), INTERVAL 7 DAY)");
-		}
-	}
+        }
+    }
 
-	public static function expire_feed_archive() {
-		Debug::log("Removing old archived feeds...");
+    public static function expire_feed_archive() {
+        Debug::log("Removing old archived feeds...");
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if (DB_TYPE == "pgsql") {
-			$pdo->query("DELETE FROM ttrss_archived_feeds
+        if (DB_TYPE == "pgsql") {
+            $pdo->query("DELETE FROM ttrss_archived_feeds
 				WHERE created < NOW() - INTERVAL '1 month'");
-		} else {
-			$pdo->query("DELETE FROM ttrss_archived_feeds
+        } else {
+            $pdo->query("DELETE FROM ttrss_archived_feeds
 				WHERE created < DATE_SUB(NOW(), INTERVAL 1 MONTH)");
-		}
-	}
-
-	public static function expire_lock_files() {
-		Debug::log("Removing old lock files...", Debug::$LOG_VERBOSE);
-
-		$num_deleted = 0;
-
-		if (is_writable(LOCK_DIRECTORY)) {
-			$files = glob(LOCK_DIRECTORY . "/*.lock");
-
-			if ($files) {
-				foreach ($files as $file) {
-					if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400*2) {
-						unlink($file);
-						++$num_deleted;
-					}
-				}
-			}
-		}
-
-		Debug::log("removed $num_deleted old lock files.");
-	}
-
-	/**
-	 * Source: http://www.php.net/manual/en/function.parse-url.php#104527
-	 * Returns the url query as associative array
-	 *
-	 * @param    string    query
-	 * @return    array    params
-	 */
-	public static function convertUrlQuery($query) {
-		$queryParts = explode('&', $query);
-
-		$params = array();
-
-		foreach ($queryParts as $param) {
-			$item = explode('=', $param);
-			$params[$item[0]] = $item[1];
-		}
-
-		return $params;
-	}
-
-	public static function get_article_filters($filters, $title, $content, $link, $author, $tags, &$matched_rules = false, &$matched_filters = false) {
-		$matches = array();
-
-		foreach ($filters as $filter) {
-			$match_any_rule = $filter["match_any_rule"];
-			$inverse = $filter["inverse"];
-			$filter_match = false;
-
-			foreach ($filter["rules"] as $rule) {
-				$match = false;
-				$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
-				$rule_inverse = $rule["inverse"];
-
-				if (!$reg_exp)
-					continue;
-
-				switch ($rule["type"]) {
-					case "title":
-						$match = @preg_match("/$reg_exp/iu", $title);
-						break;
-					case "content":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
-
-						$match = @preg_match("/$reg_exp/iu", $content);
-						break;
-					case "both":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
-
-						$match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
-						break;
-					case "link":
-						$match = @preg_match("/$reg_exp/iu", $link);
-						break;
-					case "author":
-						$match = @preg_match("/$reg_exp/iu", $author);
-						break;
-					case "tag":
-						foreach ($tags as $tag) {
-							if (@preg_match("/$reg_exp/iu", $tag)) {
-								$match = true;
-								break;
-							}
-						}
-						break;
-				}
-
-				if ($rule_inverse) $match = !$match;
-
-				if ($match_any_rule) {
-					if ($match) {
-						$filter_match = true;
-						break;
-					}
-				} else {
-					$filter_match = $match;
-					if (!$match) {
-						break;
-					}
-				}
-			}
-
-			if ($inverse) $filter_match = !$filter_match;
-
-			if ($filter_match) {
-				if (is_array($matched_rules)) array_push($matched_rules, $rule);
-				if (is_array($matched_filters)) array_push($matched_filters, $filter);
-
-				foreach ($filter["actions"] as $action) {
-					array_push($matches, $action);
-
-					// if Stop action encountered, perform no further processing
-					if (isset($action["type"]) && $action["type"] == "stop") return $matches;
-				}
-			}
-		}
-
-		return $matches;
-	}
-
-	public static function find_article_filter($filters, $filter_name) {
-		foreach ($filters as $f) {
-			if ($f["type"] == $filter_name) {
-				return $f;
-			};
-		}
-		return false;
-	}
-
-	public static function find_article_filters($filters, $filter_name) {
-		$results = array();
-
-		foreach ($filters as $f) {
-			if ($f["type"] == $filter_name) {
-				array_push($results, $f);
-			};
-		}
-		return $results;
-	}
-
-	public static function calculate_article_score($filters) {
-		$score = 0;
-
-		foreach ($filters as $f) {
-			if ($f["type"] == "score") {
-				$score += $f["param"];
-			};
-		}
-		return $score;
-	}
-
-	public static function labels_contains_caption($labels, $caption) {
-		foreach ($labels as $label) {
-			if ($label[1] == $caption) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	public static function assign_article_to_label_filters($id, $filters, $owner_uid, $article_labels) {
-		foreach ($filters as $f) {
-			if ($f["type"] == "label") {
-				if (!RSSUtils::labels_contains_caption($article_labels, $f["param"])) {
-					Labels::add_article($id, $f["param"], $owner_uid);
-				}
-			}
-		}
-	}
-
-	public static function make_guid_from_title($title) {
-		return preg_replace("/[ \"\',.:;]/", "-",
-			mb_strtolower(strip_tags($title), 'utf-8'));
-	}
-
-	public static function cleanup_counters_cache() {
-		$pdo = Db::pdo();
-
-		$res = $pdo->query("DELETE FROM ttrss_counters_cache
+        }
+    }
+
+    public static function expire_lock_files() {
+        Debug::log("Removing old lock files...", Debug::$LOG_VERBOSE);
+
+        $num_deleted = 0;
+
+        if (is_writable(LOCK_DIRECTORY)) {
+            $files = glob(LOCK_DIRECTORY . "/*.lock");
+
+            if ($files) {
+                foreach ($files as $file) {
+                    if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400*2) {
+                        unlink($file);
+                        ++$num_deleted;
+                    }
+                }
+            }
+        }
+
+        Debug::log("removed $num_deleted old lock files.");
+    }
+
+    /**
+     * Source: http://www.php.net/manual/en/function.parse-url.php#104527
+     * Returns the url query as associative array
+     *
+     * @param    string    query
+     * @return    array    params
+     */
+    public static function convertUrlQuery($query) {
+        $queryParts = explode('&', $query);
+
+        $params = array();
+
+        foreach ($queryParts as $param) {
+            $item = explode('=', $param);
+            $params[$item[0]] = $item[1];
+        }
+
+        return $params;
+    }
+
+    public static function get_article_filters($filters, $title, $content, $link, $author, $tags, &$matched_rules = false, &$matched_filters = false) {
+        $matches = array();
+
+        foreach ($filters as $filter) {
+            $match_any_rule = $filter["match_any_rule"];
+            $inverse = $filter["inverse"];
+            $filter_match = false;
+
+            foreach ($filter["rules"] as $rule) {
+                $match = false;
+                $reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
+                $rule_inverse = $rule["inverse"];
+
+                if (!$reg_exp)
+                    continue;
+
+                switch ($rule["type"]) {
+                    case "title":
+                        $match = @preg_match("/$reg_exp/iu", $title);
+                        break;
+                    case "content":
+                        // we don't need to deal with multiline regexps
+                        $content = preg_replace("/[\r\n\t]/", "", $content);
+
+                        $match = @preg_match("/$reg_exp/iu", $content);
+                        break;
+                    case "both":
+                        // we don't need to deal with multiline regexps
+                        $content = preg_replace("/[\r\n\t]/", "", $content);
+
+                        $match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
+                        break;
+                    case "link":
+                        $match = @preg_match("/$reg_exp/iu", $link);
+                        break;
+                    case "author":
+                        $match = @preg_match("/$reg_exp/iu", $author);
+                        break;
+                    case "tag":
+                        foreach ($tags as $tag) {
+                            if (@preg_match("/$reg_exp/iu", $tag)) {
+                                $match = true;
+                                break;
+                            }
+                        }
+                        break;
+                }
+
+                if ($rule_inverse) $match = !$match;
+
+                if ($match_any_rule) {
+                    if ($match) {
+                        $filter_match = true;
+                        break;
+                    }
+                } else {
+                    $filter_match = $match;
+                    if (!$match) {
+                        break;
+                    }
+                }
+            }
+
+            if ($inverse) $filter_match = !$filter_match;
+
+            if ($filter_match) {
+                if (is_array($matched_rules)) array_push($matched_rules, $rule);
+                if (is_array($matched_filters)) array_push($matched_filters, $filter);
+
+                foreach ($filter["actions"] as $action) {
+                    array_push($matches, $action);
+
+                    // if Stop action encountered, perform no further processing
+                    if (isset($action["type"]) && $action["type"] == "stop") return $matches;
+                }
+            }
+        }
+
+        return $matches;
+    }
+
+    public static function find_article_filter($filters, $filter_name) {
+        foreach ($filters as $f) {
+            if ($f["type"] == $filter_name) {
+                return $f;
+            };
+        }
+        return false;
+    }
+
+    public static function find_article_filters($filters, $filter_name) {
+        $results = array();
+
+        foreach ($filters as $f) {
+            if ($f["type"] == $filter_name) {
+                array_push($results, $f);
+            };
+        }
+        return $results;
+    }
+
+    public static function calculate_article_score($filters) {
+        $score = 0;
+
+        foreach ($filters as $f) {
+            if ($f["type"] == "score") {
+                $score += $f["param"];
+            };
+        }
+        return $score;
+    }
+
+    public static function labels_contains_caption($labels, $caption) {
+        foreach ($labels as $label) {
+            if ($label[1] == $caption) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static function assign_article_to_label_filters($id, $filters, $owner_uid, $article_labels) {
+        foreach ($filters as $f) {
+            if ($f["type"] == "label") {
+                if (!RSSUtils::labels_contains_caption($article_labels, $f["param"])) {
+                    Labels::add_article($id, $f["param"], $owner_uid);
+                }
+            }
+        }
+    }
+
+    public static function make_guid_from_title($title) {
+        return preg_replace("/[ \"\',.:;]/", "-",
+            mb_strtolower(strip_tags($title), 'utf-8'));
+    }
+
+    public static function cleanup_counters_cache() {
+        $pdo = Db::pdo();
+
+        $res = $pdo->query("DELETE FROM ttrss_counters_cache
 			WHERE feed_id > 0 AND
 			(SELECT COUNT(id) FROM ttrss_feeds WHERE
 				id = feed_id AND
 				ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid) = 0");
 
-		$frows = $res->rowCount();
+        $frows = $res->rowCount();
 
-		$res = $pdo->query("DELETE FROM ttrss_cat_counters_cache
+        $res = $pdo->query("DELETE FROM ttrss_cat_counters_cache
 			WHERE feed_id > 0 AND
 			(SELECT COUNT(id) FROM ttrss_feed_categories WHERE
 				id = feed_id AND
 				ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid) = 0");
 
-		$crows = $res->rowCount();
-
-		Debug::log("removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
-	}
-
-	public static function housekeeping_user($owner_uid) {
-		$tmph = new PluginHost();
-
-		load_user_plugins($owner_uid, $tmph);
-
-		$tmph->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
-	}
-
-	public static function housekeeping_common() {
-		DiskCache::expire();
-
-		RSSUtils::expire_lock_files();
-		RSSUtils::expire_error_log();
-		RSSUtils::expire_feed_archive();
-		RSSUtils::cleanup_feed_browser();
-
-		Article::purge_orphans();
-		RSSUtils::cleanup_counters_cache();
-
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
-	}
-
-	public static function check_feed_favicon($site_url, $feed) {
-		#		print "FAVICON [$site_url]: $favicon_url\n";
-
-		$icon_file = ICONS_DIR . "/$feed.ico";
-
-		if (!file_exists($icon_file)) {
-			$favicon_url = RSSUtils::get_favicon_url($site_url);
-
-			if ($favicon_url) {
-				// Limiting to "image" type misses those served with text/plain
-				$contents = fetch_file_contents($favicon_url); // , "image");
-
-				if ($contents) {
-					// Crude image type matching.
-					// Patterns gleaned from the file(1) source code.
-					if (preg_match('/^\x00\x00\x01\x00/', $contents)) {
-						// 0       string  \000\000\001\000        MS Windows icon resource
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa MS Windows icon resource");
-					}
-					elseif (preg_match('/^GIF8/', $contents)) {
-						// 0       string          GIF8            GIF image data
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa GIF image");
-					}
-					elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
-						// 0       string          \x89PNG\x0d\x0a\x1a\x0a         PNG image data
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa PNG image");
-					}
-					elseif (preg_match('/^\xff\xd8/', $contents)) {
-						// 0       beshort         0xffd8          JPEG image data
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa JPG image");
-					}
-					elseif (preg_match('/^BM/', $contents)) {
-						// 0	string		BM	PC bitmap (OS2, Windows BMP files)
-						//error_log("check_feed_favicon, favicon_url=$favicon_url isa BMP image");
-					}
-					else {
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa UNKNOWN type");
-						$contents = "";
-					}
-				}
-
-				if ($contents) {
-					$fp = @fopen($icon_file, "w");
-
-					if ($fp) {
-						fwrite($fp, $contents);
-						fclose($fp);
-						chmod($icon_file, 0644);
-					}
-				}
-			}
-			return $icon_file;
-		}
-	}
-
-	public static function is_gzipped($feed_data) {
-		return strpos(substr($feed_data, 0, 3),
-				"\x1f" . "\x8b" . "\x08", 0) === 0;
-	}
-
-	public static function load_filters($feed_id, $owner_uid) {
-		$filters = array();
-
-		$feed_id = (int) $feed_id;
-		$cat_id = (int)Feeds::getFeedCategory($feed_id);
-
-		if ($cat_id == 0)
-			$null_cat_qpart = "cat_id IS NULL OR";
-		else
-			$null_cat_qpart = "";
-
-		$pdo = Db::pdo();
-
-		$sth = $pdo->prepare("SELECT * FROM ttrss_filters2 WHERE
+        $crows = $res->rowCount();
+
+        Debug::log("removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
+    }
+
+    public static function housekeeping_user($owner_uid) {
+        $tmph = new PluginHost();
+
+        load_user_plugins($owner_uid, $tmph);
+
+        $tmph->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
+    }
+
+    public static function housekeeping_common() {
+        DiskCache::expire();
+
+        RSSUtils::expire_lock_files();
+        RSSUtils::expire_error_log();
+        RSSUtils::expire_feed_archive();
+        RSSUtils::cleanup_feed_browser();
+
+        Article::purge_orphans();
+        RSSUtils::cleanup_counters_cache();
+
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
+    }
+
+    public static function check_feed_favicon($site_url, $feed) {
+        #		print "FAVICON [$site_url]: $favicon_url\n";
+
+        $icon_file = ICONS_DIR . "/$feed.ico";
+
+        if (!file_exists($icon_file)) {
+            $favicon_url = RSSUtils::get_favicon_url($site_url);
+
+            if ($favicon_url) {
+                // Limiting to "image" type misses those served with text/plain
+                $contents = fetch_file_contents($favicon_url); // , "image");
+
+                if ($contents) {
+                    // Crude image type matching.
+                    // Patterns gleaned from the file(1) source code.
+                    if (preg_match('/^\x00\x00\x01\x00/', $contents)) {
+                        // 0       string  \000\000\001\000        MS Windows icon resource
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa MS Windows icon resource");
+                    }
+                    elseif (preg_match('/^GIF8/', $contents)) {
+                        // 0       string          GIF8            GIF image data
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa GIF image");
+                    }
+                    elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
+                        // 0       string          \x89PNG\x0d\x0a\x1a\x0a         PNG image data
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa PNG image");
+                    }
+                    elseif (preg_match('/^\xff\xd8/', $contents)) {
+                        // 0       beshort         0xffd8          JPEG image data
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa JPG image");
+                    }
+                    elseif (preg_match('/^BM/', $contents)) {
+                        // 0	string		BM	PC bitmap (OS2, Windows BMP files)
+                        //error_log("check_feed_favicon, favicon_url=$favicon_url isa BMP image");
+                    }
+                    else {
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa UNKNOWN type");
+                        $contents = "";
+                    }
+                }
+
+                if ($contents) {
+                    $fp = @fopen($icon_file, "w");
+
+                    if ($fp) {
+                        fwrite($fp, $contents);
+                        fclose($fp);
+                        chmod($icon_file, 0644);
+                    }
+                }
+            }
+            return $icon_file;
+        }
+    }
+
+    public static function is_gzipped($feed_data) {
+        return strpos(substr($feed_data, 0, 3),
+                "\x1f" . "\x8b" . "\x08", 0) === 0;
+    }
+
+    public static function load_filters($feed_id, $owner_uid) {
+        $filters = array();
+
+        $feed_id = (int) $feed_id;
+        $cat_id = (int)Feeds::getFeedCategory($feed_id);
+
+        if ($cat_id == 0)
+            $null_cat_qpart = "cat_id IS NULL OR";
+        else
+            $null_cat_qpart = "";
+
+        $pdo = Db::pdo();
+
+        $sth = $pdo->prepare("SELECT * FROM ttrss_filters2 WHERE
 				owner_uid = ? AND enabled = true ORDER BY order_id, title");
-		$sth->execute([$owner_uid]);
+        $sth->execute([$owner_uid]);
 
-		$check_cats = array_merge(
-			Feeds::getParentCategories($cat_id, $owner_uid),
-			[$cat_id]);
+        $check_cats = array_merge(
+            Feeds::getParentCategories($cat_id, $owner_uid),
+            [$cat_id]);
 
-		$check_cats_str = join(",", $check_cats);
-		$check_cats_fullids = array_map(function($a) { return "CAT:$a"; }, $check_cats);
+        $check_cats_str = join(",", $check_cats);
+        $check_cats_fullids = array_map(function($a) { return "CAT:$a"; }, $check_cats);
 
-		while ($line = $sth->fetch()) {
-			$filter_id = $line["id"];
+        while ($line = $sth->fetch()) {
+            $filter_id = $line["id"];
 
-			$match_any_rule = sql_bool_to_bool($line["match_any_rule"]);
+            $match_any_rule = sql_bool_to_bool($line["match_any_rule"]);
 
-			$sth2 = $pdo->prepare("SELECT
+            $sth2 = $pdo->prepare("SELECT
 					r.reg_exp, r.inverse, r.feed_id, r.cat_id, r.cat_filter, r.match_on, t.name AS type_name
 					FROM ttrss_filters2_rules AS r,
 					ttrss_filter_types AS t
@@ -1611,117 +1611,117 @@ 
 						  (($null_cat_qpart (cat_id IS NULL AND cat_filter = false) OR cat_id IN ($check_cats_str)) AND
 						  (feed_id IS NULL OR feed_id = ?))) AND
 						filter_type = t.id AND filter_id = ?");
-			$sth2->execute([$feed_id, $filter_id]);
+            $sth2->execute([$feed_id, $filter_id]);
 
-			$rules = array();
-			$actions = array();
+            $rules = array();
+            $actions = array();
 
-			while ($rule_line = $sth2->fetch()) {
-				#				print_r($rule_line);
+            while ($rule_line = $sth2->fetch()) {
+                #				print_r($rule_line);
 
-				if ($rule_line["match_on"]) {
-					$match_on = json_decode($rule_line["match_on"], true);
+                if ($rule_line["match_on"]) {
+                    $match_on = json_decode($rule_line["match_on"], true);
 
-					if (in_array("0", $match_on) || in_array($feed_id, $match_on) || count(array_intersect($check_cats_fullids, $match_on)) > 0) {
+                    if (in_array("0", $match_on) || in_array($feed_id, $match_on) || count(array_intersect($check_cats_fullids, $match_on)) > 0) {
 
-						$rule = array();
-						$rule["reg_exp"] = $rule_line["reg_exp"];
-						$rule["type"] = $rule_line["type_name"];
-						$rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
+                        $rule = array();
+                        $rule["reg_exp"] = $rule_line["reg_exp"];
+                        $rule["type"] = $rule_line["type_name"];
+                        $rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
 
-						array_push($rules, $rule);
-					} else if (!$match_any_rule) {
-						// this filter contains a rule that doesn't match to this feed/category combination
-						// thus filter has to be rejected
+                        array_push($rules, $rule);
+                    } else if (!$match_any_rule) {
+                        // this filter contains a rule that doesn't match to this feed/category combination
+                        // thus filter has to be rejected
 
-						$rules = [];
-						break;
-					}
+                        $rules = [];
+                        break;
+                    }
 
-				} else {
+                } else {
 
-					$rule = array();
-					$rule["reg_exp"] = $rule_line["reg_exp"];
-					$rule["type"] = $rule_line["type_name"];
-					$rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
+                    $rule = array();
+                    $rule["reg_exp"] = $rule_line["reg_exp"];
+                    $rule["type"] = $rule_line["type_name"];
+                    $rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
 
-					array_push($rules, $rule);
-				}
-			}
+                    array_push($rules, $rule);
+                }
+            }
 
-			if (count($rules) > 0) {
-				$sth2 = $pdo->prepare("SELECT a.action_param,t.name AS type_name
+            if (count($rules) > 0) {
+                $sth2 = $pdo->prepare("SELECT a.action_param,t.name AS type_name
 						FROM ttrss_filters2_actions AS a,
 						ttrss_filter_actions AS t
 						WHERE
 							action_id = t.id AND filter_id = ?");
-				$sth2->execute([$filter_id]);
-
-				while ($action_line = $sth2->fetch()) {
-					#				print_r($action_line);
-
-					$action = array();
-					$action["type"] = $action_line["type_name"];
-					$action["param"] = $action_line["action_param"];
-
-					array_push($actions, $action);
-				}
-			}
-
-			$filter = [];
-			$filter["id"] = $filter_id;
-			$filter["match_any_rule"] = sql_bool_to_bool($line["match_any_rule"]);
-			$filter["inverse"] = sql_bool_to_bool($line["inverse"]);
-			$filter["rules"] = $rules;
-			$filter["actions"] = $actions;
-
-			if (count($rules) > 0 && count($actions) > 0) {
-				array_push($filters, $filter);
-			}
-		}
-
-		return $filters;
-	}
-
-	/**
-	 * Try to determine the favicon URL for a feed.
-	 * adapted from wordpress favicon plugin by Jeff Minard (http://thecodepro.com/)
-	 * http://dev.wp-plugins.org/file/favatars/trunk/favatars.php
-	 *
-	 * @param string $url A feed or page URL
-	 * @access public
-	 * @return mixed The favicon URL, or false if none was found.
-	 */
-	public static function get_favicon_url($url) {
-
-		$favicon_url = false;
-
-		if ($html = @fetch_file_contents($url)) {
-
-			$doc = new DOMDocument();
-			if ($doc->loadHTML($html)) {
-				$xpath = new DOMXPath($doc);
-
-				$base = $xpath->query('/html/head/base[@href]');
-				foreach ($base as $b) {
-					$url = rewrite_relative_url($url, $b->getAttribute("href"));
-					break;
-				}
-
-				$entries = $xpath->query('/html/head/link[@rel="shortcut icon" or @rel="icon"]');
-				if (count($entries) > 0) {
-					foreach ($entries as $entry) {
-						$favicon_url = rewrite_relative_url($url, $entry->getAttribute("href"));
-						break;
-					}
-				}
-			}
-		}
-
-		if (!$favicon_url)
-			$favicon_url = rewrite_relative_url($url, "/favicon.ico");
-
-		return $favicon_url;
-	}
+                $sth2->execute([$filter_id]);
+
+                while ($action_line = $sth2->fetch()) {
+                    #				print_r($action_line);
+
+                    $action = array();
+                    $action["type"] = $action_line["type_name"];
+                    $action["param"] = $action_line["action_param"];
+
+                    array_push($actions, $action);
+                }
+            }
+
+            $filter = [];
+            $filter["id"] = $filter_id;
+            $filter["match_any_rule"] = sql_bool_to_bool($line["match_any_rule"]);
+            $filter["inverse"] = sql_bool_to_bool($line["inverse"]);
+            $filter["rules"] = $rules;
+            $filter["actions"] = $actions;
+
+            if (count($rules) > 0 && count($actions) > 0) {
+                array_push($filters, $filter);
+            }
+        }
+
+        return $filters;
+    }
+
+    /**
+     * Try to determine the favicon URL for a feed.
+     * adapted from wordpress favicon plugin by Jeff Minard (http://thecodepro.com/)
+     * http://dev.wp-plugins.org/file/favatars/trunk/favatars.php
+     *
+     * @param string $url A feed or page URL
+     * @access public
+     * @return mixed The favicon URL, or false if none was found.
+     */
+    public static function get_favicon_url($url) {
+
+        $favicon_url = false;
+
+        if ($html = @fetch_file_contents($url)) {
+
+            $doc = new DOMDocument();
+            if ($doc->loadHTML($html)) {
+                $xpath = new DOMXPath($doc);
+
+                $base = $xpath->query('/html/head/base[@href]');
+                foreach ($base as $b) {
+                    $url = rewrite_relative_url($url, $b->getAttribute("href"));
+                    break;
+                }
+
+                $entries = $xpath->query('/html/head/link[@rel="shortcut icon" or @rel="icon"]');
+                if (count($entries) > 0) {
+                    foreach ($entries as $entry) {
+                        $favicon_url = rewrite_relative_url($url, $entry->getAttribute("href"));
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (!$favicon_url)
+            $favicon_url = rewrite_relative_url($url, "/favicon.ico");
+
+        return $favicon_url;
+    }
 
 }

classes/handler/public.php

Switch Indentation +18 added lines, -18 removed lines

@@ -760,24 +760,24 @@
 				$feed_urls = false;
 
 				switch ($rc['code']) {
-					case 0:
-						print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 1:
-						print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 2:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
-						break;
-					case 3:
-						print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
-						break;
-					case 4:
-						$feed_urls = $rc["feeds"];
-						break;
-					case 5:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
-						break;
+				case 0:
+					print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
+					break;
+				case 1:
+					print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
+					break;
+				case 2:
+					print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
+					break;
+				case 3:
+					print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
+					break;
+				case 4:
+					$feed_urls = $rc["feeds"];
+					break;
+				case 5:
+					print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
+					break;
 				}
 
 				if ($feed_urls) {

Indentation +716 added lines, -716 removed lines

@@ -1,329 +1,329 @@ 
 <?php
 class Handler_Public extends Handler {
 
-	private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
-		$limit, $offset, $search,
-		$view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
+    private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
+        $limit, $offset, $search,
+        $view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
 
-		require_once "lib/MiniTemplator.class.php";
+        require_once "lib/MiniTemplator.class.php";
 
-		$note_style = 	"background-color : #fff7d5;
+        $note_style = 	"background-color : #fff7d5;
 			border-width : 1px; ".
-			"padding : 5px; border-style : dashed; border-color : #e7d796;".
-			"margin-bottom : 1em; color : #9a8c59;";
-
-		if (!$limit) $limit = 60;
-
-		$date_sort_field = "date_entered DESC, updated DESC";
-
-		if ($feed == -2 && !$is_cat) {
-			$date_sort_field = "last_published DESC";
-		} else if ($feed == -1 && !$is_cat) {
-			$date_sort_field = "last_marked DESC";
-		}
-
-		switch ($order) {
-		case "title":
-			$date_sort_field = "ttrss_entries.title, date_entered, updated";
-			break;
-		case "date_reverse":
-			$date_sort_field = "date_entered, updated";
-			break;
-		case "feed_dates":
-			$date_sort_field = "updated DESC";
-			break;
-		}
-
-		$params = array(
-			"owner_uid" => $owner_uid,
-			"feed" => $feed,
-			"limit" => $limit,
-			"view_mode" => $view_mode,
-			"cat_view" => $is_cat,
-			"search" => $search,
-			"override_order" => $date_sort_field,
-			"include_children" => true,
-			"ignore_vfeed_group" => true,
-			"offset" => $offset,
-			"start_ts" => $start_ts
-		);
-
-		if (!$is_cat && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX && $feed > LABEL_BASE_INDEX) {
-
-			$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
-
-			$tmppluginhost = new PluginHost();
-			$tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
-			$tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
-			$tmppluginhost->load_data();
-
-			$handler = $tmppluginhost->get_feed_handler(
-				PluginHost::feed_to_pfeed_id($feed));
-
-			if ($handler) {
-				$qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed), $params);
-			}
-
-		} else {
-			$qfh_ret = Feeds::queryFeedHeadlines($params);
-		}
-
-		$result = $qfh_ret[0];
-		$feed_title = htmlspecialchars($qfh_ret[1]);
-		$feed_site_url = $qfh_ret[2];
-		/* $last_error = $qfh_ret[3]; */
-
-		$feed_self_url = get_self_url_prefix() .
-			"/public.php?op=rss&id=$feed&key=" .
-			Feeds::get_feed_access_key($feed, false, $owner_uid);
-
-		if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
-
-		if ($format == 'atom') {
-			$tpl = new MiniTemplator;
-
-			$tpl->readTemplateFromFile("templates/generated_feed.txt");
-
-			$tpl->setVariable('FEED_TITLE', $feed_title, true);
-			$tpl->setVariable('VERSION', get_version(), true);
-			$tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url), true);
-
-			$tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
-			while ($line = $result->fetch()) {
-
-				$line["content_preview"] = sanitize(truncate_string(strip_tags($line["content"]), 100, '...'));
-
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-					$line = $p->hook_query_headlines($line);
-				}
+            "padding : 5px; border-style : dashed; border-color : #e7d796;".
+            "margin-bottom : 1em; color : #9a8c59;";
+
+        if (!$limit) $limit = 60;
+
+        $date_sort_field = "date_entered DESC, updated DESC";
+
+        if ($feed == -2 && !$is_cat) {
+            $date_sort_field = "last_published DESC";
+        } else if ($feed == -1 && !$is_cat) {
+            $date_sort_field = "last_marked DESC";
+        }
+
+        switch ($order) {
+        case "title":
+            $date_sort_field = "ttrss_entries.title, date_entered, updated";
+            break;
+        case "date_reverse":
+            $date_sort_field = "date_entered, updated";
+            break;
+        case "feed_dates":
+            $date_sort_field = "updated DESC";
+            break;
+        }
+
+        $params = array(
+            "owner_uid" => $owner_uid,
+            "feed" => $feed,
+            "limit" => $limit,
+            "view_mode" => $view_mode,
+            "cat_view" => $is_cat,
+            "search" => $search,
+            "override_order" => $date_sort_field,
+            "include_children" => true,
+            "ignore_vfeed_group" => true,
+            "offset" => $offset,
+            "start_ts" => $start_ts
+        );
+
+        if (!$is_cat && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX && $feed > LABEL_BASE_INDEX) {
+
+            $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
+
+            $tmppluginhost = new PluginHost();
+            $tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+            $tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
+            $tmppluginhost->load_data();
+
+            $handler = $tmppluginhost->get_feed_handler(
+                PluginHost::feed_to_pfeed_id($feed));
+
+            if ($handler) {
+                $qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed), $params);
+            }
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
-					$line = $p->hook_article_export_feed($line, $feed, $is_cat);
-				}
+        } else {
+            $qfh_ret = Feeds::queryFeedHeadlines($params);
+        }
 
-				$tpl->setVariable('ARTICLE_ID',
-					htmlspecialchars($orig_guid ? $line['link'] :
-							$this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
-				$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
-				$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
-				$tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
+        $result = $qfh_ret[0];
+        $feed_title = htmlspecialchars($qfh_ret[1]);
+        $feed_site_url = $qfh_ret[2];
+        /* $last_error = $qfh_ret[3]; */
 
-				$content = sanitize($line["content"], false, $owner_uid,
-					$feed_site_url, false, $line["id"]);
+        $feed_self_url = get_self_url_prefix() .
+            "/public.php?op=rss&id=$feed&key=" .
+            Feeds::get_feed_access_key($feed, false, $owner_uid);
 
-				if ($line['note']) {
-					$content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
-						$content;
-					$tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
-				}
+        if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
 
-				$tpl->setVariable('ARTICLE_CONTENT', $content, true);
+        if ($format == 'atom') {
+            $tpl = new MiniTemplator;
 
-				$tpl->setVariable('ARTICLE_UPDATED_ATOM',
-					date('c', strtotime($line["updated"])), true);
-				$tpl->setVariable('ARTICLE_UPDATED_RFC822',
-					date(DATE_RFC822, strtotime($line["updated"])), true);
+            $tpl->readTemplateFromFile("templates/generated_feed.txt");
 
-				$tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
+            $tpl->setVariable('FEED_TITLE', $feed_title, true);
+            $tpl->setVariable('VERSION', get_version(), true);
+            $tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url), true);
 
-				$tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
-				$tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
+            $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
+            while ($line = $result->fetch()) {
 
-				$tags = Article::get_article_tags($line["id"], $owner_uid);
+                $line["content_preview"] = sanitize(truncate_string(strip_tags($line["content"]), 100, '...'));
 
-				foreach ($tags as $tag) {
-					$tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
-					$tpl->addBlock('category');
-				}
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                    $line = $p->hook_query_headlines($line);
+                }
 
-				$enclosures = Article::get_article_enclosures($line["id"]);
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
+                    $line = $p->hook_article_export_feed($line, $feed, $is_cat);
+                }
 
-				if (count($enclosures) > 0) {
-					foreach ($enclosures as $e) {
-						$type = htmlspecialchars($e['content_type']);
-						$url = htmlspecialchars($e['content_url']);
-						$length = $e['duration'] ? $e['duration'] : 1;
+                $tpl->setVariable('ARTICLE_ID',
+                    htmlspecialchars($orig_guid ? $line['link'] :
+                            $this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
+                $tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
+                $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
+                $tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
 
-						$tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url, true);
-						$tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type, true);
-						$tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length, true);
+                $content = sanitize($line["content"], false, $owner_uid,
+                    $feed_site_url, false, $line["id"]);
 
-						$tpl->addBlock('enclosure');
-					}
-				} else {
-					$tpl->setVariable('ARTICLE_ENCLOSURE_URL', null, true);
-					$tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', null, true);
-					$tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', null, true);
-				}
+                if ($line['note']) {
+                    $content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
+                        $content;
+                    $tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
+                }
 
-				list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $feed_site_url);
+                $tpl->setVariable('ARTICLE_CONTENT', $content, true);
 
-				$tpl->setVariable('ARTICLE_OG_IMAGE', $og_image, true);
+                $tpl->setVariable('ARTICLE_UPDATED_ATOM',
+                    date('c', strtotime($line["updated"])), true);
+                $tpl->setVariable('ARTICLE_UPDATED_RFC822',
+                    date(DATE_RFC822, strtotime($line["updated"])), true);
 
-				$tpl->addBlock('entry');
-			}
+                $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
 
-			$tmp = "";
+                $tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
+                $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
 
-			$tpl->addBlock('feed');
-			$tpl->generateOutputToString($tmp);
+                $tags = Article::get_article_tags($line["id"], $owner_uid);
 
-			if (@!clean($_REQUEST["noxml"])) {
-				header("Content-Type: text/xml; charset=utf-8");
-			} else {
-				header("Content-Type: text/plain; charset=utf-8");
-			}
+                foreach ($tags as $tag) {
+                    $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
+                    $tpl->addBlock('category');
+                }
 
-			print $tmp;
-		} else if ($format == 'json') {
+                $enclosures = Article::get_article_enclosures($line["id"]);
 
-			$feed = array();
+                if (count($enclosures) > 0) {
+                    foreach ($enclosures as $e) {
+                        $type = htmlspecialchars($e['content_type']);
+                        $url = htmlspecialchars($e['content_url']);
+                        $length = $e['duration'] ? $e['duration'] : 1;
 
-			$feed['title'] = $feed_title;
-			$feed['feed_url'] = $feed_self_url;
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url, true);
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type, true);
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length, true);
 
-			$feed['self_url'] = get_self_url_prefix();
+                        $tpl->addBlock('enclosure');
+                    }
+                } else {
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_URL', null, true);
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', null, true);
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', null, true);
+                }
 
-			$feed['articles'] = array();
+                list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $feed_site_url);
 
-			while ($line = $result->fetch()) {
+                $tpl->setVariable('ARTICLE_OG_IMAGE', $og_image, true);
 
-				$line["content_preview"] = sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...'));
+                $tpl->addBlock('entry');
+            }
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-					$line = $p->hook_query_headlines($line, 100);
-				}
+            $tmp = "";
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
-					$line = $p->hook_article_export_feed($line, $feed, $is_cat);
-				}
+            $tpl->addBlock('feed');
+            $tpl->generateOutputToString($tmp);
 
-				$article = array();
+            if (@!clean($_REQUEST["noxml"])) {
+                header("Content-Type: text/xml; charset=utf-8");
+            } else {
+                header("Content-Type: text/plain; charset=utf-8");
+            }
 
-				$article['id'] = $line['link'];
-				$article['link']	= $line['link'];
-				$article['title'] = $line['title'];
-				$article['excerpt'] = $line["content_preview"];
-				$article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
-				$article['updated'] = date('c', strtotime($line["updated"]));
+            print $tmp;
+        } else if ($format == 'json') {
 
-				if ($line['note']) $article['note'] = $line['note'];
-				if ($article['author']) $article['author'] = $line['author'];
+            $feed = array();
 
-				$tags = Article::get_article_tags($line["id"], $owner_uid);
+            $feed['title'] = $feed_title;
+            $feed['feed_url'] = $feed_self_url;
 
-				if (count($tags) > 0) {
-					$article['tags'] = array();
+            $feed['self_url'] = get_self_url_prefix();
 
-					foreach ($tags as $tag) {
-						array_push($article['tags'], $tag);
-					}
-				}
+            $feed['articles'] = array();
 
-				$enclosures = Article::get_article_enclosures($line["id"]);
+            while ($line = $result->fetch()) {
 
-				if (count($enclosures) > 0) {
-					$article['enclosures'] = array();
+                $line["content_preview"] = sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...'));
 
-					foreach ($enclosures as $e) {
-						$type = $e['content_type'];
-						$url = $e['content_url'];
-						$length = $e['duration'];
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                    $line = $p->hook_query_headlines($line, 100);
+                }
 
-						array_push($article['enclosures'], array("url" => $url, "type" => $type, "length" => $length));
-					}
-				}
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
+                    $line = $p->hook_article_export_feed($line, $feed, $is_cat);
+                }
+
+                $article = array();
+
+                $article['id'] = $line['link'];
+                $article['link']	= $line['link'];
+                $article['title'] = $line['title'];
+                $article['excerpt'] = $line["content_preview"];
+                $article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
+                $article['updated'] = date('c', strtotime($line["updated"]));
+
+                if ($line['note']) $article['note'] = $line['note'];
+                if ($article['author']) $article['author'] = $line['author'];
+
+                $tags = Article::get_article_tags($line["id"], $owner_uid);
+
+                if (count($tags) > 0) {
+                    $article['tags'] = array();
 
-				array_push($feed['articles'], $article);
-			}
+                    foreach ($tags as $tag) {
+                        array_push($article['tags'], $tag);
+                    }
+                }
+
+                $enclosures = Article::get_article_enclosures($line["id"]);
 
-			header("Content-Type: text/json; charset=utf-8");
-			print json_encode($feed);
+                if (count($enclosures) > 0) {
+                    $article['enclosures'] = array();
 
-		} else {
-			header("Content-Type: text/plain; charset=utf-8");
-			print json_encode(array("error" => array("message" => "Unknown format")));
-		}
-	}
+                    foreach ($enclosures as $e) {
+                        $type = $e['content_type'];
+                        $url = $e['content_url'];
+                        $length = $e['duration'];
 
-	public function getUnread() {
-		$login = clean($_REQUEST["login"]);
-		$fresh = clean($_REQUEST["fresh"]) == "1";
+                        array_push($article['enclosures'], array("url" => $url, "type" => $type, "length" => $length));
+                    }
+                }
+
+                array_push($feed['articles'], $article);
+            }
 
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
-		$sth->execute([$login]);
+            header("Content-Type: text/json; charset=utf-8");
+            print json_encode($feed);
 
-		if ($row = $sth->fetch()) {
-			$uid = $row["id"];
+        } else {
+            header("Content-Type: text/plain; charset=utf-8");
+            print json_encode(array("error" => array("message" => "Unknown format")));
+        }
+    }
 
-			print Feeds::getGlobalUnread($uid);
+    public function getUnread() {
+        $login = clean($_REQUEST["login"]);
+        $fresh = clean($_REQUEST["fresh"]) == "1";
 
-			if ($fresh) {
-				print ";";
-				print Feeds::getFeedArticles(-3, false, true, $uid);
-			}
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
+        $sth->execute([$login]);
+
+        if ($row = $sth->fetch()) {
+            $uid = $row["id"];
+
+            print Feeds::getGlobalUnread($uid);
+
+            if ($fresh) {
+                print ";";
+                print Feeds::getFeedArticles(-3, false, true, $uid);
+            }
 
-		} else {
-			print "-1;User not found";
-		}
-	}
+        } else {
+            print "-1;User not found";
+        }
+    }
 
-	public function getProfiles() {
-		$login = clean($_REQUEST["login"]);
-		$rv = [];
+    public function getProfiles() {
+        $login = clean($_REQUEST["login"]);
+        $rv = [];
 
-		if ($login) {
-			$sth = $this->pdo->prepare("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
+        if ($login) {
+            $sth = $this->pdo->prepare("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
 			WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = ? ORDER BY title");
-			$sth->execute([$login]);
+            $sth->execute([$login]);
 
-			$rv = [ [ "value" => 0, "label" => __("Default profile") ] ];
+            $rv = [ [ "value" => 0, "label" => __("Default profile") ] ];
 
-			while ($line = $sth->fetch()) {
-				$id = $line["id"];
-				$title = $line["title"];
+            while ($line = $sth->fetch()) {
+                $id = $line["id"];
+                $title = $line["title"];
 
-				array_push($rv, [ "label" => $title, "value" => $id ]);
-			}
-	    }
+                array_push($rv, [ "label" => $title, "value" => $id ]);
+            }
+        }
 
-		print json_encode($rv);
-	}
+        print json_encode($rv);
+    }
 
-	public function logout() {
-		logout_user();
-		header("Location: index.php");
-	}
+    public function logout() {
+        logout_user();
+        header("Location: index.php");
+    }
 
-	public function share() {
-		$uuid = clean($_REQUEST["key"]);
+    public function share() {
+        $uuid = clean($_REQUEST["key"]);
 
-		if ($uuid) {
-			$sth = $this->pdo->prepare("SELECT ref_id, owner_uid
+        if ($uuid) {
+            $sth = $this->pdo->prepare("SELECT ref_id, owner_uid
 						FROM ttrss_user_entries WHERE uuid = ?");
-			$sth->execute([$uuid]);
+            $sth->execute([$uuid]);
 
-			if ($row = $sth->fetch()) {
-				header("Content-Type: text/html");
+            if ($row = $sth->fetch()) {
+                header("Content-Type: text/html");
 
-				$id = $row["ref_id"];
-				$owner_uid = $row["owner_uid"];
+                $id = $row["ref_id"];
+                $owner_uid = $row["owner_uid"];
 
-				print $this->format_article($id, $owner_uid);
+                print $this->format_article($id, $owner_uid);
 
-				return;
-			}
-		}
+                return;
+            }
+        }
 
-		header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
-		print "Article not found.";
-	}
+        header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+        print "Article not found.";
+    }
 
-	private function format_article($id, $owner_uid) {
+    private function format_article($id, $owner_uid) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id,title,link,content,feed_id,comments,int_id,lang,
+        $sth = $pdo->prepare("SELECT id,title,link,content,feed_id,comments,int_id,lang,
 			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 			(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
 			(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,
@@ -337,26 +337,26 @@ 
 			note
 			FROM ttrss_entries,ttrss_user_entries
 			WHERE	id = ? AND ref_id = id AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		$rv = '';
+        $rv = '';
 
-		if ($line = $sth->fetch()) {
+        if ($line = $sth->fetch()) {
 
-			$line["tags"] = Article::get_article_tags($id, $owner_uid, $line["tag_cache"]);
-			unset($line["tag_cache"]);
+            $line["tags"] = Article::get_article_tags($id, $owner_uid, $line["tag_cache"]);
+            unset($line["tag_cache"]);
 
-			$line["content"] = sanitize($line["content"],
-				$line['hide_images'],
-				$owner_uid, $line["site_url"], false, $line["id"]);
+            $line["content"] = sanitize($line["content"],
+                $line['hide_images'],
+                $owner_uid, $line["site_url"], false, $line["id"]);
 
-			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
-				$line = $p->hook_render_article($line);
-			}
+            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
+                $line = $p->hook_render_article($line);
+            }
 
-			$line['content'] = DiskCache::rewriteUrls($line['content']);
+            $line['content'] = DiskCache::rewriteUrls($line['content']);
 
-			$enclosures = Article::get_article_enclosures($line["id"]);
+            $enclosures = Article::get_article_enclosures($line["id"]);
 
             header("Content-Type: text/html");
 
@@ -371,13 +371,13 @@ 
             $rv .= "<meta property='og:title' content=\"".htmlspecialchars(html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401))."\"/>\n";
             $rv .= "<meta property='og:description' content=\"".
                 htmlspecialchars(
-                	truncate_string(
-                		preg_replace("/[\r\n\t]/", "",
-							preg_replace("/ {1,}/", " ",
-								strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
-							)
-					), 500, "...")
-				)."\"/>\n";
+                    truncate_string(
+                        preg_replace("/[\r\n\t]/", "",
+                            preg_replace("/ {1,}/", " ",
+                                strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
+                            )
+                    ), 500, "...")
+                )."\"/>\n";
 
             $rv .= "</head>";
 
@@ -390,132 +390,132 @@ 
             $rv .= "<body class='flat ttrss_utility ttrss_zoom'>";
             $rv .= "<div class='container'>";
 
-			if ($line["link"]) {
-				$rv .= "<h1><a target='_blank' rel='noopener noreferrer'
+            if ($line["link"]) {
+                $rv .= "<h1><a target='_blank' rel='noopener noreferrer'
 					title=\"".htmlspecialchars($line['title'])."\"
 					href=\"" .htmlspecialchars($line["link"]) . "\">" .	$line["title"] . "</a></h1>";
-			} else {
-				$rv .= "<h1>" . $line["title"] . "</h1>";
-			}
+            } else {
+                $rv .= "<h1>" . $line["title"] . "</h1>";
+            }
 
-			$rv .= "<div class='content post'>";
+            $rv .= "<div class='content post'>";
 
-			/* header */
+            /* header */
 
-			$rv .= "<div class='header'>";
-			$rv .= "<div class='row'>"; # row
+            $rv .= "<div class='header'>";
+            $rv .= "<div class='row'>"; # row
 
-			//$entry_author = $line["author"] ? " - " . $line["author"] : "";
-			$parsed_updated = make_local_datetime($line["updated"], true,
-				$owner_uid, true);
+            //$entry_author = $line["author"] ? " - " . $line["author"] : "";
+            $parsed_updated = make_local_datetime($line["updated"], true,
+                $owner_uid, true);
 
-			$rv .= "<div>".$line['author']."</div>";
+            $rv .= "<div>".$line['author']."</div>";
             $rv .= "<div>$parsed_updated</div>";
 
-			$rv .= "</div>"; # row
+            $rv .= "</div>"; # row
 
-			$rv .= "</div>"; # header
+            $rv .= "</div>"; # header
 
-			/* content */
+            /* content */
 
-			$lang = $line['lang'] ? $line['lang'] : "en";
-			$rv .= "<div class='content' lang='$lang'>";
+            $lang = $line['lang'] ? $line['lang'] : "en";
+            $rv .= "<div class='content' lang='$lang'>";
 
-			/* content body */
+            /* content body */
 
-			$rv .= $line["content"];
+            $rv .= $line["content"];
 
             $rv .= Article::format_article_enclosures($id,
                 $line["always_display_enclosures"],
                 $line["content"],
                 $line["hide_images"]);
 
-			$rv .= "</div>"; # content
+            $rv .= "</div>"; # content
 
-			$rv .= "</div>"; # post
+            $rv .= "</div>"; # post
 
-		}
+        }
 
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE) as $p) {
-			$rv = $p->hook_format_article($rv, $line, true);
-		}
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE) as $p) {
+            $rv = $p->hook_format_article($rv, $line, true);
+        }
 
-		return $rv;
+        return $rv;
 
-	}
+    }
 
-	public function rss() {
-		$feed = clean($_REQUEST["id"]);
-		$key = clean($_REQUEST["key"]);
-		$is_cat = clean($_REQUEST["is_cat"]);
-		$limit = (int)clean($_REQUEST["limit"]);
-		$offset = (int)clean($_REQUEST["offset"]);
+    public function rss() {
+        $feed = clean($_REQUEST["id"]);
+        $key = clean($_REQUEST["key"]);
+        $is_cat = clean($_REQUEST["is_cat"]);
+        $limit = (int)clean($_REQUEST["limit"]);
+        $offset = (int)clean($_REQUEST["offset"]);
 
-		$search = clean($_REQUEST["q"]);
-		$view_mode = clean($_REQUEST["view-mode"]);
-		$order = clean($_REQUEST["order"]);
-		$start_ts = clean($_REQUEST["ts"]);
+        $search = clean($_REQUEST["q"]);
+        $view_mode = clean($_REQUEST["view-mode"]);
+        $order = clean($_REQUEST["order"]);
+        $start_ts = clean($_REQUEST["ts"]);
 
-		$format = clean($_REQUEST['format']);
-		$orig_guid = clean($_REQUEST["orig_guid"]);
+        $format = clean($_REQUEST['format']);
+        $orig_guid = clean($_REQUEST["orig_guid"]);
 
-		if (!$format) $format = 'atom';
+        if (!$format) $format = 'atom';
 
-		if (SINGLE_USER_MODE) {
-			authenticate_user("admin", null);
-		}
+        if (SINGLE_USER_MODE) {
+            authenticate_user("admin", null);
+        }
 
-		$owner_id = false;
+        $owner_id = false;
 
-		if ($key) {
-			$sth = $this->pdo->prepare("SELECT owner_uid FROM
+        if ($key) {
+            $sth = $this->pdo->prepare("SELECT owner_uid FROM
 				ttrss_access_keys WHERE access_key = ? AND feed_id = ?");
-			$sth->execute([$key, $feed]);
+            $sth->execute([$key, $feed]);
 
-			if ($row = $sth->fetch())
-				$owner_id = $row["owner_uid"];
-		}
+            if ($row = $sth->fetch())
+                $owner_id = $row["owner_uid"];
+        }
 
-		if ($owner_id) {
-			$this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
-				$offset, $search, $view_mode, $format, $order, $orig_guid, $start_ts);
-		} else {
-			header('HTTP/1.1 403 Forbidden');
-		}
-	}
+        if ($owner_id) {
+            $this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
+                $offset, $search, $view_mode, $format, $order, $orig_guid, $start_ts);
+        } else {
+            header('HTTP/1.1 403 Forbidden');
+        }
+    }
 
-	public function updateTask() {
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
-	}
+    public function updateTask() {
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
+    }
 
-	public function housekeepingTask() {
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
-	}
+    public function housekeepingTask() {
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
+    }
 
-	public function globalUpdateFeeds() {
-		RPC::updaterandomfeed_real();
+    public function globalUpdateFeeds() {
+        RPC::updaterandomfeed_real();
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
-	}
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
+    }
 
-	public function sharepopup() {
-		if (SINGLE_USER_MODE) {
-			login_sequence();
-		}
+    public function sharepopup() {
+        if (SINGLE_USER_MODE) {
+            login_sequence();
+        }
 
-		header('Content-Type: text/html; charset=utf-8');
-		?>
+        header('Content-Type: text/html; charset=utf-8');
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
 			<title><?php echo __("Share with Tiny Tiny RSS") ?></title>
 			<?php
-			echo stylesheet_tag("css/default.css");
-			echo javascript_tag("lib/prototype.js");
-			echo javascript_tag("lib/dojo/dojo.js");
-			echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls")
-			?>
+            echo stylesheet_tag("css/default.css");
+            echo javascript_tag("lib/prototype.js");
+            echo javascript_tag("lib/dojo/dojo.js");
+            echo javascript_tag("lib/dojo/tt-rss-layer.js");
+            echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls")
+            ?>
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
@@ -537,29 +537,29 @@ 
 
 		<?php
 
-		$action = clean($_REQUEST["action"]);
+        $action = clean($_REQUEST["action"]);
 
-		if ($_SESSION["uid"]) {
+        if ($_SESSION["uid"]) {
 
-			if ($action == 'share') {
+            if ($action == 'share') {
 
-				$title = strip_tags(clean($_REQUEST["title"]));
-				$url = strip_tags(clean($_REQUEST["url"]));
-				$content = strip_tags(clean($_REQUEST["content"]));
-				$labels = strip_tags(clean($_REQUEST["labels"]));
+                $title = strip_tags(clean($_REQUEST["title"]));
+                $url = strip_tags(clean($_REQUEST["url"]));
+                $content = strip_tags(clean($_REQUEST["content"]));
+                $labels = strip_tags(clean($_REQUEST["labels"]));
 
-				Article::create_published_article($title, $url, $content, $labels,
-					$_SESSION["uid"]);
+                Article::create_published_article($title, $url, $content, $labels,
+                    $_SESSION["uid"]);
 
-				print "<script type='text/javascript'>";
-				print "window.close();";
-				print "</script>";
+                print "<script type='text/javascript'>";
+                print "window.close();";
+                print "</script>";
 
-			} else {
-				$title = htmlspecialchars(clean($_REQUEST["title"]));
-				$url = htmlspecialchars(clean($_REQUEST["url"]));
+            } else {
+                $title = htmlspecialchars(clean($_REQUEST["title"]));
+                $url = htmlspecialchars(clean($_REQUEST["url"]));
 
-				?>
+                ?>
 				<form id='share_form' name='share_form'>
 
 					<input type="hidden" name="op" value="sharepopup">
@@ -599,12 +599,12 @@ 
 				</form>
 				<?php
 
-			}
+            }
 
-		} else {
+        } else {
 
-			$return = urlencode(make_self_url());
-			print_error("Not logged in"); ?>
+            $return = urlencode(make_self_url());
+            print_error("Not logged in"); ?>
 
 			<form action="public.php?return=<?php echo $return ?>" method="post">
 
@@ -636,90 +636,90 @@ 
 
 			</form>
 			<?php
-		}
+        }
 
-		print "</div></body></html>";
-	}
+        print "</div></body></html>";
+    }
 
-	public function login() {
-		if (!SINGLE_USER_MODE) {
+    public function login() {
+        if (!SINGLE_USER_MODE) {
 
-			$login = clean($_POST["login"]);
-			$password = clean($_POST["password"]);
-			$remember_me = clean($_POST["remember_me"]);
+            $login = clean($_POST["login"]);
+            $password = clean($_POST["password"]);
+            $remember_me = clean($_POST["remember_me"]);
 
-			if ($remember_me) {
-				session_set_cookie_params(SESSION_COOKIE_LIFETIME);
-			} else {
-				session_set_cookie_params(0);
-			}
+            if ($remember_me) {
+                session_set_cookie_params(SESSION_COOKIE_LIFETIME);
+            } else {
+                session_set_cookie_params(0);
+            }
 
-			if (authenticate_user($login, $password)) {
-				$_POST["password"] = "";
+            if (authenticate_user($login, $password)) {
+                $_POST["password"] = "";
 
-				if (get_schema_version() >= 120) {
-					$_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
-				}
+                if (get_schema_version() >= 120) {
+                    $_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
+                }
 
-				$_SESSION["ref_schema_version"] = get_schema_version(true);
-				$_SESSION["bw_limit"] = !!clean($_POST["bw_limit"]);
+                $_SESSION["ref_schema_version"] = get_schema_version(true);
+                $_SESSION["bw_limit"] = !!clean($_POST["bw_limit"]);
 
-				if (clean($_POST["profile"])) {
+                if (clean($_POST["profile"])) {
 
-					$profile = (int) clean($_POST["profile"]);
+                    $profile = (int) clean($_POST["profile"]);
 
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
 						WHERE id = ? AND owner_uid = ?");
-					$sth->execute([$profile, $_SESSION['uid']]);
+                    $sth->execute([$profile, $_SESSION['uid']]);
 
-					if ($sth->fetch()) {
-						$_SESSION["profile"] = $profile;
- 					} else {
-					    $_SESSION["profile"] = null;
+                    if ($sth->fetch()) {
+                        $_SESSION["profile"] = $profile;
+                        } else {
+                        $_SESSION["profile"] = null;
                     }
-				}
-			} else {
+                }
+            } else {
 
-				// start an empty session to deliver login error message
-				@session_start();
+                // start an empty session to deliver login error message
+                @session_start();
 
-				if (!isset($_SESSION["login_error_msg"]))
-					$_SESSION["login_error_msg"] = __("Incorrect username or password");
+                if (!isset($_SESSION["login_error_msg"]))
+                    $_SESSION["login_error_msg"] = __("Incorrect username or password");
 
-				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
-			}
+                user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
+            }
 
-			$return = clean($_REQUEST['return']);
+            $return = clean($_REQUEST['return']);
 
-			if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
-				header("Location: " . clean($_REQUEST['return']));
-			} else {
-				header("Location: " . get_self_url_prefix());
-			}
-		}
-	}
+            if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
+                header("Location: " . clean($_REQUEST['return']));
+            } else {
+                header("Location: " . get_self_url_prefix());
+            }
+        }
+    }
 
-	public function subscribe() {
-		if (SINGLE_USER_MODE) {
-			login_sequence();
-		}
+    public function subscribe() {
+        if (SINGLE_USER_MODE) {
+            login_sequence();
+        }
 
-		if ($_SESSION["uid"]) {
+        if ($_SESSION["uid"]) {
 
-			$feed_url = trim(clean($_REQUEST["feed_url"]));
+            $feed_url = trim(clean($_REQUEST["feed_url"]));
 
-			header('Content-Type: text/html; charset=utf-8');
-			?>
+            header('Content-Type: text/html; charset=utf-8');
+            ?>
 			<!DOCTYPE html>
 			<html>
 			<head>
 				<title>Tiny Tiny RSS</title>
 				<?php
-					echo stylesheet_tag("css/default.css");
-					echo javascript_tag("lib/prototype.js");
-					echo javascript_tag("lib/dojo/dojo.js");
-					echo javascript_tag("lib/dojo/tt-rss-layer.js");
-				?>
+                    echo stylesheet_tag("css/default.css");
+                    echo javascript_tag("lib/prototype.js");
+                    echo javascript_tag("lib/dojo/dojo.js");
+                    echo javascript_tag("lib/dojo/tt-rss-layer.js");
+                ?>
 				<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 				<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 				<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
@@ -738,8 +738,8 @@ 
 			<div class='content'>
 			<?php
 
-			if (!$feed_url) {
-				?>
+            if (!$feed_url) {
+                ?>
 				<form method="post">
 					<input type="hidden" name="op" value="subscribe">
 					<fieldset>
@@ -754,101 +754,101 @@ 
 					<a href="index.php"><?php echo __("Return to Tiny Tiny RSS") ?></a>
 				</form>
 				<?php
-			} else {
-
-				$rc = Feeds::subscribe_to_feed($feed_url);
-				$feed_urls = false;
-
-				switch ($rc['code']) {
-					case 0:
-						print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 1:
-						print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 2:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
-						break;
-					case 3:
-						print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
-						break;
-					case 4:
-						$feed_urls = $rc["feeds"];
-						break;
-					case 5:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
-						break;
-				}
-
-				if ($feed_urls) {
-
-					print "<form action='public.php'>";
-					print "<input type='hidden' name='op' value='subscribe'>";
-
-					print "<fieldset>";
-					print "<label style='display : inline'>" . __("Multiple feed URLs found:") . "</label>";
-					print "<select name='feed_url' dojoType='dijit.form.Select'>";
-
-					foreach ($feed_urls as $url => $name) {
-						$url = htmlspecialchars($url);
-						$name = htmlspecialchars($name);
-
-						print "<option value=\"$url\">$name</option>";
-					}
+            } else {
+
+                $rc = Feeds::subscribe_to_feed($feed_url);
+                $feed_urls = false;
+
+                switch ($rc['code']) {
+                    case 0:
+                        print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
+                        break;
+                    case 1:
+                        print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
+                        break;
+                    case 2:
+                        print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
+                        break;
+                    case 3:
+                        print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
+                        break;
+                    case 4:
+                        $feed_urls = $rc["feeds"];
+                        break;
+                    case 5:
+                        print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
+                        break;
+                }
+
+                if ($feed_urls) {
+
+                    print "<form action='public.php'>";
+                    print "<input type='hidden' name='op' value='subscribe'>";
+
+                    print "<fieldset>";
+                    print "<label style='display : inline'>" . __("Multiple feed URLs found:") . "</label>";
+                    print "<select name='feed_url' dojoType='dijit.form.Select'>";
+
+                    foreach ($feed_urls as $url => $name) {
+                        $url = htmlspecialchars($url);
+                        $name = htmlspecialchars($name);
+
+                        print "<option value=\"$url\">$name</option>";
+                    }
 
-					print "</select>";
-					print "</fieldset>";
+                    print "</select>";
+                    print "</fieldset>";
 
-					print "<button class='alt-primary' dojoType='dijit.form.Button' type='submit'>".__("Subscribe to selected feed")."</button>";
-					print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    print "<button class='alt-primary' dojoType='dijit.form.Button' type='submit'>".__("Subscribe to selected feed")."</button>";
+                    print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-					print "</form>";
-				}
+                    print "</form>";
+                }
 
-				$tp_uri = get_self_url_prefix() . "/prefs.php";
+                $tp_uri = get_self_url_prefix() . "/prefs.php";
 
-				if ($rc['code'] <= 2){
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                if ($rc['code'] <= 2){
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 					feed_url = ? AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
-					$row = $sth->fetch();
+                    $sth->execute([$feed_url, $_SESSION['uid']]);
+                    $row = $sth->fetch();
 
-					$feed_id = $row["id"];
-				} else {
-					$feed_id = 0;
-				}
+                    $feed_id = $row["id"];
+                } else {
+                    $feed_id = 0;
+                }
 
-				if ($feed_id) {
-					print "<form method='GET' action=\"$tp_uri\">
+                if ($feed_id) {
+                    print "<form method='GET' action=\"$tp_uri\">
 					<input type='hidden' name='tab' value='feedConfig'>
 					<input type='hidden' name='method' value='editfeed'>
 					<input type='hidden' name='methodparam' value='$feed_id'>
 					<button dojoType='dijit.form.Button' class='alt-info' type='submit'>".__("Edit subscription options")."</button>
 					<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
 					</form>";
-				}
-			}
+                }
+            }
 
-			print "</div></div></body></html>";
+            print "</div></div></body></html>";
 
-		} else {
-			render_login_form();
-		}
-	}
+        } else {
+            render_login_form();
+        }
+    }
 
-	public function index() {
-		header("Content-Type: text/plain");
-		print error_json(13);
-	}
+    public function index() {
+        header("Content-Type: text/plain");
+        print error_json(13);
+    }
 
-	public function forgotpass() {
-		startup_gettext();
-		session_start();
+    public function forgotpass() {
+        startup_gettext();
+        session_start();
 
-		@$hash = clean($_REQUEST["hash"]);
+        @$hash = clean($_REQUEST["hash"]);
 
-		header('Content-Type: text/html; charset=utf-8');
-		?>
+        header('Content-Type: text/html; charset=utf-8');
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
@@ -857,11 +857,11 @@ 
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 			<?php
-				echo stylesheet_tag("css/default.css");
-				echo javascript_tag("lib/prototype.js");
-				echo javascript_tag("lib/dojo/dojo.js");
-				echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			?>
+                echo stylesheet_tag("css/default.css");
+                echo javascript_tag("lib/prototype.js");
+                echo javascript_tag("lib/dojo/dojo.js");
+                echo javascript_tag("lib/dojo/tt-rss-layer.js");
+            ?>
 		</head>
 		<body class='flat ttrss_utility'>
 		<div class='container'>
@@ -876,52 +876,52 @@ 
 		</script>
 		<?php
 
-		print "<h1>".__("Password recovery")."</h1>";
-		print "<div class='content'>";
+        print "<h1>".__("Password recovery")."</h1>";
+        print "<div class='content'>";
 
-		@$method = clean($_POST['method']);
+        @$method = clean($_POST['method']);
 
-		if ($hash) {
-			$login = clean($_REQUEST["login"]);
+        if ($hash) {
+            $login = clean($_REQUEST["login"]);
 
-			if ($login) {
-				$sth = $this->pdo->prepare("SELECT id, resetpass_token FROM ttrss_users
+            if ($login) {
+                $sth = $this->pdo->prepare("SELECT id, resetpass_token FROM ttrss_users
 					WHERE login = ?");
-				$sth->execute([$login]);
+                $sth->execute([$login]);
 
-				if ($row = $sth->fetch()) {
-					$id = $row["id"];
-					$resetpass_token_full = $row["resetpass_token"];
-					list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
+                if ($row = $sth->fetch()) {
+                    $id = $row["id"];
+                    $resetpass_token_full = $row["resetpass_token"];
+                    list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
 
-					if ($timestamp && $resetpass_token &&
-						$timestamp >= time() - 15*60*60 &&
-						$resetpass_token == $hash) {
+                    if ($timestamp && $resetpass_token &&
+                        $timestamp >= time() - 15*60*60 &&
+                        $resetpass_token == $hash) {
 
-							$sth = $this->pdo->prepare("UPDATE ttrss_users SET resetpass_token = NULL
+                            $sth = $this->pdo->prepare("UPDATE ttrss_users SET resetpass_token = NULL
 								WHERE id = ?");
-							$sth->execute([$id]);
+                            $sth->execute([$id]);
 
-							Pref_Users::resetUserPassword($id, true);
+                            Pref_Users::resetUserPassword($id, true);
 
-							print "<p>"."Completed."."</p>";
+                            print "<p>"."Completed."."</p>";
 
-					} else {
-						print_error("Some of the information provided is missing or incorrect.");
-					}
-				} else {
-					print_error("Some of the information provided is missing or incorrect.");
-				}
-			} else {
-				print_error("Some of the information provided is missing or incorrect.");
-			}
+                    } else {
+                        print_error("Some of the information provided is missing or incorrect.");
+                    }
+                } else {
+                    print_error("Some of the information provided is missing or incorrect.");
+                }
+            } else {
+                print_error("Some of the information provided is missing or incorrect.");
+            }
 
-			print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+            print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-		} else if (!$method) {
-			print_notice(__("You will need to provide valid account name and email. Password reset link will be sent to your email address."));
+        } else if (!$method) {
+            print_notice(__("You will need to provide valid account name and email. Password reset link will be sent to your email address."));
 
-			print "<form method='POST' action='public.php'>
+            print "<form method='POST' action='public.php'>
 				<input type='hidden' name='method' value='do'>
 				<input type='hidden' name='op' value='forgotpass'>
 
@@ -935,10 +935,10 @@ 
 				<input dojoType='dijit.form.TextBox' type='email' name='email' value='' required>
 				</fieldset>";
 
-			$_SESSION["pwdreset:testvalue1"] = rand(1,10);
-			$_SESSION["pwdreset:testvalue2"] = rand(1,10);
+            $_SESSION["pwdreset:testvalue1"] = rand(1,10);
+            $_SESSION["pwdreset:testvalue2"] = rand(1,10);
 
-			print "<fieldset>
+            print "<fieldset>
 				<label>".T_sprintf("How much is %d + %d:", $_SESSION["pwdreset:testvalue1"], $_SESSION["pwdreset:testvalue2"])."</label>
 				<input dojoType='dijit.form.TextBox' type='text' name='test' value='' required>
 				</fieldset>
@@ -950,109 +950,109 @@ 
 				</fieldset>
 
 				</form>";
-		} else if ($method == 'do') {
+        } else if ($method == 'do') {
 
-			$login = clean($_POST["login"]);
-			$email = clean($_POST["email"]);
-			$test = clean($_POST["test"]);
+            $login = clean($_POST["login"]);
+            $email = clean($_POST["email"]);
+            $test = clean($_POST["test"]);
 
-			if ($test != ($_SESSION["pwdreset:testvalue1"] + $_SESSION["pwdreset:testvalue2"]) || !$email || !$login) {
-				print_error(__('Some of the required form parameters are missing or incorrect.'));
+            if ($test != ($_SESSION["pwdreset:testvalue1"] + $_SESSION["pwdreset:testvalue2"]) || !$email || !$login) {
+                print_error(__('Some of the required form parameters are missing or incorrect.'));
 
-				print "<form method='GET' action='public.php'>
+                print "<form method='GET' action='public.php'>
 					<input type='hidden' name='op' value='forgotpass'>
 					<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".__("Go back")."</button>
 					</form>";
 
-			} else {
+            } else {
 
-				// prevent submitting this form multiple times
-				$_SESSION["pwdreset:testvalue1"] = rand(1, 1000);
-				$_SESSION["pwdreset:testvalue2"] = rand(1, 1000);
+                // prevent submitting this form multiple times
+                $_SESSION["pwdreset:testvalue1"] = rand(1, 1000);
+                $_SESSION["pwdreset:testvalue2"] = rand(1, 1000);
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_users
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_users
 					WHERE login = ? AND email = ?");
-				$sth->execute([$login, $email]);
+                $sth->execute([$login, $email]);
 
-				if ($row = $sth->fetch()) {
-					print_notice("Password reset instructions are being sent to your email address.");
+                if ($row = $sth->fetch()) {
+                    print_notice("Password reset instructions are being sent to your email address.");
 
-					$id = $row["id"];
+                    $id = $row["id"];
 
-					if ($id) {
-						$resetpass_token = sha1(get_random_bytes(128));
-						$resetpass_link = get_self_url_prefix() . "/public.php?op=forgotpass&hash=" . $resetpass_token .
-							"&login=" . urlencode($login);
+                    if ($id) {
+                        $resetpass_token = sha1(get_random_bytes(128));
+                        $resetpass_link = get_self_url_prefix() . "/public.php?op=forgotpass&hash=" . $resetpass_token .
+                            "&login=" . urlencode($login);
 
-						require_once "lib/MiniTemplator.class.php";
+                        require_once "lib/MiniTemplator.class.php";
 
-						$tpl = new MiniTemplator;
+                        $tpl = new MiniTemplator;
 
-						$tpl->readTemplateFromFile("templates/resetpass_link_template.txt");
+                        $tpl->readTemplateFromFile("templates/resetpass_link_template.txt");
 
-						$tpl->setVariable('LOGIN', $login);
-						$tpl->setVariable('RESETPASS_LINK', $resetpass_link);
-						$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+                        $tpl->setVariable('LOGIN', $login);
+                        $tpl->setVariable('RESETPASS_LINK', $resetpass_link);
+                        $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-						$tpl->addBlock('message');
+                        $tpl->addBlock('message');
 
-						$message = "";
+                        $message = "";
 
-						$tpl->generateOutputToString($message);
+                        $tpl->generateOutputToString($message);
 
-						$mailer = new Mailer();
+                        $mailer = new Mailer();
 
-						$rc = $mailer->mail(["to_name" => $login,
-							"to_address" => $email,
-							"subject" => __("[tt-rss] Password reset request"),
-							"message" => $message]);
+                        $rc = $mailer->mail(["to_name" => $login,
+                            "to_address" => $email,
+                            "subject" => __("[tt-rss] Password reset request"),
+                            "message" => $message]);
 
-						if (!$rc) print_error($mailer->error());
+                        if (!$rc) print_error($mailer->error());
 
-						$resetpass_token_full = time() . ":" . $resetpass_token;
+                        $resetpass_token_full = time() . ":" . $resetpass_token;
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_users
+                        $sth = $this->pdo->prepare("UPDATE ttrss_users
 							SET resetpass_token = ?
 							WHERE login = ? AND email = ?");
 
-						$sth->execute([$resetpass_token_full, $login, $email]);
+                        $sth->execute([$resetpass_token_full, $login, $email]);
 
-					} else {
-						print_error("User ID not found.");
-					}
+                    } else {
+                        print_error("User ID not found.");
+                    }
 
-					print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-				} else {
-					print_error(__("Sorry, login and email combination not found."));
+                } else {
+                    print_error(__("Sorry, login and email combination not found."));
 
-					print "<form method='GET' action='public.php'>
+                    print "<form method='GET' action='public.php'>
 						<input type='hidden' name='op' value='forgotpass'>
 						<button dojoType='dijit.form.Button' type='submit'>".__("Go back")."</button>
 						</form>";
 
-				}
-			}
+                }
+            }
 
-		}
+        }
 
-		print "</div>";
-		print "</div>";
-		print "</body>";
-		print "</html>";
+        print "</div>";
+        print "</div>";
+        print "</body>";
+        print "</html>";
 
-	}
+    }
 
-	public function dbupdate() {
-		startup_gettext();
+    public function dbupdate() {
+        startup_gettext();
 
-		if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
-			$_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
-			render_login_form();
-			exit;
-		}
+        if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
+            $_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
+            render_login_form();
+            exit;
+        }
 
-		?>
+        ?>
 		<!DOCTYPE html>
 		<html>
 			<head>
@@ -1062,11 +1062,11 @@ 
 			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
 			<?php
-				echo stylesheet_tag("css/default.css");
-				echo javascript_tag("lib/prototype.js");
-				echo javascript_tag("lib/dojo/dojo.js");
-				echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			?>
+                echo stylesheet_tag("css/default.css");
+                echo javascript_tag("lib/prototype.js");
+                echo javascript_tag("lib/dojo/dojo.js");
+                echo javascript_tag("lib/dojo/tt-rss-layer.js");
+            ?>
 			<style type="text/css">
 				span.ok { color : #009000; font-weight : bold; }
 				span.err { color : #ff0000; font-weight : bold; }
@@ -1093,139 +1093,139 @@ 
 			<div class="content">
 
 			<?php
-				@$op = clean($_REQUEST["subop"]);
-				$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
+                @$op = clean($_REQUEST["subop"]);
+                $updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
 
-				if ($op == "performupdate") {
-					if ($updater->isUpdateRequired()) {
+                if ($op == "performupdate") {
+                    if ($updater->isUpdateRequired()) {
 
-						print "<h2>" . T_sprintf("Performing updates to version %d", SCHEMA_VERSION) . "</h2>";
+                        print "<h2>" . T_sprintf("Performing updates to version %d", SCHEMA_VERSION) . "</h2>";
 
-						for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
-							print "<ul>";
+                        for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+                            print "<ul>";
 
-							print "<li class='text-info'>" . T_sprintf("Updating to version %d", $i) . "</li>";
+                            print "<li class='text-info'>" . T_sprintf("Updating to version %d", $i) . "</li>";
 
-							print "<li>";
-							$result = $updater->performUpdateTo($i, true);
-							print "</li>";
+                            print "<li>";
+                            $result = $updater->performUpdateTo($i, true);
+                            print "</li>";
 
-							if (!$result) {
-								print "</ul>";
+                            if (!$result) {
+                                print "</ul>";
 
-								print_error("One of the updates failed. Either retry the process or perform updates manually.");
+                                print_error("One of the updates failed. Either retry the process or perform updates manually.");
 
-								print "<form method='POST'>
+                                print "<form method='POST'>
 									<input type='hidden' name='subop' value='performupdate'>
 									<button type='submit' dojoType='dijit.form.Button' class='alt-danger' onclick='return confirmOP()'>".__("Try again")."</button>
 									<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
 								</form>";
 
-								return;
-							} else {
-								print "<li class='text-success'>" . __("Completed.") . "</li>";
-								print "</ul>";
-							}
-						}
+                                return;
+                            } else {
+                                print "<li class='text-success'>" . __("Completed.") . "</li>";
+                                print "</ul>";
+                            }
+                        }
 
-						print_notice("Your Tiny Tiny RSS database is now updated to the latest version.");
+                        print_notice("Your Tiny Tiny RSS database is now updated to the latest version.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-					} else {
-						print_notice("Tiny Tiny RSS database is up to date.");
+                    } else {
+                        print_notice("Tiny Tiny RSS database is up to date.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
-					}
-				} else {
-					if ($updater->isUpdateRequired()) {
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    }
+                } else {
+                    if ($updater->isUpdateRequired()) {
 
-						print "<h2>".T_sprintf("Tiny Tiny RSS database needs update to the latest version (%d to %d).",
-							$updater->getSchemaVersion(), SCHEMA_VERSION)."</h2>";
+                        print "<h2>".T_sprintf("Tiny Tiny RSS database needs update to the latest version (%d to %d).",
+                            $updater->getSchemaVersion(), SCHEMA_VERSION)."</h2>";
 
-						if (DB_TYPE == "mysql") {
-							print_error("<strong>READ THIS:</strong> Due to MySQL limitations, your database is not completely protected while updating. ".
-								"Errors may put it in an inconsistent state requiring manual rollback. <strong>BACKUP YOUR DATABASE BEFORE CONTINUING.</strong>");
-						} else {
-							print_warning("Please backup your database before proceeding.");
-						}
+                        if (DB_TYPE == "mysql") {
+                            print_error("<strong>READ THIS:</strong> Due to MySQL limitations, your database is not completely protected while updating. ".
+                                "Errors may put it in an inconsistent state requiring manual rollback. <strong>BACKUP YOUR DATABASE BEFORE CONTINUING.</strong>");
+                        } else {
+                            print_warning("Please backup your database before proceeding.");
+                        }
 
-						print "<form method='POST'>
+                        print "<form method='POST'>
 							<input type='hidden' name='subop' value='performupdate'>
 							<button type='submit' dojoType='dijit.form.Button' class='alt-danger' onclick='return confirmOP()'>".__("Perform updates")."</button>
 						</form>";
 
-					} else {
+                    } else {
 
-						print_notice("Tiny Tiny RSS database is up to date.");
+                        print_notice("Tiny Tiny RSS database is up to date.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
-					}
-				}
-			?>
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    }
+                }
+            ?>
 
 			</div>
 			</div>
 			</body>
 			</html>
 		<?php
-	}
-
-	public function cached_url() {
-		list ($cache_dir, $filename) = explode("/", $_GET["file"], 2);
-
-		// we do not allow files with extensions at the moment
-		$filename = str_replace(".", "", $filename);
-
-		$cache = new DiskCache($cache_dir);
-
-		if ($cache->exists($filename)) {
-			$cache->send($filename);
-		} else {
-			header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
-			echo "File not found.";
-		}
-	}
-
-	private function make_article_tag_uri($id, $timestamp) {
-
-		$timestamp = date("Y-m-d", strtotime($timestamp));
-
-		return "tag:" . parse_url(get_self_url_prefix(), PHP_URL_HOST) . ",$timestamp:/$id";
-	}
-
-	// this should be used very carefully because this endpoint is exposed to unauthenticated users
-	// plugin data is not loaded because there's no user context and owner_uid/session may or may not be available
-	// in general, don't do anything user-related in here and do not modify $_SESSION
-	public function pluginhandler() {
-		$host = new PluginHost();
-
-		$plugin_name = clean_filename($_REQUEST["plugin"]);
-		$method = clean($_REQUEST["pmethod"]);
-
-		$host->load($plugin_name, PluginHost::KIND_USER, 0);
-		$host->load_data();
-
-		$plugin = $host->get_plugin($plugin_name);
-
-		if ($plugin) {
-			if (method_exists($plugin, $method)) {
-				if ($plugin->is_public_method($method)) {
-					$plugin->$method();
-				} else {
-					user_error("PluginHandler[PUBLIC]: Requested private method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
-					header("Content-Type: text/json");
-					print error_json(6);
-				}
-			} else {
-				user_error("PluginHandler[PUBLIC]: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
-				header("Content-Type: text/json");
-				print error_json(13);
-			}
-		} else {
-			user_error("PluginHandler[PUBLIC]: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
-			header("Content-Type: text/json");
-			print error_json(14);
-		}
-	}
+    }
+
+    public function cached_url() {
+        list ($cache_dir, $filename) = explode("/", $_GET["file"], 2);
+
+        // we do not allow files with extensions at the moment
+        $filename = str_replace(".", "", $filename);
+
+        $cache = new DiskCache($cache_dir);
+
+        if ($cache->exists($filename)) {
+            $cache->send($filename);
+        } else {
+            header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+            echo "File not found.";
+        }
+    }
+
+    private function make_article_tag_uri($id, $timestamp) {
+
+        $timestamp = date("Y-m-d", strtotime($timestamp));
+
+        return "tag:" . parse_url(get_self_url_prefix(), PHP_URL_HOST) . ",$timestamp:/$id";
+    }
+
+    // this should be used very carefully because this endpoint is exposed to unauthenticated users
+    // plugin data is not loaded because there's no user context and owner_uid/session may or may not be available
+    // in general, don't do anything user-related in here and do not modify $_SESSION
+    public function pluginhandler() {
+        $host = new PluginHost();
+
+        $plugin_name = clean_filename($_REQUEST["plugin"]);
+        $method = clean($_REQUEST["pmethod"]);
+
+        $host->load($plugin_name, PluginHost::KIND_USER, 0);
+        $host->load_data();
+
+        $plugin = $host->get_plugin($plugin_name);
+
+        if ($plugin) {
+            if (method_exists($plugin, $method)) {
+                if ($plugin->is_public_method($method)) {
+                    $plugin->$method();
+                } else {
+                    user_error("PluginHandler[PUBLIC]: Requested private method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
+                    header("Content-Type: text/json");
+                    print error_json(6);
+                }
+            } else {
+                user_error("PluginHandler[PUBLIC]: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
+                header("Content-Type: text/json");
+                print error_json(13);
+            }
+        } else {
+            user_error("PluginHandler[PUBLIC]: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
+            header("Content-Type: text/json");
+            print error_json(14);
+        }
+    }
 }