Changeset 265 for trunk/instant_messenger/inc

Timestamp:

04/14/08 14:20:28 (16 years ago)

Author:

niltonneto

Message:

 

Location:

trunk/instant_messenger/inc

Files:

• Jabber.abstract.php (modified) (2 diffs)
• class.Ujabber.inc.php (modified) (1 diff)
• im_sessions.inc.php (modified) (1 diff)

trunk/instant_messenger/inc/Jabber.abstract.php

@@ -32 +32 @@
         const NOTICE  = 'NOTICE';
 
-        private final function _connect( $pUser = false, $pPassword = false, $pConnectionType = false )
+        private final function _connect( $pUser = false, $pPassword = false, $pConnectionType = false, $pWebjabber = false )
         {       
                 try
@@ -41 +41 @@
                         list($subject, $USER, $SERVER, $RESOURCE, $PORT) = $matches;
 
-                        if ( !($socket = $this->open('tcp://' . $SERVER . ':' . $PORT, 1, 1)) )
-                                throw new Exception('[connect] #2 can\'t access tcp://' . $SERVER . ':' . $PORT . '. File: ' . __FILE__ . '  ::  ' . __LINE__);
+                        if ( !$pWebjabber || empty($pWebjabber) )
+                                $pWebjabber = $SERVER;
+
+                        if ( !($socket = $this->open('tcp://' . $pWebjabber . ':' . $PORT, 1, 1)) )
+                                throw new Exception('[connect] #2 can\'t access tcp://' . $pWebjabber . ':' . $PORT . '. File: ' . __FILE__ . '  ::  ' . __LINE__);
 
                         $this->_socket = $socket;

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

@@ -14 +14 @@
                 $this->_port     = $_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();
 
-                if ( $this->connect($this->_user . '@' . $this->_server . '/' . $this->_resource . ':' . $this->_port, $this->_pass, 'read/write') )
+                if ( $this->connect($this->_user . '@' . $this->_server . '/' . $this->_resource . ':' . $this->_port, $this->_pass, 'read/write', $webjabber) )
                         $this->connected = true;
                 else

trunk/instant_messenger/inc/im_sessions.inc.php

@@ -13 +13 @@
                 $_SESSION['phpgw_info']['instant_messenger']['user_ldap_jabber']     = $GLOBALS['phpgw_info']['server']['user_ldap_jabber'];
                 $_SESSION['phpgw_info']['instant_messenger']['password_ldap_jabber'] = $GLOBALS['phpgw_info']['server']['password_ldap_jabber'];
+                $_SESSION['phpgw_info']['instant_messenger']['webjabber']                        = $GLOBALS['phpgw_info']['server']['wejabber'];                
                 
                 $_SESSION['phpgw_info']['instant_messenger']['server']['db_name'] = $GLOBALS['phpgw_info']['server']['db_name'];