Changeset 5516
- Timestamp:
- 02/15/12 16:26:39 (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r5509 r5516 101 101 return $this->mbox; 102 102 } 103 104 /** 105 * Move as pastas que vieram do resultado de um Drag & Drop da arvore de pastas do Expresso Mail 106 * 107 * @license http://www.gnu.org/copyleft/gpl.html GPL 108 * @author Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br) 109 * @sponsor Caixa Econômica Federal 110 * @author Gustavo Pereira dos Santos Stabelini 111 * @param array $params Contem dois indices : um contem o caminho atual da pasta, e o outro contem o caminho futuro da pasta 112 * @return boolean 113 * @access public 114 */ 103 115 104 116 function move_folder($params){ … … 108 120 $to_folder = mb_convert_encoding($params['folder_to'], 'UTF7-IMAP','UTF-8, ISO-8859-1, UTF7-IMAP'); 109 121 $mbox = imap_open('{'.$this->imap_server.":".$this->imap_port.$this->imap_options.'}'.$new_folder[0], $this->username, $this->password); 110 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]); 122 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])); 123 return false; 111 124 imap_close($mbox); 112 125 return true; -
trunk/expressoMail1_2/js/draw_api.js
r5507 r5516 461 461 $("#new_m").html(($(".selected").find(".folder_unseen").html() != "0" && $(".selected").find(".folder_unseen").html() != null)? $(".selected").find(".folder_unseen").html() : "0").css("color", "red"); 462 462 //update_menu(); 463 $(".folders_loading").removeClass("folders_loading"); 463 464 return true; 464 465 } 465 466 proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort_box_type,search_box_type,sort_box_reverse,preferences.preview_msg_subject,preferences.preview_msg_tip,handler_draw_box); 466 467 } 467 else 468 else{ 469 $(".folders_loading").removeClass("folders_loading"); 468 470 alternate_border(0); 471 } 469 472 } 470 473 -
trunk/expressoMail1_2/js/main.js
r5514 r5516 951 951 //cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + current_folder, show_msg); 952 952 if(!not_opem_previus){ 953 Execute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + url_encode(folder), show_msg);953 cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + url_encode(folder), show_msg); 954 954 } 955 955 } -
trunk/prototype/modules/mail/css/foldertree.css
r5504 r5516 1 1 #content_folders.foldertree-skin-prognus span.selected {font-weight:bold;} 2 2 #content_folders.foldertree-skin-prognus span.inbox {} 3 #content_folders.foldertree-skin-prognus span.trash {background-image: url(../img/bin.png) !important;}4 #content_folders.foldertree-skin-prognus span.drafts {background-image: url(../img/folder_page_white.png) !important;}5 #content_folders.foldertree-skin-prognus span.spam {background-image: url(../img/folder_delete.png) !important;}6 #content_folders.foldertree-skin-prognus span.sent {background-image: url(../img/folder_go.png) !important;}3 #content_folders.foldertree-skin-prognus span.trash {background-image: url(../img/bin.png);} 4 #content_folders.foldertree-skin-prognus span.drafts {background-image: url(../img/folder_page_white.png);} 5 #content_folders.foldertree-skin-prognus span.spam {background-image: url(../img/folder_delete.png);} 6 #content_folders.foldertree-skin-prognus span.sent {background-image: url(../img/folder_go.png);} 7 7 #content_folders.foldertree-skin-prognus span.folder {display: block;padding-bottom: 1px;padding-left: 18px;padding-right: 0;padding-top: 1px;} 8 8 #content_folders.treeview .closed {display:block;} … … 52 52 53 53 .collapse_folders_td{ 54 cursor : pointer; 54 55 width: 12px; 55 56 height:100%; -
trunk/prototype/modules/mail/js/foldertree.js
r5505 r5516 26 26 if($(children_of_this_folder[index]).attr('id') == openTab.imapBox[$(borders_open[i]).find("input[type=hidden]").attr("name")]){ 27 27 error = true; 28 alert(get_lang("One or more messages from any sub-folder are open"));28 write_msg(get_lang("One or more messages from any sub-folder are open")); 29 29 return error; 30 30 … … 37 37 if(openTab.imapBox[$(borders_open[i]).find("input[type=hidden]").attr("name")] == folder_to_move){ 38 38 error = true; 39 alert(get_lang("One or more messages from this folder are open"));39 write_msg(get_lang("One or more messages from this folder are open")); 40 40 return error; 41 41 } … … 79 79 80 80 // MUDANÇA DE PASTAS! 81 var target = $(this); 81 var target = $(this); 82 83 if($(".folders_loading").length) 84 return; 85 82 86 if( target.is('.collapsable-hitarea, .expandable-hitarea, .lastCollapsable-hitarea, .lastExpandable-hitarea, .treeview ,.folder_unseen,.ui-icon, .float-menu, .new_folder, .folders_loading') ) 83 87 return; 88 84 89 if( target.parent().find(".new_folder").length) 85 90 return; … … 95 100 $(target).children('.folder').addClass('selected'); 96 101 } 102 $(this).addClass("folders_loading"); 97 103 selected = target.attr('id'); 98 change_folder(target.attr('id'), child.attr('title')); 104 change_folder(target.attr('id'), child.attr('title')); 99 105 }).end(); 100 106 folders_html.find('[id="'+selected+'"]').children().addClass("selected").end().end().find("li:first").find(".folder").not(".head_folder,.inbox,.drafts,.sent,.spam,.trash").draggable({ … … 182 188 // VALIDA SE O USUARIO ESTA TENTANDO MOVER A PASTA PARA O eventSMO LOCAL 183 189 if(teste == folder_to_move){ 184 return alert(get_lang("Thie folder is already in this place"));190 return write_msg(get_lang("Thie folder is already in this place")); 185 191 } 186 192 187 193 // VALIDA SE O USUARIO ESTA TENTANDO MOVER A PASTA ABERTA NO momentO 188 194 if(folder_to_move == get_current_folder()){ 189 return alert(get_lang("It's not possible move this folder, because it is being used in the moment!"));195 return write_msg(get_lang("It's not possible move this folder, because it is being used in the moment!")); 190 196 } 191 197 192 198 // VALIDA SE O USUARIO ESTA TENTANDO MOVER UMA PASTA FILHA DA PASTA ABERTA NO momentO 193 199 if(ui.draggable.parent().find(".selected")[0]){ 194 return alert(get_lang("It's not possible move this folder, because its subfolder is being used in the moment!"));200 return write_msg(get_lang("It's not possible move this folder, because its subfolder is being used in the moment!")); 195 201 } 196 202 197 203 // VALIDA SE O USUARIO ESTA TENTANDO MOVER UMA PASTA PAI PARA DENTRO DE UMA FILHA 198 204 if(ui.draggable.parent().find('[id="'+folder_to+'"]')[0]){ 199 return alert(get_lang("It's not possible to move this folder to its subfolders!"));205 return write_msg(get_lang("It's not possible to move this folder to its subfolders!")); 200 206 } 201 207 //teste = teste.split(cyrus_delimiter); 202 208 203 209 if($('[id="'+teste+'"]').length){ 204 return alert(get_lang("Can not move this folder to this location, because the target has already a folder with this name"));210 return write_msg(get_lang("Can not move this folder to this location, because the target has already a folder with this name")); 205 211 } 206 212 … … 209 215 $.ajax({ 210 216 url : "controller.php?action=$this.imap_functions.move_folder&folder_to_move="+folder_to_move+"&folder_to="+folder_to, 211 success : function(){ 212 cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu); 213 write_msg(get_lang("The folder was successfully moved")); 217 success : function(data){ 218 data = connector.unserialize(data); 219 if(data){ 220 cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu); 221 write_msg(get_lang("The folder was successfully moved")); 222 } 223 else{ 224 write_msg(get_lang("ERROR moving your folder.")); 225 } 214 226 } 215 227 }); … … 234 246 var name = $.trim($(this).parents(".closed:first").find("span:first").text().split("[")[0]); 235 247 if($(this).parents(".closed:first").find("span:first").hasClass("selected")) 236 return alert(get_lang("It's not possible rename this folder, because it is being used in the moment!"));248 return write_msg(get_lang("It's not possible rename this folder, because it is being used in the moment!")); 237 249 if($(this).parents(".closed:first").find(".selected").length) 238 return alert(get_lang("It's not possible rename this folder, because its subfolder is being used in the moment!"));250 return write_msg(get_lang("It's not possible rename this folder, because its subfolder is being used in the moment!")); 239 251 $(this).parents(".closed:first").find("span:first").empty().append("<input class='new_folder folder' type='text' maxlength='100'></input>") 240 252 $(".new_folder").focus().keydown(function(event){ … … 243 255 if($(this).val() != ""){ 244 256 if($(this).val().match(/[\/\\\!\@\#\$\%\&\*\+\(\)]/gi)){ 245 return alert(get_lang("cannot create folder. try other folder name"));257 return write_msg(get_lang("cannot create folder. try other folder name")); 246 258 } 247 259 var new_name = folder_id.replace(/[a-zA-Z0-9á-úÁ-Ú]+$/gi, $(this).val()); … … 289 301 if($(this).parents(".closed:first").find("ul").length){ 290 302 $(this).parents(".closed:first").find(".folder").removeClass("folders_loading"); 291 return alert(get_lang("Delete/move subfolders first"));303 return write_msg(get_lang("Delete/move subfolders first")); 292 304 } 293 305 if($(this).parents(".closed:first").find(".selected").length){ 294 306 $(this).parents(".closed:first").find(".folder").removeClass("folders_loading"); 295 return alert(get_lang("It's not possible delete this folder, because it is being used in the moment!"));307 return write_msg(get_lang("It's not possible delete this folder, because it is being used in the moment!")); 296 308 } 297 309 var confirm_text = get_lang("Do you wish to exclude the folder "); … … 347 359 if(event.keyCode == 13){ 348 360 if($(this).val().match(/[\\\!\@\#\$\%\&\*\+\(\)]/gi)){ 349 return alert(get_lang("cannot create folder. try other folder name"));361 return write_msg(get_lang("cannot create folder. try other folder name")); 350 362 } 351 363 $(".new_folder").parent().addClass("folders_loading"); … … 375 387 if(confirm(get_lang("Do you want to cancel the folder creation?"))) 376 388 draw_new_tree_folder(); 389 else{ 390 $(this).focus(); 391 } 377 392 } 378 393 });
Note: See TracChangeset
for help on using the changeset viewer.