kakserpom / phpdaemon

lib/BoundSocket.php

Spacing +4 added lines, -4 removed lines

@@ -69,10 +69,10 @@ 
 		}
 	}
 	
-	public function onListenerAcceptedEvent($listener, $fd, $addrPort, $ctx)  {
+	public function onListenerAcceptedEvent($listener, $fd, $addrPort, $ctx) {
 		$class = $this->pool->connectionClass;
 		$conn = new $class($fd, $this->pool);
-		$conn->addr = $addrPort[0].':'.$addrPort[1];
+		$conn->addr = $addrPort[0] . ':' . $addrPort[1];
 		$conn->host = $addrPort[0];
 		$conn->port = $addrPort[1];
 	}
@@ -179,12 +179,12 @@ 
 			return FALSE;
 		}
 
-		$e = explode ('/', $CIDR, 2);
+		$e = explode('/', $CIDR, 2);
 
 		if (!isset($e[1])) {
 			return $e[0] === $IP;
 		}
 
-		return (ip2long ($IP) & ~((1 << (32 - $e[1])) - 1)) === ip2long($e[0]);
+		return (ip2long($IP) & ~((1 << (32 - $e[1])) - 1)) === ip2long($e[0]);
 	}
 }

lib/XMPPClient.php

Spacing +32 added lines, -32 removed lines

@@ -72,8 +72,8 @@ 
 		$this->write($s);
 	}
 	public function startXMLStream() {
-		$this->sendXML('<?xml version="1.0"?>'.
-			'<stream:stream xmlns:stream="http://etherx.jabber.org/streams" version="1.0" xmlns="jabber:client" to="'.$this->host.'" xml:lang="en" xmlns:xml="http://www.w3.org/XML/1998/namespace">'
+		$this->sendXML('<?xml version="1.0"?>' .
+			'<stream:stream xmlns:stream="http://etherx.jabber.org/streams" version="1.0" xmlns="jabber:client" to="' . $this->host . '" xml:lang="en" xmlns:xml="http://www.w3.org/XML/1998/namespace">'
 		);
 	}
 	public function iqSet($xml, $cb) {
@@ -82,7 +82,7 @@ 
 		}
 		$id = $this->getId();
 		$this->xml->addIdHandler($id, $cb);
-		$this->sendXML('<iq xmlns="jabber:client" type="set" id="'.$id.'">'.$xml.'</iq>');
+		$this->sendXML('<iq xmlns="jabber:client" type="set" id="' . $id . '">' . $xml . '</iq>');
 		return true;
 	}
 
@@ -92,7 +92,7 @@ 
 		}
 		$id = $this->getId();
 		$this->xml->addIdHandler($id, $cb);
-		$this->sendXML('<iq xmlns="jabber:client" type="set" id="'.$id.'" to="'.htmlspecialchars($to).'">'.$xml.'</iq>');
+		$this->sendXML('<iq xmlns="jabber:client" type="set" id="' . $id . '" to="' . htmlspecialchars($to) . '">' . $xml . '</iq>');
 		return true;
 
 	}
@@ -103,7 +103,7 @@ 
 		}
 		$id = $this->getId();
 		$this->xml->addIdHandler($id, $cb);
-		$this->sendXML('<iq xmlns="jabber:client" type="get" id="'.$id.'">'.$xml.'</iq>');
+		$this->sendXML('<iq xmlns="jabber:client" type="get" id="' . $id . '">' . $xml . '</iq>');
 		return true;
 	}
 
@@ -113,7 +113,7 @@ 
 		}
 		$id = $this->getId();
 		$this->xml->addIdHandler($id, $cb);
-		$this->sendXML('<iq xmlns="jabber:client" type="get" id="'.$id.'" to="'.htmlspecialchars($to).'">'.$xml.'</iq>');
+		$this->sendXML('<iq xmlns="jabber:client" type="get" id="' . $id . '" to="' . htmlspecialchars($to) . '">' . $xml . '</iq>');
 		return true;
 
 	}
