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

check for self in forwards, too 

darcs-hash:20080830085607-84dde-83e95d40d4d8a64a6bc223a0e91fec53022422c6.gz
This commit is contained in:
Evan Prodromou 2008-08-30 04:56:07 -04:00
parent 6c42bdc448
commit 1cf81a57e4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/xmppdaemon.php
View File

@ -95,9 +95,9 @@ class XMPPDaemon {
# Forwarded from another daemon (probably a broadcaster) for # Forwarded from another daemon (probably a broadcaster) for
# us to handle # us to handle
if (preg_match('/^'.strtolower(jabber_daemon_address()).'/', strtolower($from))) { if ($this->is_self($from)) {
$from = $this->get_ofrom($pl); $from = $this->get_ofrom($pl);
if (is_null($from)) { if (is_null($from) || $this->is_self($from)) {
return; return;
} }
} }
@ -129,6 +129,10 @@ class XMPPDaemon {
} }
} }
function is_self($from) {
return preg_match('/^'.strtolower(jabber_daemon_address()).'/', strtolower($from));
}
function get_ofrom($pl) { function get_ofrom($pl) {
$xml = $pl['raw']; $xml = $pl['raw'];
$addresses = $xml->sub('addresses'); $addresses = $xml->sub('addresses');