Changeset 4593 for branches/2.2

Timestamp:

06/10/11 15:59:19 (13 years ago)

Author:

niltonneto

Message:

Ticket #2007 - Corrigido rotina que automatiza criação das pastas faltantes no IMAP.

Location:

branches/2.2/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/draw_api.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (3 diffs)

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1949 +1949 @@
                 foreach($nameboxs as $key=>$tmp){
                         if($tmp != ""){
-                                if(!imap_createmailbox($mbox_stream,imap_utf7_encode("{".$imap_server."}$tmp"))){
-                                        $result = implode("<br />\n", imap_errors());
-                                        if($mbox_stream)
-                                                imap_close($mbox_stream);
-                                        return $result;
+                                $to_create_array = explode($this->imap_delimiter, $tmp);
+                                array_pop(&$to_create_array);
+                                $folder = array();
+                                foreach($to_create_array as $k=>$to_create){
+                                        $folder[] = $to_create;
+                                        if($to_create != 'INBOX') {
+                                                $tmp = implode($this->imap_delimiter, $folder);
+                                                if(!imap_createmailbox($mbox_stream,imap_utf7_encode("{".$imap_server."}$tmp"))){
+                                                        $result = implode("<br />\n", imap_errors());
+                                                        if("Mailbox already exists" != $result) {
+                                                                imap_close($mbox_stream);
+                                                                return $result;
+                                                        }
+                                                }
+                                        }
                                 }
                         }

branches/2.2/expressoMail1_2/js/draw_api.js

@@ -343 +343 @@
                 var nm1 = "";
                 if(tree_folders._folderPr.length > 0){
-                        var nm_folder = "";
-                        for(var i=0; i < tree_folders._folderPr.length; i++){
-                                nm_folder = tree_folders._folderPr[i].split(cyrus_delimiter);
-                                if(nm_folder[0] == "INBOX"){
-                                        if(nm1 == ""){
-                                                nm1 = nm_folder[1];
-                                                folder_create = "INBOX" + cyrus_delimiter + nm_folder[1] + ";";
-                                        }else{
-                                                if( nm1 != nm_folder[1]){
-                                                        folder_create += "INBOX" + cyrus_delimiter + nm_folder[1] + ";";
-                                                        nm1 = nm_folder[1];
-                                                }
+                        folder_create = tree_folders._folderPr.join(';');
+                }
+                if(folder_create != ""){
+                        if(confirm(get_lang("There are folders with invalid format. If you want to fix now, click on button OK."))){
+                                var handler_correct_folders = function(data){
+                                        //Timeout to release HTTPRequest , loadScript and update tree folders.
+                                        if(data){
+                                                write_msg(get_lang('The folders were fixed with success.'));
+                                                setTimeout("connector.loadScript('TreeShow');ttreeBox.update_folder();",500);
                                         }
                                 }
-                        }
-                }
-                if(folder_create != ""){
-                        if(confirm(get_lang("There are folders with invalid format. Do you want to fix them?"))){
-                                var handler_correct_folders = function(data){
-                                        //Timeout to release HTTPRequest , loadScript and update tree folders.
-                                        if(data)
-                                                setTimeout("connector.loadScript('TreeShow');ttreeBox.update_folder();",500);
-                                }
                                 cExecute("$this.imap_functions.create_extra_mailbox",handler_correct_folders,"nw_folders="+folder_create);
+                        }
+                        else{
+                                write_msg(get_lang('Warning: The folders with invalid format will be unavailable.'));
                         }
                 }

branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -506 +506 @@
 The field \"%1\" of the message it contains     expressoMail1_2 pt-br   O campo \"%1\" da mensagem contém
 The folder %1 was successfully removed  expressoMail1_2 pt-br   A pasta %1 foi removida com sucesso!
+The folders were fixed with success.    expressoMail1_2 pt-br   As pastas foram corrigidas com sucesso.
 The folder was not deleted!     expressoMail1_2 es-es   A pasta não foi removida!
 The import was executed successfully.   expressoMail1_2 pt-br   A importação foi executada com sucesso.
@@ -526 +527 @@
 The size of this message has exceeded  the limit (%1B). expressoMail1_2 pt-br   O tamanho desta mensagem excedeu o limite (maior que %1B).
 The Timezone you're in. expressoMail1_2 pt-br   O fuso-horário em que você está.
+There are folders with invalid format. If you want to fix now, click on button OK.      expressoMail1_2 pt-br   Algumas pastas possuem formato inválido.\n Para corrigi-las agora clique no botão 'OK'. 
 This is the number of messages shown in your mailbox per page   expressoMail1_2 pt-br   Este é o número de mensagens mostradas na sua caixa de correio por página
 This list has no participants   expressoMail1_2 pt-br   Esta lista nao possui nenhum participante.
@@ -570 +572 @@
 Voided message  expressoMail1_2 pt-br   Mensagem violada
 Warning: Your Mailbox is almost full!   expressoMail1_2 pt-br   Aviso: Sua caixa postal está quase cheia!
+Warning: The folders with invalid format will be unavailable.   expressoMail1_2 pt-br   Aviso: As pastas com formato inválido estarão indisponíveis.
 was succefully removed  expressoMail1_2 pt-br    foi removida com sucesso
 Wednesday       expressoMail1_2 pt-br   Quarta-feira