Changeset 5158
- Timestamp:
- 11/08/11 15:30:53 (11 years ago)
- Location:
- trunk
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/API/class.servicelocator.php
r5124 r5158 4 4 * Copyright (C) 2011 Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br) 5 5 * 6 * This program is free software; you can redistribute it and/or modify it under 7 * the terms of the GNU Affero General Public License version 3 as published by 8 * the Free Software Foundation with the addition of the following permission 9 * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED 10 * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE 11 * WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS. 12 * 13 * This program is distributed in the hope that it will be useful, but WITHOUT 14 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 15 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 16 * details. 17 * 18 * You should have received a copy of the GNU Affero General Public License 19 * along with this program; if not, see www.gnu.org/licenses or write to 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 21 * MA 02110-1301 USA. 22 * 23 * This code is based on the OpenXchange Connector and on the Prognus pSync 24 * Connector both developed by the community and licensed under the GPL 25 * version 2 or above as published by the Free Software Foundation. 6 * This program is free software; you can redistribute it and/or 7 * modify it under the terms of the GNU General Public License 8 * as published by the Free Software Foundation; either version 2 9 * of the License, or (at your option) any later version. 10 * 11 * This program is distributed in the hope that it will be useful, 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * GNU General Public License for more details. 15 * 16 * You should have received a copy of the GNU General Public License 17 * along with this program; if not, write to the Free Software 18 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 26 19 * 27 20 * You can contact Prognus Software Livre headquarters at Av. Tancredo Neves, 28 21 * 6731, PTI, Bl. 05, Esp. 02, Sl. 10, Foz do Iguaçu - PR - Brasil or at 29 22 * e-mail address prognus@prognus.com.br. 30 *31 *32 * Faz a localização dos serviços que serão utilizados pela aplicação e que estão localizados na API33 *34 23 * 35 24 * @package expressoMail -
trunk/calendar/inc/class.uicalendar.inc.php
r5132 r5158 991 991 } 992 992 993 if($_SESSION['phpgw_info']['expressomail']['user']['account_id'] != $owner){ 993 994 $label_suggest = lang('Suggest new hour'); 994 995 $button_right_suggestion = "<td><input type=\"button\" style=\"height: 16px; width: 110px; font-size: 10px;\" value=\"" . $label_suggest . "\"onclick=\"show_suggestion()\";</td>"; … … 1000 1001 'button_right_suggestion' => $button_right_suggestion 1001 1002 )); 1003 }else{ 1004 $p->set_var(array( 1005 'button_left' => $button_left, 1006 'button_center' => $button_center, 1007 'button_right' => $button_right, 1008 )); 1009 } 1002 1010 $p->pfp('phpgw_body','view_event'); 1003 1011 -
trunk/contactcenter/inc/class.ui_data.inc.php
r5131 r5158 2123 2123 // a entrada em $data['contact_in_list'][$i] 2124 2124 $set_catalog = $this->set_catalog($level, false); 2125 $contact_data = unserialize($this->get_catalog_add_contact( $dn, false));2125 $contact_data = unserialize($this->get_catalog_add_contact(utf8_encode($dn), false)); 2126 2126 $tmp_contact[] = $contact_data[0][0]; 2127 2127 $tmp_contact[] = $contact_data[1][0]; -
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r5134 r5158 1759 1759 $image['cid'] = eregi_replace("<", "", $image['cid']); 1760 1760 $image['cid'] = eregi_replace(">", "", $image['cid']); 1761 //if is Draft Ticket #12561762 $image['cid'] = str_replace("@localhost", "@prognus.org", $image['cid']);1763 $body = eregi_replace("<br/>", "", $body);1764 1761 1765 1762 $body = str_replace("src=\"cid:".$image['cid']."\"", " src=\"./inc/get_archive.php?msgFolder=$msg_folder&msgNumber=$msgno&indexPart=".$image['pid']."\" ", $body); … … 2091 2088 $msgs_in_the_server = $this->get_msgs($folder, $sort_box_type, $search_box_type, $sort_box_reverse,$msg_range_begin,$msg_range_end); 2092 2089 $msgs_in_the_server = array_keys($msgs_in_the_server); 2093 if(!count($msgs_in_the_server)) 2094 return array(); 2095 2090 2091 $num_msgs = (count($msgs_in_the_server) - imap_num_recent($this->mbox)); 2092 2093 $dif = ($params['msg_range_end'] - $params['msg_range_begin']) +1; 2094 if(!count($msgs_in_the_server)){ 2095 $msg_range_begin -= $dif; 2096 $msg_range_end -= $dif; 2097 $msgs_in_the_server = $this->get_msgs($folder, $sort_box_type, $search_box_type, $sort_box_reverse,$msg_range_begin,$msg_range_end); 2098 $msgs_in_the_server = array_keys($msgs_in_the_server); 2099 $num_msgs = NULL; 2100 $return['msg_range_begin'] = $msg_range_begin; 2101 $return['msg_range_end'] = $msg_range_end; 2102 } 2096 2103 $return['new_msgs'] = imap_num_recent($this->mbox); 2097 $num_msgs = (count($msgs_in_the_server) - imap_num_recent($this->mbox)); 2098 2104 2099 2105 $msgs_in_the_client = explode(",", $msgs_existent); 2100 2106 … … 2117 2123 $aux++; 2118 2124 } 2119 }else if($num_msgs < $msg_range_end && $return['new_msgs'] == 0 && count($msg_to_insert) > 0 ){2125 }else if($num_msgs < $msg_range_end && $return['new_msgs'] == 0 && count($msg_to_insert) > 0 && $msg_range_end == $dif){ 2120 2126 $return['tot_msgs'] = $num_msgs; 2121 2127 } 2122 2128 2129 if(!count($msgs_in_the_server)){ 2130 return Array(); 2131 } 2132 2123 2133 $msg_to_delete = array_diff($msgs_in_the_client, $msgs_in_the_server); 2124 2134 $msgs_to_exec = array(); … … 3217 3227 { 3218 3228 $cid = base_convert(microtime().$j, 10, 36); //Gera um cid 3219 $body = str_replace($cid_imgs[1][$j], '"cid:'.$cid.' @'.$_SESSION['phpgw_info']['expressomail']['server']['domain_name'].'"', $body ); //tira o src da imagem e coloca o cid, ele e concatenado com o domain do servidor por que a biblioteaca mime faz isso na hora de gerar o mime.3229 $body = str_replace($cid_imgs[1][$j], '"cid:'.$cid.'"', $body ); //tira o src da imagem e coloca o cid. 3220 3230 $count = strlen($cid_imgs[6][$j]); 3221 3231 -
trunk/expressoMail1_2/inc/hook_settings.inc.php
r5134 r5158 475 475 476 476 create_select_box('What is the maximum size of embedded images?','image_size',$default,'When user send an email with image in body message, it changes the size'); 477 create_check_box('Use plain text editor with standard ?','plain_text_editor',''); 477 create_check_box('Use plain text editor as standard ?','plain_text_editor',''); 478 478 479 479 480 $default = array( -
trunk/expressoMail1_2/js/TreeShow.js
r4562 r5158 112 112 return false; //Não posso criar pastas contendo a string local_ 113 113 } 114 if(button.match(/[\/\\\!\@\#\$\%\&\*\ (\)]/gi)){114 if(button.match(/[\/\\\!\@\#\$\%\&\*\+\(\)]/gi)){ 115 115 alert(get_lang("cannot create folder. try other folder name")); 116 116 return false; … … 138 138 } 139 139 140 if(button1.match(/[\/\\\!\@\#\$\%\&\*\ (\)]/gi)){140 if(button1.match(/[\/\\\!\@\#\$\%\&\*\+\(\)]/gi)){ 141 141 alert(get_lang("It's not possible rename this folder. try other folder name")); 142 142 return false; -
trunk/expressoMail1_2/js/draw_api.js
r5134 r5158 1366 1366 test = false; 1367 1367 1368 if( (headers_msgs.from != undefined) && headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase() && !(preferences.from_to_sent == "1" && test) && !(msg_folder.substr(0,5) == "user/"))1368 if( (headers_msgs.from != undefined) && headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase() && (preferences.from_to_sent == "1") && !(msg_folder.substr(0,5) == "user/")) 1369 1369 { 1370 1370 td_element3.onmouseover = function () {this.title=headers_msgs.to.email;}; … … 1395 1395 spanSender.onmouseover = function (event) {this.style.textDecoration = "underline";try {InfoContact.begin(this,headers_msgs.from.email)} catch(e){};}; 1396 1396 spanSender.onmouseout = function (){try {this.style.textDecoration = "none";clearTimeout(InfoContact.timeout);} catch(e){}}; 1397 if ( headers_msgs.from !== undefined ) 1397 folder = special_folders['Sent']; 1398 current = get_current_folder(); 1399 if ((preferences.from_to_sent == "1") && (current.substr(current.length - folder.length, folder.length) == folder)){ 1400 if (headers_msgs.to) { 1401 if (headers_msgs.to.name != null){ 1402 spanSender.innerHTML += headers_msgs.to.name; 1403 }else if(headers_msgs.to.email != null) { 1404 spanSender.innerHTML += headers_msgs.to.email; 1405 } 1406 } 1407 }else if(headers_msgs.from !== undefined){ 1398 1408 spanSender.innerHTML = headers_msgs.from.name != null ? headers_msgs.from.name : headers_msgs.from.email; 1409 } 1399 1410 if (spanSender.innerHTML.indexOf(" ") == '-1' && spanSender.innerHTML.length > 25){ 1400 1411 spanSender.innerHTML = spanSender.innerHTML.substring(0,25) + "..."; … … 1550 1561 break; 1551 1562 } 1563 folder = special_folders['Sent']; 1564 current = get_current_folder(); 1565 if ((preferences.from_to_sent == "1") && (current.substr(current.length - folder.length, folder.length) == folder)) { 1566 document.getElementById("message_header_SORTFROM_"+numBox).innerHTML = get_lang("To"); 1567 }else{ 1552 1568 document.getElementById("message_header_SORTFROM_"+numBox).innerHTML = get_lang("From"); 1569 } 1553 1570 document.getElementById("message_header_SORTSUBJECT_"+numBox).innerHTML = get_lang("Subject"); 1554 1571 document.getElementById("message_header_SORTARRIVAL_"+numBox).innerHTML = get_lang("Date"); -
trunk/expressoMail1_2/js/main.js
r5134 r5158 405 405 406 406 function refresh(alert_new_msg){ 407 407 408 var handler_refresh = function(data){ 409 410 if(data['msg_range_end']) 411 if(data['msg_range_end'] > 0) 412 current_page = data['msg_range_end']/preferences.max_email_per_page; 408 413 if(!verify_session(data)) 409 414 return; … … 850 855 msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf('_r')); 851 856 } 852 857 refresh(); 853 858 if (parseInt(msgs_number) > 0 || msgs_number.length > 0){ 854 859 if(!not_opem_previus){ … … 1168 1173 data.cc = data.cc.replace(/</gi,"<"); 1169 1174 data.cc = data.cc.replace(/>/gi,">"); 1175 var _array_cc = data.cc.split(","); 1170 1176 } 1171 1177 if (document.getElementById("cco_" + border_ID)){ … … 1308 1314 Element("to_" + new_border_ID).value = data.to; 1309 1315 Element("to_" + new_border_ID).value += ', ' + data.to_all; 1316 1310 1317 if (data.cc){ 1318 data.cc = new Array(); 1319 var j = 0; 1320 for(i = 0; i < _array_cc.length; i++) { 1321 if(_array_cc[i].lastIndexOf(Element("user_email").value) == "-1"){ 1322 data.cc[j++] = _array_cc[i]; 1323 } 1324 } 1325 if (data.cc != get_lang("undisclosed-recipient")) 1326 data.cc = data.cc.join(","); 1327 else 1328 data.cc = ""; 1311 1329 document.getElementById("cc_" + new_border_ID).value = data.cc; 1312 1330 document.getElementById("a_cc_link_" + new_border_ID).style.display='none'; … … 1503 1521 default: 1504 1522 } 1505 1506 1523 //Insere o conteúdo da mensagem e a assinatura no editor de texto simples 1524 if (preferences.plain_text_editor == 1){ 1525 Element('textplain_rt_checkbox_'+new_border_ID).checked = true; 1526 var txtarea = Element('body_'+new_border_ID); 1527 if (txtarea != null){ 1528 if (data.body != undefined) 1529 txtarea.value = data.body; 1530 if (preferences.use_signature == "1") 1531 txtarea.value += '\n' + signature; 1532 } 1533 } 1507 1534 Element("border_id_" + new_border_ID).title = title; 1508 1535 set_border_caption("border_id_" + new_border_ID, title); … … 2382 2409 2383 2410 var folder= Element('border_id_0').innerHTML; 2384 var thead = Element('divScrollHead_'+numBox).firstChild.firstChild.innerHTML;2411 //var thead = Element('divScrollHead_'+numBox).firstChild.firstChild.innerHTML; 2385 2412 2386 2413 msgs_number = get_selected_messages(); … … 2399 2426 var window_print = window.open('','ExpressoMail','width='+print_width+',height=400,resizable=yes,scrollbars=yes,left='+x+',top='+y); 2400 2427 seekDot = (is_ie ? /width=24/gi : /width="24"/gi); 2401 thead = thead.replace(seekDot, "style='display:none'"); 2428 //thead = thead.replace(seekDot, "style='display:none'"); 2429 var thead = "<tr class=\"message_header\"><td id=\"message_header_SORTFROM_0\" class=\"th_resizable\" align=\"left\" width=\"20%\">De</td><td id=\"message_header_SORTSUBJECT_0\" class=\"th_resizable\" align=\"left\" width=\"*\">Assunto</td><td id=\"message_header_SORTARRIVAL_0\" class=\"th_resizable\" align=\"center\" width=\"11%\"><b>Data</b><img src=\"templates/default/images/arrow_descendant.gif\"></td><td id=\"message_header_SORTSIZE_0\" class=\"th_resizable\" align=\"left\" width=\"11%\">Tamanho</td></tr>"; 2402 2430 tbody = tbody.replace(seekDot, "style='display:none'"); 2403 2431 seekDot = (is_ie ? /width=16/gi : /width="16"/gi); 2404 thead = thead.replace(seekDot, "style='display:none'");2432 //thead = thead.replace(seekDot, "style='display:none'"); 2405 2433 tbody = tbody.replace(seekDot, "style='display:none'"); 2406 2434 seekDot = (is_ie ? /width=12/gi : /width="12"/gi); 2407 thead = thead.replace(seekDot, "style='display:none'");2435 //thead = thead.replace(seekDot, "style='display:none'"); 2408 2436 tbody = tbody.replace(seekDot, "style='display:none'"); 2409 thead = thead.replace("<td style=\"cursor: pointer;\"></td>", "");2410 thead = thead.replace("<td style=\"cursor: pointer;\" style='display:none'><input title=\"Selecionar todas as mensagens.\" class=\"checkbox\" id=\"chk_box_select_all_messages\" type=\"checkbox\"></td>", "");2411 2437 while (1){ 2412 2438 try{ -
trunk/expressoMail1_2/js/messages_controller.js
r5134 r5158 54 54 this.aux_interface_remove_mails(msgs_number, 'local_Trash', border_ID); 55 55 draw_tree_local_folders(); 56 update_local_box(); 56 57 refresh(); 57 58 }else{ 58 59 expresso_local_messages.delete_msgs(msgs_number, border_ID); 59 60 draw_tree_local_folders(); 61 update_local_box(); 60 62 refresh(); 61 63 } … … 131 133 if (this.is_local_folder(ttree.FOLDER)) { 132 134 folder = prompt(get_lang("Enter a name for the box"), ""); 133 if(folder.match(/[\/\\\!\@\#\$\%\&\*\ (\)]/gi)){135 if(folder.match(/[\/\\\!\@\#\$\%\&\*\+\(\)]/gi)){ 134 136 alert(get_lang("It's not possible rename this folder. try other folder name")); 135 137 return false; … … 167 169 return false; 168 170 } 169 if(folder.match(/[\/\\\!\@\#\$\%\&\*\ (\)]/gi)){171 if(folder.match(/[\/\\\!\@\#\$\%\&\*\+\(\)]/gi)){ 170 172 alert(get_lang("cannot create folder. try other folder name")); 171 173 return false; … … 345 347 } 346 348 } 349 new_folder_name = this.get_folder_name(new_folder_name); 347 350 if (msgs_number.length == 1) 348 351 write_msg(get_lang("The message was moved to folder ") + new_folder_name); … … 363 366 } 364 367 368 messages_proxy.prototype.get_folder_name = function(new_folder_name){ 369 switch (new_folder_name) { 370 case 'local_Inbox': 371 return 'Local_Caixa de Entrada'; 372 case 'local_Sent': 373 return 'Local_Enviados'; 374 case 'local_Trash': 375 return 'Local_Lixeira'; 376 case 'local_Drafts': 377 return 'Local_Rascunhos'; 378 default: 379 return new_folder_name; 380 } 381 } 382 365 383 messages_proxy.prototype.msg_img = function(msgs_number,folder_name,call_back) { 366 384 if(this.is_local_folder(folder_name)){ -
trunk/expressoMail1_2/js/rich_text_editor.js
r5134 r5158 104 104 105 105 if(preferences.plain_text_editor == 1) 106 { 106 107 RichTextEditor.plain[ID] = true; 108 RichTextEditor.editorReady = true; 109 } 107 110 else 108 111 RichTextEditor.active(pObj); … … 380 383 var divBr = '<div style="'+fontSize+fontFamily+'"><br type="_moz"></div>'; 381 384 382 editor.insertHtml(divBr+divBr+divBr+data); 385 if(reply === undefined) 386 editor.insertHtml(divBr+divBr+data); 387 else if(reply == 'edit') 388 editor.insertHtml(data); 389 else 390 editor.insertHtml(divBr+data); 383 391 384 392 if(selection !== null) selection.selectRanges(selectionRanges); -
trunk/expressoMail1_2/setup/phpgw_pt-br.lang
r5134 r5158 571 571 Users from your organization expressoMail1_2 pt-br Usuários da sua organização 572 572 Use shortcuts? expressoMail1_2 pt-br Usar teclas de atalho? 573 Use plain text editor withstandard ? expressoMail1_2 pt-br Usar editor de texto simples como padrão ?573 Use plain text editor as standard ? expressoMail1_2 pt-br Usar editor de texto simples como padrão ? 574 574 Validity of certificate: expressoMail1_2 pt-br Validade do certificado: 575 575 View HTML source expressoMail1_2 pt-br Ver código html -
trunk/library/mime/mime.php
r5135 r5158 877 877 $this->_html_images[$key]['name'] 878 878 = $this->_basename($this->_html_images[$key]['name']); 879 880 //Alteração para o Expresso. 881 //Ver https://dev.prognus.com.br/expresso/ticket/1256 882 $this->_htmlbody = str_replace("src=\"cid:".substr($value['cid'], 0, strpos($value['cid'], '@'))."\"", "src=\"cid:".$value['cid']."\"", $this->_htmlbody); 883 879 884 } 880 885 } -
trunk/listAdmin/setup/setup.inc.php
r4186 r5158 9 9 $setup_info['listAdmin']['name'] = 'listAdmin'; 10 10 $setup_info['listAdmin']['title'] = 'Mailman Admin'; 11 $setup_info['listAdmin']['version'] = '2. 2.1';11 $setup_info['listAdmin']['version'] = '2.4.0'; 12 12 $setup_info['listAdmin']['app_order'] = 10; 13 13 $setup_info['listAdmin']['enable'] = 1; … … 30 30 $setup_info['listAdmin']['depends'][] = array( 31 31 'appname' => 'phpgwapi', 32 'versions' => Array('2.0','2.1','2.2' )32 'versions' => Array('2.0','2.1','2.2', '2.2.1', '2.4.0') 33 33 ); 34 34 ?>
Note: See TracChangeset
for help on using the changeset viewer.