codysnider / tt-rss

register.php

Braces +12 added lines, -4 removed lines

@@ -18,7 +18,9 @@ 
 
 	$action = $_REQUEST["action"];
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	if ($_REQUEST["format"] == "feed") {
 		header("Content-Type: text/xml");
@@ -35,7 +37,9 @@ 
 			$num_users = db_fetch_result($result, 0, "cu");
 
 			$num_users = REG_MAX_USERS - $num_users;
-			if ($num_users < 0) $num_users = 0;
+			if ($num_users < 0) {
+				$num_users = 0;
+			}
 			$reg_suffix = "enabled";
 		} else {
 			$num_users = 0;
@@ -310,7 +314,9 @@ 
 						"subject" => "Registration information for Tiny Tiny RSS",
 						"message" => $reg_text]);
 
-					if (!$rc) print_error($mailer->error());
+					if (!$rc) {
+						print_error($mailer->error());
+					}
 
 					$reg_text = "Hi!\n".
 						"\n".
@@ -324,7 +330,9 @@ 
 						"subject" => "Registration notice for Tiny Tiny RSS",
 						"message" => $reg_text]);
 
-					if (!$rc) print_error($mailer->error());
+					if (!$rc) {
+						print_error($mailer->error());
+					}
 
 					print_notice(__("Account created successfully."));
 

update.php

Braces +32 added lines, -19 removed lines

@@ -59,8 +59,9 @@ 
 		return $tags_deleted;
 	}
 
-	if (!defined('PHP_EXECUTABLE'))
-		define('PHP_EXECUTABLE', '/usr/bin/php');
+	if (!defined('PHP_EXECUTABLE')) {
+			define('PHP_EXECUTABLE', '/usr/bin/php');
+	}
 
 	$pdo = Db::pdo();
 
@@ -249,8 +250,9 @@ 
 
 		RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
 
-		if (!isset($options["pidlock"]) || $options["task"] == 0)
-			RSSUtils::housekeeping_common(true);
+		if (!isset($options["pidlock"]) || $options["task"] == 0) {
+					RSSUtils::housekeeping_common(true);
+		}
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 	}
@@ -264,8 +266,9 @@ 
 		Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
 		Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+		if (read_stdin() != 'yes') {
+					exit;
+		}
 
 		Debug::log("clearing existing indexes...");
 
@@ -319,8 +322,9 @@ 
 		Debug::log("WARNING: this will remove all existing type2 filters.");
 		Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+		if (read_stdin() != 'yes') {
+					exit;
+		}
 
 		Debug::log("converting filters...");
 
@@ -374,16 +378,18 @@ 
 		if ($updater->isUpdateRequired()) {
 			Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
 
-			if (DB_TYPE == "mysql")
-				Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
+			if (DB_TYPE == "mysql") {
+							Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
 					"Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
-			else
-				Debug::log("WARNING: please backup your database before continuing.");
+			} else {
+							Debug::log("WARNING: please backup your database before continuing.");
+			}
 
 			Debug::log("Type 'yes' to continue.");
 
-			if (read_stdin() != 'yes')
-				exit;
+			if (read_stdin() != 'yes') {
+							exit;
+			}
 
 			Debug::log("Performing updates to version " . SCHEMA_VERSION);
 
@@ -456,7 +462,9 @@ 
 
 			$status = $about[3] ? "system" : "user";
 
-			if (in_array($name, $enabled)) $name .= "*";
+			if (in_array($name, $enabled)) {
+				$name .= "*";
+			}
 
 			printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
 				$name, $status, $about[0], $about[2], $about[1]);
@@ -469,8 +477,12 @@ 
 	if (isset($options["debug-feed"])) {
 		$feed = $options["debug-feed"];
 
-		if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
-		if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
+		if (isset($options["force-refetch"])) {
+			$_REQUEST["force_refetch"] = true;
+		}
+		if (isset($options["force-rehash"])) {
+			$_REQUEST["force_rehash"] = true;
+		}
 
 		Debug::set_loglevel(Debug::$LOG_EXTENDED);
 
@@ -485,7 +497,8 @@ 
 
 	PluginHost::getInstance()->run_commands($options);
 
-	if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
-		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
+	if (file_exists(LOCK_DIRECTORY . "/$lock_filename")) {
+			if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
 			fclose($lock_handle);
+	}
 		unlink(LOCK_DIRECTORY . "/$lock_filename");

backend.php

Braces +8 added lines, -5 removed lines

@@ -5,10 +5,11 @@ 
 	$op = $_REQUEST["op"];
 	@$method = $_REQUEST['subop'] ? $_REQUEST['subop'] : $_REQUEST["method"];
 
-	if (!$method)
-		$method = 'index';
-	else
-		$method = strtolower($method);
+	if (!$method) {
+			$method = 'index';
+	} else {
+			$method = strtolower($method);
+	}
 
 	/* Public calls compatibility shim */
 
@@ -33,7 +34,9 @@ 
 
 	$script_started = microtime(true);
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	header("Content-Type: text/json; charset=utf-8");
 

public.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 
 	$script_started = microtime(true);
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
 		ob_start("ob_gzhandler");

include/autoload.php

Braces +6 added lines, -4 removed lines

@@ -5,8 +5,9 @@ 
 		$namespace = '';
 		$class_name = $class;
 
-		if (strpos($class, '\\') !== FALSE)
-			list ($namespace, $class_name) = explode('\\', $class, 2);
+		if (strpos($class, '\\') !== FALSE) {
+					list ($namespace, $class_name) = explode('\\', $class, 2);
+		}
 
 		$root_dir = dirname(__DIR__); // we're in tt-rss/include
 
@@ -20,7 +21,8 @@ 
 			$class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php";
 		}
 
