peter-gribanov / sphinx-php-client

src/SphinxClient.php

Spacing +252 added lines, -252 removed lines

@@ -33,82 +33,82 @@ 
 /////////////////////////////////////////////////////////////////////////////
 
 /// known searchd commands
-define("SEARCHD_COMMAND_SEARCH",     0);
-define("SEARCHD_COMMAND_EXCERPT",    1);
-define("SEARCHD_COMMAND_UPDATE",     2);
-define("SEARCHD_COMMAND_KEYWORDS",   3);
-define("SEARCHD_COMMAND_PERSIST",    4);
-define("SEARCHD_COMMAND_STATUS",     5);
+define("SEARCHD_COMMAND_SEARCH", 0);
+define("SEARCHD_COMMAND_EXCERPT", 1);
+define("SEARCHD_COMMAND_UPDATE", 2);
+define("SEARCHD_COMMAND_KEYWORDS", 3);
+define("SEARCHD_COMMAND_PERSIST", 4);
+define("SEARCHD_COMMAND_STATUS", 5);
 define("SEARCHD_COMMAND_FLUSHATTRS", 7);
 
 /// current client-side command implementation versions
-define("VER_COMMAND_SEARCH",     0x11E);
-define("VER_COMMAND_EXCERPT",    0x104);
-define("VER_COMMAND_UPDATE",     0x103);
-define("VER_COMMAND_KEYWORDS",   0x100);
-define("VER_COMMAND_STATUS",     0x101);
-define("VER_COMMAND_QUERY",      0x100);
+define("VER_COMMAND_SEARCH", 0x11E);
+define("VER_COMMAND_EXCERPT", 0x104);
+define("VER_COMMAND_UPDATE", 0x103);
+define("VER_COMMAND_KEYWORDS", 0x100);
+define("VER_COMMAND_STATUS", 0x101);
+define("VER_COMMAND_QUERY", 0x100);
 define("VER_COMMAND_FLUSHATTRS", 0x100);
 
 /// known searchd status codes
-define("SEARCHD_OK",      0);
-define("SEARCHD_ERROR",   1);
-define("SEARCHD_RETRY",   2);
+define("SEARCHD_OK", 0);
+define("SEARCHD_ERROR", 1);
+define("SEARCHD_RETRY", 2);
 define("SEARCHD_WARNING", 3);
 
 /// known match modes
-define("SPH_MATCH_ALL",       0);
-define("SPH_MATCH_ANY",       1);
-define("SPH_MATCH_PHRASE",    2);
-define("SPH_MATCH_BOOLEAN",   3);
-define("SPH_MATCH_EXTENDED",  4);
-define("SPH_MATCH_FULLSCAN",  5);
+define("SPH_MATCH_ALL", 0);
+define("SPH_MATCH_ANY", 1);
+define("SPH_MATCH_PHRASE", 2);
+define("SPH_MATCH_BOOLEAN", 3);
+define("SPH_MATCH_EXTENDED", 4);
+define("SPH_MATCH_FULLSCAN", 5);
 define("SPH_MATCH_EXTENDED2", 6); // extended engine V2 (TEMPORARY, WILL BE REMOVED)
 
 /// known ranking modes (ext2 only)
 define("SPH_RANK_PROXIMITY_BM25", 0); ///< default mode, phrase proximity major factor and BM25 minor one
-define("SPH_RANK_BM25",           1); ///< statistical mode, BM25 ranking only (faster but worse quality)
-define("SPH_RANK_NONE",           2); ///< no ranking, all matches get a weight of 1
-define("SPH_RANK_WORDCOUNT",      3); ///< simple word-count weighting, rank is a weighted sum of per-field keyword occurence counts
-define("SPH_RANK_PROXIMITY",      4);
-define("SPH_RANK_MATCHANY",       5);
-define("SPH_RANK_FIELDMASK",      6);
-define("SPH_RANK_SPH04",          7);
-define("SPH_RANK_EXPR",           8);
-define("SPH_RANK_TOTAL",          9);
+define("SPH_RANK_BM25", 1); ///< statistical mode, BM25 ranking only (faster but worse quality)
+define("SPH_RANK_NONE", 2); ///< no ranking, all matches get a weight of 1
+define("SPH_RANK_WORDCOUNT", 3); ///< simple word-count weighting, rank is a weighted sum of per-field keyword occurence counts
+define("SPH_RANK_PROXIMITY", 4);
+define("SPH_RANK_MATCHANY", 5);
+define("SPH_RANK_FIELDMASK", 6);
+define("SPH_RANK_SPH04", 7);
+define("SPH_RANK_EXPR", 8);
+define("SPH_RANK_TOTAL", 9);
 
 /// known sort modes
