Merge branch 'formconfirm_notification' of https://github.com/bb2a/dolibarr into formconfirm_notification
This commit is contained in:
commit
6cb83e5516
@ -112,18 +112,18 @@ class Notify
|
||||
$langs->load("mails");
|
||||
|
||||
$listofnotiftodo = $this->getNotificationsArray($action, $socid, $object, 0);
|
||||
if (!empty($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE)){
|
||||
if ($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 1 || $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 3){
|
||||
foreach($listofnotiftodo as $val){
|
||||
if ($val['type'] == 'touser'){
|
||||
if (!empty($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE)) {
|
||||
if ($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 1 || $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 3) {
|
||||
foreach ($listofnotiftodo as $val) {
|
||||
if ($val['type'] == 'touser') {
|
||||
unset($listofnotiftodo[$val['email']]);
|
||||
$listofnotiftodo = array_merge($listofnotiftodo);
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 2 || $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 3){
|
||||
foreach($listofnotiftodo as $val){
|
||||
if ($val['type'] == 'tofixedemail'){
|
||||
if ($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 2 || $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE == 3) {
|
||||
foreach ($listofnotiftodo as $val) {
|
||||
if ($val['type'] == 'tofixedemail') {
|
||||
unset($listofnotiftodo[$val['email']]);
|
||||
$listofnotiftodo = array_merge($listofnotiftodo);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user