Changeset 64 for trunk/instant_messenger/inc/Jabber.abstract.php

Timestamp:

09/05/07 11:18:58 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/instant_messenger/inc/Jabber.abstract.php (modified) (5 diffs)

trunk/instant_messenger/inc/Jabber.abstract.php

@@ -35 +35 @@
    {
       try
-      {
+      { 
          if ( !preg_match('/^(.+)@(.+)\/(.+):(\d+)$/',$pUser, $matches) )
             throw new Exception('[connect] #1 ' . $pUser . ' must be [USER]@[DOMAIN]/[RESOURCE]:[PORT] and [PORT] is integer. File: ' . __FILE__ . '  ::  ' . __LINE__);
@@ -49 +49 @@
          $xml .= "<stream:stream to='" . $SERVER . "' xmlns='jabber:client' ";
          $xml .= "xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>";
+
          if ( $this->write($xml) === false )
             throw new Exception('[connect] #3 it isn\'t possible write in the socket ' . $socket . '. File: ' . __FILE__ . '  ::  ' . __LINE__);
@@ -65 +66 @@
 
    protected function connect( $pUser = false, $pPassword = false )
-   {
+   {   
       try
       {
          $this->_connect($pUser, $pPassword);
+                        
          if ( ($xml = $this->read()) === false )
             throw new Exception('[connect] #1 it isn\'t possible read the socket. File: ' . __FILE__ . '  ::  ' . __LINE__);
-
+         
          if ( preg_match('/(<starttls .*<required\/><\/starttls>)/', $xml, $matches) )
          {
@@ -80 +82 @@
          }
          else
+                        {
             if ( !$this->_plain() )
                throw new Exception('[connect] #3 it isn\'t possible carry out the verification. File: ' . __FILE__ . '  ::  ' . __LINE__);
+                        }
 
          return true;
@@ -170 +174 @@
             throw new Exception('[_plain] #2 it isn\'t possible carry out the verification. File: ' . __FILE__ . '  ::  ' . __LINE__);
 
-         while ( !preg_match("/<iq xmlns='jabber:client' id='auth_1' type='result'\/>/", ($readSocket = $this->read()), $matches) )
-            usleep(10000);
+         while ( !preg_match("/<iq xmlns='jabber:client' id='auth_1' type='(result|error)'/", ($readSocket = $this->read()), $matches) )
+                   usleep(10000);
+
+                        if($matches[1] == "error")
+                                return false;
 
          if ( ($xml = $this->read()) === false )