diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index 77c23d5f8b4..e4477e1674a 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -130,13 +130,13 @@ if ($action == 'confirm_delete_linked_resource' && $user->rights->resource->dele if ($result >= 0) { - setEventMessage($langs->trans('RessourceLineSuccessfullyDeleted')); + setEventMessages($langs->trans('RessourceLineSuccessfullyDeleted'), null, 'mesgs'); header("Location: ".$_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id); exit; } else { - setEventMessage($object->error,'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php index 1dd494cb3e8..95ff6365dac 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -98,7 +98,7 @@ if (empty($reshook)) { $enabled = trim(GETPOST('AGENDA_EXT_ENABLED_'.$id.'_'.$i, 'alpha')); if (!empty($src) && !dol_is_url($src)) { - setEventMessage($langs->trans("ErrorParamMustBeAnUrl"), 'errors'); + setEventMessages($langs->trans("ErrorParamMustBeAnUrl"), null, 'errors'); $error ++; $errorsaved ++; break; @@ -122,11 +122,11 @@ if (empty($reshook)) { if (!$error) { $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { $db->rollback(); if (empty($errorsaved)) { - setEventMessage($langs->trans("Error"), 'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } } diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index 0325fcd0a50..b4f070a2187 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -83,7 +83,7 @@ if ($action == 'update' && ! $_POST["cancel"]) $result = $account->update($user); if (! $result) { - setEventMessage($account->error, 'errors'); + setEventMessages($account->error, $account->errors, 'errors'); $_GET["action"]='edit'; // Force chargement page edition } else diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 9fbd9d20aa7..7a4ffcb1372 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -127,7 +127,7 @@ if (empty($reshook)) { $nb = $object->getNbOfUsers("active"); if ($nb >= $conf->file->main_limit_users) { $error ++; - setEventMessage($langs->trans("YourQuotaOfUsersIsReached"), 'errors'); + setEventMessages($langs->trans("YourQuotaOfUsersIsReached"), null, 'errors'); } } @@ -146,7 +146,7 @@ if (empty($reshook)) { $result = $object->delete(); if ($result < 0) { $langs->load("errors"); - setEventMessage($langs->trans("ErrorUserCannotBeDelete"), 'errors'); + setEventMessages($langs->trans("ErrorUserCannotBeDelete"), null, 'errors'); } else { header("Location: index.php"); exit; @@ -160,12 +160,12 @@ if (empty($reshook)) { if (!$_POST["lastname"]) { $error ++; - setEventMessage($langs->trans("NameNotDefined"), 'errors'); + setEventMessages($langs->trans("NameNotDefined"), null, 'errors'); $action = "create"; // Go back to create page } if (!$_POST["login"]) { $error ++; - setEventMessage($langs->trans("LoginNotDefined"), 'errors'); + setEventMessages($langs->trans("LoginNotDefined"), null, 'errors'); $action = "create"; // Go back to create page } @@ -173,7 +173,7 @@ if (empty($reshook)) { $nb = $object->getNbOfUsers("active"); if ($nb >= $conf->file->main_limit_users) { $error ++; - setEventMessage($langs->trans("YourQuotaOfUsersIsReached"), 'errors'); + setEventMessages($langs->trans("YourQuotaOfUsersIsReached"), null, 'errors'); $action = "create"; // Go back to create page } } @@ -248,14 +248,15 @@ if (empty($reshook)) { header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); exit; - } else { + } + else + { $langs->load("errors"); $db->rollback(); - if (is_array($object->errors) && count($object->errors)) { - setEventMessage($object->errors, 'errors'); - } else { - setEventMessage($object->error, 'errors'); - } + if (is_array($object->errors) && count($object->errors)) + { + setEventMessages($object->error, $object->errors, 'errors'); + } $action = "create"; // Go back to create page } } @@ -281,8 +282,10 @@ if (empty($reshook)) { if ($result > 0) { header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); exit; - } else { - setEventMessage($object->error, 'errors'); + } + else + { + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -295,12 +298,12 @@ if (empty($reshook)) { $error = 0; if (!$_POST["lastname"]) { - setEventMessage($langs->trans("NameNotDefined"), 'errors'); + setEventMessages($langs->trans("NameNotDefined"), null, 'errors'); $action = "edit"; // Go back to create page $error ++; } if (!$_POST["login"]) { - setEventMessage($langs->trans("LoginNotDefined"), 'errors'); + setEventMessages($langs->trans("LoginNotDefined"), null, 'errors'); $action = "edit"; // Go back to create page $error ++; } @@ -398,8 +401,10 @@ if (empty($reshook)) { $error ++; if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); - setEventMessage($langs->trans("ErrorLoginAlreadyExists", $object->login), 'errors'); - } else { + setEventMessages($langs->trans("ErrorLoginAlreadyExists", $object->login), null, 'errors'); + } + else + { setEventMessages($object->error, $object->errors, 'errors'); } } @@ -427,7 +432,7 @@ if (empty($reshook)) { $resql = $db->query($sql); if (!$resql) { $error ++; - setEventMessage($db->lasterror(), 'errors'); + setEventMessages($db->lasterror(), null, 'errors'); } } @@ -449,7 +454,7 @@ if (empty($reshook)) { $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']); if (!$result > 0) { - setEventMessage($langs->trans("ErrorFailedToSaveFile"), 'errors'); + setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors'); } else { // Create small thumbs for company (Ratio is near 16/9) // Used on logon for example @@ -468,7 +473,7 @@ if (empty($reshook)) { } if (!$error && !count($object->errors)) { - setEventMessage($langs->trans("UserModified")); + setEventMessages($langs->trans("UserModified"), null, 'mesgs'); $db->commit(); $login = $_SESSION["dol_login"]; @@ -490,8 +495,9 @@ if (empty($reshook)) { $object->oldcopy = dol_clone($object); $ret = $object->setPassword($user, $_POST["password"]); - if ($ret < 0) { - setEventMessage($object->error, 'errors'); + if ($ret < 0) + { + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -502,7 +508,7 @@ if (empty($reshook)) { $ret=$object->setPassword($user,$_POST["password"]); if ($ret < 0) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -515,17 +521,22 @@ if (empty($reshook)) { $newpassword = $object->setPassword($user, ''); if ($newpassword < 0) { // Echec - setEventMessage($langs->trans("ErrorFailedToSetNewPassword"), 'errors'); + setEventMessages($langs->trans("ErrorFailedToSetNewPassword"), null, 'errors'); } else { // Succes if ($action == 'confirm_passwordsend' && $confirm == 'yes') { - if ($object->send_password($user, $newpassword) > 0) { - setEventMessage($langs->trans("PasswordChangedAndSentTo", $object->email)); - } else { - setEventMessage($object->error, 'errors'); + if ($object->send_password($user, $newpassword) > 0) + { + setEventMessages($langs->trans("PasswordChangedAndSentTo", $object->email), null, 'mesgs'); + } + else + { + setEventMessages($object->error, $object->errors, 'errors'); } - } else { - setEventMessage($langs->trans("PasswordChangedTo", $newpassword), 'errors'); + } + else + { + setEventMessages($langs->trans("PasswordChangedTo", $newpassword), null, 'errors'); } } } @@ -577,8 +588,10 @@ if (empty($reshook)) { $ldap_sid = $attribute[$conf->global->LDAP_FIELD_SID]; } } - } else { - setEventMessage($ldap->error, 'errors'); + } + else + { + setEventMessages($ldap->error, $ldap->errors, 'errors'); } } } @@ -664,12 +677,12 @@ if (($action == 'create') || ($action == 'adduserldap')) } else { - setEventMessage($ldap->error, 'errors'); + setEventMessages($ldap->error, $ldap->errors, 'errors'); } } else { - setEventMessage($ldap->error, 'errors'); + setEventMessages($ldap->error, $ldap->errors, 'errors'); } // If user list is full, we show drop-down list @@ -1123,7 +1136,7 @@ else $entries = $ldap->fetch($object->login,$userSearchFilter); if (! $entries) { - setEventMessage($ldap->error, 'errors'); + setEventMessages($ldap->error, $ldap->errors, 'errors'); } $passDoNotExpire = 0; diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 6d968e2c8c0..d53c8a368ba 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -63,8 +63,9 @@ if (empty($reshook)) { $edituser->clicktodial_poste = GETPOST("poste"); $result = $edituser->update_clicktodial(); - if ($result < 0) { - setEventMessage($edituser->error, 'errors'); + if ($result < 0) + { + setEventMessages($edituser->error, $edituser->errors, 'errors'); } } } diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 39aca6f2bf4..43666f5b0bd 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -80,7 +80,7 @@ if ($action == 'confirm_delete' && $confirm == "yes") else { $langs->load("errors"); - setEventMessage($langs->trans('ErrorForbidden'), 'errors'); + setEventMessages($langs->trans('ErrorForbidden'), null, 'errors'); } } @@ -92,7 +92,7 @@ if ($action == 'add') if ($caneditperms) { if (! $_POST["nom"]) { - setEventMessage($langs->trans("NameNotDefined"), 'errors'); + setEventMessages($langs->trans("NameNotDefined"), null, 'errors'); $action="create"; // Go back to create page } else { $object->nom = trim($_POST["nom"]); // For backward compatibility @@ -122,7 +122,7 @@ if ($action == 'add') $db->rollback(); $langs->load("errors"); - setEventMessage($langs->trans("ErrorGroupAlreadyExists",$object->name), 'errors'); + setEventMessages($langs->trans("ErrorGroupAlreadyExists",$object->name), null, 'errors'); $action="create"; // Go back to create page } } @@ -130,7 +130,7 @@ if ($action == 'add') else { $langs->load("errors"); - setEventMessage($langs->trans('ErrorForbidden'), 'errors'); + setEventMessages($langs->trans('ErrorForbidden'), null, 'errors'); } } @@ -156,14 +156,14 @@ if ($action == 'adduser' || $action =='removeuser') } else { - setEventMessage($edituser->error, 'errors'); + setEventMessages($edituser->error, $edituser->errors, 'errors'); } } } else { $langs->load("errors"); - setEventMessage($langs->trans('ErrorForbidden'), 'errors'); + setEventMessages($langs->trans('ErrorForbidden'), null, 'errors'); } } @@ -193,19 +193,19 @@ if ($action == 'update') if ($ret >= 0 && ! count($object->errors)) { - setEventMessage($langs->trans("GroupModified")); + setEventMessages($langs->trans("GroupModified"), null, 'mesgs'); $db->commit(); } else { - setEventMessage($object->error); + setEventMessages($object->error, $object->errors, 'errors'); $db->rollback(); } } else { $langs->load("errors"); - setEventMessage($langs->trans('ErrorForbidden')); + setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs'); } } diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index ed7122fe164..c6c18d9a87b 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -73,12 +73,12 @@ if ($action == 'dolibarr2ldap') if ($result >= 0) { - setEventMessage($langs->trans("GroupSynchronized")); + setEventMessages($langs->trans("GroupSynchronized"), null, 'mesgs'); $db->commit(); } else { - setEventMessage($ldap->error); + setEventMessages($ldap->error, $ldap->errors, 'errors'); $db->rollback(); } } diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 34d29150251..e8a6a8fc1c9 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -70,11 +70,14 @@ if (empty($reshook)) { $result = $ldap->update($dn, $info, $user, $olddn); - if ($result >= 0) { - setEventMessage($langs->trans("UserSynchronized")); + if ($result >= 0) + { + setEventMessages($langs->trans("UserSynchronized"), null, 'mesgs'); $db->commit(); - } else { - setEventMessage($ldap->error, 'errors'); + } + else + { + setEventMessages($ldap->error, $ldap->errors, 'errors'); $db->rollback(); } }