peter-gribanov / sphinx-php-client

src/test.php

Braces +85 added lines, -42 removed lines

@@ -11,8 +11,9 @@ 
 //////////////////////
 
 // for very old PHP versions, like at my home test server
-if ( is_array($argv) && !isset($_SERVER["argv"]) )
+if ( is_array($argv) && !isset($_SERVER["argv"]) ) {
 	$_SERVER["argv"] = $argv;
+}
 unset ( $_SERVER["argv"][0] );
 
 // build query
@@ -41,8 +42,9 @@ 
 }
 
 $args = array();
-foreach ( $_SERVER["argv"] as $arg )
+foreach ( $_SERVER["argv"] as $arg ) {
 	$args[] = $arg;
+}
 
 $cl = new SphinxClient ();
 
@@ -66,36 +68,60 @@ 
 {
 	$arg = $args[$i];
 
-	if ( $arg=="-h" || $arg=="--host" )				$host = $args[++$i];
-	else if ( $arg=="-p" || $arg=="--port" )		$port = (int)$args[++$i];
-	else if ( $arg=="-i" || $arg=="--index" )		$index = $args[++$i];
-	else if ( $arg=="-s" || $arg=="--sortby" )		{ $sortby = $args[++$i]; $sortexpr = ""; }
-	else if ( $arg=="-S" || $arg=="--sortexpr" )	{ $sortexpr = $args[++$i]; $sortby = ""; }
-	else if ( $arg=="-a" || $arg=="--any" )			$mode = SPH_MATCH_ANY;
-	else if ( $arg=="-b" || $arg=="--boolean" )		$mode = SPH_MATCH_BOOLEAN;
-	else if ( $arg=="-e" || $arg=="--extended" )	$mode = SPH_MATCH_EXTENDED;
-	else if ( $arg=="-e2" )							$mode = SPH_MATCH_EXTENDED2;
-	else if ( $arg=="-ph"|| $arg=="--phrase" )		$mode = SPH_MATCH_PHRASE;
-	else if ( $arg=="-f" || $arg=="--filter" )		$filter = $args[++$i];
-	else if ( $arg=="-v" || $arg=="--value" )		$filtervals[] = $args[++$i];
-	else if ( $arg=="-g" || $arg=="--groupby" )		$groupby = $args[++$i];
-	else if ( $arg=="-gs"|| $arg=="--groupsort" )	$groupsort = $args[++$i];
-	else if ( $arg=="-d" || $arg=="--distinct" )	$distinct = $args[++$i];
-	else if ( $arg=="-l" || $arg=="--limit" )		$limit = (int)$args[++$i];
-	else if ( $arg=="--select" )					$select = $args[++$i];
-	else if ( $arg=="-fr"|| $arg=="--filterrange" )	$cl->SetFilterRange ( $args[++$i], $args[++$i], $args[++$i] );
-	else if ( $arg=="-r" )
+	if ( $arg=="-h" || $arg=="--host" ) {
+		$host = $args[++$i];
+	} else if ( $arg=="-p" || $arg=="--port" ) {
+		$port = (int)$args[++$i];
+	} else if ( $arg=="-i" || $arg=="--index" ) {
+		$index = $args[++$i];
+	} else if ( $arg=="-s" || $arg=="--sortby" )		{ $sortby = $args[++$i]; $sortexpr = ""; } else if ( $arg=="-S" || $arg=="--sortexpr" )	{ $sortexpr = $args[++$i]; $sortby = ""; } else if ( $arg=="-a" || $arg=="--any" ) {
+		$mode = SPH_MATCH_ANY;
+	} else if ( $arg=="-b" || $arg=="--boolean" ) {
+		$mode = SPH_MATCH_BOOLEAN;
+	} else if ( $arg=="-e" || $arg=="--extended" ) {
+		$mode = SPH_MATCH_EXTENDED;
+	} else if ( $arg=="-e2" ) {
+		$mode = SPH_MATCH_EXTENDED2;
+	} else if ( $arg=="-ph"|| $arg=="--phrase" ) {
+		$mode = SPH_MATCH_PHRASE;
+	} else if ( $arg=="-f" || $arg=="--filter" ) {
+		$filter = $args[++$i];
+	} else if ( $arg=="-v" || $arg=="--value" ) {
+		$filtervals[] = $args[++$i];
+	} else if ( $arg=="-g" || $arg=="--groupby" ) {
+		$groupby = $args[++$i];
+	} else if ( $arg=="-gs"|| $arg=="--groupsort" ) {
+		$groupsort = $args[++$i];
+	} else if ( $arg=="-d" || $arg=="--distinct" ) {
+		$distinct = $args[++$i];
+	} else if ( $arg=="-l" || $arg=="--limit" ) {
+		$limit = (int)$args[++$i];
+	} else if ( $arg=="--select" ) {
+		$select = $args[++$i];
+	} else if ( $arg=="-fr"|| $arg=="--filterrange" ) {
+		$cl->SetFilterRange ( $args[++$i], $args[++$i], $args[++$i] );
+	} else if ( $arg=="-r" )
 	{
 		$arg = strtolower($args[++$i]);
-		if ( $arg=="bm25" )		$ranker = SPH_RANK_BM25;
-		if ( $arg=="none" )		$ranker = SPH_RANK_NONE;
-		if ( $arg=="wordcount" )$ranker = SPH_RANK_WORDCOUNT;
-		if ( $arg=="fieldmask" )$ranker = SPH_RANK_FIELDMASK;
-		if ( $arg=="sph04" )	$ranker = SPH_RANK_SPH04;
+		if ( $arg=="bm25" ) {
+			$ranker = SPH_RANK_BM25;
+		}
+		if ( $arg=="none" ) {
+			$ranker = SPH_RANK_NONE;
+		}
+		if ( $arg=="wordcount" ) {
+			$ranker = SPH_RANK_WORDCOUNT;
+		}
+		if ( $arg=="fieldmask" ) {
+			$ranker = SPH_RANK_FIELDMASK;
+		}
+		if ( $arg=="sph04" ) {
+			$ranker = SPH_RANK_SPH04;
+		}
+	} else {
+			$q .= $args[$i] . " ";
+	}
 	}
