Changeset 239

Timestamp:

03/25/08 14:43:28 (16 years ago)

Author:

niltonneto

Message:

 

Location:

trunk/instant_messenger

Files:

• inc/Jabber.abstract.php (modified) (2 diffs)
• js/client.js (modified) (2 diffs)

trunk/instant_messenger/inc/Jabber.abstract.php

@@ -48 +48 @@
                         fwrite($socket, "{$USER}@{$SERVER}##{$pPassword}##{$pConnectionType}");
 
-                        #sleep(1);
-
                         $return = fread($socket, 3);
-                        #var_dump($return);
-                        #$return = "new";
 
                         if ( $return == "new" )
                         {
-                                $xml  = "<?xml version='1.0' encoding='UTF-8'?>";
+                                $xml  = "<?xml version='1.0' ?>";
                                 $xml .= "<stream:stream to='" . $SERVER . "' xmlns='jabber:client' ";
-                                $xml .= "xmlns:stream='http://etherx.jabber.org/streams'>";// version='1.0'>";
+                                $xml .= "xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>";
 
                                 if ( $this->write($xml) === false )
@@ -144 +140 @@
                                 throw new Exception('[starttls] #1 Cannot write to socket (' . $this->_socket . '). File: ' . __FILE__ . '  ::  ' . __LINE__);
 
-                        if ( ($xml = $this->read()) === false )
-                                throw new Exception('[starttls] #2 it isn\'t possible read the socket. File: ' . __FILE__ . '  ::  ' . __LINE__);
-
-                        if ( !preg_match('/<proceed.*\/>/', $xml, $matches) )
-                                throw new Exception('[starttls] #3 can\'t start tls in the socket ' .$this->_socket . '. File: ' . __FILE__ . '  ::  ' . __LINE__);
-
-                        stream_socket_enable_crypto($this->_socket, TRUE, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+                        usleep(50000);
+                        fread($this->_socket, 4096);
+
+                        stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
 
                         $xml  = "<?xml version='1.0' encoding='UTF-8'?>";
                         $xml .= "<stream:stream to='" . $this->_server . "' xmlns='jabber:client' ";
                         $xml .= "xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>";
+
                         if ( $this->write($xml) === false )
-                                throw new Exception('[starttls] #4 Cannot write to socket (' . $this->_socket . '). File: ' . __FILE__ . '  ::  ' . __LINE__);
-
-                        usleep(90000);
-                        $this->blocking($this->_socket, 0);
-
-                        if ( ($xml = $this->read()) === false )
-                                throw new Exception('[starttls] #5 it isn\'t possible read the socket. File: ' . __FILE__ . '  ::  ' . __LINE__);
-
+                                throw new Exception('[starttls] #2 Cannot write to socket (' . $this->_socket . '). File: ' . __FILE__ . '  ::  ' . __LINE__);
+
+                        usleep(50000);
+
+                        fread($this->_socket, 4096);
+
+                        usleep(50000);
+                        
+                        fread($this->_socket, 4096);
+                        
                         if ( !$this->_plain() )
-                                throw new Exception('[starttls] #6 it isn\'t possible carry out the verification. File: ' . __FILE__ . '  ::  ' . __LINE__);
+                                throw new Exception('[starttls] #3 it isn\'t possible carry out the verification. File: ' . __FILE__ . '  ::  ' . __LINE__);
 
                         return true;

trunk/instant_messenger/js/client.js

@@ -81 +81 @@
 }
 
+var _bkp_onbeforeunload = window.onbeforeunload;
+
 window.onbeforeunload = function()
 {
+        if ( typeof _bkp_onbeforeunload == 'function' )
+                _bkp_onbeforeunload();
+
         disconnected = true;
         var i;
@@ -88 +93 @@
                 con.__HTTP__[i].abort();
 };
-//window.onbeforeunload = function(){con.__HTTP__['$this.Ujabber.listen'].abort();}