Changeset 512

Timestamp:

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

Author:

niltonneto

Message:

Alteração de pasta template.

Location:

trunk/jabberit_messenger

Files:

• inc/jabberit_sessions.inc.php (modified) (2 diffs)
• inc/login.php (modified) (2 diffs)
• templates/celepar/config.tpl (modified) (1 diff)

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']);

trunk/jabberit_messenger/templates/celepar/config.tpl

@@ -57 +57 @@
         </td>
    </tr>
+   
+   <tr bgcolor="{row_on}">
+        <td>Usar o Atributo:</td>
+        <td>
+                <select name="newsettings[use_attribute_jabberit]">
+                        <option value="uid" {selected_use_attribute_jabberit_uid}>uid</option>
+                        <option value="mail" {selected_use_attribute_jabberit_mail}>mail</option>
+                </select>
+        </td>
+   </tr>
 
-        <tr bgcolor="{row_on}">
+        <tr bgcolor="{row_off}">
                 <td colspan="2">&nbsp;<b>Configurando o Nome da Empresa</b></td>
         </tr>
         
-        <tr bgcolor="{row_off}">
-                <td id="JETTI_name_company_applet_jabberit__label">Digite o Nome da sua Empresa</td> 
+        <tr bgcolor="{row_on}">
+                <td id="JETTI_name_company_applet_jabberit__label">Digite o Nome da sua Empresa:</td> 
                 <td><input type="text" id="JETTI_name_company_applet_jabberit" name="newsettings[name_company_applet_jabberit]" value="{value_name_company_applet_jabberit}"></td>      
         </tr>
 
-   <tr bgcolor="{row_on}">
+   <tr bgcolor="{row_off}">
     <td colspan="2">&nbsp;<b>Configuração do Servidor Ldap</b></td>
    </tr>
 
-   <tr bgcolor="{row_off}">
+   <tr bgcolor="{row_on}">
     <td id="JETTI_server_ldap_jabberit__label">Servidor Ldap:</td>
     <td><input type="text" id="JETTI_server_ldap_jabberit" name="newsettings[server_ldap_jabberit]" value="{value_server_ldap_jabberit}"></td>
    </tr>
 
-   <tr bgcolor="{row_on}">
+   <tr bgcolor="{row_off}">
     <td id="JETTI_context_ldap_jabberit__label">Contexto:</td>
     <td><input type="text" id="JETTI_context_ldap_jabberit" name="newsettings[context_ldap_jabberit]" value="{value_context_ldap_jabberit}" size="30"></td>
    </tr>
 
-   <tr bgcolor="{row_off}">
+   <tr bgcolor="{row_on}">
     <td id="JETTI_user_ldap_jabberit__label">Usuário Ldap:</td>
     <td><input type="text" id="JETTI_user_ldap_jabberit" name="newsettings[user_ldap_jabberit]" value="{value_user_ldap_jabberit}" size="30"></td>
    </tr>
 
-   <tr bgcolor="{row_on}">
+   <tr bgcolor="{row_off}">
     <td id="JETTI_password_ldap_jabberit__label">Password:</td>
     <td><input type="password" id="JETTI_password_ldap_jabberit" name="newsettings[password_ldap_jabberit]" value="{value_password_ldap_jabberit}"></td>