- Timestamp:
- 12/17/10 11:46:48 (14 years ago)
- Location:
- branches/2.2/mobile
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/mobile/inc/class.ui_mobilemail.inc.php
r3600 r3602 195 195 $msg = $this->imap_functions->get_info_msg($params); 196 196 197 $msg_number = $params['msg_number']; 198 $msg_folder = $params['msg_folder']; 199 197 200 // Carrega o template 198 201 $this->template->set_file(array('view_msg' => 'view_msg.tpl')); … … 200 203 $this->template->set_block('view_msg', 'begin_anchor'); 201 204 $this->template->set_block('view_msg', 'end_anchor'); 205 $this->template->set_block('view_msg', 'operation_block'); 202 206 $this->template->set_var('lang_back', lang("back")); 203 207 $this->template->set_var('lang_reading_message', lang("Reading Message")); … … 219 223 $this->template->set_var('lang_link', lang("Return")); 220 224 $this->template->set_var('return_link', "index.php?menuaction=mobile.ui_mobilemail.mail_list"); 221 222 $this->template->set_var('lang_reply_all', lang("Reply to all")); 223 $this->template->set_var('lang_forward', lang("Forward")); 224 $this->template->set_var('lang_mark_as_unread', lang("mark as unread")); 225 $this->template->set_var('lang_reply', lang("Reply")); 226 $this->template->set_var('lang_delete', lang("Delete")); 227 $msg_number = $params['msg_number']; 228 $msg_folder = $params['msg_folder']; 229 $this->template->set_var('mark_as_unread_link', "index.php?menuaction=mobile.ui_mobilemail.mark_message_with_flag&flag=unseen&msgs_to_set=$msg_number&msg_folder=$msg_folder"); 230 $this->template->set_var('reply_link', "index.php?menuaction=mobile.ui_mobilemail.new_msg&msg_number=$msg_number&msg_folder=$msg_folder"); 231 $this->template->set_var('delete_link', "index.php?menuaction=mobile.ui_mobilemail.confirm_delete_msg&msg_number=$msg_number&msg_folder=$msg_folder"); 232 $this->template->set_var('reply_all_link', "index.php?menuaction=mobile.ui_mobilemail.new_msg&msg_number=$msg_number&msg_folder=$msg_folder&type=reply_all"); 233 $this->template->set_var('forward_link', "index.php?menuaction=mobile.ui_mobilemail.new_msg&msg_number=$msg_number&msg_folder=$msg_folder&type=forward"); 225 226 $operations = array(); 227 228 if($msg["Draft"] === "X") { 229 $operations["edit_draft"]["link"] = "index.php?menuaction=mobile.ui_mobilemail.new_msg&msg_number=$msg_number&msg_folder=$msg_folder&type=use_draft"; 230 $operations["edit_draft"]["lang"] = lang("edit draft"); 231 } else { 232 $operations["mark_as_unread"]["link"] = "index.php?menuaction=mobile.ui_mobilemail.mark_message_with_flag&flag=unseen&msgs_to_set=$msg_number&msg_folder=$msg_folder"; 233 $operations["mark_as_unread"]["lang"] = lang("mark as unread"); 234 $operations["forward"]["link"] = "index.php?menuaction=mobile.ui_mobilemail.new_msg&msg_number=$msg_number&msg_folder=$msg_folder&type=forward"; 235 $operations["forward"]["lang"] = lang("Forward"); 236 $operations["reply"]["link"] = "index.php?menuaction=mobile.ui_mobilemail.new_msg&msg_number=$msg_number&msg_folder=$msg_folder"; 237 $operations["reply"]["lang"] = lang("Reply"); 238 $operations["reply_all"]["link"] = "index.php?menuaction=mobile.ui_mobilemail.new_msg&msg_number=$msg_number&msg_folder=$msg_folder&type=reply_all"; 239 $operations["reply_all"]["lang"] = lang("Reply to all"); 240 } 241 242 $operations["delete"]["link"] = "index.php?menuaction=mobile.ui_mobilemail.confirm_delete_msg&msg_number=$msg_number&msg_folder=$msg_folder"; 243 $operations["delete"]["lang"] = lang("Delete"); 244 245 foreach($operations as $index=>$operation) { 246 $this->template->set_var('operation_link', $operation["link"]); 247 $this->template->set_var('operation_id', $index); 248 $this->template->set_var('lang_operation', $operation["lang"]); 249 $this->template->parse('operation_box','operation_block', true); 250 } 251 234 252 if (!empty($msg['attachments'])) 235 253 { … … 702 720 case "clk": 703 721 case "from_mobilecc": 722 case "use_draft": 704 723 $this->template->set_var('action_msg', lang("New message")); 705 724 break; … … 722 741 $this->template->set_file(array('new_msg_t' => 'new_msg.tpl')); 723 742 $this->template->set_block('new_msg_t', 'page'); 724 $this->template->set_block('new_msg_t', 'add_recipient_block');725 743 $this->template->set_var('lang_back', lang("back")); 726 744 $this->template->set_var('lang_calendar', strtoupper(lang("Calendar"))); … … 735 753 $this->template->set_var('lang_read_confirmation', lang("read confirmation")); 736 754 $this->template->set_var('lang_add_history', lang("add history")); 737 738 $this->template->parse('add_recipient_box', 'add_recipient_block', true);739 755 740 756 if(isset($params["error_message"])) { … … 754 770 $GLOBALS['phpgw_info']['mobiletemplate']->set_error_msg($params["error_message"]); 755 771 } else { 756 if (isset($params['msg_number'])) $msg = $this->imap_functions->get_info_msg(array('msg_number' => $params['msg_number'] ) );772 if (isset($params['msg_number'])) $msg = $this->imap_functions->get_info_msg(array('msg_number' => $params['msg_number'], 'msg_folder' => $params['msg_folder'] ) ); 757 773 758 774 if($params['type']=="clk") … … 816 832 $this->template->set_var('msg_folder', $_GET['msg_folder']); 817 833 } 834 else if($params['type']=="use_draft"){ 835 $this->template->set_var('input_to', $msg['toaddress2']); 836 $this->template->set_var('input_cc', $msg['cc']); 837 $this->template->set_var('subject', $msg['subject']); 838 $this->template->set_var('body_value', strip_tags($msg['body'])); // Usa a função strip_tags() para filtrar 839 $this->template->set_var('msg_number', $_GET['msg_number']); 840 $this->template->set_var('msg_folder', $_GET['msg_folder']); 841 } 818 842 else{ 819 843 $this->template->set_var('from', $msg['toaddress2']); … … 824 848 $this->template->set_var('msg_number', $_GET['msg_number']); 825 849 $this->template->set_var('msg_folder', $_GET['msg_folder']); 826 827 $this->template->set_var('read_only', "readonly");828 850 } 829 851 } … … 865 887 866 888 //Recebe os dados do form (passados pelo POST) 867 $ userMail= $_POST['input_to'];868 $cc UserMail= $_POST['input_cc'];889 $toaddress = $_POST['input_to']; 890 $ccaddress = $_POST['input_cc']; 869 891 $subject = $_POST['input_subject']; //"Mail Subject"; 870 892 $body = $_POST['body']; //"Mail body. Any text."; … … 876 898 //Cria objeto 877 899 $mail = new PHPMailer(); 878 879 if(!$this->imap_functions->add_recipients("to", $userMail, &$mail)) 900 901 $db_functions = CreateObject('expressoMail1_2.db_functions'); 902 903 //chama o getAddrs para carregar os emails caso seja um grupo 904 $toaddress = implode(',',$db_functions->getAddrs(explode(',',$toaddress))); 905 $ccaddress = implode(',',$db_functions->getAddrs(explode(',',$ccaddress))); 906 907 if(!$this->imap_functions->add_recipients("to", $toaddress, &$mail)) 880 908 { 881 909 $error_msg = lang("Some addresses in the To field were not recognized. Please make sure that all addresses are properly formed"); 882 910 } 883 911 884 if(!$this->imap_functions->add_recipients("cc", $cc UserMail, &$mail))912 if(!$this->imap_functions->add_recipients("cc", $ccaddress, &$mail)) 885 913 { 886 914 $error_msg = lang("Some addresses in the CC field were not recognized. Please make sure that all addresses are properly formed"); -
branches/2.2/mobile/setup/phpgw_pt-br.lang
r3599 r3602 34 34 new mail mobile pt-br Novo 35 35 save draft mobile pt-br Salvar rascunho 36 edit draft mobile pt-br Editar rascunho 36 37 search return mobile pt-br resultado de busca 37 38 see details mobile pt-br ver detalhes -
branches/2.2/mobile/templates/css/mobile.css
r3599 r3602 21 21 22 22 *{font-family:Arial; font-size: 10px;} 23 h1{ padding-top: 5px; height:20px; font-size: 80%; padding-left:5px; color:#FFFFFF;}23 h1{ padding-top: 5px; height:20px; font-size: 90%; padding-left:5px; color:#FFFFFF;} 24 24 dt{ padding:2px 0px 0px 5px; height:20px; font-weight:bold; font-size: 80%; color:#3E3E3D; background-color:#CEE5EF;} 25 25 dt.seen {font-weight:normal;} … … 33 33 #operacao_lista{ padding-left: 5px; padding-top:5px; height:25px; font-size:70%; background-color:#C9C9C9; } 34 34 #menu_rodape{background-color:#F2F2F2;} 35 #menu_rodape a{ padding-left:10px; color:#2B84AF; font-size:9 px;}35 #menu_rodape a{ padding-left:10px; color:#2B84AF; font-size:90%; } 36 36 #corpo_mensagem{ padding:10px;font-size:11px; min-width:200px;} 37 37 #corpo_mensagem p{min-height:25px;} … … 50 50 .contagem{ text-align:right;} 51 51 .nome-item{ float:left;width:160px;} 52 .menu-contexto{ padding-top:3px; padding-left:5px; height:20px; font-size: 60%; background-color:#3399CC; color:#FFFFFF;}52 .menu-contexto{ padding-top:3px; padding-left:5px; height:20px; font-size:70%; background-color:#3399CC; color:#FFFFFF;} 53 53 .btn-contexto{ font-size:90%; background-color:#2B84AF; color:#FFFFFF; border:none;} 54 54 .btn-generico, .btn-contexto{ height:20px; } … … 74 74 75 75 .campos-entrada{ height:110px; font-size:70%; background-color:#CEE5EF;} 76 .campos-correspondencia{ height:80px; font-size:70%; background-color:#CEE5EF;}76 .campos-correspondencia{ min-height:80px; font-size:70%; background-color:#CEE5EF;} 77 77 .campos-correspondencia input{height:15px;} 78 .campos-correspondencia p{height:25px;} 79 .campos-correspondencia p label{float:left;width:75px;} 78 80 .campos-entrada input{height:10px;} 79 .campos-entrada .posiciona-esquerda p{height:20px;} 80 .posiciona-esquerda{padding:5px 0px 0px 10px; float:left;} 81 .posiciona-esquerda p{height:25px;} 82 .posiciona-esquerda p label{float:left;width:75px;} 81 .campos-correspondencia, .campos-entrada { padding:5px 0px 0px 10px; } 83 82 84 83 .login{ background-color:#EEF7FA;} -
branches/2.2/mobile/templates/default/mails_list.tpl
r3589 r3602 5 5 <dt class="titulo_mensagem {bg} {flag}"> 6 6 <div class="nome-item"> 7 <input type="checkbox" name="msgs[]" style="display:{show_check};" value={msg_number}><a href="index.php?menuaction=mobile.ui_mobilemail.show_msg&msg_number={msg_number}& folder={msg_folder}">7 <input type="checkbox" name="msgs[]" style="display:{show_check};" value={msg_number}><a href="index.php?menuaction=mobile.ui_mobilemail.show_msg&msg_number={msg_number}&msg_folder={msg_folder}"> 8 8 {from} 9 9 </a> -
branches/2.2/mobile/templates/default/new_msg.tpl
r3600 r3602 26 26 27 27 <div class="campos-correspondencia"> 28 <div class="posiciona-esquerda"> 29 <p><strong><label>{lang_to}:</label></strong> <input id="input_to" name="input_to" value='{input_to}' "{read_only}"></p> 30 <p><strong><label>{lang_cc}:</label></strong> <input id="input_cc" name="input_cc" value='{input_cc}' "{read_only}"></p> 31 <p><strong><label>{lang_subject}:</label></strong> <input id="input_subject" name="input_subject" value='{subject}'></p> 32 </div> 33 34 <div class="posiciona-esquerda"> 35 {add_recipient_box} 36 <!--<p><button name="anexo" title="Anexar" class="btn-contexto">{lang_attachment}</button></p>--> 37 </div> 28 <p> 29 <strong><label>{lang_to}:</label></strong> 30 <input id="input_to" name="input_to" value='{input_to}' "{read_only}" /> 31 <button name="action" title="Ver agenda" class="btn-contexto" onclick="mobile_add_contact('to');">+</button> 32 </p> 33 <p> 34 <strong><label>{lang_cc}:</label></strong> 35 <input id="input_cc" name="input_cc" value='{input_cc}' "{read_only}" /> 36 <button name="action" title="Ver agenda" class="btn-contexto" onclick="mobile_add_contact('cc');">+</button> 37 </p> 38 <p> 39 <strong><label>{lang_subject}:</label></strong> 40 <input id="input_subject" name="input_subject" value='{subject}' /> 41 <!-- <button name="anexo" title="Anexar" class="btn-contexto">{lang_attachment}</button> --> 42 </p> 38 43 </div> 39 44 … … 53 58 </form> 54 59 <!-- END page --> 55 <!-- BEGIN add_recipient_block -->56 <p><button name="action" title="Ver agenda" class="btn-contexto" onclick="mobile_add_contact('to');">+</button></p>57 <p><button name="action" title="Ver agenda" class="btn-contexto" onclick="mobile_add_contact('cc');">+</button></p>58 <p></p>59 <!-- END add_recipient_block --> -
branches/2.2/mobile/templates/default/view_msg.tpl
r3576 r3602 26 26 27 27 <div id="operacao_lista"> 28 <a href="{mark_as_unread_link}"><button id="mark_as_read" class="btn-generico" >{lang_mark_as_unread}</button></a> 29 <a href="{forward_link}"><button id="forward" class="btn-generico" >{lang_forward}</button></a> 30 <a href="{reply_link}"><button id="replay" class="btn-generico" >{lang_reply}</button></a> 31 <a href="{reply_all_link}"><button id="replay_all" class="btn-generico" >{lang_reply_all}</button></a> 32 <a href="{delete_link}"><button id="delete" class="btn-generico" >{lang_delete}</button></a> 28 {operation_box} 33 29 </div> 34 30 … … 42 38 </a> 43 39 <!-- END end_anchor --> 40 41 <!-- BEGIN operation_block --> 42 <a href="{operation_link}"><button id="{operation_id}" class="btn-generico" >{lang_operation}</button></a> 43 <!-- END operation_block -->
Note: See TracChangeset
for help on using the changeset viewer.