kakserpom / phpdaemon

lib/WebSocketServerConnection.php

Spacing +20 added lines, -20 removed lines

@@ -43,11 +43,11 @@ 
 
         if (!isset($this->protocol))
         {
-            Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client ' . $this->addr) ;
-            return FALSE ;
+            Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client ' . $this->addr);
+            return FALSE;
         }
 
-        $this->protocol->sendFrame($data, $type) ;
+        $this->protocol->sendFrame($data, $type);
         if ($cb) {
         	$this->onWriteOnce($cb);
         }
@@ -93,7 +93,7 @@ 
 	public function onHandshake() {
 		
 		$e = explode('/', $this->server['DOCUMENT_URI']);
-		$routeName = isset($e[1])?$e[1]:'';
+		$routeName = isset($e[1]) ? $e[1] : '';
 
 		if (!isset($this->pool->routes[$routeName])) {
 			if (Daemon::$config->logerrors->value) {
@@ -125,12 +125,12 @@ 
 		}
 
         if (!isset($this->protocol)) {
-            Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"') ;
-            return FALSE ;
+            Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"');
+            return FALSE;
         }
 
 		if ($this->protocol->onHandshake() === FALSE) {
-			return FALSE ;
+			return FALSE;
 		}		
 
 		return TRUE;
@@ -157,14 +157,14 @@ 
 	public function handshake($data) {
 
 		if (!$this->onHandshake()) {
-			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot handshake session for client "' . $this->addr . '"') ;
+			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot handshake session for client "' . $this->addr . '"');
 			$this->finish();
 			return false;
 		}
 
 		if (!isset($this->protocol)) {
-			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"') ;
-			$this->finish() ;
+			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"');
+			$this->finish();
 			return false;
 		}
 
@@ -176,17 +176,17 @@ 
 		}
 
 		if (!$handshake) {
-			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Handshake protocol failure for client "' . $this->addr . '"') ;
-			$this->finish() ;
-			return false ;
+			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Handshake protocol failure for client "' . $this->addr . '"');
+			$this->finish();
+			return false;
 		}
 		if ($this->write($handshake)) {
-			if (is_callable(array($this->upstream, 'onHandshake')))	{
+			if (is_callable(array($this->upstream, 'onHandshake'))) {
 				$this->upstream->onHandshake();
 			}
 		}
 		else {
-			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Handshake send failure for client "' . $this->addr . '"') ;
+			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Handshake send failure for client "' . $this->addr . '"');
 			$this->finish();
 			return false;
 		}
@@ -202,7 +202,7 @@ 
 
 	public function stdin($buf) {
 		$this->buf .= $buf;
-		if ($this->state === self::STATE_ROOT)	{
+		if ($this->state === self::STATE_ROOT) {
 			if (strpos($this->buf, "<policy-file-request/>\x00") !== false) {
 				$FP = FlashPolicyServer::getInstance();
 				if ($FP && $FP->policyData) {
@@ -246,14 +246,14 @@ 
 					// ----------------------------------------------------------
 					if (isset($this->server['HTTP_SEC_WEBSOCKET_VERSION'])) { // HYBI
 						if ($this->server['HTTP_SEC_WEBSOCKET_VERSION'] == '8') { // Version 8 (FF7, Chrome14)
-							$this->protocol = new WebSocketProtocolV13($this) ;
+							$this->protocol = new WebSocketProtocolV13($this);
 						}
 						elseif ($this->server['HTTP_SEC_WEBSOCKET_VERSION'] == '13') { // newest protocol
 							$this->protocol = new WebSocketProtocolV13($this);
 						}
 						else
 						{
-							Daemon::$process->log(get_class($this) . '::' . __METHOD__ . " : Websocket protocol version " . $this->server['HTTP_SEC_WEBSOCKET_VERSION'] . ' is not yet supported for client "' . $this->addr . '"') ;
+							Daemon::$process->log(get_class($this) . '::' . __METHOD__ . " : Websocket protocol version " . $this->server['HTTP_SEC_WEBSOCKET_VERSION'] . ' is not yet supported for client "' . $this->addr . '"');
 
 							$this->finish();
 							return;
@@ -263,7 +263,7 @@ 
 						$this->protocol = new WebSocketProtocolVE($this);
 					}
 					else {	// Defaulting to HIXIE (Safari5 and many non-browser clients...)
-						$this->protocol = new WebSocketProtocolV0($this) ;
+						$this->protocol = new WebSocketProtocolV0($this);
 					}
 					// ----------------------------------------------------------
 					// End of protocol discovery
@@ -283,7 +283,7 @@ 
 					$this->server['SCRIPT_NAME'] = $this->server['DOCUMENT_URI'] = isset($u['path']) ? $u['path'] : '/';
 					$this->server['SERVER_PROTOCOL'] = isset($e[2]) ? trim($e[2]) : '';
 
-					list($this->server['REMOTE_ADDR'],$this->server['REMOTE_PORT']) = explode(':', $this->addr);
+					list($this->server['REMOTE_ADDR'], $this->server['REMOTE_PORT']) = explode(':', $this->addr);
 				}
 				else
 				{

lib/LockClient.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
 	 */
 	public function job($name, $wait, $onRun, $onSuccess = NULL, $onFailure = NULL) {
 		$name = $this->prefix . $name;
-		$this->getConnectionByName($name, function ($conn) use ($name, $wait, $onRun, $onSuccess, $onFailure) {
+		$this->getConnectionByName($name, function($conn) use ($name, $wait, $onRun, $onSuccess, $onFailure) {
 			if (!$conn->connected) {
 				return;
 			}
@@ -50,7 +50,7 @@ 
 	 * @return void
 	 */
 	public function done($name) {
-		$this->getConnectionByName($name, function ($conn) use ($name) {
+		$this->getConnectionByName($name, function($conn) use ($name) {
 			if (!$conn->connected) {
 				return;
 			}
@@ -64,7 +64,7 @@ 
 	 * @return void
 	 */
 	public function failed($name) {
-		$this->getConnectionByName($name, function ($conn) use ($name) {
+		$this->getConnectionByName($name, function($conn) use ($name) {
 			if (!$conn->connected) {
 				return;
 			}
@@ -85,7 +85,7 @@ 
 			&& (($ep = strpos($name, ']')) !== FALSE) 
 			&& ($ep > $sp)
 		) {
-			$name = substr($name,$sp + 1, $ep - $sp - 1);
+			$name = substr($name, $sp + 1, $ep - $sp - 1);
 		}
 
 		srand(crc32($name));
@@ -124,7 +124,7 @@ 
 					call_user_func($this->pool->jobs[$e[1]][2], $e[0], $e[1], $this->pool);
 				}
 			}
-			if($this->pool->config->protologging->value) {
+			if ($this->pool->config->protologging->value) {
 				Daemon::log('Lock client <-- Lock server: ' . Debug::exportBytes(implode(' ', $e)) . "\n");
 			}
 		}

lib/IPCManager.php

Spacing +6 added lines, -6 removed lines

@@ -63,8 +63,8 @@ 
 		foreach ($instancesCount as $name => $num) {
 			$v = Daemon::$config->{$name}->limitinstances->value - $num;
 			foreach ($this->pool->workers as $worker) {
-					if ($v <= 0) {break;}
-					if ((isset($worker->instancesCount[$name])) && ($worker->instancesCount[$name] < $perWorker))	{
+					if ($v <= 0) {break; }
+					if ((isset($worker->instancesCount[$name])) && ($worker->instancesCount[$name] < $perWorker)) {
 						continue;
 					}
 					if (!isset($worker->instancesCount[$name])) {
@@ -248,11 +248,11 @@ 
 		if ($p['op'] === 'spawnInstance') {
 			$fullname = $p['appfullname'];
 			$fullname = str_replace('-', ':', $fullname);
-			if (strpos($fullname,':') === false) {
+			if (strpos($fullname, ':') === false) {
 				$fullname .= ':';
 			}
 			list($app, $name) = explode(':', $fullname, 2);
-			Daemon::$appResolver->appInstantiate($app,$name);
+			Daemon::$appResolver->appInstantiate($app, $name);
 		}
 		elseif ($p['op'] === 'importFile') {
 			if (!Daemon::$config->autoreimport->value) {
@@ -268,14 +268,14 @@ 
 					runkit_import($path, RUNKIT_IMPORT_FUNCTIONS | RUNKIT_IMPORT_CLASSES | RUNKIT_IMPORT_OVERRIDE);
 					//Daemon::log('--end runkit_import('.$path.')');
 				} else {
-					$this->appInstance->log('Cannot import \''.$path.'\': runkit_import is not callable.');
+					$this->appInstance->log('Cannot import \'' . $path . '\': runkit_import is not callable.');
 				}
 				
 				$event->finish();
 			}, 5);
 		}
 		elseif ($p['op'] === 'call') {
-			if (strpos($p['appfullname'],':') === false) {
+			if (strpos($p['appfullname'], ':') === false) {
 				$p['appfullname'] .= ':';
 			}
 			list($app, $name) = explode(':', $p['appfullname'], 2);

lib/IRC.php

Spacing +67 added lines, -67 removed lines

@@ -1,77 +1,77 @@
 <?php
 class IRC {
-	public static $codes = array (
-  		'1' => 'RPL_WELCOME',  2 => 'RPL_YOURHOST',
+	public static $codes = array(
+  		'1' => 'RPL_WELCOME', 2 => 'RPL_YOURHOST',
 		3 => 'RPL_CREATED', 4 => 'RPL_MYINFO',
 		5 => 'RPL_BOUNCE', 200 => 'RPL_TRACELINK',
-		201 => 'RPL_TRACECONNECTING',  202 => 'RPL_TRACEHANDSHAKE',
-		203 => 'RPL_TRACEUNKNOWN',  204 => 'RPL_TRACEOPERATOR',
-		205 => 'RPL_TRACEUSER',  206 => 'RPL_TRACESERVER',
-		207 => 'RPL_TRACESERVICE',  208 => 'RPL_TRACENEWTYPE',
-		209 => 'RPL_TRACECLASS',  210 => 'RPL_TRACERECONNECT',
-		211 => 'RPL_STATSLINKINFO',  212 => 'RPL_STATSCOMMANDS',
-		219 => 'RPL_ENDOFSTATS',  221 => 'RPL_UMODEIS',
-		234 => 'RPL_SERVLIST',  235 => 'RPL_SERVLISTEND',
-		242 => 'RPL_STATSUPTIME',  243 => 'RPL_STATSOLINE',
+		201 => 'RPL_TRACECONNECTING', 202 => 'RPL_TRACEHANDSHAKE',
+		203 => 'RPL_TRACEUNKNOWN', 204 => 'RPL_TRACEOPERATOR',
+		205 => 'RPL_TRACEUSER', 206 => 'RPL_TRACESERVER',
+		207 => 'RPL_TRACESERVICE', 208 => 'RPL_TRACENEWTYPE',
+		209 => 'RPL_TRACECLASS', 210 => 'RPL_TRACERECONNECT',
+		211 => 'RPL_STATSLINKINFO', 212 => 'RPL_STATSCOMMANDS',
+		219 => 'RPL_ENDOFSTATS', 221 => 'RPL_UMODEIS',
+		234 => 'RPL_SERVLIST', 235 => 'RPL_SERVLISTEND',
+		242 => 'RPL_STATSUPTIME', 243 => 'RPL_STATSOLINE',
 		250 => 'RPL_STATSCONN',
-		251 => 'RPL_LUSERCLIENT',  252 => 'RPL_LUSEROP',
-		253 => 'RPL_LUSERUNKNOWN',  254 => 'RPL_LUSERCHANNELS',
-		255 => 'RPL_LUSERME',  256 => 'RPL_ADMINME',
-		257 => 'RPL_ADMINLOC1',  258 => 'RPL_ADMINLOC2',
-		259 => 'RPL_ADMINEMAIL',  261 => 'RPL_TRACELOG',
-		262 => 'RPL_TRACEEND',  263 => 'RPL_TRYAGAIN',
+		251 => 'RPL_LUSERCLIENT', 252 => 'RPL_LUSEROP',
+		253 => 'RPL_LUSERUNKNOWN', 254 => 'RPL_LUSERCHANNELS',
+		255 => 'RPL_LUSERME', 256 => 'RPL_ADMINME',
+		257 => 'RPL_ADMINLOC1', 258 => 'RPL_ADMINLOC2',
+		259 => 'RPL_ADMINEMAIL', 261 => 'RPL_TRACELOG',
+		262 => 'RPL_TRACEEND', 263 => 'RPL_TRYAGAIN',
 		265 => 'RRPL_LOCALUSERS', 266 => 'RPL_GLOBALUSERS',
-		301 => 'RPL_AWAY',  302 => 'RPL_USERHOST',
-		303 => 'RPL_ISON',  305 => 'RPL_UNAWAY',
-		306 => 'RPL_NOWAWAY',  311 => 'RPL_WHOISUSER',
-		312 => 'RPL_WHOISSERVER',  313 => 'RPL_WHOISOPERATOR',
-  		314 => 'RPL_WHOWASUSER',  315 => 'RPL_ENDOFWHO',
-  		317 => 'RPL_WHOISIDLE',  318 => 'RPL_ENDOFWHOIS',
-  		319 => 'RPL_WHOISCHANNELS',  321 => 'RPL_LISTSTART',
-  		322 => 'RPL_LIST',  323 => 'RPL_LISTEND',
-  		324 => 'RPL_CHANNELMODEIS',  325 => 'RPL_UNIQOPIS',
+		301 => 'RPL_AWAY', 302 => 'RPL_USERHOST',
+		303 => 'RPL_ISON', 305 => 'RPL_UNAWAY',
+		306 => 'RPL_NOWAWAY', 311 => 'RPL_WHOISUSER',
+		312 => 'RPL_WHOISSERVER', 313 => 'RPL_WHOISOPERATOR',
+  		314 => 'RPL_WHOWASUSER', 315 => 'RPL_ENDOFWHO',
+  		317 => 'RPL_WHOISIDLE', 318 => 'RPL_ENDOFWHOIS',
+  		319 => 'RPL_WHOISCHANNELS', 321 => 'RPL_LISTSTART',
+  		322 => 'RPL_LIST', 323 => 'RPL_LISTEND',
+  		324 => 'RPL_CHANNELMODEIS', 325 => 'RPL_UNIQOPIS',
       328 => 'RPL_CHANNEL_URL', 329 => 'RPL_CREATIONTIME',
-  		331 => 'RPL_NOTOPIC',  332 => 'RPL_TOPIC',  333 => 'RPL_TOPIC_TS',
-  		341 => 'RPL_INVITING',  342 => 'RPL_SUMMONING',
-  		346 => 'RPL_INVITELIST',  347 => 'RPL_ENDOFINVITELIST',
-  		348 => 'RPL_EXCEPTLIST',  349 => 'RPL_ENDOFEXCEPTLIST',
-  		351 => 'RPL_VERSION',  352 => 'RPL_WHOREPLY',
-  		353 => 'RPL_NAMREPLY',  364 => 'RPL_LINKS',
-  		365 => 'RPL_ENDOFLINKS',  366 => 'RPL_ENDOFNAMES',
-  		367 => 'RPL_BANLIST',  368 => 'RPL_ENDOFBANLIST',
-  		369 => 'RPL_ENDOFWHOWAS',  371 => 'RPL_INFO',
-  		372 => 'RPL_MOTD',  374 => 'RPL_ENDOFINFO',
-  		375 => 'RPL_MOTDSTART',  376 => 'RPL_ENDOFMOTD',
-  		381 => 'RPL_YOUREOPER',  382 => 'RPL_REHASHING',
-  		383 => 'RPL_YOURESERVICE',  391 => 'RPL_TIME',
-  		392 => 'RPL_USERSSTART',  393 => 'RPL_USERS',
-  		394 => 'RPL_ENDOFUSERS',  395 => 'RPL_NOUSERS',
-  		401 => 'ERR_NOSUCHNICK',  402 => 'ERR_NOSUCHSERVER',
-  		403 => 'ERR_NOSUCHCHANNEL',  404 => 'ERR_CANNOTSENDTOCHAN',
-  		405 => 'ERR_TOOMANYCHANNELS',  406 => 'ERR_WASNOSUCHNICK',
-  		407 => 'ERR_TOOMANYTARGETS',  408 => 'ERR_NOSUCHSERVICE',
-  		409 => 'ERR_NOORIGIN',  411 => 'ERR_NORECIPIENT',
-  		412 => 'ERR_NOTEXTTOSEND',  413 => 'ERR_NOTOPLEVEL',
-  		414 => 'ERR_WILDTOPLEVEL',  415 => 'ERR_BADMASK',
-  		421 => 'ERR_UNKNOWNCOMMAND',  422 => 'ERR_NOMOTD',
-  		423 => 'ERR_NOADMININFO',  424 => 'ERR_FILEERROR',
-  		431 => 'ERR_NONICKNAMEGIVEN',  432 => 'ERR_ERRONEUSNICKNAME',
-  		433 => 'ERR_NICKNAMEINUSE',  436 => 'ERR_NICKCOLLISION',
-  		437 => 'ERR_UNAVAILRESOURCE',  441 => 'ERR_USERNOTINCHANNEL',
-  		442 => 'ERR_NOTONCHANNEL',  443 => 'ERR_USERONCHANNEL',
-  		444 => 'ERR_NOLOGIN',  445 => 'ERR_SUMMONDISABLED',
-  		446 => 'ERR_USERSDISABLED',  451 => 'ERR_NOTREGISTERED',
-  		461 => 'ERR_NEEDMOREPARAMS',  462 => 'ERR_ALREADYREGISTRED',
-		463 => 'ERR_NOPERMFORHOST',  		464 => 'ERR_PASSWDMISMATCH',
-  		465 => 'ERR_YOUREBANNEDCREEP',  		466 => 'ERR_YOUWILLBEBANNED',
-  		467 => 'ERR_KEYSET',  		471 => 'ERR_CHANNELISFULL',
-  		472 => 'ERR_UNKNOWNMODE',  		473 => 'ERR_INVITEONLYCHAN',
-  		474 => 'ERR_BANNEDFROMCHAN',  		475 => 'ERR_BADCHANNELKEY',
-  		476 => 'ERR_BADCHANMASK',  		477 => 'ERR_NOCHANMODES',
-  		478 => 'ERR_BANLISTFULL',  		481 => 'ERR_NOPRIVILEGES',
-  		482 => 'ERR_CHANOPRIVSNEEDED',  		483 => 'ERR_CANTKILLSERVER',
-  		484 => 'ERR_RESTRICTED',  		485 => 'ERR_UNIQOPPRIVSNEEDED',
-  		491 => 'ERR_NOOPERHOST',  		501 => 'ERR_UMODEUNKNOWNFLAG',
+  		331 => 'RPL_NOTOPIC', 332 => 'RPL_TOPIC', 333 => 'RPL_TOPIC_TS',
+  		341 => 'RPL_INVITING', 342 => 'RPL_SUMMONING',
+  		346 => 'RPL_INVITELIST', 347 => 'RPL_ENDOFINVITELIST',
+  		348 => 'RPL_EXCEPTLIST', 349 => 'RPL_ENDOFEXCEPTLIST',
+  		351 => 'RPL_VERSION', 352 => 'RPL_WHOREPLY',
+  		353 => 'RPL_NAMREPLY', 364 => 'RPL_LINKS',
+  		365 => 'RPL_ENDOFLINKS', 366 => 'RPL_ENDOFNAMES',
+  		367 => 'RPL_BANLIST', 368 => 'RPL_ENDOFBANLIST',
+  		369 => 'RPL_ENDOFWHOWAS', 371 => 'RPL_INFO',
+  		372 => 'RPL_MOTD', 374 => 'RPL_ENDOFINFO',
+  		375 => 'RPL_MOTDSTART', 376 => 'RPL_ENDOFMOTD',
+  		381 => 'RPL_YOUREOPER', 382 => 'RPL_REHASHING',
+  		383 => 'RPL_YOURESERVICE', 391 => 'RPL_TIME',
+  		392 => 'RPL_USERSSTART', 393 => 'RPL_USERS',
+  		394 => 'RPL_ENDOFUSERS', 395 => 'RPL_NOUSERS',
+  		401 => 'ERR_NOSUCHNICK', 402 => 'ERR_NOSUCHSERVER',
+  		403 => 'ERR_NOSUCHCHANNEL', 404 => 'ERR_CANNOTSENDTOCHAN',
+  		405 => 'ERR_TOOMANYCHANNELS', 406 => 'ERR_WASNOSUCHNICK',
+  		407 => 'ERR_TOOMANYTARGETS', 408 => 'ERR_NOSUCHSERVICE',
+  		409 => 'ERR_NOORIGIN', 411 => 'ERR_NORECIPIENT',
+  		412 => 'ERR_NOTEXTTOSEND', 413 => 'ERR_NOTOPLEVEL',
+  		414 => 'ERR_WILDTOPLEVEL', 415 => 'ERR_BADMASK',
+  		421 => 'ERR_UNKNOWNCOMMAND', 422 => 'ERR_NOMOTD',
+  		423 => 'ERR_NOADMININFO', 424 => 'ERR_FILEERROR',
+  		431 => 'ERR_NONICKNAMEGIVEN', 432 => 'ERR_ERRONEUSNICKNAME',
+  		433 => 'ERR_NICKNAMEINUSE', 436 => 'ERR_NICKCOLLISION',
+  		437 => 'ERR_UNAVAILRESOURCE', 441 => 'ERR_USERNOTINCHANNEL',
+  		442 => 'ERR_NOTONCHANNEL', 443 => 'ERR_USERONCHANNEL',
+  		444 => 'ERR_NOLOGIN', 445 => 'ERR_SUMMONDISABLED',
+  		446 => 'ERR_USERSDISABLED', 451 => 'ERR_NOTREGISTERED',
+  		461 => 'ERR_NEEDMOREPARAMS', 462 => 'ERR_ALREADYREGISTRED',
+		463 => 'ERR_NOPERMFORHOST', 464 => 'ERR_PASSWDMISMATCH',
+  		465 => 'ERR_YOUREBANNEDCREEP', 466 => 'ERR_YOUWILLBEBANNED',
+  		467 => 'ERR_KEYSET', 471 => 'ERR_CHANNELISFULL',
+  		472 => 'ERR_UNKNOWNMODE', 473 => 'ERR_INVITEONLYCHAN',
+  		474 => 'ERR_BANNEDFROMCHAN', 475 => 'ERR_BADCHANNELKEY',
+  		476 => 'ERR_BADCHANMASK', 477 => 'ERR_NOCHANMODES',
+  		478 => 'ERR_BANLISTFULL', 481 => 'ERR_NOPRIVILEGES',
+  		482 => 'ERR_CHANOPRIVSNEEDED', 483 => 'ERR_CANTKILLSERVER',
+  		484 => 'ERR_RESTRICTED', 485 => 'ERR_UNIQOPPRIVSNEEDED',
+  		491 => 'ERR_NOOPERHOST', 501 => 'ERR_UMODEUNKNOWNFLAG',
   		502 => 'ERR_USERSDONTMATCH',
 	);
   public static $codesFlip;

lib/IRCClient.php

Spacing +12 added lines, -12 removed lines

@@ -28,9 +28,9 @@ 
 }
 
 class IRCClientConnection extends NetworkClientConnection {
-	public $user 			= 'Guest';     // Username
-	public $password 		= '';         // Password
-	public $EOL				= "\r\n";
+	public $user = 'Guest'; // Username
+	public $password = ''; // Password
+	public $EOL = "\r\n";
 	public $nick;
 	public $realname;
 	public $eventHandlers = array();
@@ -49,13 +49,13 @@ 
 	 */
 	public function onReady() {
 		if ($this->pool->identd) {
-			$this->pool->identd->registerPair($this->locPort, $this->port, 'UNIX : '.$this->user);
+			$this->pool->identd->registerPair($this->locPort, $this->port, 'UNIX : ' . $this->user);
 		}
 		list($this->nick, $this->realname) = explode('/', $this->path . '/John Doe');
 		$this->command('USER', $this->user, 0, '*', $this->realname);
 		$this->command('NICK', $this->nick);
 		if (strlen($this->password)) {
-			$this->message('NickServ', 'IDENTIFY '.$this->password);
+			$this->message('NickServ', 'IDENTIFY ' . $this->password);
 		}
 	}
 
@@ -76,7 +76,7 @@ 
 		}
 		$this->writeln($line);
 		if ($this->pool->protologging) {
-			Daemon::log('->->->-> '.$line);
+			Daemon::log('->->->-> ' . $line);
 		}
 	}
 
@@ -99,7 +99,7 @@ 
 		}
 		$this->writeln($line);
 		if ($this->pool->protologging && !in_array($cmd, array('PONG'))) {
-			Daemon::log('->->->-> '.$line);
+			Daemon::log('->->->-> ' . $line);
 		}
 	}
 
@@ -131,7 +131,7 @@ 
 
 	public function ping() {
 		$this->lastPingTS = microtime(true);
-		$this->writeln('PING :'.$this->servername);
+		$this->writeln('PING :' . $this->servername);
 	}
 
 	public function message($to, $msg) {
@@ -215,7 +215,7 @@ 
 			return;
 		}
 		elseif ($cmd === 'RPL_ENDOFMOTD') {
-			$this->motd .= "\r\n";// . $args[1];
+			$this->motd .= "\r\n"; // . $args[1];
 			$this->event('motd', $this->motd);
 			return;
 		}
@@ -339,7 +339,7 @@ 
 			}
 		}
 		elseif ($cmd === 'PING') {
-			$this->writeln(isset($args[0]) ? 'PONG :'.$args[0] : 'PONG');
+			$this->writeln(isset($args[0]) ? 'PONG :' . $args[0] : 'PONG');
 		}
 		elseif ($cmd === 'PONG') {
 			if ($this->lastPingTS) {
@@ -349,7 +349,7 @@ 
 			return;
 		}
 		if ($this->pool->protologging) {
-			Daemon::$process->log('<-<-<-< '.$cmd.': '.json_encode($args). ' ('.json_encode($from['orig']).') (' . json_encode($this->lastLine) . ')');
+			Daemon::$process->log('<-<-<-< ' . $cmd . ': ' . json_encode($args) . ' (' . json_encode($from['orig']) . ') (' . json_encode($this->lastLine) . ')');
 		}
 	}
 
@@ -626,7 +626,7 @@ 
 		$this->channel->detach($this);
 	}
 	public function chanMessage($msg) {
-		$this->channel->message($this->nick.': '.$msg);
+		$this->channel->message($this->nick . ': ' . $msg);
 	}
 }
 

lib/BoundTCPSocket.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
    					return;
    				}
    			}
-			$conn->addr = $host.':'.$port;
+			$conn->addr = $host . ':' . $port;
 			$conn->host = $host;
 			$conn->port = $port;
 			$conn->parentSocket = $socket;

lib/AppResolver.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 	
 		foreach (Daemon::$config as $fullname => $section) {
 		
-			if (!$section instanceof Daemon_ConfigSection)	{
+			if (!$section instanceof Daemon_ConfigSection) {
 				continue;
 			}
 			if (isset($section->limitinstances)) {
@@ -29,7 +29,7 @@ 
 					||
 					(!isset($section->enable) && !isset($section->disable))
 			) {
-				if (strpos($fullname,':') === false) {
+				if (strpos($fullname, ':') === false) {
 					$fullname .= ':';
 				}
 				list($appName, $instance) = explode(':', $fullname, 2);
@@ -121,7 +121,7 @@ 
 		else {
 			$appName = $defaultApp;
 		}
-		if (strpos($appName,'-') === false) {
+		if (strpos($appName, '-') === false) {
 			$appName .= '-';
 		}
 		list($app, $instance) = explode('-', $appName, 2);

lib/AsyncStream.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 		return $r;
 	}
 	
-	public function initStream($readFD = NULL,$writeFD = NULL) {
+	public function initStream($readFD = NULL, $writeFD = NULL) {
 		if (is_string($readFD)) {
 			$u = parse_url($url = $readFD);
 		
@@ -104,7 +104,7 @@ 
 		}
 	
 		if ($readFD !== NULL) {
-			$this->setFD($readFD,$writeFD);
+			$this->setFD($readFD, $writeFD);
 		}
 
 		return $readFD !== FALSE;
@@ -170,7 +170,7 @@ 
 		}
 
 		if (!is_resource($this->writeFD)) {
-			throw new BadStreamDescriptorException('wrong writeFD',1);
+			throw new BadStreamDescriptorException('wrong writeFD', 1);
 		}
 
 		if ($this->writeBuf === NULL) {

lib/Binary.php

Spacing +33 added lines, -33 removed lines

@@ -24,7 +24,7 @@ 
 			}
 
      		$p = substr($data, 1, $l);
-     		$domain .= $p.(($l !== 0)?'.':'');
+     		$domain .= $p . (($l !== 0) ? '.' : '');
      		$data = substr($data, $l + 1);
        		if ($l === 0) {
      			break;
@@ -40,7 +40,7 @@ 
 		return $l . $string;
 	}
 	public static function LVnull($string) {
-		return self::LV($string."\x00",2,TRUE);
+		return self::LV($string . "\x00", 2, TRUE);
 	}
 	public static function byte($int) {
 		return chr($int);
@@ -55,7 +55,7 @@ 
 	}
 
 	public static function dword($int) {
-		return self::i2b(4,$int);
+		return self::i2b(4, $int);
 	}
 
 	public static function dwordl($int) {
@@ -83,8 +83,8 @@ 
 	}
 	
 	public static function getWord(&$p, $l = false) {
-		$r = self::bytes2int(binarySubstr($p,0,2),!!$l);
-		$p = binarySubstr($p,2);
+		$r = self::bytes2int(binarySubstr($p, 0, 2), !!$l);
+		$p = binarySubstr($p, 2);
 		return intval($r);
 	}
 
@@ -97,17 +97,17 @@ 
 		return $r;
 	}
 
-	public static function getDWord(&$p,$l = false) {
-		$r = self::bytes2int(binarySubstr($p,0,4),!!$l);
-		$p = binarySubstr($p,4);
+	public static function getDWord(&$p, $l = false) {
+		$r = self::bytes2int(binarySubstr($p, 0, 4), !!$l);
+		$p = binarySubstr($p, 4);
 		return intval($r);
 	}
 	public static function getQword(&$p, $l = false) {
-		$r = self::bytes2int(binarySubstr($p,0,8),!!$l);
-		$p = binarySubstr($p,8);
+		$r = self::bytes2int(binarySubstr($p, 0, 8), !!$l);
+		$p = binarySubstr($p, 8);
 		return intval($r);
 	}
-	public static function getStrQWord(&$p,$l = false) {
+	public static function getStrQWord(&$p, $l = false) {
 		$r = binarySubstr($p, 0, 8);
 		if ($l) {
 			$r = strrev($r);
@@ -116,31 +116,31 @@ 
 		return $r;
 	}
 	public static function getString(&$str) {
-		$p = strpos($str,"\x00");
+		$p = strpos($str, "\x00");
 		if ($p === FALSE) {
 			return '';
 		}
- 		$r = substr($str,0,$p);
- 		$str = substr($str, $p+1);
+ 		$r = substr($str, 0, $p);
+ 		$str = substr($str, $p + 1);
  		return $r;
 	}
 	public static function getLV(&$p, $l = 1, $nul = false, $lrev = false) {
- 		$s = self::b2i(binarySubstr($p,0,$l),!!$lrev);
+ 		$s = self::b2i(binarySubstr($p, 0, $l), !!$lrev);
  		//Daemon::log('s = '.$s. ' -- '.Debug::exportBytes(binarySubstr($p,0,$l), true));
- 		$p = binarySubstr($p,$l);
+ 		$p = binarySubstr($p, $l);
 		if ($s == 0) {
 			return '';
 		}
 		$r = '';
  		if (strlen($p) < $s) {
- 			echo("getLV error: buf length (".strlen($p)."): ".Debug::exportBytes($p).", must be >= string length (".$s.")\n");
+ 			echo("getLV error: buf length (" . strlen($p) . "): " . Debug::exportBytes($p) . ", must be >= string length (" . $s . ")\n");
  		}
  		elseif ($nul) {
-  			if ($p{$s-1} != "\x00") {
-  				echo("getLV error: Wrong end of NUL-string (".Debug::exportBytes($p{$s-1})."), len ".$s."\n");
+  			if ($p{$s - 1} != "\x00") {
+  				echo("getLV error: Wrong end of NUL-string (" . Debug::exportBytes($p{$s - 1}) . "), len " . $s . "\n");
   			}
   			else {
-  				$d = $s-1;
+  				$d = $s - 1;
   				if ($d < 0) {
   					$d = 0;
   				}
@@ -155,30 +155,30 @@ 
  		return $r;
 	}
 
-	public static function int2bytes($len,$int = 1) {
+	public static function int2bytes($len, $int = 1) {
  		$hexstr = dechex($int);
  		if ($len === NULL) {
  			if (strlen($hexstr) % 2) {
- 				$hexstr = "0".$hexstr;
+ 				$hexstr = "0" . $hexstr;
  			}
  		}
  		else {
  			$hexstr = str_repeat('0', $len * 2 - strlen($hexstr)) . $hexstr;
  		}
- 		$bytes = strlen($hexstr)/2;
+ 		$bytes = strlen($hexstr) / 2;
  		$bin = '';
- 		for($i = 0; $i < $bytes; ++$i) {
- 			$bin .= chr(hexdec(binarySubstr($hexstr,$i*2,2)));
+ 		for ($i = 0; $i < $bytes; ++$i) {
+ 			$bin .= chr(hexdec(binarySubstr($hexstr, $i * 2, 2)));
  		}
  		return $bin;
 	}
 	
 	public static function flags2bitarray($flags, $len = 4) {
 		$ret = 0;
-		foreach($flags as $v) {
+		foreach ($flags as $v) {
 			$ret |= $v;
 		}
-		return self::i2b($len,$ret);
+		return self::i2b($len, $ret);
 	}
 	public static function i2b($bytes, $val = 0) {
 		return self::int2bytes($bytes, $val);
@@ -190,8 +190,8 @@ 
  		}
  		$dec = 0;
  		$len = strlen($str);
- 		for($i = 0; $i < $len; ++$i) {
- 			$dec += ord(binarySubstr($str,$i,1))*pow(256,$len-$i-1);
+ 		for ($i = 0; $i < $len; ++$i) {
+ 			$dec += ord(binarySubstr($str, $i, 1)) * pow(256, $len - $i - 1);
  		}
  		return $dec;
 	}
@@ -202,9 +202,9 @@ 
 
 	public static function bitmap2bytes($bitmap, $check_len = 0) {
  		$r = '';
- 		$bitmap = str_pad($bitmap,ceil(strlen($bitmap)/8)*8,'0',STR_PAD_LEFT);
- 		for ($i = 0, $n = strlen($bitmap)/8; $i < $n; ++$i) {
-  			$r .= chr((int) bindec(binarySubstr($bitmap,$i*8,8)));
+ 		$bitmap = str_pad($bitmap, ceil(strlen($bitmap) / 8) * 8, '0', STR_PAD_LEFT);
+ 		for ($i = 0, $n = strlen($bitmap) / 8; $i < $n; ++$i) {
+  			$r .= chr((int) bindec(binarySubstr($bitmap, $i * 8, 8)));
  		}
  		if ($check_len && (strlen($r) != $check_len)) {
  			echo "Warning! Bitmap incorrect.\n";
@@ -212,6 +212,6 @@ 
  		return $r;
 	}
 	public static function getbitmap($byte) {
- 		return sprintf('%08b',$byte);
+ 		return sprintf('%08b', $byte);
 	}
 }