-	else
-		$q .= $args[$i] . " ";
-}
 
 ////////////
 // do query
@@ -105,13 +131,27 @@ 
 $cl->SetConnectTimeout ( 1 );
 $cl->SetArrayResult ( true );
 $cl->SetMatchMode ( $mode );
-if ( count($filtervals) )	$cl->SetFilter ( $filter, $filtervals );
-if ( $groupby )				$cl->SetGroupBy ( $groupby, SPH_GROUPBY_ATTR, $groupsort );
-if ( $sortby )				$cl->SetSortMode ( SPH_SORT_EXTENDED, $sortby );
-if ( $sortexpr )			$cl->SetSortMode ( SPH_SORT_EXPR, $sortexpr );
-if ( $distinct )			$cl->SetGroupDistinct ( $distinct );
-if ( $select )				$cl->SetSelect ( $select );
-if ( $limit )				$cl->SetLimits ( 0, $limit, ( $limit>1000 ) ? $limit : 1000 );
+if ( count($filtervals) ) {
+	$cl->SetFilter ( $filter, $filtervals );
+}
+if ( $groupby ) {
+	$cl->SetGroupBy ( $groupby, SPH_GROUPBY_ATTR, $groupsort );
+}
+if ( $sortby ) {
+	$cl->SetSortMode ( SPH_SORT_EXTENDED, $sortby );
+}
+if ( $sortexpr ) {
+	$cl->SetSortMode ( SPH_SORT_EXPR, $sortexpr );
+}
+if ( $distinct ) {
+	$cl->SetGroupDistinct ( $distinct );
+}
+if ( $select ) {
+	$cl->SetSelect ( $select );
+}
+if ( $limit ) {
+	$cl->SetLimits ( 0, $limit, ( $limit>1000 ) ? $limit : 1000 );
+}
 $cl->SetRankingMode ( $ranker );
 $res = $cl->Query ( $q, $index );
 
@@ -125,14 +165,16 @@ 
 
 } else
 {
-	if ( $cl->GetLastWarning() )
-		print "WARNING: " . $cl->GetLastWarning() . "\n\n";
+	if ( $cl->GetLastWarning() ) {
+			print "WARNING: " . $cl->GetLastWarning() . "\n\n";
+	}
 
 	print "Query '$q' retrieved $res[total] of $res[total_found] matches in $res[time] sec.\n";
 	print "Query stats:\n";
-	if ( is_array($res["words"]) )
-		foreach ( $res["words"] as $word => $info )
+	if ( is_array($res["words"]) ) {
+			foreach ( $res["words"] as $word => $info )
 			print "    '$word' found $info[hits] times in $info[docs] documents\n";
+	}
 	print "\n";
 
 	if ( is_array($res["matches"]) )
@@ -150,8 +192,9 @@ 
 					$value = "(" . join ( ",", $value ) .")";
 				} else
 				{
-					if ( $attrtype==SPH_ATTR_TIMESTAMP )
-						$value = date ( "Y-m-d H:i:s", $value );
+					if ( $attrtype==SPH_ATTR_TIMESTAMP ) {
+											$value = date ( "Y-m-d H:i:s", $value );
+					}
 				}
 				print ", $attrname=$value";
 			}

