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

use a wrapper on a different url for sending mail to be able to select a different fpm pool

Browse Source
This commit is contained in:
Ralf Becker 2014-11-21 13:37:30 +00:00
parent 0da238155c
commit 46b4758dac
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3100,4 +3100,20 @@ class mail_compose
$response->error(implode(',',$results['failed']));
}
}
/**
* Wrapper for etemplate_new::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'] = 'etemplate_new::ajax_process_content';
return etemplate_new::ajax_process_content($etemplate_exec_id, $content, $no_validation);
}
}

2
mail/js/app.js
View File

@ -174,6 +174,8 @@ app.classes.mail = AppJS.extend(
);
break;
case 'mail.compose':
// 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;
this.mail_isMainWindow = false;
this.compose_fieldExpander_init();