-define("SPH_SORT_RELEVANCE",     0);
-define("SPH_SORT_ATTR_DESC",     1);
-define("SPH_SORT_ATTR_ASC",      2);
+define("SPH_SORT_RELEVANCE", 0);
+define("SPH_SORT_ATTR_DESC", 1);
+define("SPH_SORT_ATTR_ASC", 2);
 define("SPH_SORT_TIME_SEGMENTS", 3);
-define("SPH_SORT_EXTENDED",      4);
-define("SPH_SORT_EXPR",          5);
+define("SPH_SORT_EXTENDED", 4);
+define("SPH_SORT_EXPR", 5);
 
 /// known filter types
-define("SPH_FILTER_VALUES",     0);
-define("SPH_FILTER_RANGE",      1);
+define("SPH_FILTER_VALUES", 0);
+define("SPH_FILTER_RANGE", 1);
 define("SPH_FILTER_FLOATRANGE", 2);
-define("SPH_FILTER_STRING",     3);
+define("SPH_FILTER_STRING", 3);
 
 /// known attribute types
-define("SPH_ATTR_INTEGER",   1);
+define("SPH_ATTR_INTEGER", 1);
 define("SPH_ATTR_TIMESTAMP", 2);
-define("SPH_ATTR_ORDINAL",   3);
-define("SPH_ATTR_BOOL",      4);
-define("SPH_ATTR_FLOAT",     5);
-define("SPH_ATTR_BIGINT",    6);
-define("SPH_ATTR_STRING",    7);
-define("SPH_ATTR_FACTORS",   1001);
-define("SPH_ATTR_MULTI",     0x40000001);
-define("SPH_ATTR_MULTI64",   0x40000002);
+define("SPH_ATTR_ORDINAL", 3);
+define("SPH_ATTR_BOOL", 4);
+define("SPH_ATTR_FLOAT", 5);
+define("SPH_ATTR_BIGINT", 6);
+define("SPH_ATTR_STRING", 7);
+define("SPH_ATTR_FACTORS", 1001);
+define("SPH_ATTR_MULTI", 0x40000001);
+define("SPH_ATTR_MULTI64", 0x40000002);
 
 /// known grouping functions
-define("SPH_GROUPBY_DAY",      0);
-define("SPH_GROUPBY_WEEK",     1);
-define("SPH_GROUPBY_MONTH",    2);
-define("SPH_GROUPBY_YEAR",     3);
-define("SPH_GROUPBY_ATTR",     4);
+define("SPH_GROUPBY_DAY", 0);
+define("SPH_GROUPBY_WEEK", 1);
+define("SPH_GROUPBY_MONTH", 2);
+define("SPH_GROUPBY_YEAR", 3);
+define("SPH_GROUPBY_ATTR", 4);
 define("SPH_GROUPBY_ATTRPAIR", 5);
 
 // important properties of PHP's integers:
@@ -146,17 +146,17 @@ 
     if (PHP_INT_SIZE>=8)
     {
         $v = (int)$v;
-        return pack("NN", $v>>32, $v&0xFFFFFFFF);
+        return pack("NN", $v >> 32, $v & 0xFFFFFFFF);
     }
 
     // x32, int
     if (is_int($v))
-        return pack("NN", $v < 0 ? -1 : 0, $v);
+        return pack("NN", $v<0 ? -1 : 0, $v);
 
     // x32, bcmath
     if (function_exists("bcmul"))
     {
-        if (bccomp($v, 0) == -1)
+        if (bccomp($v, 0)==-1)
             $v = bcadd("18446744073709551616", $v);
         $h = bcdiv($v, "4294967296", 0);
         $l = bcmod($v, "4294967296");
@@ -168,10 +168,10 @@ 
     $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
+    $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)
     {
@@ -198,7 +198,7 @@ 
 
         // x64, int
         if (is_int($v))
-            return pack("NN", $v>>32, $v&0xFFFFFFFF);
+            return pack("NN", $v >> 32, $v & 0xFFFFFFFF);
 
         // x64, bcmath
         if (function_exists("bcmul"))
@@ -213,9 +213,9 @@ 
         $lo = (int)substr($v, $p);
         $hi = (int)substr($v, 0, $p);
 
-        $m = $lo + $hi*1316134912;
+        $m = $lo + $hi * 1316134912;
         $l = $m % 4294967296;
-        $h = $hi*2328 + (int)($m/4294967296);
+        $h = $hi * 2328 + (int)($m / 4294967296);
 
         return pack("NN", $h, $l);
     }
@@ -237,10 +237,10 @@ 
     $lo = (float)substr($v, $p);
     $hi = (float)substr($v, 0, $p);
 
-    $m = $lo + $hi*1316134912.0;
+    $m = $lo + $hi * 1316134912.0;
     $q = floor($m / 4294967296.0);
     $l = $m - ($q * 4294967296.0);