src/SphinxClient.php

Braces +276 added lines, -149 removed lines

@@ -150,14 +150,16 @@ 
 	}
 
 	// x32, int
-	if ( is_int($v) )
-		return pack ( "NN", $v < 0 ? -1 : 0, $v );
+	if ( is_int($v) ) {
+			return pack ( "NN", $v < 0 ? -1 : 0, $v );
+	}
 
 	// x32, bcmath	
 	if ( function_exists("bcmul") )
 	{
-		if ( bccomp ( $v, 0 ) == -1 )
-			$v = bcadd ( "18446744073709551616", $v );
+		if ( bccomp ( $v, 0 ) == -1 ) {
+					$v = bcadd ( "18446744073709551616", $v );
+		}
 		$h = bcdiv ( $v, "4294967296", 0 );
 		$l = bcmod ( $v, "4294967296" );
 		return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
@@ -175,9 +177,9 @@ 
 
 	if ( $v<0 )
 	{
-		if ( $l==0 )
-			$h = 4294967296.0 - $h;
-		else
+		if ( $l==0 ) {
+					$h = 4294967296.0 - $h;
+		} else
 		{
 			$h = 4294967295.0 - $h;
 			$l = 4294967296.0 - $l;
@@ -197,8 +199,9 @@ 
 		assert ( $v>=0 );
 		
 		// x64, int
-		if ( is_int($v) )
-			return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
+		if ( is_int($v) ) {
+					return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
+		}
 						  
 		// x64, bcmath
 		if ( function_exists("bcmul") )
@@ -221,8 +224,9 @@ 
 	}
 
 	// x32, int
-	if ( is_int($v) )
-		return pack ( "NN", 0, $v );
+	if ( is_int($v) ) {
+			return pack ( "NN", 0, $v );
+	}
 	
 	// x32, bcmath
 	if ( function_exists("bcmul") )
@@ -252,16 +256,23 @@ 
 
 	if ( PHP_INT_SIZE>=8 )
 	{
-		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-		if ( $lo<0 ) $lo += (1<<32);
+		if ( $hi<0 ) {
+			$hi += (1<<32);
+		}
+		// because php 5.2.2 to 5.2.5 is totally fucked up again
+		if ( $lo<0 ) {
+			$lo += (1<<32);
+		}
 
 		// x64, int
-		if ( $hi<=2147483647 )
-			return ($hi<<32) + $lo;
+		if ( $hi<=2147483647 ) {
+					return ($hi<<32) + $lo;
+		}
 
 		// x64, bcmath
-		if ( function_exists("bcmul") )
-			return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+		if ( function_exists("bcmul") ) {
+					return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+		}
 
 		// x64, no-bcmath
 		$C = 100000;
@@ -273,16 +284,18 @@ 
 			$l  = $l % $C;
 		}
 
-		if ( $h==0 )
-			return $l;
+		if ( $h==0 ) {
+					return $l;
+		}
 		return sprintf ( "%d%05d", $h, $l );
 	}
 
 	// x32, int
 	if ( $hi==0 )
 	{
-		if ( $lo>0 )
-			return $lo;
+		if ( $lo>0 ) {
+					return $lo;
+		}
 		return sprintf ( "%u", $lo );
 	}
 
@@ -290,8 +303,9 @@ 
 	$lo = sprintf ( "%u", $lo );
 
 	// x32, bcmath
-	if ( function_exists("bcmul") )
-		return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+	if ( function_exists("bcmul") ) {
+			return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+	}
 	
 	// x32, no-bcmath
 	$hi = (float)$hi;
@@ -306,8 +320,9 @@ 
 
 	$h = sprintf ( "%.0f", $h );
 	$l = sprintf ( "%07.0f", $l );
-	if ( $h=="0" )
-		return sprintf( "%.0f", (float)$l );
+	if ( $h=="0" ) {
+			return sprintf( "%.0f", (float)$l );
+	}
 	return $h . $l;
 }
 
@@ -319,8 +334,13 @@ 
 	// x64
 	if ( PHP_INT_SIZE>=8 )
 	{
-		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-		if ( $lo<0 ) $lo += (1<<32);
+		if ( $hi<0 ) {
+			$hi += (1<<32);
+		}
+		// because php 5.2.2 to 5.2.5 is totally fucked up again
+		if ( $lo<0 ) {
+			$lo += (1<<32);
+		}
 
 		return ($hi<<32) + $lo;
 	}
