From eff527b3d84c6cee766b770c86ae88ca2ee62535 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Thu, 10 Apr 2008 14:37:10 +0000
Subject: [PATCH] Move error output to page_header()

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@386 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 abstraction.inc.php |  3 +--
 auth.inc.php        |  9 +--------
 call.inc.php        |  8 +++-----
 connect.inc.php     |  5 ++---
 create.inc.php      |  5 +----
 createv.inc.php     |  5 +----
 database.inc.php    |  5 +----
 design.inc.php      |  5 ++++-
 edit.inc.php        |  5 +----
 foreign.inc.php     |  5 +----
 index.php           |  2 +-
 indexes.inc.php     |  5 +----
 lang/cs.inc.php     | 12 ------------
 lang/nl.inc.php     | 14 ++------------
 lang/sk.inc.php     | 17 +++--------------
 procedure.inc.php   |  8 +-------
 processlist.inc.php |  6 +-----
 schema.inc.php      |  2 +-
 select.inc.php      | 10 +++-------
 sql.inc.php         |  6 ++----
 table.inc.php       |  9 +++++----
 trigger.inc.php     |  5 +----
 user.inc.php        |  5 +----
 23 files changed, 38 insertions(+), 118 deletions(-)

diff --git a/abstraction.inc.php b/abstraction.inc.php
index 8eeca206..537f8115 100644
--- a/abstraction.inc.php
+++ b/abstraction.inc.php
@@ -196,8 +196,7 @@ if (extension_loaded("mysqli")) {
 	$mysql = new Min_PDO_MySQL;
 
 } else {
-	page_header(lang('No MySQL extension'), null);
-	echo "<p class='error'>" . lang('None of supported PHP extensions (%s) are available.', 'MySQLi, MySQL, PDO') . "</p>\n";
+	page_header(lang('No MySQL extension'), lang('None of supported PHP extensions (%s) are available.', 'MySQLi, MySQL, PDO'), null);
 	page_footer("auth");
 	exit;
 }
diff --git a/auth.inc.php b/auth.inc.php
index d737568f..0685bf5f 100644
--- a/auth.inc.php
+++ b/auth.inc.php
@@ -37,14 +37,7 @@ function auth_error() {
 		$_POST["token"] = token();
 	}
 	unset($_SESSION["usernames"][$_GET["server"]]);
-	page_header(lang('Login'), null);
-	if (isset($username)) {
-		echo "<p class='error'>" . lang('Invalid credentials.') . "</p>\n";
-	} elseif (isset($_POST["server"])) {
-		echo "<p class='error'>" . lang('Sessions must be enabled.') . "</p>\n";
-	} elseif ($_POST) {
-		echo "<p class='error'>" . lang('Session expired, please login again.') . "</p>\n";
-	}
+	page_header(lang('Login'), (isset($username) ? lang('Invalid credentials.') : (isset($_POST["server"]) ? lang('Sessions must be enabled.') : ($_POST ? lang('Session expired, please login again.') : ""))), null);
 	?>
 	<form action="" method="post">
 	<table border="0" cellspacing="0" cellpadding="2">
diff --git a/call.inc.php b/call.inc.php
index d56489e3..709c65ea 100644
--- a/call.inc.php
+++ b/call.inc.php
@@ -1,5 +1,5 @@
 <?php
-page_header(lang('Call') . ": " . htmlspecialchars($_GET["call"]));
+page_header(lang('Call') . ": " . htmlspecialchars($_GET["call"]), $error);
 
 $routine = routine($_GET["call"], (isset($_GET["callf"]) ? "FUNCTION" : "PROCEDURE"));
 $in = array();
@@ -13,9 +13,7 @@ foreach ($routine["fields"] as $i => $field) {
 	}
 }
 
