diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php index 64823e63195..63784e560f0 100644 --- a/htdocs/printing/admin/printing.php +++ b/htdocs/printing/admin/printing.php @@ -47,6 +47,14 @@ if (!$mode) $mode='config'; /* * Action */ + +if (($mode == 'test' || $mode == 'setup') && empty($driver)) +{ + setEventMessage($langs->trans('PleaseSelectaDriverfromList')); + header("Location: ".$_SERVER['PHP_SELF'].'?mode=config'); + exit; +} + if ($action == 'setconst' && $user->admin) { $error=0; @@ -241,8 +249,9 @@ if ($mode == 'userconf' && $user->admin) print ''.$langs->trans("PrinterLocation").''; print ''.$langs->trans("PrinterId").''; print ''.$langs->trans("NumberOfCopy").''; + print ''.$langs->trans("Delete").''; print "\n"; - $sql = 'SELECT p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid'; + $sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid'; $resql = $db->query($sql); while ($row=$db->fetch_array($resql)) { $var=!$var; @@ -254,6 +263,7 @@ if ($mode == 'userconf' && $user->admin) print ''.$row['printer_location'].''; print ''.$row['printer_id'].''; print ''.$row['copy'].''; + print ''.img_picto($langs->trans("Delete"), 'delete').''; print "\n"; } print '';