@@ -328,15 +348,17 @@ 
 	// x32, int
 	if ( $hi==0 )
 	{
-		if ( $lo>0 )
-			return $lo;
+		if ( $lo>0 ) {
+					return $lo;
+		}
 		return sprintf ( "%u", $lo );
 	}
 	// x32, int
 	elseif ( $hi==-1 )
 	{
-		if ( $lo<0 )
-			return $lo;
+		if ( $lo<0 ) {
+					return $lo;
+		}
 		return sprintf ( "%.0f", $lo - 4294967296.0 );
 	}
 	
@@ -354,8 +376,9 @@ 
 	$lo = sprintf ( "%u", $lo );
 
 	// x32, bcmath
-	if ( function_exists("bcmul") )
-		return $neg . bcadd ( bcadd ( $lo, bcmul ( $hi, "4294967296" ) ), $c );
+	if ( function_exists("bcmul") ) {
+			return $neg . bcadd ( bcadd ( $lo, bcmul ( $hi, "4294967296" ) ), $c );
+	}
 
 	// x32, no-bcmath
 	$hi = (float)$hi;
@@ -375,8 +398,9 @@ 
 
 	$h = sprintf ( "%.0f", $h );
 	$l = sprintf ( "%07.0f", $l );
-	if ( $h=="0" )
-		return $neg . sprintf( "%.0f", (float)$l );
+	if ( $h=="0" ) {
+			return $neg . sprintf( "%.0f", (float)$l );
+	}
 	return $neg . $h . $l;
 }
 
@@ -386,10 +410,11 @@ 
 	if ( PHP_INT_SIZE>=8 )
 	{
 		// x64 route, workaround broken unpack() in 5.2.2+
-		if ( $value<0 ) $value += (1<<32);
+		if ( $value<0 ) {
+			$value += (1<<32);
+		}
 		return $value;
-	}
-	else
+	} else
 	{
 		// x32 route, workaround php signed/unsigned braindamage
 		return sprintf ( "%u", $value );
@@ -514,8 +539,9 @@ 
 
 	function __destruct()
 	{
-		if ( $this->_socket !== false )
-			fclose ( $this->_socket );
+		if ( $this->_socket !== false ) {
+					fclose ( $this->_socket );
+		}
 	}
 
 	/// get last error message (string)
@@ -593,8 +619,9 @@ 
 	/// leave mbstring workaround mode
 	function _MBPop ()
 	{
-		if ( $this->_mbenc )
-			mb_internal_encoding ( $this->_mbenc );
+		if ( $this->_mbenc ) {
+					mb_internal_encoding ( $this->_mbenc );
+		}
 	}
 
 	/// connect to searchd server
@@ -604,8 +631,9 @@ 
 		{
 			// we are in persistent connection mode, so we have a socket
 			// however, need to check whether it's still alive
-			if ( !@feof ( $this->_socket ) )
-				return $this->_socket;
+			if ( !@feof ( $this->_socket ) ) {
+							return $this->_socket;
+			}
 
 			// force reopen
 			$this->_socket = false;
@@ -619,24 +647,25 @@ 
 		{
 			$host = $this->_path;
 			$port = 0;
-		}
-		else
+		} else
 		{
 			$host = $this->_host;
 			$port = $this->_port;
 		}
 
-		if ( $this->_timeout<=0 )
-			$fp = @fsockopen ( $host, $port, $errno, $errstr );
-		else
-			$fp = @fsockopen ( $host, $port, $errno, $errstr, $this->_timeout );
+		if ( $this->_timeout<=0 ) {
+					$fp = @fsockopen ( $host, $port, $errno, $errstr );
+		} else {
+					$fp = @fsockopen ( $host, $port, $errno, $errstr, $this->_timeout );
+		}
 		
 		if ( !$fp )
 		{
-			if ( $this->_path )
-				$location = $this->_path;
-			else
-				$location = "{$this->_host}:{$this->_port}";
+			if ( $this->_path ) {
+							$location = $this->_path;
+			} else {
+							$location = "{$this->_host}:{$this->_port}";
+			}
 			
 			$errstr = trim ( $errstr );
 			$this->_error = "connection to $location failed (errno=$errno, msg=$errstr)";
@@ -689,8 +718,9 @@ 
 				}
 			}
 		}
-		if ( $this->_socket === false )
-			fclose ( $fp );
+		if ( $this->_socket === false ) {
+					fclose ( $fp );
+		}
 
 		// check response
 		$read = strlen ( $response );
