Somme cleaning
This commit is contained in:
parent
883aff8235
commit
0836a84c0e
@ -270,9 +270,9 @@ if ($action == 'update')
|
|||||||
|
|
||||||
if (! $error)
|
if (! $error)
|
||||||
{
|
{
|
||||||
setEventMessage($langs->trans("SetupSaved"));
|
setEventMessages($langs->trans("SetupSaved"), null);
|
||||||
} else {
|
} else {
|
||||||
setEventMessage($langs->trans("Error"),'errors');
|
setEventMessages($langs->trans("Error"), null, 'errors');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -48,18 +48,18 @@ if ($action == 'print_file' and $user->rights->printing->read)
|
|||||||
$subdir=(GETPOST('printer', 'alpha')=='expedition'?'sending':'');
|
$subdir=(GETPOST('printer', 'alpha')=='expedition'?'sending':'');
|
||||||
$ret = $printer->print_file(GETPOST('file', 'alpha'), GETPOST('printer', 'alpha'), $subdir);
|
$ret = $printer->print_file(GETPOST('file', 'alpha'), GETPOST('printer', 'alpha'), $subdir);
|
||||||
if ($ret < 0) {
|
if ($ret < 0) {
|
||||||
setEventMessage($printer->error, 'errors');
|
setEventMessages($printer->error, $printer->errors, 'errors');
|
||||||
}
|
}
|
||||||
if ($ret==0) {
|
if ($ret==0) {
|
||||||
setEventMessage($printer->error, 'warning');
|
setEventMessages($printer->error, $printer->errors, 'warning');
|
||||||
setEventMessage($langs->trans("FileWasSentToPrinter", basename(GETPOST('file'))).' '.$langs->trans("ViaModule").' '.$printer->name);
|
setEventMessages($langs->trans("FileWasSentToPrinter", basename(GETPOST('file'))).' '.$langs->trans("ViaModule").' '.$printer->name, null);
|
||||||
$printed++;
|
$printed++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($printed==0) setEventMessage($langs->trans("NoActivePrintingModuleFound"));
|
if ($printed==0) setEventMessages($langs->trans("NoActivePrintingModuleFound"), null);
|
||||||
} else {
|
} else {
|
||||||
setEventMessage($langs->trans("NoModuleFound"), 'warning');
|
setEventMessages($langs->trans("NoModuleFound"), null, 'warning');
|
||||||
}
|
}
|
||||||
$action = '';
|
$action = '';
|
||||||
}
|
}
|
||||||
|
|||||||
@ -50,7 +50,7 @@ if (!$mode) $mode='config';
|
|||||||
|
|
||||||
if (($mode == 'test' || $mode == 'setup') && empty($driver))
|
if (($mode == 'test' || $mode == 'setup') && empty($driver))
|
||||||
{
|
{
|
||||||
setEventMessage($langs->trans('PleaseSelectaDriverfromList'));
|
setEventMessages($langs->trans('PleaseSelectaDriverfromList'), null);
|
||||||
header("Location: ".$_SERVER['PHP_SELF'].'?mode=config');
|
header("Location: ".$_SERVER['PHP_SELF'].'?mode=config');
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
@ -68,7 +68,7 @@ if ($action == 'setconst' && $user->admin)
|
|||||||
if (! $error)
|
if (! $error)
|
||||||
{
|
{
|
||||||
$db->commit();
|
$db->commit();
|
||||||
setEventMessage($langs->trans("SetupSaved"));
|
setEventMessages($langs->trans("SetupSaved"), null);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -88,7 +88,7 @@ if ($action == 'setvalue' && $user->admin)
|
|||||||
if (! $error)
|
if (! $error)
|
||||||
{
|
{
|
||||||
$db->commit();
|
$db->commit();
|
||||||
setEventMessage($langs->trans("SetupSaved"));
|
setEventMessages($langs->trans("SetupSaved"), null);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user