Move error output to page_header()

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@386 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana
2008-04-10 14:37:10 +00:00
parent b48cbebd1c
commit eff527b3d8
23 changed files with 38 additions and 118 deletions

View File

@@ -83,11 +83,7 @@ if ($_POST && !$error) {
}
$error = $mysql->error;
}
page_header(lang('Select') . ": " . htmlspecialchars($_GET["select"]));
if ($error) {
echo "<p class='error'>" . lang('Error during deleting') . ": " . htmlspecialchars($error) . "</p>\n";
}
page_header(lang('Select') . ": " . htmlspecialchars($_GET["select"]), ($error ? lang('Error during deleting') . ": $error" : ""));
if (isset($rights["insert"])) {
//! pass search values forth and back
@@ -95,7 +91,7 @@ if (isset($rights["insert"])) {
}
if (!$columns) {
echo "<p class='error'>" . lang('Unable to select the table') . ($fields ? "" : ": " . $mysql->error) . ".</p>\n";
echo "<p class='error'>" . lang('Unable to select the table') . ($fields ? "" : ": " . htmlspecialchars($mysql->error)) . ".</p>\n";
} else {
echo "<form action='' id='form'>\n<fieldset><legend>" . lang('Search') . "</legend>\n";
if (strlen($_GET["server"])) {
@@ -182,7 +178,7 @@ function add_row(field) {
$result = $mysql->query("SELECT SQL_CALC_FOUND_ROWS * $from");
if (!$result) {
echo "<p class='error'>" . lang('Error in query') . ": " . htmlspecialchars($mysql->error) . "</p>\n";
echo "<p class='error'>" . htmlspecialchars($mysql->error) . "</p>\n";
} else {
if (!$result->num_rows) {
echo "<p class='message'>" . lang('No rows.') . "</p>\n";