-if ($error) {
-	echo "<p class='error'>" . htmlspecialchars($error) . "</p>\n";
-} elseif ($_POST) {
+if (!$error && $_POST) {
 	$call = array();
 	foreach ($routine["fields"] as $key => $field) {
 		if (in_array($key, $in)) {
@@ -31,7 +29,7 @@ if ($error) {
 	}
 	$result = $mysql->multi_query((isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . idf_escape($_GET["call"]) . "(" . implode(", ", $call) . ")");
 	if (!$result) {
-		echo "<p class='error'>" . lang('Error during calling') . ": " . htmlspecialchars($mysql->error) . "</p>\n";
+		echo "<p class='error'>" . htmlspecialchars($mysql->error) . "</p>\n";
 	} else {
 		do {
 			$result = $mysql->store_result();
diff --git a/connect.inc.php b/connect.inc.php
index 576bcdfa..09eea2e2 100644
--- a/connect.inc.php
+++ b/connect.inc.php
@@ -4,10 +4,9 @@ if (!(strlen($_GET["db"]) ? $mysql->select_db($_GET["db"]) : isset($_GET["sql"])
 		unset($_SESSION["databases"][$_GET["server"]]);
 	}
 	if (strlen($_GET["db"])) {
-		page_header(lang('Database') . ": " . htmlspecialchars($_GET["db"]), false);
-		echo "<p class='error'>" . lang('Invalid database.') . "</p>\n";
+		page_header(lang('Database') . ": " . htmlspecialchars($_GET["db"]), lang('Invalid database.'), false);
 	} else {
-		page_header(lang('Select database'), null);
+		page_header(lang('Select database'), "", null);
 		echo '<p><a href="' . htmlspecialchars($SELF) . 'database=">' . lang('Create new database') . "</a></p>\n";
 		echo '<p><a href="' . htmlspecialchars($SELF) . 'privileges=">' . lang('Privileges') . "</a></p>\n";
 		echo '<p><a href="' . htmlspecialchars($SELF) . 'processlist=">' . lang('Process list') . "</a></p>\n";
diff --git a/create.inc.php b/create.inc.php
index 440c37eb..0ff5a741 100644
--- a/create.inc.php
+++ b/create.inc.php
@@ -54,7 +54,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
 	}
 	$error = $mysql->error;
 }
-page_header(strlen($_GET["create"]) ? lang('Alter table') : lang('Create table'), array("table" => $_GET["create"]), $_GET["create"]);
+page_header((strlen($_GET["create"]) ? lang('Alter table') : lang('Create table')), $error, array("table" => $_GET["create"]), $_GET["create"]);
 
 $engines = array();
 $result = $mysql->query("SHOW ENGINES");
@@ -65,9 +65,6 @@ while ($row = $result->fetch_assoc()) {
 }
 $result->free();
 
-if ($error) {
-	echo "<p class='error'>" . lang('Unable to operate table') . ": " . htmlspecialchars($error) . "</p>\n";
-}
 if ($_POST) {
 	$row = $_POST;
 	ksort($row["fields"]);
diff --git a/createv.inc.php b/createv.inc.php
index 607d6b68..feef4781 100644
--- a/createv.inc.php
+++ b/createv.inc.php
@@ -13,11 +13,8 @@ if ($_POST && !$error) {
 	$error = $mysql->error;
 }
 
-page_header(strlen($_GET["createv"]) ? lang('Alter view') : lang('Create view'), array("view" => $_GET["createv"]), $_GET["createv"]);
+page_header((strlen($_GET["createv"]) ? lang('Alter view') : lang('Create view')), $error, array("view" => $_GET["createv"]), $_GET["createv"]);
 
-if ($error) {
-	echo "<p class='error'>" . lang('Unable to operate view') . ": " . htmlspecialchars($error) . "</p>\n";
-}
 if ($_POST) {
 	$row = $_POST;
 } elseif (strlen($_GET["createv"])) {
diff --git a/database.inc.php b/database.inc.php
index 353f7d73..e4ab8860 100644
--- a/database.inc.php
+++ b/database.inc.php
@@ -28,12 +28,9 @@ if ($_POST && !$error) {
 	}
 	$error = $mysql->error;
 }
-page_header(strlen($_GET["db"]) ? lang('Alter database') : lang('Create database'), array(), $_GET["db"]);
+page_header(strlen($_GET["db"]) ? lang('Alter database') : lang('Create database'), $error, array(), $_GET["db"]);
 
 $collations = collations();
-if ($error) {
-	echo "<p class='error'>" . lang('Unable to operate database') . ": " . htmlspecialchars($error) . "</p>\n";
-}
 if ($_POST) {
 	$name = $_POST["name"];
 	$collate = $_POST["collation"];
diff --git a/design.inc.php b/design.inc.php
index fb1a5007..6a742d4c 100644
--- a/design.inc.php
+++ b/design.inc.php
@@ -1,5 +1,5 @@
 <?php
-function page_header($title, $breadcrumb = array(), $title2 = "") {
+function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 	global $SELF, $LANG;
 	header("Content-Type: text/html; charset=utf-8");
 	?>
@@ -46,6 +46,9 @@ function page_header($title, $breadcrumb = array(), $title2 = "") {
 	if (isset($_SESSION["databases"][$_GET["server"]]) && !isset($_GET["sql"])) {
 		session_write_close();
 	}
+	if ($error) {
+		echo "<p class='error'>" . htmlspecialchars($error) . "</p>\n";
+	}
 }
 
 function page_footer($missing = false) {
diff --git a/edit.inc.php b/edit.inc.php
index c673a26e..56efbfc3 100644
--- a/edit.inc.php
+++ b/edit.inc.php
@@ -41,11 +41,8 @@ if ($_POST && !$error) {
 	}
 	$error = $mysql->error;
 }
-page_header((isset($_GET["default"]) ? lang('Default values') : ($_GET["where"] ? lang('Edit') : lang('Insert'))), array((isset($_GET["default"]) ? "table" : "select") => $_GET["edit"]), $_GET["edit"]);
+page_header((isset($_GET["default"]) ? lang('Default values') : ($_GET["where"] ? lang('Edit') : lang('Insert'))), $error, array((isset($_GET["default"]) ? "table" : "select") => $_GET["edit"]), $_GET["edit"]);
 
-if ($error) {
-	echo "<p class='error'>" . lang('Error during saving') . ": " . htmlspecialchars($error) . "</p>\n";
-}
 if ($_POST) {
 	$row = (array) $_POST["fields"];
 	foreach ((array) $_POST["null"] as $key => $val) {
diff --git a/foreign.inc.php b/foreign.inc.php
index 03ee1072..65e54a06 100644
--- a/foreign.inc.php
+++ b/foreign.inc.php
@@ -24,7 +24,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-
 	}
 	$error = $mysql->error;
 }
-page_header(lang('Foreign key'), array("table" => $_GET["foreign"]), $_GET["foreign"]);
+page_header(lang('Foreign key'), $error, array("table" => $_GET["foreign"]), $_GET["foreign"]);
 
 $tables = array();
 $result = $mysql->query("SHOW TABLE STATUS");
@@ -35,9 +35,6 @@ while ($row = $result->fetch_assoc()) {
 }
 $result->free();
 
-if ($error) {
-	echo "<p class='error'>" . lang('Unable to operate foreign keys') . ": " . htmlspecialchars($error) . "</p>\n";
-}
 if ($_POST) {
 	$row = $_POST;
 	ksort($row["source"]);
diff --git a/index.php b/index.php
index 2ef891ce..230ef85c 100644
--- a/index.php
+++ b/index.php
@@ -96,7 +96,7 @@ if (isset($_GET["dump"])) {
 			include "./select.inc.php";
 		} else {
 			unset($_SESSION["tokens"][$_GET["server"]][$_SERVER["REQUEST_URI"]]);
-			page_header(lang('Database') . ": " . htmlspecialchars($_GET["db"]), false);
+			page_header(lang('Database') . ": " . htmlspecialchars($_GET["db"]), $error, false);
 			echo '<p><a href="' . htmlspecialchars($SELF) . 'database=">' . lang('Alter database') . "</a></p>\n";
 			echo '<p><a href="' . htmlspecialchars($SELF) . 'schema=">' . lang('Database schema') . "</a></p>\n";
 			if ($mysql->server_info >= 5) {
diff --git a/indexes.inc.php b/indexes.inc.php
index 4e8ccaf5..b1644d82 100644
--- a/indexes.inc.php
+++ b/indexes.inc.php
@@ -38,11 +38,8 @@ if ($_POST && !$error && !$_POST["add"]) {
 	}
 	$error = $mysql->error;
 }
-page_header(lang('Indexes'), array("table" => $_GET["indexes"]), $_GET["indexes"]);
+page_header(lang('Indexes'), $error, array("table" => $_GET["indexes"]), $_GET["indexes"]);
 
-if ($error) {
-	echo "<p class='error'>" . lang('Unable to operate indexes') . ": " . htmlspecialchars($error) . "</p>\n";
-}
 $fields = array_keys(fields($_GET["indexes"]));
 if ($_POST) {
 	$row = $_POST;
diff --git a/lang/cs.inc.php b/lang/cs.inc.php
index 36534e6a..fe0577ab 100644
--- a/lang/cs.inc.php
+++ b/lang/cs.inc.php
@@ -15,7 +15,6 @@ $translations = array(
 	'Table has been created.' => 'Tabulka byla vytvořena.',
 	'Alter table' => 'Pozměnit tabulku',
 	'Create table' => 'Vytvořit tabulku',
-	'Unable to operate table' => 'Nepodařilo se zpracovat tabulku',
 	'Table name' => 'Název tabulky',
 	'engine' => 'úložiště',
 	'collation' => 'porovnávání',
@@ -33,7 +32,6 @@ $translations = array(
 	'Database has been altered.' => 'Databáze byla změněna.',
 	'Alter database' => 'Pozměnit databázi',
 	'Create database' => 'Vytvořit databázi',
-	'Unable to operate database' => 'Nepodařilo se zpracovat databázi',
 	'SQL command' => 'SQL příkaz',
 	'Dump' => 'Export',
 	'Logout' => 'Odhlásit',
@@ -47,14 +45,12 @@ $translations = array(
 	'Item has been inserted.' => 'Položka byla vložena.',
 	'Edit' => 'Upravit',
 	'Insert' => 'Vložit',
-	'Error during saving' => 'Chyba při ukládání',
 	'Save and insert next' => 'Uložit a vložit další',
 	'Delete' => 'Smazat',
 	'Database' => 'Databáze',
 	'Routines' => 'Procedury',
 	'Indexes has been altered.' => 'Indexy byly změněny.',
 	'Indexes' => 'Indexy',
-	'Unable to operate indexes' => 'Nepodařilo se zpracovat indexy',
 	'Alter indexes' => 'Pozměnit indexy',
 	'Add next' => 'Přidat další',
 	'Language' => 'Jazyk',
@@ -76,7 +72,6 @@ $translations = array(
 	'Triggers' => 'Triggery',
 	'View' => 'Pohled',
 	'Unable to select the table' => 'Nepodařilo se vypsat tabulku',
-	'Unable to show the table definition' => 'Nepodařilo se získat strukturu tabulky',
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odešlete formulář znovu.',
 	'Comment' => 'Komentář',
 	'Default values has been set.' => 'Výchozí hodnoty byly nastaveny.',
@@ -90,7 +85,6 @@ $translations = array(
 	'File uploads are disabled.' => 'Nahrávání souborů není povoleno.',
 	'Routine has been called, %d row(s) affected.' => array('Procedura byla zavolána, byl změněn %d záznam.', 'Procedura byla zavolána, byly změněny %d záznamy.', 'Procedura byla zavolána, bylo změněno %d záznamů.'),
 	'Call' => 'Zavolat',
-	'Error during calling' => 'Chyba při volání',
 	'No MySQL extension' => 'Žádná MySQL extenze',
 	'None of supported PHP extensions (%s) are available.' => 'Není dostupná žádná z podporovaných PHP extenzí (%s).',
 	'Sessions must be enabled.' => 'Session proměnné musí být povolené.',
@@ -101,7 +95,6 @@ $translations = array(
 	'Foreign key has been altered.' => 'Cizí klíč byl změněn.',
 	'Foreign key has been created.' => 'Cizí klíč byl vytvořen.',
 	'Foreign key' => 'Cizí klíč',
-	'Unable to operate foreign keys' => 'Nepodařilo se zpracovat cizí klíče',
 	'Target table' => 'Cílová tabulka',
 	'Change' => 'Změnit',
 	'Source' => 'Zdroj',
@@ -118,11 +111,9 @@ $translations = array(
 	'View has been created.' => 'Pohled byl vytvořen.',
 	'Alter view' => 'Pozměnit pohled',
 	'Create view' => 'Vytvořit pohled',
-	'Unable to operate view' => 'Nepodařilo se zpracovat pohled',
 	'Name' => 'Název',
 	'Process list' => 'Seznam procesů',
 	'%d process(es) has been killed.' => array('Byl ukončen %d proces.', 'Byly ukončeny %d procesy.', 'Bylo ukončeno %d procesů.'),
-	'Unable to kill process' => 'Nepodařilo se ukončit proces.',
 	'Kill' => 'Ukončit',
 	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Název parametru',
@@ -134,7 +125,6 @@ $translations = array(
 	'Routine has been created.' => 'Procedura byla vytvořena.',
 	'Alter function' => 'Změnit funkci',
 	'Alter procedure' => 'Změnit proceduru',
-	'Unable to operate routine' => 'Nepořadilo se zpracovat proceduru',
 	'Return type' => 'Návratový typ',
 	'Add trigger' => 'Přidat trigger',
 	'Trigger has been dropped.' => 'Trigger byl odstraněn.',
@@ -142,7 +132,6 @@ $translations = array(
 	'Trigger has been created.' => 'Trigger byl vytvořen.',
 	'Alter trigger' => 'Změnit trigger',
 	'Create trigger' => 'Vytvořit trigger',
-	'Unable to operate trigger' => 'Nepořadilo se zpracovat trigger',
 	'Time' => 'Čas',
 	'Event' => 'Událost',
 	'MySQL version: %s through PHP extension %s' => 'Verze MySQL: %s přes PHP extenzi %s',
@@ -156,7 +145,6 @@ $translations = array(
 	'User has been dropped.' => 'Uživatel byl odstraněn.',
 	'User has been altered.' => 'Uživatel byl změněn.',
 	'User has been created.' => 'Uživatel byl vytvořen.',
-	'Unable to operate user' => 'Nepodařilo se zpracovat uživatele',
 	'Hashed' => 'Zahašované',
 	'Column' => 'Sloupec',
 	'Routine' => 'Procedura',
diff --git a/lang/nl.inc.php b/lang/nl.inc.php
index 3a154461..59dfd83b 100644
--- a/lang/nl.inc.php
+++ b/lang/nl.inc.php
@@ -15,7 +15,6 @@ $translations = array(
 	'Table has been created.' => 'Tabel aangemaakt.',
 	'Alter table' => 'Tabel aanpassen',
 	'Create table' => 'Tabel aanmaken',
-	'Unable to operate table' => 'Onmogelijk tabel te beheren',
 	'Table name' => 'Tabelnaam',
 	'engine' => 'engine',
 	'collation' => 'collation',
@@ -33,7 +32,6 @@ $translations = array(
 	'Database has been altered.' => 'Database aangepast.',
 	'Alter database' => 'Database aanpassen',
 	'Create database' => 'Database aanmaken',
-	'Unable to operate database' => 'Onmogelijk database te beheren',
 	'SQL command' => 'SQL opdracht',
 	'Dump' => 'Exporteer',
 	'Logout' => 'Uitloggen',
@@ -47,14 +45,12 @@ $translations = array(
 	'Item has been inserted.' => 'Item toegevoegd.',
 	'Edit' => 'Bewerk',
 	'Insert' => 'Toevoegen',
-	'Error during saving' => 'Fout bij opslaan',
 	'Save and insert next' => 'Opslaan, daarna toevoegen',
 	'Delete' => 'Verwijderen',
 	'Database' => 'Database',
 	'Routines' => 'Procedures',
 	'Indexes has been altered.' => 'Index aangepast.',
 	'Indexes' => 'Indexen',
-	'Unable to operate indexes' => 'Onmogelijk indexen te beheren',
 	'Alter indexes' => 'Indexen aanpassen',
 	'Add next' => 'Volgende toevoegen',
 	'Language' => 'Taal',
@@ -76,7 +72,6 @@ $translations = array(
 	'Triggers' => 'Triggers',
 	'View' => 'View',
 	'Unable to select the table' => 'Onmogelijk tabel te selecteren',
-	'Unable to show the table definition' => 'Onmogelijk tabeldefinitie weer te geven',
 	'Invalid CSRF token. Send the form again.' => 'Ongeldig CSRF token. Verstuur het formulier opnieuw.',
 	'Comment' => 'Commentaar',
 	'Default values has been set.' => 'Standaard waarde ingesteld.',
@@ -90,7 +85,6 @@ $translations = array(
 	'File uploads are disabled.' => 'Bestanden uploaden is uitgeschakeld.',
 	'Routine has been called, %d row(s) affected.' => array('Procedure uitgevoerd, %d rij geraakt.', 'Procedure uitgevoerd, %d rijen geraakt.'),
 	'Call' => 'Uitvoeren',
-	'Error during calling' => 'Fout tijdens uitvoering',
 	'No MySQL extension' => 'Geen MySQL extensie',
 	'None of supported PHP extensions (%s) are available.' => 'Geen geldige PHP extensies beschikbaar (%s).',
 	'Sessions must be enabled.' => 'Siessies moeten geactiveerd zijn.',
@@ -101,7 +95,6 @@ $translations = array(
 	'Foreign key has been altered.' => 'Foreign key aangepast.',
 	'Foreign key has been created.' => 'Foreign key aangemaakt.',
 	'Foreign key' => 'Foreign key',
-	'Unable to operate foreign keys' => 'Onmogelijk foreign keys te beheren',
 	'Target table' => 'Doeltabel',
 	'Change' => 'Veranderen',
 	'Source' => 'Bron',
@@ -118,11 +111,9 @@ $translations = array(
 	'View has been created.' => 'View aangemaakt.',
 	'Alter view' => 'View aanpassen',
 	'Create view' => 'View aanmaken',
-	'Unable to operate view' => 'Onmogelijk view te beheren',
 	'Name' => 'Naam',
 	'Process list' => 'Proceslijst',
 	'%d process(es) has been killed.' => array('%d proces gestopt.', '%d processen gestopt.'),
-	'Unable to kill process' => 'Onmogelijk proces te stoppen.',
 	'Kill' => 'Stoppen',
 	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Parameternaam',
@@ -134,7 +125,6 @@ $translations = array(
 	'Routine has been created.' => 'Procedure aangemaakt.',
 	'Alter function' => 'Functie aanpassen',
 	'Alter procedure' => 'Procedure aanpassen',
-	'Unable to operate routine' => 'Onmogelijk procedure te beheren',
 	'Return type' => 'Return type',
 	'Add trigger' => 'Trigger aanmaken',
 	'Trigger has been dropped.' => 'Trigger verwijderd.',
@@ -142,7 +132,6 @@ $translations = array(
 	'Trigger has been created.' => 'Trigger aangemaakt.',
 	'Alter trigger' => 'Trigger aanpassen',
 	'Create trigger' => 'Trigger aanmaken',
-	'Unable to operate trigger' => 'Onmogelijk trigger te beheren',
 	'Time' => 'Time',
 	'Event' => 'Event',
 	'MySQL version: %s through PHP extension %s' => 'MySQL versie: %s met PHP extensie %s',
@@ -156,7 +145,6 @@ $translations = array(
 	'User has been dropped.' => 'Gebruiker verwijderd.',
 	'User has been altered.' => 'Gebruiker aangepast.',
 	'User has been created.' => 'Gebruiker aangemaakt.',
-	'Unable to operate user' => 'Onmogelijk gebruiker te beheren',
 	'Hashed' => 'Gehashed',
 	'Column' => 'Kolom',
 	'Routine' => 'Routine',
@@ -167,4 +155,6 @@ $translations = array(
 	'all' => 'alle',
 	'Delete selected' => 'Geselecteerde verwijderen',
 	'Truncate table' => 'Tabel leegmaken',
+	'Logged as: %s' => '',
+	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => '',
 );
diff --git a/lang/sk.inc.php b/lang/sk.inc.php
index 49904e1d..ea6e09a2 100644
--- a/lang/sk.inc.php
+++ b/lang/sk.inc.php
@@ -15,7 +15,6 @@ $translations = array(
 	'Table has been created.' => 'Tabuľka bola vytvorená.',
 	'Alter table' => 'Zmeniť tabuľku',
 	'Create table' => 'Vytvoriť tabuľku',
-	'Unable to operate table' => 'Tabuľku sa nepodarilo spracovať',
 	'Table name' => 'Názov tabuľky',
 	'engine' => 'úložisko',
 	'collation' => 'porovnávanie',
@@ -33,7 +32,6 @@ $translations = array(
 	'Database has been altered.' => 'Databáza bola zmenená.',
 	'Alter database' => 'Zmeniť databázu',
 	'Create database' => 'Vytvoriť databázu',
-	'Unable to operate database' => 'Databázu sa nepodarilo spracovať',
 	'SQL command' => 'SQL príkaz',
 	'Dump' => 'Export',
 	'Logout' => 'Odhlásiť',
@@ -47,14 +45,12 @@ $translations = array(
 	'Item has been inserted.' => 'Položka bola vložená.',
 	'Edit' => 'Upraviť',
 	'Insert' => 'Vložiť',
-	'Error during saving' => 'Chyba pri ukladaní',
 	'Save and insert next' => 'Uložiť a vložiť ďalší',
 	'Delete' => 'Zmazať',
 	'Database' => 'Databáza',
 	'Routines' => 'Procedúry',
 	'Indexes has been altered.' => 'Indexy boli zmenené.',
 	'Indexes' => 'Indexy',
-	'Unable to operate indexes' => 'Indexy sa nepodarilo spracovať',
 	'Alter indexes' => 'Zmeniť indexy',
 	'Add next' => 'Pridať ďalší',
 	'Language' => 'Jazyk',
@@ -76,7 +72,6 @@ $translations = array(
 	'Triggers' => 'Triggery',
 	'View' => 'Pohľad',
 	'Unable to select the table' => 'Tabuľku sa nepodarilo vypísať',
-	'Unable to show the table definition' => 'Štruktúru tabuľky sa nepodarilo získať',
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odošlite formulár znova.',
 	'Comment' => 'Komentár',
 	'Default values has been set.' => 'Východzie hodnoty boli nastavené.',
@@ -90,7 +85,6 @@ $translations = array(
 	'File uploads are disabled.' => 'Nahrávánie súborov nie je povolené.',
 	'Routine has been called, %d row(s) affected.' => array('Procedúra bola zavolaná, bol zmenený %d záznam.', 'Procedúra bola zavolaná, boli zmenené %d záznamy.', 'Procedúra bola zavolaná, bolo zmenených %d záznamov.'),
 	'Call' => 'Zavolať',
-	'Error during calling' => 'Chyba pri volaní',
 	'No MySQL extension' => 'Žiadne MySQL rozšírenie',
 	'None of supported PHP extensions (%s) are available.' => 'Nie je dostupné žiadne z podporovaných rozšírení (%s).',
 	'Sessions must be enabled.' => 'Session premenné musia byť povolené.',
@@ -101,7 +95,6 @@ $translations = array(
 	'Foreign key has been altered.' => 'Cudzí kľúč bol zmenený.',
 	'Foreign key has been created.' => 'Cudzí kľúč bol vytvorený.',
 	'Foreign key' => 'Cudzí kľúč',
-	'Unable to operate foreign keys' => 'Cudzie kľúče sa nepodarilo spracovať',
 	'Target table' => 'Cieľová tabuľka',
 	'Change' => 'Zmeniť',
 	'Source' => 'Zdroj',
@@ -118,11 +111,9 @@ $translations = array(
 	'View has been created.' => 'Pohľad bol vytvorený.',
 	'Alter view' => 'Zmeniť pohľad',
 	'Create view' => 'Vytvoriť pohľad',
-	'Unable to operate view' => 'Pohľad sa nepodarilo spracovať',
 	'Name' => 'Názov',
 	'Process list' => 'Zoznam procesov',
 	'%d process(es) has been killed.' => array('Bol ukončený %d proces.', 'Boli ukončené %d procesy.', 'Bolo ukončených %d procesov.'),
-	'Unable to kill process' => 'Proces sa nepodarilo ukončiť.',
 	'Kill' => 'Ukončiť',
 	'IN-OUT' => 'IN-OUT',
 	'Parameter name' => 'Názov parametra',
@@ -134,7 +125,6 @@ $translations = array(
 	'Routine has been created.' => 'Procedúra bola vytvorená.',
 	'Alter function' => 'Zmeniť funkciu',
 	'Alter procedure' => 'Zmeniť procedúru',
-	'Unable to operate routine' => 'Procedúru sa nepodarilo spracovať',
 	'Return type' => 'Návratový typ',
 	'Add trigger' => 'Pridať trigger',
 	'Trigger has been dropped.' => 'Trigger bol odstránený.',
@@ -142,7 +132,6 @@ $translations = array(
 	'Trigger has been created.' => 'Trigger bol vytvorený.',
 	'Alter trigger' => 'Zmeniť trigger',
 	'Create trigger' => 'Vytvoriť trigger',
-	'Unable to operate trigger' => 'Trigger sa nepodarilo spracovať',
 	'Time' => 'Čas',
 	'Event' => 'Udalosť',
 	'MySQL version: %s through PHP extension %s' => 'Verzia MySQL: %s cez PHP rozšírenie %s',
@@ -156,16 +145,16 @@ $translations = array(
 	'User has been dropped.' => 'Používateľ bol odstránený.',
 	'User has been altered.' => 'Používateľ bol zmenený.',
 	'User has been created.' => 'Používateľ bol vytvorený.',
-	'Unable to operate user' => 'Používateľa sa nepodarilo spracovať',
 	'Hashed' => 'Zahašované',
 	'Column' => 'Stĺpec',
 	'Routine' => 'Procedúra',
 	'Grant' => 'Povoliť',
 	'Revoke' => 'Zakázať',
 	'Error during deleting' => 'Chyba pri mazaní',
-	'%d item(s) have been deleted.' => array('%d záznam bol zmazaný.', '%d
-	záznamy boli zmazané.', '%d záznamov bolo zmazaných.'),
+	'%d item(s) have been deleted.' => array('%d záznam bol zmazaný.', '%d,
 	'all' => 'všetko',
 	'Delete selected' => 'Zmazať označené',
 	'Truncate table' => 'Vyprázdniť tabuľku',
+	'Logged as: %s' => '',
+	'Too big POST data. Reduce the data or increase the "post_max_size" configuration directive.' => '',
 );
diff --git a/procedure.inc.php b/procedure.inc.php
index 2d94abd1..82735ee4 100644
--- a/procedure.inc.php
+++ b/procedure.inc.php
@@ -29,14 +29,8 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
 	}
 	$error = $mysql->error;
 }
-page_header(strlen($_GET["procedure"])
-? (isset($_GET["function"]) ? lang('Alter function') : lang('Alter procedure')) . ": " . htmlspecialchars($_GET["procedure"])
-: (isset($_GET["function"]) ? lang('Create function') : lang('Create procedure'))
-);
+page_header((strlen($_GET["procedure"]) ? (isset($_GET["function"]) ? lang('Alter function') : lang('Alter procedure')) . ": " . htmlspecialchars($_GET["procedure"]) : (isset($_GET["function"]) ? lang('Create function') : lang('Create procedure'))), $error);
 
-if ($error) {
-	echo "<p class='error'>" . lang('Unable to operate routine') . ": " . htmlspecialchars($error) . "</p>\n";
-}
 $collations = get_vals("SHOW CHARACTER SET");
 if ($_POST) {
 	$row = $_POST;
diff --git a/processlist.inc.php b/processlist.inc.php
index 1cd3dabd..913e773e 100644
--- a/processlist.inc.php
+++ b/processlist.inc.php
@@ -11,11 +11,7 @@ if ($_POST && !$error) {
 	}
 	$error = $mysql->error;
 }
-page_header(lang('Process list'));
-
-if ($error) {
-	echo "<p class='error'>" . lang('Unable to kill process') . ": " . htmlspecialchars($error) . "</p>\n";
-}
+page_header(lang('Process list'), $error);
 ?>
 
 <form action="" method="post">
diff --git a/schema.inc.php b/schema.inc.php
index fcf72ada..a53c9406 100644
--- a/schema.inc.php
+++ b/schema.inc.php
@@ -1,5 +1,5 @@
 <?php
-page_header(lang('Database schema'), array(), $_GET["db"]);
+page_header(lang('Database schema'), "", array(), $_GET["db"]);
 
 $table_pos = array();
 $table_pos_js = array();
diff --git a/select.inc.php b/select.inc.php
index 1476606c..6bb78d3c 100644
--- a/select.inc.php
+++ b/select.inc.php
@@ -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";
diff --git a/sql.inc.php b/sql.inc.php
index d461584c..3ccc316f 100644
--- a/sql.inc.php
+++ b/sql.inc.php
@@ -3,11 +3,9 @@ if (isset($_POST["query"])) {
 	setcookie("highlight", $_POST["highlight"], strtotime("+1 month"), preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]));
 	$_COOKIE["highlight"] = $_POST["highlight"];
 }
-page_header(lang('SQL command'));
+page_header(lang('SQL command'), $error);
 
-if ($error) {
-	echo "<p class='error'>" . htmlspecialchars($error) . "</p>\n";
-} elseif ($_POST && is_string($query = (isset($_POST["query"]) ? $_POST["query"] : get_file("sql_file")))) {
+if (!$error && $_POST && is_string($query = (isset($_POST["query"]) ? $_POST["query"] : get_file("sql_file")))) {
 	$delimiter = ";";
 	$offset = 0;
 	$empty = true;
diff --git a/table.inc.php b/table.inc.php
index 7a9af16b..be90bba5 100644
--- a/table.inc.php
+++ b/table.inc.php
@@ -1,10 +1,11 @@
 <?php
-page_header(lang('Table') . ": " . htmlspecialchars($_GET["table"]));
-
 $result = $mysql->query("SHOW COLUMNS FROM " . idf_escape($_GET["table"]));
 if (!$result) {
-	echo "<p class='error'>" . lang('Unable to show the table definition') . ": " . $mysql->error . ".</p>\n";
-} else {
+	$error = $mysql->error;
+}
+page_header(lang('Table') . ": " . htmlspecialchars($_GET["table"]), $error);
+
+if ($result) {
 	$table_status = table_status($_GET["table"]);
 	$auto_increment_only = true;
 	echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
diff --git a/trigger.inc.php b/trigger.inc.php
index 4a72bd5c..c49fff59 100644
--- a/trigger.inc.php
+++ b/trigger.inc.php
@@ -19,11 +19,8 @@ if ($_POST && !$error) {
 	}
 	$error = $mysql->error;
 }
-page_header(strlen($_GET["name"]) ? lang('Alter trigger') . ": " . htmlspecialchars($_GET["name"]) : lang('Create trigger'), array("table" => $_GET["trigger"]));
+page_header((strlen($_GET["name"]) ? lang('Alter trigger') . ": " . htmlspecialchars($_GET["name"]) : lang('Create trigger')), $error, array("table" => $_GET["trigger"]));
 
-if ($error) {
-	echo "<p class='error'>" . lang('Unable to operate trigger') . ": " . htmlspecialchars($error) . "</p>\n";
-}
 if ($_POST) {
 	$row = $_POST;
 } elseif (strlen($_GET["name"])) {
diff --git a/user.inc.php b/user.inc.php
index e74d1e70..3fc58485 100644
--- a/user.inc.php
+++ b/user.inc.php
@@ -117,11 +117,8 @@ if ($_POST && !$error) {
 		$error = $mysql->error;
 	}
 }
-page_header((isset($_GET["host"]) ? lang('Username') . ": " . htmlspecialchars("$_GET[user]@$_GET[host]") : lang('Create user')), array("privileges" => lang('Privileges')));
+page_header((isset($_GET["host"]) ? lang('Username') . ": " . htmlspecialchars("$_GET[user]@$_GET[host]") : lang('Create user')), $error, array("privileges" => lang('Privileges')));
 
-if ($error) {
-	echo "<p class='error'>" . lang('Unable to operate user') . ": " . htmlspecialchars($error) . "</p>\n";
-}
 if ($_POST) {
 	$row = $_POST;
 	$grants = $new_grants;
-- 
2.39.5