Handle max_input_vars and generalize Suhosin compatibility

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index 3b6665d1a69b1df3f9ee7420154375065725cbb0..4ce934b792111932b84bfb5263c71e39bacb7b3b 100644 (file)
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -145,11 +145,6 @@ if ($_POST) {
 }
 $collations = collations();
 
-$suhosin = floor(extension_loaded("suhosin") ? (min(ini_get("suhosin.request.max_vars"), ini_get("suhosin.post.max_vars")) - 13) / 10 : 0); // 10 - number of fields per row, 13 - number of other fields
-if ($suhosin && count($row["fields"]) > $suhosin) {
-       echo "<p class='error'>" . h(lang('Maximum number of allowed fields exceeded. Please increase %s and %s.', 'suhosin.post.max_vars', 'suhosin.request.max_vars')) . "\n";
-}
-
 $engines = engines();
 // case of engine may differ
 foreach ($engines as $engine) {
@@ -178,7 +173,7 @@ if (!$_POST && !$comments) {
                }
        }
 }
-edit_fields($row["fields"], $collations, "TABLE", $suhosin, $foreign_keys, $comments);
+edit_fields($row["fields"], $collations, "TABLE", $foreign_keys, $comments);
 ?>
 </table>
 <p>
@@ -189,7 +184,6 @@ edit_fields($row["fields"], $collations, "TABLE", $suhosin, $foreign_keys, $comm
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php if ($_GET["create"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
 <?php
 if (support("partitioning")) {
        $partition_table = ereg('RANGE|LIST', $row["partition_by"]);
@@ -213,4 +207,5 @@ foreach ($row["partition_names"] as $key => $val) {
 <?php
 }
 ?>
+<input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index 43a55dff2a4b9f4c25860eaa38e02acd93174678..1b4cbd15e04b37f084d3e95ec330e7bd2f8ca576 100644 (file)
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -114,7 +114,27 @@ $token = $_SESSION["token"]; ///< @var string CSRF protection
 if ($auth && $_POST["token"]) {
        $_POST["token"] = $token; // reset token after explicit login
 }
-$error = ($_POST ///< @var string
-       ? ($_POST["token"] == $token ? "" : lang('Invalid CSRF token. Send the form again.'))
-       : ($_SERVER["REQUEST_METHOD"] != "POST" ? "" : lang('Too big POST data. Reduce the data or increase the %s configuration directive.', '"post_max_size"')) // posted form with no data means that post_max_size exceeded because Adminer always sends token at least
-);
+
+$error = ''; ///< @var string
+if ($_POST) {
+       if ($_POST["token"] != $token) {
+               $ini = "max_input_vars";
+               $max_vars = ini_get($ini);
+               if (extension_loaded("suhosin")) {
+                       foreach (array("suhosin.request.max_vars", "suhosin.post.max_vars") as $key) {
+                               $val = ini_get($key);
+                               if ($val && (!$max_vars || $val < $max_vars)) {
+                                       $ini = $key;
+                                       $max_vars = $val;
+                               }
+                       }
+               }
+               $error = (!$_POST["token"] && $max_vars
+                       ? lang('Maximum number of allowed fields exceeded. Please increase %s.', "'$ini'")
+                       : lang('Invalid CSRF token. Send the form again.')
+               );
+       }
+} elseif ($_SERVER["REQUEST_METHOD"] == "POST") {
+       // posted form with no data means that post_max_size exceeded because Adminer always sends token at least
+       $error = lang('Too big POST data. Reduce the data or increase the %s configuration directive.', "'post_max_size'");
+}

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index e31d590870d0fe80a5709a4f655724444c01bee6..bf24bda6770e162767847da3715516950e1317b0 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -214,12 +214,11 @@ function type_class($type) {
 * @param array
 * @param array
 * @param string TABLE or PROCEDURE
-* @param int number of fields allowed by Suhosin
 * @param array returned by referencable_primary()
 * @param bool display comments column
 * @return null
 */
-function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $foreign_keys = array(), $comments = false) {
+function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = array(), $comments = false) {
        global $connection, $inout;
        ?>
 <thead><tr class="wrap">
@@ -245,7 +244,7 @@ function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $forei
                ?>
 <tr<?php echo ($display ? "" : " style='display: none;'"); ?>>
 <?php echo ($type == "PROCEDURE" ? "<td>" . html_select("fields[$i][inout]", explode("|", $inout), $field["inout"]) : ""); ?>
-<th><?php if ($display) { ?><input name="fields[<?php echo $i; ?>][field]" value="<?php echo h($field["field"]); ?>" onchange="<?php echo ($field["field"] != "" || count($fields) > 1 ? "" : "editingAddRow(this, $allowed); "); ?>editingNameChange(this);" maxlength="64" autocapitalize="off"><?php } ?><input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo h($orig); ?>">
+<th><?php if ($display) { ?><input name="fields[<?php echo $i; ?>][field]" value="<?php echo h($field["field"]); ?>" onchange="<?php echo ($field["field"] != "" || count($fields) > 1 ? "" : "editingAddRow(this); "); ?>editingNameChange(this);" maxlength="64" autocapitalize="off"><?php } ?><input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo h($orig); ?>">
 <?php edit_type("fields[$i]", $field, $collations, $foreign_keys); ?>
 <?php if ($type == "TABLE") { ?>
 <td><?php echo checkbox("fields[$i][null]", 1, $field["null"]); ?>
@@ -256,7 +255,7 @@ function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $forei
 <?php
                echo "<td>";
                echo (support("move_col") ?
-                       "<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='return !editingAddRow(this, $allowed, 1);'>&nbsp;"
+                       "<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='return !editingAddRow(this, 1);'>&nbsp;"
                        . "<input type='image' class='icon' name='up[$i]' src='../adminer/static/up.gif' alt='^' title='" . lang('Move up') . "'>&nbsp;"
                        . "<input type='image' class='icon' name='down[$i]' src='../adminer/static/down.gif' alt='v' title='" . lang('Move down') . "'>&nbsp;"
                : "");

diff --git a/adminer/lang/ar.inc.php b/adminer/lang/ar.inc.php
index 34128722dfbee52ff3a93a7c3216a0a80159a208..a2a1a9d99fdd8f2aa4d896414a1bc5377ea2980f 100644 (file)
--- a/adminer/lang/ar.inc.php
+++ b/adminer/lang/ar.inc.php
@@ -188,7 +188,7 @@ $translations = array(
        '%d item(s) have been affected.' => 'عدد العناصر المعدلة هو %d.',
        'whole result' => 'نتيجة كاملة',
        'Clone' => 'نسخ',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'لقد تجاوزت العدد الأقصى للحقول. يرجى الرفع من %s و %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'لقد تجاوزت العدد الأقصى للحقول. يرجى الرفع من %s.',
        'Partition by' => 'مقسم بواسطة',
        'Partitions' => 'التقسيمات',
        'Partition name' => 'إسم التقسيم',

diff --git a/adminer/lang/bn.inc.php b/adminer/lang/bn.inc.php
index e42462f87b707393fc9a096a78996527255d90a2..5f8626d01943cff1875b131c5f96c45a8427a099 100644 (file)
--- a/adminer/lang/bn.inc.php
+++ b/adminer/lang/bn.inc.php
@@ -190,7 +190,7 @@ $translations = array(
        '%d item(s) have been affected.' => '%d টি বিষয়বস্তু প্রভাবিত হয়েছে',
        'whole result' => 'সম্পূর্ণ ফলাফল',
        'Clone' => 'ক্লোন',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'অনুমোদিত ফিল্ড এর সর্বাধিক সংখ্যা অতিক্রম করে গেছে। অনুগ্রহপূর্বক %s এবং %s বৃদ্ধি করুন।',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'অনুমোদিত ফিল্ড এর সর্বাধিক সংখ্যা অতিক্রম করে গেছে। অনুগ্রহপূর্বক %s বৃদ্ধি করুন।',
        'Partition by' => 'পার্টিশন যার মাধ্যমে',
        'Partitions' => 'পার্টিশন',
        'Partition name' => 'পার্টিশনের নাম',

diff --git a/adminer/lang/ca.inc.php b/adminer/lang/ca.inc.php
index 1883737a79ef9a2ca0521e04b4415b506b1a0ad9..bdc206fbbb67b6a2d7f1f564c5a415fe3ccc31bc 100644 (file)
--- a/adminer/lang/ca.inc.php
+++ b/adminer/lang/ca.inc.php
@@ -199,7 +199,7 @@ $translations = array(
        'Show structure' => 'Mostra l\'estructura',
        'Select data' => 'Selecciona dades',
        'Stop on error' => 'Atura en trobar un error',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'S\'ha assolit el nombre màxim de camps. Incrementa %s i %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'S\'ha assolit el nombre màxim de camps. Incrementa %s.',
        'anywhere' => 'a qualsevol lloc',
        '%.3f s' => '%.3f s',
        '$1-$3-$5' => '$5/$3/$1',

diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php
index 9804ff02d18120a699517d9b51c08d3424f45c5d..403331eb67be07995292585442ad919021eabbf5 100644 (file)
--- a/adminer/lang/cs.inc.php
+++ b/adminer/lang/cs.inc.php
@@ -166,7 +166,7 @@ $translations = array(
        'Move up' => 'Přesunout nahoru',
        'Move down' => 'Přesunout dolů',
        'Remove' => 'Odebrat',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Byl překročen maximální povolený počet polí. Zvyšte prosím %s a %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Byl překročen maximální povolený počet polí. Zvyšte prosím %s.',
        
        'Partition by' => 'Rozdělit podle',
        'Partitions' => 'Oddíly',

diff --git a/adminer/lang/de.inc.php b/adminer/lang/de.inc.php
index 2e216b1d11cce9065369983412d45b325ca1bb62..c3e30009252427e6399fcc8ae9f5e89efd6f68a1 100644 (file)
--- a/adminer/lang/de.inc.php
+++ b/adminer/lang/de.inc.php
@@ -190,7 +190,7 @@ $translations = array(
        '%d item(s) have been affected.' => '%d Artikel betroffen.',
        'whole result' => 'Gesamtergebnis',
        'Clone' => 'Klonen',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Die maximal erlaubte Anzahl der Felder ist überschritten. Bitte %s und %s erhöhen.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Die maximal erlaubte Anzahl der Felder ist überschritten. Bitte %s erhöhen.',
        'Partition by' => 'Partitionieren um',
        'Partitions' => 'Partitionen',
        'Partition name' => 'Name der Partition',

diff --git a/adminer/lang/es.inc.php b/adminer/lang/es.inc.php
index c48ed126cd5ba133086d5d5295bdf00bb8ccc4fb..1ffde6722e56723942d628b3aa53dcb98e33e224 100644 (file)
--- a/adminer/lang/es.inc.php
+++ b/adminer/lang/es.inc.php
@@ -190,7 +190,7 @@ $translations = array(
        '%d item(s) have been affected.' => array('%d ítem afectado.', '%d itemes afectados.'),
        'whole result' => 'resultado completo',
        'Clone' => 'Clonar',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Cantida máxima de campos permitidos excedidos. Por favor aumente %s y %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Cantida máxima de campos permitidos excedidos. Por favor aumente %s.',
        'Partition by' => 'Particionar por',
        'Partitions' => 'Particiones',
        'Partition name' => 'Nombre de Partición',

diff --git a/adminer/lang/et.inc.php b/adminer/lang/et.inc.php
index 3481c3fb360cadb468e6545fcaa4092563b494ad..e6b7222dba1f0e279c9ce860fdaf50fd51c30f72 100644 (file)
--- a/adminer/lang/et.inc.php
+++ b/adminer/lang/et.inc.php
@@ -190,7 +190,7 @@ $translations = array(
        '%d item(s) have been affected.' => 'Mõjutatud kirjeid: %d.',
        'whole result' => 'Täielikud tulemused',
        'Clone' => 'Kloon',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Maksimaalne väljade arv ületatud. Palun suurendage %s ja %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimaalne väljade arv ületatud. Palun suurendage %s.',
        'Partition by' => 'Partitsiooni',
        'Partitions' => 'Partitsioonid',
        'Partition name' => 'Partitsiooni nimi',

diff --git a/adminer/lang/fa.inc.php b/adminer/lang/fa.inc.php
index b0dc8da48c2eda517e2b56c6f6c0e374c78d8662..f4dc5253618bdacc75284997811161b5569ce9ef 100644 (file)
--- a/adminer/lang/fa.inc.php
+++ b/adminer/lang/fa.inc.php
@@ -165,7 +165,7 @@ $translations = array(
        'Move up' => 'انتقال به بالا',
        'Move down' => 'انتقال به پایین',
        'Remove' => 'حذف',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'حداکثر مجاز فیلدهای مجاز اشباع شد. لطفا %s و %s را کاهش دهید',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'حداکثر مجاز فیلدهای مجاز اشباع شد. لطفا %s را کاهش دهید',
        
        'Partition by' => 'بخشبندی توسط',
        'Partitions' => 'بخشبندیها',

diff --git a/adminer/lang/fr.inc.php b/adminer/lang/fr.inc.php
index 0a64b829fa3b49cfef924c4aa71b208ab3a38afd..fe2fc9426d1b69e656fa46d2f82ed417051e4af3 100644 (file)
--- a/adminer/lang/fr.inc.php
+++ b/adminer/lang/fr.inc.php
@@ -188,7 +188,7 @@ $translations = array(
        '%d item(s) have been affected.' => array('%d élément a été modifié.', '%d éléments ont été modifiés.'),
        'whole result' => 'résultat entier',
        'Clone' => 'Cloner',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Le nombre maximum de champs est dépassé. Veuillez augmenter %s et %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Le nombre maximum de champs est dépassé. Veuillez augmenter %s.',
        'Partition by' => 'Partitionner par',
        'Partitions' => 'Partitions',
        'Partition name' => 'Nom de la partition',

diff --git a/adminer/lang/hu.inc.php b/adminer/lang/hu.inc.php
index 241e889b4218da41f7eefe390897100e67e493ad..73489059c87f891512a999c10cb34f9c0ce0766e 100644 (file)
--- a/adminer/lang/hu.inc.php
+++ b/adminer/lang/hu.inc.php
@@ -199,7 +199,7 @@ $translations = array(
        'Show structure' => 'Struktúra',
        'Select data' => 'Tartalom',
        'Stop on error' => 'Hiba esetén megáll',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'A maximális mezőszámot elérted. Növeld meg ezeket: %s, %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'A maximális mezőszámot elérted. Növeld meg ezeket: %s.',
        'anywhere' => 'bárhol',
        '%.3f s' => '%.3f másodperc',
        '$1-$3-$5' => '$6.$4.$1',

diff --git a/adminer/lang/id.inc.php b/adminer/lang/id.inc.php
index 82b6cc34291ce32c2712e87bed89ab7783d3b9fd..d7ea7d4582c5c5ebfe76eaffad765f67a031c95f 100644 (file)
--- a/adminer/lang/id.inc.php
+++ b/adminer/lang/id.inc.php
@@ -166,7 +166,7 @@ $translations = array(
        'Move up' => 'Naik',
        'Move down' => 'Turun',
        'Remove' => 'Hapus',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Jumlah ruas maksimum yang diizinkan dilewati. Harap naikkan %s dan %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Jumlah ruas maksimum yang diizinkan dilewati. Harap naikkan %s.',
 
        'Partition by' => 'Partisi menurut',
        'Partitions' => 'Partisi',

diff --git a/adminer/lang/it.inc.php b/adminer/lang/it.inc.php
index ef1aae196063a138d6470b4bd923f928622554d7..85fa155198568ad89ff71b94c79dd7aefcc7ca7c 100644 (file)
--- a/adminer/lang/it.inc.php
+++ b/adminer/lang/it.inc.php
@@ -190,7 +190,7 @@ $translations = array(
        '%d item(s) have been affected.' => array('Il risultato consiste in %d elemento.', 'Il risultato consiste in %d elementi.'),
        'whole result' => 'intero risultato',
        'Clone' => 'Clona',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Troppi campi. Per favore aumentare %s e %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Troppi campi. Per favore aumentare %s.',
        'Partition by' => 'Partiziona per',
        'Partitions' => 'Partizioni',
        'Partition name' => 'Nome partizione',

diff --git a/adminer/lang/ja.inc.php b/adminer/lang/ja.inc.php
index 463306873be59dd57eecc482a56278bd5a38b930..3bd5e1c0a617eb7d5c5724e9d435d257bf2b089f 100644 (file)
--- a/adminer/lang/ja.inc.php
+++ b/adminer/lang/ja.inc.php
@@ -189,7 +189,7 @@ $translations = array(
        'whole result' => '全結果',
        'Tables have been dropped.' => 'テーブルを削除しました',
        'Clone' => 'クローン',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => '定義可能な最大フィールド数を越えました。%s と %s を増やしてください。',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => '定義可能な最大フィールド数を越えました。%s を増やしてください。',
        'Partition by' => 'パーティション',
        'Partitions' => 'パーティション',
        'Partition name' => 'パーティション名',

diff --git a/adminer/lang/lt.inc.php b/adminer/lang/lt.inc.php
index e608c055e4a32b091f4886c17997a3f1e3b644a6..c6b14a7a04856e1802a352e08b53772a840a3728 100644 (file)
--- a/adminer/lang/lt.inc.php
+++ b/adminer/lang/lt.inc.php
@@ -165,7 +165,7 @@ $translations = array(
        'Move up' => 'Perkelti į viršų',
        'Move down' => 'Perkelti žemyn',
        'Remove' => 'Pašalinti',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Viršytas maksimalus leidžiamų stulpelių kiekis. Padidinkite %s ir %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Viršytas maksimalus leidžiamų stulpelių kiekis. Padidinkite %s.',
        
        'Partition by' => 'Skirstyti pagal',
        'Partitions' => 'Skirsniai',

diff --git a/adminer/lang/nl.inc.php b/adminer/lang/nl.inc.php
index 2c9fb1a49dd725d791c19aa7440d223de4e5b14e..ac2a84421dcaf22c8d43fdc127a074cf5e4df3cd 100644 (file)
--- a/adminer/lang/nl.inc.php
+++ b/adminer/lang/nl.inc.php
@@ -191,7 +191,7 @@ $translations = array(
        '%d item(s) have been affected.' => array('%d item aangepast.', '%d items aangepast.'),
        'whole result' => 'volledig resultaat',
        'Clone' => 'Dupliceer',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Maximum aantal velden bereikt. Verhoog %s en %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maximum aantal velden bereikt. Verhoog %s.',
        'Partition by' => 'Partitioneren op',
        'Partitions' => 'Partities',
        'Partition name' => 'Partitie naam',

diff --git a/adminer/lang/pl.inc.php b/adminer/lang/pl.inc.php
index d9bbef7ed5ae65e4c43472d7fcc679cf22b02355..275bc517f9ae1a89bd36e9439c069433f93d45f7 100644 (file)
--- a/adminer/lang/pl.inc.php
+++ b/adminer/lang/pl.inc.php
@@ -166,7 +166,7 @@ $translations = array(
        'Move up' => 'Przesuń w górę',
        'Move down' => 'Przesuń w dół',
        'Remove' => 'Usuń',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Przekroczono maksymalną liczbę pól. Zwiększ %s i %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Przekroczono maksymalną liczbę pól. Zwiększ %s.',
        
        'Partition by' => 'Partycjonowanie',
        'Partitions' => 'Partycje',

diff --git a/adminer/lang/pt.inc.php b/adminer/lang/pt.inc.php
index 103733a5034a8da7a066b8844c2588dcb80187a3..4fe699c53f8e8c87db28f3b0d21a7e7cbd5c6a58 100644 (file)
--- a/adminer/lang/pt.inc.php
+++ b/adminer/lang/pt.inc.php
@@ -190,7 +190,7 @@ $translations = array(
        '%d item(s) have been affected.' => array('%d item afetado.', '%d itens afetados.'),
        'whole result' => 'resultado completo',
        'Clone' => 'Clonar',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Quantidade máxima de campos permitidos excedidos. Por favor aumente %s e %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Quantidade máxima de campos permitidos excedidos. Por favor aumente %s.',
        'Partition by' => 'Particionar por',
        'Partitions' => 'Partições',
        'Partition name' => 'Nome da Partição',

diff --git a/adminer/lang/ro.inc.php b/adminer/lang/ro.inc.php
index c2b2e0496f380614e2abd71654ec7ff2bdb74906..7bc9ec7cb398efcdf0a5c43f315f4e7bc5618dfd 100644 (file)
--- a/adminer/lang/ro.inc.php
+++ b/adminer/lang/ro.inc.php
@@ -197,7 +197,7 @@ $translations = array(
        '%d row(s) have been imported.' => array('%d rînd importat.', '%d rînduri importate.'),
        'Import' => 'Importă',
        'Stop on error' => 'Opreștete la eroare',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Numărul maxim de înscrieri disponibile a fost atins. Majorați %s și %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Numărul maxim de înscrieri disponibile a fost atins. Majorați %s.',
        'anywhere' => 'oriunde',
        '%.3f s' => '%.3f s',
        '$1-$3-$5' => '$5.$3.$1',

diff --git a/adminer/lang/ru.inc.php b/adminer/lang/ru.inc.php
index 5d21bdc15bf427aba63644e532bff91cece02fbd..d72c5c469e5c0c0f8643b3a4932dccf6387a245a 100644 (file)
--- a/adminer/lang/ru.inc.php
+++ b/adminer/lang/ru.inc.php
@@ -197,7 +197,7 @@ $translations = array(
        '%d row(s) have been imported.' => array('Импортирована %d строка.', 'Импортировано %d строки.', 'Импортировано %d строк.'),
        'Import' => 'Импорт',
        'Stop on error' => 'Остановить при ошибке',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Достигнуто максимальное значение количества доступных полей. Увеличьте %s и %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Достигнуто максимальное значение количества доступных полей. Увеличьте %s.',
        'anywhere' => 'в любом месте',
        '%.3f s' => '%.3f s',
        '$1-$3-$5' => '$5.$3.$1',

diff --git a/adminer/lang/sk.inc.php b/adminer/lang/sk.inc.php
index 87360ac9f8544f62dc40db24edc8caf03d1dc019..b9ae5b21175a2b965759a178e36a5bc3b432a85d 100644 (file)
--- a/adminer/lang/sk.inc.php
+++ b/adminer/lang/sk.inc.php
@@ -198,7 +198,7 @@ $translations = array(
        '%d row(s) have been imported.' => array('Bol importovaný %d záznam.', 'Boli importované %d záznamy.', 'Bolo importovaných %d záznamov.'),
        'Import' => 'Import',
        'Stop on error' => 'Zastaviť pri chybe',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Bol prekročený maximálny počet povolených polí. Zvýšte prosím %s a %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Bol prekročený maximálny počet povolených polí. Zvýšte prosím %s.',
        'anywhere' => 'kdekoľvek',
        '%.3f s' => '%.3f s',
        '$1-$3-$5' => '$6.$4.$1',

diff --git a/adminer/lang/sl.inc.php b/adminer/lang/sl.inc.php
index 266bb2fdc537c8be5e4177979a4987e53e44dd97..ba3bf8c336d65076c4f7116fccfcb0edc4ae8775 100644 (file)
--- a/adminer/lang/sl.inc.php
+++ b/adminer/lang/sl.inc.php
@@ -161,7 +161,7 @@ $translations = array(
        'Move up' => 'Premakni gor',
        'Move down' => 'Premakni dol',
        'Remove' => 'Odstrani',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Največje število dovoljenih polje je preseženo. Prosimo, povečajte %s in %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Največje število dovoljenih polje je preseženo. Prosimo, povečajte %s.',
        
        'Partition by' => 'Porazdeli po',
        'Partitions' => 'Porazdelitve',

diff --git a/adminer/lang/sr.inc.php b/adminer/lang/sr.inc.php
index 3ee265f7c531d024ea84f343c456aed3eb08152d..acabcd7fb0fd95414910787b6a764ed7118f31d6 100644 (file)
--- a/adminer/lang/sr.inc.php
+++ b/adminer/lang/sr.inc.php
@@ -166,7 +166,7 @@ $translations = array(
        'Move up' => 'Помери на горе',
        'Move down' => 'Помери на доле',
        'Remove' => 'Уклони',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Премашен је максимални број дозвољених поља. Молим увећајте %s и %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Премашен је максимални број дозвољених поља. Молим увећајте %s.',
 
        'Partition by' => 'Подели по',
        'Partitions' => 'Поделе',

diff --git a/adminer/lang/ta.inc.php b/adminer/lang/ta.inc.php
index b62a0bebf1e93134269abd044cc090d5ca0bed96..b3e90161bb5b4cb77bbbc186131269a5c8c16d63 100644 (file)
--- a/adminer/lang/ta.inc.php
+++ b/adminer/lang/ta.inc.php
@@ -187,7 +187,7 @@ $translations = array(
        '%d item(s) have been affected.' => array('%d உருப்ப‌டி மாற்ற‌ம‌டைந்தது.', '%d உருப்ப‌டிக‌ள் மாற்ற‌ம‌டைந்த‌ன‌.'),
        'whole result' => 'முழுமையான‌ முடிவு',
        'Clone' => 'ந‌க‌லி (Clone)',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'அனும‌திக்க‌ப்ப‌ட்ட‌ அதிக‌ப‌ட்ச‌ கோப்புக‌ளின் எண்ணிக்கை மீற‌ப்ப‌ட்ட‌து. த‌ய‌வு செய்து %s ம‌ற்றும் %s யை அதிக‌ரிக்க‌வும்.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'அனும‌திக்க‌ப்ப‌ட்ட‌ அதிக‌ப‌ட்ச‌ கோப்புக‌ளின் எண்ணிக்கை மீற‌ப்ப‌ட்ட‌து. த‌ய‌வு செய்து %s ம‌ற்றும் %s யை அதிக‌ரிக்க‌வும்.',
        'Partition by' => 'பிரித்த‌து',
        'Partitions' => 'பிரிவுக‌ள்',
        'Partition name' => 'பிரிவின் பெய‌ர்',

diff --git a/adminer/lang/tr.inc.php b/adminer/lang/tr.inc.php
index 18b13c69613d5bb518c6ff7263692699cab1821f..c42b5d3f6b287d730b0395dbecd6a7638ad4d8d9 100644 (file)
--- a/adminer/lang/tr.inc.php
+++ b/adminer/lang/tr.inc.php
@@ -166,7 +166,7 @@ $translations = array(
        'Move up' => 'Yukarı taşı',
        'Move down' => 'Aşağı taşı',
        'Remove' => 'Sil',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'İzin verilen en fazla alan sayısı aşıldı. Lütfen %s ve %s değerlerini artırın.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'İzin verilen en fazla alan sayısı aşıldı. Lütfen %s değerlerini artırın.',
 
        'Partition by' => 'Bununla bölümle',
        'Partitions' => 'Bölümler',

diff --git a/adminer/lang/uk.inc.php b/adminer/lang/uk.inc.php
index e55827c02876622ad590c4b0f229a38cbd0870ce..38c8173ba08bf89d3a2242cf2c14646870a183fe 100644 (file)
--- a/adminer/lang/uk.inc.php
+++ b/adminer/lang/uk.inc.php
@@ -166,7 +166,7 @@ $translations = array(
        'Move up' => 'Пересунути вгору',
        'Move down' => 'Пересунути вниз',
        'Remove' => 'Видалити',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Досягнута максимальна кількість доступних полів. Будь ласка, збільшіть %s і %s.',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'Досягнута максимальна кількість доступних полів. Будь ласка, збільшіть %s.',
        
        'Partition by' => 'Розділити по',
        'Partitions' => 'Розділи',

diff --git a/adminer/lang/xx.inc.php b/adminer/lang/xx.inc.php
index 05834aefe302bbf835a8a791704f8e9bbe8ed64e..e2a8ac9b9d6349c051ad447c30be5ad6fb14c904 100644 (file)
--- a/adminer/lang/xx.inc.php
+++ b/adminer/lang/xx.inc.php
@@ -166,7 +166,7 @@ $translations = array(
        'Move up' => 'xx',
        'Move down' => 'xx',
        'Remove' => 'xx',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'xx',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => 'xx',
        
        'Partition by' => 'xx',
        'Partitions' => 'xx',

diff --git a/adminer/lang/zh-tw.inc.php b/adminer/lang/zh-tw.inc.php
index 31d111cee0e59a4c638b8ebc601e4940164f6f5c..f99c107cd9135d511a33dc140e972cc9f00fe6d8 100644 (file)
--- a/adminer/lang/zh-tw.inc.php
+++ b/adminer/lang/zh-tw.inc.php
@@ -188,7 +188,7 @@ $translations = array(
        'whole result' => '所有結果',
        'Tables have been dropped.' => '已丟棄表。',
        'Clone' => '複製',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => '超過最多允許的字段數量。請增加%s和%s 。',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => '超過最多允許的字段數量。請增加%s。',
        'Partition by' => '分區類型',
        'Partitions' => '分區',
        'Partition name' => '分區名',

diff --git a/adminer/lang/zh.inc.php b/adminer/lang/zh.inc.php
index 75e30257fe62846c88287ccada0976807064855e..3c0a3d2864162262d25a26640b64d0376591263a 100644 (file)
--- a/adminer/lang/zh.inc.php
+++ b/adminer/lang/zh.inc.php
@@ -190,7 +190,7 @@ $translations = array(
        'whole result' => '所有结果',
        'Tables have been dropped.' => '已丢弃表。',
        'Clone' => '克隆',
-       'Maximum number of allowed fields exceeded. Please increase %s and %s.' => '超过最多允许的字段数量。请增加 %s 和 %s 。',
+       'Maximum number of allowed fields exceeded. Please increase %s.' => '超过最多允许的字段数量。请增加 %s。',
        'Partition by' => '分区类型',
        'Partitions' => '分区',
        'Partition name' => '分区名',

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index b93f9a1e6836df1e4bf9194f22ce91a768476882..e2c0bb90b7d5c196bf0885552c89a87d63473dfe 100644 (file)
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -185,7 +185,6 @@ echo "<p>" . (ini_bool("file_uploads")
 ?>
 <p>
 <input type="submit" value="<?php echo lang('Execute'); ?>" title="Ctrl+Enter">
-<input type="hidden" name="token" value="<?php echo $token; ?>">
 <?php
 echo checkbox("error_stops", 1, $_POST["error_stops"], lang('Stop on error')) . "\n";
 echo checkbox("only_errors", 1, $_POST["only_errors"], lang('Show only errors')) . "\n";
@@ -212,5 +211,5 @@ if ($history) {
        echo "</div></fieldset>\n";
 }
 ?>
-
+<input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index 7a31e36597e3913b6f47ddb0d111d58cd1e713ca..047cba16a5b92e566ca29aa6d29ca7f12c8751cb 100644 (file)
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -254,13 +254,9 @@ function editingNameChange(field) {
 /** Add table row for next field
 * @param HTMLInputElement
 * @param boolean
-* @param boolean
 * @return boolean
 */
-function editingAddRow(button, allowed, focus) {
-       if (allowed && rowCount >= allowed) {
-               return false;
-       }
+function editingAddRow(button, focus) {
        var match = /(\d+)(\.\d+)?/.exec(button.name);
        var x = match[0] + (match[2] ? added.substr(match[2].length) : added) + '1';
        var row = parentTag(button, 'tr');

diff --git a/changes.txt b/changes.txt
index 0042bfbae4a071d0924a19a0c63b9e3cdb4fb01e..38da0d630c2f9d83b28b22b2a041542b9d065337 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -4,6 +4,7 @@ Compatibility with MySQL 5.6
 Recover original view, trigger, routine if creating fails
 Allow loading more data with inline edit (bug #3605531)
 Stay on the same page after deleting rows (bug #3605845)
+Handle max_input_vars
 Disable autocapitalize in identifiers
 
 Adminer 3.6.3 (released 2013-01-23):