Changeset 2247

Timestamp:

03/15/10 14:10:57 (14 years ago)

Author:

eduardoalex

Message:

Ticket #887 - Alteracao da mensagem exibida para o usuario, sera necessario atualizar o lang

Location:

trunk/expressoMail1_2

Files:

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

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

@@ -1823 +1823 @@
                 $namebox = mb_convert_encoding($namebox, "UTF7-IMAP","UTF-8");
                 $new_box = mb_convert_encoding($new_box, "UTF7-IMAP","UTF-8");
-
-                if(!imap_renamemailbox($mbox_stream,"{".$imap_server."}$namebox","{".$imap_server."}$new_box"))
-                {
-                        $result = imap_errors();
+                if(!$this->folder_exists($new_box))
+                {
+                        if(!imap_renamemailbox($mbox_stream,"{".$imap_server."}$namebox","{".$imap_server."}$new_box"))
+                        {
+                                $result = imap_errors();
+                        }
+                }
+                else{
+                        $result = "Mailbox already exists";
                 }
                 if($mbox_stream)

trunk/expressoMail1_2/js/TreeShow.js

@@ -67 +67 @@
         {
                 // IE does not understand regExp!!!
-                if (is_ie)
-                        var reTipo = /^[a-z0-9 \-_+=]*$/i;
-                else
-                        eval('var reTipo = /^[a-z0-9 \-_+=áéíóúàèìòùâêôãõÃÕÁÉÍÓÚÀÈÌÒÙÂÊÔçÇüñ]*$/i');
-                return reTipo.test(exp);
+                if (is_ie)
+                        var reTipo = /[^a-z0-9 \-_+=]*$/i;
+                else
+                        reTipo = /[^a-z0-9 \-_=áéíóúàèìòùâêôãõÃÕÁÉÍÓÚÀÈÌÒÙÂÊÔçÇüñ]/i;
+                        
+        return reTipo.test(exp);
         }
 
@@ -149 +150 @@
                 var newp2 = "";
                 if( aux[0] == "root"){
-                        if(!this.verify(newp)){
-                                alert(get_lang("Type without spaces, dots or special characters!"));
+                        if(this.verify(newp)){
+                                alert(get_lang("The folder name must not contain special characters."));
                                 newp = "";
                                 return false;
@@ -158 +159 @@
                         }
                 }else{
-                        if(!this.verify(newp)){
-                                alert(get_lang("Type without spaces, dots or special characters!"));
+                        if(this.verify(newp)){
+                                alert(get_lang("The folder name must not contain special characters."));
                                 newp = "";
                                 return false;
@@ -205 +206 @@
                                 return false;
                         }else{
-                                if(!this.verify(rename)){
-                    alert(get_lang("Type without spaces, dots or special characters!"));
+                                if(this.verify(rename)){
+                    alert(get_lang("The folder name must not contain special characters."));
                                         rename = "";
                                         return false;
@@ -224 +225 @@
                         var handler_return = function(data)
                         {
-                                expresso.connector.purgeCache();
-                                ttreeBox.name_folder = "root";
-                                ttreeBox.update_folder();
+                                if (data != "Ok") {
+                                        alert(get_lang(data));
+                                }
+                                else {
+                                        expresso.connector.purgeCache();
+                                        ttreeBox.name_folder = "root";
+                                        ttreeBox.update_folder();
+                                }
                         }
                         var args = "$this.imap_functions.ren_mailbox";

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -456 +456 @@
 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 folder name must not contain special characters.    expressoMail1_2 pt-br   O nome da pasta não deve conter caracteres especiais.
 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.