Index: /branches/2.2/mobile/setup/phpmailer.lang-br.php
===================================================================
--- /branches/2.2/mobile/setup/phpmailer.lang-br.php (revision 3723)
+++ /branches/2.2/mobile/setup/phpmailer.lang-br.php (revision 3814)
@@ -22,3 +22,2 @@
$PHPMAILER_LANG["undisclosed-recipient"] = 'destinatarios nao divulgados';
?>
-
Index: /branches/2.2/mobile/inc/class.ui_mobilemail.inc.php
===================================================================
--- /branches/2.2/mobile/inc/class.ui_mobilemail.inc.php (revision 3791)
+++ /branches/2.2/mobile/inc/class.ui_mobilemail.inc.php (revision 3814)
@@ -883,5 +883,5 @@
{
$error_msg = lang("Some addresses in the CC field were not recognized. Please make sure that all addresses are properly formed");
- }
+ }
$mail->IsSMTP();
@@ -905,5 +905,5 @@
if($addHistory && $msgNumber) {
$msg = $this->imap_functions->get_info_msg(array('msg_number' => $msgNumber ) );
- $mail->Body .= "
".$msg['body']."
";
+ $mail->Body .= "
".$msg['body']."
";
}
//read confirmation
@@ -932,30 +932,32 @@
$file_description = unserialize(rawurldecode($forwarding_attachment));
$fileContent = $imap_functions->get_forwarding_attachment(
- $file_description[0],
- $file_description[1],
- $file_description[3],
- $file_description[4]);
+ $file_description[0],
+ $file_description[1],
+ $file_description[3],
+ $file_description[4]);
$fileName = $file_description[2];
$mail->AddStringAttachment($fileContent,html_entity_decode(rawurldecode($fileName)), $file_description[4], $imap_functions->get_file_type($file_description[2]));
-
- }
- }
-
- //Se o e-mail nao for enviado por qualquer motivo...
+ }
+ }
+
if(!$mail->Send()) {
$params["error_message"] = lang("Message not sent")."
".lang("error") . $mail->ErrorInfo;
$this->new_msg( $params );
}else {
- header('Location: index.php?menuaction=menuaction=mobile.ui_home.index&success_message='.lang("Message sent successfully"));
+ if($GLOBALS['phpgw']->session->appsession('mobile.layout','mobile')=="mini_desktop") {
+ header('Location: index.php?menuaction=mobile.ui_mobilemail.index&success_message='.lang("Message sent successfully"));
+ } else {
+ header('Location: index.php?menuaction=mobile.ui_home.index&success_message='.lang("Message sent successfully"));
+ }
}
}
function confirm_delete_msg()
- {
+ {
//Cria um objeto template
//Define o template para mensagens de retorno da funcao
$this->template->set_file(array('delete_msg_t' => 'delete_msg.tpl'));
$this->template->set_block('delete_msg_t','retorno');
- $this->template->set_var('lang_delete_msg', lang("Do you like to delete this message?"));
+ $this->template->set_var('lang_delete_msg', lang("Do you like to delete this message?"));
$this->template->set_var('lang_yes', lang("Yes"));
$this->template->set_var('lang_no', lang("No"));
Index: /branches/2.2/mobile/templates/default/pc_template.tpl
===================================================================
--- /branches/2.2/mobile/templates/default/pc_template.tpl (revision 3734)
+++ /branches/2.2/mobile/templates/default/pc_template.tpl (revision 3814)
@@ -77,5 +77,4 @@
{message_box}
-