Changeset 7273 for sandbox/2.4.3-expresso-rest/expressoMail1_2
- Timestamp:
- 09/21/12 16:02:43 (12 years ago)
- Location:
- sandbox/2.4.3-expresso-rest
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.3-expresso-rest
- Property svn:mergeinfo changed
/trunk (added) merged: 7253,7257-7259,7264,7267-7269,7271-7272
- Property svn:mergeinfo changed
-
sandbox/2.4.3-expresso-rest/expressoMail1_2/inc/class.imap_functions.inc.php
r7235 r7273 2834 2834 } else { 2835 2835 //Compatibilização com Outlook, ao encaminhar a mensagem 2836 $body = mb_ereg_replace('<!--\[', '<!-- [', $params['body']); 2836 $body = mb_ereg_replace('<!--\[', '<!-- [', $params['body']); 2837 $body = str_replace("<","&yzwkx;",$body); //Alterar as Entities padrão das tags < > para compatibilizar com o Expresso 2838 $body = str_replace(">","&xzwky;",$body); 2837 2839 $body = str_replace("%nbsp;"," ",$body); 2838 2840 //$body = preg_replace("/\n/"," ",$body); 2839 2841 //$body = preg_replace("/\r/","" ,$body); 2840 2842 $body = html_entity_decode ( $body, ENT_QUOTES , 'ISO-8859-1' ); 2843 $body = str_replace("&yzwkx;","<",$body); 2844 $body = str_replace("&xzwky;",">",$body); 2841 2845 } 2842 2846 … … 3641 3645 return $returns; 3642 3646 } 3647 function verify_disposition_notification($msg){ 3648 $header = imap_fetchheader($this->mbox, $msg, FT_UID); 3649 $pattern = '/^[ \t]*Disposition-Notification-To:.*/mi'; 3650 if (preg_match($pattern, $header, $fields)) 3651 return true; 3652 else 3653 return false; 3654 } 3655 3643 3656 function set_messages_flag($params) 3644 3657 { … … 3667 3680 $msgs = explode(",",$msgs_to_set); 3668 3681 foreach($msgs as $men){ 3669 if (imap_setflag_full($this->mbox, $men, "\\Seen", ST_UID)) 3670 $return["msgs_to_set"] .= $men.","; 3671 else 3672 $return["msgs_not_to_set"] .= $men.","; 3682 3683 if($this->verify_disposition_notification($men)){ 3684 3685 if(!array_key_exists('disposition_notification_to', $return)) 3686 $return['disposition_notification_to'] = array(); 3687 3688 $return["disposition_notification_to"][] = $men; 3689 }else{ 3690 if (imap_setflag_full($this->mbox, $men, "\\Seen", ST_UID)) 3691 $return["msgs_to_set"] .= $men.","; 3692 else 3693 $return["msgs_not_to_set"] .= $men.","; 3694 } 3673 3695 } 3674 3696 $return["status"] = true; -
sandbox/2.4.3-expresso-rest/expressoMail1_2/js/QuickCatalogSearch.js
r7225 r7273 54 54 e.preventDefault(); 55 55 $("#dialog-modal").dialog("close"); 56 $('.to').blur().focus(); 56 57 } 57 58 if (is_webkit){ -
sandbox/2.4.3-expresso-rest/expressoMail1_2/js/draw_api.js
r7240 r7273 1322 1322 td_element3 = createTDElement(0,8,"th_resizable","left","message_header_SORTFROM_"+numBox); 1323 1323 td_element3.onclick = function () {sort_box(search_box_type,'SORTFROM');}; 1324 td_element3.innerHTML = get_lang("From"); 1324 folder_ = special_folders['Sent']; 1325 current_ = get_current_folder(); 1326 if ((preferences.from_to_sent == "1") && (current_.substr(current_.length - folder_.length, folder_.length) == folder_)) { 1327 td_element3.innerHTML = get_lang("To"); 1328 }else{ 1329 td_element3.innerHTML = get_lang("From"); 1330 } 1325 1331 1326 1332 td_element4 = createTDElement(0,9,"th_resizable","left","message_header_SORTSUBJECT_"+numBox); … … 2170 2176 if ((preferences.from_to_sent == "1") && (current.substr(current.length - folder.length, folder.length) == folder)) { 2171 2177 document.getElementById("message_header_SORTFROM_"+numBox).innerHTML = get_lang("To"); 2178 if (sort_box_type == "SORTFROM") 2179 type_name = get_lang("To"); 2172 2180 }else{ 2173 2181 document.getElementById("message_header_SORTFROM_"+numBox).innerHTML = get_lang("From"); … … 4138 4146 'auto_close': 3000 4139 4147 }); 4140 }).find(".box-input").val("\""+data.collection.data[1].value+"\" <"+ data.collection.data[2].value+">");4148 }).find(".box-input").val("\""+data.collection.data[1].value+"\" <"+$.trim(data.collection.data[2].value)+">"); 4141 4149 box.find(".email-box-value").html( (data.collection.data[1].value.length > 18 ? data.collection.data[1].value.substring(0, 15)+"...": data.collection.data[1].value)) 4142 4150 } … … 4165 4173 'auto_close': 3000 4166 4174 }); 4167 }).find(".box-input").val("\""+item.name+"\" <"+ item.email+">");4175 }).find(".box-input").val("\""+item.name+"\" <"+$.trim(item.email)+">"); 4168 4176 4169 4177 box.find(".email-box-value").html(normalizeBoxName(item.name, item.value)); … … 4192 4200 'auto_close': 3000 4193 4201 }); 4194 }).find(".box-input").val("\""+item.name+"\" <"+ item.email+">");4202 }).find(".box-input").val("\""+item.name+"\" <"+$.trim(item.email)+">"); 4195 4203 4196 4204 box.find(".email-box-value").html(normalizeBoxName(item.name, item.value)); -
sandbox/2.4.3-expresso-rest/expressoMail1_2/js/main.js
r7245 r7273 33 33 function updateDynamicContact(){ 34 34 dynamicContacts = new Array(); 35 var dynamicData = REST.get("/dynamiccontacts").collection.itens; 36 if(dynamicData){ 37 $.each(dynamicData, function(index, value){ 35 36 var dynamicUsers = REST.get("/dynamiccontacts"); 37 38 if(dynamicUsers.collection && !dynamicUsers.collection.error){ 39 var dynamicData = normalizeContacts(dynamicUsers.collection.itens) 40 41 $.each(dynamicData, function(index, value){ 38 42 if(index ==0){ 39 topContact = parseInt(value .data[2].value);43 topContact = parseInt(value['number_of_messages']); 40 44 } 41 45 var dynamic = { 42 name : value. data[0].value,43 mail : value. data[1].value,44 value: value. data[0].value + " - " + value.data[1].value,46 name : value.name, 47 mail : value.mail, 48 value: value.name + " - " + value.mail, 45 49 type: "", 46 id: parseInt(value.data[3].value),47 qtd : parseInt(value.data[2].value)50 id: value.id, 51 qtd : value['number_of_messages'] 48 52 }; 49 53 dynamicContacts.push(dynamic); … … 55 59 function updateDynamicPersonalContacts(){ 56 60 dynamicPersonalContacts = new Array(); 57 var contactsData = normalizeContacts(REST.get("/personalContact").collection.itens); 58 if(contactsData){ 59 $.each(contactsData, function(index, value){ 60 var contact = { 61 id : parseInt(value.id), 62 name : value.name, 63 email: value.email, 64 value: value.name+ " - " + value.email, 65 type: "P" 66 }; 67 dynamicPersonalContacts.push(contact); 68 }); 69 } 61 62 var personalContacts = REST.get("/personalContact"); 63 64 if(personalContacts.collection && !personalContacts.collection.error){ 65 var contactsData = normalizeContacts(personalContacts.collection.itens); 66 if(contactsData){ 67 $.each(contactsData, function(index, value){ 68 var contact = { 69 id : parseInt(value.id), 70 name : value.name, 71 email: value.email, 72 value: value.name+ " - " + value.email, 73 type: "P" 74 }; 75 dynamicPersonalContacts.push(contact); 76 }); 77 } 78 } 70 79 } 71 80 … … 73 82 function updateDynamicPersonalGroups(){ 74 83 dynamicPersonalGroups = new Array(); 75 var contactsData = normalizeContacts(REST.get("/groups").collection.itens); 76 if(contactsData){ 77 $.each(contactsData, function(index, value){ 78 var contact = { 79 id : parseInt(value.id), 80 owner : value.owner, 81 name : value.name, 82 email: value.email, 83 type: "G" 84 }; 85 dynamicPersonalGroups.push(contact); 86 }); 87 } 84 85 var groups = REST.get("/groups"); 86 87 if(groups.collection && !groups.collection.error){ 88 var contactsData = normalizeContacts(groups.collection.itens); 89 if(contactsData.collecion && !contactsData.collecion.error){ 90 $.each(contactsData, function(index, value){ 91 var contact = { 92 id : parseInt(value.id), 93 owner : value.owner, 94 name : value.name, 95 email: value.email, 96 type: "G" 97 }; 98 dynamicPersonalGroups.push(contact); 99 }); 100 } 101 } 88 102 } 89 103 … … 3267 3281 return; 3268 3282 var msgs_to_set = data.msgs_to_set.split(","); 3283 3284 3285 if(data.disposition_notification_to){ 3286 $.Zebra_Dialog(data.disposition_notification_to.length == 1 ? get_lang('One of his messages can not be marked as read, because it contains a read confirmation.') : data.disposition_notification_to.length + get_lang(' of its messages could not be marked as read, because it contains a read confirmation.'), { 3287 'type': 'warning', 3288 'overlay_opacity': '0.5', 3289 'buttons': ['Fechar'] 3290 }); 3291 } 3269 3292 3270 3293 if(!data.status) { -
sandbox/2.4.3-expresso-rest/expressoMail1_2/setup/phpgw_pt-br.lang
r7100 r7273 648 648 with some expressoMail1_2 pt-br com algumas 649 649 With the following message expressoMail1_2 pt-br Com a seguinte mensagem 650 Would you like to have a read receipt option to read messages? expressoMail1_2 pt-br Deseja apresentar opção de confirmação de leitura ao ler mensagem? 650 Would you like to have a read receipt option to read messages? expressoMail1_2 pt-br Deseja apresentar opção de confirmação de leitura ao ler mensagem? 651 651 Would you like to keep archived messages? expressoMail1_2 pt-br Você gostaria de manter as mensagens arquivadas? 652 652 Would you like to use local messages? expressoMail1_2 pt-br Você gostaria de usar mensagens locais? … … 935 935 The contact was moved from recent contacts to personal contacts successful. expressoMail1_2 pt-br O Contato foi movido dos contatos recentes para os contatos pessoais com sucesso. 936 936 You can not remove the message with the preference 'Send to Trash' enabled. There is no permission to move messages to the trash folder. expressoMail1_2 pt-br Não é possível remover a mensagem com a preferencia 'Enviar para lixeira' ativada. Não existe permissão para mover mensagens para a pasta lixeira. 937 One of his messages can not be marked as read, because it contains a read confirmation. expressoMail1_2 pt-br Uma de suas mensagens não pode ser marcada como lida, pois contém uma confirmação de leitura. 938 of its messages could not be marked as read, because it contains a read confirmation. expressoMail1_2 pt-br de suas mensagens não puderam ser marcadas como lida, pois contém uma confirmação de leitura. -
sandbox/2.4.3-expresso-rest/expressoMail1_2/templates/default/main.css
r7113 r7273 803 803 .em_div_sidebox_menu { 804 804 position: relative; 805 left: 17px;806 805 cursor: pointer; 807 806 }
Note: See TracChangeset
for help on using the changeset viewer.