* added SSL and fixed XMPP_Old
git-svn-id: svn://netflint.net/xmpphp@51 ef36c318-a008-4979-b6e8-6b496270793b
This commit is contained in:
@@ -43,7 +43,9 @@ require_once "XMPP.php";
|
||||
|
||||
public function __construct($host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null) {
|
||||
parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel);
|
||||
|
||||
if(!$server) $server = $host;
|
||||
$this->stream_start = '<stream:stream to="' . $server . '" xmlns:stream="http://etherx.jabber.org/streams" xmlns="jabber:client">';
|
||||
$this->fulljid = "{$user}@{$server}/{$resource}";
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -53,8 +55,8 @@ require_once "XMPP.php";
|
||||
* @param string $name
|
||||
* @param array $attr
|
||||
*/
|
||||
protected function startXML($parser, $name, $attr) {
|
||||
if($this->xml_depth == 0 and $attr['version'] != '1.0') {
|
||||
public function startXML($parser, $name, $attr) {
|
||||
if($this->xml_depth == 0) {
|
||||
$this->session_id = $attr['ID'];
|
||||
$this->authenticate();
|
||||
}
|
||||
@@ -84,7 +86,7 @@ require_once "XMPP.php";
|
||||
print "{$this->session_id} {$this->password}\n";
|
||||
$out = "<iq type='set' id='$id'><query xmlns='jabber:iq:auth'><username>{$this->user}</username><digest>{$hash}</digest><resource>{$this->resource}</resource></query></iq>";
|
||||
} else {
|
||||
$out = "<iq type='set' id='$id'><query xmlns='jabber:iq:auth'><username>{$this->user}</username><digest>{$this->password}</digest><resource>{$this->resource}</resource></query></iq>";
|
||||
$out = "<iq type='set' id='$id'><query xmlns='jabber:iq:auth'><username>{$this->user}</username><password>{$this->password}</password><resource>{$this->resource}</resource></query></iq>";
|
||||
}
|
||||
$this->send($out);
|
||||
|
||||
|
Reference in New Issue
Block a user