-    $h = $hi*2328.0 + $q;
+    $h = $hi * 2328.0 + $q;
 
     return pack("NN", $h, $l);
 }
@@ -252,12 +252,12 @@ 
 
     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;
+            return ($hi << 32) + $lo;
 
         // x64, bcmath
         if (function_exists("bcmul"))
@@ -297,18 +297,18 @@ 
     $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;
+    $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;
+        return sprintf("%.0f", (float)$l);
+    return $h.$l;
 }
 
 // unpack 64-bit signed
@@ -319,10 +319,10 @@ 
     // 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;
+        return ($hi << 32) + $lo;
     }
 
     // x32, int
@@ -355,18 +355,18 @@ 
 
     // x32, bcmath
     if (function_exists("bcmul"))
-        return $neg . bcadd(bcadd($lo, bcmul($hi, "4294967296")), $c);
+        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;
+    $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;
@@ -376,8 +376,8 @@ 
     $h = sprintf("%.0f", $h);
     $l = sprintf("%07.0f", $l);
     if ($h=="0")
-        return $neg . sprintf( "%.0f", (float)$l);
-    return $neg . $h . $l;
+        return $neg.sprintf("%.0f", (float)$l);
+    return $neg.$h.$l;
 }
 
 
@@ -386,7 +386,7 @@ 
     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
@@ -400,10 +400,10 @@ 
 {
     if ($on)
     {
-        $flag |=(1<<$bit);
+        $flag |= (1 << $bit);
     } else
     {
-        $reset = 16777215 ^(1<<$bit);
+        $reset = 16777215 ^ (1 << $bit);
         $flag = $flag & $reset;
     }
     return $flag;
@@ -461,7 +461,7 @@ 
     /////////////////////////////////////////////////////////////////////////////
 
     /// create a new client object and fill defaults
-    function SphinxClient ()
+    function SphinxClient()
     {
         // per-client-object settings
         $this->_host = "localhost";
@@ -473,12 +473,12 @@ 
         $this->_offset = 0;
         $this->_limit = 20;
         $this->_mode = SPH_MATCH_EXTENDED2;
-        $this->_weights = array ();
+        $this->_weights = array();
         $this->_sort = SPH_SORT_RELEVANCE;
         $this->_sortby = "";
         $this->_min_id = 0;
         $this->_max_id = 0;
-        $this->_filters = array ();
+        $this->_filters = array();
         $this->_groupby = "";
         $this->_groupfunc = SPH_GROUPBY_DAY;
         $this->_groupsort = "@group desc";
@@ -487,8 +487,8 @@ 
         $this->_cutoff = 0;
         $this->_retrycount = 0;
         $this->_retrydelay = 0;
-        $this->_anchor = array ();
-        $this->_indexweights = array ();
+        $this->_anchor = array();
+        $this->_indexweights = array();
         $this->_ranker = SPH_RANK_PROXIMITY_BM25;
         $this->_rankexpr = "";
         $this->_maxquerytime = 0;
@@ -506,7 +506,7 @@ 
         $this->_warning = "";
         $this->_connerror = false;
 
-        $this->_reqs = array ();// requests storage (for multi-query case)
+        $this->_reqs = array(); // requests storage (for multi-query case)
         $this->_mbenc = "";
         $this->_arrayresult = false;
         $this->_timeout = 0;
@@ -514,18 +514,18 @@ 
 
     function __destruct()
     {
-        if ($this->_socket !== false)
+        if ($this->_socket!==false)
             fclose($this->_socket);
     }
 
     /// get last error message (string)
-    function GetLastError ()
+    function GetLastError()
     {
         return $this->_error;
     }
 
     /// get last warning message (string)
-    function GetLastWarning ()
+    function GetLastWarning()
     {
         return $this->_warning;
     }
@@ -540,9 +540,9 @@ 
     function SetServer($host, $port = 0)
     {
         assert(is_string($host));
-        if ($host[0] == '/')
+        if ($host[0]=='/')
         {
-            $this->_path = 'unix://' . $host;
+            $this->_path = 'unix://'.$host;
             return;
         }
         if (substr($host, 0, 7)=="unix://")
@@ -554,7 +554,7 @@ 
         $this->_host = $host;
         $port = intval($port);
         assert(0<=$port && $port<65536);
-        $this->_port =($port==0) ? 9312 : $port;
+        $this->_port = ($port==0) ? 9312 : $port;
         $this->_path = '';
     }
 
@@ -568,7 +568,7 @@ 
 
     function _Send($handle, $data, $length)
     {
-        if (feof($handle) || fwrite($handle, $data, $length) !== $length)
+        if (feof($handle) || fwrite($handle, $data, $length)!==$length)
         {
             $this->_error = 'connection unexpectedly closed (timed out?)';
             $this->_connerror = true;
@@ -580,7 +580,7 @@ 
     /////////////////////////////////////////////////////////////////////////////
 
     /// enter mbstring workaround mode
-    function _MBPush ()
+    function _MBPush()
     {
         $this->_mbenc = "";
         if (ini_get("mbstring.func_overload") & 2)
@@ -591,14 +591,14 @@ 
     }
 
     /// leave mbstring workaround mode
-    function _MBPop ()
+    function _MBPop()
     {
         if ($this->_mbenc)
             mb_internal_encoding($this->_mbenc);
     }
 
     /// connect to searchd server
-    function _Connect ()
+    function _Connect()
     {
         if ($this->_socket!==false)
         {
@@ -689,7 +689,7 @@ 
                 }
             }
         }
-        if ($this->_socket === false)
+        if ($this->_socket===false)
             fclose($fp);
 
         // check response
@@ -707,16 +707,16 @@ 
         {
             list(,$wlen) = unpack("N*", substr($response, 0, 4));
             $this->_warning = substr($response, 4, $wlen);
-            return substr($response, 4+$wlen);
+            return substr($response, 4 + $wlen);
         }
         if ($status==SEARCHD_ERROR)
         {
-            $this->_error = "searchd error: " . substr($response, 4);
+            $this->_error = "searchd error: ".substr($response, 4);
             return false;
         }
         if ($status==SEARCHD_RETRY)
         {
-            $this->_error = "temporary searchd error: " . substr($response, 4);
+            $this->_error = "temporary searchd error: ".substr($response, 4);
             return false;
         }
         if ($status!=SEARCHD_OK)
@@ -729,7 +729,7 @@ 
         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);
+                $ver >> 8, $ver & 0xff, $client_ver >> 8, $client_ver & 0xff);
         }
 
         return $response;
