Changeset 4046
- Timestamp:
- 04/15/11 15:22:49 (13 years ago)
- Location:
- branches/2.2/mobile
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/mobile/inc/class.mobiletemplate.inc.php
r3996 r4046 184 184 185 185 $built_current_url = $this->build_url($current_url, $current_params); 186 187 //se der reload não vai gravar a url e vai sobreescrever o link do botão voltar para não voltar para a mesma página 188 if(str_replace("&is_back_link=true","",$built_current_url) != str_replace("&is_back_link=true","",$this->href_back)) 189 $trace[sizeof($trace)] = array("url" => $current_url, "request" => $current_params); 190 else { 191 if($trace_idx >= 1) $trace_idx--; 192 $this->href_back = $this->build_url($trace[$trace_idx]["url"], $trace[$trace_idx]["request"]); 186 187 if( (preg_match('/menuaction/i',$built_current_url) 188 && !preg_match('/mobile\.ui_mobilemail\.(send_mail|save_draft|delete_msg)/i',$built_current_url) ) 189 && !$current_params["ignore_trace_url"] ) { 190 191 //se der reload não vai gravar a url e vai sobreescrever o link do botão voltar para não voltar para a mesma página 192 if(str_replace("&is_back_link=true","",$built_current_url) != str_replace("&is_back_link=true","",$this->href_back)) 193 $trace[sizeof($trace)] = array("url" => $current_url, "request" => $current_params); 194 else { 195 if($trace_idx >= 1) $trace_idx--; 196 $this->href_back = $this->build_url($trace[$trace_idx]["url"], $trace[$trace_idx]["request"]); 197 } 193 198 } 194 199 } else { -
branches/2.2/mobile/inc/class.ui_mobilemail.inc.php
r4040 r4046 843 843 $this->new_msg( $params ); 844 844 }else { 845 header('Location: index.php?menuaction=menuaction=mobile.ui_home.index&success_message='.lang("draft saved") );845 header('Location: index.php?menuaction=menuaction=mobile.ui_home.index&success_message='.lang("draft saved").'&ignore_trace_url=true'); 846 846 } 847 847 } … … 952 952 }else { 953 953 if($GLOBALS['phpgw']->session->appsession('mobile.layout','mobile')=="mini_desktop") { 954 header('Location: index.php?menuaction=mobile.ui_mobilemail.index&success_message='.lang("Message sent successfully") );954 header('Location: index.php?menuaction=mobile.ui_mobilemail.index&success_message='.lang("Message sent successfully").'&ignore_trace_url=true'); 955 955 } else { 956 header('Location: index.php?menuaction=mobile.ui_home.index&success_message='.lang("Message sent successfully") );956 header('Location: index.php?menuaction=mobile.ui_home.index&success_message='.lang("Message sent successfully").'&ignore_trace_url=true'); 957 957 } 958 958 } … … 976 976 $this->imap_functions->move_messages($params_messages); 977 977 978 header("Location: index.php?menuaction=mobile.ui_mobilemail.index&success_message=".lang("The messages were moved to trash") );978 header("Location: index.php?menuaction=mobile.ui_mobilemail.index&success_message=".lang("The messages were moved to trash").'&ignore_trace_url=true'); 979 979 980 980 }else{ -
branches/2.2/mobile/templates/default/new_msg.tpl
r3935 r4046 14 14 var anexo_element = document.createElement("div"); 15 15 anexo_box.innerHTML += "<input name=\"FILES[]\" type=\"file\">"; 16 } 17 18 function save_msg_as_draft() { 19 document.getElementById('menuaction').value = "mobile.ui_mobilemail.save_draft"; 20 document.getElementById('mail_form').submit(); 16 21 } 17 22 … … 64 69 <div class="margin-rodape"> 65 70 <button onclick="location.href='{href_back}'" id="cancel" class="btn-generico" >{lang_cancel}</button> 66 <button id="save_draft" class="btn-generico" onclick=" document.getElementById('mail_form').action='index.php?menuaction=mobile.ui_mobilemail.save_draft';document.getElementById('mail_form').submit()" >{lang_save_draft}</button>71 <button id="save_draft" class="btn-generico" onclick="save_msg_as_draft()" >{lang_save_draft}</button> 67 72 <button name="action" id="reply_send" class="btn-generico" onclick="document.getElementById('mail_form').submit()">{lang_send}</button> 68 73 </div>
Note: See TracChangeset
for help on using the changeset viewer.