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

normalize jids before comparison

Browse Source 
darcs-hash:20080623041816-34904-9a55d96a3e76e27b399706f7247bb715f396366b.gz
This commit is contained in:
Evan Prodromou 2008-06-23 00:18:16 -04:00
parent 8b89e1cfb0
commit e4f5893f73
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xmppdaemon.php
View File

@ -51,6 +51,14 @@ class XMPPDaemon {
return !$this->conn->disconnected; return !$this->conn->disconnected;
} }
function normalize_jid($jid) {
preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $jid, $matches);
$node = $matches[1];
$server = $matches[2];
$resource = $matches[3];
return strtolower($node.'@'.$server);
}
function handle() { function handle() {
while(!$this->conn->disconnected) { while(!$this->conn->disconnected) {
$payloads = $this->conn->processUntil(array('message', 'presence', $payloads = $this->conn->processUntil(array('message', 'presence',
@ -73,9 +81,10 @@ class XMPPDaemon {
} }
function handle_message(&$pl) { function handle_message(&$pl) {
$user = User::staticGet('jabber', $pl['from']); $from = $this->normalize_jid($pl['from']);
$user = User::staticGet('jabber', $from);
if (!$user) { if (!$user) {
$this->log(LOG_WARNING, 'Message from unknown user ' . $pl['from']); $this->log(LOG_WARNING, 'Message from unknown user ' . $from);
return; return;
} }
if ($this->handle_command($user, $pl['body'])) { if ($this->handle_command($user, $pl['body'])) {
@ -147,9 +156,10 @@ class XMPPDaemon {
} }
function handle_presence(&$pl) { function handle_presence(&$pl) {
$user = User::staticGet('jabber', $pl['from']); $from = $this->normalize_jid($pl['from']);
$user = User::staticGet('jabber', $from);
if (!$user) { if (!$user) {
$this->log(LOG_WARNING, 'Message from unknown user ' . $pl['from']); $this->log(LOG_WARNING, 'Message from unknown user ' . $from);
return; return;
} }
if ($user->updatefrompresence) { if ($user->updatefrompresence) {