@@ -741,7 +741,7 @@ 
 
     /// set offset and count into result set,
     /// and optionally set max-matches and cutoff limits
-    function SetLimits($offset, $limit, $max=0, $cutoff=0)
+    function SetLimits($offset, $limit, $max = 0, $cutoff = 0)
     {
         assert(is_int($offset));
         assert(is_int($limit));
@@ -780,7 +780,7 @@ 
     }
 
     /// set ranking mode
-    function SetRankingMode($ranker, $rankexpr="")
+    function SetRankingMode($ranker, $rankexpr = "")
     {
         assert($ranker===0 || $ranker>=1 && $ranker<SPH_RANK_TOTAL);
         assert(is_string($rankexpr));
@@ -789,9 +789,9 @@ 
     }
 
     /// set matches sorting mode
-    function SetSortMode($mode, $sortby="")
+    function SetSortMode($mode, $sortby = "")
     {
-        assert (
+        assert(
             $mode==SPH_SORT_RELEVANCE ||
             $mode==SPH_SORT_ATTR_DESC ||
             $mode==SPH_SORT_ATTR_ASC ||
@@ -849,7 +849,7 @@ 
 
     /// set values set filter
     /// only match records where $attribute value is in given set
-    function SetFilter($attribute, $values, $exclude=false)
+    function SetFilter($attribute, $values, $exclude = false)
     {
         assert(is_string($attribute));
         assert(is_array($values));
@@ -866,7 +866,7 @@ 
 
     /// set string filter
     /// only match records where $attribute value is equal
-    function SetFilterString($attribute, $value, $exclude=false)
+    function SetFilterString($attribute, $value, $exclude = false)
     {
         assert(is_string($attribute));
         assert(is_string($value));
@@ -875,7 +875,7 @@ 
 
     /// set range filter
     /// only match records if $attribute value is beetwen $min and $max (inclusive)
-    function SetFilterRange($attribute, $min, $max, $exclude=false)
+    function SetFilterRange($attribute, $min, $max, $exclude = false)
     {
         assert(is_string($attribute));
         assert(is_numeric($min));
@@ -887,7 +887,7 @@ 
 
     /// set float range filter
     /// only match records if $attribute value is beetwen $min and $max (inclusive)
-    function SetFilterFloatRange($attribute, $min, $max, $exclude=false)
+    function SetFilterFloatRange($attribute, $min, $max, $exclude = false)
     {
         assert(is_string($attribute));
         assert(is_float($min));
@@ -911,7 +911,7 @@ 
     }
 
     /// set grouping attribute and function
-    function SetGroupBy($attribute, $func, $groupsort="@group desc")
+    function SetGroupBy($attribute, $func, $groupsort = "@group desc")
     {
         assert(is_string($attribute));
         assert(is_string($groupsort));
@@ -935,7 +935,7 @@ 
     }
 
     /// set distributed retries count and delay
-    function SetRetries($count, $delay=0)
+    function SetRetries($count, $delay = 0)
     {
         assert(is_int($count) && $count>=0);
         assert(is_int($delay) && $delay>=0);
@@ -974,18 +974,18 @@ 
     function SetQueryFlag($flag_name, $flag_value)
     {
         $known_names = array("reverse_scan", "sort_method", "max_predicted_time", "boolean_simplify", "idf", "global_idf", "low_priority");
-        $flags = array (
+        $flags = array(
         "reverse_scan" => array(0, 1),
         "sort_method" => array("pq", "kbuffer"),
         "max_predicted_time" => array(0),
         "boolean_simplify" => array(true, false),
-        "idf" => array ("normalized", "plain", "tfidf_normalized", "tfidf_unnormalized"),
+        "idf" => array("normalized", "plain", "tfidf_normalized", "tfidf_unnormalized"),
         "global_idf" => array(true, false),
         "low_priority" => array(true, false)
         );
 
         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));
+        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");
@@ -995,9 +995,9 @@ 
             $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=="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=="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);
     }
 
@@ -1020,14 +1020,14 @@ 
     //////////////////////////////////////////////////////////////////////////////
 
     /// clear all filters (for multi-queries)
-    function ResetFilters ()
+    function ResetFilters()
     {
         $this->_filters = array();
         $this->_anchor = array();
     }
 
     /// clear groupby settings (for multi-queries)
-    function ResetGroupBy ()
+    function ResetGroupBy()
     {
         $this->_groupby = "";
         $this->_groupfunc = SPH_GROUPBY_DAY;
@@ -1036,18 +1036,18 @@ 
     }
 
     /// clear all attribute value overrides (for multi-queries)
-    function ResetOverrides ()
+    function ResetOverrides()
     {
-        $this->_overrides = array ();
+        $this->_overrides = array();
     }
 
-    function ResetQueryFlag ()
+    function ResetQueryFlag()
     {
         $this->_query_flags = sphSetBit(0, 6, true); // default idf=tfidf_normalized
         $this->_predictedtime = 0;
     }
 
-    function ResetOuterSelect ()
+    function ResetOuterSelect()
     {
         $this->_outerorderby = '';
         $this->_outeroffset = 0;
@@ -1059,13 +1059,13 @@ 
 
     /// connect to searchd server, run given search query through given indexes,
     /// and return the search results
-    function Query($query, $index="*", $comment="")
+    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
+        $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
@@ -1088,30 +1088,30 @@ 
 
     /// add query to multi-query batch
     /// returns index into results array from RunQueries() call
-    function AddQuery($query, $index="*", $comment="")
+    function AddQuery($query, $index = "*", $comment = "")
     {
         // mbstring workaround
-        $this->_MBPush ();
+        $this->_MBPush();
 
         // 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;
+            $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", 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", strlen($index)).$index; // indexes
         $req .= pack("N", 1); // id64 range marker
-        $req .= sphPackU64($this->_min_id) . sphPackU64($this->_max_id); // id64 range
+        $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", strlen($filter["attr"])).$filter["attr"];
             $req .= pack("N", $filter["type"]);
             switch ($filter["type"])
             {
@@ -1122,15 +1122,15 @@ 
                     break;
 
                 case SPH_FILTER_RANGE:
-                    $req .= sphPackI64($filter["min"]) . sphPackI64($filter["max"]);
+                    $req .= sphPackI64($filter["min"]).sphPackI64($filter["max"]);
                     break;
 
                 case SPH_FILTER_FLOATRANGE:
-                    $req .= $this->_PackFloat($filter["min"]) . $this->_PackFloat($filter["max"]);
+                    $req .= $this->_PackFloat($filter["min"]).$this->_PackFloat($filter["max"]);
                     break;
 
                 case SPH_FILTER_STRING:
-                    $req .= pack("N", strlen($filter["value"])) . $filter["value"];
+                    $req .= pack("N", strlen($filter["value"])).$filter["value"];
                     break;
 
                 default:
@@ -1140,11 +1140,11 @@ 
         }
 
         // group-by clause, max-matches count, group-sort clause, cutoff count
-        $req .= pack("NN", $this->_groupfunc, strlen($this->_groupby)) . $this->_groupby;
+        $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("N", strlen($this->_groupsort)).$this->_groupsort;
         $req .= pack("NNN", $this->_cutoff, $this->_retrycount, $this->_retrydelay);
-        $req .= pack("N", strlen($this->_groupdistinct)) . $this->_groupdistinct;
+        $req .= pack("N", strlen($this->_groupdistinct)).$this->_groupdistinct;
 
         // anchor point
         if (empty($this->_anchor))
@@ -1152,17 +1152,17 @@ 
             $req .= pack("N", 0);
         } else
         {
-            $a =& $this->_anchor;
+            $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"]);
+            $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);
+            $req .= pack("N", strlen($idx)).$idx.pack("N", $weight);
 
         // max query time
         $req .= pack("N", $this->_maxquerytime);
@@ -1170,16 +1170,16 @@ 
         // per-field weights
         $req .= pack("N", count($this->_fieldweights));
         foreach ($this->_fieldweights as $field=>$weight)
-            $req .= pack("N", strlen($field)) . $field . pack("N", $weight);
+            $req .= pack("N", strlen($field)).$field.pack("N", $weight);
 
         // comment
-        $req .= pack("N", strlen($comment)) . $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("N", strlen($entry["attr"])).$entry["attr"];
             $req .= pack("NN", $entry["type"], count($entry["values"]));
             foreach ($entry["values"] as $id=>$val)
             {
@@ -1197,13 +1197,13 @@ 
         }
 
         // select-list
-        $req .= pack("N", strlen($this->_select)) . $this->_select;
+        $req .= pack("N", strlen($this->_select)).$this->_select;
 
         // max_predicted_time
         if ($this->_predictedtime>0)
             $req .= pack("N", (int)$this->_predictedtime);
 
-        $req .= pack("N", strlen($this->_outerorderby)) . $this->_outerorderby;
+        $req .= pack("N", strlen($this->_outerorderby)).$this->_outerorderby;
         $req .= pack("NN", $this->_outeroffset, $this->_outerlimit);
         if ($this->_hasouter)
             $req .= pack("N", 1);
@@ -1211,15 +1211,15 @@ 
             $req .= pack("N", 0);
 
         // mbstring workaround
-        $this->_MBPop ();
+        $this->_MBPop();
 
         // store request to requests array
         $this->_reqs[] = $req;
-        return count($this->_reqs)-1;
+        return count($this->_reqs) - 1;
     }
 
     /// connect to searchd, run queries batch, and return an array of result sets
-    function RunQueries ()
+    function RunQueries()
     {
         if (empty($this->_reqs))
         {
@@ -1228,29 +1228,29 @@ 
         }
 
         // mbstring workaround
-        $this->_MBPush ();
+        $this->_MBPush();
 
-        if (!( $fp = $this->_Connect()))
+        if (!($fp = $this->_Connect()))
         {
-            $this->_MBPop ();
+            $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
+        $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)))
+        if (!($this->_Send($fp, $req, $len + 8)) ||
+             !($response = $this->_GetResponse($fp, VER_COMMAND_SEARCH)))
         {
-            $this->_MBPop ();
+            $this->_MBPop();
             return false;
         }
 
         // query sent ok; we can reset reqs now
-        $this->_reqs = array ();
+        $this->_reqs = array();
 
         // parse and return response
         return $this->_ParseSearchResponse($response, $nreqs);
@@ -1262,11 +1262,11 @@ 
         $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();
+        for ($ires = 0; $ires<$nreqs && $p<$max; $ires++)
         {
             $results[] = array();
-            $result =& $results[$ires];
+            $result = & $results[$ires];
 
             $result["error"] = "";
             $result["warning"] = "";
@@ -1290,8 +1290,8 @@ 
             }
 
             // read schema
-            $fields = array ();
-            $attrs = array ();
+            $fields = array();
+            $attrs = array();
 
             list(,$nfields) = unpack("N*", substr($response, $p, 4)); $p += 4;
             while ($nfields-->0 && $p<$max)
@@ -1302,7 +1302,7 @@ 
             $result["fields"] = $fields;
 
             list(,$nattrs) = unpack("N*", substr($response, $p, 4)); $p += 4;
-            while ($nattrs-->0 && $p<$max )
+            while ($nattrs-->0 && $p<$max)
             {
                 list(,$len) = unpack("N*", substr($response, $p, 4)); $p += 4;
                 $attr = substr($response, $p, $len); $p += $len;
@@ -1344,7 +1344,7 @@ 
                     $result["matches"][$doc]["weight"] = $weight;
 
                 // parse and create attributes
-                $attrvals = array ();
+                $attrvals = array();
                 foreach ($attrs as $attr=>$type)
                 {
                     // handle 64bit ints
@@ -1367,7 +1367,7 @@ 
                     list(,$val) = unpack("N*", substr($response, $p, 4)); $p += 4;
                     if ($type==SPH_ATTR_MULTI)
                     {
-                        $attrvals[$attr] = array ();
+                        $attrvals[$attr] = array();
                         $nvalues = $val;
                         while ($nvalues-->0 && $p<$max)
                         {
@@ -1376,7 +1376,7 @@ 
                         }
                     } else if ($type==SPH_ATTR_MULTI64)
                     {
-                        $attrvals[$attr] = array ();
+                        $attrvals[$attr] = array();
                         $nvalues = $val;
                         while ($nvalues>0 && $p<$max)
                         {
@@ -1389,8 +1389,8 @@ 
                         $p += $val;
                     } else if ($type==SPH_ATTR_FACTORS)
                     {
-                        $attrvals[$attr] = substr($response, $p, $val-4);
-                        $p += $val-4;
+                        $attrvals[$attr] = substr($response, $p, $val - 4);
+                        $p += $val - 4;
                     } else
                     {
                         $attrvals[$attr] = sphFixUint($val);
@@ -1407,7 +1407,7 @@ 
                 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);
+            $result["time"] = sprintf("%.3f", $msecs / 1000);
             $p += 16;
 
             while ($words-->0 && $p<$max)
@@ -1415,13 +1415,13 @@ 
                 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 (
+                $result["words"][$word] = array(
                     "docs"=>sprintf("%u", $docs),
                     "hits"=>sprintf("%u", $hits));
             }
         }
 
-        $this->_MBPop ();
+        $this->_MBPop();
         return $results;
     }
 
@@ -1432,16 +1432,16 @@ 
     /// connect to searchd server, and generate exceprts (snippets)
     /// of given documents for given query. returns false on failure,
     /// an array of snippets on success
-    function BuildExcerpts($docs, $index, $words, $opts=array())
+    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 ();
+        $this->_MBPush();
 
-        if (!( $fp = $this->_Connect()))
+        if (!($fp = $this->_Connect()))
         {
             $this->_MBPop();
             return false;
@@ -1490,24 +1490,24 @@ 
         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
+        $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("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"];
+        $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;
+            $req .= pack("N", strlen($doc)).$doc;
         }
 
         ////////////////////////////
@@ -1515,11 +1515,11 @@ 
         ////////////////////////////
 
         $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)))
+        $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 ();
+            $this->_MBPop();
             return false;
         }
 