@@ -130,16 +130,16 @@ 
 	}
 
 	public function queryGet($ns, $cb) {
-		return $this->iqGet('<query xmlns="'.$ns.'" />', $cb);
+		return $this->iqGet('<query xmlns="' . $ns . '" />', $cb);
 	}
 
 
 	public function querySet($ns, $xml, $cb) {
-		return $this->iqSet('<query xmlns="'.$ns.'">'.$xml.'</query>', $cb);
+		return $this->iqSet('<query xmlns="' . $ns . '">' . $xml . '</query>', $cb);
 	}
 
 	public function querySetTo($to, $ns, $xml, $cb) {
-		return $this->iqSetTo($to, '<query xmlns="'.$ns.'">'.$xml.'</query>', $cb);
+		return $this->iqSetTo($to, '<query xmlns="' . $ns . '">' . $xml . '</query>', $cb);
 	}
 
 	public function createXMLStream() {
@@ -147,15 +147,15 @@ 
 		$this->xml->setDefaultNS('jabber:client');
 		$this->xml->conn = $this;
 		$conn = $this;
-		$this->xml->addXPathHandler('{http://etherx.jabber.org/streams}features', function ($xml) use ($conn) {
+		$this->xml->addXPathHandler('{http://etherx.jabber.org/streams}features', function($xml) use ($conn) {
 			if ($xml->hasSub('starttls') and $this->use_encryption) {
 				$conn->sendXML("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'><required /></starttls>");
 			} elseif ($xml->hasSub('bind') and $this->authorized) {
 				$id = $this->getId();
-				$this->iqSet('<bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><resource>'.$this->path.'</resource></bind>', function ($xml) use ($conn) {
-					if($xml->attrs['type'] == 'result') {
+				$this->iqSet('<bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><resource>' . $this->path . '</resource></bind>', function($xml) use ($conn) {
+					if ($xml->attrs['type'] == 'result') {
 						$conn->fulljid = $xml->sub('bind')->sub('jid')->data;
-						$jidarray = explode('/',$this->fulljid);
+						$jidarray = explode('/', $this->fulljid);
 						$conn->jid = $jidarray[0];
 					}
 					$conn->iqSet('<session xmlns="urn:ietf:params:xml:ns:xmpp-session" />', function($xml) use ($conn) {
@@ -176,13 +176,13 @@ 
 				}	
 			}
 		});
-		$this->xml->addXPathHandler('{urn:ietf:params:xml:ns:xmpp-sasl}success', function ($xml) {
+		$this->xml->addXPathHandler('{urn:ietf:params:xml:ns:xmpp-sasl}success', function($xml) {
 			$this->authorized = true;
 			$this->xml->finish();
 			$this->createXMLStream();
 			$this->startXMLStream();
 		});
-		$this->xml->addXPathHandler('{urn:ietf:params:xml:ns:xmpp-sasl}failure', function ($xml) {
+		$this->xml->addXPathHandler('{urn:ietf:params:xml:ns:xmpp-sasl}failure', function($xml) {
 			if ($this->onConnected) {
 				$this->connected = false;
 				call_user_func($this->onConnected, $this);
@@ -190,11 +190,11 @@ 
 			}
 			$this->finish();
 		});
-		$this->xml->addXPathHandler('{urn:ietf:params:xml:ns:xmpp-tls}proceed', function ($xml) {
+		$this->xml->addXPathHandler('{urn:ietf:params:xml:ns:xmpp-tls}proceed', function($xml) {
 			Daemon::log("XMPPClient: TLS not supported.");
 		});
 		$this->xml->addXPathHandler('{jabber:client}message', function($xml) {
-			if( isset($xml->attrs['type'])) {
+			if (isset($xml->attrs['type'])) {
 				$payload['type'] = $xml->attrs['type'];
 			} else {
 				$payload['type'] = 'chat';
@@ -242,11 +242,11 @@ 
 		$body	= htmlspecialchars($body);
 		$subject = htmlspecialchars($subject);
 		
-		$out = '<message from="'.$this->fulljid.'" to="'.$to.'" type="'.$type.'">';
-		if($subject) {
-			$out .= '<subject>'.$subject.'</subject>';
+		$out = '<message from="' . $this->fulljid . '" to="' . $to . '" type="' . $type . '">';
+		if ($subject) {
+			$out .= '<subject>' . $subject . '</subject>';
 		}
-		$out .= '<body>'.$body.'</body>';
+		$out .= '<body>' . $body . '</body>';
 		if ($payload) {
 			$out .= $payload;
 		}
@@ -262,19 +262,19 @@ 
 	 * @param string $show
 	 * @param string $to
 	 */
-	public function presence($status = null, $show = 'available', $to = null, $type='available', $priority = 0 ) {
-		if($type == 'available') $type = '';
-		$to	 = htmlspecialchars($to);
+	public function presence($status = null, $show = 'available', $to = null, $type = 'available', $priority = 0) {
+		if ($type == 'available') $type = '';
+		$to = htmlspecialchars($to);
 		$status = htmlspecialchars($status);
-		if($show == 'unavailable') $type = 'unavailable';
+		if ($show == 'unavailable') $type = 'unavailable';
 		
 		$out = "<presence";
-		$out .= ' from="'.$this->fulljid.'"';
+		$out .= ' from="' . $this->fulljid . '"';
 		if ($to) {
-			$out .= ' to="'.$to.'"';
+			$out .= ' to="' . $to . '"';
 		}
 		if ($type) {
-			$out .= ' type="'.$type.'"';
+			$out .= ' type="' . $type . '"';
 		}
 		$inner = '';
 		if ($show != 'available') {
@@ -297,7 +297,7 @@ 
 
 	public function getVCard($jid = null, $cb) {
 		$id = $this->getId();
-		$this->xml->addIdHandler($id, function ($xml) use ($cb) {
+		$this->xml->addIdHandler($id, function($xml) use ($cb) {
 			$vcard = array();
 			$vcardXML = $xml->sub('vcard');
 			foreach ($vcardXML->subs as $sub) {
@@ -313,10 +313,10 @@ 
 			$vcard['from'] = $xml->attrs['from'];
 			call_user_func($cb, $vcard);
 		});
-		if($jid) {
-			$this->send('<iq type="get" id="'.$id.'" to="'.$jid.'"><vCard xmlns="vcard-temp" /></iq>');
+		if ($jid) {
+			$this->send('<iq type="get" id="' . $id . '" to="' . $jid . '"><vCard xmlns="vcard-temp" /></iq>');
 		} else {
-			$this->send('<iq type="get" id="'.$id.'"><vCard xmlns="vcard-temp" /></iq>');
+			$this->send('<iq type="get" id="' . $id . '"><vCard xmlns="vcard-temp" /></iq>');
 		}
 	}
 

lib/Daemon_Config.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 	public $configfile     = '/etc/phpdaemon/phpd.conf;/etc/phpd/phpd.conf;./conf/phpd.conf';
 	public $path           = '/etc/phpdaemon/AppResolver.php;./conf/AppResolver.php';
 	public $appfilepath    = '{app-*,applications}/%s.php';
-	public $autoload   	 	= NULL;
+	public $autoload = NULL;
 			
 	// Master-related
 	public $mpmdelay        = '0.1s';
@@ -76,7 +76,7 @@ 
 		static $sizes = array('maxmemoryusage');
 		static $times = array('maxidle', 'autoreload', 'mpmdelay', 'eiosetmaxpolltime');
 		static $numbers = array(
-			'maxrequests', 'autogc','minworkers','maxworkers','minspareworkers','maxspareworkers','masterpriority', 'ipcthreadpriority',
+			'maxrequests', 'autogc', 'minworkers', 'maxworkers', 'minspareworkers', 'maxspareworkers', 'masterpriority', 'ipcthreadpriority',
 			'eiosetmaxidle', 'eiosetmaxparallel', 'eiosetmaxpollreqs', 'eiosetminparallel', 'verbose', 'verbosetty'
 		);
 
@@ -103,7 +103,7 @@ 
 	}
 
 	public function loadFile($path) {
-		$parser = new Daemon_ConfigParser($path,$this);
+		$parser = new Daemon_ConfigParser($path, $this);
 		$this->onLoad();
 		return !$parser->errorneus;
 	}
@@ -143,7 +143,7 @@ 
 		return isset($this->{$offset}) ? $this->{$offset}->value : NULL;
 	}
 	
-	public function offsetSet($offset,$value) {
+	public function offsetSet($offset, $value) {
 		$offset = $this->getRealOffsetName($offset);
 
 		$this->{$offset} = $value;

lib/Daemon_ConfigEntryTime.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 				return;
 			}
 
-			if (!empty($m[2]))  {
+			if (!empty($m[2])) {
 				$n = (float) $m[1];
 			} else {
 				$n = (int) $m[1];

lib/ComplexJob.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 	public function __construct($cb = null) {
 		$this->state = self::STATE_WAITING;
-		if($cb !== null) {
+		if ($cb !== null) {
 			$this->addListener($cb);
 		}
 	}

lib/WebSocketProtocolV13.php

Spacing +18 added lines, -18 removed lines

@@ -12,7 +12,7 @@ 
 	const BINARY = 0x2;
 	const CONNCLOSE = 0x8;
 	const PING = 0x9;
-	const PONG = 0xA ;
+	const PONG = 0xA;
 	public $opcodes;
 	public $outgoingCompression = 0;
 		
@@ -28,8 +28,8 @@ 
 		);
 	}
 
-	public function onHandshake(){
-        if (!isset($this->connection->server['HTTP_SEC_WEBSOCKET_KEY'])	|| !isset($this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'])) {
+	public function onHandshake() {
+        if (!isset($this->connection->server['HTTP_SEC_WEBSOCKET_KEY']) || !isset($this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'])) {
 			return false;
 		}
 		if ($this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'] != '13' && $this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'] != '8') {
@@ -52,12 +52,12 @@ 
 			}
             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 Switching Protocols\r\n"
                 . "Upgrade: WebSocket\r\n"
                 . "connection: Upgrade\r\n"
-                . "Date: ".date('r')."\r\n"
+                . "Date: " . date('r') . "\r\n"
                 . "Sec-WebSocket-Origin: " . $this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'] . "\r\n"
                 . "Sec-WebSocket-Location: ws://" . $this->connection->server['HTTP_HOST'] . $this->connection->server['REQUEST_URI'] . "\r\n"
                 . "Sec-WebSocket-Accept: " . base64_encode(sha1(trim($this->connection->server['HTTP_SEC_WEBSOCKET_KEY']) . "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", true)) . "\r\n";
@@ -71,7 +71,7 @@ 
 			}
 
             $reply .= "\r\n";
-            return $reply ;
+            return $reply;
         }
 
 		return false;
@@ -96,10 +96,10 @@ 
     }
 
 	protected function encodeFragment($data, $type, $fin = 1, $rsv1 = 0, $rsv2 = 0, $rsv3 = 0) {
-        $mask =	chr(rand(0, 0xFF)) .
+        $mask = chr(rand(0, 0xFF)) .
  						chr(rand(0, 0xFF)) . 
 						chr(rand(0, 0xFF)) . 
-						chr(rand(0, 0xFF)) ;
+						chr(rand(0, 0xFF));
 		$packet = chr(bindec($fin . $rsv1 . $rsv2 . $rsv3 . str_pad(decbin($this->getFrameType($type)), 4, '0', STR_PAD_LEFT)));
         $dataLength = strlen($data);
 		$isMasked = false;
@@ -110,31 +110,31 @@ 
         }
         elseif ($dataLength <= 65535)
         {
-            $packet .=	chr(126 + $isMaskedInt) . // 126 + 128
+            $packet .= chr(126 + $isMaskedInt) . // 126 + 128
             			chr($dataLength >> 8) .
             			chr($dataLength & 0xFF);
         }
         else {
-            $packet .=	chr(127 + $isMaskedInt) . // 127 + 128
+            $packet .= chr(127 + $isMaskedInt) . // 127 + 128
              			chr($dataLength >> 56) .
            				chr($dataLength >> 48) .
             			chr($dataLength >> 40) .
              			chr($dataLength >> 32) .
              			chr($dataLength >> 24) .
              			chr($dataLength >> 16) .
-               			chr($dataLength >>  8) .
+               			chr($dataLength >> 8) .
              			chr($dataLength & 0xFF);
         }
         if ($isMasked) { 
-        	$packet .=	$mask . $this->mask($data, $mask);
+        	$packet .= $mask . $this->mask($data, $mask);
 		} else {
  			$packet .= $data;
 		}
 		return $packet;
 	}
-	public function mask ($data, $mask) {
+	public function mask($data, $mask) {
    		for ($i = 0, $l = strlen($data), $ml = strlen($mask); $i < $l; $i++) {
-	     	$data[$i] = $data[$i] ^ $mask[$i % $ml] ;
+	     	$data[$i] = $data[$i] ^ $mask[$i % $ml];
 	     }
 		return $data;
 	}
@@ -153,7 +153,7 @@ 
 		$dec = 0;
 		$len = strlen($str);
 		
-		for($i = 0; $i < $len; ++$i) {
+		for ($i = 0; $i < $len; ++$i) {
 			$dec += ord(binarySubstr($str, $i, 1)) * pow(0x100, $len - $i - 1);
 		}
 		
@@ -172,7 +172,7 @@ 
 
 		if ($len === NULL) {
 			if (strlen($hexstr) % 2) {
-				$hexstr = "0".$hexstr;
+				$hexstr = "0" . $hexstr;
 			}
 		} else {
 			$hexstr = str_repeat('0', $len * 2 - strlen($hexstr)) . $hexstr;
@@ -181,7 +181,7 @@ 
 		$bytes = strlen($hexstr) / 2;
 		$bin = '';
 		
-		for($i = 0; $i < $bytes; ++$i) {
+		for ($i = 0; $i < $bytes; ++$i) {
 			$bin .= chr(hexdec(substr($hexstr, $i * 2, 2)));
 		}
 		
@@ -209,7 +209,7 @@ 
 			}
 			$opcodeName = $this->opcodes[$opcode];
 			$second = ord(binarySubstr($this->connection->buf, $p++, 1)); // second byte integer (masked, payload length)
-			$fin =	(bool) ($first >> 7);
+			$fin = (bool) ($first >> 7);
         	$isMasked   = (bool) ($second >> 7);
         	$dataLength = $second & 0x7f;
           	if ($dataLength === 0x7e) { // 2 bytes-length

lib/PostgreSQLClient.php

Spacing +23 added lines, -23 removed lines

@@ -27,25 +27,25 @@ 
 }
 
 class PostgreSQLClientConnection extends NetworkClientConnection {
-	public $url;                       // Connection's URL.
+	public $url; // Connection's URL.
 	public $protover      = '3.0';
 	public $maxPacketSize = 0x1000000; // Maximum packet size.
-	public $charsetNumber = 0x08;      // Charset number.
-	public $dbname        = '';        // Default database name.
-	public $user          = 'root';    // Username
-	public $password      = '';        // Password
-	public $options       = '';        // Default options
-	public $state        = 0;         // Connection's state. 0 - start,  1 - got initial packet,  2 - auth. packet sent,  3 - auth. error,  4 - handshaked OK
-	public $instate       = 0;         // State of pointer of incoming data. 0 - Result Set Header Packet,  1 - Field Packet,  2 - Row Packet
-	public $resultRows    = array();   // Resulting rows.
-	public $resultFields  = array();   // Resulting fields
-	public $onConnected   = array();   // Callback. Called when connection's handshaked.
-	public $context;                   // Property holds a reference to user's object.
-	public $insertId;                  // Equals with INSERT_ID().
-	public $insertNum;                 // Equals with INSERT_ID().
-	public $affectedRows;              // Number of affected rows.
+	public $charsetNumber = 0x08; // Charset number.
+	public $dbname        = ''; // Default database name.
+	public $user          = 'root'; // Username
+	public $password      = ''; // Password
+	public $options       = ''; // Default options
+	public $state = 0; // Connection's state. 0 - start,  1 - got initial packet,  2 - auth. packet sent,  3 - auth. error,  4 - handshaked OK
+	public $instate       = 0; // State of pointer of incoming data. 0 - Result Set Header Packet,  1 - Field Packet,  2 - Row Packet
+	public $resultRows    = array(); // Resulting rows.
+	public $resultFields  = array(); // Resulting fields
+	public $onConnected   = array(); // Callback. Called when connection's handshaked.
+	public $context; // Property holds a reference to user's object.
+	public $insertId; // Equals with INSERT_ID().
+	public $insertNum; // Equals with INSERT_ID().
+	public $affectedRows; // Number of affected rows.
 	public $ready         = FALSE;
-	public $parameters    = array();   // Runtime parameters from server
+	public $parameters    = array(); // Runtime parameters from server
 	public $backendKey;
 	const STATE_AUTH_ERROR = 3;
 	const STATE_AUTH_OK = 4;
@@ -108,7 +108,7 @@ 
 		$dec = 0;
 		$len = strlen($str);
 		
-		for($i = 0; $i < $len; ++$i) {
+		for ($i = 0; $i < $len; ++$i) {
 			$dec += ord(binarySubstr($str, $i, 1)) * pow(0x100, $len - $i - 1);
 		}
 		
@@ -127,7 +127,7 @@ 
 
 		if ($len === NULL) {
 			if (strlen($hexstr) % 2) {
-				$hexstr = "0".$hexstr;
+				$hexstr = "0" . $hexstr;
 			}
 		} else {
 			$hexstr = str_repeat('0', $len * 2 - strlen($hexstr)) . $hexstr;
@@ -136,7 +136,7 @@ 
 		$bytes = strlen($hexstr) / 2;
 		$bin = '';
 		
-		for($i = 0; $i < $bytes; ++$i) {
+		for ($i = 0; $i < $bytes; ++$i) {
 			$bin .= chr(hexdec(substr($hexstr, $i * 2, 2)));
 		}
 		
@@ -148,7 +148,7 @@ 
 	 * @param string Data
 	 * @return boolean Success
 	 */
-	public function sendPacket($type = '',  $packet) {
+	public function sendPacket($type = '', $packet) {
 		$header = $type . pack('N', strlen($packet) + 4); 
 
 		$this->write($header);
@@ -224,7 +224,7 @@ 
 		}
 		
 		$o = $p;
-		$p =+ 8;
+		$p = + 8;
 
 		return $this->bytes2int(binarySubstr($s, $o, 8));
 	}
@@ -402,7 +402,7 @@ 
 			}
 			elseif ($authType == 9) {
 				// GSS
-				Daemon::log(__CLASS__.': Unsupported authentication method: GSS.');
+				Daemon::log(__CLASS__ . ': Unsupported authentication method: GSS.');
 				$this->state = self::STATE_AUTH_ERROR; // Auth. error
 				$this->finish(); // Unsupported,  finish
 			}
@@ -550,7 +550,7 @@ 
 		elseif ($type === 'K') {
 			// Backend Key Data
 			list(, $this->backendKey) = unpack('N', $packet);
-			$this->backendKey = isset($u[1])?$u[1]:NULL;
+			$this->backendKey = isset($u[1]) ? $u[1] : NULL;
 	
 			if ($this->pool->config->protologging->value) {
 				Daemon::log(__CLASS__ . ': BackendKey is ' . $this->backendKey);

lib/IdentServer.php

Spacing +7 added lines, -7 removed lines

@@ -32,11 +32,11 @@ 
 	public function RPCall($method, $args) {
 		if ($method === 'registerPair') {
 			list ($local, $foreign, $user) = $args;
-			$this->pairs[$local . ':' .$foreign] = $user;
+			$this->pairs[$local . ':' . $foreign] = $user;
 		}
 		elseif ($method === 'unregisterPair') {
 			list ($local, $foreign) = $args;
-			unset($this->pairs[$local . ':' .$foreign]);
+			unset($this->pairs[$local . ':' . $foreign]);
 		}
 	}
 
@@ -48,8 +48,8 @@ 
 	}
 	public function findPair($local, $foreign) {
 		return
-			isset($this->pairs[$local . ':' .$foreign])
-		 	? $this->pairs[$local . ':' .$foreign]
+			isset($this->pairs[$local . ':' . $foreign])
+		 	? $this->pairs[$local . ':' . $foreign]
 		 	: false;
 	}
 }
@@ -71,17 +71,17 @@ 
 		while (($line = $this->gets()) !== false) {
 			$e = explode(',', str_replace("\x20", '', $line = trim($line)));
 			if ((sizeof($e) <> 2) || !ctype_digit($e[0]) || !ctype_digit($e[1])) {
-				$this->writeln($line. ' : ERROR : INVALID-PORT');
+				$this->writeln($line . ' : ERROR : INVALID-PORT');
 				$this->finish();
 				return;
 			}
 			$local = (int) $e[0];
 			$foreign = (int) $e[1];
 			if ($user = $this->pool->findPair($local, $foreign)) {
-				$this->writeln($line. ' : USERID : ' . $user);
+				$this->writeln($line . ' : USERID : ' . $user);
 
 			} else {
-				$this->writeln($line. ' : ERROR : NO-USER');	
+				$this->writeln($line . ' : ERROR : NO-USER');	
 			}
 		}
 	}

lib/File.php

Spacing +10 added lines, -10 removed lines

@@ -69,7 +69,7 @@ 
 		if ($this->stat) {
 			call_user_func($cb, $this, $this->stat);
 		} else {
-			eio_fstat($this->fd, $pri, function ($file, $stat) use ($cb) {
+			eio_fstat($this->fd, $pri, function($file, $stat) use ($cb) {
 				$stat = FS::statPrepare($stat);
 				$file->stat = $stat;
 				call_user_func($cb, $file, $stat);
@@ -88,7 +88,7 @@ 
 			call_user_func($cb, $this, FS::statPrepare(fstat($this->fd)));
 			return;
 		}
-		eio_fstat($this->fd, $pri, function ($file, $stat) use ($cb) {
+		eio_fstat($this->fd, $pri, function($file, $stat) use ($cb) {
 			$stat = FS::statPrepare($stat);
 			$file->stat = $stat;
 			call_user_func($cb, $file, $stat);
@@ -111,7 +111,7 @@ 
 		if ($this->statvfs) {
 			call_user_func($cb, $this, $this->statvfs);
 		} else {
-			eio_fstatvfs($this->fd, $pri, function ($file, $stat) use ($cb) {
+			eio_fstatvfs($this->fd, $pri, function($file, $stat) use ($cb) {
 				$file->statvfs = $stat;
 				call_user_func($cb, $file, $stat);
 			}, $this);		
@@ -229,7 +229,7 @@ 
 			$length,
 			$offset !== null ? $offset : $this->offset,
 			$pri,
-			$cb ? $cb: $this->onRead,
+			$cb ? $cb : $this->onRead,
 			$this
 		);
 		return true;
@@ -250,7 +250,7 @@ 
 		}
 		static $chunkSize = 1024;
 		$ret = true;
-		$handler = function ($file, $sent) use (&$ret, $outfd, $cb, &$handler, &$offset, &$length, $pri, $chunkSize) {
+		$handler = function($file, $sent) use (&$ret, $outfd, $cb, &$handler, &$offset, &$length, $pri, $chunkSize) {
 			if (!$ret) {
 				call_user_func($cb, $file, false);
 				return;
@@ -274,7 +274,7 @@ 
 			$handler($this, -1);
 			return;
 		}
-		$this->statRefresh(function ($file, $stat) use ($handler, &$length) {
+		$this->statRefresh(function($file, $stat) use ($handler, &$length) {
 			$length = $stat['size'];
 			$handler($file, -1);
 		}, $pri);
@@ -312,7 +312,7 @@ 
 			}
 			return false;
 		}
-		$this->statRefresh(function ($file, $stat) use ($cb, $pri) {
+		$this->statRefresh(function($file, $stat) use ($cb, $pri) {
 			if (!$stat) {
 				if ($cb) {
 					call_user_func($cb, $file, false);
@@ -322,7 +322,7 @@ 
 			$offset = 0;
 			$buf = '';
 			$size = $stat['size'];
-			$handler = function ($file, $data) use ($cb, &$handler, $size, &$offset, $pri, &$buf) {
+			$handler = function($file, $data) use ($cb, &$handler, $size, &$offset, $pri, &$buf) {
 				$buf .= $data;
 				$offset += strlen($data);
 				$len = min($file->chunkSize, $size - $offset);
@@ -345,14 +345,14 @@ 
 			}
 			return false;
 		}
-		$this->statRefresh(function ($file, $stat) use ($cb, $chunkcb, $pri) {
+		$this->statRefresh(function($file, $stat) use ($cb, $chunkcb, $pri) {
 			if (!$stat) {
 				call_user_func($cb, $file, false);
 				return;
 			}
 			$offset = 0;
 			$size = $stat['size'];
-			$handler = function ($file, $data) use ($cb, $chunkcb, &$handler, $size, &$offset, $pri) {
+			$handler = function($file, $data) use ($cb, $chunkcb, &$handler, $size, &$offset, $pri) {
 				call_user_func($chunkcb, $file, $data);
 				$offset += strlen($data);
 				$len = min($file->chunkSize, $size - $offset);