Changeset 512 for trunk/jabberit_messenger/inc

Timestamp:

10/07/08 15:04:27 (16 years ago)

Author:

niltonneto

Message:

Alteração de pasta template.

Location:

trunk/jabberit_messenger/inc

Files:

• jabberit_sessions.inc.php (modified) (2 diffs)
• login.php (modified) (2 diffs)

trunk/jabberit_messenger/inc/jabberit_sessions.inc.php

@@ -15 +15 @@
                 $_SESSION['phpgw_info']['jabberit_messenger']['user_id']    = $GLOBALS['phpgw_info']['user']['account_id'];             
         $_SESSION['phpgw_info']['jabberit_messenger']['passwd']         = $GLOBALS['phpgw_info']['user']['passwd'];
+                $_SESSION['phpgw_info']['jabberit_messenger']['mail']           = $GLOBALS['phpgw_info']['user']['email'];
 
                 //Ldap
@@ -38 +39 @@
                 $_SESSION['phpgw_info']['jabberit_messenger']['use_proxy_java']                 = $GLOBALS['phpgw_info']['server']['use_proxy_java'];
                 $_SESSION['phpgw_info']['jabberit_messenger']['name_company']                   = $GLOBALS['phpgw_info']['server']['name_company_applet_jabberit'];
+                $_SESSION['phpgw_info']['jabberit_messenger']['use_attribute_jabberit'] = $GLOBALS['phpgw_info']['server']['use_attribute_jabberit'];
 
 ?>

trunk/jabberit_messenger/inc/login.php

@@ -18 +18 @@
                 $path = $_SESSION['phpgw_info']['jabberit_messenger']['webserver_url'];
                 $SERVER_EXPRESSO = $_SERVER['HTTP_HOST'] . $path;
-        
+                
+                $uid = $_SESSION['phpgw_info']['jabberit_messenger']['user'];
+                
+                if(isset($_SESSION['phpgw_info']['jabberit_messenger']['use_attribute_jabberit']))
+                {
+                        $attribute = $_SESSION['phpgw_info']['jabberit_messenger']['use_attribute_jabberit'];
+                        
+                        if( trim($attribute) == 'mail')
+                        {
+                                $uid = $_SESSION['phpgw_info']['jabberit_messenger']['mail'];
+                                $uid = substr($uid,0,strpos($uid,"@")); 
+                        }
+                        else
+                        {
+                                $uid = $_SESSION['phpgw_info']['jabberit_messenger']['user'];
+                        }        
+                }
+                
                 $template = new Template('templates/default');
                 $template->set_var("path", $path);
@@ -29 +46 @@
                 $template->set_var("value_port",$_SESSION['phpgw_info']['jabberit_messenger']['port_jabberit']);
                 $template->set_var("value_resource",$_SESSION['phpgw_info']['jabberit_messenger']['resource_jabberit']);
-                $template->set_var("value_user",$_SESSION['phpgw_info']['jabberit_messenger']['user']);
+                $template->set_var("value_user",$uid);
                 $template->set_var("value_password",$_SESSION['phpgw_info']['jabberit_messenger']['passwd']);
                 $template->set_var("value_ssl",$_SESSION['phpgw_info']['jabberit_messenger']['use_ssl_jabberit']);