@@ -1528,24 +1528,24 @@ 
         //////////////////
 
         $pos = 0;
-        $res = array ();
+        $res = array();
         $rlen = strlen($response);
-        for($i=0; $i<count($docs); $i++)
+        for ($i = 0; $i<count($docs); $i++)
         {
             list(,$len) = unpack("N*", substr($response, $pos, 4));
             $pos += 4;
 
-            if ($pos+$len > $rlen)
+            if ($pos + $len>$rlen)
             {
                 $this->_error = "incomplete reply";
-                $this->_MBPop ();
+                $this->_MBPop();
                 return false;
             }
             $res[] = $len ? substr($response, $pos, $len) : "";
             $pos += $len;
         }
 
-        $this->_MBPop ();
+        $this->_MBPop();
         return $res;
     }
 
@@ -1563,9 +1563,9 @@ 
         assert(is_string($index));
         assert(is_bool($hits));
 
-        $this->_MBPush ();
+        $this->_MBPush();
 
-        if (!( $fp = $this->_Connect()))
+        if (!($fp = $this->_Connect()))
         {
             $this->_MBPop();
             return false;
@@ -1576,8 +1576,8 @@ 
         /////////////////
 
         // v.1.0 req
-        $req  = pack("N", strlen($query)) . $query; // req query
-        $req .= pack("N", strlen($index)) . $index; // req index
+        $req  = pack("N", strlen($query)).$query; // req query
+        $req .= pack("N", strlen($index)).$index; // req index
         $req .= pack("N", (int)$hits);
 
         ////////////////////////////
@@ -1585,11 +1585,11 @@ 
         ////////////////////////////
 
         $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)))
