extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 03:13:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove since 14.3 no longer necessary workaround for submiting mail compose to a different url, which was causing now problems (Application echoed something), and fixed not always instanciate $contacts_objs from previous commit

Browse Source
This commit is contained in:
Ralf Becker 2016-03-29 10:13:32 +00:00
parent b42c2fe4f7
commit 4f3eb21e84
2 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,6 +812,7 @@ class mail_compose
if ($_REQUEST['preset']['mailtocontactbyid']) {
if ($GLOBALS['egw_info']['user']['apps']['addressbook']) {
$contacts_obj = new Api\Contacts();
$addressbookprefs =& $GLOBALS['egw_info']['user']['preferences']['addressbook'];
if (method_exists($contacts_obj,'search')) {
@ -2613,11 +2614,13 @@ class mail_compose
*/
static function resolveEmailAddressList($_emailAddressList)
{
$contacts_obs = null;
$addrFromList=array();
foreach((array)$_emailAddressList as $ak => $address)
{
if(is_int($address))
{
if (!isset($contacts_obs)) $contacts_obj = new Api\Contacts();
// List was selected, expand to addresses
unset($_emailAddressList[$ak]);
$list = $contacts_obj->search('',array('n_fn','n_prefix','n_given','n_family','org_name','email','email_home'),'','','',False,'AND',false,array('list' =>(int)$address));
@ -3496,20 +3499,4 @@ class mail_compose
$response->error(implode(',',$results['failed']));
}
}
/**
* Wrapper for Api\Etemplate::ajax_process_content to be able to identify send request to select different fpm pool
*
* @param string $etemplate_exec_id
* @param array $content
* @param boolean $no_validation
* @throws egw_exception_wrong_parameter
*/
static public function ajax_send($etemplate_exec_id, array $content, $no_validation)
{
// setting menuaction is required as it triggers different behavior eg. in egw_framework::window_close()
$_GET['menuaction'] = 'Api\Etemplate::ajax_process_content';
return Api\Etemplate::ajax_process_content($etemplate_exec_id, $content, $no_validation);
}
}

2
mail/js/app.js
View File

@ -225,8 +225,6 @@ app.classes.mail = AppJS.extend(
{
this.mailvelopeAvailable(this.mailvelopeCompose);
}
// use a wrapper on a different url to be able to use a different fpm pool
et2.menuaction = 'mail_compose::ajax_send';
var that = this;
var textAreaWidget = this.et2.getWidgetById('mail_htmltext');
this.mail_isMainWindow = false;