codysnider / tt-rss

classes/debug.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 
 		$ts = strftime("%H:%M:%S", time());
 		if (function_exists('posix_getpid')) {
-			$ts = "$ts/" . posix_getpid();
+			$ts = "$ts/".posix_getpid();
 		}
 
 		if (Debug::$logfile) {
@@ -60,7 +60,7 @@ 
 
 					if (!$locked) {
 						fclose($fp);
-						user_error("Unable to lock debugging log file: " . Debug::$logfile, E_USER_WARNING);
+						user_error("Unable to lock debugging log file: ".Debug::$logfile, E_USER_WARNING);
 						return;
 					}
 				}
@@ -77,7 +77,7 @@ 
 					return;
 
 			} else {
-				user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING);
+				user_error("Unable to open debugging log file: ".Debug::$logfile, E_USER_WARNING);
 			}
 		}
 

classes/opml.php

Spacing +5 added lines, -5 removed lines

@@ -221,7 +221,7 @@ 
 						foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
 
 							if (strpos($feed_id, "CAT:") === 0) {
-								$feed_id = (int)substr($feed_id, 4);
+								$feed_id = (int) substr($feed_id, 4);
 								if ($feed_id) {
 									array_push($match, [Feeds::getCategoryTitle($feed_id), true, false]);
 								} else {
@@ -229,7 +229,7 @@ 
 								}
 							} else {
 								if ($feed_id) {
-									array_push($match, [Feeds::getFeedTitle((int)$feed_id), false, false]);
+									array_push($match, [Feeds::getFeedTitle((int) $feed_id), false, false]);
 								} else {
 									array_push($match, [0, false, true]);
 								}
@@ -429,7 +429,7 @@ 
 								list ($name, $is_cat, $is_id) = $match;
 
 								if ($is_id) {
-									array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
+									array_push($match_on, ($is_cat ? "CAT:" : "").$name);
 								} else {
 
 									if (!$is_cat) {
@@ -458,7 +458,7 @@ 
 							}
 
 							$reg_exp = $rule["reg_exp"];
-							$filter_type = (int)$rule["filter_type"];
+							$filter_type = (int) $rule["filter_type"];
 							$inverse = bool_to_sql_bool($rule["inverse"]);
 							$match_on = json_encode($match_on);
 
@@ -492,7 +492,7 @@ 
 
 							$cat_filter = bool_to_sql_bool($rule["cat_filter"]);
 							$reg_exp = $rule["reg_exp"];
-							$filter_type = (int)$rule["filter_type"];
+							$filter_type = (int) $rule["filter_type"];
 							$inverse = bool_to_sql_bool($rule["inverse"]);
 
 							$usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules

include/colors.php

Spacing +28 added lines, -28 removed lines

@@ -183,7 +183,7 @@ 
 ### HSL >> RGB
 function _color_hsl2rgb($hsl) {
 	$h = $hsl[0]; $s = $hsl[1]; $l = $hsl[2];
-	$m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
+	$m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l * $s;
 	$m1 = $l * 2 - $m2;
 	return array(_color_hue2rgb($m1, $m2, $h + 0.33333),
 		_color_hue2rgb($m1, $m2, $h),
@@ -208,7 +208,7 @@ 
 		$hex = substr($hex, 1);
 
 	if (strlen($hex) == 4) {
-		$hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
+		$hex = $hex[1].$hex[1].$hex[2].$hex[2].$hex[3].$hex[3];
 	}
 	$c = hexdec($hex);
 	for ($i = 16; $i >= 0; $i -= 8) {
@@ -220,7 +220,7 @@ 
 function _color_pack($rgb, $normalize = false) {
 	foreach ($rgb as $k => $v) {
 		$out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8));
-	}return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
+	}return '#'.str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
 }
 
 function rgb2hsl($arr) {
@@ -244,13 +244,13 @@ 
 	} else {
 		$s = $del_Max / $var_Max;
 
-		$del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-		$del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-		$del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+		$del_R = ((($var_Max - $var_R) / 6) + ($del_Max / 2)) / $del_Max;
+		$del_G = ((($var_Max - $var_G) / 6) + ($del_Max / 2)) / $del_Max;
+		$del_B = ((($var_Max - $var_B) / 6) + ($del_Max / 2)) / $del_Max;
 
-		if      ($var_R == $var_Max) $h = $del_B - $del_G;
-		else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
-		else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
+		if ($var_R == $var_Max) $h = $del_B - $del_G;
+		else if ($var_G == $var_Max) $h = (1 / 3) + $del_R - $del_B;
+		else if ($var_B == $var_Max) $h = (2 / 3) + $del_G - $del_R;
 
 		if ($h < 0) $h++;
 		if ($h > 1) $h--;
@@ -264,21 +264,21 @@ 
 	$s = $arr[1];
 	$v = $arr[2];
 
-	if($s == 0) {
+	if ($s == 0) {
 		$r = $g = $B = $v * 255;
 	} else {
 		$var_H = $h * 6;
-		$var_i = floor($var_H );
-		$var_1 = $v * (1 - $s );
-		$var_2 = $v * (1 - $s * ($var_H - $var_i ) );
-		$var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
-
-		if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
-		else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
-		else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
-		else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
-		else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
-		else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+		$var_i = floor($var_H);
+		$var_1 = $v * (1 - $s);
+		$var_2 = $v * (1 - $s * ($var_H - $var_i));
+		$var_3 = $v * (1 - $s * (1 - ($var_H - $var_i)));
+
+		if ($var_i == 0) { $var_R = $v; $var_G = $var_3; $var_B = $var_1; }
+		else if ($var_i == 1) { $var_R = $var_2; $var_G = $v; $var_B = $var_1; }
+		else if ($var_i == 2) { $var_R = $var_1; $var_G = $v; $var_B = $var_3; }
+		else if ($var_i == 3) { $var_R = $var_1; $var_G = $var_2; $var_B = $v; }
+		else if ($var_i == 4) { $var_R = $var_3; $var_G = $var_1; $var_B = $v; }
+		else { $var_R = $v; $var_G = $var_1; $var_B = $var_2; }
 
 		$r = $var_R * 255;
 		$g = $var_G * 255;
@@ -288,7 +288,7 @@ 
 }
 
 function colorPalette($imageFile, $numColors, $granularity = 5) {
-	$granularity = max(1, abs((int)$granularity));
+	$granularity = max(1, abs((int) $granularity));
 	$colors = array();
 
 	$size = @getimagesize($imageFile);
@@ -301,10 +301,10 @@ 
 			$ico = new floIcon();
 			@$ico->readICO($imageFile);
 
-			if(count($ico->images)==0)
+			if (count($ico->images) == 0)
 				return false;
 			else
-				$img = @$ico->images[count($ico->images)-1]->getImageResource();
+				$img = @$ico->images[count($ico->images) - 1]->getImageResource();
 
 		} else {
 			return false;
@@ -316,17 +316,17 @@ 
 
 	if (!$img) return false;
 
-	for($x = 0; $x < $size[0]; $x += $granularity) {
-		for($y = 0; $y < $size[1]; $y += $granularity) {
+	for ($x = 0; $x < $size[0]; $x += $granularity) {
+		for ($y = 0; $y < $size[1]; $y += $granularity) {
 			$thisColor = imagecolorat($img, $x, $y);
 			$rgb = imagecolorsforindex($img, $thisColor);
 			$red = round(round(($rgb['red'] / 0x33)) * 0x33);
 			$green = round(round(($rgb['green'] / 0x33)) * 0x33);
 			$blue = round(round(($rgb['blue'] / 0x33)) * 0x33);
 			$thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue);
-			if(array_key_exists($thisRGB, $colors)) {
+			if (array_key_exists($thisRGB, $colors)) {
 				$colors[$thisRGB]++;
-			} else{
+			} else {
 				$colors[$thisRGB] = 1;
 			}
 		}

include/functions.php

Spacing +48 added lines, -49 removed lines

@@ -203,7 +203,7 @@ 
 	if (!is_array($options)) {
 
 		// falling back on compatibility shim
-		$option_names = [ "url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent" ];
+		$option_names = ["url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent"];
 		$tmp = [];
 
 		for ($i = 0; $i < func_num_args(); $i++) {
@@ -230,13 +230,13 @@ 
 	$url = str_replace(' ', '%20', $url);
 
 	if (strpos($url, "//") === 0)
-		$url = 'http:' . $url;
+		$url = 'http:'.$url;
 
 	$url_host = parse_url($url, PHP_URL_HOST);
 	$fetch_domain_hits[$url_host] += 1;
 
 	if ($fetch_domain_hits[$url_host] > MAX_FETCH_REQUESTS_PER_HOST) {
-		user_error("Exceeded fetch request quota for $url_host: " . $fetch_domain_hits[$url_host], E_USER_WARNING);
+		user_error("Exceeded fetch request quota for $url_host: ".$fetch_domain_hits[$url_host], E_USER_WARNING);
 		#return false;
 	}
 
@@ -252,7 +252,7 @@ 
 			array_push($curl_http_headers, "If-Modified-Since: $last_modified");
 
 		if ($http_accept)
-			array_push($curl_http_headers, "Accept: " . $http_accept);
+			array_push($curl_http_headers, "Accept: ".$http_accept);
 
 		if (count($curl_http_headers) > 0)
 			curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
@@ -265,11 +265,10 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_HEADER, true);
 		curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-		curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent :
-			SELF_USER_AGENT);
+		curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent : SELF_USER_AGENT);
 		curl_setopt($ch, CURLOPT_ENCODING, "");
 
-		if  ($http_referrer)
+		if ($http_referrer)
 			curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
 
 		if ($max_size) {
@@ -278,7 +277,7 @@ 
 
 			// holy shit closures in php
 			// download & upload are *expected* sizes respectively, could be zero
-			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use( &$max_size) {
+			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use(&$max_size) {
 				Debug::log("[curl progressfunction] $downloaded $max_size", Debug::$LOG_EXTENDED);
 
 				return ($downloaded > $max_size) ? 1 : 0; // if max size is set, abort when exceeding it
@@ -338,7 +337,7 @@ 
 		if ($http_code != 200 || $type && strpos($fetch_last_content_type, "$type") === false) {
 
 			if (curl_errno($ch) != 0) {
-				$fetch_last_error .=  "; " . curl_errno($ch) . " " . curl_error($ch);
+				$fetch_last_error .= "; ".curl_errno($ch)." ".curl_error($ch);
 			}
 
 			$fetch_last_error_content = $contents;
@@ -347,7 +346,7 @@ 
 		}
 
 		if (!$contents) {
-			$fetch_last_error = curl_errno($ch) . " " . curl_error($ch);
+			$fetch_last_error = curl_errno($ch)." ".curl_error($ch);
 			curl_close($ch);
 			return false;
 		}
@@ -367,7 +366,7 @@ 
 
 		$fetch_curl_used = false;
 
-		if ($login && $pass){
+		if ($login && $pass) {
 			$url_parts = array();
 
 			preg_match("/(^[^:]*):\/\/(.*)/", $url, $url_parts);
@@ -375,7 +374,7 @@ 
 			$pass = urlencode($pass);
 
 			if ($url_parts[1] && $url_parts[2]) {
-				$url = $url_parts[1] . "://$login:$pass@" . $url_parts[2];
+				$url = $url_parts[1]."://$login:$pass@".$url_parts[2];
 			}
 		}
 
@@ -443,7 +442,7 @@ 
 			$error = error_get_last();
 
 			if ($error['message'] != $old_error['message']) {
-				$fetch_last_error .= "; " . $error["message"];
+				$fetch_last_error .= "; ".$error["message"];
 			}
 
 			$fetch_last_error_content = $data;
@@ -518,15 +517,15 @@ 
 
 function get_ssl_certificate_id() {
 	if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]) {
-		return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] .
-			$_SERVER["REDIRECT_SSL_CLIENT_V_START"] .
-			$_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
+		return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"].
+			$_SERVER["REDIRECT_SSL_CLIENT_V_START"].
+			$_SERVER["REDIRECT_SSL_CLIENT_V_END"].
 			$_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
 	}
 	if ($_SERVER["SSL_CLIENT_M_SERIAL"]) {
-		return sha1($_SERVER["SSL_CLIENT_M_SERIAL"] .
-			$_SERVER["SSL_CLIENT_V_START"] .
-			$_SERVER["SSL_CLIENT_V_END"] .
+		return sha1($_SERVER["SSL_CLIENT_M_SERIAL"].
+			$_SERVER["SSL_CLIENT_V_START"].
+			$_SERVER["SSL_CLIENT_V_END"].
 			$_SERVER["SSL_CLIENT_S_DN"]);
 	}
 	return "";
@@ -661,7 +660,7 @@ 
 function logout_user() {
 	@session_destroy();
 	if (isset($_COOKIE[session_name()])) {
-	   setcookie(session_name(), '', time()-42000, '/');
+	   setcookie(session_name(), '', time() - 42000, '/');
 	}
 	session_commit();
 }
@@ -745,7 +744,7 @@ 
 
 function truncate_string($str, $max_len, $suffix = '&hellip;') {
 	if (mb_strlen($str, "utf-8") > $max_len) {
-		return mb_substr($str, 0, $max_len, "utf-8") . $suffix;
+		return mb_substr($str, 0, $max_len, "utf-8").$suffix;
 	} else {
 		return $str;
 	}
@@ -755,7 +754,7 @@ 
 	$startString = mb_substr($original, 0, $position, "UTF-8");
 	$endString = mb_substr($original, $position + $length, mb_strlen($original), "UTF-8");
 
-	$out = $startString . $replacement . $endString;
+	$out = $startString.$replacement.$endString;
 
 	return $out;
 }
@@ -893,9 +892,9 @@ 
 }
 
 function file_is_locked($filename) {
-	if (file_exists(LOCK_DIRECTORY . "/$filename")) {
+	if (file_exists(LOCK_DIRECTORY."/$filename")) {
 		if (function_exists('flock')) {
-			$fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
+			$fp = @fopen(LOCK_DIRECTORY."/$filename", "r");
 			if ($fp) {
 				if (flock($fp, LOCK_EX | LOCK_NB)) {
 					flock($fp, LOCK_UN);
@@ -916,11 +915,11 @@ 
 
 
 function make_lockfile($filename) {
-	$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+	$fp = fopen(LOCK_DIRECTORY."/$filename", "w");
 
 	if ($fp && flock($fp, LOCK_EX | LOCK_NB)) {
 		$stat_h = fstat($fp);
-		$stat_f = stat(LOCK_DIRECTORY . "/$filename");
+		$stat_f = stat(LOCK_DIRECTORY."/$filename");
 
 		if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
 			if ($stat_h["ino"] != $stat_f["ino"] ||
@@ -931,7 +930,7 @@ 
 		}
 
 		if (function_exists('posix_getpid')) {
-			fwrite($fp, posix_getpid() . "\n");
+			fwrite($fp, posix_getpid()."\n");
 		}
 		return $fp;
 	} else {
@@ -940,10 +939,10 @@ 
 }
 
 function make_stampfile($filename) {
-	$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+	$fp = fopen(LOCK_DIRECTORY."/$filename", "w");
 
 	if (flock($fp, LOCK_EX | LOCK_NB)) {
-		fwrite($fp, time() . "\n");
+		fwrite($fp, time()."\n");
 		flock($fp, LOCK_UN);
 		fclose($fp);
 		return true;
@@ -993,7 +992,7 @@ 
 	$params["is_default_pw"] = Pref_Prefs::isdefaultpassword();
 	$params["label_base_index"] = (int) LABEL_BASE_INDEX;
 
-	$theme = get_pref( "USER_CSS_THEME", false, false);
+	$theme = get_pref("USER_CSS_THEME", false, false);
 	$params["theme"] = theme_exists($theme) ? $theme : "";
 
 	$params["plugins"] = implode(", ", PluginHost::getInstance()->get_plugin_names());
@@ -1217,13 +1216,13 @@ 
 		}
 	}
 
-	if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+	if (file_exists(LOCK_DIRECTORY."/update_daemon.lock")) {
 
 		$data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
 
 		if (time() - $_SESSION["daemon_stamp_check"] > 30) {
 
-			$stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+			$stamp = (int) @file_get_contents(LOCK_DIRECTORY."/update_daemon.stamp");
 
 			if ($stamp) {
 				$stamp_delta = time() - $stamp;
@@ -1266,7 +1265,7 @@ 
 	$res = trim($str); if (!$res) return '';
 
 	$doc = new DOMDocument();
-	$doc->loadHTML('<?xml encoding="UTF-8">' . $res);
+	$doc->loadHTML('<?xml encoding="UTF-8">'.$res);
 	$xpath = new DOMXPath($doc);
 
 	$rewrite_base_url = $site_url ? $site_url : get_self_url_prefix();
@@ -1365,7 +1364,7 @@ 
 		'ol', 'p', 'picture', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section',
 		'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary',
 		'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
-		'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
+		'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace');
 
 	if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
 
@@ -1500,8 +1499,8 @@ 
 
 // this returns SELF_URL_PATH sans ending slash
 function get_self_url_prefix() {
-	if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH)-1) {
-		return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH)-1);
+	if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH) - 1) {
+		return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH) - 1);
 	} else {
 		return SELF_URL_PATH;
 	}
@@ -1510,11 +1509,11 @@ 
 /* TODO: This needs to use bcrypt */
 function encrypt_password($pass, $salt = '', $mode2 = false) {
 	if ($salt && $mode2) {
-		return "MODE2:" . hash('sha256', $salt . $pass);
+		return "MODE2:".hash('sha256', $salt.$pass);
 	} else if ($salt) {
-		return "SHA1X:" . sha1("$salt:$pass");
+		return "SHA1X:".sha1("$salt:$pass");
 	} else {
-		return "SHA1:" . sha1($pass);
+		return "SHA1:".sha1($pass);
 	}
 }
 
@@ -1525,7 +1524,7 @@ 
 }
 
 function build_url($parts) {
-	return $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
+	return $parts['scheme']."://".$parts['host'].$parts['path'];
 }
 
 function cleanup_url_path($path) {
@@ -1569,7 +1568,7 @@ 
 			$dir = dirname($parts['path']);
 			$dir !== '/' && $dir .= '/';
 		}
-		$parts['path'] = $dir . $rel_url;
+		$parts['path'] = $dir.$rel_url;
 		$parts['path'] = cleanup_url_path($parts['path']);
 
 		return build_url($parts);
@@ -1656,12 +1655,12 @@ 
 
 		for ($i = 0; $i < $l10n->total; $i++) {
 			$orig = $l10n->get_original_string($i);
-			if(strpos($orig, "\000") !== FALSE) { // Plural forms
+			if (strpos($orig, "\000") !== FALSE) { // Plural forms
 				$key = explode(chr(0), $orig);
 				print T_js_decl($key[0], _ngettext($key[0], $key[1], 1)); // Singular
 				print T_js_decl($key[1], _ngettext($key[0], $key[1], 2)); // Plural
 			} else {
-				$translation = _dgettext($domain,$orig);
+				$translation = _dgettext($domain, $orig);
 				print T_js_decl($orig, $translation);
 			}
 		}
@@ -1717,7 +1716,7 @@ 
 	if (file_exists($filename)) {
 		$ext = pathinfo($filename, PATHINFO_EXTENSION);
 
-		return "data:image/$ext;base64," . base64_encode(file_get_contents($filename));
+		return "data:image/$ext;base64,".base64_encode(file_get_contents($filename));
 	} else {
 		return "";
 	}
@@ -1754,7 +1753,7 @@ 
 
 		header("Content-type: $mimetype");
 
-		$stamp = gmdate("D, d M Y H:i:s", filemtime($filename)) . " GMT";
+		$stamp = gmdate("D, d M Y H:i:s", filemtime($filename))." GMT";
 		header("Last-Modified: $stamp", true);
 
 		return readfile($filename);
@@ -1764,7 +1763,7 @@ 
 }
 
 function arr_qmarks($arr) {
-	return str_repeat('?,', count($arr) - 1) . '?';
+	return str_repeat('?,', count($arr) - 1).'?';
 }
 
 function get_scripts_timestamp() {
@@ -1799,7 +1798,7 @@ 
 	} else if (PHP_OS === "Darwin") {
 		$ttrss_version = "UNKNOWN (Unsupported, Darwin)";
 	} else if (file_exists("$root_dir/version_static.txt")) {
-		$ttrss_version = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)";
+		$ttrss_version = trim(file_get_contents("$root_dir/version_static.txt"))." (Unsupported)";
 	} else if (is_dir("$root_dir/.git")) {
 		$rc = 0;
 		$output = [];
@@ -1817,10 +1816,10 @@ 
 				$git_commit = $commit;
 				$git_timestamp = $timestamp;
 
-				$ttrss_version = strftime("%y.%m", $timestamp) . "-$commit";
+				$ttrss_version = strftime("%y.%m", $timestamp)."-$commit";
 			}
 		} else {
-			user_error("Unable to determine version (using $root_dir): " . implode("\n", $output), E_USER_WARNING);
+			user_error("Unable to determine version (using $root_dir): ".implode("\n", $output), E_USER_WARNING);
 		}
 	}
 

include/sessions.php

Spacing +6 added lines, -6 removed lines

@@ -78,11 +78,11 @@ 
 	return true;
 }
 
-function ttrss_open () {
+function ttrss_open() {
 	return true;
 }
 
-function ttrss_read ($id){
+function ttrss_read($id) {
 	global $session_expire;
 
 	$sth = Db::pdo()->prepare("SELECT data FROM ttrss_sessions WHERE id=?");
@@ -101,7 +101,7 @@ 
 	}
 }
 
-function ttrss_write ($id, $data) {
+function ttrss_write($id, $data) {
 	global $session_expire;
 
 	$data = base64_encode($data);
@@ -121,7 +121,7 @@ 
 	return true;
 }
 
-function ttrss_close () {
+function ttrss_close() {
 	return true;
 }
 
@@ -132,8 +132,8 @@ 
 	return true;
 }
 
-function ttrss_gc () {
-	Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
+function ttrss_gc() {
+	Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < ".time());
 
 	return true;
 }

plugins/af_readability/vendor/andreskrey/Readability/Nodes/NodeTrait.php

Spacing +4 added lines, -4 removed lines

@@ -328,7 +328,7 @@ 
 		$ret = iterator_to_array($this->childNodes);
 		if ($filterEmptyDOMText) {
 			// Array values is used to discard the key order. Needs to be 0 to whatever without skipping any number
-			$ret = array_values(array_filter($ret, function ($node) {
+			$ret = array_values(array_filter($ret, function($node) {
 				return $node->nodeName !== '#text' || mb_strlen(trim($node->nodeValue));
 			}));
 		}
@@ -427,7 +427,7 @@ 
 		}
 
 		// And there should be no text nodes with real content
-		return array_reduce(iterator_to_array($children), function ($carry, $child) {
+		return array_reduce(iterator_to_array($children), function($carry, $child) {
 			if (!$carry === false) {
 				return false;
 			}
@@ -480,7 +480,7 @@ 
                  * are dealing with (And at this point we know they are empty or are just whitespace, because of the
                  * mb_strlen in this chain of checks).
                  */
-				+ count(array_filter(iterator_to_array($this->childNodes), function ($child) {
+				+ count(array_filter(iterator_to_array($this->childNodes), function($child) {
 					return $child instanceof DOMText;
 				}))
 
@@ -498,7 +498,7 @@ 
 		return $this->nodeType === XML_TEXT_NODE || in_array($this->nodeName, $this->phrasing_elems) !== false ||
 			(!is_null($this->childNodes) &&
 				($this->nodeName === 'a' || $this->nodeName === 'del' || $this->nodeName === 'ins') &&
-				array_reduce(iterator_to_array($this->childNodes), function ($carry, $node) {
+				array_reduce(iterator_to_array($this->childNodes), function($carry, $node) {
 					return $node->isPhrasingContent() && $carry;
 				}, true)
 			);

plugins/af_readability/vendor/andreskrey/Readability/Readability.php

Spacing +17 added lines, -17 removed lines

@@ -194,7 +194,7 @@ 
 					$this->attempts[] = ['articleContent' => $result, 'textLength' => $length];
 
 					// No luck after removing flags, just return the longest text we found during the different loops
-					usort($this->attempts, function ($a, $b) {
+					usort($this->attempts, function($a, $b) {
 						return $a['textLength'] < $b['textLength'];
 					});
 
@@ -273,7 +273,7 @@ 
 		}
 
 		// Prepend the XML tag to avoid having issues with special characters. Should be harmless.
-		$dom->loadHTML('<?xml encoding="UTF-8">' . $html);
+		$dom->loadHTML('<?xml encoding="UTF-8">'.$html);
 		$dom->encoding = 'UTF-8';
 
 		$this->removeScripts($dom);
@@ -491,7 +491,7 @@ 
          * I can assure you it works properly if you let the code run.
          */
 		if (preg_match('/ [\|\-\\\\\/>»] /i', $curTitle)) {
-			$titleHadHierarchicalSeparators = (bool)preg_match('/ [\\\\\/>»] /', $curTitle);
+			$titleHadHierarchicalSeparators = (bool) preg_match('/ [\\\\\/>»] /', $curTitle);
 			$curTitle = preg_replace('/(.*)[\|\-\\\\\/>»] .*/i', '$1', $originalTitle);
 
 			$this->logger->info(sprintf('[Metadata] Found hierarchical separators in title, new title is: \'%s\'', $curTitle));
@@ -507,7 +507,7 @@ 
 			// could assume it's the full title.
 			$match = false;
 			for ($i = 1; $i <= 2; $i++) {
-				foreach ($this->dom->getElementsByTagName('h' . $i) as $hTag) {
+				foreach ($this->dom->getElementsByTagName('h'.$i) as $hTag) {
 					// Trim texts to avoid having false negatives when the title is surrounded by spaces or tabs
 					if (trim($hTag->nodeValue) === trim($curTitle)) {
 						$match = true;
@@ -579,17 +579,17 @@ 
 
 		// Scheme-rooted relative URI.
 		if (substr($uri, 0, 2) === '//') {
-			return $scheme . '://' . substr($uri, 2);
+			return $scheme.'://'.substr($uri, 2);
 		}
 
 		// Prepath-rooted relative URI.
 		if (substr($uri, 0, 1) === '/') {
-			return $prePath . $uri;
+			return $prePath.$uri;
 		}
 
 		// Dotslash relative URI.
 		if (strpos($uri, './') === 0) {
-			return $pathBase . substr($uri, 2);
+			return $pathBase.substr($uri, 2);
 		}
 		// Ignore hash URIs:
 		if (substr($uri, 0, 1) === '#') {
@@ -598,7 +598,7 @@ 
 
 		// Standard relative URI; add entire path. pathBase already includes a
 		// trailing "/".
-		return $pathBase . $uri;
+		return $pathBase.$uri;
 	}
 
 	/**
@@ -614,17 +614,17 @@ 
 		if ($this->dom->baseURI !== null) {
 			if (substr($this->dom->baseURI, 0, 1) === '/') {
 				// URLs starting with '/' override completely the URL defined in the link
-				$pathBase = parse_url($url, PHP_URL_SCHEME) . '://' . parse_url($url, PHP_URL_HOST) . $this->dom->baseURI;
+				$pathBase = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST).$this->dom->baseURI;
 			} else {
 				// Otherwise just prepend the base to the actual path
-				$pathBase = parse_url($url, PHP_URL_SCHEME) . '://' . parse_url($url, PHP_URL_HOST) . dirname(parse_url($url, PHP_URL_PATH)) . '/' . rtrim($this->dom->baseURI, '/') . '/';
+				$pathBase = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST).dirname(parse_url($url, PHP_URL_PATH)).'/'.rtrim($this->dom->baseURI, '/').'/';
 			}
 		} else {
-			$pathBase = parse_url($url, PHP_URL_SCHEME) . '://' . parse_url($url, PHP_URL_HOST) . dirname(parse_url($url, PHP_URL_PATH)) . '/';
+			$pathBase = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST).dirname(parse_url($url, PHP_URL_PATH)).'/';
 		}
 
 		$scheme = parse_url($pathBase, PHP_URL_SCHEME);
-		$prePath = $scheme . '://' . parse_url($pathBase, PHP_URL_HOST);
+		$prePath = $scheme.'://'.parse_url($pathBase, PHP_URL_HOST);
 
 		return [$pathBase, $scheme, $prePath];
 	}
@@ -658,7 +658,7 @@ 
 				continue;
 			}
 
-			$matchString = $node->getAttribute('class') . ' ' . $node->getAttribute('id');
+			$matchString = $node->getAttribute('class').' '.$node->getAttribute('id');
 
 			if (!$node->isProbablyVisible()) {
 				$this->logger->debug(sprintf('[Get Nodes] Removing hidden node... Match string was: \'%s\'', $matchString));
@@ -1049,7 +1049,7 @@ 
 				while ($parentOfTopCandidate->nodeName !== 'body' && $parentOfTopCandidate->nodeType === XML_ELEMENT_NODE) {
 					$listsContainingThisAncestor = 0;
 					for ($ancestorIndex = 0; $ancestorIndex < count($alternativeCandidateAncestors) && $listsContainingThisAncestor < $MINIMUM_TOPCANDIDATES; $ancestorIndex++) {
-						$listsContainingThisAncestor += (int)in_array($parentOfTopCandidate, $alternativeCandidateAncestors[$ancestorIndex]);
+						$listsContainingThisAncestor += (int) in_array($parentOfTopCandidate, $alternativeCandidateAncestors[$ancestorIndex]);
 					}
 					if ($listsContainingThisAncestor >= $MINIMUM_TOPCANDIDATES) {
 						$topCandidate = $parentOfTopCandidate;
@@ -1285,7 +1285,7 @@ 
 				$row = $tbody->getFirstElementChild();
 				if ($row->hasSingleTagInsideElement('td')) {
 					$cell = $row->getFirstElementChild();
-					$cell = NodeUtility::setNodeTag($cell, (array_reduce(iterator_to_array($cell->childNodes), function ($carry, $node) {
+					$cell = NodeUtility::setNodeTag($cell, (array_reduce(iterator_to_array($cell->childNodes), function($carry, $node) {
 						return $node->isPhrasingContent() && $carry;
 					}, true)) ? 'p' : 'div');
 					$table->parentNode->replaceChild($cell, $table);
@@ -1465,7 +1465,7 @@ 
 			$node = $DOMNodeList->item($length - 1 - $i);
 
 			// First check if we're in a data table, in which case don't remove us.
-			if ($node->hasAncestorTag('table', -1, function ($node) {
+			if ($node->hasAncestorTag('table', -1, function($node) {
 				return $node->isReadabilityDataTable();
 			})) {
 				continue;
@@ -1577,7 +1577,7 @@ 
 	public function _cleanHeaders(DOMDocument $article)
 	{
 		for ($headerIndex = 1; $headerIndex < 3; $headerIndex++) {
-			$headers = $article->getElementsByTagName('h' . $headerIndex);
+			$headers = $article->getElementsByTagName('h'.$headerIndex);
 			/** @var $header DOMElement */
 			foreach ($headers as $header) {
 				$weight = 0;

plugins/mailto/init.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		while ($line = $sth->fetch()) {
 
 			if (!$subject) {
-							$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+							$subject = __("[Forwarded]")." ".htmlspecialchars($line["title"]);
 			}
 
 			$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));

plugins/search_sphinx/sphinxapi.php

Spacing +120 added lines, -120 removed lines

@@ -536,32 +536,32 @@ 
 	/////////////////////////////////////////////////////////////////////////////
 
 	/// enter mbstring workaround mode
-	public function _MBPush ()
+	public function _MBPush()
 	{
 		$this->_mbenc = "";
-		if ( ini_get ( "mbstring.func_overload" ) & 2 )
+		if (ini_get("mbstring.func_overload") & 2)
 		{
 			$this->_mbenc = mb_internal_encoding();
-			mb_internal_encoding ( "latin1" );
+			mb_internal_encoding("latin1");
 		}
 	}
 
 	/// leave mbstring workaround mode
-	public function _MBPop ()
+	public function _MBPop()
 	{
-		if ( $this->_mbenc ) {
-					mb_internal_encoding ( $this->_mbenc );
+		if ($this->_mbenc) {
+					mb_internal_encoding($this->_mbenc);
 		}
 	}
 
 	/// connect to searchd server
-	public function _Connect ()
+	public function _Connect()
 	{
-		if ( $this->_socket!==false )
+		if ($this->_socket !== false)
 		{
 			// we are in persistent connection mode, so we have a socket
 			// however, need to check whether it's still alive
-			if ( !@feof ( $this->_socket ) ) {
+			if (!@feof($this->_socket)) {
 							return $this->_socket;
 			}
 
@@ -878,92 +878,92 @@ 
 	}
 
 	/// set count-distinct attribute for group-by queries
-	public function SetGroupDistinct ( $attribute )
+	public function SetGroupDistinct($attribute)
 	{
-		assert ( is_string($attribute) );
+		assert(is_string($attribute));
 		$this->_groupdistinct = $attribute;
 	}
 
 	/// set distributed retries count and delay
-	public function SetRetries ( $count, $delay=0 )
+	public function SetRetries($count, $delay = 0)
 	{
-		assert ( is_int($count) && $count>=0 );
-		assert ( is_int($delay) && $delay>=0 );
+		assert(is_int($count) && $count >= 0);
+		assert(is_int($delay) && $delay >= 0);
 		$this->_retrycount = $count;
 		$this->_retrydelay = $delay;
 	}
 
 	/// set result set format (hash or array; hash by default)
 	/// PHP specific; needed for group-by-MVA result sets that may contain duplicate IDs
-	public function SetArrayResult ( $arrayresult )
+	public function SetArrayResult($arrayresult)
 	{
-		assert ( is_bool($arrayresult) );
+		assert(is_bool($arrayresult));
 		$this->_arrayresult = $arrayresult;
 	}
 
 	/// set attribute values override
 	/// there can be only one override per attribute
 	/// $values must be a hash that maps document IDs to attribute values
-	public function SetOverride ( $attrname, $attrtype, $values )
+	public function SetOverride($attrname, $attrtype, $values)
 	{
-		assert ( is_string ( $attrname ) );
-		assert ( in_array ( $attrtype, array ( SPH_ATTR_INTEGER, SPH_ATTR_TIMESTAMP, SPH_ATTR_BOOL, SPH_ATTR_FLOAT, SPH_ATTR_BIGINT ) ) );
-		assert ( is_array ( $values ) );
+		assert(is_string($attrname));
+		assert(in_array($attrtype, array(SPH_ATTR_INTEGER, SPH_ATTR_TIMESTAMP, SPH_ATTR_BOOL, SPH_ATTR_FLOAT, SPH_ATTR_BIGINT)));
+		assert(is_array($values));
 
-		$this->_overrides[$attrname] = array ( "attr"=>$attrname, "type"=>$attrtype, "values"=>$values );
+		$this->_overrides[$attrname] = array("attr"=>$attrname, "type"=>$attrtype, "values"=>$values);
 	}
 
 	/// set select-list (attributes or expressions), SQL-like syntax
-	public function SetSelect ( $select )
+	public function SetSelect($select)
 	{
-		assert ( is_string ( $select ) );
+		assert(is_string($select));
 		$this->_select = $select;
 	}
 
 	//////////////////////////////////////////////////////////////////////////////
 
 	/// clear all filters (for multi-queries)
-	public function ResetFilters ()
+	public function ResetFilters()
 	{
 		$this->_filters = array();
 		$this->_anchor = array();
 	}
 
 	/// clear groupby settings (for multi-queries)
-	public function ResetGroupBy ()
+	public function ResetGroupBy()
 	{
-		$this->_groupby		= "";
+		$this->_groupby = "";
 		$this->_groupfunc	= SPH_GROUPBY_DAY;
 		$this->_groupsort	= "@group desc";
-		$this->_groupdistinct= "";
+		$this->_groupdistinct = "";
 	}
 
 	/// clear all attribute value overrides (for multi-queries)
-	public function ResetOverrides ()
+	public function ResetOverrides()
 	{
-		$this->_overrides = array ();
+		$this->_overrides = array();
 	}
 
 	//////////////////////////////////////////////////////////////////////////////
 
 	/// connect to searchd server, run given search query through given indexes,
 	/// and return the search results
-	public function Query ( $query, $index="*", $comment="" )
+	public function Query($query, $index = "*", $comment = "")
 	{
-		assert ( empty($this->_reqs) );
+		assert(empty($this->_reqs));
 
-		$this->AddQuery ( $query, $index, $comment );
-		$results = $this->RunQueries ();
-		$this->_reqs = array (); // just in case it failed too early
+		$this->AddQuery($query, $index, $comment);
+		$results = $this->RunQueries();
+		$this->_reqs = array(); // just in case it failed too early
 
-		if ( !is_array($results) ) {
+		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 ) {
+		if ($results[0]["status"] == SEARCHD_ERROR) {
 					return false;
 		} else {
 					return $results[0];
@@ -971,11 +971,11 @@ 
 	}
 
 	/// helper to pack floats in network byte order
-	public function _PackFloat ( $f )
+	public function _PackFloat($f)
 	{
-		$t1 = pack ( "f", $f ); // machine order
-		list(,$t2) = unpack ( "L*", $t1 ); // int in machine order
-		return pack ( "N", $t2 );
+		$t1 = pack("f", $f); // machine order
+		list(,$t2) = unpack("L*", $t1); // int in machine order
+		return pack("N", $t2);
 	}
 
 	/**
@@ -984,183 +984,183 @@ 
 
 	/// add query to multi-query batch
 	/// returns index into results array from RunQueries() call
-	public function AddQuery ( $query, $index="*", $comment="" )
+	public function AddQuery($query, $index = "*", $comment = "")
 	{
 		// mbstring workaround
-		$this->_MBPush ();
+		$this->_MBPush();
 
 		// build request
-		$req = pack ( "NNNNN", $this->_offset, $this->_limit, $this->_mode, $this->_ranker, $this->_sort ); // mode and limits
-		$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("NNNNN", $this->_offset, $this->_limit, $this->_mode, $this->_ranker, $this->_sort); // mode and limits
+		$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", 1 ); // id64 range marker
-		$req .= sphPackU64 ( $this->_min_id ) . sphPackU64 ( $this->_max_id ); // id64 range
+		$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
 
 		// filters
-		$req .= pack ( "N", count($this->_filters) );
-		foreach ( $this->_filters as $filter )
+		$req .= pack("N", count($this->_filters));
+		foreach ($this->_filters as $filter)
 		{
-			$req .= pack ( "N", strlen($filter["attr"]) ) . $filter["attr"];
-			$req .= pack ( "N", $filter["type"] );
-			switch ( $filter["type"] )
+			$req .= pack("N", strlen($filter["attr"])).$filter["attr"];
+			$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 );
+				$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"] );
+				$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;
 
 			default:
-				assert ( 0 && "internal error: unhandled filter type" );
+				assert(0 && "internal error: unhandled filter type");
 			}
-			$req .= pack ( "N", $filter["exclude"] );
+			$req .= pack("N", $filter["exclude"]);
 		}
 
 		// group-by clause, max-matches count, group-sort clause, cutoff count
-		$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 ( "NNN", $this->_cutoff, $this->_retrycount, $this->_retrydelay );
-		$req .= pack ( "N", strlen($this->_groupdistinct) ) . $this->_groupdistinct;
+		$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("NNN", $this->_cutoff, $this->_retrycount, $this->_retrydelay);
+		$req .= pack("N", strlen($this->_groupdistinct)).$this->_groupdistinct;
 
 		// anchor point
-		if ( empty($this->_anchor) )
+		if (empty($this->_anchor))
 		{
-			$req .= pack ( "N", 0 );
+			$req .= pack("N", 0);
 		} else
 		{
-			$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"] );
+			$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"]);
 		}
 
 		// 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", count($this->_indexweights));
+		foreach ($this->_indexweights as $idx=>$weight) {
+					$req .= pack("N", strlen($idx)).$idx.pack("N", $weight);
 		}
 
 		// max query time
-		$req .= pack ( "N", $this->_maxquerytime );
+		$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 );
+		$req .= pack("N", count($this->_fieldweights));
+		foreach ($this->_fieldweights as $field=>$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", count($this->_overrides));
+		foreach ($this->_overrides as $key => $entry)
 		{
-			$req .= pack ( "N", strlen($entry["attr"]) ) . $entry["attr"];
-			$req .= pack ( "NN", $entry["type"], count($entry["values"]) );
-			foreach ( $entry["values"] as $id=>$val )
+			$req .= pack("N", strlen($entry["attr"])).$entry["attr"];
+			$req .= pack("NN", $entry["type"], count($entry["values"]));
+			foreach ($entry["values"] as $id=>$val)
 			{
-				assert ( is_numeric($id) );
-				assert ( is_numeric($val) );
+				assert(is_numeric($id));
+				assert(is_numeric($val));
 
-				$req .= sphPackU64 ( $id );
-				switch ( $entry["type"] )
+				$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;
 				}
 			}
 		}
 
 		// select-list
-		$req .= pack ( "N", strlen($this->_select) ) . $this->_select;
+		$req .= pack("N", strlen($this->_select)).$this->_select;
 
 		// 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
-	public function RunQueries ()
+	public function RunQueries()
 	{
-		if ( empty($this->_reqs) )
+		if (empty($this->_reqs))
 		{
 			$this->_error = "no queries defined, issue AddQuery() first";
 			return false;
 		}
 
 		// 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
+		$req = join("", $this->_reqs);
+		$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 );
+		return $this->_ParseSearchResponse($response, $nreqs);
 	}
 
 	/// parse and return search query (or queries) response
-	public function _ParseSearchResponse ( $response, $nreqs )
+	public function _ParseSearchResponse($response, $nreqs)
 	{
 		$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"] = "";
 
 			// extract status
-			list(,$status) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+			list(,$status) = unpack("N*", substr($response, $p, 4)); $p += 4;
 			$result["status"] = $status;
-			if ( $status!=SEARCHD_OK )
+			if ($status != SEARCHD_OK)
 			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$message = substr ( $response, $p, $len ); $p += $len;
+				list(,$len) = unpack("N*", substr($response, $p, 4)); $p += 4;
+				$message = substr($response, $p, $len); $p += $len;
 
-				if ( $status==SEARCHD_WARNING )
+				if ($status == SEARCHD_WARNING)
 				{
 					$result["warning"] = $message;
 				} else