summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-08-30 01:21:43 -0400
committerEvan Prodromou <evan@prodromou.name>2008-08-30 01:21:43 -0400
commit706dc53d40bd940e5b75b254b9c96fd846d26daa (patch)
tree1645c9507ccf3003debf6c7703e3e3600d344c4c
parent4cdd90283b46db68d278d287074c740348b4ba55 (diff)
strtolower jids for comparison
darcs-hash:20080830052143-84dde-81ba3f1e687605d23e9bdc2c3672ac7ae36f9b60.gz
-rwxr-xr-xscripts/xmppdaemon.php2
-rwxr-xr-xscripts/xmppqueuehandler.php3
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index b1cdb914c..d3e767e09 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -95,7 +95,7 @@ class XMPPDaemon {
# Forwarded from another daemon (probably a broadcaster) for
# us to handle
- if (preg_match('/^'.jabber_daemon_address().'/', $from)) {
+ if (preg_match('/^'.strtolower(jabber_daemon_address()).'/', strtolower($from))) {
$from = $this->get_ofrom($pl);
if (is_null($from)) {
return;
diff --git a/scripts/xmppqueuehandler.php b/scripts/xmppqueuehandler.php
index a82f5b944..489ae7e7c 100755
--- a/scripts/xmppqueuehandler.php
+++ b/scripts/xmppqueuehandler.php
@@ -61,6 +61,9 @@ class XmppQueueHandler extends QueueHandler {
}
function forward_message(&$pl) {
+ if ($pl['type'] != 'chat') {
+ return;
+ }
$listener = $this->listener();
$this->log(LOG_INFO, 'Forwarding message from ' . $pl['from'] . ' to ' . $listener);
$this->conn->message($this->listener(), $pl['body'], 'chat', NULL, $this->ofrom($pl['from']));