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

* Addressbook: Fix send all contact's emails/vcards to compose dialog does not work

Browse Source
This commit is contained in:
Hadi Nategh 2018-04-09 16:42:08 +02:00
parent 98c7a7af64
commit 5d128cc43b
3 changed files with 78 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addressbook/js/app.js
View File

@ -769,15 +769,23 @@ app.classes.addressbook = AppJS.extend(
*/
adb_mail_vcard: function(_action, _elems)
{
var link = '';
var link = {'preset[type]':[], 'preset[file]':[]};
var content = {vcard:{file:[], type:[]}};
var nm = this.et2.getWidgetById('nm');
if(fetchAll(_elems, nm, jQuery.proxy(function(ids) {
this.adb_mail_vcard(_action, ids.map(function(num) {return {id:'addressbook::'+num};}));
}, this)))
{
return;
}
for (var i = 0; i < _elems.length; i++)
{
var idToUse = _elems[i].id;
var idToUseArray = idToUse.split('::');
idToUse = idToUseArray[1];
link += "preset[type][]="+"text/vcard; charset="+(egw.preference('vcard_charset', 'addressbook') || 'utf-8')+'&';
link += "preset[file][]="+"vfs://default/apps/addressbook/"+idToUse+"/.entry"+'&';
link['preset[type]'].push("text/vcard; charset="+(egw.preference('vcard_charset', 'addressbook') || 'utf-8'));
link['preset[file]'].push("vfs://default/apps/addressbook/"+idToUse+"/.entry");
content.vcard.file.push("vfs://default/apps/addressbook/"+idToUse+"/.entry");
content.vcard.type.push("text/vcard; charset="+(egw.preference('vcard_charset', 'addressbook') || 'utf-8'));
}

91
api/js/jsapi/egw_open.js
View File

@ -449,6 +449,68 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
{
var popups = window.framework.popups_get(_app, _regexp);
var openUp = function (_app, _extra) {
var len = 0;
if (typeof _extra == "string")
{
len = _extra.length;
}
else if (typeof _extra == "object")
{
for (var i in _extra)
{
if (jQuery.isArray(_extra[i]))
{
var tmp = '';
for (var j in _extra[i])
{
tmp += i+'[]='+_extra[i][j]+'&';
}
len += tmp.length;
}
else
{
len += _extra[i].length;
}
}
}
// Accoring to microsoft, IE 10/11 can only accept a url with 2083 caharacters
// therefore we need to send request to compose window with POST method
// instead of GET. We create a temporary <Form> and will post emails.
// ** WebServers and other browsers also have url length limit:
// Firefox:~ 65k, Safari:80k, Chrome: 2MB, Apache: 4k, Nginx: 4k
if (len > 2083)
{
var popup = egw.open('','mail','add','','compose__','mail');
var $tmpForm = jQuery(document.createElement('form'));
var $tmpSubmitInput = jQuery(document.createElement('input')).attr({type:"submit"});
for (var i in _extra)
{
if (jQuery.isArray(_extra[i]))
{
$tmpForm.append(jQuery(document.createElement('input')).attr({name:i, type:"text", value: JSON.stringify(_extra[i])}));
}
else
{
$tmpForm.append(jQuery(document.createElement('input')).attr({name:i, type:"text", value: _extra[i]}));
}
}
// Set the temporary form's attributes
$tmpForm.attr({target:popup.name, action:"index.php?menuaction=mail.mail_compose.compose", method:"post"})
.append($tmpSubmitInput).appendTo('body');
$tmpForm.submit();
// Remove the form after submit
$tmpForm.remove();
}
else
{
egw.open('', _app, 'add', _extra, _app, _app);
}
};
for(var i = 0; i < popups.length; i++)
{
if(popups[i].closed)
@ -464,7 +526,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
}
catch(e) {
window.setTimeout(function() {
egw.open('', _app, 'add', _extra, _app, _app);
openUp(_app, _extra);
});
}
}
@ -502,32 +564,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
}
else
{
// No compose windows, might be no mail app.js
// We really want to use mail_compose() here
// Accoring to microsoft, IE 10/11 can only accept a url with 2083 caharacters
// therefore we need to send request to compose window with POST method
// instead of GET. We create a temporary <Form> and will post emails.
// ** WebServers and other browsers also have url length limit:
// Firefox:~ 65k, Safari:80k, Chrome: 2MB, Apache: 4k, Nginx: 4k
if (_extra.length > 2083)
{
var popup = egw.open('', _app, 'add', '', '', _app);
var $tmpForm = jQuery(document.createElement('form')).appendTo('body');
var $tmpInput = jQuery(document.createElement('input')).attr({name:Object.keys(_extra)[0], type:"text", value: _extra});
var $tmpSubmitInput = jQuery(document.createElement('input')).attr({type:"submit"});
// Set the temporary form's attributes
$tmpForm.attr({target:popup.name, action:"index.php?menuaction=mail.mail_compose.compose", method:"post"})
.append($tmpInput)
.append($tmpSubmitInput);
$tmpForm.submit();
// Remove the form after submit
$tmpForm.remove();
}
else // simple GET request
{
egw.open('', _app, 'add', _extra, _app, _app);
}
openUp(_app, _extra);
}
}
};

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

@ -1361,10 +1361,10 @@ class mail_compose
*/
function addPresetFiles (&$_content, &$_insertSigOnTop, $_eliminateDoubleAttachments)
{
$names = (array)$_REQUEST['preset']['name'];
$types = (array)$_REQUEST['preset']['type'];
$names = !is_array($_REQUEST['preset']['name'])? json_decode($_REQUEST['preset']['name'], true):$_REQUEST['preset']['name'];
$types = !is_array($_REQUEST['preset']['type'])? json_decode($_REQUEST['preset']['type'], true):$_REQUEST['preset']['type'];
//if (!empty($types) && in_array('text/calendar; method=request',$types))
$files = (array)$_REQUEST['preset']['file'];
$files = !is_array($_REQUEST['preset']['file'])? json_decode($_REQUEST['preset']['file'], true):$_REQUEST['preset']['file'];
foreach($files as $k => $path)
{