kakserpom / phpdaemon

lib/Daemon_IPCThread.php

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function prepareSystemEnv() {
 		proc_nice(Daemon::$config->ipcthreadpriority->value);
-		register_shutdown_function(array($this,'shutdown'));
+		register_shutdown_function(array($this, 'shutdown'));
 		
 		$this->setproctitle(
 			Daemon::$runName . ': IPC process'
@@ -168,7 +168,7 @@ 
 		$error = error_get_last(); 
 		if ($error) {
 			if ($error['type'] === E_ERROR) {
-				$this->log('crashed by error \''.$error['message'].'\' at '.$error['file'].':'.$error['line']);
+				$this->log('crashed by error \'' . $error['message'] . '\' at ' . $error['file'] . ':' . $error['line']);
 			}
 
 		}

lib/MongoClientAsyncCollection.php

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
             'function () { '
                 . 'return db.autoincrement.findAndModify({ '
                 . 'query: {"_id":"' . $this->name . '"}, update: {$inc:{"id":1}}, new: true, upsert: true }); }',
-            function ($res) use ($cb) {
+            function($res) use ($cb) {
                 call_user_func($cb, $res);
             },
             $key

lib/AsyncProcess.php

Spacing +11 added lines, -11 removed lines

@@ -41,21 +41,21 @@ 
 	public $outputErrors = false;
 
 	// @todo make methods setUser and setGroup, variables change to $user and $group with null values
-	public $setUser;                               // optinal SUID.
-	public $setGroup;                              // optional SGID.
+	public $setUser; // optinal SUID.
+	public $setGroup; // optional SGID.
 
 	// @todo the same, make a method setChroot
-	public $chroot = '/';                          // optional chroot.
+	public $chroot = '/'; // optional chroot.
 
-	public $env = array();                         // hash of environment's variables
+	public $env = array(); // hash of environment's variables
 
 	// @todo setCwd
-	public $cwd;                                   // optional chdir
-	public $errlogfile = '/tmp/cgi-errorlog.log';  // path to error logfile
-	public $args;                                  // array of arguments
+	public $cwd; // optional chdir
+	public $errlogfile = '/tmp/cgi-errorlog.log'; // path to error logfile
+	public $args; // array of arguments
 
 	// @todo setNice
-	public $nice;                                  // optional priority
+	public $nice; // optional priority
  
 	/**
 	 * AsyncProcess constructor
@@ -140,7 +140,7 @@ 
 				&& isset($this->setGroup) 
 				&& ($this->setUser !== $this->setGroup)
 			) {
-				$this->cmd = 'sudo -g ' . escapeshellarg($this->setGroup). '  -u ' . escapeshellarg($this->setUser) . ' ' . $this->cmd;
+				$this->cmd = 'sudo -g ' . escapeshellarg($this->setGroup) . '  -u ' . escapeshellarg($this->setUser) . ' ' . $this->cmd;
 			} else {
 				$this->cmd = 'su ' . escapeshellarg($this->setGroup) . ' -c ' . escapeshellarg($this->cmd);
 			}
@@ -155,8 +155,8 @@ 
 		}
 
 		$pipesDescr = array(
-			0 => array('pipe', 'r'),  // stdin is a pipe that the child will read from
-			1 => array('pipe', 'w'),  // stdout is a pipe that the child will write to
+			0 => array('pipe', 'r'), // stdin is a pipe that the child will read from
+			1 => array('pipe', 'w'), // stdout is a pipe that the child will write to
 		);
 
 		if (

lib/WebSocketProtocolVE.php

Spacing +19 added lines, -19 removed lines

@@ -99,11 +99,11 @@ 
                 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";
         }
     }
 
@@ -111,31 +111,31 @@ 
 		while ($this->connection && (($buflen = strlen($this->connection->buf)) >= 2)) {
 			$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 ;
+                    $this->connection->finish();
+                    return FALSE;
                 }
 
                 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, $frametype);
             }
@@ -143,12 +143,12 @@ 
             	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, $frametype);
                     
                 }
@@ -156,8 +156,8 @@ 
                     if ($this->connection->pool->maxAllowedPacket <= strlen($this->connection->buf))
                     {
                         // Too big packet
-                        $this->connection->finish() ;
-                        return FALSE ;
+                        $this->connection->finish();
+                        return FALSE;
                     }
                 }
             }

lib/NetworkClientConnection.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 	public $busy = false;
 	public $timeout = 60;
 	
-	public $onResponse;  // stack of onResponse callbacks
+	public $onResponse; // stack of onResponse callbacks
 	
 	public $alive = true;
 

lib/ConnectionPool.php

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
  */
 class ConnectionPool extends ObjectStorage {
 
-	public $allowedClients  = null;
+	public $allowedClients = null;
 	public $connectionClass;
 	public $name;
 	public $config;
@@ -103,7 +103,7 @@ 
 			if (isset(self::$instances[$key])) {
 				return self::$instances[$key];
 			}
-			$k = 'Pool:' . $class . ($arg !== '' ? ':' . $arg : '' );
+			$k = 'Pool:' . $class . ($arg !== '' ? ':' . $arg : '');
 			
 			$config = (isset(Daemon::$config->{$k}) && Daemon::$config->{$k} instanceof Daemon_ConfigSection) ? Daemon::$config->{$k}: new Daemon_ConfigSection;			
 			$obj = self::$instances[$key] = new $class($config);
@@ -129,16 +129,16 @@ 
 			$k = strtolower(str_replace('-', '', $k));
 
 			if (!isset($this->config->{$k})) {
-			  if (is_scalar($v))	{
+			  if (is_scalar($v)) {
 					$this->config->{$k} = new Daemon_ConfigEntry($v);
 				} else {
 					$this->config->{$k} = $v;
 				}
 			} elseif ($v instanceof Daemon_ConfigSection) {
 			// @todo
-			}	else {
+			} else {
 				$current = $this->config->{$k};
-			  if (is_scalar($v))	{
+			  if (is_scalar($v)) {
 					$this->config->{$k} = new Daemon_ConfigEntry($v);
 				} else {
 					$this->config->{$k} = $v;
@@ -266,10 +266,10 @@ 
 					$socket->setDefaultPort($this->config->port->value);
 				}
 			} else {
-				if (stripos($addr,'tcp://') === 0) {
+				if (stripos($addr, 'tcp://') === 0) {
 					$addr = substr($addr, 6);
 				}
-				elseif (stripos($addr,'tcp:') === 0) {
+				elseif (stripos($addr, 'tcp:') === 0) {
 					$addr = substr($addr, 4);
 				}
 				$socket = new BoundTCPSocket($addr, $reuse);

lib/Daemon.php

Spacing +11 added lines, -11 removed lines

@@ -12,7 +12,7 @@ 
 	const SUPPORT_RUNKIT_SANDBOX         = 0;	
 	const SUPPORT_RUNKIT_MODIFY          = 1;
 	const SUPPORT_RUNKIT_INTERNAL_MODIFY = 2;
-	const SUPPORT_RUNKIT_IMPORT 		 = 3;
+	const SUPPORT_RUNKIT_IMPORT = 3;
 	const WSTATE_IDLE = 1;
 	const WSTATE_BUSY = 2;
 	const WSTATE_SHUTDOWN = 3;
@@ -79,7 +79,7 @@ 
 		Daemon::$reusePort = 1 === preg_match("~BSD~i", php_uname('s'));
 		
 		if (Daemon::$reusePort && !defined("SO_REUSEPORT"))
-		    define("SO_REUSEPORT", 0x200);	// FIXME: this is a BSD-only hack
+		    define("SO_REUSEPORT", 0x200); // FIXME: this is a BSD-only hack
 	}
 
 	public static function loadModuleIfAbsent($mod) {
@@ -132,9 +132,9 @@ 
 
 	public static function uncaughtExceptionHandler(Exception $e) {
 		$msg = $e->getMessage();
-		Daemon::log('Uncaught '.get_class($e).' (' . $e->getCode() . ')' . (strlen($msg) ? ': ' . $msg : ''). ".\n" . $e->getTraceAsString());
+		Daemon::log('Uncaught ' . get_class($e) . ' (' . $e->getCode() . ')' . (strlen($msg) ? ': ' . $msg : '') . ".\n" . $e->getTraceAsString());
 		if (Daemon::$req) {
-			Daemon::$req->out('<b>Uncaught '.get_class($e).' (' . $e->getCode() . ')</b>' . (strlen($msg) ? ': ' . $msg : ''). '.<br />');
+			Daemon::$req->out('<b>Uncaught ' . get_class($e) . ' (' . $e->getCode() . ')</b>' . (strlen($msg) ? ': ' . $msg : '') . '.<br />');
 		}
 	}
 
@@ -164,9 +164,9 @@ 
 			E_USER_DEPRECATED => 'Deprecated (userland)',
 		);
 		$errtype = $errtypes[$errno];
-		Daemon::log($errtype . ': '.$errstr.' in ' . $errfile . ':' . $errline . "\n" . Debug::backtrace());
+		Daemon::log($errtype . ': ' . $errstr . ' in ' . $errfile . ':' . $errline . "\n" . Debug::backtrace());
 		if (Daemon::$req) {
-			Daemon::$req->out('<strong>' . $errtype . '</strong>: ' . $errstr . ' in ' . basename($errfile) . ':' . $errline.'<br />');
+			Daemon::$req->out('<strong>' . $errtype . '</strong>: ' . $errstr . ' in ' . basename($errfile) . ':' . $errline . '<br />');
 		}
 	}
 
@@ -290,7 +290,7 @@ 
 		$req->attrs->cookie = $_REQUEST;
 		$req->attrs->server = $_SERVER;
 		$req->attrs->files = $_FILES;
-		$req->attrs->session = isset($_SESSION)?$_SESSION:NULL;
+		$req->attrs->session = isset($_SESSION) ? $_SESSION : NULL;
 		$req->attrs->connId = 1;
 		$req->attrs->trole = 'RESPONDER';
 		$req->attrs->flags = 0;
@@ -317,7 +317,7 @@ 
 		$apaths = explode(';', $paths);
 		$found = false;
 
-		foreach($apaths as $path) {
+		foreach ($apaths as $path) {
 			if (is_file($p = realpath($path))) {
 				$found = true;
 
@@ -355,7 +355,7 @@ 
 				chown(Daemon::$config->logstorage->value, Daemon::$config->user->value); // @TODO: rewrite to async I/O
 			}
 			if ((Daemon::$process instanceof Daemon_WorkerThread) && FS::$supported) {
-				FS::open(Daemon::$config->logstorage->value, 'a!', function ($file) {
+				FS::open(Daemon::$config->logstorage->value, 'a!', function($file) {
 					Daemon::$logpointerAsync = $file;
 					if (!$file) {
 						return;
@@ -463,7 +463,7 @@ 
 		if (is_resource(STDERR)) {
 			fwrite(STDERR, '[PHPD] ' . $msg . "\n");
 		}
-		$msg = '[' . date('D, j M Y H:i:s', $mt[1]) . '.' . sprintf('%06d', $mt[0]*1000000) . ' ' . date('O') . '] ' . $msg . "\n";
+		$msg = '[' . date('D, j M Y H:i:s', $mt[1]) . '.' . sprintf('%06d', $mt[0] * 1000000) . ' ' . date('O') . '] ' . $msg . "\n";
 		if (Daemon::$logpointerAsync) {
 			Daemon::$logpointerAsync->write($msg);
 		} elseif (Daemon::$logpointer) {
@@ -547,7 +547,7 @@ 
 	public static function date_period_text($date_start, $date_finish) {
 		$result = Daemon::date_period($date_start, $date_finish);
 
-		$str  = '';
+		$str = '';
 
 		if ($result[5] > 0) {
 			$str .= $result[5] . ' year. ';

lib/Daemon_ConfigEntryConfigFile.php

Spacing +2 added lines, -2 removed lines

@@ -15,12 +15,12 @@
 		if (Daemon::$process instanceof Daemon_MasterThread) {
 			if (Daemon::$config->autoreload->value > 0) {
 				if ($old) {
-					$e = explode(';',$old);
+					$e = explode(';', $old);
 					foreach ($e as $path) {
 						Daemon::$process->fileWatcher->rmWatch($path);
 					}
 				}
-				$e = explode(';',$this->value);
+				$e = explode(';', $this->value);
 				foreach ($e as $path) {
 					Daemon::$process->fileWatcher->addWatch($path, array(Daemon::$process, 'sighup'));
 				}

lib/IRCBouncer.php

Spacing +13 added lines, -13 removed lines

@@ -57,11 +57,11 @@ 
 
 	public function getConnection($url) {
 		$pool = $this;
-		$this->client->getConnection($url, function ($conn) use ($pool, $url) {
+		$this->client->getConnection($url, function($conn) use ($pool, $url) {
 			$pool->conn = $conn;
 			$conn->attachedClients = new ObjectStorage;
 			if ($conn->connected) {
-				Daemon::log('IRC bot connected at '.$url);
+				Daemon::log('IRC bot connected at ' . $url);
 				$conn->join($pool->config->defaultchannels->value);
 				$conn->bind('motd', function($conn) {
 					//Daemon::log($conn->motd);
@@ -84,7 +84,7 @@ 
 					$conn->attachedClients->each('commandArr', $from['orig'], $cmd, $args);
 				});
 				$conn->bind('privateMsg', function($conn, $msg) {
-					Daemon::log('IRCBouncer: got private message \''.$msg['body'].'\' from \''.$msg['from']['orig'].'\'');
+					Daemon::log('IRCBouncer: got private message \'' . $msg['body'] . '\' from \'' . $msg['from']['orig'] . '\'');
 				});
 				$conn->bind('msg', function($conn, $msg) use ($pool) {
 					$msg['ts'] = microtime(true);
@@ -101,7 +101,7 @@ 
 				});
 			}
 			else {
-				Daemon::log('IRCBouncer: unable to connect ('.$url.')');
+				Daemon::log('IRCBouncer: unable to connect (' . $url . ')');
 			}
 		});
 	}
@@ -171,7 +171,7 @@ 
 
 	public function ping() {
 		$this->lastPingTS = microtime(true);
-		$this->writeln('PING :'.$this->usermask);
+		$this->writeln('PING :' . $this->usermask);
 		Timer::setTimeout($this->keepaliveTimer);
 	}
 
@@ -192,7 +192,7 @@ 
 		}
 		$this->writeln($line);
 		if ($this->pool->protologging && !in_array($cmd, array('PONG'))) {
-			Daemon::log('=>=>=>=> '.json_encode($line));
+			Daemon::log('=>=>=>=> ' . json_encode($line));
 		}
 	}
 
@@ -201,7 +201,7 @@ 
 			$from = $this->pool->config->servername->value;
 		}
 		if (is_string($args)) {
-			Daemon::log(get_class($this).'->commandArr: args is string');
+			Daemon::log(get_class($this) . '->commandArr: args is string');
 			return;
 		}
 		$cmd = IRC::getCodeByCommand($cmd);
@@ -216,7 +216,7 @@ 
 		}
 		$this->writeln($line);
 		if ($this->pool->protologging && !in_array($cmd, array('PONG'))) {
-			Daemon::log('=>=>=>=> '.json_encode($line));
+			Daemon::log('=>=>=>=> ' . json_encode($line));
 		}
 	}
 
@@ -234,7 +234,7 @@ 
 		} else {
 			return;
 		}
-		$this->msgFromBNC('Attached to '.$this->attachedServer->url);
+		$this->msgFromBNC('Attached to ' . $this->attachedServer->url);
 		$this->usermask = $this->attachedServer->nick . '!' . $this->attachedServer->user . '@' . $this->pool->config->servername->value;
 		$this->command(null, 'RPL_WELCOME', $this->attachedServer->nick, 'Welcome to phpDaemon bouncer -- ' . $this->pool->config->servername->value);
 		foreach ($this->attachedServer->channels as $chan) {
@@ -306,7 +306,7 @@ 
 					}
 
 				} else {
-					$this->msgFromBNC('Unknown command: '.$msg);
+					$this->msgFromBNC('Unknown command: ' . $msg);
 				}
 				return;
 			}
@@ -322,7 +322,7 @@ 
 			$this->attachedServer->commandArr($cmd, $args);
 		}
 		if ($this->protologging) {
-			Daemon::$process->log('<=<=<=< '.$cmd.': '.json_encode($args));
+			Daemon::$process->log('<=<=<=< ' . $cmd . ': ' . json_encode($args));
 		}
 	}
 
@@ -330,7 +330,7 @@ 
 		if ($this->usermask === null) {
 			return;
 		}
-		$this->command('$!@' . $this->pool->config->servername->value, 'PRIVMSG' , $this->usermask, $msg);
+		$this->command('$!@' . $this->pool->config->servername->value, 'PRIVMSG', $this->usermask, $msg);
 	}
 
 	/**
@@ -368,7 +368,7 @@ 
 
 			if (ctype_digit($cmd)) {
 				$code = (int) $cmd;
-				$cmd = isset(IRC::$codes[$code]) ? IRC::$codes[$code] : 'UNKNOWN-'.$code;
+				$cmd = isset(IRC::$codes[$code]) ? IRC::$codes[$code] : 'UNKNOWN-' . $code;
 			}
 			$this->onCommand($cmd, $args);
 		}