kakserpom / phpdaemon

lib/Pool.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		if ($this->isEnabled()) {
 			list ($class, $name) = explode(':', $this->name . ':');
 			if (!class_exists($class)) {
-				Daemon::log($class. ' class not exists.');
+				Daemon::log($class . ' class not exists.');
 				return;
 			}
 			$this->pool = call_user_func(array($class, 'getInstance'), $name);

lib/XMLStream.php

Spacing +27 added lines, -27 removed lines

@@ -50,24 +50,24 @@ 
 			$this->current_ns[$this->xml_depth] = $attr['XMLNS'];
 		} else {
 			$this->current_ns[$this->xml_depth] = $this->current_ns[$this->xml_depth - 1];
-			if(!$this->current_ns[$this->xml_depth]) $this->current_ns[$this->xml_depth] = $this->default_ns;
+			if (!$this->current_ns[$this->xml_depth]) $this->current_ns[$this->xml_depth] = $this->default_ns;
 		}
 		$ns = $this->current_ns[$this->xml_depth];
-		foreach($attr as $key => $value) {
-			if(strstr($key, ':')) {
+		foreach ($attr as $key => $value) {
+			if (strstr($key, ':')) {
 				$key = explode(':', $key);
 				$key = $key[1];
 				$this->ns_map[$key] = $value;
 			}
 		}
-		if(!strstr($name, ":") === false)
+		if (!strstr($name, ":") === false)
 		{
 			$name = explode(':', $name);
 			$ns = $this->ns_map[$name[0]];
 			$name = $name[1];
 		}
 		$obj = new XMLStream_Object($name, $ns, $attr);
-		if($this->xml_depth > 1) {
+		if ($this->xml_depth > 1) {
 			$this->xmlobj[$this->xml_depth - 1]->subs[] = $obj;
 		}
 		$this->xmlobj[$this->xml_depth] = $obj;
@@ -84,14 +84,14 @@ 
 	public function endXML($parser, $name) {
 		--$this->xml_depth;
 		if ($this->xml_depth == 1) {
-			foreach($this->xpathhandlers as $handler) {
+			foreach ($this->xpathhandlers as $handler) {
 				if (is_array($this->xmlobj) && array_key_exists(2, $this->xmlobj)) {
 					$searchxml = $this->xmlobj[2];
 					$nstag = array_shift($handler[0]);
 					if (($nstag[0] == null or $searchxml->ns == $nstag[0]) and ($nstag[1] == "*" or $nstag[1] == $searchxml->name)) {
-						foreach($handler[0] as $nstag) {
-							if ($searchxml !== null and $searchxml->hasSub($nstag[1], $ns=$nstag[0])) {
-								$searchxml = $searchxml->sub($nstag[1], $ns=$nstag[0]);
+						foreach ($handler[0] as $nstag) {
+							if ($searchxml !== null and $searchxml->hasSub($nstag[1], $ns = $nstag[0])) {
+								$searchxml = $searchxml->sub($nstag[1], $ns = $nstag[0]);
 							} else {
 								$searchxml = null;
 								break;
@@ -106,23 +106,23 @@ 
 					}
 				}
 			}
-			foreach($this->idhandlers as $id => $handler) {
-				if(array_key_exists('id', $this->xmlobj[2]->attrs) and $this->xmlobj[2]->attrs['id'] == $id) {
+			foreach ($this->idhandlers as $id => $handler) {
+				if (array_key_exists('id', $this->xmlobj[2]->attrs) and $this->xmlobj[2]->attrs['id'] == $id) {
 					call_user_func($handler, $this->xmlobj[2]);
 					#id handlers are only used once
 					unset($this->idhandlers[$id]);
 					break;
 				}
 			}
-			if(is_array($this->xmlobj)) {
+			if (is_array($this->xmlobj)) {
 				$this->xmlobj = array_slice($this->xmlobj, 0, 1);
-				if(isset($this->xmlobj[0]) && $this->xmlobj[0] instanceof XMLStream_Object) {
+				if (isset($this->xmlobj[0]) && $this->xmlobj[0] instanceof XMLStream_Object) {
 					$this->xmlobj[0]->subs = null;
 				}
 			}
 			unset($this->xmlobj[2]);
 		}
-		if($this->xml_depth == 0) {
+		if ($this->xml_depth == 0) {
 			$this->event('streamEnd');
 		}
 	}
@@ -135,7 +135,7 @@ 
 	 * @param string   $data
 	 */
 	public function charXML($parser, $data) {
-		if(array_key_exists($this->xml_depth, $this->xmlobj)) {
+		if (array_key_exists($this->xml_depth, $this->xmlobj)) {
 			$this->xmlobj[$this->xml_depth]->data .= $data;
 		}
 	}
@@ -156,7 +156,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function useSSL($use=true) {
+	public function useSSL($use = true) {
 		$this->use_ssl = $use;
 	}
 
@@ -205,7 +205,7 @@ 
 		} else {
 			$ns_tags = array($xpath);
 		}
-		foreach($ns_tags as $ns_tag) {
+		foreach ($ns_tags as $ns_tag) {
 			list($l, $r) = explode("}", $ns_tag);
 			if ($r != null) {
 				$xpart = array(substr($l, 1), $r);
@@ -267,8 +267,8 @@ 
 	public function __construct($name, $ns = '', $attrs = array(), $data = '') {
 		$this->name = strtolower($name);
 		$this->ns   = $ns;
-		if(is_array($attrs) && count($attrs)) {
-			foreach($attrs as $key => $value) {
+		if (is_array($attrs) && count($attrs)) {
+			foreach ($attrs as $key => $value) {
 				$this->attrs[strtolower($key)] = $value;
 			}
 		}
@@ -282,7 +282,7 @@ 
 	 */
 	public function printObj($depth = 0) {
 		$s = str_repeat("\t", $depth) . $this->name . " " . $this->ns . ' ' . $this->data . "\n";
-		foreach($this->subs as $sub) {
+		foreach ($this->subs as $sub) {
 			$s .= $sub->printObj($depth + 1);
 		}
 		return $s;
@@ -295,14 +295,14 @@ 
 	 */
 	public function toString($str = '') {
 		$str .= "<{$this->name} xmlns='{$this->ns}' ";
-		foreach($this->attrs as $key => $value) {
-			if($key != 'xmlns') {
+		foreach ($this->attrs as $key => $value) {
+			if ($key != 'xmlns') {
 				$value = htmlspecialchars($value);
 				$str .= "$key='$value' ";
 			}
 		}
 		$str .= ">";
-		foreach($this->subs as $sub) {
+		foreach ($this->subs as $sub) {
 			$str .= $sub->toString();
 		}
 		$body = htmlspecialchars($this->data);
@@ -317,8 +317,8 @@ 
 	 * @return boolean
 	 */
 	public function hasSub($name, $ns = null) {
-		foreach($this->subs as $sub) {
-			if(($name == "*" or $sub->name == $name) and ($ns == null or $sub->ns == $ns)) return true;
+		foreach ($this->subs as $sub) {
+			if (($name == "*" or $sub->name == $name) and ($ns == null or $sub->ns == $ns)) return true;
 		}
 		return false;
 	}
@@ -332,8 +332,8 @@ 
 	 */
 	public function sub($name, $attrs = null, $ns = null) {
 		#TODO attrs is ignored
-		foreach($this->subs as $sub) {
-			if($sub->name == $name and ($ns == null or $sub->ns == $ns)) {
+		foreach ($this->subs as $sub) {
+			if ($sub->name == $name and ($ns == null or $sub->ns == $ns)) {
 				return $sub;
 			}
 		}

lib/WebSocketProtocolV0.php

Spacing +28 added lines, -28 removed lines

@@ -28,21 +28,21 @@ 
 			if (strlen($data) < 8) {
 				return 0; // not enough data yet;
 			}
-			$final_key = $this->_computeFinalKey($this->connection->server['HTTP_SEC_WEBSOCKET_KEY1'], $this->connection->server['HTTP_SEC_WEBSOCKET_KEY2'], $data) ;
+			$final_key = $this->_computeFinalKey($this->connection->server['HTTP_SEC_WEBSOCKET_KEY1'], $this->connection->server['HTTP_SEC_WEBSOCKET_KEY2'], $data);
 
 			if (!$final_key) {
 				return false;
 			}
 
             if (!isset($this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'])) {
-                $this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'] = '' ;
+                $this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'] = '';
             }
 
             $reply = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
                 . "Upgrade: WebSocket\r\n"
                 . "Connection: Upgrade\r\n"
                 . "Sec-WebSocket-Origin: " . $this->connection->server['HTTP_ORIGIN'] . "\r\n"
-                . "Sec-WebSocket-Location: ws://" . $this->connection->server['HTTP_HOST'] . $this->connection->server['REQUEST_URI'] . "\r\n" ;
+                . "Sec-WebSocket-Location: ws://" . $this->connection->server['HTTP_HOST'] . $this->connection->server['REQUEST_URI'] . "\r\n";
 			if ($this->connection->pool->config->expose->value) {
 				$reply .= 'X-Powered-By: phpDaemon/' . Daemon::$version . "\r\n";
 			}
@@ -53,7 +53,7 @@ 
             return $reply;
         }
 
-        return FALSE ;
+        return FALSE;
     }
 
 	/**
@@ -67,13 +67,13 @@ 
 	protected function _computeFinalKey($key1, $key2, $data) {
 		if (strlen($data) < 8)
 		{
-			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Invalid handshake data for client "' . $this->connection->addr . '"') ;
-			return FALSE ;
+			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Invalid handshake data for client "' . $this->connection->addr . '"');
+			return FALSE;
 		}
 
-		$bodyData = binarySubstr($data, 0, 8) ;
+		$bodyData = binarySubstr($data, 0, 8);
 			
-		return md5($this->_computeKey($key1) . $this->_computeKey($key2) . binarySubstr($data, 0, 8), TRUE) ;
+		return md5($this->_computeKey($key1) . $this->_computeKey($key2) . binarySubstr($data, 0, 8), TRUE);
 	}
 
 	/**
@@ -132,61 +132,61 @@ 
 				goto char;
 			};
 			
-			return chr(self::BINARY) . $len . $data ;
+			return chr(self::BINARY) . $len . $data;
 		}
 		// String
 		else
 		{
-			return chr(self::STRING) . $data . "\xFF" ;
+			return chr(self::STRING) . $data . "\xFF";
 		}
     }
 
     public function onRead() {
 		while ($this->connection && (($buflen = strlen($this->connection->buf)) >= 1)) {
-			$frametype = ord(binarySubstr($this->connection->buf, 0, 1)) ;
+			$frametype = ord(binarySubstr($this->connection->buf, 0, 1));
 			if (($frametype & 0x80) === 0x80) {
-				$len = 0 ;
-				$i = 0 ;
+				$len = 0;
+				$i = 0;
 
 				do {
 					$b = ord(binarySubstr($this->connection->buf, ++$i, 1));
-					$n = $b & 0x7F ;
-					$len *= 0x80 ;
-					$len += $n ;
-				} while ($b > 0x80) ;
+					$n = $b & 0x7F;
+					$len *= 0x80;
+					$len += $n;
+				} while ($b > 0x80);
 
 				if ($this->connection->pool->maxAllowedPacket <= $len) {
 					// Too big packet
 					$this->connection->finish();
-					return FALSE ;
+					return FALSE;
 				}
 
-				if ($buflen < $len + 2)	{
+				if ($buflen < $len + 2) {
 					// not enough data yet
-					return FALSE ;
+					return FALSE;
 				} 
 					
-				$decodedData = binarySubstr($this->connection->buf, 2, $len) ;
-				$this->connection->buf = binarySubstr($this->connection->buf, 2 + $len) ;
+				$decodedData = binarySubstr($this->connection->buf, 2, $len);
+				$this->connection->buf = binarySubstr($this->connection->buf, 2 + $len);
 				$this->connection->onFrame($decodedData, 'BINARY');
 			}
 			else {
 				if (($p = strpos($this->connection->buf, "\xFF")) !== FALSE) {
 					if ($this->connection->pool->maxAllowedPacket <= $p - 1) {
 						// Too big packet
-						$this->connection->finish() ;
-						return FALSE ;
+						$this->connection->finish();
+						return FALSE;
 					}
 						
-					$decodedData = binarySubstr($this->connection->buf, 1, $p - 1) ;
-					$this->connection->buf = binarySubstr($this->connection->buf, $p + 1) ;
+					$decodedData = binarySubstr($this->connection->buf, 1, $p - 1);
+					$this->connection->buf = binarySubstr($this->connection->buf, $p + 1);
 					$this->connection->onFrame($decodedData, 'STRING');
 				}
 				else {
 					if ($this->connection->pool->maxAllowedPacket <= $buflen - 1) {
 						// Too big packet
-						$this->connection->finish() ;
-						return FALSE ;
+						$this->connection->finish();
+						return FALSE;
 					}
 					// not enough data yet					
 					return;

lib/Daemon_ConfigParser.php

Spacing +17 added lines, -17 removed lines

@@ -37,7 +37,7 @@ 
 		$cfg->revision = ++Daemon_Config::$lastRevision;
 		$cfg->data = file_get_contents($file);
 		
-		if (substr($cfg->data,0,2) === '#!') 	{
+		if (substr($cfg->data, 0, 2) === '#!') {
 			if (!is_executable($file)) {
 				$this->raiseError('Shebang (#!) detected in the first line, but file hasn\'t +x mode.');
 				return;
@@ -58,7 +58,7 @@ 
 				$str = '';
 				++$cfg->p;
 
-				for (;$cfg->p < $cfg->len;++$cfg->p) {
+				for (;$cfg->p < $cfg->len; ++$cfg->p) {
 					$c = $cfg->getCurrentChar();
 
 					if ($c === $q) {
@@ -111,7 +111,7 @@ 
 							if ($c === "\n") {
 								$newLineDetected = $prePoint;
 							}
-							if ($elTypes[$i] !== NULL)	{
+							if ($elTypes[$i] !== NULL) {
 								++$i;
 								$elTypes[$i] = NULL;
 							}
@@ -120,14 +120,14 @@ 
 							($c === '"') 
 							|| ($c === '\'')
 						) {
-							if ($elTypes[$i] != NULL)	 {
+							if ($elTypes[$i] != NULL) {
 								$cfg->raiseError('Unexpected T_STRING.');
 							}
 
 							$string = call_user_func($cfg->tokens[Daemon_ConfigParser::T_STRING], $cfg, $c);
 							--$cfg->p;
 
-							if ($elTypes[$i] === NULL)	 {
+							if ($elTypes[$i] === NULL) {
 								$elements[$i] = $string;
 								$elTypes[$i] = Daemon_ConfigParser::T_STRING;
 							}
@@ -146,7 +146,7 @@ 
 							$tokenType = Daemon_ConfigParser::T_BLOCK;
 							break;
 						} else {
-							if ($elTypes[$i] === Daemon_ConfigParser::T_STRING)	 {
+							if ($elTypes[$i] === Daemon_ConfigParser::T_STRING) {
 								$cfg->raiseError('Unexpected T_CVALUE.');
 							} else {
 								if (!isset($elements[$i])) {
@@ -190,8 +190,8 @@ 
 						
 						if ($name === 'include') {
 							$path = $elements[1];
-							if (substr($path,0,1) !== '/') {
-								$path = 'conf/'.$path;
+							if (substr($path, 0, 1) !== '/') {
+								$path = 'conf/' . $path;
 							}
 							$files = glob($path);
 							if ($files) {
@@ -199,14 +199,14 @@ 
 									$parser = new Daemon_ConfigParser($fn, $scope, true);
 								}
 							}
-						} elseif (substr(strtolower($elements[0]),0,4) === 'mod-') { // @TODO: remove in 1.0
+						} elseif (substr(strtolower($elements[0]), 0, 4) === 'mod-') { // @TODO: remove in 1.0
 							$cfg->raiseError('Variable started with \'mod-\'. This style is deprecated. You should replace it with block.');
 						} else {
 							if (sizeof($elements) > 2) {
 								$cfg->raiseError('Too many arguments.');
 							}
 							if (isset($scope->{$name})) {
-								if ($scope->{$name}->source !== 'cmdline')	{
+								if ($scope->{$name}->source !== 'cmdline') {
 									if (!isset($elements[1])) {
 										$elements[1] = true;
 										$elTypes[1] = Daemon_ConfigParser::T_CVALUE;
@@ -233,7 +233,7 @@ 
 								$scope->{$name}->setValue($elements[1]);
 								$scope->{$name}->setValueType($elTypes[1]);
 							}
-							else {$cfg->raiseError('Unrecognized parameter \''.$name.'\'');}
+							else {$cfg->raiseError('Unrecognized parameter \'' . $name . '\''); }
 						}
 					}
 					elseif ($tokenType === Daemon_ConfigParser::T_BLOCK) {
@@ -251,7 +251,7 @@ 
 						);
 					}
 				} else {
-					$cfg->raiseError('Unexpected char \''.Debug::exportBytes($c).'\'');
+					$cfg->raiseError('Unexpected char \'' . Debug::exportBytes($c) . '\'');
 				}
 			}
 		);
@@ -261,7 +261,7 @@ 
 			$e = end($this->state);
 			$cfg->token($e[0], $c);
 		}
-		if (!$included) {$this->purgeScope($this->result);}
+		if (!$included) {$this->purgeScope($this->result); }
 	}
 	
 	/**
@@ -272,7 +272,7 @@ 
 		$cfg = $this;
 		foreach ($scope as $name => $obj) {
 			if ($obj instanceof Daemon_ConfigEntry) {
-					if ($obj->source === 'config' && ($obj->revision < $cfg->revision))	{
+					if ($obj->source === 'config' && ($obj->revision < $cfg->revision)) {
 						if (!$obj->resetToDefault()) {
 							unset($scope->{$name});
 						}
@@ -280,7 +280,7 @@ 
 			}
 			elseif ($obj instanceof Daemon_ConfigSection) {
 				
-				if ($obj->source === 'config' && ($obj->revision < $cfg->revision))	{
+				if ($obj->source === 'config' && ($obj->revision < $cfg->revision)) {
 					if (sizeof($obj) === 0) {
 						unset($scope->{$name});
 					}
@@ -316,10 +316,10 @@ 
 			$line = $this->line;
 		}
 		if ($col === null) {
-			$col = $this->col -1 ;
+			$col = $this->col - 1;
 		}
 
-		Daemon::log('[conf#' . $level . '][' . $this->file . ' L:' . $line . ' C: ' . $col . ']   '.$msg);
+		Daemon::log('[conf#' . $level . '][' . $this->file . ' L:' . $line . ' C: ' . $col . ']   ' . $msg);
 	}
 
 	/**

lib/HTTPRequest.php

Spacing +13 added lines, -13 removed lines

@@ -13,7 +13,7 @@ 
 	 * Status codes
 	 * @var array
 	 */
-	private static $codes = array (
+	private static $codes = array(
 		100 => 'Continue',
 		101 => 'Switching Protocols',
 		200 => 'OK',
@@ -242,7 +242,7 @@ 
 					$URLprefix = $this->attrs->server['REQUEST_PREPARED_UPLOADS_URL_PREFIX'];
 					$l = strlen($URLprefix);
 					foreach (array('PHP_SELF', 'REQUEST_URI', 'SCRIPT_NAME', 'DOCUMENT_URI') as $k) {
-						if (!isset($this->attrs->server[$k])) {continue;}
+						if (!isset($this->attrs->server[$k])) {continue; }
 						if (strncmp($this->attrs->server[$k], $URLprefix, $l) === 0) {
 							$this->attrs->server[$k] = substr($this->attrs->server[$k], $l - 1);
 						}
@@ -272,7 +272,7 @@ 
 					if ($this->oldFashionUploadFP) {
 						$file['fp'] = fopen($file['tmp_name'], 'c+');
 					} else {
-						FS::open($file['tmp_name'], 'c+', function ($fp) use (&$file) {
+						FS::open($file['tmp_name'], 'c+', function($fp) use (&$file) {
 							if (!$fp) {
 								return;
 							}
@@ -529,8 +529,8 @@ 
 		$this->header(
 			'Set-Cookie: ' . $name . '=' . rawurlencode($value)
 			. (empty($domain) ? '' : '; Domain=' . $domain)
-			. (empty($maxage) ? '' : '; Max-Age='.$maxage)
-			. (empty($path) ? '' : '; Path='.$path)
+			. (empty($maxage) ? '' : '; Max-Age=' . $maxage)
+			. (empty($path) ? '' : '; Path=' . $path)
 			. (!$secure ? '' : '; Secure')
 			. (!$HTTPOnly ? '' : '; HttpOnly'), false);
 	}
@@ -570,17 +570,17 @@ 
 			if (!isset($ctype['charset'])) {
 				$ctype['charset'] = $this->upstream->pool->config->defaultcharset->value;
 
-				$s = $e[0].': ';
+				$s = $e[0] . ': ';
 				$i = 0;
 				foreach ($ctype as $k => $v) {
-					$s .= ($i > 0 ? '; ' : '') . $k.  ($v !== '' ? '=' . $v : '');
+					$s .= ($i > 0 ? '; ' : '') . $k . ($v !== '' ? '=' . $v : '');
 					++$i;
 				}
 			}
 		}
 
 		if ($k === 'SET_COOKIE') {
-			$k .= '_'.++$this->cookieNum;
+			$k .= '_' . ++$this->cookieNum;
 		}
 		elseif (
 			!$replace
@@ -703,7 +703,7 @@ 
 									if (FS::$supported) {
 										$this->upstream->lockRead();
 									}
-									FS::open($this->attrs->files[$name]['tmp_name'], 'c+', function ($fp) use ($req, $name) {
+									FS::open($this->attrs->files[$name]['tmp_name'], 'c+', function($fp) use ($req, $name) {
 										if (!$fp) {
 											$req->attrs->files[$name]['error'] = UPLOAD_ERR_CANT_WRITE;
 										}
@@ -864,7 +864,7 @@ 
 	 * @param string The destination of the moved file.
 	 * @return boolean Success.
 	 */
-	public function moveUploadedFile($filename,$dest) {
+	public function moveUploadedFile($filename, $dest) {
 		if (!$this->isUploadedFile($filename)) {
 			return false;
 		}
@@ -880,7 +880,7 @@ 
 			return false;
 		}
 		FS::readfileChunked($this->attrs->server['REQUEST_BODY_FILE'],
-			function ($file, $success) {
+			function($file, $success) {
 				$this->attrs->stdin_done = true;
 				if ($this->sleepTime === 0) {
 					$this->wakeup();
@@ -902,7 +902,7 @@ 
 	public static function parse_str($s, &$var, $header = false) {
 		static $cb;
 		if ($cb === NULL) {
-			$cb = function ($m) {
+			$cb = function($m) {
 				return urlencode(html_entity_decode('&#' . hexdec($m[1]) . ';', ENT_NOQUOTES, 'utf-8'));
 			};
 		}
@@ -910,7 +910,7 @@ 
 			$s = strtr($s, HTTPRequest::$hvaltr);
 		}
 		if (
-			(stripos($s,'%u') !== false)
+			(stripos($s, '%u') !== false)
 			&& preg_match('~(%u[a-f\d]{4}|%[c-f][a-f\d](?!%[89a-f][a-f\d]))~is', $s, $m)
 		) {
 			$s = preg_replace_callback('~%(u[a-f\d]{4}|[a-f\d]{2})~i', $cb, $s);

lib/DNSClient.php

Spacing +7 added lines, -7 removed lines

@@ -7,7 +7,7 @@ 
  */
 class DNSClient extends NetworkClient {
 	public static $type = array(
- 		1 => 'A', 2 => 'NS',  3 => 'MD', 4 => 'MF', 5 => 'CNAME',
+ 		1 => 'A', 2 => 'NS', 3 => 'MD', 4 => 'MF', 5 => 'CNAME',
  		6 => 'SOA', 7 => 'MB', 8 => 'MG', 9 => 'MR', 10 => 'RR',
  		11 => 'WKS', 12 => 'PTR', 13 => 'HINFO', 14 => 'MINFO',
  		15 => 'MX', 16 => 'TXT', 17 => 'RP', 18 => 'AFSDB',
@@ -65,7 +65,7 @@ 
 			$this->preloading = new ComplexJob;
 		}
 		$job = $this->preloading;
-		$job->addJob('resolvfile', function ($jobname, $job) use ($pool) {
+		$job->addJob('resolvfile', function($jobname, $job) use ($pool) {
 			FS::readfile($pool->config->resolvfile->value, function($file, $data) use ($pool, $job, $jobname) {
 				if ($file) {
 					preg_match_all('~nameserver ([^\r\n;]+)~', $data, $m);
@@ -77,7 +77,7 @@ 
 				$job->setResult($jobname);
 			});
 		});
-		$job->addJob('hostsfile', function ($jobname, $job) use ($pool) {
+		$job->addJob('hostsfile', function($jobname, $job) use ($pool) {
 			FS::readfile($pool->config->hostsfile->value, function($file, $data) use ($pool, $job, $jobname) {
 				if ($file) {
 					preg_match_all('~^(\S+)\s+([^\r\n]+)\s*~m', $data, $m, PREG_SET_ORDER);
@@ -100,7 +100,7 @@ 
 	public function resolve($hostname, $cb, $noncache = false) {
 		if (!$this->preloading->hasCompleted()) {
 			$pool = $this;
-			$this->preloading->addListener(function ($job) use ($hostname, $cb, $noncache, $pool) {
+			$this->preloading->addListener(function($job) use ($hostname, $cb, $noncache, $pool) {
 				$pool->resolve($hostname, $cb, $noncache);
 			});
 			return;
@@ -123,7 +123,7 @@ 
 			$item->addListener($cb);
 		}
 		$pool = $this;
-		$this->get($hostname, function ($response) use ($cb, $noncache, $hostname, $pool) {
+		$this->get($hostname, function($response) use ($cb, $noncache, $hostname, $pool) {
 			if (!isset($response['A'])) {
 				if ($noncache) {
 					call_user_func($cb, false);
@@ -155,7 +155,7 @@ 
 	public function get($hostname, $cb, $noncache = false) {
 		if (!$this->preloading->hasCompleted()) {
 			$pool = $this;
-			$this->preloading->addListener(function ($job) use ($hostname, $cb, $noncache, $pool) {
+			$this->preloading->addListener(function($job) use ($hostname, $cb, $noncache, $pool) {
 				$pool->get($hostname, $cb, $noncache);
 			});
 			return;
@@ -178,7 +178,7 @@ 
 				call_user_func($cb, false);
 				return;
 			}
-			$q =	Binary::labels($hostname) .  // domain
+			$q = Binary::labels($hostname) . // domain
 					Binary::word($qtypeInt) . 
 					Binary::word($qclassInt);
 			$QD[] = $q;

lib/MySQLClient.php

Spacing +47 added lines, -47 removed lines

@@ -8,54 +8,54 @@
  */
 class MySQLClient extends NetworkClient {
 
-	const CLIENT_LONG_PASSWORD     = 1;       // new more secure passwords
-	const CLIENT_FOUND_ROWS        = 2;       // Found instead of affected rows
-	const CLIENT_LONG_FLAG         = 4;       // Get all column flags
-	const CLIENT_CONNECT_WITH_DB   = 8;       // One can specify db on connect
-	const CLIENT_NO_SCHEMA         = 16;      // Don't allow database.table.column
-	const CLIENT_COMPRESS          = 32;      // Can use compression protocol
-	const CLIENT_ODBC              = 64;      // Odbc client
-	const CLIENT_LOCAL_FILES       = 128;     // Can use LOAD DATA LOCAL
-	const CLIENT_IGNORE_SPACE      = 256;     // Ignore spaces before '('
-	const CLIENT_PROTOCOL_41       = 512;     // New 4.1 protocol
-	const CLIENT_INTERACTIVE       = 1024;    // This is an interactive client
-	const CLIENT_SSL               = 2048;    // Switch to SSL after handshake
-	const CLIENT_IGNORE_SIGPIPE    = 4096;    // IGNORE sigpipes
-	const CLIENT_TRANSACTIONS      = 8192;    // Client knows about transactions
-	const CLIENT_RESERVED          = 16384;   // Old flag for 4.1 protocol
-	const CLIENT_SECURE_CONNECTION = 32768;   // New 4.1 authentication
-	const CLIENT_MULTI_STATEMENTS  = 65536;   // Enable/disable multi-stmt support
-	const CLIENT_MULTI_RESULTS     = 131072;  // Enable/disable multi-results
+	const CLIENT_LONG_PASSWORD     = 1; // new more secure passwords
+	const CLIENT_FOUND_ROWS        = 2; // Found instead of affected rows
+	const CLIENT_LONG_FLAG         = 4; // Get all column flags
+	const CLIENT_CONNECT_WITH_DB   = 8; // One can specify db on connect
+	const CLIENT_NO_SCHEMA         = 16; // Don't allow database.table.column
+	const CLIENT_COMPRESS          = 32; // Can use compression protocol
+	const CLIENT_ODBC              = 64; // Odbc client
+	const CLIENT_LOCAL_FILES       = 128; // Can use LOAD DATA LOCAL
+	const CLIENT_IGNORE_SPACE      = 256; // Ignore spaces before '('
+	const CLIENT_PROTOCOL_41       = 512; // New 4.1 protocol
+	const CLIENT_INTERACTIVE       = 1024; // This is an interactive client
+	const CLIENT_SSL               = 2048; // Switch to SSL after handshake
+	const CLIENT_IGNORE_SIGPIPE    = 4096; // IGNORE sigpipes
+	const CLIENT_TRANSACTIONS      = 8192; // Client knows about transactions
+	const CLIENT_RESERVED          = 16384; // Old flag for 4.1 protocol
+	const CLIENT_SECURE_CONNECTION = 32768; // New 4.1 authentication
+	const CLIENT_MULTI_STATEMENTS  = 65536; // Enable/disable multi-stmt support
+	const CLIENT_MULTI_RESULTS     = 131072; // Enable/disable multi-results
 
-	const COM_SLEEP               = 0x00;  // (none, this is an internal thread state)
-	const COM_QUIT                = 0x01;  // mysql_close
-	const COM_INIT_DB             = 0x02;  // mysql_select_db
-	const COM_QUERY               = 0x03;  // mysql_real_query
-	const COM_FIELD_LIST          = 0x04;  // mysql_list_fields
-	const COM_CREATE_DB           = 0x05;  // mysql_create_db (deprecated)
-	const COM_DROP_DB             = 0x06;  // mysql_drop_db (deprecated)
-	const COM_REFRESH             = 0x07;  // mysql_refresh
-	const COM_SHUTDOWN            = 0x08;  // mysql_shutdown
-	const COM_STATISTICS          = 0x09;  // mysql_stat
-	const COM_PROCESS_INFO        = 0x0a;  // mysql_list_processes
-	const COM_CONNECT             = 0x0b;  // (none, this is an internal thread state)
-	const COM_PROCESS_KILL        = 0x0c;  // mysql_kill
-	const COM_DEBUG               = 0x0d;  // mysql_dump_debug_info
-	const COM_PING                = 0x0e;  // mysql_ping
-	const COM_TIME                = 0x0f;  // (none, this is an internal thread state)
-	const COM_DELAYED_INSERT      = 0x10;  // (none, this is an internal thread state)
-	const COM_CHANGE_USER         = 0x11;  // mysql_change_user
-	const COM_BINLOG_DUMP         = 0x12;  // sent by the slave IO thread to request a binlog
-	const COM_TABLE_DUMP          = 0x13;  // LOAD TABLE ... FROM MASTER (deprecated)
-	const COM_CONNECT_OUT         = 0x14;  // (none, this is an internal thread state)
-	const COM_REGISTER_SLAVE      = 0x15;  // sent by the slave to register with the master (optional)
-	const COM_STMT_PREPARE        = 0x16;  // mysql_stmt_prepare
-	const COM_STMT_EXECUTE        = 0x17;  // mysql_stmt_execute
-	const COM_STMT_SEND_LONG_DATA = 0x18;  // mysql_stmt_send_long_data
-	const COM_STMT_CLOSE          = 0x19;  // mysql_stmt_close
-	const COM_STMT_RESET          = 0x1a;  // mysql_stmt_reset
-	const COM_SET_OPTION          = 0x1b;  // mysql_set_server_option
-	const COM_STMT_FETCH          = 0x1c;  // mysql_stmt_fetch
+	const COM_SLEEP               = 0x00; // (none, this is an internal thread state)
+	const COM_QUIT                = 0x01; // mysql_close
+	const COM_INIT_DB             = 0x02; // mysql_select_db
+	const COM_QUERY               = 0x03; // mysql_real_query
+	const COM_FIELD_LIST          = 0x04; // mysql_list_fields
+	const COM_CREATE_DB           = 0x05; // mysql_create_db (deprecated)
+	const COM_DROP_DB             = 0x06; // mysql_drop_db (deprecated)
+	const COM_REFRESH             = 0x07; // mysql_refresh
+	const COM_SHUTDOWN            = 0x08; // mysql_shutdown
+	const COM_STATISTICS          = 0x09; // mysql_stat
+	const COM_PROCESS_INFO        = 0x0a; // mysql_list_processes
+	const COM_CONNECT             = 0x0b; // (none, this is an internal thread state)
+	const COM_PROCESS_KILL        = 0x0c; // mysql_kill
+	const COM_DEBUG               = 0x0d; // mysql_dump_debug_info
+	const COM_PING                = 0x0e; // mysql_ping
+	const COM_TIME                = 0x0f; // (none, this is an internal thread state)
+	const COM_DELAYED_INSERT      = 0x10; // (none, this is an internal thread state)
+	const COM_CHANGE_USER         = 0x11; // mysql_change_user
+	const COM_BINLOG_DUMP         = 0x12; // sent by the slave IO thread to request a binlog
+	const COM_TABLE_DUMP          = 0x13; // LOAD TABLE ... FROM MASTER (deprecated)
+	const COM_CONNECT_OUT         = 0x14; // (none, this is an internal thread state)
+	const COM_REGISTER_SLAVE      = 0x15; // sent by the slave to register with the master (optional)
+	const COM_STMT_PREPARE        = 0x16; // mysql_stmt_prepare
+	const COM_STMT_EXECUTE        = 0x17; // mysql_stmt_execute
+	const COM_STMT_SEND_LONG_DATA = 0x18; // mysql_stmt_send_long_data
+	const COM_STMT_CLOSE          = 0x19; // mysql_stmt_close
+	const COM_STMT_RESET          = 0x1a; // mysql_stmt_reset
+	const COM_SET_OPTION          = 0x1b; // mysql_set_server_option
+	const COM_STMT_FETCH          = 0x1c; // mysql_stmt_fetch
 
 	const FIELD_TYPE_DECIMAL      = 0x00;
 	const FIELD_TYPE_TINY         = 0x01;

app-servers/MongoNode.php

Spacing +5 added lines, -5 removed lines

@@ -47,8 +47,8 @@ 
 		if ($this->config->enable->value) {
 			$appInstance = $this;
 			
-			$this->LockClient->job(__CLASS__,TRUE,
-				function($command,$jobname,$client) use ($appInstance) {
+			$this->LockClient->job(__CLASS__, TRUE,
+				function($command, $jobname, $client) use ($appInstance) {
 					$appInstance->pushRequest(new MongoNode_ReplicationRequest($appInstance, $appInstance));
 				}
 			);
@@ -67,7 +67,7 @@ 
 
 		if (isset($o['_key'])) {
 			$this->cache->set($o['_key'], bson_encode($o));
-			$this->cache->set('_id.' . ((string)$o['_id']), $o['_key']);
+			$this->cache->set('_id.' . ((string) $o['_id']), $o['_key']);
 		}
 
 		if (isset($o['_ev'])) {
@@ -94,7 +94,7 @@ 
 			Daemon::log(__METHOD__ . '(' . json_encode($o) . ')');
 		}
 	      
-		$this->cache->get('_id.' . ((string)$o['_id']),
+		$this->cache->get('_id.' . ((string) $o['_id']),
 			function($m) use ($o) {
 				if (is_string($m->result)) {
 					$m->appInstance->delete($m->result);
@@ -184,7 +184,7 @@ 
 				$this->inited = TRUE;
 			    
 				$this->appInstance->cache->get('_rp',
-					function ($answer) use ($req) {
+					function($answer) use ($req) {
 						$req->inited = FALSE;
 						$e = explode(' ', $answer->result);
 					   

old-code-for-refactoring/AsteriskDriver.php

Spacing +9 added lines, -9 removed lines

@@ -263,10 +263,10 @@ 
 			return; // Not enough data buffered yet
 		}
 		elseif (strpos($this->buf, "\r\n\r\n") !== false) {
-			while(($line = $this->gets()) !== false) {
+			while (($line = $this->gets()) !== false) {
 				if ($line == "\r\n") {
 					$this->instate = AsteriskDriver::INPUT_STATE_END_OF_PACKET;
-					$packet =& $this->packets[$this->cnt];
+					$packet = & $this->packets[$this->cnt];
 					$this->cnt++;
 				} else {
 					$this->instate = AsteriskDriver::INPUT_STATE_PROCESSING;
@@ -274,7 +274,7 @@ 
 					$this->packets[$this->cnt][$header] = $value;
 				}
 
-				if ((int)$this->cstate === AsteriskDriver::CONN_STATE_AUTH) {
+				if ((int) $this->cstate === AsteriskDriver::CONN_STATE_AUTH) {
 					if ($this->instate == AsteriskDriver::INPUT_STATE_END_OF_PACKET) {
 						if ($packet['response'] == 'success') {
 							if (
@@ -317,7 +317,7 @@ 
 						}
 						// Response
 						elseif (isset($packet['actionid'])) {
-							$action_id =& $packet['actionid'];
+							$action_id = & $packet['actionid'];
 
 							if (isset($this->callbacks[$action_id])) {
 								if (isset($this->assertions[$action_id])) {
@@ -503,10 +503,10 @@ 
 	 */
 	public function setVar($channel, $variable, $value, $callback) {
 		$cmd = "Action: SetVar\r\n";
-		if($channel) {
+		if ($channel) {
 			$cmd .= "Channel: " . trim($channel) . "\r\n";
 		}
-		if(isset($variable, $value)) {
+		if (isset($variable, $value)) {
 			$cmd .= "Variable: " . trim($variable) . "\r\n";
 			$cmd .= "Value: " . trim($value) . "\r\n";
 			$this->command($cmd, $callback);
@@ -540,7 +540,7 @@ 
 	 */
 	public function status($callback, $channel = null) {
 		$cmd = "Action: Status\r\n";
-		if($channel !== null) {
+		if ($channel !== null) {
 			$cmd .= "Channel: " . trim($channel) . "\r\n";
 		}
 		$this->command($cmd, $callback, array('event' => 'statuscomplete'));
@@ -660,7 +660,7 @@ 
 		}
 
 		$action_id = $this->uniqid();
-		if(!is_callable($callback, true)) {
+		if (!is_callable($callback, true)) {
 			$callback = false;
 		}
 		$this->callbacks[$action_id] = $callback;
@@ -679,7 +679,7 @@ 
 	 */
 	protected function implodeParams(array $params) {
 		$s = '';
-		foreach($params as $header => $value) {
+		foreach ($params as $header => $value) {
 			$s .= trim($header) . ": " . trim($value) . "\r\n";
 		}
 		return $s;