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-11 09:54:30 +01:00
parent fc8c12d6f6
commit 8ccafc6e36
8 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/ftp/index.php
View File

@ -108,15 +108,15 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
$langs->load("errors"); $langs->load("errors");
if ($resupload < 0) // Unknown error if ($resupload < 0) // Unknown error
{ {
setEventMessage($langs->trans("ErrorFileNotUploaded"), 'errors'); setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
} }
else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) // Files infected by a virus else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) // Files infected by a virus
{ {
setEventMessage($langs->trans("ErrorFileIsInfectedWithAVirus"), 'errors'); setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
} }
else // Known error else // Known error
{ {
setEventMessage($langs->trans($resupload), 'errors'); setEventMessages($langs->trans($resupload), null, 'errors');
} }
} }
} }
@ -124,7 +124,7 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
// Echec transfert (fichier depassant la limite ?) // Echec transfert (fichier depassant la limite ?)
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans("ErrorFailToCreateDir",$upload_dir), 'errors'); setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
} }
} }
@ -143,8 +143,7 @@ if ($action == 'add' && $user->rights->ftp->setup)
} }
else else
{ {
//TODO: Translate setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
setEventMessage('Error '.$langs->trans($ecmdir->error));
$action = "create"; $action = "create";
} }
} }
@ -176,12 +175,12 @@ if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
$result=@ftp_delete($conn_id, $newremotefileiso); $result=@ftp_delete($conn_id, $newremotefileiso);
if ($result) if ($result)
{ {
setEventMessage($langs->trans("FileWasRemoved",$file)); setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
} }
else else
{ {
dol_syslog("ftp/index.php ftp_delete", LOG_ERR); dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
setEventMessage($langs->trans("FTPFailedToRemoveFile",$file), 'errors'); setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
} }
//ftp_close($conn_id); Close later //ftp_close($conn_id); Close later
@ -226,12 +225,12 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
$result=@ftp_delete($conn_id, $newremotefileiso); $result=@ftp_delete($conn_id, $newremotefileiso);
if ($result) if ($result)
{ {
setEventMessage($langs->trans("FileWasRemoved",$file)); setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
} }
else else
{ {
dol_syslog("ftp/index.php ftp_delete", LOG_ERR); dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
setEventMessage($langs->trans("FTPFailedToRemoveFile",$file), 'errors'); setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
} }
//ftp_close($conn_id); Close later //ftp_close($conn_id); Close later
@ -270,11 +269,11 @@ if ($action == 'confirm_deletesection' && $confirm == 'yes')
$result=@ftp_rmdir($conn_id, $newremotefileiso); $result=@ftp_rmdir($conn_id, $newremotefileiso);
if ($result) if ($result)
{ {
setEventMessage($langs->trans("DirWasRemoved",$file)); setEventMessages($langs->trans("DirWasRemoved",$file), null, 'mesgs');
} }
else else
{ {
setEventMessage($langs->trans("FTPFailedToRemoveDir",$file), 'errors'); setEventMessages($langs->trans("FTPFailedToRemoveDir",$file), null, 'errors');
} }
//ftp_close($conn_id); Close later //ftp_close($conn_id); Close later

10
htdocs/holiday/card.php
View File

