Changeset 2247 for trunk/expressoMail1_2
- Timestamp:
- 03/15/10 14:10:57 (15 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r2213 r2247 1823 1823 $namebox = mb_convert_encoding($namebox, "UTF7-IMAP","UTF-8"); 1824 1824 $new_box = mb_convert_encoding($new_box, "UTF7-IMAP","UTF-8"); 1825 1826 if(!imap_renamemailbox($mbox_stream,"{".$imap_server."}$namebox","{".$imap_server."}$new_box")) 1827 { 1828 $result = imap_errors(); 1825 if(!$this->folder_exists($new_box)) 1826 { 1827 if(!imap_renamemailbox($mbox_stream,"{".$imap_server."}$namebox","{".$imap_server."}$new_box")) 1828 { 1829 $result = imap_errors(); 1830 } 1831 } 1832 else{ 1833 $result = "Mailbox already exists"; 1829 1834 } 1830 1835 if($mbox_stream) -
trunk/expressoMail1_2/js/TreeShow.js
r1999 r2247 67 67 { 68 68 // IE does not understand regExp!!! 69 if (is_ie) 70 var reTipo = /^[a-z0-9 \-_+=]*$/i; 71 else 72 eval('var reTipo = /^[a-z0-9 \-_+=áéíóúàèìòùâêôãõÃÕÁÉÍÓÚÀÈÌÒÙÂÊÔçÇüñ]*$/i'); 73 return reTipo.test(exp); 69 if (is_ie) 70 var reTipo = /[^a-z0-9 \-_+=]*$/i; 71 else 72 reTipo = /[^a-z0-9 \-_=áéíóúàèìòùâêôãõÃÕÁÉÍÓÚÀÈÌÒÙÂÊÔçÇüñ]/i; 73 74 return reTipo.test(exp); 74 75 } 75 76 … … 149 150 var newp2 = ""; 150 151 if( aux[0] == "root"){ 151 if( !this.verify(newp)){152 alert(get_lang("T ype without spaces, dots or special characters!"));152 if(this.verify(newp)){ 153 alert(get_lang("The folder name must not contain special characters.")); 153 154 newp = ""; 154 155 return false; … … 158 159 } 159 160 }else{ 160 if( !this.verify(newp)){161 alert(get_lang("T ype without spaces, dots or special characters!"));161 if(this.verify(newp)){ 162 alert(get_lang("The folder name must not contain special characters.")); 162 163 newp = ""; 163 164 return false; … … 205 206 return false; 206 207 }else{ 207 if( !this.verify(rename)){208 alert(get_lang("T ype without spaces, dots or special characters!"));208 if(this.verify(rename)){ 209 alert(get_lang("The folder name must not contain special characters.")); 209 210 rename = ""; 210 211 return false; … … 224 225 var handler_return = function(data) 225 226 { 226 expresso.connector.purgeCache(); 227 ttreeBox.name_folder = "root"; 228 ttreeBox.update_folder(); 227 if (data != "Ok") { 228 alert(get_lang(data)); 229 } 230 else { 231 expresso.connector.purgeCache(); 232 ttreeBox.name_folder = "root"; 233 ttreeBox.update_folder(); 234 } 229 235 } 230 236 var args = "$this.imap_functions.ren_mailbox"; -
trunk/expressoMail1_2/setup/phpgw_pt-br.lang
r2173 r2247 456 456 The field \"%1\" of the message it contains expressoMail1_2 pt-br O campo \"%1\" da mensagem contém 457 457 The folder %1 was successfully removed expressoMail1_2 pt-br A pasta %1 foi removida com sucesso! 458 The folder name must not contain special characters. expressoMail1_2 pt-br O nome da pasta não deve conter caracteres especiais. 458 459 The folder was not deleted! expressoMail1_2 es-es A pasta não foi removida! 459 460 The import was executed successfully. expressoMail1_2 pt-br A importação foi executada com sucesso.
Note: See TracChangeset
for help on using the changeset viewer.