diff --git a/ChangeLog b/ChangeLog index 73763cef3e..fa240dc579 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,11 +52,19 @@ phpMyAdmin - ChangeLog + rfe #1535 Keyword-based autocompletion in SQL query editors - bug #4558 Unable to Add Rows while Creating Table + rfe #1547 Wrap No Tables Found message with message box +- bug #4559 Logging in causes 100% CPU usage +- bug #4564 Designer: spaces in table name with edit table link generates bad links 4.2.11.0 (not yet released) - bug ReferenceError: Table_onover is not defined - bug #4552 Incorrect routines display for database due to case insensitive checks - bug #4259 reCaptcha sound session expired problem +- bug #4557 PHP fatal error, undefined function __() +- bug #4568 Date displayed incorrectly when charting a timeline + +4.2.10.1 (not yet released) +- bug #4562 [security] XSS in debug SQL output +- bug #4563 [security] XSS in monitor query analyzer 4.2.10.0 (2014-10-11) - bug #4361 Can't change font size (when config.inc.php not present) diff --git a/import.php b/import.php index 24dc56d422..68ad03a609 100644 --- a/import.php +++ b/import.php @@ -209,13 +209,8 @@ $post_patterns = array( '/^force_file_/', '/^' . $format . '_/' ); -foreach (array_keys($_POST) as $post_key) { - foreach ($post_patterns as $one_post_pattern) { - if (preg_match($one_post_pattern, $post_key)) { - $GLOBALS[$post_key] = $_POST[$post_key]; - } - } -} + +PMA_setPostAsGlobal($post_patterns); // Check needed parameters PMA_Util::checkParameters(array('import_type', 'format')); diff --git a/js/navigation.js b/js/navigation.js index 90fd346e3c..874101d403 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -1309,19 +1309,21 @@ PMA_fastFilter.filter.prototype.request = function () { type: 'post', dataType: 'json', data: params, - complete: function (jqXHR) { - var data = $.parseJSON(jqXHR.responseText); - self.$this.find('li.fast_filter').find('div.throbber').remove(); - if (data && data.results) { - var $listItem = $('
  • ', {'class': 'moreResults'}) - .appendTo(self.$this.find('li.fast_filter')); - $('', {href: '#'}) - .text(data.results) - .appendTo($listItem) - .click(function (event) { - event.preventDefault(); - self.swap.apply(self, [data.message]); - }); + complete: function (jqXHR, status) { + if (status != 'abort') { + var data = $.parseJSON(jqXHR.responseText); + self.$this.find('li.fast_filter').find('div.throbber').remove(); + if (data && data.results) { + var $listItem = $('
  • ', {'class': 'moreResults'}) + .appendTo(self.$this.find('li.fast_filter')); + $('', {href: '#'}) + .text(data.results) + .appendTo($listItem) + .click(function (event) { + event.preventDefault(); + self.swap.apply(self, [data.message]); + }); + } } } }); diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index b330859cc7..a082089e7d 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1869,7 +1869,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { if (name == 'user_host') { return value.replace(/(\[.*?\])+/g, ''); } - return value; + return escapeHtml(value); }; for (var i = 0, l = rows.length; i < l; i++) { @@ -2022,7 +2022,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { explain += '

    '; var tempExplain = function (key, value) { - value = (value === null) ? 'null' : value; + value = (value === null) ? 'null' : escapeHtml(value); if (key == 'type' && value.toLowerCase() == 'all') { value = '' + value + ''; diff --git a/js/tbl_chart.js b/js/tbl_chart.js index 14dcd8c81b..9a56c1bc7d 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -17,12 +17,12 @@ function extractDate(dateString) { matches = dateTimeRegExp.exec(dateString); if (matches !== null && matches.length > 0) { match = matches[0]; - return new Date(match.substr(0, 4), match.substr(5, 2), match.substr(8, 2), match.substr(11, 2), match.substr(14, 2), match.substr(17, 2)); + return new Date(match.substr(0, 4), parseInt(match.substr(5, 2), 10) - 1, match.substr(8, 2), match.substr(11, 2), match.substr(14, 2), match.substr(17, 2)); } else { matches = dateRegExp.exec(dateString); if (matches !== null && matches.length > 0) { match = matches[0]; - return new Date(match.substr(0, 4), match.substr(5, 2), match.substr(8, 2)); + return new Date(match.substr(0, 4), parseInt(match.substr(5, 2), 10) - 1, match.substr(8, 2)); } } return null; diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 24e6776d0d..85f76d5bbc 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -439,7 +439,6 @@ class PMA_Config $pmaString = $GLOBALS['PMA_String']; $branch = false; // are we on any branch? - //@TODO Implement strstr in PMA_String if ($pmaString->strstr($ref_head, '/')) { $ref_head = $pmaString->substr(trim($ref_head), 5); if ($pmaString->substr($ref_head, 0, 11) === 'refs/heads/') { @@ -492,8 +491,7 @@ class PMA_Config $commit = false; if (! isset($_SESSION['PMA_VERSION_COMMITDATA_' . $hash])) { $git_file_name = $git_folder . '/objects/' - . $pmaString->substr($hash, 0, 2) - . '/' . $pmaString->substr($hash, 2); + . substr($hash, 0, 2) . '/' . substr($hash, 2); if (file_exists($git_file_name) ) { if (! $commit = @file_get_contents($git_file_name)) { return; @@ -512,7 +510,7 @@ class PMA_Config // packs. (to look for them in .git/object/pack directory later) foreach (explode("\n", $packs) as $line) { // skip blank lines - if ($pmaString->strlen(trim($line)) == 0) { + if (strlen(trim($line)) == 0) { continue; } // skip non pack lines @@ -520,7 +518,7 @@ class PMA_Config continue; } // parse names - $pack_names[] = $pmaString->substr($line, 2); + $pack_names[] = substr($line, 2); } } else { // '.git/objects/info/packs' file can be missing @@ -534,14 +532,13 @@ class PMA_Config foreach ($dirIterator as $file_info) { $file_name = $file_info->getFilename(); // if this is a .pack file - if ($file_info->isFile() - && $pmaString->substr($file_name, -5) == '.pack' + if ($file_info->isFile() && substr($file_name, -5) == '.pack' ) { $pack_names[] = $file_name; } } } - $hash = $pmaString->strtolower($hash); + $hash = strtolower($hash); foreach ($pack_names as $pack_name) { $index_name = str_replace('.pack', '.idx', $pack_name); @@ -553,22 +550,22 @@ class PMA_Config continue; } // check format - if ($pmaString->substr($index_data, 0, 4) != "\377tOc") { + if (substr($index_data, 0, 4) != "\377tOc") { continue; } // check version - $version = unpack('N', $pmaString->substr($index_data, 4, 4)); + $version = unpack('N', substr($index_data, 4, 4)); if ($version[1] != 2) { continue; } // parse fanout table $fanout = unpack( "N*", - $pmaString->substr($index_data, 8, 256 * 4) + substr($index_data, 8, 256 * 4) ); // find where we should search - $firstbyte = intval($pmaString->substr($hash, 0, 2), 16); + $firstbyte = intval(substr($hash, 0, 2), 16); // array is indexed from 1 and we need to get // previous entry for start if ($firstbyte == 0) { @@ -582,11 +579,9 @@ class PMA_Config $found = false; $offset = 8 + (256 * 4); for ($position = $start; $position < $end; $position++) { - $sha = $pmaString->strtolower( + $sha = strtolower( bin2hex( - $pmaString->substr( - $index_data, $offset + ($position * 20), 20 - ) + substr($index_data, $offset + ($position * 20), 20) ) ); if ($sha == $hash) { @@ -601,7 +596,7 @@ class PMA_Config $offset = 8 + (256 * 4) + (24 * $fanout[256]); $pack_offset = unpack( 'N', - $pmaString->substr($index_data, $offset + ($position * 4), 4) + substr($index_data, $offset + ($position * 4), 4) ); $pack_offset = $pack_offset[1]; @@ -616,14 +611,14 @@ class PMA_Config fseek($pack_file, $pack_offset); // parse header - $header = $pmaString->ord(fread($pack_file, 1)); + $header = ord(fread($pack_file, 1)); $type = ($header >> 4) & 7; $hasnext = ($header & 128) >> 7; $size = $header & 0xf; $offset = 4; while ($hasnext) { - $byte = $pmaString->ord(fread($pack_file, 1)); + $byte = ord(fread($pack_file, 1)); $size |= ($byte & 0x7f) << $offset; $hasnext = ($byte & 128) >> 7; $offset += 7; diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php index efcd3194e1..6eba1aba52 100644 --- a/libraries/DatabaseInterface.class.php +++ b/libraries/DatabaseInterface.class.php @@ -142,10 +142,11 @@ class PMA_DatabaseInterface $_SESSION['debug']['queries'][$hash] = array(); if ($result == false) { $_SESSION['debug']['queries'][$hash]['error'] - = '' . $this->getError($link) . ''; + = '' + . htmlspecialchars($this->getError($link)) . ''; } $_SESSION['debug']['queries'][$hash]['count'] = 1; - $_SESSION['debug']['queries'][$hash]['query'] = $query; + $_SESSION['debug']['queries'][$hash]['query'] = htmlspecialchars($query); $_SESSION['debug']['queries'][$hash]['time'] = $time; } diff --git a/libraries/core.lib.php b/libraries/core.lib.php index cdab092651..e7915c2c01 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -225,7 +225,13 @@ function PMA_fatalError( /* Load gettext for fatal errors */ if (!function_exists('__')) { - include_once GETTEXT_INC; + // It is possible that PMA_fatalError() is called before including vendor_config.php + // which defines GETTEXT_INC. See bug #4557 + if (defined(GETTEXT_INC)) { + include_once GETTEXT_INC; + } else { + include_once './libraries/php-gettext/gettext.inc'; + } } // these variables are used in the included file libraries/error.inc.php @@ -1005,4 +1011,22 @@ function PMA_checkAndFixPMATablesInCurrentDb() } } } + +/** + * Creates some globals from $_POST variables matching a pattern + * + * @param array $post_patterns The patterns to search for + * + * @return void + */ +function PMA_setPostAsGlobal($post_patterns) +{ + foreach (array_keys($_POST) as $post_key) { + foreach ($post_patterns as $one_post_pattern) { + if (preg_match($one_post_pattern, $post_key)) { + $GLOBALS[$post_key] = $_POST[$post_key]; + } + } + } +} ?> diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index cf79f12c33..7e9256ac85 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -675,9 +675,10 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') $show_create_table = $GLOBALS['dbi']->fetchValue( $showCreateTableQuery, 0, 1 ); - $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table)); - - $foreign['foreign_keys_data'] = $analyzed_sql[0]['foreign_keys']; + if ($show_create_table) { + $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table)); + $foreign['foreign_keys_data'] = $analyzed_sql[0]['foreign_keys']; + } } /** @@ -1889,9 +1890,9 @@ function PMA_getHtmlFixPMATables() } /** - * Gets the relations info and status, depending on the condition + * Gets the relations info and status, depending on the condition * - * @param boolean $condition whether to look for foreigners or not + * @param boolean $condition whether to look for foreigners or not * @param string $db database name * @param string $table table name * diff --git a/po/ca.po b/po/ca.po index a89a64798d..5e27eae4a2 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-10-16 12:25-0400\n" -"PO-Revision-Date: 2014-10-16 07:47+0200\n" +"PO-Revision-Date: 2014-10-19 20:02+0200\n" "Last-Translator: josep constanti \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan " +"\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.10-dev\n" @@ -3717,7 +3717,7 @@ msgstr "Favorites" #: libraries/SavedSearches.class.php:246 msgid "Please provide a name for this bookmarked search." -msgstr "" +msgstr "Proporcioneu un nom per aquesta cerca preferida." #: libraries/SavedSearches.class.php:261 msgid "Missing information to save the bookmarked search." @@ -3729,11 +3729,11 @@ msgstr "Ja existeix una entrada amb aquest nom." #: libraries/SavedSearches.class.php:347 msgid "Missing information to delete the search." -msgstr "" +msgstr "Manca informació per esborrar la cerca." #: libraries/SavedSearches.class.php:375 msgid "Missing information to load the search." -msgstr "" +msgstr "Manca informació per carregar la cerca." #: libraries/SavedSearches.class.php:394 msgid "Error while loading the search." @@ -3970,7 +3970,7 @@ msgstr "Cerca de zoom" #: libraries/TableSearch.class.php:217 libraries/TableSearch.class.php:1227 msgid "Find and Replace" -msgstr "" +msgstr "Troba i substitueix" #: libraries/TableSearch.class.php:240 libraries/insert_edit.lib.php:1353 msgid "Edit/Insert" @@ -4041,7 +4041,7 @@ msgstr "Usar expressió regular" #: libraries/TableSearch.class.php:1474 msgid "Find and replace - preview" -msgstr "" +msgstr "Troba i substitueix - vista prèvia" #: libraries/TableSearch.class.php:1478 msgid "Count" @@ -4811,15 +4811,15 @@ msgstr "Tancat" #: libraries/config.values.php:116 msgid "Ask before sending error reports" -msgstr "" +msgstr "Demanar abans d'enviar informes d'error" #: libraries/config.values.php:117 msgid "Always send error reports" -msgstr "" +msgstr "Enviar sempre els informes d'error" #: libraries/config.values.php:118 msgid "Never send error reports" -msgstr "" +msgstr "No enviar mai informes d'error" #: libraries/config.values.php:147 #: libraries/plugins/export/ExportHtmlword.class.php:69 @@ -4959,7 +4959,7 @@ msgstr "Permet als usuaris configurar aquest valor" #: libraries/config/FormDisplay.tpl.php:393 msgid "Apply" -msgstr "" +msgstr "Aplicar" #: libraries/config/ServerConfigChecks.class.php:168 msgid "You should use SSL connections if your database server supports it." @@ -5579,10 +5579,9 @@ msgstr "Desactiva les comprovacions de claus externes" #: libraries/config/messages.inc.php:166 #: libraries/plugins/export/ExportSql.class.php:155 -#, fuzzy #| msgid "Exporting rows from \"%s\" table" msgid "Export views as tables" -msgstr "Exportar les files de la taula \"%s\"" +msgstr "Exportar les vistes com taules" #: libraries/config/messages.inc.php:167 libraries/config/messages.inc.php:169 #: libraries/config/messages.inc.php:170 libraries/config/messages.inc.php:171 @@ -5594,10 +5593,9 @@ msgid "Add %s" msgstr "Afegeix %s" #: libraries/config/messages.inc.php:174 -#, fuzzy #| msgid "Use hexadecimal for BLOB" msgid "Use hexadecimal for BINARY & BLOB" -msgstr "Usa hexadecimal per a BLOB" +msgstr "Utilitzeu hexadecimal per a BINARY i BLOB" #: libraries/config/messages.inc.php:176 msgid "Use ignore inserts" @@ -5626,17 +5624,15 @@ msgid "Export time in UTC" msgstr "Exporta l'hora en UTC" #: libraries/config/messages.inc.php:195 -#, fuzzy #| msgid "Force secured connection while using phpMyAdmin" msgid "Force secured connection while using phpMyAdmin." -msgstr "Força la connexió segura al usar phpMyAdmin" +msgstr "Forçar una connexió segura en usar phpMyAdmin." #: libraries/config/messages.inc.php:196 msgid "Force SSL connection" msgstr "Força la connexió SSL" #: libraries/config/messages.inc.php:198 -#, fuzzy #| msgid "" #| "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " #| "the referenced data, [kbd]id[/kbd] is the key value" @@ -5644,19 +5640,18 @@ msgid "" "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " "the referenced data, [kbd]id[/kbd] is the key value." msgstr "" -"Ordre de clasificació per a ítems a la llista desplegable de claus externes; " -"[kbd]content[/kbd] és la dada referenciada, [kbd]id[/kbd] és el valor de la " -"clau" +"Ordre de classificació per a ítems a la llista desplegable de claus externes;" +" [kbd]content[/kbd] és la dada referenciada, [kbd]id[/kbd] és el valor de la " +"clau." #: libraries/config/messages.inc.php:201 msgid "Foreign key dropdown order" msgstr "Ordre de claus externes a la llista desplegable" #: libraries/config/messages.inc.php:203 -#, fuzzy #| msgid "A dropdown will be used if fewer items are present" msgid "A dropdown will be used if fewer items are present." -msgstr "Ús de llista desplegable si hi son menys ítems presents" +msgstr "S'utilitzara una llista desplegable si hi ha menys ítems." #: libraries/config/messages.inc.php:204 msgid "Foreign key limit" @@ -5667,18 +5662,16 @@ msgid "Browse mode" msgstr "Mode de navegació" #: libraries/config/messages.inc.php:206 -#, fuzzy #| msgid "Customize browse mode" msgid "Customize browse mode." -msgstr "Configura el mode de navegació" +msgstr "Configura el mode de navegació." #: libraries/config/messages.inc.php:208 libraries/config/messages.inc.php:210 #: libraries/config/messages.inc.php:228 libraries/config/messages.inc.php:239 #: libraries/config/messages.inc.php:241 libraries/config/messages.inc.php:287 -#, fuzzy #| msgid "Customize default options" msgid "Customize default options." -msgstr "Configura les opcions predeterminades" +msgstr "Configura les opcions predeterminades." #: libraries/config/messages.inc.php:209 libraries/config/setup.forms.php:245 #: libraries/config/setup.forms.php:322 @@ -5692,30 +5685,27 @@ msgid "Developer" msgstr "Desenvolupador" #: libraries/config/messages.inc.php:212 -#, fuzzy #| msgid "Settings for phpMyAdmin developers" msgid "Settings for phpMyAdmin developers." -msgstr "Opcions per desenvolupadors de phpMyAdmin" +msgstr "Opcions per desenvolupadors de phpMyAdmin." #: libraries/config/messages.inc.php:213 msgid "Edit mode" msgstr "Mode d'edició" #: libraries/config/messages.inc.php:214 -#, fuzzy #| msgid "Customize edit mode" msgid "Customize edit mode." -msgstr "Configura el mode d'edició" +msgstr "Configura el mode d'edició." #: libraries/config/messages.inc.php:216 msgid "Export defaults" msgstr "Predeterminats d'exportació" #: libraries/config/messages.inc.php:217 -#, fuzzy #| msgid "Customize default export options" msgid "Customize default export options." -msgstr "Configura les opcions predeterminades d'exportació" +msgstr "Configura les opcions predeterminades d'exportació." #: libraries/config/messages.inc.php:218 libraries/config/messages.inc.php:279 #: setup/frames/menu.inc.php:22 @@ -5727,31 +5717,29 @@ msgid "General" msgstr "General" #: libraries/config/messages.inc.php:220 -#, fuzzy #| msgid "Set some commonly used options" msgid "Set some commonly used options." -msgstr "Estableix algunes de les opcions més utilitzades" +msgstr "Estableix algunes de les opcions més utilitzades." #: libraries/config/messages.inc.php:222 msgid "Import defaults" msgstr "Predeterminats d'importació" #: libraries/config/messages.inc.php:223 -#, fuzzy #| msgid "Customize default common import options" msgid "Customize default common import options." -msgstr "Configura les opcions predeterminades d'importació" +msgstr "Configura les opcions predeterminades habituals d'importació." #: libraries/config/messages.inc.php:224 msgid "Import / export" msgstr "Importar / exportar" #: libraries/config/messages.inc.php:226 -#, fuzzy #| msgid "Set import and export directories and compression options" msgid "Set import and export directories and compression options." msgstr "" -"Configura els directoris d'importació i exportació i les opcions d'empaquetat" +"Configura els directoris d'importació i exportació i les opcions " +"d'empaquetat." #: libraries/config/messages.inc.php:227 msgid "LaTeX" diff --git a/po/cs.po b/po/cs.po index 9edb90411f..64a5a68611 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-10-16 12:25-0400\n" -"PO-Revision-Date: 2014-07-15 10:52+0200\n" +"PO-Revision-Date: 2014-10-21 09:26+0200\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Czech \n" +"Language-Team: Czech " +"\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 1.10-dev\n" +"X-Generator: Weblate 2.0-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -256,15 +256,14 @@ msgid "Database %1$s has been copied to %2$s." msgstr "Databáze %1$s byla zkopírována do %2$s." #: db_operations.php:263 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage has been deactivated. To find out " #| "why click %shere%s." msgid "" "The phpMyAdmin configuration storage has been deactivated. %sFind out why%s." msgstr "" -"Některé z rozšířených funkcí phpMyAdmina nelze používat. %sZde%s zjistíte " -"proč." +"Některé z rozšířených funkcí phpMyAdmina nelze používat. %sZjistěte proč%s." #: db_printview.php:48 db_tracking.php:83 db_tracking.php:207 #: libraries/Menu.class.php:246 libraries/config/messages.inc.php:756 @@ -598,20 +597,18 @@ msgstr "" "Z funkcí zvolte „GeomFromText“ a vložte níže uvedený text jako hodnotu." #: import.php:54 -#, fuzzy #| msgid "Success!" msgid "Succeeded" -msgstr "Úspěch!" +msgstr "Úspěch" #: import.php:58 js/messages.php:437 msgid "Failed" -msgstr "" +msgstr "Chyba" #: import.php:62 -#, fuzzy #| msgid "complete inserts" msgid "Incomplete params" -msgstr "úplné inserty" +msgstr "Chybí parametry" #: import.php:166 #, php-format @@ -891,7 +888,7 @@ msgstr "" "lidmi přistupujícími k vašemu nastavení." #: index.php:520 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage is not completely configured, some " #| "extended features have been deactivated. To find out why click %shere%s." @@ -900,7 +897,7 @@ msgid "" "extended features have been deactivated. %sFind out why%s. " msgstr "" "Úložiště nastavení phpMyAdmina není plně dostupné, některé z rozšířených " -"funkcí phpMyAdmina nelze používat. %sZde%s zjistíte proč." +"funkcí phpMyAdmina nelze používat. %sZjistěte proč%s. " #: index.php:526 msgid "" @@ -960,10 +957,9 @@ msgid "Dropping Primary Key/Index" msgstr "Odstraňuji (primární) klíč" #: js/messages.php:43 -#, fuzzy #| msgid "Is a foreign key." msgid "Dropping Foreign key." -msgstr "Jedná se o cizí klíč." +msgstr "Odstraňuji cizí klíč." #: js/messages.php:44 msgid "This operation could take a long time. Proceed anyway?" @@ -1313,11 +1309,11 @@ msgstr "Přerušit monitor" #: js/messages.php:149 libraries/server_status_processes.lib.php:37 msgid "Start auto refresh" -msgstr "" +msgstr "Zapnout automatické obnovování" #: js/messages.php:150 msgid "Stop auto refresh" -msgstr "" +msgstr "Vypnout automatické obnovování" #: js/messages.php:152 msgid "general_log and slow_query_log are enabled." @@ -1855,16 +1851,14 @@ msgid "Add primary key" msgstr "Přidat primární klíč" #: js/messages.php:314 -#, fuzzy #| msgid "A primary key has been added on %s." msgid "Primary key added." -msgstr "Na poli %s byl vytvořen primární klíč." +msgstr "Byl přidán primární klíč." #: js/messages.php:315 libraries/normalization.lib.php:172 -#, fuzzy #| msgid "Taking you to %s." msgid "Taking you to next step…" -msgstr "Přesměrovávám na %s." +msgstr "Přesměrovávám na další krok…" #: js/messages.php:316 #, php-format @@ -1874,10 +1868,9 @@ msgstr "" #: js/messages.php:317 libraries/normalization.lib.php:420 #: libraries/normalization.lib.php:467 libraries/normalization.lib.php:550 #: libraries/normalization.lib.php:610 -#, fuzzy #| msgid "End of line" msgid "End of step" -msgstr "Konec řádku" +msgstr "Konec kroku" #: js/messages.php:318 msgid "Second step of normalization (2NF)" @@ -1924,7 +1917,7 @@ msgstr "" #: js/messages.php:328 msgid "Step" -msgstr "" +msgstr "Krok" #: js/messages.php:329 #, fuzzy @@ -2140,10 +2133,9 @@ msgid "Delete page" msgstr "Odstranit stránku" #: js/messages.php:407 libraries/db_designer.lib.php:382 -#, fuzzy #| msgid "Unit" msgid "Untitled" -msgstr "Jednotka" +msgstr "Beze jména" #: js/messages.php:408 #, fuzzy @@ -2152,10 +2144,9 @@ msgid "Please select a page to continue" msgstr "Zvolte stránku, kterou si přejete změnit" #: js/messages.php:409 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid page name" -msgstr "Prosím zadejte platné číslo!" +msgstr "Prosím zadejte platný název stránky" #: js/messages.php:410 msgid "Do you want to save the changes to the current page?" @@ -2163,7 +2154,7 @@ msgstr "" #: js/messages.php:411 msgid "Successfully deleted the page" -msgstr "" +msgstr "Stránka byla odstraněna" #: js/messages.php:412 #, fuzzy @@ -2245,26 +2236,23 @@ msgstr "" "Prosím zadejte platný šestnáctkový řetězec. Můžete použít znaky 0-9, A-F." #: js/messages.php:435 -#, fuzzy #| msgid "Cancel" msgid "cancel" -msgstr "Zrušit" +msgstr "zrušit" #: js/messages.php:436 libraries/server_status.lib.php:261 msgid "Aborted" msgstr "Přerušené" #: js/messages.php:438 -#, fuzzy #| msgid "Success!" msgid "Success" -msgstr "Úspěch!" +msgstr "Úspěch" #: js/messages.php:439 -#, fuzzy #| msgid "Import defaults" msgid "Import status" -msgstr "Výchozí nastavení importu" +msgstr "Stav importu" #: js/messages.php:440 libraries/navigation/Navigation.class.php:102 #, fuzzy @@ -2782,10 +2770,9 @@ msgid "Expand" msgstr "" #: libraries/Console.class.php:95 libraries/Console.class.php:174 -#, fuzzy #| msgid "subquery" msgid "Requery" -msgstr "poddotaz" +msgstr "Znovu" #: libraries/Console.class.php:97 libraries/DbSearch.class.php:363 #: libraries/DisplayResults.class.php:3506 @@ -2799,17 +2786,17 @@ msgid "Delete" msgstr "Odstranit" #: libraries/Console.class.php:106 -#, fuzzy, php-format +#, php-format #| msgid "New bookmark" msgid "Total %d bookmark" msgid_plural "Total %d bookmarks" -msgstr[0] "Nová záložka" -msgstr[1] "Nová záložka" -msgstr[2] "Nová záložka" +msgstr[0] "Celkem %d záložka" +msgstr[1] "Celkem %d záložky" +msgstr[2] "Celkem %d záložek" #: libraries/Console.class.php:114 msgid "private" -msgstr "" +msgstr "soukromé" #: libraries/Console.class.php:118 libraries/bookmark.lib.php:87 msgid "shared" @@ -2823,16 +2810,14 @@ msgid "%1$s, %2$s and %3$s bookmarks included" msgstr "Položka byla smazána z oblíbených." #: libraries/Console.class.php:128 -#, fuzzy #| msgid "New bookmark" msgid "No bookmarks" -msgstr "Nová záložka" +msgstr "Žádné záložky" #: libraries/Console.class.php:176 -#, fuzzy #| msgid "Explain SQL" msgid "Explain" -msgstr "Vysvětlit SQL" +msgstr "Vysvětlit" #: libraries/Console.class.php:177 libraries/Util.class.php:1287 #: libraries/sql.lib.php:485 @@ -2840,20 +2825,18 @@ msgid "Profiling" msgstr "Profilování" #: libraries/Console.class.php:178 -#, fuzzy #| msgid "Bookmarks" msgid "Bookmark" -msgstr "Záložky" +msgstr "Záložka" #: libraries/Console.class.php:179 msgid "Query failed" msgstr "Dotaz selhal" #: libraries/Console.class.php:181 -#, fuzzy #| msgid "Query execution time" msgid "Queried time" -msgstr "Doba běhu dotazu" +msgstr "Doba běhu" #: libraries/Console.class.php:187 msgid "SQL Query Console" @@ -2921,32 +2904,28 @@ msgid "Refresh" msgstr "Obnovit" #: libraries/Console.class.php:257 -#, fuzzy #| msgid "And" msgid "Add" -msgstr "a" +msgstr "Přidat" #: libraries/Console.class.php:266 -#, fuzzy #| msgid "New bookmark" msgid "Add bookmark" -msgstr "Nová záložka" +msgstr "Přidat záložku" #: libraries/Console.class.php:270 -#, fuzzy #| msgid "Label:" msgid "Label" -msgstr "Název:" +msgstr "Název" #: libraries/Console.class.php:272 msgid "Target database" msgstr "Cílová databáze" #: libraries/Console.class.php:275 -#, fuzzy #| msgid "Create bookmark" msgid "Share this bookmark" -msgstr "Uložit vyhledávání" +msgstr "Sdílet záložku" #: libraries/Console.class.php:291 #, fuzzy @@ -4704,14 +4683,13 @@ msgid "Could not remove columns!" msgstr "Nepodařilo se uložit oblíbenou tabulku!" #: libraries/central_columns.lib.php:509 -#, fuzzy #| msgid "EPS" msgid "YES" -msgstr "EPS" +msgstr "ANO" #: libraries/central_columns.lib.php:509 msgid "NO" -msgstr "" +msgstr "NE" #: libraries/central_columns.lib.php:629 #: libraries/display_create_table.lib.php:60 @@ -4762,10 +4740,9 @@ msgid "on update CURRENT_TIMESTAMP" msgstr "" #: libraries/central_columns.lib.php:889 -#, fuzzy #| msgid "Add column" msgid "Add new column" -msgstr "Přidat sloupec" +msgstr "Přidat nový sloupec" #: libraries/common.inc.php:586 msgid "Failed to read configuration file!" @@ -7899,10 +7876,9 @@ msgid "Skip tables larger than" msgstr "Přeskočit tabulky větší než" #: libraries/display_export.lib.php:783 -#, fuzzy #| msgid "Select a table" msgid "Select database" -msgstr "Zvolte tabulku" +msgstr "Zvolte databázi" #: libraries/display_export.lib.php:785 #, fuzzy @@ -7911,16 +7887,14 @@ msgid "Select table" msgstr "Zvolte tabulku" #: libraries/display_export.lib.php:801 -#, fuzzy #| msgid "database name" msgid "New database name" -msgstr "jméno databáze" +msgstr "Nové jméno databáze" #: libraries/display_export.lib.php:825 -#, fuzzy #| msgid "New table" msgid "New table name" -msgstr "Nová tabulka" +msgstr "Nové jméno tabulky" #: libraries/display_export.lib.php:834 #, fuzzy @@ -14335,16 +14309,14 @@ msgid "Available MIME types" msgstr "Dostupné MIME typy" #: transformation_overview.php:37 -#, fuzzy #| msgid "Available transformations" msgid "Available browser display transformations" -msgstr "Dostupné transformace" +msgstr "Dostupné transformace pro zobrazení" #: transformation_overview.php:38 -#, fuzzy #| msgid "Available transformations" msgid "Available input transformations" -msgstr "Dostupné transformace" +msgstr "Dostupné vstupní transformace" #: transformation_overview.php:53 msgctxt "for MIME transformation" diff --git a/server_privileges.php b/server_privileges.php index 616ebd7660..1515d32bbc 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -43,13 +43,8 @@ $post_patterns = array( '/_priv$/i', '/^max_/i' ); -foreach (array_keys($_POST) as $post_key) { - foreach ($post_patterns as $one_post_pattern) { - if (preg_match($one_post_pattern, $post_key)) { - $GLOBALS[$post_key] = $_POST[$post_key]; - } - } -} + +PMA_setPostAsGlobal($post_patterns); require 'libraries/server_common.inc.php';