@ -60,7 +60,7 @@ if ($action == 'create')
if (($userid == $user->id && empty($user->rights->holiday->write)) || ($userid != $user->id && empty($user->rights->holiday->write_all))) if (($userid == $user->id && empty($user->rights->holiday->write)) || ($userid != $user->id && empty($user->rights->holiday->write_all)))
{ {
$error++; $error++;
setEventMessage($langs->trans('CantCreateCP')); setEventMessages($langs->trans('CantCreateCP'), null, 'errors');
$action='request'; $action='request';
} }
@ -130,7 +130,7 @@ if ($action == 'create')
// If no validator designated // If no validator designated
if ($valideur < 1) if ($valideur < 1)
{ {
setEventMessage($langs->transnoentitiesnoconv('InvalidValidatorCP'), 'errors'); setEventMessages($langs->transnoentitiesnoconv('InvalidValidatorCP'), null, 'errors');
$error++; $error++;
} }
@ -138,7 +138,7 @@ if ($action == 'create')
if ($type < 1) if ($type < 1)
{ {
setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Type")), 'errors'); setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Type")), null, 'errors');
$error++; $error++;
} }
@ -723,7 +723,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
break; break;
} }
setEventMessage($errors, 'errors'); setEventMessages($errors, null, 'errors');
} }
@ -946,7 +946,7 @@ else
break; break;
} }
setEventMessage($errors, 'errors'); setEventMessages($errors, null, 'errors');
} }
// On vérifie si l'utilisateur à le droit de lire cette demande // On vérifie si l'utilisateur à le droit de lire cette demande

6
htdocs/hrm/establishment/card.php
View File

@ -62,7 +62,7 @@ if ($action == 'confirm_delete' && $confirm == "yes")
} }
else else
{ {
setEventMessage($object->error, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
@ -75,7 +75,7 @@ else if ($action == 'add')
$object->name = GETPOST('name', 'alpha'); $object->name = GETPOST('name', 'alpha');
if (empty($object->name)) if (empty($object->name))
{ {
setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")), 'errors'); setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")), null, 'errors');
$error++; $error++;
} }
@ -124,7 +124,7 @@ else if ($action == 'update')
$name = GETPOST('name', 'alpha'); $name = GETPOST('name', 'alpha');
if (empty($name)) { if (empty($name)) {
setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('Name')), 'errors'); setEventMessages($langs->trans('ErrorFieldRequired', $langs->trans('Name')), null, 'errors');
$error ++; $error ++;
} }

16
htdocs/imports/import.php
View File

@ -139,11 +139,11 @@ if ($action == 'builddoc')
$result=$objimport->build_file($user, GETPOST('model','alpha'), $datatoimport, $array_match_file_to_database); $result=$objimport->build_file($user, GETPOST('model','alpha'), $datatoimport, $array_match_file_to_database);
if ($result < 0) if ($result < 0)
{ {
setEventMessage($objimport->error, 'errors'); setEventMessages($objimport->error, $objimport->errors, 'errors');
} }
else else
{ {
setEventMessage($langs->trans("FileSuccessfullyBuilt")); setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
} }
} }
@ -176,17 +176,17 @@ if ($action == 'add_import_model')
$result = $objimport->create($user); $result = $objimport->create($user);
if ($result >= 0) if ($result >= 0)
{ {
setEventMessage($langs->trans("ImportModelSaved",$objimport->model_name)); setEventMessages($langs->trans("ImportModelSaved", $objimport->model_name), null, 'mesgs');
} }
else else
{ {
$langs->load("errors"); $langs->load("errors");
if ($objimport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS') if ($objimport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{ {
setEventMessage($langs->trans("ErrorImportDuplicateProfil"), 'errors'); setEventMessages($langs->trans("ErrorImportDuplicateProfil"), null, 'errors');
} }
else { else {
setEventMessage($objimport->error, 'errors'); setEventMessages($objimport->error, null, 'errors');
} }
} }
} }
@ -211,7 +211,7 @@ if ($step == 3 && $datatoimport)
else else
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans("ErrorFailedToSaveFile"), 'errors'); setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
} }
} }
@ -225,8 +225,8 @@ if ($step == 3 && $datatoimport)
$file = $conf->import->dir_temp . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). $file = $conf->import->dir_temp . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
$ret=dol_delete_file($file); $ret=dol_delete_file($file);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
Header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.$param); Header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.$param);
exit; exit;
} }

6
htdocs/livraison/card.php
View File

