diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 040bb6291be..b7935fb1450 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -638,8 +638,12 @@ if ($_GET["id"]) $valuetoshow=$langs->trans('All'); } else if ($fieldlist[$field]=='pays') { - $key=$langs->trans("Country".strtoupper($obj->pays_code)); - $valuetoshow=($key != "Country".strtoupper($obj->pays_code))?$obj->pays_code." - ".$key:$obj->pays; + if (empty($obj->pays_code)) print '-'; + else + { + $key=$langs->trans("Country".strtoupper($obj->pays_code)); + $valuetoshow=($key != "Country".strtoupper($obj->pays_code))?$obj->pays_code." - ".$key:$obj->pays; + } } else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field]=='fdm') { $valuetoshow=yn($valuetoshow); diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 3b7b3da64bd..58eea94bcb2 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -57,7 +57,7 @@ $pagenext = $page + 1; */ // Purge audit events -if ($_POST['action'] == 'confirm_purge' && $_POST['confirm'] == 'yes' && $user->admin) +if ($_REQUEST['action'] == 'confirm_purge' && $_REQUEST['confirm'] == 'yes' && $user->admin) { $sql = "DELETE FROM ".MAIN_DB_PREFIX."events"; $sql.= " WHERE entity = ".$conf->entity; @@ -104,7 +104,8 @@ if ($result) if ($_GET["action"] == 'purge') { - $ret=$form->form_confirm($_SERVER["PHP_SELF"], $langs->trans('PurgeAuditEvents'), $langs->trans('ConfirmPurgeAuditEvents'), 'confirm_purge'); + $formquestion=array(); + $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('PurgeAuditEvents'), $langs->trans('ConfirmPurgeAuditEvents'),'confirm_purge',$formquestion,'no',1); if ($ret == 'html') print '
'; } @@ -203,7 +204,7 @@ if ($result) print ""; $db->free(); - if ($num && $_GET["action"] != 'purge') + if ($num) { print '
'; print ''.$langs->trans("Purge").'';