extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 16:33:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail: allow open as HTML/Plain Text on right click action

Browse Source
This commit is contained in:
Klaus Leithoff 2013-05-10 13:58:19 +00:00
parent 70d5474d96
commit 2f5a39d73f
3 changed files with 86 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
felamimail/inc/class.uidisplay.inc.php
View File

@ -293,6 +293,11 @@
{
$partID = $this->partID = $_GET['part'];
if (!empty($_GET['mailbox'])) $this->mailbox = base64_decode($_GET['mailbox']);
$htmlOptions = $this->bofelamimail->htmlOptions;
if (!empty($_GET['tryastext'])) $htmlOptions = "only_if_no_text";
if (!empty($_GET['tryashtml'])) $htmlOptions = "always_display";
$deleteDraftOnClose = false;
if (!empty($_GET['deleteDraftOnClose']) && $this->bofelamimail->isDraftFolder($this->mailbox)) $deleteDraftOnClose = true;
//$transformdate =& CreateObject('felamimail.transformdate');
@ -316,7 +321,7 @@
$rawheaders = $this->bofelamimail->getMessageRawHeader($this->uid, $partID);
//_debug_array($rawheaders);exit;
$fetchEmbeddedImages = false;
if ($this->bofelamimail->htmlOptions !='always_display') $fetchEmbeddedImages = true;
if ($htmlOptions !='always_display') $fetchEmbeddedImages = true;
$attachments = $this->bofelamimail->getMessageAttachments($this->uid, $partID, '',$fetchEmbeddedImages);
//_debug_array($attachments); //exit;
$envelope = $this->bofelamimail->getMessageEnvelope($this->uid, $partID,true);
@ -521,13 +526,17 @@
'part' => $partID,
'mailbox' => base64_encode($this->mailbox)
);
if ($htmlOptions != $this->bofelamimail->htmlOptions)
{
$linkData[($htmlOptions=='only_if_no_text'?'tryastext':'tryashtml')] = 1;
}
$this->t->set_var('url_displayBody', $GLOBALS['egw']->link('/index.php',$linkData));
// if browser supports data uri: ie<8 does NOT and ie>=8 does NOT support html as content :-(
// --> use it to send the mail as data uri
if (!isset($_GET['printable']))
{
$mailData = $this->get_load_email_data($this->uid, $partID, $envelope['SENDER'][0]['EMAIL']);
$mailData = $this->get_load_email_data($this->uid, $partID, $envelope['SENDER'][0]['EMAIL'],$htmlOptions);
$this->t->set_var('url_displayBody', $mailData['src']."\" onload=\"".$mailData['onload']);
$this->t->set_var('mail_dataScript', $mailData['script']);
@ -707,9 +716,12 @@
$partID = $_GET['part'];
if (empty($this->uid) && !empty($_GET['uid']) ) $this->uid = 9247;//$_GET['uid'];
if (!empty($_GET['mailbox'])) $this->mailbox = base64_decode($_GET['mailbox']);
$htmlOptions = $this->bofelamimail->htmlOptions;
if (!empty($_GET['tryastext'])) $htmlOptions = "only_if_no_text";
if (!empty($_GET['tryashtml'])) $htmlOptions = "always_display";
$this->bofelamimail->reopen($this->mailbox);
$bodyParts = $this->bofelamimail->getMessageBody($this->uid,'',$partID, '', false, $this->mailbox);
$bodyParts = $this->bofelamimail->getMessageBody($this->uid,$htmlOptions,$partID, '', false, $this->mailbox);
$this->bofelamimail->closeConnection();
$this->display_app_header();
@ -1085,17 +1097,17 @@ blockquote[type=cite] {
';
}
function get_load_email_data($uid, $partID, $sender)
function get_load_email_data($uid, $partID, $sender, $htmlOptions=null)
{
// seems to be needed, as if we open a mail from notification popup that is
// located in a different folder, we experience: could not parse message
$this->bofelamimail->reopen($this->mailbox);
$bodyParts = $this->bofelamimail->getMessageBody($uid, '', $partID, '', false, $this->mailbox);
if (empty($htmlOptions)) $htmlOptions = $this->bofelamimail->htmlOptions;
$bodyParts = $this->bofelamimail->getMessageBody($uid, ($htmlOptions?$htmlOptions:''), $partID, '', false, $this->mailbox);
//error_log(__METHOD__.__LINE__.array2string($bodyParts));
$meetingRequest = false;
$fetchEmbeddedImages = false;
if ($this->bofelamimail->htmlOptions !='always_display') $fetchEmbeddedImages = true;
if ($htmlOptions !='always_display') $fetchEmbeddedImages = true;
$attachments = $this->bofelamimail->getMessageAttachments($uid, $partID, '',$fetchEmbeddedImages,true);
foreach ((array)$attachments as $key => $attach)
{

15
felamimail/inc/class.uiwidgets.inc.php
View File

@ -501,6 +501,21 @@ class uiwidgets
'onExecute' => 'javaScript:mail_mailsource',
'allowOnMultiple' => false,
),
'openastext' => array(
'caption' => lang('Open in Text mode'),
'group' => ++$group,
'icon' => egw_vfs::mime_icon('text/plain'),
'onExecute' => 'javaScript:mail_openAsText',
'allowOnMultiple' => false,
),
'openashtml' => array(
'caption' => lang('Open in HTML mode'),
'group' => $group,
'icon' => egw_vfs::mime_icon('text/html'),
'onExecute' => 'javaScript:mail_openAsHtml',
'allowOnMultiple' => false,
),
),
),
/*

52
felamimail/js/jscode/viewMainScreen.js
View File

@ -168,6 +168,58 @@ function mail_open(_action, _elems)
}
}
/**
* Open a single message in html mode
*
* @param _action
* @param _elems _elems[0].id is the row-id
*/
function mail_openAsHtml(_action, _elems)
{
//alert('mail_open('+_elems[0].id+')');
if (activeFolderB64 == draftFolderB64 || activeFolderB64 == templateFolderB64)
{
_action.id='composefromdraft';
mail_compose(_action,_elems);
}
else
{
var url = window.egw_webserverUrl+'/index.php?';
url += 'menuaction=felamimail.uidisplay.display'; // todo compose for Draft folder
url += '&mailbox='+egw_appWindow('felamimail').activeFolderB64;
url += '&uid='+_elems[0].id;
url += '&tryashtml=1';
fm_readMessage(url, 'displayMessage_'+_elems[0].id, _elems[0].iface.getDOMNode());
}
}
/**
* Open a single message in plain text mode
*
* @param _action
* @param _elems _elems[0].id is the row-id
*/
function mail_openAsText(_action, _elems)
{
//alert('mail_open('+_elems[0].id+')');
if (activeFolderB64 == draftFolderB64 || activeFolderB64 == templateFolderB64)
{
_action.id='composefromdraft';
mail_compose(_action,_elems);
}
else
{
var url = window.egw_webserverUrl+'/index.php?';
url += 'menuaction=felamimail.uidisplay.display'; // todo compose for Draft folder
url += '&mailbox='+egw_appWindow('felamimail').activeFolderB64;
url += '&uid='+_elems[0].id;
url += '&tryastext=1';
fm_readMessage(url, 'displayMessage_'+_elems[0].id, _elems[0].iface.getDOMNode());
}
}
/**
* Compose, reply or forward a message
*