extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 20:31:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

support Disposition-Notification-To, Return-Receipt-To and X-Confirm-Reading-To on preview

Browse Source
This commit is contained in:
Klaus Leithoff 2014-03-25 16:20:28 +00:00
parent 7ef65b30d6
commit e36a7b17e3
4 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mail/inc/class.mail_bo.inc.php
View File

@ -19,5 +19,4 @@
*/ */
class mail_bo extends emailadmin_imapbase class mail_bo extends emailadmin_imapbase
{ {
} }

2
mail/inc/class.mail_bosieve.inc.php
View File

@ -3,7 +3,7 @@
* EGroupware EMail - timed vacation * EGroupware EMail - timed vacation
* *
* @link http://www.stylite.de * @link http://www.stylite.de
* @package felamimail * @package mail
* @author Ralf Becker <rb@stylite.de> * @author Ralf Becker <rb@stylite.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$

19
mail/inc/class.mail_ui.inc.php
View File

@ -1887,6 +1887,10 @@ unset($query['actions']);
else $data["flags"][$flag] = $flag; else $data["flags"][$flag] = $flag;
} }
} }
$data['dispositionnotificationto'] = $header['DISPOSITION-NOTIFICATION-TO'];
if (($header['mdnsent']||$header['mdnnotsent']|$header['seen'])&&isset($data['dispositionnotificationto'])) unset($data['dispositionnotificationto']);
if ($header['mdnsent']) $data["flags"]['mdnsent'];
if ($header['mdnnotsent']) $data["flags"]['mdnnotsent'];
$data['attachmentsPresent'] = $imageTag; $data['attachmentsPresent'] = $imageTag;
$data['attachmentsBlock'] = $imageHTMLBlock; $data['attachmentsBlock'] = $imageHTMLBlock;
$data['address'] = ($_folderType?$data["toaddress"]:$data["fromaddress"]); $data['address'] = ($_folderType?$data["toaddress"]:$data["fromaddress"]);
@ -4077,6 +4081,21 @@ $this->partID = $partID;
} }
} }
/**
* sendMDN, ...
*
* @param array _messageList list of UID's
*
* @return nothing
*/
function ajax_sendMDN($_messageList)
{
if(mail_bo::$debug); error_log(__METHOD__."->".array2string($_messageList));
$uidA = self::splitRowID($_messageList['msg'][0]);
$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
$this->mail_bo->sendMDN($uidA['msgUID'],$folder);
}
/** /**
* flag messages as read, unread, flagged, ... * flag messages as read, unread, flagged, ...
* *

21
mail/js/app.js
View File

@ -650,6 +650,27 @@ app.classes.mail = AppJS.extend(
this.mail_removeRowClass(messages,'unseen'); this.mail_removeRowClass(messages,'unseen');
// reduce counter without server roundtrip // reduce counter without server roundtrip
this.mail_reduceCounterWithoutServerRoundtrip(); this.mail_reduceCounterWithoutServerRoundtrip();
if (typeof dataElem.data.dispositionnotificationto != 'undefined' && typeof dataElem.data.flags.mdnsent == 'undefined' && typeof dataElem.data.flags.mdnnotsent == 'undefined')
{
var buttons = [
{text: this.egw.lang("Yes"), id: "mdnsent"},
{text: this.egw.lang("No"), id:"mdnnotsent"}
];
et2_dialog.show_dialog(function(_button_id, _value) {
switch (_button_id)
{
case "mdnsent":
egw.jsonq('mail.mail_ui.ajax_sendMDN',[messages]);
egw.jsonq('mail.mail_ui.ajax_flagMessages',['mdnsent', messages, true]);
return;
case "mdnnotsent":
egw.jsonq('mail.mail_ui.ajax_flagMessages',['mdnnotsent', messages, true]);
}
},
this.egw.lang("The message sender has requested a response to indicate that you have read this message. Would you like to send a receipt?"),
this.egw.lang("Confirm"),
messages, buttons);
}
egw.jsonq('mail.mail_ui.ajax_flagMessages',['read', messages, false]); egw.jsonq('mail.mail_ui.ajax_flagMessages',['read', messages, false]);
} }
// Pre-load next email already so user gets it faster // Pre-load next email already so user gets it faster