lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean and update code

Browse Source
This commit is contained in:
Philippe GRAND 2018-07-23 17:57:11 +02:00
parent 3297554102
commit 442ffb95ba
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/api/class/api_setup.class.php
View File

@ -1,8 +1,8 @@
<?php <?php
/* Copyright (C) 2016 Xebax Christy <xebax@wanadoo.fr> /* Copyright (C) 2016 Xebax Christy <xebax@wanadoo.fr>
* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2017 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2017 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2017 Neil Orley <neil.orley@oeris.fr> * Copyright (C) 2017 Neil Orley <neil.orley@oeris.fr>
* *
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -863,11 +863,11 @@ class Setup extends DolibarrApi
// Show warning // Show warning
if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3)) if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
{ {
//setEventMessage($langs->trans("FileIntegrityIsStrictlyConformedWithReference")); //setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
} }
else else
{ {
//setEventMessage($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), 'warnings'); //setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
} }
} }
else else

4
htdocs/blockedlog/admin/blockedlog_list.php
View File

@ -138,7 +138,7 @@ else if (GETPOST('downloadcsv','alpha'))
else else
{ {
$error++; $error++;
setEventMessage($db->lasterror, 'errors'); setEventMessages($db->lasterror, null, 'errors');
} }
} }
@ -243,7 +243,7 @@ else if (GETPOST('downloadcsv','alpha'))
} }
else else
{ {
setEventMessage($db->lasterror, 'errors'); setEventMessages($db->lasterror, null, 'errors');
} }
} }
} }

2
htdocs/cashdesk/validation_verif.php
View File

@ -253,7 +253,7 @@ switch ($action)
} }
else else
{ {
setEventMessage($invoice->error, $invoice->errors, 'errors'); setEventMessages($invoice->error, $invoice->errors, 'errors');
$error++; $error++;
} }

27
htdocs/comm/mailing/advtargetemailing.php
View File

@ -84,9 +84,12 @@ if (empty($template_id)) {
$result = $advTarget->fetch($template_id); $result = $advTarget->fetch($template_id);
} }
if ($result < 0) { if ($result < 0)
setEventMessage($advTarget->error, 'errors'); {
} else { setEventMessages($advTarget->error, $advTarget->errors, 'errors');
}
else
{
if (! empty($advTarget->id)) { if (! empty($advTarget->id)) {
$array_query = json_decode($advTarget->filtervalue, true); $array_query = json_decode($advTarget->filtervalue, true);
} }
@ -101,7 +104,7 @@ if ($action == 'loadfilter') {
if (! empty($template_id)) { if (! empty($template_id)) {
$result = $advTarget->fetch($template_id); $result = $advTarget->fetch($template_id);
if ($result < 0) { if ($result < 0) {
setEventMessage($advTarget->error, 'errors'); setEventMessages($advTarget->error, $advTarget->errors, 'errors');
} else { } else {
if (! empty($advTarget->id)) { if (! empty($advTarget->id)) {
$array_query = json_decode($advTarget->filtervalue, true); $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) { // if ($array_query ['type_of_target'] == 1 || $array_query ['type_of_target'] == 3) {
$result = $advTarget->query_thirdparty($array_query); $result = $advTarget->query_thirdparty($array_query);
if ($result < 0) { if ($result < 0) {
setEventMessage($advTarget->error, 'errors'); setEventMessages($advTarget->error, $advTarget->errors, 'errors');
} }
/*} else { /*} else {
$advTarget->thirdparty_lines = array (); $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)) { 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); $result = $advTarget->query_contact($array_query, 1);
if ($result < 0) { 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 use contact but no result use artefact to so not use socid into add_to_target
if (count($advTarget->contact_lines) == 0) { if (count($advTarget->contact_lines) == 0) {
@ -241,10 +244,10 @@ if ($action == 'add') {
exit(); exit();
} }
if ($result == 0) { if ($result == 0) {
setEventMessage($langs->trans("WarningNoEMailsAdded"), 'warnings'); setEventMessages($langs->trans("WarningNoEMailsAdded"), null, 'warnings');
} }
if ($result < 0) { if ($result < 0) {
setEventMessage($obj->error, 'errors'); setEventMessages($obj->error, $obj->errors, 'errors');
} }
} }
@ -264,7 +267,7 @@ if ($action == 'savefilter' || $action == 'createfilter') {
$error = 0; $error = 0;
if ($action == 'createfilter' && empty($template_name)) { if ($action == 'createfilter' && empty($template_name)) {
setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('AdvTgtOrCreateNewFilter')), 'errors'); setEventMessages($langs->trans('ErrorFieldRequired', $langs->trans('AdvTgtOrCreateNewFilter')), null, 'errors');
$error ++; $error ++;
} }
@ -353,13 +356,13 @@ if ($action == 'savefilter' || $action == 'createfilter') {
$advTarget->name = $template_name; $advTarget->name = $template_name;
$result = $advTarget->create($user); $result = $advTarget->create($user);
if ($result < 0) { if ($result < 0) {
setEventMessage($advTarget->error, 'errors'); setEventMessages($advTarget->error, $advTarget->errors, 'errors');
} }
} elseif ($action == 'savefilter') { } elseif ($action == 'savefilter') {
$result = $advTarget->update($user); $result = $advTarget->update($user);
if ($result < 0) { if ($result < 0) {
setEventMessage($advTarget->error, 'errors'); setEventMessages($advTarget->error, $advTarget->errors, 'errors');
} }
} }
$template_id = $advTarget->id; $template_id = $advTarget->id;
@ -369,7 +372,7 @@ if ($action == 'savefilter' || $action == 'createfilter') {
if ($action == 'deletefilter') { if ($action == 'deletefilter') {
$result = $advTarget->delete($user); $result = $advTarget->delete($user);
if ($result < 0) { if ($result < 0) {
setEventMessage($advTarget->error, 'errors'); setEventMessages($advTarget->error, $advTarget->errors, 'errors');
} }
header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id); header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
exit(); exit();