eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

upgrade XMPPHP to upstream version

Browse Source 
darcs-hash:20081211181500-5ed1f-5042b1ff2ed5de36500200f3ea2aa91108f1f853.gz
This commit is contained in:
Evan Prodromou
2008-12-11 13:15:00 -05:00
parent fb837b86c5
commit 939a400fd3
8 changed files with 565 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extlib/XMPPHP/XMLObj.php
View File

@@ -22,6 +22,7 @@
* @package XMPPHP
* @author Nathanael C. Fritz <JID: fritzy@netflint.net>
* @author Stephan Wentz <JID: stephan@jabber.wentz.it>
* @author Michael Garvin <JID: gar@netflint.net>
* @copyright 2008 Nathanael C. Fritz
*/
@@ -32,6 +33,7 @@
* @package XMPPHP
* @author Nathanael C. Fritz <JID: fritzy@netflint.net>
* @author Stephan Wentz <JID: stephan@jabber.wentz.it>
* @author Michael Garvin <JID: gar@netflint.net>
* @copyright 2008 Nathanael C. Fritz
* @version $Id$
*/
@@ -131,9 +133,9 @@ class XMPPHP_XMLObj {
* @param string $name
* @return boolean
*/
public function hasSub($name) {
public function hasSub($name, $ns = null) {
foreach($this->subs as $sub) {
if($sub->name == $name) return true;
if(($name == "*" or $sub->name == $name) and ($ns == null or $sub->ns == $ns)) return true;
}
return false;
}
@@ -146,8 +148,9 @@ class XMPPHP_XMLObj {
* @param string $ns
*/
public function sub($name, $attrs = null, $ns = null) {
#TODO attrs is ignored
foreach($this->subs as $sub) {
if($sub->name == $name) {
if($sub->name == $name and ($ns == null or $sub->ns == $ns)) {
return $sub;
}
}