Changeset 6952 for trunk

Timestamp:

08/07/12 10:04:50 (12 years ago)

Author:

marcosw

Message:

Ticket #2998 - Correção na exibição de erros ao mover mensagens

Location:

trunk/expressoMail1_2

Files:

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

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -3543 +3543 @@
                                 if($mbox_stream)
                                         imap_close($mbox_stream);
-                                return "move_messages() line ".__LINE__.": ". imap_last_error()." folder:".$newmailbox;
+                                
+                                $msg_error = "move_messages() line ".__LINE__.": ". imap_last_error()." folder:".$newmailbox;
+                                trigger_error($msg_error);
+                                return $msg_error;
                         }
                 }

trunk/expressoMail1_2/js/main.js

@@ -1107 +1107 @@
                                 return false;
                         }else{
-                                alert(get_lang('Error moving message.')+":\n"+data);
+                                data = data.split("/").reverse(); //Recupera o nome da pasta do array
+                                write_msg(get_lang('Error moving message.')+" "+get_lang('Permission denied to folder "%1".', data[0]));
                                 return false;
                         }
                 //Este bloco verifica as permissoes ACL sobre pastas compartilhadas
                 if(data.status == false){
-                        alert(get_lang("You don't have permission for this operation in this shared folder!"));
+                        write_msg(get_lang("You don't have permission for this operation in this shared folder!"));
                         return false;
                 }

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -927 +927 @@
 The contact was moved from recent contacts to personal contacts successful.     expressoMail1_2 pt-br   O Contato foi movido dos contatos recentes para os contatos pessoais com sucesso.
 Permission denied       expressoMail1_2 pt-br   Permissão negada
+Permission denied to folder "%1".       expressoMail1_2 pt-br   Permissão negada para pasta "%1".
 Success expressoMail1_2 pt-br   Concluído