@@ -750,10 +780,12 @@ 
 		assert ( $max>=0 );
 		$this->_offset = $offset;
 		$this->_limit = $limit;
-		if ( $max>0 )
-			$this->_maxmatches = $max;
-		if ( $cutoff>0 )
-			$this->_cutoff = $cutoff;
+		if ( $max>0 ) {
+					$this->_maxmatches = $max;
+		}
+		if ( $cutoff>0 ) {
+					$this->_cutoff = $cutoff;
+		}
 	}
 
 	/// set maximum query time, in milliseconds, per-index
@@ -857,8 +889,9 @@ 
 
 		if ( is_array($values) && count($values) )
 		{
-			foreach ( $values as $value )
-				assert ( is_numeric($value) );
+			foreach ( $values as $value ) {
+							assert ( is_numeric($value) );
+			}
 
 			$this->_filters[] = array ( "type"=>SPH_FILTER_VALUES, "attr"=>$attribute, "exclude"=>$exclude, "values"=>$values );
 		}
@@ -987,18 +1020,32 @@ 
 		assert ( isset ( $flag_name, $known_names ) );
 		assert ( in_array( $flag_value, $flags[$flag_name], true ) || ( $flag_name=="max_predicted_time" && is_int ( $flag_value ) && $flag_value>=0 ) );
 		
-		if ( $flag_name=="reverse_scan" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 0, $flag_value==1 );
-		if ( $flag_name=="sort_method" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 1, $flag_value=="kbuffer" );
+		if ( $flag_name=="reverse_scan" ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 0, $flag_value==1 );
+		}
+		if ( $flag_name=="sort_method" ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 1, $flag_value=="kbuffer" );
+		}
 		if ( $flag_name=="max_predicted_time" )
 		{
 			$this->_query_flags = sphSetBit ( $this->_query_flags, 2, $flag_value>0 );
 			$this->_predictedtime = (int)$flag_value;
 		}
-		if ( $flag_name=="boolean_simplify" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 3, $flag_value );
-		if ( $flag_name=="idf" && ( $flag_value=="normalized" || $flag_value=="plain" ) )	$this->_query_flags = sphSetBit ( $this->_query_flags, 4, $flag_value=="plain" );
-		if ( $flag_name=="global_idf" )	$this->_query_flags = sphSetBit ( $this->_query_flags, 5, $flag_value );
-		if ( $flag_name=="idf" && ( $flag_value=="tfidf_normalized" || $flag_value=="tfidf_unnormalized" ) )	$this->_query_flags = sphSetBit ( $this->_query_flags, 6, $flag_value=="tfidf_normalized" );
-		if ( $flag_name=="low_priority" ) $this->_query_flags = sphSetBit ( $this->_query_flags, 8, $flag_value );
+		if ( $flag_name=="boolean_simplify" ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 3, $flag_value );
+		}
+		if ( $flag_name=="idf" && ( $flag_value=="normalized" || $flag_value=="plain" ) ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 4, $flag_value=="plain" );
+		}
+		if ( $flag_name=="global_idf" ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 5, $flag_value );
+		}
+		if ( $flag_name=="idf" && ( $flag_value=="tfidf_normalized" || $flag_value=="tfidf_unnormalized" ) ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 6, $flag_value=="tfidf_normalized" );
+		}
+		if ( $flag_name=="low_priority" ) {
+			$this->_query_flags = sphSetBit ( $this->_query_flags, 8, $flag_value );
+		}
 	}
 	
 	/// set outer order by parameters
@@ -1067,15 +1114,18 @@ 
 		$results = $this->RunQueries ();
 		$this->_reqs = array (); // just in case it failed too early
 
-		if ( !is_array($results) )
-			return false; // probably network error; error message should be already filled
+		if ( !is_array($results) ) {
+					return false;
+		}
+		// probably network error; error message should be already filled
 
 		$this->_error = $results[0]["error"];
 		$this->_warning = $results[0]["warning"];
-		if ( $results[0]["status"]==SEARCHD_ERROR )
-			return false;
-		else
-			return $results[0];
+		if ( $results[0]["status"]==SEARCHD_ERROR ) {
+					return false;
+		} else {
+					return $results[0];
+		}
 	}
 
 	/// helper to pack floats in network byte order
@@ -1095,14 +1145,16 @@ 
 
 		// build request
 		$req = pack ( "NNNNN", $this->_query_flags, $this->_offset, $this->_limit, $this->_mode, $this->_ranker );
