Changeset 305 for trunk/instant_messenger/inc/class.Ujabber.inc.php

Timestamp:

06/06/08 13:54:09 (16 years ago)

Author:

niltonneto

Message:

Correçoes

File:

• trunk/instant_messenger/inc/class.Ujabber.inc.php (modified) (6 diffs)

trunk/instant_messenger/inc/class.Ujabber.inc.php

@@ -1 +1 @@
 <?php
-
+#error_reporting(E_ALL);
 require_once 'Jabberd2.abstract.php';
 
 class Ujabber extends Jabberd2
 {
-        private $set_presence;
-        
         public final function __construct($pConnectionType = 'write')
-        {       
-                session_start();
+        {
+                /*session_start();
+
                 $this->_user     = $_SESSION['phpgw_info']['instant_messenger']['user'];
+                //$this->_user     = 'niltonneto';//$_SESSION['phpgw_info']['instant_messenger']['user'];
+                //$this->_pass     = 'nine59ever';//$_SESSION['phpgw_info']['instant_messenger']['passwd'];
+                //$this->_pass     = 'senha';//$_SESSION['phpgw_info']['instant_messenger']['passwd'];
                 $this->_pass     = $_SESSION['phpgw_info']['instant_messenger']['passwd'];
                 $this->_server   = $_SESSION['phpgw_info']['instant_messenger']['name_jabber'];
-                $this->_port     = $_SESSION['phpgw_info']['instant_messenger']['port_jabber'];
+                $this->_port     = '8883';//$_SESSION['phpgw_info']['instant_messenger']['port_jabber'];
                 $this->_resource = $_SESSION['phpgw_info']['instant_messenger']['resource_jabber'];
-                $webjabber       = $_SESSION['phpgw_info']['instant_messenger']['webjabber'];
-                session_write_close();
+                //$webjabber       = 'im.pr.gov.br';//$_SESSION['phpgw_info']['instant_messenger']['webjabber'];
+                $webjabber       = '10.15.22.236';//$_SESSION['phpgw_info']['instant_messenger']['webjabber'];
 
-                if ( $this->connect($this->_user . '@' . $this->_server . '/' . $this->_resource . ':' . $this->_port, $this->_pass, $pConnectionType, $webjabber) )
-                        $this->connected = true;
-                else
+                session_write_close();*/
+
+                try
+                {
+                        if ( !file_exists(dirname(__FILE__) . '/../instant_messenger.define.php') )
+                                throw new Exception(__CLASS__ . '[ ERROR #1 ] : Not found configuration file');
+
+                        require_once dirname(__FILE__) . '/../instant_messenger.define.php';
+
+                        if ( !(defined('JABBER_URL') && defined('JABBER_RESOURCE')) )
+                                throw new Exception(__CLASS__ . '[ ERROR #2 ] : Jabber server is not cofigured');
+
+                        if ( !(defined('WEBJABBER_URL') && defined('WEBJABBER_PORT')) )
+                                throw new Exception(__CLASS__ . '[ ERROR #3 ] : Webabber server is not cofigured');
+
+                        $this->_server = constant('JABBER_URL');
+                        $this->_resource = constant('JABBER_RESOURCE');
+
+                        $this->_port = constant('WEBJABBER_PORT');
+
+                        session_start();
+                        $this->_user = $_SESSION['phpgw_info']['instant_messenger']['user'];
+                        $this->_pass = $_SESSION['phpgw_info']['instant_messenger']['passwd'];
+                        session_write_close();
+
+                        $access_string = $this->_user . '@' . $this->_server . '/' . $this->_resource . ':' . $this->_port;
+
                         $this->connected = false;
+                        if ( $this->connect($access_string, $this->_pass, $pConnectionType, constant('WEBJABBER_URL')) )
+                                $this->connected = true;
+                }
+                catch(Exception $e)
+                {
+                        echo $e->getMessage();
+                }
         }
 
@@ -30 +63 @@
                 flush();
         }
-        
+
         public final function isConnected()
         {
@@ -40 +73 @@
                 if ( !$this->isConnected() )
                         return "disconnected";
-
-                $this->get_last_access_user(array("jid" => "this"));    
 
                 if ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') )
@@ -56 +87 @@
 
                         $init = time();
+                        $buffer = '';
 
                         while ( ( connection_aborted() === 0 ) && time() - $init < 50 )
                         {
-                                if( isset($xml) )       
-                                        unset($xml);
-                        
                                 # read from server and write in the client
                                 $xml = $this->readSocket();
+                                //var_dump($xml);
+                                if ( strlen($xml) && $xml != ' ' )
+                                {
+                                        if ( $xml[strlen($xml) - 1 ] != '>' )
+                                        {
+                                                $buffer .= $xml;
+                                                $xml = '';
+                                        }
+                                        else
+                                        {
+                                                $xml = $buffer . $xml;
+                                                $buffer = '';
+                                                //var_dump($xml);
+                                                //strlen($xml);
+                                                //exit;
+                                        }
+                                }
                                 $xml = ( strlen($xml) ) ? $xml : ' ';
-                                //$xml = ( strlen($xml) ) ? $xml : '_##_';
                                 printf("%s", $xml);
                                 ob_flush();
@@ -85 +130 @@
                 $pSendMessage['body'] = preg_replace($patterns, $replace, $pSendMessage['body']);
 
-                $_emotions  = '/<img[^>]*emotion="(\S+)?"[^>]*>/'; 
+                $_emotions  = '/<img emotion="(\S+)?"[^>]+>/';
                 $_emotions = preg_match_all($_emotions, $pSendMessage['body'], $emotions);
 
@@ -134 +179 @@
 
                         //retirar a linha abaixo para voltar ao padrão conforme acima
-                        $xml .= "<body><![CDATA[" . htmlentities($content['body']) . "]]></body>";
+                        $xml .= "<body><![CDATA[" . $content['body'] . "]]></body>";
                         $xml .= $payload;
                         $xml .= "</message>";