[Quickfw-git] SF.net Git: quickfw branch, master, updated. 22c10fa7e34341162144117de8caef8e0fbafcb0

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  22c10fa7e34341162144117de8caef8e0fbafcb0 (commit)
      from  491adedf0aefcbc70c4250f9db0dde6d07cc8772 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 22c10fa7e34341162144117de8caef8e0fbafcb0
Author: Ivan1986 <iva...@li...>
Date:   Fri Jul 2 13:07:03 2010 +0400

    Обновлен xmpphp

diff --git a/lib/jabber/XMPPHP/XMLStream.php b/lib/jabber/XMPPHP/XMLStream.php
index d818881..5a25943 100644
--- a/lib/jabber/XMPPHP/XMLStream.php
+++ b/lib/jabber/XMPPHP/XMLStream.php
@@ -396,7 +396,7 @@ class XMPPHP_XMLStream {
 		);
 		$stop  = substr($buff, -strlen($start) - 3);
 
-		if ($start == '?xml') {
+		if ($start == '?xml' || substr($start,-6) == 'stream' ) {
 			//starting with an xml tag. this means a stream is being
 			// opened, which is not much of data, so no fear it's
 			// not complete
diff --git a/lib/jabber/XMPPHP/XMPP.php b/lib/jabber/XMPPHP/XMPP.php
index eed8f69..3e94286 100644
--- a/lib/jabber/XMPPHP/XMPP.php
+++ b/lib/jabber/XMPPHP/XMPP.php
@@ -133,7 +133,7 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
 		$this->resource = $resource;
 		if(!$server) $server = $host;
 		$this->server = $server;
-		$this->basejid = $this->user . '@' . $this->host;
+		$this->basejid = $this->user . '@' . $this->server;
 
 		$this->roster = new Roster();
 		$this->track_presence = true;
@@ -161,7 +161,7 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
 	public function useEncryption($useEncryption = true) {
 		$this->use_encryption = $useEncryption;
 	}
-	
+
 	/**
 	 * Turn on auto-authorization of subscription requests.
 	 *
@@ -471,6 +471,8 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
 	* Roster iq handler
 	* Gets all packets matching XPath "iq/{jabber:iq:roster}query'
 	*
+	* Implements RFC3921, 7.4. "Adding a Roster Item"
+	*
 	* @param string $xml
 	*/
 	protected function roster_iq_handler($xml) {
@@ -498,7 +500,7 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
 			}
 		}
 		if ($xml->attrs['type'] == 'set') {
-			$this->send("<iq type=\"reply\" id=\"{$xml->attrs['id']}\" to=\"{$xml->attrs['from']}\" />");
+			$this->send("<iq type=\"result\" id=\"{$xml->attrs['id']}\" to=\"{$xml->attrs['from']}\" />");
 		}
 	}
 

-----------------------------------------------------------------------

Summary of changes:
 lib/jabber/XMPPHP/XMLStream.php |    2 +-
 lib/jabber/XMPPHP/XMPP.php      |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
quickfw