-		if ( $this->_ranker==SPH_RANK_EXPR )
-			$req .= pack ( "N", strlen($this->_rankexpr) ) . $this->_rankexpr;
+		if ( $this->_ranker==SPH_RANK_EXPR ) {
+					$req .= pack ( "N", strlen($this->_rankexpr) ) . $this->_rankexpr;
+		}
 		$req .= pack ( "N", $this->_sort ); // (deprecated) sort mode
 		$req .= pack ( "N", strlen($this->_sortby) ) . $this->_sortby;
 		$req .= pack ( "N", strlen($query) ) . $query; // query itself
 		$req .= pack ( "N", count($this->_weights) ); // weights
-		foreach ( $this->_weights as $weight )
-			$req .= pack ( "N", (int)$weight );
+		foreach ( $this->_weights as $weight ) {
+					$req .= pack ( "N", (int)$weight );
+		}
 		$req .= pack ( "N", strlen($index) ) . $index; // indexes
 		$req .= pack ( "N", 1 ); // id64 range marker
 		$req .= sphPackU64 ( $this->_min_id ) . sphPackU64 ( $this->_max_id ); // id64 range
@@ -1117,8 +1169,9 @@ 
 			{
 				case SPH_FILTER_VALUES:
 					$req .= pack ( "N", count($filter["values"]) );
-					foreach ( $filter["values"] as $value )
-						$req .= sphPackI64 ( $value );
+					foreach ( $filter["values"] as $value ) {
+											$req .= sphPackI64 ( $value );
+					}
 					break;
 
 				case SPH_FILTER_RANGE:
@@ -1161,16 +1214,18 @@ 
 
 		// per-index weights
 		$req .= pack ( "N", count($this->_indexweights) );
-		foreach ( $this->_indexweights as $idx=>$weight )
-			$req .= pack ( "N", strlen($idx) ) . $idx . pack ( "N", $weight );
+		foreach ( $this->_indexweights as $idx=>$weight ) {
+					$req .= pack ( "N", strlen($idx) ) . $idx . pack ( "N", $weight );
+		}
 
 		// max query time
 		$req .= pack ( "N", $this->_maxquerytime );
 
 		// per-field weights
 		$req .= pack ( "N", count($this->_fieldweights) );
-		foreach ( $this->_fieldweights as $field=>$weight )
-			$req .= pack ( "N", strlen($field) ) . $field . pack ( "N", $weight );
+		foreach ( $this->_fieldweights as $field=>$weight ) {
+					$req .= pack ( "N", strlen($field) ) . $field . pack ( "N", $weight );
+		}
 
 		// comment
 		$req .= pack ( "N", strlen($comment) ) . $comment;
@@ -1200,15 +1255,17 @@ 
 		$req .= pack ( "N", strlen($this->_select) ) . $this->_select;
 		
 		// max_predicted_time
-		if ( $this->_predictedtime>0 )
-			$req .= pack ( "N", (int)$this->_predictedtime );
+		if ( $this->_predictedtime>0 ) {
+					$req .= pack ( "N", (int)$this->_predictedtime );
+		}
 			
 		$req .= pack ( "N", strlen($this->_outerorderby) ) . $this->_outerorderby;
 		$req .= pack ( "NN", $this->_outeroffset, $this->_outerlimit );
-		if ( $this->_hasouter )
-			$req .= pack ( "N", 1 );
-		else
-			$req .= pack ( "N", 0 );
+		if ( $this->_hasouter ) {
+					$req .= pack ( "N", 1 );
+		} else {
+					$req .= pack ( "N", 0 );
+		}
 
 		// mbstring workaround
 		$this->_MBPop ();
@@ -1327,8 +1384,7 @@ 
 				{
 					$doc = sphUnpackU64 ( substr ( $response, $p, 8 ) ); $p += 8;
 					list(,$weight) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				}
-				else
+				} else
 				{
 					list ( $doc, $weight ) = array_values ( unpack ( "N*N*",
 						substr ( $response, $p, 8 ) ) );
@@ -1338,10 +1394,11 @@ 
 				$weight = sprintf ( "%u", $weight );
 
 				// create match entry
-				if ( $this->_arrayresult )
-					$result["matches"][$idx] = array ( "id"=>$doc, "weight"=>$weight );
-				else
-					$result["matches"][$doc]["weight"] = $weight;
+				if ( $this->_arrayresult ) {
+									$result["matches"][$idx] = array ( "id"=>$doc, "weight"=>$weight );
+				} else {
+									$result["matches"][$doc]["weight"] = $weight;
+				}
 
 				// parse and create attributes
 				$attrvals = array ();
@@ -1397,10 +1454,11 @@ 
 					}
 				}
 
