From 442ffb95bacab9f6ad81db67c57cc0eaacefd8df Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 23 Jul 2018 17:57:11 +0200 Subject: [PATCH] clean and update code --- htdocs/api/class/api_setup.class.php | 8 +++--- htdocs/blockedlog/admin/blockedlog_list.php | 4 +-- htdocs/cashdesk/validation_verif.php | 2 +- htdocs/comm/mailing/advtargetemailing.php | 27 ++++++++++++--------- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php index ef2b4c8bb6d..fe4c73e91fd 100644 --- a/htdocs/api/class/api_setup.class.php +++ b/htdocs/api/class/api_setup.class.php @@ -1,8 +1,8 @@ * Copyright (C) 2016 Laurent Destailleur - * Copyright (C) 2017 Regis Houssin - * Copyright (C) 2017 Neil Orley + * Copyright (C) 2017 Regis Houssin + * Copyright (C) 2017 Neil Orley * * * This program is free software; you can redistribute it and/or modify @@ -863,11 +863,11 @@ class Setup extends DolibarrApi // Show warning if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3)) { - //setEventMessage($langs->trans("FileIntegrityIsStrictlyConformedWithReference")); + //setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs'); } else { - //setEventMessage($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), 'warnings'); + //setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings'); } } else diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index dbb0affdbdf..8f5d47bf704 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -138,7 +138,7 @@ else if (GETPOST('downloadcsv','alpha')) else { $error++; - setEventMessage($db->lasterror, 'errors'); + setEventMessages($db->lasterror, null, 'errors'); } } @@ -243,7 +243,7 @@ else if (GETPOST('downloadcsv','alpha')) } else { - setEventMessage($db->lasterror, 'errors'); + setEventMessages($db->lasterror, null, 'errors'); } } } diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 431f921a1fb..cdf9873e791 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -253,7 +253,7 @@ switch ($action) } else { - setEventMessage($invoice->error, $invoice->errors, 'errors'); + setEventMessages($invoice->error, $invoice->errors, 'errors'); $error++; } diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php index 1c886e2ba2c..b63ffac6efd 100644 --- a/htdocs/comm/mailing/advtargetemailing.php +++ b/htdocs/comm/mailing/advtargetemailing.php @@ -84,9 +84,12 @@ if (empty($template_id)) { $result = $advTarget->fetch($template_id); } -if ($result < 0) { - setEventMessage($advTarget->error, 'errors'); -} else { +if ($result < 0) +{ + setEventMessages($advTarget->error, $advTarget->errors, 'errors'); +} +else +{ if (! empty($advTarget->id)) { $array_query = json_decode($advTarget->filtervalue, true); } @@ -101,7 +104,7 @@ if ($action == 'loadfilter') { if (! empty($template_id)) { $result = $advTarget->fetch($template_id); if ($result < 0) { - setEventMessage($advTarget->error, 'errors'); + setEventMessages($advTarget->error, $advTarget->errors, 'errors'); } else { if (! empty($advTarget->id)) { $array_query = json_decode($advTarget->filtervalue, true); @@ -202,7 +205,7 @@ if ($action == 'add') { // if ($array_query ['type_of_target'] == 1 || $array_query ['type_of_target'] == 3) { $result = $advTarget->query_thirdparty($array_query); if ($result < 0) { - setEventMessage($advTarget->error, 'errors'); + setEventMessages($advTarget->error, $advTarget->errors, 'errors'); } /*} else { $advTarget->thirdparty_lines = array (); @@ -211,7 +214,7 @@ if ($action == 'add') { if ($user_contact_query && ($array_query['type_of_target'] == 1 || $array_query['type_of_target'] == 2 || $array_query['type_of_target'] == 4)) { $result = $advTarget->query_contact($array_query, 1); if ($result < 0) { - setEventMessage($advTarget->error, 'errors'); + setEventMessages($advTarget->error, $advTarget->errors, 'errors'); } // If use contact but no result use artefact to so not use socid into add_to_target if (count($advTarget->contact_lines) == 0) { @@ -241,10 +244,10 @@ if ($action == 'add') { exit(); } if ($result == 0) { - setEventMessage($langs->trans("WarningNoEMailsAdded"), 'warnings'); + setEventMessages($langs->trans("WarningNoEMailsAdded"), null, 'warnings'); } if ($result < 0) { - setEventMessage($obj->error, 'errors'); + setEventMessages($obj->error, $obj->errors, 'errors'); } } @@ -264,7 +267,7 @@ if ($action == 'savefilter' || $action == 'createfilter') { $error = 0; if ($action == 'createfilter' && empty($template_name)) { - setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('AdvTgtOrCreateNewFilter')), 'errors'); + setEventMessages($langs->trans('ErrorFieldRequired', $langs->trans('AdvTgtOrCreateNewFilter')), null, 'errors'); $error ++; } @@ -353,13 +356,13 @@ if ($action == 'savefilter' || $action == 'createfilter') { $advTarget->name = $template_name; $result = $advTarget->create($user); if ($result < 0) { - setEventMessage($advTarget->error, 'errors'); + setEventMessages($advTarget->error, $advTarget->errors, 'errors'); } } elseif ($action == 'savefilter') { $result = $advTarget->update($user); if ($result < 0) { - setEventMessage($advTarget->error, 'errors'); + setEventMessages($advTarget->error, $advTarget->errors, 'errors'); } } $template_id = $advTarget->id; @@ -369,7 +372,7 @@ if ($action == 'savefilter' || $action == 'createfilter') { if ($action == 'deletefilter') { $result = $advTarget->delete($user); if ($result < 0) { - setEventMessage($advTarget->error, 'errors'); + setEventMessages($advTarget->error, $advTarget->errors, 'errors'); } header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id); exit();