Changeset 1430

Timestamp:

09/21/09 14:52:07 (15 years ago)

Author:

alexandrecorreia

Message:

Ticket #588 - Conexão através do proxy ( Squid ) , utilizando mode Digest e Basic.

File:

• trunk/jabberit_messenger/inc/login.php (modified) (2 diffs)

trunk/jabberit_messenger/inc/login.php

@@ -127 +127 @@
                 $language = $lang[0];
                 
+                // Porta/(SSL)?                 
+                $conn_SSL = "false";
+                $port_jabber = "5222";
+                
+                if( $_SESSION['phpgw_info']['jabberit_messenger']['port_1_jabberit'] === "true" )
+                {       
+                        $conn_SSL = "true";
+                        $port_jabber = "5223";
+                }
+                                
+                if( trim($_SESSION['phpgw_info']['jabberit_messenger']['port_2_jabberit']) )
+                {               
+                        $port_jabber = $_SESSION['phpgw_info']['jabberit_messenger']['port_2_jabberit'];
+                }
+                
                 // Load Template;
                 $template = new Template('templates/default');
@@ -136 +151 @@
                 $template->set_var("value_country", $country);
                 $template->set_var("value_expresso", $SERVER_EXPRESSO);         
-                $template->set_var("value_host", $_SESSION['phpgw_info']['jabberit_messenger']['name_jabberit']);
+                $template->set_var("value_host", $_SESSION['phpgw_info']['jabberit_messenger']['ip_server_jabberit']);
                 $template->set_var("value_javaPlugins", $javaPlugins);
                 $template->set_var("value_language", $language);                        
                 $template->set_var("value_password", $_SESSION['phpgw_info']['jabberit_messenger']['passwd']);
-                $template->set_var("value_port", $_SESSION['phpgw_info']['jabberit_messenger']['port_jabberit']);
+                $template->set_var("value_port", $port_jabber);
                 $template->set_var("value_resource", $_SESSION['phpgw_info']['jabberit_messenger']['resource_jabberit']);
                 $template->set_var("value_server", $_SESSION['phpgw_info']['jabberit_messenger']['name_jabberit']);
-                $template->set_var("value_ssl", $_SESSION['phpgw_info']['jabberit_messenger']['use_ssl_jabberit']);
+                $template->set_var("value_ssl", $conn_SSL);
                 $template->set_var("value_use_https", $PROTOCOL);
                 $template->set_var("value_user", $uid);
-                $template->set_var("value_userproxy", $_SESSION['phpgw_info']['jabberit_messenger']['use_proxy_java']);
-                
+
                 if( strpos($_SERVER['HTTP_USER_AGENT'], "MSIE") )
                         $template->set_file(Array('jabberit_messenger' => 'jabberIM_IE.tpl'));