holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use mail_id in app.mail.compose() when there's no rows passed

Browse Source 
- Some code consolidation in preparation for tracking open compose windows
This commit is contained in:
Nathan Gray 2013-10-04 17:45:33 +00:00
parent ec2de1c7e6
commit 3b3986e27d
2 changed files with 113 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
mail/inc/class.mail_compose.inc.php
View File

@ -281,6 +281,20 @@ class mail_compose
error_log(__METHOD__.__LINE__.array2string($_content).function_backtrace());
if (isset($_GET['reply_id'])) $replyID = $_GET['reply_id'];
if (!$replyID && isset($_GET['id'])) $replyID = $_GET['id'];
if (isset($_GET['part_id'])) $replyID = $_GET['part_id'];
// Process different places we can use as a start for composing an email
if($_GET['from'] && $replyID)
{
$_content = array_merge((array)$_content, $this->getComposeFrom(
// Parameters needed for fetching appropriate data
$replyID, $_GET['part_id'], $_GET['from'],
// Additionally may be changed
$_focusElement, $suppressSigOnTop, $isReply
));
}
// VFS Selector was used
if (is_array($_content['selectFromVFSForCompose']))
{
@ -1114,37 +1128,61 @@ if (is_array($content['attachments']))error_log(__METHOD__.__LINE__.' Attachment
$etpl = new etemplate_new('mail.testhtmlarea');
$etpl->exec('mail.mail_compose.testhtmlarea',$content,$sel_options,$readonlys,$preserv,2);
}
function composeFromDraft() {
$replyID = $_GET['uid'];
$hA = mail_ui::splitRowID($replyID);
$replyID = $hA['msgUID'];
/**
* Get pre-fill a new compose based on an existing email
*
* @param type $mail_id If composing based on an existing mail, this is the ID of the mail
* @param type $part_id For multi-part mails, indicates which part
* @param type $from Indicates what the mail is based on, and how to extract data.
* One of 'compose', 'composeasnew', 'reply', 'reply_all' or 'forward'
* @param boolean $_focusElement varchar subject, to, body supported
* @param boolean $suppressSigOnTop
* @param boolean $isReply
*
* @return mixed[] Content array pre-filled according to source mail
*/
private function getComposeFrom($mail_id, $part_id, $from, &$_focusElement, &$suppressSigOnTop, &$isReply)
{
$content = array();
$hA = mail_ui::splitRowID($mail_id);
$msgUID = $hA['msgUID'];
$folder = $hA['folder'];
$icServer = $hA['profileID'];
if (!empty($folder) && !empty($replyID) ) {
// this fill the session data with the values from the original email
$content = $this->getDraftData($icServer, $folder, $replyID);
}
$this->compose($content,null,'body',$suppressSigOnTop=true);
}
function forward() {
$replyID = $_GET['reply_id'];
$partID = $_GET['part_id'];
$hA = mail_ui::splitRowID($replyID);
$replyID = $hA['msgUID'];
$folder = $hA['folder'];
$icServer = $hA['profileID'];
$mode = false;
if (isset($_GET['mode']) && ($_GET['mode']=='forwardasattach'||$_GET['mode']=='forwardinline')) $mode = ($_GET['mode']=='forwardinline'?'inline':'asattach');
if (!empty($replyID))
if (!empty($folder) && !empty($msgUID) )
{
// this fill the session data with the values from the original email
$content = $this->getForwardData($icServer, $folder, $replyID, $partID, $mode);
switch($from)
{
case 'composeasnew':
case 'composefromdraft':
$content = $this->getDraftData($icServer, $folder, $msgUID, $part_id);
$_focusElement = 'body';
$suppressSigOnTop = true;
break;
case 'reply':
case 'replyAll':
$content = $this->getReplyData($from == 'reply' ? 'single' : 'all', $icServer, $folder, $msgUID, $part_id);
$_focusElement = 'body';
$supressSigOnTop = true;
$isReply = true;
break;
case 'forward':
$mode = ($_GET['mode']=='forwardinline'?'inline':'asattach');
$content = $this->getForwardData($icServer, $folder, $msgUID, $part_id, $mode);
$isReply = ($mode?$mode=='inline':$this->preferencesArray['message_forwarding'] == 'inline');
$_focusElement = 'to';
break;
default:
error_log('Unhandled compose source: ' . $from);
}
}
$handleAsReply = ($mode?$mode=='inline':$this->preferencesArray['message_forwarding'] == 'inline');
$this->compose($content,null,'to',false, $handleAsReply);
return $content;
}
function getAttachment()
@ -1215,47 +1253,7 @@ if (is_array($content['attachments']))error_log(__METHOD__.__LINE__.' Attachment
print $folderTree;
}
function composeAsNew() {
$replyID = $_GET['reply_id'];
$partID = $_GET['part_id'];
$hA = mail_ui::splitRowID($replyID);
$replyID = $hA['msgUID'];
$folder = $hA['folder'];
$icServer = $hA['profileID'];
if (!empty($folder) && !empty($replyID) ) {
// this fill the session data with the values from the original email
$content = $this->getDraftData($icServer, $folder, $replyID, $partID);
}
$this->compose($content,null,'body',true);
}
function reply() {
$replyID = $_GET['reply_id'];
$partID = $_GET['part_id'];
$hA = mail_ui::splitRowID($replyID);
$replyID = $hA['msgUID'];
$folder = $hA['folder'];
$icServer = $hA['profileID'];
if (!empty($folder) && !empty($replyID) ) {
// this fill the session data with the values from the original email
$content = $this->getReplyData('single', $icServer, $folder, $replyID, $partID);
}
$this->compose($content,null,'body',false,true);
}
function replyAll() {
$replyID = $_GET['reply_id'];
$partID = $_GET['part_id'];
$hA = mail_ui::splitRowID($replyID);
$replyID = $hA['msgUID'];
$folder = $hA['folder'];
$icServer = $hA['profileID'];
if (!empty($folder) && !empty($replyID) ) {
// this fill the session data with the values from the original email
$content = $this->getReplyData('all', $icServer, $folder, $replyID, $partID);
}
$this->compose($content,null,'body',false,true);
}
/**
* previous bocompose stuff
@ -1588,7 +1586,7 @@ if (is_array($content['attachments']))error_log(__METHOD__.__LINE__.' Attachment
$userEMailAddresses = $this->preferences->getUserEMailAddresses();
// get message headers for specified message
#print "AAAA: $_folder, $_uid, $_partID<br>";
print "AAAA: $_folder, $_uid, $_partID<br>";
$headers = $mail_bo->getMessageEnvelope($_uid, $_partID);
#$headers = $mail_bo->getMessageHeader($_uid, $_partID);
$this->sessionData['uid'] = $_uid;

111
mail/js/app.js
View File

@ -194,75 +194,62 @@ app.mail = AppJS.extend(
*/
mail_compose: function(_action, _elems)
{
var idsToProcess = '';
var multipleIds = false;
var url = window.egw_webserverUrl+'/index.php?';
// Extra info passed to egw.open()
var settings = {
// 'Source' Mail UID
id: '',
// How to pull data from the Mail IDs for the compose
from: ''
};
if (typeof _elems == 'undefined')
{
var h = egw().open('','mail','add');
return true;
// No ids, try from content
settings.id = this.et2.getArrayMgr("content").getEntry('mail_id') || '';
}
if (_elems.length > 1) multipleIds = true;
//for (var i=0; i<_elems.length; i++)
//{
// if (i>0) idsToProcess += ',';
// idsToProcess += _elems[i].id;
//}
//alert('mail_'+_action.id+'('+idsToProcess+')');
if (_action.id == 'compose')
else
{
if (multipleIds == false)
{
if (_elems.length == 1) mail_parentRefreshListRowStyle(_elems[0].id,_elems[0].id);
url += 'menuaction=mail.mail_compose.compose';
this.mail_openComposeWindow(url)
}
else
{
this.mail_compose('forward',_elems);
}
// We only handle one for everything but forward
settings.id = _elems[0].id;
}
if (_action.id == 'composefromdraft')
switch(_action.id)
{
url += 'menuaction=mail.mail_compose.composeFromDraft';
url += '&id='+_elems[0].id;
egw_openWindowCentered(url,'composeasnew_'+_elems[0].id,870,egw_getWindowOuterHeight());
case 'compose':
if (_elems.length == 1)
{
mail_parentRefreshListRowStyle(settings.id,settings.id);
}
else
{
return this.mail_compose('forward',_elems);
}
break;
case 'forward':
case 'forwardinline':
case 'forwardasattach':
if (_elems.length||_action.id == 'forwardasattach')
{
url = 'menuaction=mail.mail_compose.compose';
return this.mail_openComposeWindow(url,_action.id == 'forwardasattach', _elems);
}
else
{
settings.from = 'forward';
settings.mode = 'forwardinline';
}
break;
default:
// No further client side processing needed for these
settings.from = _action.id;
}
if (_action.id == 'composeasnew')
{
url += 'menuaction=mail.mail_compose.composeAsNew';
url += '&reply_id='+_elems[0].id;
egw_openWindowCentered(url,'composeasnew_'+_elems[0].id,870,egw_getWindowOuterHeight());
}
if (_action.id == 'reply')
{
url += 'menuaction=mail.mail_compose.reply';
url += '&reply_id='+_elems[0].id;
egw_openWindowCentered(url,'reply_'+_elems[0].id,870,egw_getWindowOuterHeight());
}
if (_action.id == 'reply_all')
{
url += 'menuaction=mail.mail_compose.replyAll';
url += '&reply_id='+_elems[0].id;
egw_openWindowCentered(url,'replyAll_'+_elems[0].id,870,egw_getWindowOuterHeight());
}
if (_action.id == 'forward'||_action.id == 'forwardinline'||_action.id == 'forwardasattach')
{
if (multipleIds||_action.id == 'forwardasattach')
{
url += 'menuaction=mail.mail_compose.compose';
mail_openComposeWindow(url,_action.id == 'forwardasattach');
}
else
{
url += 'menuaction=mail.mail_compose.forward';
url += '&reply_id='+_elems[0].id;
url += '&mode=forwardinline';
egw_openWindowCentered(url,'forward_'+_elems[0].id,870,egw_getWindowOuterHeight());
}
}
},
var window_name = settings.from + '_' + settings.id;
egw().open('','mail','add',settings,window_name);
return true;
},
/**
* Compose, reply or forward a message
*
@ -333,7 +320,7 @@ app.mail = AppJS.extend(
sMessageList= 'AsForward&forwardmails=1&folder='+activeFolderB64+'&reply_id='+sMessageList.substring(0,sMessageList.length-1);
}
//alert(sMessageList);
egw_openWindowCentered(_url+sMessageList,'compose',870,egw_getWindowOuterHeight());
egw_openWindowCentered(window.egw_webserverUrl+'/index.php?'+_url+sMessageList,'compose',870,egw_getWindowOuterHeight());
}
//ToDo: reset message selection
},