GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

XMPP daemon that doesn't eat messages - note change to XMPPHP as well (Ticket #551)

Browse Source 
darcs-hash:20080826200057-f6e2c-fb9a88251d034824218d20b3fefcde96ddaef827.gz
This commit is contained in:
CiaranG 2008-08-26 16:00:57 -04:00
parent 28ed510854
commit b6d67b06d4
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extlib/XMPPHP/XMLStream.php
View File

@ -242,7 +242,7 @@ class XMPPHP_XMLStream {
* @param string $obj * @param string $obj
*/ */
public function addEventHandler($name, $pointer, $obj) { public function addEventHandler($name, $pointer, $obj) {
$this->eventhandlers[] = array($name, $pointer, $obj); $this->eventhanders[] = array($name, $pointer, $obj);
} }
/** /**
@ -521,6 +521,7 @@ class XMPPHP_XMLStream {
if($handler[2] === null) { if($handler[2] === null) {
$handler[2] = $this; $handler[2] = $this;
} }
$this->log->log("Calling {$handler[1]}", XMPPHP_Log::LEVEL_DEBUG);
$handler[2]->$handler[1]($payload); $handler[2]->$handler[1]($payload);
} }
} }

29
scripts/xmppdaemon.php
View File

@ -96,39 +96,16 @@ class XMPPDaemon {
function handle() { function handle() {
static $parts = array('message', 'presence', $this->conn->addEventHandler('message','handle_message',$this);
'end_stream', 'session_start'); $this->conn->addEventHandler('presence','handle_presence',$this);
while(!$this->conn->isDisconnected()) { while(!$this->conn->isDisconnected()) {
$payloads = $this->conn->processUntil($parts, 10); $this->conn->processTime(10);
if ($payloads) {
foreach($payloads as $event) {
$pl = $event[1];
switch($event[0]) {
case 'message':
$this->handle_message($pl);
break;
case 'presence':
$this->handle_presence($pl);
break;
case 'session_start':
$this->handle_session($pl);
break;
}
}
}
$this->broadcast_queue(); $this->broadcast_queue();
$this->confirmation_queue(); $this->confirmation_queue();
} }
} }
function handle_session($pl) {
# XXX what to do here?
return true;
}
function get_user($from) { function get_user($from) {
$user = User::staticGet('jabber', jabber_normalize_jid($from)); $user = User::staticGet('jabber', jabber_normalize_jid($from));