+        $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 ();
+            $this->_MBPop();
             return false;
         }
 
@@ -1598,11 +1598,11 @@ 
         //////////////////
 
         $pos = 0;
-        $res = array ();
+        $res = array();
         $rlen = strlen($response);
         list(,$nwords) = unpack("N*", substr($response, $pos, 4));
         $pos += 4;
-        for($i=0; $i<$nwords; $i++)
+        for ($i = 0; $i<$nwords; $i++)
         {
             list(,$len) = unpack("N*", substr($response, $pos, 4)); $pos += 4;
             $tokenized = $len ? substr($response, $pos, $len) : "";
@@ -1616,28 +1616,28 @@ 
 
             if ($hits)
             {
-                list($ndocs,$nhits) = array_values(unpack("N*N*", substr($response, $pos, 8)));
+                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)
+            if ($pos>$rlen)
             {
                 $this->_error = "incomplete reply";
-                $this->_MBPop ();
+                $this->_MBPop();
                 return false;
             }
         }
 
-        $this->_MBPop ();
+        $this->_MBPop();
         return $res;
     }
 
     function EscapeString($string)
     {
-        $from = array('\\', '(',')','|','-','!','@','~','"','&', '/', '^', '$', '=', '<');
-        $to   = array('\\\\', '\(','\)','\|','\-','\!','\@','\~','\"', '\&', '\/', '\^', '\$', '\=', '\<');
+        $from = array('\\', '(', ')', '|', '-', '!', '@', '~', '"', '&', '/', '^', '$', '=', '<');
+        $to   = array('\\\\', '\(', '\)', '\|', '\-', '\!', '\@', '\~', '\"', '\&', '\/', '\^', '\$', '\=', '\<');
 
         return str_replace($from, $to, $string);
     }
