Changeset 2986

Timestamp:

07/01/10 11:12:02 (14 years ago)

Author:

amuller

Message:

Ticket #113 - Arrumando lang que pegava do EM que é errado

File:

• trunk/mobile/inc/class.ui_mobilemail.inc.php (modified) (3 diffs)

trunk/mobile/inc/class.ui_mobilemail.inc.php

@@ -264 +264 @@
                          * Inicialização do expressoMail1_2 *
                         \************************************/
-                        // Get Data from ldap_manager and emailadmin.
-                        $ldap_manager = CreateObject('contactcenter.bo_ldap_manager');
                         $boemailadmin   = CreateObject('emailadmin.bo');
                         $emailadmin_profile = $boemailadmin->getProfileList();
@@ -271 +269 @@
                         $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user'];
                         $_SESSION['phpgw_info']['expressomail']['server'] = $GLOBALS['phpgw_info']['server'];
-                        $_SESSION['phpgw_info']['expressomail']['ldap_server'] = $ldap_manager ? $ldap_manager->srcs[1] : null;
+                        
+                        if (isset($GLOBALS['phpgw_info']['server']['ldap_root_pw'])){ // Do not remove this, unless you are "smart" enough to do it
+                                $ldap_manager = CreateObject('contactcenter.bo_ldap_manager');
+                                $_SESSION['phpgw_info']['expressomail']['ldap_server'] = $ldap_manager ? $ldap_manager->srcs[1] : null;
+                        }
                         $_SESSION['phpgw_info']['expressomail']['user']['email'] = $GLOBALS['phpgw']->preferences->values['email'];
                 
@@ -299 +301 @@
                     $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']  = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'] ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']       : "Drafts";
                     $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']              : "Spam";
-                    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']              : "Sent";
-
-                        include("../expressoMail1_2/inc/load_lang.php");                    
+                    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']              : "Sent"; 
         
                 }