Changeset 6919

Timestamp:

07/31/12 15:21:28 (12 years ago)

Author:

gustavo

Message:

Ticket #2971 - Edicao de pastas compartilhadas na propria arvore de pastas

Location:

sandbox/2.4.2-expresso2

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (5 diffs)
• prototype/modules/mail/js/foldertree.js (modified) (3 diffs)

sandbox/2.4.2-expresso2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -128 +128 @@
                 $result = true;
                 if(!imap_renamemailbox($mbox, '{'.$this->imap_server.":".$this->imap_port.$this->imap_options.'}'.$old_folder, '{'.$this->imap_server.":".$this->imap_port.$this->imap_options.'}'.$to_folder.$this->imap_delimiter.$new_folder[count($new_folder)-1])){
-                        $result = imap_errors();
+                        $result = imap_last_error();
                 }
 
@@ -2492 +2492 @@
                         if(!imap_createmailbox($mbox_stream,"{".$imap_server."}".$namebox))
                         {
-                                $result = implode("<br />\n", imap_errors());
+                                $result = imap_last_error();
                         }
                 }else{
@@ -2503 +2503 @@
                                 if(!imap_createmailbox($mbox_stream,"{".$imap_server."}$namebox"))
                                 {
-                                        $result = implode("<br />\n", imap_errors());                                           
+                                        $result = imap_last_error();                                            
                                 }
                                 $child .=$this->imap_delimiter;
@@ -2545 +2545 @@
                 if(!imap_deletemailbox($mbox_stream,"{".$imap_server."}$namebox"))
                 {
-                        $result = implode("<br />\n", imap_errors());
+                        $result = imap_last_error();
                 }
                 /*
@@ -2568 +2568 @@
                 if(!imap_renamemailbox($mbox_stream,"{".$imap_server."}$namebox","{".$imap_server."}$new_box"))
                 {
-                        $result = imap_errors();
+                        $result = imap_last_error();
                 }
                 if($mbox_stream)

sandbox/2.4.2-expresso2/prototype/modules/mail/js/foldertree.js

@@ -289 +289 @@
                                                 cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
                                                 data = connector.unserialize(data);
-                                                if(typeof(data) == "object"){
-                                                        if(data[2] == "Permission denied"){
-                                                                write_msg(get_lang("Permission denied"));
-                                                        }
+                                                if(data == "Permission denied"){
+                                                        write_msg(get_lang("Permission denied"));
                                                 }else if(data){
                                                         write_msg(get_lang("The folder was successfully moved"));
@@ -360 +358 @@
                                                                         data : "current="+folder_id+"&rename="+new_name,
                                                                         success : function(data){
-                                                                                data = connector.unserialize(data)[1];
+                                                                                data = connector.unserialize(data);
                                                                                 if(data == "Permission denied"){
                                                                                         $(".folders-loading").removeClass("folders-loading");
@@ -414 +412 @@
                                                                                         $(".folders-loading").removeClass("folders-loading");
                                                                                         return write_msg(get_lang("Mailbox does not exist"));
-                                                                                }else if(data.substring(data.indexOf("Permission"), data.length) == "Permission denied"){
+                                                                                }else if(data == "Permission denied"){
                                                                                         $(".folders-loading").removeClass("folders-loading");
                                                                                         cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);