kakserpom / phpdaemon

lib/XMPPRoster.php

Spacing +13 added lines, -13 removed lines

@@ -10,7 +10,7 @@ 
 	public function __construct($xmpp) {
 		$this->xmpp = $xmpp;
 
-		$this->xmpp->xml->addXPathHandler('{jabber:client}presence', function ($xml) {
+		$this->xmpp->xml->addXPathHandler('{jabber:client}presence', function($xml) {
 			$payload = array();
 			$payload['type'] = (isset($xml->attrs['type'])) ? $xml->attrs['type'] : 'available';
 			$payload['show'] = (isset($xml->sub('show')->data)) ? $xml->sub('show')->data : $payload['type'];
@@ -25,13 +25,13 @@ 
 				$this->setPresence($payload['from'], $payload['priority'], $payload['show'], $payload['status']);
 			}
 			//Daemon::log("Presence: {$payload['from']} [{$payload['show']}] {$payload['status']}");
-			if(array_key_exists('type', $xml->attrs) and $xml->attrs['type'] == 'subscribe') {
-				if($this->auto_subscribe) {
+			if (array_key_exists('type', $xml->attrs) and $xml->attrs['type'] == 'subscribe') {
+				if ($this->auto_subscribe) {
 					$this->xmpp->sendXML("<presence type='subscribed' to='{$xml->attrs['from']}' from='{$this->xmpp->fulljid}' />");
 					$this->xmpp->sendXML("<presence type='subscribe' to='{$xml->attrs['from']}' from='{$this->xmpp->fulljid}' />");
 				}
 				$this->event('subscription_requested', $payload);
-			} elseif(array_key_exists('type', $xml->attrs) and $xml->attrs['type'] == 'subscribed') {
+			} elseif (array_key_exists('type', $xml->attrs) and $xml->attrs['type'] == 'subscribed') {
 				$this->event('subscription_accepted', $payload);
 			} else {
 				$this->event('presence', $payload);
@@ -46,20 +46,20 @@ 
 	}
 
 	public function setSubscription($jid, $type, $cb = null) {
-		$this->rosterSet('<item jid="'.htmlspecialchars($jid).'" subscription="'.htmlspecialchars($type).'" />', $cb);
+		$this->rosterSet('<item jid="' . htmlspecialchars($jid) . '" subscription="' . htmlspecialchars($type) . '" />', $cb);
 	} 
 	public function fetch($cb = null) {
-		$this->xmpp->queryGet($this->ns, function ($xml) use ($cb) {
+		$this->xmpp->queryGet($this->ns, function($xml) use ($cb) {
 			$status = "result";
 			$xmlroster = $xml->sub('query');
 			$contacts = array();
-			foreach($xmlroster->subs as $item) {
+			foreach ($xmlroster->subs as $item) {
 				$groups = array();
 				if ($item->name == 'item') {
 					$jid = $item->attrs['jid']; //REQUIRED
 					$name = isset($item->attrs['name']) ? $item->attrs['name'] : ''; //MAY
 					$subscription = $item->attrs['subscription'];
-					foreach($item->subs as $subitem) {
+					foreach ($item->subs as $subitem) {
 						if ($subitem->name == 'group') {
 							$groups[] = $subitem->data;
 						}
@@ -70,12 +70,12 @@ 
 				}
 			}
 			if ($status == "result") { //No errors, add contacts
-				foreach($contacts as $contact) {
+				foreach ($contacts as $contact) {
 					$this->_addContact($contact[0], $contact[1], $contact[2], $contact[3]);
 				}
 			}
 			if ($xml->attrs['type'] == 'set') {
-				$this->xmpp->sendXML('<iq type="reply" id="'.$xml->attrs['id'].'" to="'.$xml->attrs['from'].'" />');
+				$this->xmpp->sendXML('<iq type="reply" id="' . $xml->attrs['id'] . '" to="' . $xml->attrs['from'] . '" />');
 			}
 			if ($cb) {
 				call_user_func($cb, $status);
@@ -109,7 +109,7 @@ 
 	 * @param string $name
 	 * @param array $groups
 	 */
-	public function _addContact($jid, $subscription, $name='', $groups=array()) {
+	public function _addContact($jid, $subscription, $name = '', $groups = array()) {
 		$contact = array('jid' => $jid, 'subscription' => $subscription, 'name' => $name, 'groups' => $groups);
 		if ($this->isContact($jid)) {
 			$this->roster_array[$jid]['contact'] = $contact;
@@ -170,9 +170,9 @@ 
 	public function getPresence($jid) {
 		$split = split("/", $jid);
 		$jid = $split[0];
-		if($this->isContact($jid)) {
+		if ($this->isContact($jid)) {
 			$current = array('resource' => '', 'active' => '', 'priority' => -129, 'show' => '', 'status' => ''); //Priorities can only be -128 = 127
-			foreach($this->roster_array[$jid]['presence'] as $resource => $presence) {
+			foreach ($this->roster_array[$jid]['presence'] as $resource => $presence) {
 				//Highest available priority or just highest priority
 				if ($presence['priority'] > $current['priority'] and (($presence['show'] == "chat" or $presence['show'] == "available") or ($current['show'] != "chat" or $current['show'] != "available"))) {
 					$current = $presence;

lib/Daemon_WorkerThread.php

Spacing +6 added lines, -6 removed lines

@@ -68,7 +68,7 @@ 
 		$this->prepareSystemEnv();
 		$this->overrideNativeFuncs();
 
-		$this->setState(Daemon::WSTATE_INIT);;
+		$this->setState(Daemon::WSTATE_INIT); ;
 		$this->dnsBase = new EventDnsBase($this->eventBase, true); 
 		$this->registerEventSignals();
 
@@ -106,7 +106,7 @@ 
 			Daemon::callAutoGC();
 
 			$event->timeout();
-		}, 1e6 * 1,	'breakMainLoopCheck');
+		}, 1e6 * 1, 'breakMainLoopCheck');
 		if (Daemon::$config->autoreload->value > 0) {
 			Timer::add(function($event) {
 				$self = Daemon::$process;
@@ -249,7 +249,7 @@ 
 					$cache = array_slice($cache, $maxCacheSize);
 				}
 
-				$cache[$key] = array($cb = eval('return function('.$arg.'){'.$body.'};'), 0);
+				$cache[$key] = array($cb = eval('return function(' . $arg . '){' . $body . '};'), 0);
 				return $cb;
 			}
 		}
@@ -262,7 +262,7 @@ 
 	public function prepareSystemEnv() {
 		proc_nice(Daemon::$config->workerpriority->value);
 		
-		register_shutdown_function(array($this,'shutdown'));
+		register_shutdown_function(array($this, 'shutdown'));
 		
 		$this->setproctitle(
 			Daemon::$runName . ': worker process'
@@ -423,7 +423,7 @@ 
 		$error = error_get_last(); 
 		if ($error) {
 			if ($error['type'] === E_ERROR) {
-				Daemon::log('W#' . $this->pid . ' crashed by error \''.$error['message'].'\' at '.$error['file'].':'.$error['line']);
+				Daemon::log('W#' . $this->pid . ' crashed by error \'' . $error['message'] . '\' at ' . $error['file'] . ':' . $error['line']);
 			}
 
 		}
@@ -466,7 +466,7 @@ 
 
 		unset(Timer::$list['breakMainLoopCheck']);
 
-		Timer::add(function($event) 	{
+		Timer::add(function($event) {
 			$self = Daemon::$process;
 
 			$self->reloadReady = $self->appInstancesReloadReady();

lib/HTTPClient.php

Spacing +11 added lines, -11 removed lines

@@ -80,7 +80,7 @@ 
 		if (isset($u['path'])) {
 			$uri .= $u['path'];
 			if (isset($u['query'])) {
-				$uri .= '?'.$u['query'];
+				$uri .= '?' . $u['query'];
 			}
 		}
 		return array($u['host'], $uri, isset($u['port']) ? $u['port'] : null);
@@ -118,13 +118,13 @@ 
 		if (!isset($params['version'])) {
 			$params['version'] = '1.1';
 		}
-		$this->writeln('GET '.$params['uri']. ' HTTP/'.$params['version']);
-		$this->writeln('Host: '.$params['host']);
+		$this->writeln('GET ' . $params['uri'] . ' HTTP/' . $params['version']);
+		$this->writeln('Host: ' . $params['host']);
 		if ($this->pool->config->expose->value) {
-			$this->writeln('User-Agent: phpDaemon/'.Daemon::$version);
+			$this->writeln('User-Agent: phpDaemon/' . Daemon::$version);
 		}
 		if (isset($params['cookie']) && sizeof($params['cookie'])) {
-			$this->writeln('Cookie: '.http_build_query($this->cookie, '', '; '));
+			$this->writeln('Cookie: ' . http_build_query($this->cookie, '', '; '));
 		}
 		if (isset($params['headers'])) {
 			$this->customRequestHeaders($params['headers']);
@@ -143,11 +143,11 @@ 
                     $this->writeln($item);
                 }
 				elseif (is_array($item)) {
-					$this->writeln($item[0].': '.$item[1]); // @TODO: prevent injections?
+					$this->writeln($item[0] . ': ' . $item[1]); // @TODO: prevent injections?
 				}
 			}
 			else {
-				$this->writeln($key.': '.$item);
+				$this->writeln($key . ': ' . $item);
 			}
 		}
 	}
@@ -172,13 +172,13 @@ 
 		if (!isset($params['contentType'])) {
 			$params['contentType'] = 'application/x-www-form-urlencoded';
 		}
-		$this->writeln('POST '.$params['uri']. ' HTTP/'.$params['version']);
-		$this->writeln('Host: '.$params['host']);
+		$this->writeln('POST ' . $params['uri'] . ' HTTP/' . $params['version']);
+		$this->writeln('Host: ' . $params['host']);
 		if ($this->pool->config->expose->value) {
-			$this->writeln('User-Agent: phpDaemon/'.Daemon::$version);
+			$this->writeln('User-Agent: phpDaemon/' . Daemon::$version);
 		}
 		if (isset($params['cookie']) && sizeof($params['cookie'])) {
-			$this->writeln('Cookie: '.http_build_query($this->cookie, '', '; '));
+			$this->writeln('Cookie: ' . http_build_query($this->cookie, '', '; '));
 		}
 		$body = '';
 		foreach ($data as $k => $v) {

lib/BoundUDPSocket.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		do {
 			$l = @socket_recvfrom($this->fd, $buf, 10240, MSG_DONTWAIT, $host, $port);
 			if ($l) {
-				$key = '['.$host . ']:' . $port;
+				$key = '[' . $host . ']:' . $port;
 				if (!isset($this->portsMap[$key])) {
 
 					if ($this->pool->allowedClients !== null) {

lib/ValveClient.php

Spacing +8 added lines, -8 removed lines

@@ -19,9 +19,9 @@ 
 	
 	public static $zombie = 0;
 
-	public function request($addr, $name, $data,  $cb) {
+	public function request($addr, $name, $data, $cb) {
 		$e = explode(':', $addr);
-		$this->getConnection('valve://[udp:' . $e[0] . ']' . (isset($e[1]) ? ':'.$e[1] : '') . '/', function($conn) use ($cb, $addr, $data, $name) {
+		$this->getConnection('valve://[udp:' . $e[0] . ']' . (isset($e[1]) ? ':' . $e[1] : '') . '/', function($conn) use ($cb, $addr, $data, $name) {
 			if (!$conn->connected) {
 				call_user_func($cb, $conn, false);
 				return;
@@ -33,13 +33,13 @@ 
 
 	public function ping($addr, $cb) {
 		$e = explode(':', $addr);
-		$this->getConnection('valve://[udp:' . $e[0] . ']' . (isset($e[1]) ? ':'.$e[1] : '') . '/ping', function($conn) use ($cb) {
+		$this->getConnection('valve://[udp:' . $e[0] . ']' . (isset($e[1]) ? ':' . $e[1] : '') . '/ping', function($conn) use ($cb) {
 			if (!$conn->connected) {
 				call_user_func($cb, $conn, false);
 				return;
 			}
 			$mt = microtime(true);
-			$conn->request('ping', null, function ($conn, $success) use ($mt, $cb) {
+			$conn->request('ping', null, function($conn, $success) use ($mt, $cb) {
 				call_user_func($cb, $conn, $success ? (microtime(true) - $mt) : false);
 			});
 		});
@@ -50,7 +50,7 @@ 
 	}
 
 	public function requestPlayers($addr, $cb) {
-		$this->request($addr, 'challenge', null, function ($conn, $result) use ($cb) {
+		$this->request($addr, 'challenge', null, function($conn, $result) use ($cb) {
 			if (is_array($result)) {
 				$cb($conn, $result);
 				return;
@@ -77,7 +77,7 @@ 
 	public $timeout = 1;
 
 	public function requestPlayers($cb) {
-		$this->request('challenge', null, function ($conn, $result) use ($cb) {
+		$this->request('challenge', null, function($conn, $result) use ($cb) {
 			if (is_array($result)) {
 				call_user_func($cb, $conn, $result);
 				return;
@@ -159,7 +159,7 @@ 
 		for ($i = 1; $i < $playersn; ++$i) {
 			$n = Binary::getByte($st);
 			$name = Binary::getString($st);
-			$score = Binary::getDWord($st,TRUE);
+			$score = Binary::getDWord($st, TRUE);
 			if (strlen($st) === 0) {
 				break;
 			}
@@ -214,7 +214,7 @@ 
 				$info['mod_website'] = Binary::getString($st);
 				$info['mod_downloadserver'] = Binary::getString($st);
 				$info['mod_unused'] = Binary::getString($st);
-				$info['mod_version'] = Binary::getDWord($st,TRUE);
+				$info['mod_version'] = Binary::getDWord($st, TRUE);
 				$info['mod_size'] = Binary::getDWord($st);
 				$info['mod_serverside'] = Binary::getByte($st);
 				$info['mod_customdll'] = Binary::getByte($st);

lib/MongoClientAsync.php

Spacing +9 added lines, -9 removed lines

@@ -10,10 +10,10 @@ 
 	
 	public $requests    = array(); // Pending requests
 	public $cursors     = array(); // Active cursors
-	public $lastReqId   = 0;       // ID of the last request
+	public $lastReqId   = 0; // ID of the last request
 	public $collections = array(); // Objects of MongoClientAsyncCollection
-	public $dbname      = '';      // Current database
-	public $lastRequestConnection;    // Holds last used MongoClientAsyncConnection object.
+	public $dbname      = ''; // Current database
+	public $lastRequestConnection; // Holds last used MongoClientAsyncConnection object.
 
 	/* Codes of operations */
 	const OP_REPLY        = 1; 
@@ -25,7 +25,7 @@ 
 	const OP_DELETE       = 2006;
 	const OP_KILL_CURSORS = 2007;
 
-	public $cache;                 // object of MemcacheClient
+	public $cache; // object of MemcacheClient
 
 	/**
 	 * Setting default config options
@@ -86,7 +86,7 @@ 
 	 */
 	public function request($key, $opcode, $data, $reply = false) {
 		$reqId = ++$this->lastReqId;
-		$cb = function ($conn) use ($opcode, $data, $reply, $reqId) {
+		$cb = function($conn) use ($opcode, $data, $reply, $reqId) {
 			if (!$conn->connected) {
 				throw new MongoClientConnectionAsyncFinished;
 			}
@@ -217,7 +217,7 @@ 
 	public function findOne($p, $callback, $key = '') {
 		if (isset($p['cachekey'])) {
 			$db = $this;
-			$this->cache->get($p['cachekey'], function($r) use ($db,  $p,  $callback,  $key) {
+			$this->cache->get($p['cachekey'], function($r) use ($db, $p, $callback, $key) {
 				if ($r->result !== NULL) {
 					call_user_func($callback, bson_decode($r->result));
 				} else {
@@ -615,7 +615,7 @@ 
 		}
 		
 		if (strpos($p['col'], '.') === false) {
-			$p['col'] = $this->dbname.'.'.$p['col'];
+			$p['col'] = $this->dbname . '.' . $p['col'];
 		}
 		
 		$e = explode('.', $p['col']);
@@ -630,7 +630,7 @@ 
 		);
 		
 		if (isset($p[$k = 'cond'])) {
-			$query['group'][$k]= $p[$k];
+			$query['group'][$k] = $p[$k];
 		}
 		
 		if (isset($p[$k = 'finalize'])) {
@@ -725,7 +725,7 @@ 
 	 * @param string Optional. Distribution key.
 	 * @return object MongoId
 	 */
-	public function insert($col, $doc = array(), $cb = NULL,  $key = '') {
+	public function insert($col, $doc = array(), $cb = NULL, $key = '') {
 		if (strpos($col, '.') === false) {
 			$col = $this->dbname . '.' . $col;
 		}

lib/RedisClientConnection.php

Spacing +7 added lines, -7 removed lines

@@ -9,15 +9,15 @@
 
 class RedisClientConnection extends NetworkClientConnection {
 
-	public $result = null;      	// current result (array)
+	public $result = null; // current result (array)
 	public $resultLength = 0;
-	public $resultSize = 0;			// number of received array items in result
+	public $resultSize = 0; // number of received array items in result
 	public $value = '';
-	public $valueLength = 0;        // length of incoming value
-	public $valueSize = 0;         // size of received part of the value
-	public $error;                 // error message
-	public $key;                   // current incoming key
-	public $EOL = "\r\n";			// EOL for gets() and writeln()
+	public $valueLength = 0; // length of incoming value
+	public $valueSize = 0; // size of received part of the value
+	public $error; // error message
+	public $key; // current incoming key
+	public $EOL = "\r\n"; // EOL for gets() and writeln()
 	const STATE_BINARY = 1;
 
 	/**

lib/RedisClient.php

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
 
 	public function __call($name, $args) {
 		$onResponse = null;		
-		if (($e = end($args)) && (is_array($e) || is_object($e)) &&	is_callable($e)) {
-			$onResponse= array_pop($args);
+		if (($e = end($args)) && (is_array($e) || is_object($e)) && is_callable($e)) {
+			$onResponse = array_pop($args);
 		}
 		reset($args);
 		$name = strtoupper($name);

lib/Connection.php

Spacing +4 added lines, -4 removed lines

@@ -172,7 +172,7 @@ 
 			if (@inet_pton($host) === false) { // dirty condition check
 				DNSClient::getInstance()->resolve($host, function($result) use ($host) {
 					if ($result === false) {
-						Daemon::log(get_class($this).'->connectTo (raw) : enable to resolve hostname: '.$host);
+						Daemon::log(get_class($this) . '->connectTo (raw) : enable to resolve hostname: ' . $host);
 						$this->onFailureEvent(null);
 						return;
 					}
@@ -184,7 +184,7 @@ 
 					} else {
 						$real = $result;
 					}
-					$this->connectTo('raw:'. $real);
+					$this->connectTo('raw:' . $real);
 				});
 				return;
 			}
@@ -210,7 +210,7 @@ 
 			if ($pton === false) { // dirty condition check
 				DNSClient::getInstance()->resolve($host, function($result) use ($host) {
 					if ($result === false) {
-						Daemon::log(get_class($this).'->connectTo (udp) : enable to resolve hostname: '.$host);
+						Daemon::log(get_class($this) . '->connectTo (udp) : enable to resolve hostname: ' . $host);
 						$this->onStateEvent($this->bev, EventBufferEvent::ERROR);
 						return;
 					}
@@ -256,7 +256,7 @@ 
 			if ($pton === false) { // dirty condition check
 				DNSClient::getInstance()->resolve($this->host, function($result) use ($host) {
 					if ($result === false) {
-						Daemon::log(get_class($this).'->connectTo (tcp) : enable to resolve hostname: '.$host);
+						Daemon::log(get_class($this) . '->connectTo (tcp) : enable to resolve hostname: ' . $host);
 						$this->onStateEvent($this->bev, EventBufferEvent::ERROR);
 						return;
 					}