codysnider / tt-rss

include/errorhandler.php

Braces +16 added lines, -8 removed lines

@@ -32,16 +32,19 @@ 
 }
 
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
-	if (error_reporting() == 0 || !$errno) return false;
+	if (error_reporting() == 0 || !$errno) {
+		return false;
+	}
 
 	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
 	$context = format_backtrace(debug_backtrace());
 	$errstr = truncate_middle($errstr, 16384, " (...) ");
 
-	if (class_exists("Logger"))
-		return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
-}
+	if (class_exists("Logger")) {
+			return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+	}
+	}
 
 function ttrss_fatal_handler() {
 	global $last_query;
@@ -54,16 +57,21 @@ 
 		$line = $error["line"];
 		$errstr  = $error["message"];
 
-		if (!$errno) return false;
+		if (!$errno) {
+			return false;
+		}
 
 		$context = format_backtrace(debug_backtrace());
 
 		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-		if ($last_query) $errstr .= " [Last query: $last_query]";
+		if ($last_query) {
+			$errstr .= " [Last query: $last_query]";
+		}
 
-		if (class_exists("Logger"))
-			return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+		if (class_exists("Logger")) {
+					return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+		}
 	}
 
 	return false;

prefs.php

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 	require_once "config.php";
 	require_once "db-prefs.php";
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	login_sequence();
 

plugins/nsfw/init.php

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
 	}
 
 	function hook_prefs_tab($args) {
-		if ($args != "prefPrefs") return;
+		if ($args != "prefPrefs") {
+			return;
+		}
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" 
 			title=\"<i class='material-icons'>extension</i> ".__("NSFW Plugin")."\">";

plugins/af_unburn/init.php

Braces +6 added lines, -3 removed lines

@@ -21,8 +21,9 @@ 
 	function hook_article_filter($article) {
 		$owner_uid = $article["owner_uid"];
 
-		if (defined('NO_CURL') || !function_exists("curl_init") || ini_get("open_basedir"))
-			return $article;
+		if (defined('NO_CURL') || !function_exists("curl_init") || ini_get("open_basedir")) {
+					return $article;
+		}
 
 		if ((strpos($article["link"], "feedproxy.google.com") !== FALSE ||
 		  		strpos($article["link"], "/~r/") !== FALSE ||
@@ -57,7 +58,9 @@ 
 						parse_str($query, $args);
 
 						foreach (array("utm_source", "utm_medium", "utm_campaign") as $param) {
-							if (isset($args[$param])) unset($args[$param]);
+							if (isset($args[$param])) {
+								unset($args[$param]);
+							}
 						}
 
 						$new_query = http_build_query($args);

plugins/af_psql_trgm/init.php

Braces +42 added lines, -14 removed lines

@@ -15,10 +15,16 @@ 
 		$min_title_length = (int) $_POST["min_title_length"];
 		$enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]);
 
-		if ($similarity < 0) $similarity = 0;
-		if ($similarity > 1) $similarity = 1;
+		if ($similarity < 0) {
+			$similarity = 0;
+		}
+		if ($similarity > 1) {
+			$similarity = 1;
+		}
 
-		if ($min_title_length < 0) $min_title_length = 0;
+		if ($min_title_length < 0) {
+			$min_title_length = 0;
+		}
 
 		$similarity = sprintf("%.2f", $similarity);
 
@@ -121,7 +127,9 @@ 
 	}
 
 	function hook_prefs_tab($args) {
-		if ($args != "prefFeeds") return;
+		if ($args != "prefFeeds") {
+			return;
+		}
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" 
 			title=\"<i class='material-icons'>extension</i> ".__('Mark similar articles as read')."\">";
@@ -140,8 +148,12 @@ 
 			$min_title_length = $this->host->get($this, "min_title_length");
 			$enable_globally = $this->host->get($this, "enable_globally");
 
-			if (!$similarity) $similarity = '0.75';
-			if (!$min_title_length) $min_title_length = '32';
+			if (!$similarity) {
+				$similarity = '0.75';
+			}
+			if (!$min_title_length) {
+				$min_title_length = '32';
+			}
 
 			print "<form dojoType=\"dijit.form.Form\">";
 
@@ -198,7 +210,9 @@ 
 			print "</form>";
 
 			$enabled_feeds = $this->host->get($this, "enabled_feeds");
-			if (!array($enabled_feeds)) $enabled_feeds = array();
+			if (!array($enabled_feeds)) {
+				$enabled_feeds = array();
+			}
 
 			$enabled_feeds = $this->filter_unknown_feeds($enabled_feeds);
 			$this->host->set($this, "enabled_feeds", $enabled_feeds);
@@ -225,7 +239,9 @@ 
 		print "<section>";
 
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!array($enabled_feeds)) $enabled_feeds = array();
+		if (!array($enabled_feeds)) {
+			$enabled_feeds = array();
+		}
 
 		$key = array_search($feed_id, $enabled_feeds);
 		$checked = $key !== FALSE ? "checked" : "";
@@ -242,7 +258,9 @@ 
 
 	function hook_prefs_save_feed($feed_id) {
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!is_array($enabled_feeds)) $enabled_feeds = array();
+		if (!is_array($enabled_feeds)) {
+			$enabled_feeds = array();
+		}
 
 		$enable = checkbox_to_sql_bool($_POST["trgm_similarity_enabled"]);
 		$key = array_search($feed_id, $enabled_feeds);
@@ -262,24 +280,34 @@ 
 
 	function hook_article_filter($article) {
 
-		if (DB_TYPE != "pgsql") return $article;
+		if (DB_TYPE != "pgsql") {
+			return $article;
+		}
 
 		$res = $this->pdo->query("select 'similarity'::regproc");
-		if (!$res->fetch()) return $article;
+		if (!$res->fetch()) {
+			return $article;
+		}
 
 		$enable_globally = $this->host->get($this, "enable_globally");
 
 		if (!$enable_globally) {
 			$enabled_feeds = $this->host->get($this, "enabled_feeds");
 			$key = array_search($article["feed"]["id"], $enabled_feeds);
-			if ($key === FALSE) return $article;
+			if ($key === FALSE) {
+				return $article;
+			}
 		}
 
 		$similarity = (float) $this->host->get($this, "similarity");
-		if ($similarity < 0.01) return $article;
+		if ($similarity < 0.01) {
+			return $article;
+		}
 
 		$min_title_length = (int) $this->host->get($this, "min_title_length");
-		if (mb_strlen($article["title"]) < $min_title_length) return $article;
+		if (mb_strlen($article["title"]) < $min_title_length) {
+			return $article;
+		}
 
 		$owner_uid = $article["owner_uid"];
 		$entry_guid = $article["guid_hashed"];

plugins/search_sphinx/sphinxapi.php

Braces +241 added lines, -134 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 @@ 
 
 	function __destruct()
 	{
-		if ( $this->_socket !== false )
-			fclose ( $this->_socket );
+		if ( $this->_socket !== false ) {
+					fclose ( $this->_socket );
+		}
 	}
 
 	/// get last error message (string)
@@ -549,8 +575,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
@@ -560,8 +587,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;
@@ -575,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)";
@@ -645,8 +674,9 @@ 
 				}
 			}
 		}
