diogo/xmpphp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* changed indents back to tabs (ung)

Browse Source 
* fixed several bugs in the issue list


git-svn-id: svn://netflint.net/xmpphp@45 ef36c318-a008-4979-b6e8-6b496270793b
This commit is contained in:
fritzy 2008-07-07 02:33:57 +00:00
parent 9793c80e60
commit 9bfd715564
4 changed files with 988 additions and 988 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
XMPPHP/XMLStream.php
View File

@ -468,13 +468,13 @@ class XMPPHP_XMLStream {
if($searchxml !== null and $searchxml->name == $handler[0] and ($searchxml->ns == $handler[1] or (!$handler[1] and $searchxml->ns == $this->default_ns))) { if($searchxml !== null and $searchxml->name == $handler[0] and ($searchxml->ns == $handler[1] or (!$handler[1] and $searchxml->ns == $this->default_ns))) {
if($handler[3] === null) $handler[3] = $this; if($handler[3] === null) $handler[3] = $this;
$this->log->log("Calling {$handler[2]}", XMPPHP_Log::LEVEL_DEBUG); $this->log->log("Calling {$handler[2]}", XMPPHP_Log::LEVEL_DEBUG);
call_user_func(array($handler[3], $handler[2]), $this->xmlobj[2]); $handler[3]->$handler[2]($this->xmlobj[2]);
} }
} }
foreach($this->idhandlers as $id => $handler) { foreach($this->idhandlers as $id => $handler) {
if(array_key_exists('id', $this->xmlobj[2]->attrs) and $this->xmlobj[2]->attrs['id'] == $id) { if(array_key_exists('id', $this->xmlobj[2]->attrs) and $this->xmlobj[2]->attrs['id'] == $id) {
if($handler[1] === null) $handler[1] = $this; if($handler[1] === null) $handler[1] = $this;
call_user_func(array($handler[1], $handler[0]), $this->xmlobj[2]); $handler[1]->$handler[0]($this->xmlobj[2]);
#id handlers are only used once #id handlers are only used once
unset($this->idhandlers[$id]); unset($this->idhandlers[$id]);
break; break;
@ -530,7 +530,7 @@ class XMPPHP_XMLStream {
if($handler[2] === null) { if($handler[2] === null) {
$handler[2] = $this; $handler[2] = $this;
} }
call_user_method($handler[1], $handler[2], $payload); $handler[2]->$handler[1]($payload);
} }
} }
foreach($this->until as $key => $until) { foreach($this->until as $key => $until) {

4
XMPPHP/XMPP.php
View File

@ -162,8 +162,8 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
* @param string $show * @param string $show
* @param string $to * @param string $to
*/ */
public function presence($status = null, $show = 'available', $to = null) { public function presence($status = null, $show = 'available', $to = null, $type='available') {
$type = ''; if($type == 'available') $type = '';
$to = htmlspecialchars($to); $to = htmlspecialchars($to);
$status = htmlspecialchars($status); $status = htmlspecialchars($status);
if($show == 'unavailable') $type = 'unavailable'; if($show == 'unavailable') $type = 'unavailable';