Changeset 3231

Timestamp:

09/13/10 10:24:00 (14 years ago)

Author:

amuller

Message:

Ticket #1057 - Corrigindo envio de confirmação de leitura

Location:

branches/2.2/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (2 diffs)
• js/main.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (1 diff)

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -3007 +3007 @@
 
         function send_notification($params){
+                include("../header.inc.php");
                 require_once("class.phpmailer.php");
                 $mail = new PHPMailer();
@@ -3012 +3013 @@
                 $toaddress = $params['notificationto'];
 
-                $subject = 'Confirmação de leitura: ' . $params['subject'];
-                $body = 'Sua mensagem: ' . $params['subject'] . '<br>';
-                $body .= 'foi lida por: ' . $_SESSION['phpgw_info']['expressomail']['user']['fullname'] . ' &lt;' . $_SESSION['phpgw_info']['expressomail']['user']['email'] . '&gt; em ' . date("d/m/Y H:i");
+                $subject = lang("Read receipt: %1",$params['subject']);
+                $body = lang("Your message: %1",$params['subject']) . '<br>';
+                $body .= lang("Received in: %1",$params['date']) . '<br>';
+                $body .= lang("Has been read by: %1 &lt; %2 &gt; at %3", $_SESSION['phpgw_info']['expressomail']['user']['fullname'], $_SESSION['phpgw_info']['expressomail']['user']['email'], date("d/m/Y H:i"));
                 $mail->SMTPDebug = false;
                 $mail->IsSMTP();

branches/2.2/expressoMail1_2/js/main.js

@@ -358 +358 @@
 
                         if (confNotification)
-                                cExecute ("$this.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&subject="+url_encode(msg_info.subject), handler_sendNotification);
+                                cExecute ("$this.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&date="+msg_info.udate+"&subject="+url_encode(msg_info.subject), handler_sendNotification);
                 }
                 //Change msg class to read.

branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -30 +30 @@
 Archiving messages on folder    expressoMail1_2 pt-br   Arquivando mensagens na pasta
 A read confirmation was sent.   expressoMail1_2 pt-br   Uma confirmação de leitura foi enviada.
+Read receipt: %1        expressoMail1_2 pt-br   Confirmação de leitura: %1
+Your message: %1        expressoMail1_2 pt-br   Sua mensagem: %1
+Received in: %1 expressoMail1_2 pt-br   Recebida em: %1
+Has been read by: %1 < %2 > at %3 expressoMail1_2 pt-br   Foi lida por: %1 < %2 > em %3
 At %1, %2 hours, %3 wrote:      expressoMail1_2 pt-br   Em %1 às %2 horas, %3 escreveu:
 At least one message have the same origin       expressoMail1_2 pt-br   Pelo menos uma das mensagens está sendo movida para a mesma pasta