Changeset 5121 for branches/2.2


Ignore:
Timestamp:
10/27/11 15:10:59 (8 years ago)
Author:
alexandrecorreia
Message:

Ticket #2302 - Corrigido erro ao remover mensagens pelo modulo do mobile

Location:
branches/2.2/mobile
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2/mobile/inc/class.ui_mobilemail.inc.php

    r5087 r5121  
    334334 
    335335                        // echo '<script> var array_lang = new Array();var use_spam_filter = \''.$current_config['expressoMail_use_spam_filter'].'\' </script>'; 
    336  
    337336                        // End Set Anti-Spam options. 
    338337                 
    339338                    // Set Imap Folder names options 
    340                     $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']   = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']     ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']             : "Trash"; 
    341                     $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']  = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'] ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']       : "Drafts"; 
    342                     $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']              : "Spam"; 
    343                     $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']              : "Sent"; 
    344  
    345                         // include("../expressoMail1_2/inc/load_lang.php");                  
     339                    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']   = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']     ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']             : lang("Trash"); 
     340                    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']  = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'] ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']       : lang("Drafts"); 
     341                    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']              : lang("Spam"); 
     342                    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']              : lang("Sent"); 
     343                 
    346344                } 
    347345 
     
    10051003                        else 
    10061004                        { 
    1007                                 $imapDefaultTrashFolder = ( isset($email_server['imapDefaultTrashFolder']) ) ? $email_server['imapDefaultTrashFolder'] : "Trash"; 
    1008  
     1005                                $imapDefaultTrashFolder = ( isset($email_server['imapDefaultTrashFolder']) && trim($email_server['imapDefaultTrashFolder']) !== "" ) ? $email_server['imapDefaultTrashFolder'] : lang("Trash"); 
     1006                                 
    10091007                                $folderTrash = "INBOX".$this->imap_functions->imap_delimiter.$imapDefaultTrashFolder; 
    10101008 
  • branches/2.2/mobile/setup/phpgw_pt-br.lang

    r5063 r5121  
    138138short Saturday  mobile  pt-br   Sáb 
    139139short Sunday    mobile  pt-br   Dom 
     140Spam    mobile  pt-br   Spam 
    140141You have been successfully logged out   mobile  pt-br   Você desconectou do expresso com sucesso. 
    141142now     mobile  pt-br   Agora 
Note: See TracChangeset for help on using the changeset viewer.