-		if (file_exists($class_file))
-			include $class_file;
+		if (file_exists($class_file)) {
+					include $class_file;
+		}
 
 	});

include/controls.php

Braces +54 added lines, -32 removed lines

@@ -1,14 +1,17 @@ 
 <?php
 
 function print_select($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) $name = $id;
+	if (!$name) {
+		$name = $id;
+	}
 
 	print "<select name=\"$name\" id=\"$id\" $attributes>";
 	foreach ($values as $v) {
-		if ($v == $default)
-			$sel = "selected=\"1\"";
-		else
-			$sel = "";
+		if ($v == $default) {
+					$sel = "selected=\"1\"";
+		} else {
+					$sel = "";
+		}
 
 		$v = trim($v);
 
@@ -18,14 +21,17 @@ 
 }
 
 function print_select_hash($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) $name = $id;
+	if (!$name) {
+		$name = $id;
+	}
 
 	print "<select name=\"$name\" id='$id' $attributes>";
 	foreach (array_keys($values) as $v) {
-		if ($v == $default)
-			$sel = 'selected="selected"';
-		else
-			$sel = "";
+		if ($v == $default) {
+					$sel = 'selected="selected"';
+		} else {
+					$sel = "";
+		}
 
 		$v = trim($v);
 
@@ -53,10 +59,11 @@ 
 function print_radio($id, $default, $true_is, $values, $attributes = "") {
 	foreach ($values as $v) {
 
-		if ($v == $default)
-			$sel = "checked";
-		else
-			$sel = "";
+		if ($v == $default) {
+					$sel = "checked";
+		} else {
+					$sel = "";
+		}
 
 		if ($v == $true_is) {
 			$sel .= " value=\"1\"";
@@ -88,7 +95,9 @@ 
 
 	if (get_pref('ENABLE_FEED_CATS')) {
 
-		if (!$root_id) $root_id = null;
+		if (!$root_id) {
+			$root_id = null;
+		}
 
 		$sth = $pdo->prepare("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
@@ -101,17 +110,19 @@ 
 
 		while ($line = $sth->fetch()) {
 
-			for ($i = 0; $i < $nest_level; $i++)
-				$line["title"] = " - " . $line["title"];
+			for ($i = 0; $i < $nest_level; $i++) {
+							$line["title"] = " - " . $line["title"];
+			}
 
 			$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
 
 			printf("<option $is_selected value='CAT:%d'>%s</option>",
 				$line["id"], htmlspecialchars($line["title"]));
 
-			if ($line["num_children"] > 0)
-				print_feed_multi_select($id, $default_ids, $attributes,
+			if ($line["num_children"] > 0) {
+							print_feed_multi_select($id, $default_ids, $attributes,
 					$include_all_feeds, $line["id"], $nest_level+1);
+			}
 
 			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
 					WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
@@ -123,8 +134,9 @@ 
 
 				$fline["title"] = " + " . $fline["title"];
 
-				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+				for ($i = 0; $i < $nest_level; $i++) {
+									$fline["title"] = " - " . $fline["title"];
+				}
 
 				printf("<option $is_selected value='%d'>%s</option>",
 					$fline["id"], htmlspecialchars($fline["title"]));
@@ -146,8 +158,9 @@ 
 
 				$fline["title"] = " + " . $fline["title"];
 
-				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+				for ($i = 0; $i < $nest_level; $i++) {
+									$fline["title"] = " - " . $fline["title"];
+				}
 
 				printf("<option $is_selected value='%d'>%s</option>",
 					$fline["id"], htmlspecialchars($fline["title"]));
@@ -182,7 +195,9 @@ 
 
 	$pdo = DB::pdo();
 
-	if (!$root_id) $root_id = null;
+	if (!$root_id) {
+		$root_id = null;
+	}
 
 	$sth = $pdo->prepare("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
@@ -203,16 +218,19 @@ 
 			$is_selected = "";
 		}
 
-		for ($i = 0; $i < $nest_level; $i++)
-			$line["title"] = " - " . $line["title"];
+		for ($i = 0; $i < $nest_level; $i++) {
+					$line["title"] = " - " . $line["title"];
+		}
 
-		if ($line["title"])
-			printf("<option $is_selected value='%d'>%s</option>",
+		if ($line["title"]) {
+					printf("<option $is_selected value='%d'>%s</option>",
 				$line["id"], htmlspecialchars($line["title"]));
+		}
 
-		if ($line["num_children"] > 0)
-			print_feed_cat_select($id, $default_id, $attributes,
+		if ($line["num_children"] > 0) {
+					print_feed_cat_select($id, $default_id, $attributes,
 				$include_all_cats, $line["id"], $nest_level+1);
+		}
 	}
 
 	if (!$root_id) {
@@ -251,7 +269,9 @@ 
 
 	$timestamp = filemtime($filename);
 
-	if ($query) $timestamp .= "&$query";
+	if ($query) {
+		$timestamp .= "&$query";
+	}
 
 	return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
 }
@@ -299,8 +319,10 @@ 
 
 		}
 
-		if ($entry) $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
+		if ($entry) {
+			$entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
 				href=\"$url\">" . basename($url) . "</a>";
+		}
 
 		$entry .= "</div>";
 

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/search_sphinx/sphinxapi.php

Switch Indentation +19 added lines, -19 removed lines

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

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 @@ 
 
 	public 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
 	public 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 @@ 
 	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;
 	}
@@ -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;