-				if ( $this->_arrayresult )
-					$result["matches"][$idx]["attrs"] = $attrvals;
-				else
-					$result["matches"][$doc]["attrs"] = $attrvals;
+				if ( $this->_arrayresult ) {
+									$result["matches"][$idx]["attrs"] = $attrvals;
+				} else {
+									$result["matches"][$doc]["attrs"] = $attrvals;
+				}
 			}
 
 			list ( $total, $total_found, $msecs, $words ) =
@@ -1451,26 +1509,66 @@ 
 		// fixup options
 		/////////////////
 
-		if ( !isset($opts["before_match"]) )		$opts["before_match"] = "<b>";
-		if ( !isset($opts["after_match"]) )			$opts["after_match"] = "</b>";
-		if ( !isset($opts["chunk_separator"]) )		$opts["chunk_separator"] = " ... ";
-		if ( !isset($opts["limit"]) )				$opts["limit"] = 256;
-		if ( !isset($opts["limit_passages"]) )		$opts["limit_passages"] = 0;
-		if ( !isset($opts["limit_words"]) )			$opts["limit_words"] = 0;
-		if ( !isset($opts["around"]) )				$opts["around"] = 5;
-		if ( !isset($opts["exact_phrase"]) )		$opts["exact_phrase"] = false;
-		if ( !isset($opts["single_passage"]) )		$opts["single_passage"] = false;
-		if ( !isset($opts["use_boundaries"]) )		$opts["use_boundaries"] = false;
-		if ( !isset($opts["weight_order"]) )		$opts["weight_order"] = false;
-		if ( !isset($opts["query_mode"]) )			$opts["query_mode"] = false;
-		if ( !isset($opts["force_all_words"]) )		$opts["force_all_words"] = false;
-		if ( !isset($opts["start_passage_id"]) )	$opts["start_passage_id"] = 1;
-		if ( !isset($opts["load_files"]) )			$opts["load_files"] = false;
-		if ( !isset($opts["html_strip_mode"]) )		$opts["html_strip_mode"] = "index";
-		if ( !isset($opts["allow_empty"]) )			$opts["allow_empty"] = false;
-		if ( !isset($opts["passage_boundary"]) )	$opts["passage_boundary"] = "none";
-		if ( !isset($opts["emit_zones"]) )			$opts["emit_zones"] = false;
-		if ( !isset($opts["load_files_scattered"]) )		$opts["load_files_scattered"] = false;
+		if ( !isset($opts["before_match"]) ) {
+			$opts["before_match"] = "<b>";
+		}
+		if ( !isset($opts["after_match"]) ) {
+			$opts["after_match"] = "</b>";
+		}
+		if ( !isset($opts["chunk_separator"]) ) {
+			$opts["chunk_separator"] = " ... ";
+		}
+		if ( !isset($opts["limit"]) ) {
+			$opts["limit"] = 256;
+		}
+		if ( !isset($opts["limit_passages"]) ) {
+			$opts["limit_passages"] = 0;
+		}
+		if ( !isset($opts["limit_words"]) ) {
+			$opts["limit_words"] = 0;
+		}
+		if ( !isset($opts["around"]) ) {
+			$opts["around"] = 5;
+		}
+		if ( !isset($opts["exact_phrase"]) ) {
+			$opts["exact_phrase"] = false;
+		}
+		if ( !isset($opts["single_passage"]) ) {
+			$opts["single_passage"] = false;
+		}
+		if ( !isset($opts["use_boundaries"]) ) {
+			$opts["use_boundaries"] = false;
+		}
+		if ( !isset($opts["weight_order"]) ) {
+			$opts["weight_order"] = false;
+		}
+		if ( !isset($opts["query_mode"]) ) {
+			$opts["query_mode"] = false;
+		}
+		if ( !isset($opts["force_all_words"]) ) {
+			$opts["force_all_words"] = false;
+		}
+		if ( !isset($opts["start_passage_id"]) ) {
+			$opts["start_passage_id"] = 1;
+		}
+		if ( !isset($opts["load_files"]) ) {
+			$opts["load_files"] = false;
+		}
+		if ( !isset($opts["html_strip_mode"]) ) {
+			$opts["html_strip_mode"] = "index";
+		}
+		if ( !isset($opts["allow_empty"]) ) {
+			$opts["allow_empty"] = false;
+		}
+		if ( !isset($opts["passage_boundary"]) ) {
+			$opts["passage_boundary"] = "none";
+		}
+		if ( !isset($opts["emit_zones"]) ) {
+			$opts["emit_zones"] = false;
+		}
+		if ( !isset($opts["load_files_scattered"]) ) {
+			$opts["load_files_scattered"] = false;
+		}
 		
 
 		/////////////////
