forked from GNUsocial/gnu-social
correctly use attrs array rather than nonexistent attunction
darcs-hash:20080830062744-84dde-98c6419f4b66a570e9ef9de34d8d07e40aa1177d.gz
This commit is contained in:
parent
c3adc854da
commit
755f192df0
@ -136,25 +136,30 @@ class XMPPDaemon {
|
||||
$this->log(LOG_WARNING, 'Forwarded message without addresses');
|
||||
return NULL;
|
||||
}
|
||||
$this->log(LOG_DEBUG, "Got addresses XML: " . $addresses->toString());
|
||||
$address = $addresses->sub('address');
|
||||
$this->log(LOG_DEBUG, "Fetched address.");
|
||||
if (!$address) {
|
||||
$this->log(LOG_WARNING, 'Forwarded message without address');
|
||||
return NULL;
|
||||
}
|
||||
$type = $address->attr('type');
|
||||
if (!array_key_exists('type', $address->attrs)) {
|
||||
$this->log(LOG_WARNING, 'No type for forwarded message');
|
||||
return NULL;
|
||||
}
|
||||
$type = $address->attrs['type'];
|
||||
if ($type != 'ofrom') {
|
||||
$this->log(LOG_WARNING, 'Type of forwarded message is not ofrom');
|
||||
return NULL;
|
||||
}
|
||||
$jid = $address->attr('jid');
|
||||
if (!array_key_exists('jid', $address->attrs)) {
|
||||
$this->log(LOG_WARNING, 'No jid for forwarded message');
|
||||
return NULL;
|
||||
}
|
||||
$jid = $address->attrs['jid'];
|
||||
if (!$jid) {
|
||||
$this->log(LOG_WARNING, 'Could not get jid from address');
|
||||
return NULL;
|
||||
}
|
||||
$this->log(LOG_DEBUG, 'Got message forwarded from jid ' . $jid);
|
||||
|
||||
return $jid;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user