summaryrefslogtreecommitdiff
path: root/lib/xmppqueuehandler.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-12-23 14:33:23 -0500
committerEvan Prodromou <evan@prodromou.name>2008-12-23 14:33:23 -0500
commit04ef1ba8eee7a9e2a565d7b4b747ef607665d562 (patch)
treed56ac33bd6bfb8f8641cc9f63b0f6af52b6edfb9 /lib/xmppqueuehandler.php
parenteb2f9c98ac115ce67e9a740b200c832153ffa05c (diff)
change function headers to K&R style
Another huge change, for PEAR code standards compliance. Function headers have to be in K&R style (opening brace on its own line), instead of having the opening brace on the same line as the function and parameters. So, a little perl magic found all the function definitions and move the opening brace to the next line (properly indented... usually). darcs-hash:20081223193323-84dde-a28e36ecc66672c783c2842d12fc11043c13ab28.gz
Diffstat (limited to 'lib/xmppqueuehandler.php')
-rw-r--r--lib/xmppqueuehandler.php18
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index 10c754a5b..0a73403f9 100644
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -30,7 +30,8 @@ require_once(INSTALLDIR.'/lib/queuehandler.php');
class XmppQueueHandler extends QueueHandler {
- function start() {
+ function start()
+ {
# Low priority; we don't want to receive messages
$this->log(LOG_INFO, "INITIALIZE");
$this->conn = jabber_connect($this->_id);
@@ -43,12 +44,14 @@ class XmppQueueHandler extends QueueHandler {
return !is_null($this->conn);
}
- function handle_reconnect(&$pl) {
+ function handle_reconnect(&$pl)
+ {
$this->conn->processUntil('session_start');
$this->conn->presence(null, 'available', null, 'available', -1);
}
- function idle($timeout=0) {
+ function idle($timeout=0)
+ {
# Process the queue for as long as needed
try {
if ($this->conn) {
@@ -60,7 +63,8 @@ class XmppQueueHandler extends QueueHandler {
}
}
- function forward_message(&$pl) {
+ function forward_message(&$pl)
+ {
if ($pl['type'] != 'chat') {
$this->log(LOG_DEBUG, 'Ignoring message of type ' . $pl['type'] . ' from ' . $pl['from']);
return;
@@ -74,14 +78,16 @@ class XmppQueueHandler extends QueueHandler {
$this->conn->message($this->listener(), $pl['body'], 'chat', null, $this->ofrom($pl['from']));
}
- function ofrom($from) {
+ function ofrom($from)
+ {
$address = "<addresses xmlns='http://jabber.org/protocol/address'>\n";
$address .= "<address type='ofrom' jid='$from' />\n";
$address .= "</addresses>\n";
return $address;
}
- function listener() {
+ function listener()
+ {
if (common_config('xmpp', 'listener')) {
return common_config('xmpp', 'listener');
} else {