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

[Qual] Uniformize code

Browse Source
This commit is contained in:
philippe grand 2015-12-21 14:43:21 +01:00
parent 8e8c6b1534
commit c740a85006
8 changed files with 75 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/resource/element_resource.php
View File

@ -130,13 +130,13 @@ if ($action == 'confirm_delete_linked_resource' && $user->rights->resource->dele
if ($result >= 0) if ($result >= 0)
{ {
setEventMessage($langs->trans('RessourceLineSuccessfullyDeleted')); setEventMessages($langs->trans('RessourceLineSuccessfullyDeleted'), null, 'mesgs');
header("Location: ".$_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id); header("Location: ".$_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id);
exit; exit;
} }
else else
{ {
setEventMessage($object->error,'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }

6
htdocs/user/agenda_extsites.php
View File

@ -98,7 +98,7 @@ if (empty($reshook)) {
$enabled = trim(GETPOST('AGENDA_EXT_ENABLED_'.$id.'_'.$i, 'alpha')); $enabled = trim(GETPOST('AGENDA_EXT_ENABLED_'.$id.'_'.$i, 'alpha'));
if (!empty($src) && !dol_is_url($src)) { if (!empty($src) && !dol_is_url($src)) {
setEventMessage($langs->trans("ErrorParamMustBeAnUrl"), 'errors'); setEventMessages($langs->trans("ErrorParamMustBeAnUrl"), null, 'errors');
$error ++; $error ++;
$errorsaved ++; $errorsaved ++;
break; break;
@ -122,11 +122,11 @@ if (empty($reshook)) {
if (!$error) { if (!$error) {
$db->commit(); $db->commit();
setEventMessage($langs->trans("SetupSaved")); setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
} else { } else {
$db->rollback(); $db->rollback();
if (empty($errorsaved)) { if (empty($errorsaved)) {
setEventMessage($langs->trans("Error"), 'errors'); setEventMessages($langs->trans("Error"), null, 'errors');
} }
} }
} }

2
htdocs/user/bank.php
View File

@ -83,7 +83,7 @@ if ($action == 'update' && ! $_POST["cancel"])
$result = $account->update($user); $result = $account->update($user);
if (! $result) if (! $result)
{ {
setEventMessage($account->error, 'errors'); setEventMessages($account->error, $account->errors, 'errors');
$_GET["action"]='edit'; // Force chargement page edition $_GET["action"]='edit'; // Force chargement page edition
} }
else else

83
htdocs/user/card.php
View File

@ -127,7 +127,7 @@ if (empty($reshook)) {
$nb = $object->getNbOfUsers("active"); $nb = $object->getNbOfUsers("active");
if ($nb >= $conf->file->main_limit_users) { if ($nb >= $conf->file->main_limit_users) {
$error ++; $error ++;
setEventMessage($langs->trans("YourQuotaOfUsersIsReached"), 'errors'); setEventMessages($langs->trans("YourQuotaOfUsersIsReached"), null, 'errors');
} }
} }
@ -146,7 +146,7 @@ if (empty($reshook)) {
$result = $object->delete(); $result = $object->delete();
if ($result < 0) { if ($result < 0) {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans("ErrorUserCannotBeDelete"), 'errors'); setEventMessages($langs->trans("ErrorUserCannotBeDelete"), null, 'errors');
} else { } else {
header("Location: index.php"); header("Location: index.php");
exit; exit;
@ -160,12 +160,12 @@ if (empty($reshook)) {
if (!$_POST["lastname"]) { if (!$_POST["lastname"]) {
$error ++; $error ++;
setEventMessage($langs->trans("NameNotDefined"), 'errors'); setEventMessages($langs->trans("NameNotDefined"), null, 'errors');
$action = "create"; // Go back to create page $action = "create"; // Go back to create page
} }
if (!$_POST["login"]) { if (!$_POST["login"]) {
$error ++; $error ++;
setEventMessage($langs->trans("LoginNotDefined"), 'errors'); setEventMessages($langs->trans("LoginNotDefined"), null, 'errors');
$action = "create"; // Go back to create page $action = "create"; // Go back to create page
} }
@ -173,7 +173,7 @@ if (empty($reshook)) {
$nb = $object->getNbOfUsers("active"); $nb = $object->getNbOfUsers("active");
if ($nb >= $conf->file->main_limit_users) { if ($nb >= $conf->file->main_limit_users) {
$error ++; $error ++;
setEventMessage($langs->trans("YourQuotaOfUsersIsReached"), 'errors'); setEventMessages($langs->trans("YourQuotaOfUsersIsReached"), null, 'errors');
$action = "create"; // Go back to create page $action = "create"; // Go back to create page
} }
} }
@ -248,14 +248,15 @@ if (empty($reshook)) {
header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
exit; exit;
} else { }
else
{
$langs->load("errors"); $langs->load("errors");
$db->rollback(); $db->rollback();
if (is_array($object->errors) && count($object->errors)) { if (is_array($object->errors) && count($object->errors))
setEventMessage($object->errors, 'errors'); {
} else { setEventMessages($object->error, $object->errors, 'errors');
setEventMessage($object->error, 'errors'); }
}
$action = "create"; // Go back to create page $action = "create"; // Go back to create page
} }
} }
@ -281,8 +282,10 @@ if (empty($reshook)) {
if ($result > 0) { if ($result > 0) {
header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
exit; exit;
} else { }
setEventMessage($object->error, 'errors'); else
{
setEventMessages($object->error, $object->errors, 'errors');
} }
} }
} }
@ -295,12 +298,12 @@ if (empty($reshook)) {
$error = 0; $error = 0;
if (!$_POST["lastname"]) { if (!$_POST["lastname"]) {
setEventMessage($langs->trans("NameNotDefined"), 'errors'); setEventMessages($langs->trans("NameNotDefined"), null, 'errors');
$action = "edit"; // Go back to create page $action = "edit"; // Go back to create page
$error ++; $error ++;
} }
if (!$_POST["login"]) { if (!$_POST["login"]) {
setEventMessage($langs->trans("LoginNotDefined"), 'errors'); setEventMessages($langs->trans("LoginNotDefined"), null, 'errors');
$action = "edit"; // Go back to create page $action = "edit"; // Go back to create page
$error ++; $error ++;
} }
@ -398,8 +401,10 @@ if (empty($reshook)) {
$error ++; $error ++;
if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans("ErrorLoginAlreadyExists", $object->login), 'errors'); setEventMessages($langs->trans("ErrorLoginAlreadyExists", $object->login), null, 'errors');
} else { }
else
{
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
@ -427,7 +432,7 @@ if (empty($reshook)) {
$resql = $db->query($sql); $resql = $db->query($sql);
if (!$resql) { if (!$resql) {
$error ++; $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']); $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']);
if (!$result > 0) { if (!$result > 0) {
setEventMessage($langs->trans("ErrorFailedToSaveFile"), 'errors'); setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
} else { } else {
// Create small thumbs for company (Ratio is near 16/9) // Create small thumbs for company (Ratio is near 16/9)
// Used on logon for example // Used on logon for example
@ -468,7 +473,7 @@ if (empty($reshook)) {
} }
if (!$error && !count($object->errors)) { if (!$error && !count($object->errors)) {
setEventMessage($langs->trans("UserModified")); setEventMessages($langs->trans("UserModified"), null, 'mesgs');
$db->commit(); $db->commit();
$login = $_SESSION["dol_login"]; $login = $_SESSION["dol_login"];
@ -490,8 +495,9 @@ if (empty($reshook)) {
$object->oldcopy = dol_clone($object); $object->oldcopy = dol_clone($object);
$ret = $object->setPassword($user, $_POST["password"]); $ret = $object->setPassword($user, $_POST["password"]);
if ($ret < 0) { if ($ret < 0)
setEventMessage($object->error, 'errors'); {
setEventMessages($object->error, $object->errors, 'errors');
} }
} }
} }
@ -502,7 +508,7 @@ if (empty($reshook)) {
$ret=$object->setPassword($user,$_POST["password"]); $ret=$object->setPassword($user,$_POST["password"]);
if ($ret < 0) if ($ret < 0)
{ {
setEventMessage($object->error, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
@ -515,17 +521,22 @@ if (empty($reshook)) {
$newpassword = $object->setPassword($user, ''); $newpassword = $object->setPassword($user, '');
if ($newpassword < 0) { if ($newpassword < 0) {
// Echec // Echec
setEventMessage($langs->trans("ErrorFailedToSetNewPassword"), 'errors'); setEventMessages($langs->trans("ErrorFailedToSetNewPassword"), null, 'errors');
} else { } else {
// Succes // Succes
if ($action == 'confirm_passwordsend' && $confirm == 'yes') { if ($action == 'confirm_passwordsend' && $confirm == 'yes') {
if ($object->send_password($user, $newpassword) > 0) { if ($object->send_password($user, $newpassword) > 0)
setEventMessage($langs->trans("PasswordChangedAndSentTo", $object->email)); {
} else { setEventMessages($langs->trans("PasswordChangedAndSentTo", $object->email), null, 'mesgs');
setEventMessage($object->error, 'errors'); }
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]; $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 else
{ {
setEventMessage($ldap->error, 'errors'); setEventMessages($ldap->error, $ldap->errors, 'errors');
} }
} }
else else
{ {
setEventMessage($ldap->error, 'errors'); setEventMessages($ldap->error, $ldap->errors, 'errors');
} }
// If user list is full, we show drop-down list // If user list is full, we show drop-down list
@ -1123,7 +1136,7 @@ else
$entries = $ldap->fetch($object->login,$userSearchFilter); $entries = $ldap->fetch($object->login,$userSearchFilter);
if (! $entries) if (! $entries)
{ {
setEventMessage($ldap->error, 'errors'); setEventMessages($ldap->error, $ldap->errors, 'errors');
} }
$passDoNotExpire = 0; $passDoNotExpire = 0;

5
htdocs/user/clicktodial.php
View File

@ -63,8 +63,9 @@ if (empty($reshook)) {
$edituser->clicktodial_poste = GETPOST("poste"); $edituser->clicktodial_poste = GETPOST("poste");
$result = $edituser->update_clicktodial(); $result = $edituser->update_clicktodial();
if ($result < 0) { if ($result < 0)
setEventMessage($edituser->error, 'errors'); {
setEventMessages($edituser->error, $edituser->errors, 'errors');
} }
} }
} }

18
htdocs/user/group/card.php
View File

@ -80,7 +80,7 @@ if ($action == 'confirm_delete' && $confirm == "yes")
else else
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans('ErrorForbidden'), 'errors'); setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
} }
} }
@ -92,7 +92,7 @@ if ($action == 'add')
if ($caneditperms) if ($caneditperms)
{ {
if (! $_POST["nom"]) { if (! $_POST["nom"]) {
setEventMessage($langs->trans("NameNotDefined"), 'errors'); setEventMessages($langs->trans("NameNotDefined"), null, 'errors');
$action="create"; // Go back to create page $action="create"; // Go back to create page
} else { } else {
$object->nom = trim($_POST["nom"]); // For backward compatibility $object->nom = trim($_POST["nom"]); // For backward compatibility
@ -122,7 +122,7 @@ if ($action == 'add')
$db->rollback(); $db->rollback();
$langs->load("errors"); $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 $action="create"; // Go back to create page
} }
} }
@ -130,7 +130,7 @@ if ($action == 'add')
else else
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans('ErrorForbidden'), 'errors'); setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
} }
} }
@ -156,14 +156,14 @@ if ($action == 'adduser' || $action =='removeuser')
} }
else else
{ {
setEventMessage($edituser->error, 'errors'); setEventMessages($edituser->error, $edituser->errors, 'errors');
} }
} }
} }
else else
{ {
$langs->load("errors"); $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)) if ($ret >= 0 && ! count($object->errors))
{ {
setEventMessage($langs->trans("GroupModified")); setEventMessages($langs->trans("GroupModified"), null, 'mesgs');
$db->commit(); $db->commit();
} }
else else
{ {
setEventMessage($object->error); setEventMessages($object->error, $object->errors, 'errors');
$db->rollback(); $db->rollback();
} }
} }
else else
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans('ErrorForbidden')); setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs');
} }
} }

4
htdocs/user/group/ldap.php
View File

@ -73,12 +73,12 @@ if ($action == 'dolibarr2ldap')
if ($result >= 0) if ($result >= 0)
{ {
setEventMessage($langs->trans("GroupSynchronized")); setEventMessages($langs->trans("GroupSynchronized"), null, 'mesgs');
$db->commit(); $db->commit();
} }
else else
{ {
setEventMessage($ldap->error); setEventMessages($ldap->error, $ldap->errors, 'errors');
$db->rollback(); $db->rollback();
} }
} }

11
htdocs/user/ldap.php
View File

@ -70,11 +70,14 @@ if (empty($reshook)) {
$result = $ldap->update($dn, $info, $user, $olddn); $result = $ldap->update($dn, $info, $user, $olddn);
if ($result >= 0) { if ($result >= 0)
setEventMessage($langs->trans("UserSynchronized")); {
setEventMessages($langs->trans("UserSynchronized"), null, 'mesgs');
$db->commit(); $db->commit();
} else { }
setEventMessage($ldap->error, 'errors'); else
{
setEventMessages($ldap->error, $ldap->errors, 'errors');
$db->rollback(); $db->rollback();
} }
} }