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-17 14:14:44 +01:00
parent 34f4e913d4
commit c9d6607b04
10 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/card.php
View File

@ -186,7 +186,7 @@ if (empty($reshook))
} }
if (! empty(GETPOST('duration_value')) && empty(GETPOST('duration_unit'))) if (! empty(GETPOST('duration_value')) && empty(GETPOST('duration_unit')))
{ {
setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Unit')), 'errors'); setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Unit')), null, 'errors');
$action = "create"; $action = "create";
$error++; $error++;
} }

6
htdocs/projet/activity/perday.php
View File

@ -116,7 +116,7 @@ if ($action == 'assign')
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'warnings'); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'warnings');
} }
else else
{ {
@ -195,7 +195,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
if (! $error) if (! $error)
{ {
setEventMessage($langs->trans("RecordSaved")); setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
// Redirect to avoid submit twice on back // Redirect to avoid submit twice on back
header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday); header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
@ -204,7 +204,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
} }
else else
{ {
setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors'); setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
} }
} }

6
htdocs/projet/activity/perweek.php
View File

@ -129,7 +129,7 @@ if ($action == 'assign')
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'warnings'); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'warnings');
} }
else else
{ {
@ -150,7 +150,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
$timetoadd=$_POST['task']; $timetoadd=$_POST['task'];
if (empty($timetoadd)) if (empty($timetoadd))
{ {
setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors'); setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
} }
else else
{ {
@ -189,7 +189,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
if (! $error) if (! $error)
{ {
setEventMessage($langs->trans("RecordSaved")); setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
// Redirect to avoid submit twice on back // Redirect to avoid submit twice on back
header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'')); header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:''));

20
htdocs/projet/admin/project.php
View File

@ -71,11 +71,11 @@ else if ($action == 'updateMask')
if (! $error) if (! $error)
{ {
setEventMessage($langs->trans("SetupSaved")); setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
} }
else else
{ {
setEventMessage($langs->trans("Error"), 'errors'); setEventMessages($langs->trans("Error"), null, 'errors');
} }
} }
@ -90,11 +90,11 @@ if ($action == 'updateMaskTask')
if (! $error) if (! $error)
{ {
setEventMessage($langs->trans("SetupSaved")); setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
} }
else else
{ {
setEventMessage($langs->trans("Error"), 'errors'); setEventMessages($langs->trans("Error"), null, 'errors');
} }
} }
@ -132,13 +132,13 @@ else if ($action == 'specimen')
} }
else else
{ {
setEventMessage($obj->error, 'errors'); setEventMessages($obj->error, $obj->errors, 'errors');
dol_syslog($obj->error, LOG_ERR); dol_syslog($obj->error, LOG_ERR);
} }
} }
else else
{ {
setEventMessage($langs->trans("ErrorModuleNotFound"), 'errors'); setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
} }
} }
@ -177,13 +177,13 @@ else if ($action == 'specimentask')
} }
else else
{ {
setEventMessage($obj->error, 'errors'); setEventMessages($obj->error, $obj->errors, 'errors');
dol_syslog($obj->error, LOG_ERR); dol_syslog($obj->error, LOG_ERR);
} }
} }
else else
{ {
setEventMessage($langs->trans("ErrorModuleNotFound"), 'errors'); setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
} }
} }
@ -208,12 +208,12 @@ if ($action == 'setModuleOptions')
if (! $error) if (! $error)
{ {
$db->commit(); $db->commit();
setEventMessage($langs->trans("SetupSaved")); setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
} }
else else
{ {
$db->rollback(); $db->rollback();
setEventMessage($langs->trans("Error"),'errors'); setEventMessages($langs->trans("Error"), null, 'errors');
} }
} }

16
htdocs/projet/card.php
View File

@ -101,7 +101,7 @@ if (empty($reshook))
else else
{ {
dol_syslog($object->error,LOG_DEBUG); dol_syslog($object->error,LOG_DEBUG);
setEventMessage($langs->trans("CantRemoveProject"), 'errors'); setEventMessages($langs->trans("CantRemoveProject"), null, 'errors');
} }
} }
if ($backtopage) if ($backtopage)
@ -158,14 +158,14 @@ if (empty($reshook))
if ($result < 0) if ($result < 0)
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans($object->error), 'errors'); setEventMessages($langs->trans($object->error), null,s 'errors');
$error++; $error++;
} }
} }
else else
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans($object->error), 'errors'); setEventMessage($langs->trans($object->error), null, 'errors');
$error++; $error++;
} }
@ -241,7 +241,7 @@ if (empty($reshook))
if ($object->opp_amount && ($object->opp_status <= 0)) if ($object->opp_amount && ($object->opp_status <= 0))
{ {
$error++; $error++;
setEventMessage($langs->trans("ErrorOppStatusRequiredIfAmount"),'errors'); setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
} }
if (! $error) if (! $error)
@ -262,7 +262,7 @@ if (empty($reshook))
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
setEventMessage($langs->trans("ErrorShiftTaskDate").':'.$object->error, 'errors'); setEventMessages($langs->trans("ErrorShiftTaskDate").':'.$object->error, $langs->trans("ErrorShiftTaskDate").':'.$object->errors, 'errors');
} }
} }
} }
@ -313,8 +313,8 @@ if (empty($reshook))
$urlfile=GETPOST('urlfile','alpha'); $urlfile=GETPOST('urlfile','alpha');
$file = $upload_dir . '/' . $filetodelete; $file = $upload_dir . '/' . $filetodelete;
$ret=dol_delete_file($file); $ret=dol_delete_file($file);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", $urlfile)); if ($ret) setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
else setEventMessage($langs->trans("ErrorFailToDeleteFile", $urlfile), 'errors'); else setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
} }
} }
@ -352,7 +352,7 @@ if (empty($reshook))
$result=$object->delete($user); $result=$object->delete($user);
if ($result > 0) if ($result > 0)
{ {
setEventMessage($langs->trans("RecordDeleted"), 'info'); setEventMessagess($langs->trans("RecordDeleted"), null, 'mesgs');
header("Location: index.php"); header("Location: index.php");
exit; exit;
} }