-		if ( $this->_socket === false )
-			fclose ( $fp );
+		if ( $this->_socket === false ) {
+					fclose ( $fp );
+		}
 
 		// check response
 		$read = strlen ( $response );
@@ -706,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
@@ -763,8 +795,9 @@ 
 	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;
 	}
@@ -814,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 );
 		}
@@ -954,15 +988,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
@@ -989,8 +1026,9 @@ 
 		$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
@@ -1005,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:
@@ -1045,16 +1084,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,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 ) ) );
@@ -1211,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 ();
@@ -1257,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 ) =
@@ -1311,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
@@ -1337,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
@@ -1512,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 )
@@ -1526,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) );
+				}
 			}
 		}
 
@@ -1551,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 );
+				}
 			}
 		}
 
@@ -1595,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;
@@ -1647,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;
@@ -1680,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;

plugins/search_sphinx/init.php

Braces +5 added lines, -4 removed lines

@@ -53,10 +53,11 @@
 
 		$ids = join(",", $ids);
 
-		if ($ids)
-			return array("ref_id IN ($ids)", array());
-		else
-			return array("ref_id = -1", array());
+		if ($ids) {
+					return array("ref_id IN ($ids)", array());
+		} else {
+					return array("ref_id = -1", array());
+		}
 	}
 
 	function api_version() {

plugins/auth_remote/init.php

Braces +9 added lines, -3 removed lines

@@ -44,10 +44,16 @@
 		$try_login = $_SERVER["REMOTE_USER"];
 
 		// php-cgi
-		if (!$try_login) $try_login = $_SERVER["REDIRECT_REMOTE_USER"];
-		if (!$try_login) $try_login = $_SERVER["PHP_AUTH_USER"];
+		if (!$try_login) {
+			$try_login = $_SERVER["REDIRECT_REMOTE_USER"];
+		}
+		if (!$try_login) {
+			$try_login = $_SERVER["PHP_AUTH_USER"];
+		}
 
-		if (!$try_login) $try_login = $this->get_login_by_ssl_certificate();
+		if (!$try_login) {
+			$try_login = $this->get_login_by_ssl_certificate();
+		}
 
 		if ($try_login) {
 			$user_id = $this->base->auto_create_user($try_login, $password);

plugins/auth_internal/init.php

Braces +3 added lines, -2 removed lines

@@ -99,8 +99,9 @@
 		if ($service && get_schema_version() > 138) {
 			$user_id = $this->check_app_password($login, $password, $service);
 
-			if ($user_id)
-				return $user_id;
+			if ($user_id) {
+							return $user_id;
+			}
 		}
 
 		if (get_schema_version() > 87) {