kakserpom / phpdaemon

old-code-for-refactoring/AsteriskDriver.php

Doc Comments +3 added lines, -2 removed lines

@@ -417,6 +417,7 @@ 
 	 * Synopsis: Generate Challenge for MD5 Auth
 	 * Privilege: <none>
 	 *
+	 * @param Closure $callback
 	 * @return void
 	 */
 	protected function challenge($callback) {
@@ -629,7 +630,7 @@ 
 
 	/**
 	 * Generate a unique ID.
-	 * @return Returns the unique identifier, as a string. 
+	 * @return string the unique identifier, as a string. 
 	 */
 	protected function uniqid() {
 		return uniqid(Daemon::$process->pid, true);
@@ -637,7 +638,7 @@ 
 	
 	/**
 	 * Sends a packet.
-	 * @param string $pacekt Data
+	 * @param string $packet Data
 	 * @return void
 	 */
 	public function sendPacket($packet) {

Indentation +1 added lines, -1 removed lines

@@ -532,7 +532,7 @@
 	 * Privilege: system,call,reporting,all
 	 * Description: Lists channel status along with requested channel vars.
 	 * Variables: (Names marked with * are required)
-		*Channel: Name of the channel to query for status
+	 *Channel: Name of the channel to query for status
 	 *	Variables: Comma ',' separated list of variables to include
 	 * ActionID: Optional ID for this transaction
 	 * Will return the status information of each channel along with the

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;

Braces +4 added lines, -8 removed lines

@@ -258,11 +258,9 @@ 
 			$this->cstate = AsteriskDriver::CONN_STATE_GOT_INITIAL_PACKET;
 			$this->appInstance->amiVersions[$this->addr] = trim($this->buf);
 			$this->auth();
-		}
-		elseif (strlen($this->buf) < 4) {
+		} elseif (strlen($this->buf) < 4) {
 			return; // Not enough data buffered yet
-		}
-		elseif (strpos($this->buf, "\r\n\r\n") !== false) {
+		} elseif (strpos($this->buf, "\r\n\r\n") !== false) {
 			while(($line = $this->gets()) !== false) {
 				if ($line == "\r\n") {
 					$this->instate = AsteriskDriver::INPUT_STATE_END_OF_PACKET;
@@ -303,8 +301,7 @@ 
 						}
 						$this->packets = array();
 					}
-				}
-				elseif ($this->cstate === AsteriskDriver::CONN_STATE_HANDSHAKED_OK) {
+				} elseif ($this->cstate === AsteriskDriver::CONN_STATE_HANDSHAKED_OK) {
 					if ($this->instate == AsteriskDriver::INPUT_STATE_END_OF_PACKET) {
 						// Event
 						if (
@@ -361,8 +358,7 @@ 
 			&& is_callable($this->onConnected)
 		) {
 			call_user_func($this->onConnected, $this, false);
-		}
-		elseif (
+		} elseif (
 			$this->cstate === AsteriskDriver::CONN_STATE_HANDSHAKED_OK
 			&& is_callable($this->onConnected)
 		) {

app-examples/ExampleIRCBot.php

Spacing +7 added lines, -7 removed lines

@@ -18,9 +18,9 @@ 
 	 * @return array|false
 	 */
 	protected function getConfigDefaults() {
-		$random = sprintf('%x', crc32(posix_getpid() . "\x00". microtime(true)));
+		$random = sprintf('%x', crc32(posix_getpid() . "\x00" . microtime(true)));
 		return array(
-			'url' => 'irc://guest_'.$random.':password@hobana.freenode.net/Bot_phpDaemon'
+			'url' => 'irc://guest_' . $random . ':password@hobana.freenode.net/Bot_phpDaemon'
 		);
 	}
 	/**
@@ -46,24 +46,24 @@ 
 	
 	public function connect() {
 		$app = $this;
-		$r = $this->client->getConnection($this->config->url->value, function ($conn) use ($app) {
+		$r = $this->client->getConnection($this->config->url->value, function($conn) use ($app) {
 			$app->conn = $conn;
 			if ($conn->connected) {
-				Daemon::log('IRC bot connected at '.$this->config->url->value);
+				Daemon::log('IRC bot connected at ' . $this->config->url->value);
 				$conn->join('#botwar_phpdaemon');
 				$conn->bind('motd', function($conn) {
 					//Daemon::log($conn->motd);
 				});
 				$conn->bind('privateMsg', function($conn, $msg) {
-					Daemon::log('IRCBot: got private message \''.$msg['body'].'\' from \''.$msg['from']['orig'].'\'');
-					$conn->message($msg['from']['nick'], 'You just wrote: '.$msg['body']); // send the message back
+					Daemon::log('IRCBot: got private message \'' . $msg['body'] . '\' from \'' . $msg['from']['orig'] . '\'');
+					$conn->message($msg['from']['nick'], 'You just wrote: ' . $msg['body']); // send the message back
 				});
 				$conn->bind('disconnect', function() use ($app) {
 					$app->connect();
 				});
 			}
 			else {
-				Daemon::log('IRCBot: unable to connect ('.$this->config->url->value.')');
+				Daemon::log('IRCBot: unable to connect (' . $this->config->url->value . ')');
 			}
 		});
 	}

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
 				$conn->bind('disconnect', function() use ($app) {
 					$app->connect();
 				});
-			}
-			else {
+			} else {
 				Daemon::log('IRCBot: unable to connect ('.$this->config->url->value.')');
 			}
 		});

app-examples/TelnetHoneypot.php

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 
 			if ($cmd === 'ping') {
 				$this->writeln('pong');
-			}
-			elseif (
+			} elseif (
 				($cmd === 'exit') 
 				|| ($cmd === 'quit')
 			) {

app-examples/ExampleJabberbot.php

Spacing +5 added lines, -5 removed lines

@@ -45,21 +45,21 @@
 	
 	public function connect() {
 		$app = $this;
-		$this->xmppclient->getConnection($this->config->url->value, function ($conn) use ($app) {
+		$this->xmppclient->getConnection($this->config->url->value, function($conn) use ($app) {
 			$app->xmppconn = $conn;
 			if ($conn->connected) {
-				Daemon::log('Jabberbot connected at '.$this->config->url->value);
+				Daemon::log('Jabberbot connected at ' . $this->config->url->value);
 				$conn->presence('I\'m a robot.', 'chat');
 				$conn->addEventHandler('message', function($msg) use ($conn) {
-					Daemon::log('JabberBot: got message \''.$msg['body'].'\'');
-					$conn->message($msg['from'], 'You just wrote: '.$msg['body']); // send the message back
+					Daemon::log('JabberBot: got message \'' . $msg['body'] . '\'');
+					$conn->message($msg['from'], 'You just wrote: ' . $msg['body']); // send the message back
 				});
 				$conn->addEventHandler('disconnect', function() use ($app) {
 					$app->connect();
 				});
 			}
 			else {
-				Daemon::log('Jabberbot: unable to connect ('.$this->config->url->value.')');
+				Daemon::log('Jabberbot: unable to connect (' . $this->config->url->value . ')');
 			}
 		});
 	}

Braces +1 added lines, -2 removed lines

@@ -57,8 +57,7 @@
 				$conn->addEventHandler('disconnect', function() use ($app) {
 					$app->connect();
 				});
-			}
-			else {
+			} else {
 				Daemon::log('Jabberbot: unable to connect ('.$this->config->url->value.')');
 			}
 		});

app-examples/ExampleLockClient.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 			$LockClient->job(
 					'ExampleJobName', // name of the job
 					false, //wait?
-					function($command,$jobname,$client) use ($req) {
+					function($command, $jobname, $client) use ($req) {
 						if ($command === 'RUN') {
 							Daemon_TimedEvent::add(function($event) use ($req, $jobname, $client) {
 							Daemon::log('done');
@@ -41,7 +41,7 @@ 
 								$req->out(':-)');
 								$req->wakeup();
 								$event->finish();
-							}, pow(10,6) * 1);
+							}, pow(10, 6) * 1);
 						}
 						else {
 						 $req->out(':-(');

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
 								$req->wakeup();
 								$event->finish();
 							}, pow(10,6) * 1);
-						}
-						else {
+						} else {
 						 $req->out(':-(');
 						 $req->wakeup();
 						}

app-examples/ExampleBroadcastCall.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	
 	public function hello($pid) {
 	
-		Daemon::$process->log('I got hello from '.$pid.'!');
+		Daemon::$process->log('I got hello from ' . $pid . '!');
 	
 	}
 	

app-examples/ExampleComplexJob.php

Indentation +52 added lines, -52 removed lines

@@ -14,13 +14,13 @@ 
 	 * 
 	 * @return void
 	 */
-    public function onReady() {
+	public function onReady() {
 
-        // Adding listener
-        // ComplexJob - STATE_WAITING
-        $job = new ComplexJob(function($job) {
-        	// ComplexJob - STATE_DONE
-            /*array (
+		// Adding listener
+		// ComplexJob - STATE_WAITING
+		$job = new ComplexJob(function($job) {
+			// ComplexJob - STATE_DONE
+			/*array (
               'bar' =>
               array (
                     'job' => 'bar',
@@ -44,62 +44,62 @@ 
                     'line' => 94,
               ),
             )*/
-            Daemon::log($job->results);
-        });
+			Daemon::log($job->results);
+		});
 
-        // Adding listener
-        // ComplexJob - STATE_WAITING
-        $job->addListener(function($job) {
+		// Adding listener
+		// ComplexJob - STATE_WAITING
+		$job->addListener(function($job) {
 			// ComplexJob - STATE_DONE
-        });
+		});
 
-        // Incapsulate some property in job
-        $job->appInstance = $this;
+		// Incapsulate some property in job
+		$job->appInstance = $this;
 
-        // Adding async job foo
-        $job('foo', $this->foo(array('param' => 'value')));
+		// Adding async job foo
+		$job('foo', $this->foo(array('param' => 'value')));
 
-        // Adding with 1 sec delay
-        Timer::add(function($event) use ($job) {
+		// Adding with 1 sec delay
+		Timer::add(function($event) use ($job) {
 
-            // Adding async job bar
-            $job('bar', function($jobname, $job) {
-                Timer::add(function($event) use($jobname, $job) {
-                    // Job done
-                    $job->setResult($jobname, array('job' => 'bar', 'success' => false, 'line' => __LINE__));
-                    $event->finish();
-                }, 1e3 * 50);
-            });
+			// Adding async job bar
+			$job('bar', function($jobname, $job) {
+				Timer::add(function($event) use($jobname, $job) {
+					// Job done
+					$job->setResult($jobname, array('job' => 'bar', 'success' => false, 'line' => __LINE__));
+					$event->finish();
+				}, 1e3 * 50);
+			});
 
-            // Adding async job baz. Equal $job('baz', $job->appInstance->baz());
-            $job->addJob('baz', $job->appInstance->baz());
+			// Adding async job baz. Equal $job('baz', $job->appInstance->baz());
+			$job->addJob('baz', $job->appInstance->baz());
 
-            // Run jobs. All listeners will be called when the jobs done
-            // ComplexJob - STATE_RUNNING
-            $job();
+			// Run jobs. All listeners will be called when the jobs done
+			// ComplexJob - STATE_RUNNING
+			$job();
                 
-            $event->finish();
-        }, 1e6 * 1);
+			$event->finish();
+		}, 1e6 * 1);
 
-    }
+	}
 
-    final public function foo($arg) {
-        return function($jobname, $job) use ($arg) {
-            Timer::add(function($event) use($jobname, $job, $arg) {
-                // Job done
-                $job->setResult($jobname, array('job' => 'foo', 'success' => true, 'line' => __LINE__, 'arg' => $arg));
-                $event->finish();
-            }, 1e3 * 100);
-        };
-    }
+	final public function foo($arg) {
+		return function($jobname, $job) use ($arg) {
+			Timer::add(function($event) use($jobname, $job, $arg) {
+				// Job done
+				$job->setResult($jobname, array('job' => 'foo', 'success' => true, 'line' => __LINE__, 'arg' => $arg));
+				$event->finish();
+			}, 1e3 * 100);
+		};
+	}
 
-    final public function baz() {
-        return function($jobname, $job) {
-            Timer::add(function($event) use($jobname, $job) {
-                // Job done
-                $job->setResult($jobname, array('job' => 'baz', 'success' => false, 'line' => __LINE__));
-                $event->finish();
-            }, 1e3 * 300);
-        };
-    }
+	final public function baz() {
+		return function($jobname, $job) {
+			Timer::add(function($event) use($jobname, $job) {
+				// Job done
+				$job->setResult($jobname, array('job' => 'baz', 'success' => false, 'line' => __LINE__));
+				$event->finish();
+			}, 1e3 * 300);
+		};
+	}
 }

lib/MemcacheClientConnection.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	 * Called when new data received
 	 * @param string New data
 	 * @return void
-	*/
+	 */
 	public function stdin($buf) {
 		$this->buf .= $buf;
 

Spacing +7 added lines, -7 removed lines

@@ -8,12 +8,12 @@ 
 
 class MemcacheClientConnection extends NetworkClientConnection {
 
-	public $result;                // current result
-	public $valueFlags;            // flags of incoming value
-	public $valueLength;           // length of incoming value
-	public $valueSize = 0;         // size of received part of the value
-	public $error;                 // error message
-	public $key;                   // current incoming key
+	public $result; // current result
+	public $valueFlags; // flags of incoming value
+	public $valueLength; // length of incoming value
+	public $valueSize = 0; // size of received part of the value
+	public $error; // error message
+	public $key; // current incoming key
 	const STATE_DATA = 1;
 	public $EOL = "\r\n";
 
@@ -70,7 +70,7 @@ 
 
 		if ($this->state === self::STATE_DATA) {
 			if ($this->valueSize < $this->valueLength) {
-				$n = $this->valueLength-$this->valueSize;
+				$n = $this->valueLength - $this->valueSize;
 				$buflen = strlen($this->buf);
 
 				if ($buflen > $n) {

Braces +2 added lines, -4 removed lines

@@ -38,15 +38,13 @@
 					$this->result = '';
 					$this->state = self::STATE_DATA;
 					break;
-				}
-				elseif ($e[0] == 'STAT') {
+				} elseif ($e[0] == 'STAT') {
 					if ($this->result === NULL) {
 						$this->result = array();
 					}
 
 					$this->result[$e[1]] = $e[2];
-				}
-				elseif (
+				} elseif (
 					($e[0] === 'STORED') 
 					|| ($e[0] === 'END') 
 					|| ($e[0] === 'DELETED') 

lib/XMPPRoster.php

Indentation +9 added lines, -9 removed lines

@@ -101,14 +101,14 @@ 
 	}
 
 		/**
-	 *
-	 * Add given contact to roster
-	 *
-	 * @param string $jid
-	 * @param string $subscription
-	 * @param string $name
-	 * @param array $groups
-	 */
+		 *
+		 * Add given contact to roster
+		 *
+		 * @param string $jid
+		 * @param string $subscription
+		 * @param string $name
+		 * @param array $groups
+		 */
 	public function _addContact($jid, $subscription, $name='', $groups=array()) {
 		$contact = array('jid' => $jid, 'subscription' => $subscription, 'name' => $name, 'groups' => $groups);
 		if ($this->isContact($jid)) {
@@ -148,7 +148,7 @@ 
 	 * @param integer $priority
 	 * @param string $show
 	 * @param string $status
-	*/
+	 */
 	public function setPresence($presence, $priority, $show, $status) {
 		list($jid, $resource) = explode('/', $presence . '/');
 		if ($show != 'unavailable') {

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;