@ -113,7 +113,7 @@ if ($action == 'add')
} }
else else
{ {
setEventMessage($object->error, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
$db->rollback(); $db->rollback();
$_GET["commande_id"]=$_POST["commande_id"]; $_GET["commande_id"]=$_POST["commande_id"];
@ -216,8 +216,8 @@ elseif ($action == 'remove_file')
$upload_dir = $conf->expedition->dir_output . "/receipt"; $upload_dir = $conf->expedition->dir_output . "/receipt";
$file = $upload_dir . '/' . GETPOST('file'); $file = $upload_dir . '/' . GETPOST('file');
$ret=dol_delete_file($file,0,0,0,$object); $ret=dol_delete_file($file,0,0,0,$object);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
} }

12
htdocs/loan/card.php
View File

@ -54,11 +54,11 @@ if ($action == 'confirm_paid' && $confirm == 'yes')
$result = $object->set_paid($user); $result = $object->set_paid($user);
if ($result > 0) if ($result > 0)
{ {
setEventMessage($langs->trans('LoanPaid')); setEventMessages($langs->trans('LoanPaid'), null, 'mesgs');
} }
else else
{ {
setEventMessage($loan->error, 'errors'); setEventMessages($loan->error, null, 'errors');
} }
} }
@ -69,13 +69,13 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
$result=$object->delete($user); $result=$object->delete($user);
if ($result > 0) if ($result > 0)
{ {
setEventMessage($langs->trans('LoanDeleted')); setEventMessages($langs->trans('LoanDeleted'), null, 'mesgs');
header("Location: index.php"); header("Location: index.php");
exit; exit;
} }
else else
{ {
setEventMessage($loan->error, 'errors'); setEventMessages($loan->error, null, 'errors');
} }
} }
@ -121,7 +121,7 @@ if ($action == 'add' && $user->rights->loan->write)
$id=$object->create($user); $id=$object->create($user);
if ($id <= 0) if ($id <= 0)
{ {
setEventMessage($object->error, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
} }
@ -157,7 +157,7 @@ else if ($action == 'update' && $user->rights->loan->write)
} }
else else
{ {
setEventMessage($object->error, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
else else

4
htdocs/loan/payment/card.php
View File

@ -65,7 +65,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->del
} }
else else
{ {
setEventMessage($payment->error, 'errors'); setEventMessages($payment->error, $payment->errors, 'errors');
$db->rollback(); $db->rollback();
} }
} }
@ -103,7 +103,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->loan->wri
} }
else else
{ {
setEventMessage($payment->error); setEventMessages($payment->error, $payment->errors, 'errors');
$db->rollback(); $db->rollback();
} }
} }

6
htdocs/loan/payment/payment.php
View File

@ -83,7 +83,7 @@ if ($action == 'add_payment')
$amount = GETPOST('amount_capital') + GETPOST('amount_insurance') + GETPOST('amount_interest'); $amount = GETPOST('amount_capital') + GETPOST('amount_insurance') + GETPOST('amount_interest');
if ($amount == 0) if ($amount == 0)
{ {
setEventMessage($langs->trans('ErrorNoPaymentDefined'), 'errors'); setEventMessages($langs->trans('ErrorNoPaymentDefined'), null, 'errors');
$error++; $error++;
} }
@ -109,7 +109,7 @@ if ($action == 'add_payment')
$paymentid = $payment->create($user); $paymentid = $payment->create($user);
if ($paymentid < 0) if ($paymentid < 0)
{ {
setEventMessage($payment->error, 'errors'); setEventMessages($payment->error, $payment->errors, 'errors');
$error++; $error++;
} }
} }
@ -119,7 +119,7 @@ if ($action == 'add_payment')
$result = $payment->addPaymentToBank($user, 'payment_loan', '(LoanPayment)', GETPOST('accountid', 'int'), '', ''); $result = $payment->addPaymentToBank($user, 'payment_loan', '(LoanPayment)', GETPOST('accountid', 'int'), '', '');
if (! $result > 0) if (! $result > 0)
{ {
setEventMessage($payment->error, 'errors'); setEventMessages($payment->error, $payment->errors, 'errors');
$error++; $error++;
} }
} }