@@ -1648,7 +1648,7 @@ 
 
     /// batch update given attributes in given rows in given indexes
     /// returns amount of updated documents (0 or more) on success, or -1 on failure
-    function UpdateAttributes($index, $attrs, $values, $mva=false, $ignorenonexistent=false)
+    function UpdateAttributes($index, $attrs, $values, $mva = false, $ignorenonexistent = false)
     {
         // verify everything
         assert(is_string($index));
@@ -1678,14 +1678,14 @@ 
         }
 
         // build request
-        $this->_MBPush ();
-        $req = pack("N", strlen($index)) . $index;
+        $this->_MBPush();
+        $req = pack("N", strlen($index)).$index;
 
         $req .= pack("N", count($attrs));
         $req .= pack("N", $ignorenonexistent ? 1 : 0);
         foreach ($attrs as $attr)
         {
-            $req .= pack("N", strlen($attr)) . $attr;
+            $req .= pack("N", strlen($attr)).$attr;
             $req .= pack("N", $mva ? 1 : 0);
         }
 
@@ -1703,29 +1703,29 @@ 
         }
 
         // connect, send query, get response
-        if (!( $fp = $this->_Connect()))
+        if (!($fp = $this->_Connect()))
         {
-            $this->_MBPop ();
+            $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))
+        $req = pack("nnN", SEARCHD_COMMAND_UPDATE, VER_COMMAND_UPDATE, $len).$req; // add header
+        if (!$this->_Send($fp, $req, $len + 8))
         {
-            $this->_MBPop ();
+            $this->_MBPop();
             return -1;
         }
 
