diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-08 12:51:43 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-08 12:51:43 +0000 |
| commit | 9d9d61b1a209098dc30d0905d88575a4f84cb197 (patch) | |
| tree | eeed66fe2ff92a246d498defd1863996737e4d59 /phpBB/includes/functions_jabber.php | |
| parent | 89f1b88fe15da4fc8c25f456ef594f20a5357476 (diff) | |
| download | forums-9d9d61b1a209098dc30d0905d88575a4f84cb197.tar forums-9d9d61b1a209098dc30d0905d88575a4f84cb197.tar.gz forums-9d9d61b1a209098dc30d0905d88575a4f84cb197.tar.bz2 forums-9d9d61b1a209098dc30d0905d88575a4f84cb197.tar.xz forums-9d9d61b1a209098dc30d0905d88575a4f84cb197.zip | |
Merge revisions:
r8974, r8975, r8976, r8977, r8978, r8979
git-svn-id: file:///svn/phpbb/trunk@8980 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_jabber.php')
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index 3af7881043..5fc7123db7 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * Jabber class from Flyspray project * -* @version class.jabber2.php 1488 2007-11-25 +* @version class.jabber2.php 1595 2008-09-19 (0.9.9) * @copyright 2006 Flyspray.org * @author Florian Schmitz (floele) * @@ -35,6 +35,7 @@ class jabber private $timeout = 10; private $server; + private $connect_server; private $port; private $username; private $password; @@ -50,9 +51,23 @@ class jabber */ function __construct($server, $port, $username, $password, $use_ssl = false) { - $this->server = ($server) ? $server : 'localhost'; + $this->connect_server = ($server) ? $server : 'localhost'; $this->port = ($port) ? $port : 5222; - $this->username = $username; + + // Get the server and the username + if (strpos($username, '@') === false) + { + $this->server = $this->connect_server; + $this->username = $username; + } + else + { + $jid = explode('@', $username, 2); + + $this->username = $jid[0]; + $this->server = $jid[1]; + } + $this->password = $password; $this->use_ssl = ($use_ssl && self::can_use_ssl()) ? true : false; @@ -123,7 +138,7 @@ class jabber $this->session['ssl'] = $this->use_ssl; - if ($this->open_socket($this->server, $this->port, $this->use_ssl)) + if ($this->open_socket($this->connect_server, $this->port, $this->use_ssl)) { $this->send("<?xml version='1.0' encoding='UTF-8' ?" . ">\n"); $this->send("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n"); @@ -499,14 +514,7 @@ class jabber } // better generate a cnonce, maybe it's needed - $str = ''; - mt_srand((double)microtime()*10000000); - - for ($i = 0; $i < 32; $i++) - { - $str .= chr(mt_rand(0, 255)); - } - $decoded['cnonce'] = base64_encode($str); + $decoded['cnonce'] = base64_encode(md5(uniqid(mt_rand(), true))); // second challenge? if (isset($decoded['rspauth'])) |