Changeset 3390 for branches/2.2

Timestamp:

10/21/10 15:29:26 (14 years ago)

Author:

brunocosta

Message:

Ticket #730 - Verificação de criação e renomeação de pastas.

Location:

branches/2.2/expressoMail1_2/js

Files:

• TreeShow.js (modified) (2 diffs)
• local_messages.js (modified) (1 diff)
• messages_controller.js (modified) (2 diffs)

branches/2.2/expressoMail1_2/js/TreeShow.js

@@ -109 +109 @@
                                                 return false; //Não posso criar pastas contendo a string local_                                 
                                         }
+                                        if(button.match(/[\/\\\!\@\#\$\%\&\*\(\)]/gi)){
+                                            alert(get_lang("cannot create folder. try other folder name"));
+                                            return false;
+                                        }
 
                                         if(trim(button) == "" || trim(button) == null){
@@ -130 +134 @@
                                                 return false; //Não posso criar pastas contendo a string local_                                 
                                         }
+
+                                        if(button1.match(/[\/\\\!\@\#\$\%\&\*\(\)]/gi)){
+                                            alert(get_lang("It's not possible rename this folder. try other folder name"));
+                                            return false;
+                                        }
+
                                         if(trim(button1) == "" || trim(button1) == null){
                                                 return false;

branches/2.2/expressoMail1_2/js/local_messages.js

@@ -716 +716 @@
     } catch (error) {
         this.finalize();
-        throw error;
         return false;
     }

branches/2.2/expressoMail1_2/js/messages_controller.js

@@ -108 +108 @@
                 if (this.is_local_folder(ttree.FOLDER)) {
                         folder = prompt(get_lang("Enter a name for the box"), "");
+                        if(folder.match(/[\/\\\!\@\#\$\%\&\*\(\)]/gi)){
+                            alert(get_lang("It's not possible rename this folder. try other folder name"));
+                            return false;
+                        }
                         if(trim(folder) == "" || trim(folder) == null){
                                 alert(get_lang("you have to enter the name of the new folder"));
@@ -130 +134 @@
                                 alert(get_lang("you have to enter the name of the new folder"));
                                 return false;
+                        }
+                        if(folder.match(/[\/\\\!\@\#\$\%\&\*\(\)]/gi)){
+                            alert(get_lang("cannot create folder. try other folder name"));
+                            return false;
                         }
                         if(ttree.FOLDER=="local_root")