@@ -1479,16 +1577,36 @@ 
 
 		// v.1.2 req
 		$flags = 1; // remove spaces
-		if ( $opts["exact_phrase"] )	$flags |= 2;
-		if ( $opts["single_passage"] )	$flags |= 4;
-		if ( $opts["use_boundaries"] )	$flags |= 8;
-		if ( $opts["weight_order"] )	$flags |= 16;
-		if ( $opts["query_mode"] )		$flags |= 32;
-		if ( $opts["force_all_words"] )	$flags |= 64;
-		if ( $opts["load_files"] )		$flags |= 128;
-		if ( $opts["allow_empty"] )		$flags |= 256;
-		if ( $opts["emit_zones"] )		$flags |= 512;
-		if ( $opts["load_files_scattered"] )	$flags |= 1024;
+		if ( $opts["exact_phrase"] ) {
+			$flags |= 2;
+		}
+		if ( $opts["single_passage"] ) {
+			$flags |= 4;
+		}
+		if ( $opts["use_boundaries"] ) {
+			$flags |= 8;
+		}
+		if ( $opts["weight_order"] ) {
+			$flags |= 16;
+		}
+		if ( $opts["query_mode"] ) {
+			$flags |= 32;
+		}
+		if ( $opts["force_all_words"] ) {
+			$flags |= 64;
+		}
+		if ( $opts["load_files"] ) {
+			$flags |= 128;
+		}
+		if ( $opts["allow_empty"] ) {
+			$flags |= 256;
+		}
+		if ( $opts["emit_zones"] ) {
+			$flags |= 512;
+		}
+		if ( $opts["load_files_scattered"] ) {
+			$flags |= 1024;
+		}
 		$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
@@ -1656,8 +1774,9 @@ 
 		assert ( is_bool($ignorenonexistent) );
 
 		assert ( is_array($attrs) );
-		foreach ( $attrs as $attr )
-			assert ( is_string($attr) );
+		foreach ( $attrs as $attr ) {
+					assert ( is_string($attr) );
+		}
 
 		assert ( is_array($values) );
 		foreach ( $values as $id=>$entry )
@@ -1670,10 +1789,12 @@ 
 				if ( $mva )
 				{
 					assert ( is_array($v) );
-					foreach ( $v as $vv )
-						assert ( is_int($vv) );
-				} else
-					assert ( is_int($v) );
+					foreach ( $v as $vv ) {
+											assert ( is_int($vv) );
+					}
+				} else {
+									assert ( is_int($v) );
+				}
 			}
 		}
 
@@ -1696,9 +1817,10 @@ 
 			foreach ( $entry as $v )
 			{
 				$req .= pack ( "N", $mva ? count($v) : $v );
-				if ( $mva )
-					foreach ( $v as $vv )
+				if ( $mva ) {
+									foreach ( $v as $vv )
 						$req .= pack ( "N", $vv );
+				}
 			}
 		}
 
@@ -1740,13 +1862,15 @@ 
 			$this->_error = 'already connected';
 			return false;
 		}
-		if ( !$fp = $this->_Connect() )
-			return false;
+		if ( !$fp = $this->_Connect() ) {
+					return false;
+		}
 
 		// command, command version = 0, body length = 4, body = 1
 		$req = pack ( "nnNN", SEARCHD_COMMAND_PERSIST, 0, 4, 1 );
-		if ( !$this->_Send ( $fp, $req, 12 ) )
-			return false;
+		if ( !$this->_Send ( $fp, $req, 12 ) ) {
+					return false;
+		}
 
 		$this->_socket = $fp;
 		return true;
@@ -1794,8 +1918,10 @@ 
 		list ( $rows, $cols ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
 
 		$res = array();
-		for ( $i=0; $i<$rows; $i++ )
-			for ( $j=0; $j<$cols; $j++ )
+		for ( $i=0; $i<$rows; $i++ ) {
+					for ( $j=0;
+		}
+		$j<$cols; $j++ )
 		{
 			list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
 			$res[$i][] = substr ( $response, $p, $len ); $p += $len;
@@ -1827,10 +1953,11 @@ 
 		}
 
 		$tag = -1;
-		if ( strlen($response)==4 )
-			list(,$tag) = unpack ( "N*", $response );
-		else
-			$this->_error = "unexpected response length";
+		if ( strlen($response)==4 ) {
+					list(,$tag) = unpack ( "N*", $response );
+		} else {
+					$this->_error = "unexpected response length";
+		}
 
 		$this->_MBPop ();
 		return $tag;