-        if (!( $response = $this->_GetResponse($fp, VER_COMMAND_UPDATE)))
+        if (!($response = $this->_GetResponse($fp, VER_COMMAND_UPDATE)))
         {
-            $this->_MBPop ();
+            $this->_MBPop();
             return -1;
         }
 
         // parse response
         list(,$updated) = unpack("N*", substr($response, 0, 4));
-        $this->_MBPop ();
+        $this->_MBPop();
         return $updated;
     }
 
@@ -1735,7 +1735,7 @@ 
 
     function Open()
     {
-        if ($this->_socket !== false)
+        if ($this->_socket!==false)
         {
             $this->_error = 'already connected';
             return false;
@@ -1754,7 +1754,7 @@ 
 
     function Close()
     {
-        if ($this->_socket === false)
+        if ($this->_socket===false)
         {
             $this->_error = 'not connected';
             return false;
@@ -1770,22 +1770,22 @@ 
     // status
     //////////////////////////////////////////////////////////////////////////
 
-    function Status ($session=false)
+    function Status($session = false)
     {
         assert(is_bool($session));
 
-        $this->_MBPush ();
-        if (!( $fp = $this->_Connect()))
+        $this->_MBPush();
+        if (!($fp = $this->_Connect()))
         {
             $this->_MBPop();
             return false;
         }
 
-        $req = pack("nnNN", SEARCHD_COMMAND_STATUS, VER_COMMAND_STATUS, 4, $session?0:1); // len=4, body=1
-        if (!( $this->_Send($fp, $req, 12)) ||
-             !( $response = $this->_GetResponse($fp, VER_COMMAND_STATUS)))
+        $req = pack("nnNN", SEARCHD_COMMAND_STATUS, VER_COMMAND_STATUS, 4, $session ? 0 : 1); // len=4, body=1
+        if (!($this->_Send($fp, $req, 12)) ||
+             !($response = $this->_GetResponse($fp, VER_COMMAND_STATUS)))
         {
-            $this->_MBPop ();
+            $this->_MBPop();
             return false;
         }
 
@@ -1794,14 +1794,14 @@ 
         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;
         }
 
-        $this->_MBPop ();
+        $this->_MBPop();
         return $res;
     }
 
@@ -1809,20 +1809,20 @@ 
     // flush
     //////////////////////////////////////////////////////////////////////////
 
-    function FlushAttributes ()
+    function FlushAttributes()
     {
-        $this->_MBPush ();
-        if (!( $fp = $this->_Connect()))
+        $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)))
+        if (!($this->_Send($fp, $req, 8)) ||
+             !($response = $this->_GetResponse($fp, VER_COMMAND_FLUSHATTRS)))
         {
-            $this->_MBPop ();
+            $this->_MBPop();
             return -1;
         }
 
@@ -1832,7 +1832,7 @@ 
         else
             $this->_error = "unexpected response length";
 
-        $this->_MBPop ();
+        $this->_MBPop();
         return $tag;
     }
 }

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;