lost a couple of variables

darcs-hash:20080626203935-34904-bf73b91cc008b28a0d0d2187dfaa346784c23afd.gz

diff --git a/lib/jabber.php b/lib/jabber.php
index 7630d8cd2039e4736522a83a0eed0d21a86c57d9..2e136cd74874ae7091b4b9b9b416dddff11e8ca7 100644 (file)
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -93,7 +93,7 @@ function jabber_confirm_address($code, $nickname, $address) {
                'address bar of your browser). If that user isn\'t you, ' .
                'or if you didn\'t request this confirmation, just ignore this message.';
 
-               jabber_send_message($address, $body);
+       jabber_send_message($address, $body);
 }
 
 function jabber_special_presence($type, $to=NULL, $show=NULL, $status=NULL) {

diff --git a/xmppdaemon.php b/xmppdaemon.php
index cc464f155e4de9d55f53937eaac166d694dc4469..afe248c8e4f2fa4394cef43d3325032a0a93dd8a 100755 (executable)
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -111,6 +111,10 @@ class XMPPDaemon {
                if (strlen($pl['body']) == 0) {
                        return;
                }
+
+               $from = jabber_normalize_jid($pl['from']);
+               $user = $this->get_user($from);
+
                if (!$user) {
                        $this->log(LOG_WARNING, 'Message from unknown user ' . $from);
                        return;