codysnider / tt-rss

plugins/search_sphinx/sphinxapi.php

Braces +217 added lines, -118 removed lines

@@ -133,14 +133,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
@@ -158,9 +160,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;
@@ -180,8 +182,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"))
@@ -204,8 +207,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"))
@@ -235,16 +239,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;
@@ -256,16 +267,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);
 	}
 
@@ -273,8 +286,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;
@@ -289,8 +303,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;
 }
 
@@ -302,8 +317,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;
 	}
@@ -311,15 +331,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);
 	}
 
@@ -337,8 +359,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;
@@ -358,8 +381,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;
 }
 
@@ -369,10 +393,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);
@@ -470,8 +495,9 @@ 
 
 	public function __destruct()
 	{
-		if ($this->_socket !== false)
-			fclose($this->_socket);
+		if ($this->_socket !== false) {
+					fclose($this->_socket);
+		}
 	}
 
 	/// get last error message (string)
@@ -577,24 +603,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)";
@@ -647,8 +674,9 @@ 
 				}
 			}
 		}
-		if ($this->_socket === false)
-			fclose($fp);
+		if ($this->_socket === false) {
+					fclose($fp);
+		}
 
 		// check response
 		$read = strlen($response);
@@ -708,10 +736,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
@@ -765,8 +795,9 @@ 
 	public function SetWeights($weights)
 	{
 		assert(is_array($weights));
-		foreach ($weights as $weight)
-			assert(is_int($weight));
+		foreach ($weights as $weight) {
+					assert(is_int($weight));
+		}
 
 		$this->_weights = $weights;
 	}
@@ -816,8 +847,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);
 		}
@@ -1011,8 +1043,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:
@@ -1208,8 +1241,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)));
@@ -1219,10 +1251,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();
@@ -1265,10 +1298,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) =
@@ -1319,25 +1353,63 @@ 
 		// 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["before_match"])) {
+			$opts["before_match"] = "<b>";
+		}
+		if (!isset($opts["after_match"])) {
+			$opts["after_match"] = "</b>";
+		}
+		if (!isset($opts["chunk_separator"])) {
+			$opts["chunk_separator"] = " ... ";
+		}
+		if (!isset($opts["limit"])) {
+			$opts["limit"] = 256;
+		}
+		if (!isset($opts["limit_passages"])) {
+			$opts["limit_passages"] = 0;
+		}
+		if (!isset($opts["limit_words"])) {
+			$opts["limit_words"] = 0;
+		}
+		if (!isset($opts["around"])) {
+			$opts["around"] = 5;
+		}
+		if (!isset($opts["exact_phrase"])) {
+			$opts["exact_phrase"] = false;
+		}
+		if (!isset($opts["single_passage"])) {
+			$opts["single_passage"] = false;
+		}
+		if (!isset($opts["use_boundaries"])) {
+			$opts["use_boundaries"] = false;
+		}
+		if (!isset($opts["weight_order"])) {
+			$opts["weight_order"] = false;
+		}
+		if (!isset($opts["query_mode"])) {
+			$opts["query_mode"] = false;
+		}
+		if (!isset($opts["force_all_words"])) {
+			$opts["force_all_words"] = false;
+		}
+		if (!isset($opts["start_passage_id"])) {
+			$opts["start_passage_id"] = 1;
+		}
+		if (!isset($opts["load_files"])) {
+			$opts["load_files"] = false;
+		}
+		if (!isset($opts["html_strip_mode"])) {
+			$opts["html_strip_mode"] = "index";
+		}
+		if (!isset($opts["allow_empty"])) {
+			$opts["allow_empty"] = false;
+		}
+		if (!isset($opts["passage_boundary"])) {
+			$opts["passage_boundary"] = "none";
+		}
+		if (!isset($opts["emit_zones"])) {
+			$opts["emit_zones"] = false;
+		}
 
 		/////////////////
 		// build request
@@ -1345,15 +1417,33 @@ 
 
 		// 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["exact_phrase"]) {
+			$flags |= 2;
+		}
+		if ($opts["single_passage"]) {
+			$flags |= 4;
+		}
+		if ($opts["use_boundaries"]) {
+			$flags |= 8;
+		}
+		if ($opts["weight_order"]) {
+			$flags |= 16;
+		}
+		if ($opts["query_mode"]) {
+			$flags |= 32;
+		}
+		if ($opts["force_all_words"]) {
+			$flags |= 64;
+		}
+		if ($opts["load_files"]) {
+			$flags |= 128;
+		}
+		if ($opts["allow_empty"]) {
+			$flags |= 256;
+		}
+		if ($opts["emit_zones"]) {
+			$flags |= 512;
+		}
 		$req = pack("NN", 0, $flags); // mode=0, flags=$flags
 		$req .= pack("N", strlen($index)).$index; // req index
 		$req .= pack("N", strlen($words)).$words; // req words
@@ -1520,8 +1610,9 @@ 
 		assert(is_bool($mva));
 
 		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)
@@ -1534,10 +1625,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));
+				}
 			}
 		}
 
@@ -1559,9 +1652,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);
+				}
 			}
 		}
 
@@ -1603,13 +1697,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;
@@ -1655,8 +1751,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;
@@ -1688,10 +1786,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;

update.php

Braces +3 added lines, -2 removed lines

@@ -498,7 +498,8 @@
 	PluginHost::getInstance()->run_commands($options);
 
 	if (file_exists(LOCK_DIRECTORY . "/$lock_filename")) {
-			if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
-			fclose($lock_handle);
+			if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
+						fclose($lock_handle);
+			}
 	}
 		unlink(LOCK_DIRECTORY . "/$lock_filename");

api/index.php

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
 	// fallback on HTTP parameters
 	if ($input) {
 		$input = json_decode($input, true);
-		if ($input) $_REQUEST = $input;
+		if ($input) {
+			$_REQUEST = $input;
+		}
 	}
 } else {
 	// Accept JSON only