Changeset 8014 for trunk

Timestamp:

03/14/13 17:06:36 (10 years ago)

Author:

angelo

Message:

Ticket #3388 - Problema ao renomear pasta que contenha ponto

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)
• prototype/modules/mail/js/foldertree.js (modified) (1 diff)

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

@@ -2638 +2638 @@
         function ren_mailbox($arr)
         {
-                $namebox = $arr['current'];
-                $new_box = $arr['rename'];
+                $namebox = $arr['current'];             
+                $path_delimiter = strrpos($namebox,$this->imap_delimiter)+1;
+                $base_path = substr($namebox,0,$path_delimiter);
+                $test = preg_split("/\/|\./",substr($arr['rename'], $path_delimiter));
+                $new_box = array_shift($test);
+                $subfolders = $test;
                 $imap_server = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer'];
                 $mbox_stream = $this->open_mbox();
                 //$ren_folder = imap_renamemailbox($mbox_stream,"{".$imap_server."}INBOX.$namebox","{".$imap_server."}INBOX.$new_box");
-
                 $result = "Ok";
                 $namebox = mb_convert_encoding($namebox, "UTF7-IMAP","UTF-8");
-                $new_box = mb_convert_encoding($new_box, "UTF7-IMAP","UTF-8");
+                $new_box = mb_convert_encoding($base_path.$new_box, "UTF7-IMAP","UTF-8");
 
                 if(!imap_renamemailbox($mbox_stream,"{".$imap_server."}$namebox","{".$imap_server."}$new_box"))
@@ -2652 +2655 @@
                         $result = imap_last_error();
                 }
+                /*Cria as subpastas*/
+                if ($result == "Ok" && is_array($subfolders)){
+                        $child = $new_box.$this->imap_delimiter;
+            $subfolders_count = count($subfolders);
+                        for($i =0; $i < $subfolders_count; ++$i){
+                                $child .= ($subfolders[$i] ? $subfolders[$i] : $this->functions->getLang("New Folder"));
+                                $namebox =  mb_convert_encoding($child, "UTF7-IMAP", "UTF-8");
+                                $result = "Ok";
+                                if(!imap_createmailbox($mbox_stream,"{".$imap_server."}$namebox"))
+                                {
+                                        $result = imap_last_error();                                            
+                                }
+                                $child .=$this->imap_delimiter;
+                        }                       
+                }
+
                 if($mbox_stream)
                         imap_close($mbox_stream);

trunk/prototype/modules/mail/js/foldertree.js

@@ -603 +603 @@
                             /* Verifica se existe caracteres especiais no nome da pasta ou se existe "local_"
                              * em parte do nome (palavra reservada para pastas locais) */
-                            if($(this).val().match(/[\/\`\~\^\<\>\|\\\"\!\@\#\$\%\&\*\+\(\)\[\]\{\}\?;:]/gi) || $(this).val().indexOf("local_") != -1)
+                            if($(this).val().match(/[\`\~\^\<\>\|\\\"\!\@\#\$\%\&\*\+\(\)\[\]\{\}\?;:]/gi) || $(this).val().indexOf("local_") != -1)
                             {
                                 return write_msg(get_lang("cannot create folder. try other folder name"));
                             }
-                            var new_name = folder_id.replace(/[a-zA-Z0-9á-úÁ-Ú,=.^\s_-]+$/, $(this).val());
+                            var new_name = folder_id.replace(/[a-zA-Z0-9á-úÁ-Ú,=^\s_-]+$/, $(this).val());
                             if($('[id="' + new_name + '"]').length)
                             {