4
htdocs/projet/contact.php
View File

@ -76,11 +76,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors'); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
} }
else else
{ {
setEventMessage($object->error, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
} }

14
htdocs/projet/element.php
View File

@ -293,17 +293,21 @@ if ($action=="addelement")
$tablename = GETPOST("tablename"); $tablename = GETPOST("tablename");
$elementselectid = GETPOST("elementselect"); $elementselectid = GETPOST("elementselect");
$result=$object->update_element($tablename, $elementselectid); $result=$object->update_element($tablename, $elementselectid);
if ($result<0) { if ($result<0)
setEventMessage($object->error,'errors'); {
setEventMessages($object->error, $object->errors, 'errors');
} }
}elseif ($action == "unlink") { }
elseif ($action == "unlink")
{
$tablename = GETPOST("tablename"); $tablename = GETPOST("tablename");
$elementselectid = GETPOST("elementselect"); $elementselectid = GETPOST("elementselect");
$result = $object->remove_element($tablename, $elementselectid); $result = $object->remove_element($tablename, $elementselectid);
if ($result < 0) { if ($result < 0)
setEventMessage($object->error, 'errors'); {
setEventMessages($object->error, $object->errors, 'errors');
} }
} }

4
htdocs/projet/tasks/contact.php
View File

@ -94,11 +94,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors'); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
} }
else else
{ {
setEventMessage($object->error, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
} }

4
htdocs/projet/tasks/task.php
View File

@ -180,8 +180,8 @@ if ($action == 'remove_file' && $user->rights->projet->creer)
$file = $upload_dir . '/' . GETPOST('file'); $file = $upload_dir . '/' . GETPOST('file');
$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');
} }
} }

18
htdocs/projet/tasks/time.php
View File

@ -61,13 +61,13 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
$timespent_durationmin = GETPOST('timespent_durationmin','int'); $timespent_durationmin = GETPOST('timespent_durationmin','int');
if (empty($timespent_durationhour) && empty($timespent_durationmin)) if (empty($timespent_durationhour) && empty($timespent_durationmin))
{ {
setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")),'errors'); setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")), null, 'errors');
$error++; $error++;
} }
if (empty($_POST["userid"])) if (empty($_POST["userid"]))
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans('ErrorUserNotAssignedToTask'),'errors'); setEventMessages($langs->trans('ErrorUserNotAssignedToTask'), null, 'errors');
$error++; $error++;
} }
@ -78,7 +78,7 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
if (empty($object->projet->statut)) if (empty($object->projet->statut))
{ {
setEventMessage($langs->trans("ProjectMustBeValidatedFirst"),'errors'); setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors');
$error++; $error++;
} }
else else
@ -100,11 +100,11 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
$result=$object->addTimeSpent($user); $result=$object->addTimeSpent($user);
if ($result >= 0) if ($result >= 0)
{ {
setEventMessage($langs->trans("RecordSaved")); setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
} }
else else
{ {
setEventMessage($langs->trans($object->error),'errors'); setEventMessages($langs->trans($object->error), null, 'errors');
$error++; $error++;
} }
} }
@ -121,7 +121,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree
if (empty($_POST["new_durationhour"]) && empty($_POST["new_durationmin"])) if (empty($_POST["new_durationhour"]) && empty($_POST["new_durationmin"]))
{ {
setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")),'errors'); setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")), null, 'errors');
$error++; $error++;
} }
@ -148,11 +148,11 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree
$result=$object->updateTimeSpent($user); $result=$object->updateTimeSpent($user);
if ($result >= 0) if ($result >= 0)
{ {
setEventMessage($langs->trans("RecordSaved")); setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
} }
else else
{ {
setEventMessage($langs->trans($object->error),'errors'); setEventMessages($langs->trans($object->error), null, 'errors');
$error++; $error++;
} }
} }
@ -170,7 +170,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->c
if ($result < 0) if ($result < 0)
{ {
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans($object->error),'errors'); setEventMessages($langs->trans($object->error), null, 'errors');
$error++; $error++;
$action=''; $action='';
} }