Changeset 5898 for branches/2.3/expressoMail1_2/index.php

Timestamp:

04/09/12 15:21:57 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #2256 - Problemas com o token iKey 2032 / 4000.

File:

• branches/2.3/expressoMail1_2/index.php (modified) (2 diffs)

branches/2.3/expressoMail1_2/index.php

@@ -182 +182 @@
     var sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'";
     var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'";
+    var locale = "'.$GLOBALS['phpgw']->translation->userlang.'";
     var token_param = "'.$var_tokens.'";
-    var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'";
+
     </script>';
-
+    
     // End Set Imap Folder names options
         //User info
@@ -221 +222 @@
         echo '<script type="text/javascript">init();</script>';
 
-        // Maybe it's better to put locale in another place.
-        $locale = $GLOBALS['phpgw']->translation->userlang;
-        echo '<input type="hidden" id="locale" name="locale" value="'.$locale.'" />';
-
         if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'])
         {