From 17eda5b9688e6e7137a8d6f2bd82cec802ebaca4 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Sat, 3 Sep 2016 09:55:33 +0530 Subject: [PATCH 01/41] ChangeLog entry for #12523 Signed-off-by: Deven Bansod --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 11818ed0de..12e46dd1f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog - issue #12465 Improved handling of http requests - issue #12474 Broken links in Setup forms Navigation - issue #12494 Can't add a new User +- issue #12523 Add 'token' Parameter in all POST requests (Fix 'Token mismatch' errors) 4.6.5 (not yet released) - issue Remove potentionally license problematic sRGB profile From 2a2d6d8bd6c535a6906ffc2b2abcb75eb9676a65 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Sun, 4 Sep 2016 20:34:36 +0530 Subject: [PATCH 02/41] Fix #12534: Remove option from after_field select after a column is dropped Signed-off-by: Deven Bansod --- ChangeLog | 1 + js/tbl_structure.js | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 145aff04bb..be0fa788a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog - issue #12502 Remove unused paramenter when connecting to MySQLi - issue #12303 Fix number formatting with different settings of precision in PHP - issue #12405 Use single quotes in PHP code +- issue #12534 Option for the dropped column is not removed from 'after_field' select, after the column is dropped 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 6dd5ce0ab6..efd2daf646 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -233,8 +233,16 @@ AJAX.registerOnload('tbl_structure.js', function () { } $after_field_item.remove(); $curr_row.hide("medium").remove(); - //by default select the last option to add new column (in case last column is dropped) + + // Remove the dropped column from select menu for 'after field' + $("select[name=after_field]").find( + '[value="' + curr_column_name.trim() + '"]' + ).remove(); + + // by default select the (new) last option to add new column + // (in case last column is dropped) $("select[name=after_field] option:last").attr("selected","selected"); + //refresh table stats if (data.tableStat) { $('#tablestatistics').html(data.tableStat); From 0a7d3afd27bba56c69ead885319aa8d8519c0b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Sun, 4 Sep 2016 18:16:55 +0000 Subject: [PATCH 03/41] Translated using Weblate (Hungarian) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] --- po/hu.po | 438 +++++++++++++++++++------------------------------------ 1 file changed, 152 insertions(+), 286 deletions(-) diff --git a/po/hu.po b/po/hu.po index 91f16478bb..fe6aa09467 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-06-08 14:42+0000\n" -"Last-Translator: Gergő Felföldi \n" -"Language-Team: Hungarian \n" +"PO-Revision-Date: 2016-09-04 18:17+0000\n" +"Last-Translator: Balázs Úr \n" +"Language-Team: Hungarian " +"\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.7-dev\n" +"X-Generator: Weblate 2.8\n" #: changelog.php:38 license.php:33 #, php-format @@ -794,7 +794,7 @@ msgstr "" #: index.php:525 msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "A titkos jelmondat a beállításokban (blowfish_secret) túl rövid." #: index.php:539 msgid "" @@ -974,7 +974,6 @@ msgstr "" "adatokat?" #: js/messages.php:98 -#, fuzzy #| msgid "" #| "Through this operation, MySQL attempts to map the data values between " #| "collations. If the character sets are incompatible, there may be data " @@ -1223,19 +1222,16 @@ msgid "Total swap" msgstr "Teljes lapozófájl" #: js/messages.php:192 -#, fuzzy #| msgid "Cached Swap" msgid "Cached swap" msgstr "Gyorsítótárazott lapozófájl" #: js/messages.php:193 -#, fuzzy #| msgid "Used Swap" msgid "Used swap" msgstr "Használt lapozófájl" #: js/messages.php:194 -#, fuzzy #| msgid "Free Swap" msgid "Free swap" msgstr "Szabad lapozófájl" @@ -1652,7 +1648,6 @@ msgid "No files available on server for import!" msgstr "Nincs elérhető fájl a kiszolgálón az importáláshoz!" #: js/messages.php:331 -#, fuzzy #| msgid "Analyse Query" msgid "Analyse query" msgstr "Lekérdezés elemzése" @@ -1723,19 +1718,16 @@ msgid "Loading…" msgstr "Betöltés…" #: js/messages.php:358 -#, fuzzy #| msgid "Request Aborted!!" msgid "Request aborted!!" msgstr "Kérés megszakítva!" #: js/messages.php:359 -#, fuzzy #| msgid "Processing Request" msgid "Processing request" msgstr "Kérés feldolgozása" #: js/messages.php:360 -#, fuzzy #| msgid "Request Failed!!" msgid "Request failed!!" msgstr "A kérés sikertelen!" @@ -1761,13 +1753,11 @@ msgid "No databases selected." msgstr "Nincs kiválasztott adatbázis." #: js/messages.php:365 -#, fuzzy #| msgid "Dropping Column" msgid "Dropping column" -msgstr "Oszlop törlése" +msgstr "Oszlop eldobása" #: js/messages.php:366 -#, fuzzy #| msgid "Add primary key" msgid "Adding primary key" msgstr "Elsődleges kulcs hozzáadása" @@ -1787,22 +1777,19 @@ msgid "Click to dismiss this notification" msgstr "Kattintson az értesítés elutasításához" #: js/messages.php:371 -#, fuzzy #| msgid "Renaming Databases" msgid "Renaming databases" -msgstr "Adatbázis(ok) átnevezése" +msgstr "Adatbázisok átnevezése" #: js/messages.php:372 -#, fuzzy #| msgid "Copying Database" msgid "Copying database" msgstr "Adatbázis másolása" #: js/messages.php:373 -#, fuzzy #| msgid "Changing Charset" msgid "Changing charset" -msgstr "Karakterkészlet változtatása" +msgstr "Karakterkészlet megváltoztatása" #: js/messages.php:377 libraries/Util.php:3297 msgid "Enable foreign key checks" @@ -2194,7 +2181,6 @@ msgid "Geometry" msgstr "Geometria" #: js/messages.php:515 -#, fuzzy #| msgid "Inner Ring" msgid "Inner ring" msgstr "Belső gyűrű" @@ -2452,13 +2438,11 @@ msgid "More" msgstr "Több" #: js/messages.php:631 -#, fuzzy #| msgid "Show Panel" msgid "Show panel" msgstr "Panel megjelenítése" #: js/messages.php:632 -#, fuzzy #| msgid "Hide Panel" msgid "Hide panel" msgstr "Panel elrejtése" @@ -2503,13 +2487,11 @@ msgid "Create view" msgstr "Nézet létrehozása" #: js/messages.php:653 -#, fuzzy #| msgid "Send error reports" msgid "Send error report" -msgstr "Hibajelentések küldése" +msgstr "Hibajelentés küldése" #: js/messages.php:654 -#, fuzzy #| msgid "Submit Error Report" msgid "Submit error report" msgstr "Hibajelentés beküldése" @@ -2521,13 +2503,11 @@ msgid "" msgstr "Végzetes JavaScript hiba történt. Szeretne hibajelentést küldeni?" #: js/messages.php:658 -#, fuzzy #| msgid "Change Report Settings" msgid "Change report settings" -msgstr "Jelentés beállítások megváltoztatása" +msgstr "Jelentés beállításainak megváltoztatása" #: js/messages.php:659 -#, fuzzy #| msgid "Show Report Details" msgid "Show report details" msgstr "Jelentés részleteinek megjelenítése" @@ -2618,22 +2598,19 @@ msgstr "" "módú böngészés okozza." #: js/messages.php:711 -#, fuzzy #| msgid "Copy database to" msgid "Copy tables to" -msgstr "Adatbázis másolása ide" +msgstr "Táblák másolása ide" #: js/messages.php:712 -#, fuzzy #| msgid "Add table prefix:" msgid "Add table prefix" -msgstr "Tábla előtag hozzáadása:" +msgstr "Táblaelőtag hozzáadása" #: js/messages.php:713 -#, fuzzy #| msgid "Replace table prefix" msgid "Replace table with prefix" -msgstr "Tábla előtagjának lecserélése" +msgstr "Tábla cseréje előtaggal" #: js/messages.php:714 templates/database/structure/check_all_tables.phtml:29 msgid "Copy table with prefix" @@ -3251,7 +3228,7 @@ msgstr "Lekérdezés előzmények megjelenítése indításkor" #: libraries/Console.php:367 msgid "Show current browsing query" -msgstr "Az aktuális böngészés lekérdezéseinek megjelenítése" +msgstr "A jelenlegi böngészés lekérdezésének megjelenítése" #: libraries/Console.php:370 msgid "" @@ -3266,10 +3243,9 @@ msgid "Switch to dark theme" msgstr "Átváltás sötét témára" #: libraries/DatabaseInterface.php:1528 -#, fuzzy #| msgid "Failed to read configuration file!" msgid "Failed to set configured collation connection!" -msgstr "A beállítófájl olvasása meghiúsult!" +msgstr "Nem sikerült beállítani a beállított egyeztetés kapcsolatot!" #: libraries/DatabaseInterface.php:2139 msgid "" @@ -3488,10 +3464,9 @@ msgstr "Belső táblák:" #: libraries/DbSearch.php:446 libraries/display_export.lib.php:48 #: libraries/replication_gui.lib.php:379 -#, fuzzy #| msgid "Unselect All" msgid "Unselect all" -msgstr "Minden kijelölés törlése" +msgstr "Összes kijelölésének megszüntetése" #: libraries/DbSearch.php:451 msgid "Inside column:" @@ -3567,10 +3542,9 @@ msgid "Relational key" msgstr "Relációs kulcs" #: libraries/DisplayResults.php:1742 -#, fuzzy #| msgid "Display foreign key relationships" msgid "Display column for relations" -msgstr "Idegen kulcsok kapcsolatainak megjelenítése" +msgstr "Oszlop megjelenítése a kapcsolatokhoz" #: libraries/DisplayResults.php:1755 msgid "Show binary contents" @@ -3659,10 +3633,9 @@ msgstr "A kijelöltekkel végzendő művelet:" #: libraries/server_user_groups.lib.php:231 #: templates/database/structure/check_all_tables.phtml:3 #: templates/database/structure/check_all_tables.phtml:4 -#, fuzzy #| msgid "Check All" msgid "Check all" -msgstr "Mind kijelölése" +msgstr "Összes bejelölése" #: libraries/DisplayResults.php:5013 msgid "Copy to clipboard" @@ -3736,7 +3709,7 @@ msgstr "Ismeretlen hiba a fájlfeltöltésben." #: libraries/File.php:424 msgid "File is a symbolic link" -msgstr "" +msgstr "A fájl egy szimbolikus link" #: libraries/File.php:470 msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]." @@ -3749,7 +3722,6 @@ msgid "Error while moving uploaded file." msgstr "Hiba a feltöltött fájl mozgatása közben." #: libraries/File.php:497 -#, fuzzy #| msgid "Cannot read (moved) upload file." msgid "Cannot read uploaded file." msgstr "A feltöltött fájl nem olvasható." @@ -4725,19 +4697,16 @@ msgid "Analyze Explain at %s" msgstr "Magyarázat elemzése itt: %s" #: libraries/Util.php:1258 -#, fuzzy #| msgid "Without PHP Code" msgid "Without PHP code" -msgstr "PHP kód nélkül" +msgstr "PHP-kód nélkül" #: libraries/Util.php:1270 -#, fuzzy #| msgid "Submit Query" msgid "Submit query" msgstr "Lekérdezés indítása" #: libraries/Util.php:1281 libraries/config/messages.inc.php:888 -#, fuzzy #| msgid "Create PHP Code" msgid "Create PHP code" msgstr "PHP-kód létrehozása" @@ -5245,10 +5214,9 @@ msgid "You allow for connecting to the server without a password." msgstr "Ön engedélyezi a jelszó nélküli csatlakozást a kiszolgálóhoz." #: libraries/config/ServerConfigChecks.php:347 -#, fuzzy #| msgid "Key is too short, it should have at least 8 characters." msgid "Key is too short, it should have at least 32 characters." -msgstr "Túl rövid a kulcs, legalább 8 karakterből kell állnia." +msgstr "A kulcs túl rövid, legalább 32 karakterből kell állnia." #: libraries/config/ServerConfigChecks.php:357 msgid "Key should contain letters, numbers [em]and[/em] special characters." @@ -5394,10 +5362,9 @@ msgid "Could not connect to the database server!" msgstr "Nem sikerült kapcsolódni az adatbázis-kiszolgálóhoz!" #: libraries/config/Validator.php:243 -#, fuzzy #| msgid "Authentication type" msgid "Invalid authentication type!" -msgstr "Hitelesítés típusa" +msgstr "Érvénytelen hitelesítési típus!" #: libraries/config/Validator.php:250 msgid "Empty username while using [kbd]config[/kbd] authentication method!" @@ -5516,14 +5483,11 @@ msgid "Highlight pointer" msgstr "A mutató kiemelése" #: libraries/config/messages.inc.php:47 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " #| "import operations." msgid "Enable bzip2 compression for import operations." -msgstr "" -"A [a@https://en.wikipedia.org/wiki/Bzip2]bzip2[/a] tömörítés engedélyezése " -"az importálási műveletekhez." +msgstr "A bzip2 tömörítés engedélyezése az importálási műveletekhez." #: libraries/config/messages.inc.php:50 msgid "Bzip2" @@ -5544,7 +5508,6 @@ msgid "CHAR columns editing" msgstr "CHAR mezők szerkesztése" #: libraries/config/messages.inc.php:58 -#, fuzzy #| msgid "" #| "Use user-friendly editor for editing SQL queries ([a@https://codemirror." #| "net/]CodeMirror[/a]) with syntax highlighting and line numbers." @@ -5552,8 +5515,8 @@ msgid "" "Use user-friendly editor for editing SQL queries (CodeMirror) with syntax " "highlighting and line numbers." msgstr "" -"Felhasználóbarát szerkesztő használata az SQL-lekérdezésekhez ([a@https://" -"codemirror.net/]CodeMirror[/a]) szintaxis kiemelővel és sorszámozással." +"Felhasználóbarát szerkesztő használata az SQL-lekérdezések szerkesztéséhez " +"(CodeMirror) szintaxiskiemelővel és sorszámozással." #: libraries/config/messages.inc.php:62 msgid "Enable CodeMirror" @@ -5568,10 +5531,9 @@ msgstr "" "szükséges a működéshez." #: libraries/config/messages.inc.php:67 -#, fuzzy #| msgid "Enable SQL Validator" msgid "Enable linter" -msgstr "SQL Validator engedélyezése" +msgstr "Linter engedélyezése" #: libraries/config/messages.inc.php:69 msgid "" @@ -5690,10 +5652,9 @@ msgid "Whether the table structure actions should be hidden." msgstr "Legyenek-e rejtve a táblaszerkezet műveletei." #: libraries/config/messages.inc.php:117 -#, fuzzy #| msgid "Show table comments" msgid "Show column comments" -msgstr "Tábla megjegyzéseinek megjelenítése" +msgstr "Oszlopmegjegyzések megjelenítése" #: libraries/config/messages.inc.php:119 msgid "Whether column comments should be shown in table structure view" @@ -6315,14 +6276,12 @@ msgid "Disable some of the warnings shown by phpMyAdmin." msgstr "Egyes phpMyAdmin által megjelenített figyelmeztetések letiltása." #: libraries/config/messages.inc.php:353 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for " #| "import and export operations." msgid "Enable gzip compression for import and export operations." msgstr "" -"A [a@https://en.wikipedia.org/wiki/Gzip]gzip[/a] tömörítés engedélyezése az " -"importálási és az exportálási műveletekhez." +"A gzip tömörítés engedélyezése az importálási és exportálási műveletekhez." #: libraries/config/messages.inc.php:356 msgid "GZip" @@ -6573,7 +6532,6 @@ msgid "Maximum tables" msgstr "A táblák száma" #: libraries/config/messages.inc.php:466 -#, fuzzy #| msgid "" #| "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] " #| "([kbd]0[/kbd] for no limit)." @@ -6582,7 +6540,8 @@ msgid "" "([kbd]-1[/kbd] for no limit and [kbd]0[/kbd] for no change)." msgstr "" "Egy parancsfájl számára a lefoglaláshoz engedélyezett bájtok száma, például " -"[kbd]32M[/kbd] (korlátlan: [kbd]0[/kbd])." +"[kbd]32M[/kbd] ([kbd]-1[/kbd] esetén nincs korlát és [kbd]0[/kbd] esetén " +"nincs változtatás)." #: libraries/config/messages.inc.php:469 msgid "Memory limit" @@ -7018,7 +6977,6 @@ msgid "Authentication type" msgstr "Hitelesítés típusa" #: libraries/config/messages.inc.php:638 -#, fuzzy #| msgid "" #| "Leave blank for no [a@https://wiki.phpmyadmin.net/pma/bookmark]bookmark[/" #| "a] support, suggested: [kbd]pma__bookmark[/kbd]" @@ -7026,8 +6984,8 @@ msgid "" "Leave blank for no [doc@bookmarks@]bookmark[/doc] support, suggested: " "[kbd]pma__bookmark[/kbd]" msgstr "" -"Hagyja üresen, ha nincs [a@https://wiki.phpmyadmin.net/pma/" -"bookmark]könyvjelző[/a] támogatás, alapértelmezés: [kbd]pma_bookmark[/kbd]" +"Hagyja üresen, ha nincs [doc@bookmarks@]könyvjelző[/doc] támogatás, javasolt:" +" [kbd]pma__bookmark[/kbd]" #: libraries/config/messages.inc.php:641 msgid "Bookmark table" @@ -7068,7 +7026,6 @@ msgid "Control user password" msgstr "A kontrollfelhasználó jelszava" #: libraries/config/messages.inc.php:654 -#, fuzzy #| msgid "" #| "A special MySQL user configured with limited permissions, more " #| "information available on [a@https://wiki.phpmyadmin.net/pma/" @@ -7077,9 +7034,8 @@ msgid "" "A special MySQL user configured with limited permissions, more information " "available on [doc@linked-tables]documentation[/doc]." msgstr "" -"Korlátozott jogokkal rendelkező, speciális MySQL felhasználó, további " -"információk érhetők el a [a@https://wiki.phpmyadmin.net/pma/" -"controluser]wiki[/a] oldalon." +"Korlátozott jogosultságokkal rendelkező, speciális MySQL felhasználó. " +"További információk érhetők el a [doc@linked-tables]dokumentációban[/doc]." #: libraries/config/messages.inc.php:657 msgid "Control user" @@ -7246,7 +7202,6 @@ msgid "PDF schema: pages table" msgstr "PDF-séma: pages table" #: libraries/config/messages.inc.php:721 -#, fuzzy #| msgid "" #| "Database used for relations, bookmarks, and PDF features. See [a@https://" #| "wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave " @@ -7257,8 +7212,8 @@ msgid "" "Suggested: [kbd]phpmyadmin[/kbd]." msgstr "" "A kapcsolatokhoz, könyvjelzőkhöz és PDF-funkciókhoz használt adatbázis. A " -"teljes információt lásd a [a@https://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] " -"oldalon. Hagyja üresen, ha nincs szükség a támogatására. Ajánlott: " +"teljes információkért nézze meg a [doc@linked-tables]pmadb[/doc] fejezetet. " +"Hagyja üresen, ha nincs szükség a támogatására. Ajánlott: " "[kbd]phpmyadmin[/kbd]." #: libraries/config/messages.inc.php:725 @@ -7301,7 +7256,6 @@ msgid "Favorites table" msgstr "Kedvencek tábla" #: libraries/config/messages.inc.php:740 -#, fuzzy #| msgid "" #| "Leave blank for no [a@https://wiki.phpmyadmin.net/pma/relation]relation-" #| "links[/a] support, suggested: [kbd]pma__relation[/kbd]." @@ -7309,23 +7263,20 @@ msgid "" "Leave blank for no [doc@relations@]relation-links[/doc] support, suggested: " "[kbd]pma__relation[/kbd]." msgstr "" -"Hagyja üresen, ha nincs [a@https://wiki.phpmyadmin.net/pma/relation]relációs " -"hivatkozás[/a] támogatás, ajánlott: [kbd]pma__relation[/kbd]." +"Hagyja üresen, ha nincs [doc@relations@]relációs hivatkozás[/doc] támogatás, " +"ajánlott: [kbd]pma__relation[/kbd]." #: libraries/config/messages.inc.php:744 msgid "Relation table" msgstr "Kapcsolat tábla" #: libraries/config/messages.inc.php:746 -#, fuzzy #| msgid "" #| "See [a@https://wiki.phpmyadmin.net/pma/auth_types#signon]authentication " #| "types[/a] for an example." msgid "" "See [doc@authentication-modes]authentication types[/doc] for an example." -msgstr "" -"Lásd a [a@https://wiki.phpmyadmin.net/pma/auth_types#signon]hitelesítési " -"típusok[/a] példáját." +msgstr "Lásd a [doc@authentication-modes]hitelesítési típusok[/doc] példáját." #: libraries/config/messages.inc.php:749 msgid "Signon session name" @@ -7571,7 +7522,6 @@ msgstr "" "minden táblánál." #: libraries/config/messages.inc.php:848 -#, fuzzy #| msgid "Show Creation timestamp" msgid "Show creation timestamp" msgstr "Létrehozás időbélyegének megjelenítése" @@ -7584,10 +7534,9 @@ msgstr "" "elrejtése minden táblánál." #: libraries/config/messages.inc.php:852 -#, fuzzy #| msgid "Show Last update timestamp" msgid "Show last update timestamp" -msgstr "Legutóbbi változás időbélyegének megjelenítése" +msgstr "Utolsó frissítés időbélyegének megjelenítése" #: libraries/config/messages.inc.php:854 msgid "" @@ -7597,7 +7546,6 @@ msgstr "" "elrejtése minden táblánál." #: libraries/config/messages.inc.php:856 -#, fuzzy #| msgid "Show Last check timestamp" msgid "Show last check timestamp" msgstr "Utolsó ellenőrzés időbélyegének megjelenítése" @@ -7846,14 +7794,12 @@ msgid "Proxy password" msgstr "Proxy jelszó" #: libraries/config/messages.inc.php:967 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for " #| "import and export operations." msgid "Enable ZIP compression for import and export operations." msgstr "" -"A [a@https://en.wikipedia.org/wiki/Gzip]gzip[/a] tömörítés engedélyezése az " -"importálási és az exportálási műveletekhez." +"A ZIP tömörítés engedélyezése az importálási és exportálási műveletekhez." #: libraries/config/messages.inc.php:970 msgid "ZIP" @@ -8079,16 +8025,17 @@ msgstr "" #: libraries/controllers/server/ServerDatabasesController.php:571 #: libraries/controllers/server/ServerDatabasesController.php:577 -#, fuzzy #| msgid "Enable Statistics" msgid "Enable statistics" -msgstr "Statisztika engedélyezése" +msgstr "Statisztikák engedélyezése" #: libraries/controllers/server/ServerVariablesController.php:110 -#, fuzzy, php-format +#, php-format #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view server variables and settings. %s" -msgstr "Nincs elegendő jogosultság a felhasználók megtekintéséhez." +msgstr "" +"Nincs elegendő jogosultság a kiszolgáló változóinak és beállításainak " +"megtekintéséhez. %s" #: libraries/controllers/server/ServerVariablesController.php:220 msgid "Setting variable failed" @@ -8319,10 +8266,9 @@ msgid "Custom - display all possible options" msgstr "Egyedi - minden lehetséges opció megjelenítése" #: libraries/display_export.lib.php:336 -#, fuzzy #| msgid "Databases" msgid "Databases:" -msgstr "Adatbázisok" +msgstr "Adatbázisok:" #: libraries/display_export.lib.php:338 libraries/navigation/Navigation.php:195 msgid "Tables:" @@ -8536,7 +8482,6 @@ msgstr "" "lennie. Például: .sql.zip" #: libraries/display_import.lib.php:221 -#, fuzzy #| msgid "File to Import:" msgid "File to import:" msgstr "Az importálandó fájl:" @@ -8550,7 +8495,6 @@ msgid "File uploads are not allowed on this server." msgstr "A fájlfeltöltések nem engedélyezettek ezen a kiszolgálón." #: libraries/display_import.lib.php:281 -#, fuzzy #| msgid "Partial Import:" msgid "Partial import:" msgstr "Részleges importálás:" @@ -8574,17 +8518,13 @@ msgstr "" "jöhet, azonban meg tudja szakítani a tranzakciót.)" #: libraries/display_import.lib.php:312 -#, fuzzy #| msgid "" #| "Skip this number of queries (for SQL) or lines (for other formats), " #| "starting from the first one:" msgid "Skip this number of queries (for SQL) starting from the first one:" -msgstr "" -"Ennyi számú lekérdezés (SQL esetén) vagy sor (más formátumoknál) kihagyása " -"az elsőtől kezdve:" +msgstr "Ennyi számú lekérdezés (SQL esetén) kihagyása az elsőtől kezdve:" #: libraries/display_import.lib.php:342 -#, fuzzy #| msgid "Other Options:" msgid "Other options:" msgstr "Egyéb beállítások:" @@ -9145,14 +9085,13 @@ msgid "Edit next row" msgstr "Következő sor szerkesztése" #: libraries/insert_edit.lib.php:1604 -#, fuzzy #| msgid "" #| "Use TAB key to move from value to value, or CTRL+arrows to move anywhere" msgid "" "Use TAB key to move from value to value, or CTRL+arrows to move anywhere." msgstr "" "A TAB billentyűvel értékről értékre lépkedhet, vagy a CTRL+nyilakkal bárhová " -"léphet" +"léphet." #: libraries/insert_edit.lib.php:1641 libraries/replication_gui.lib.php:542 #: libraries/rte/rte_routines.lib.php:1588 @@ -9206,10 +9145,9 @@ msgid "Data only" msgstr "Csak az adatok" #: libraries/mult_submits.lib.php:352 -#, fuzzy #| msgid "Add AUTO_INCREMENT value" msgid "Add AUTO INCREMENT value" -msgstr "AUTO_INCREMENT érték hozzáadása" +msgstr "AUTO INCREMENT érték hozzáadása" #: libraries/mult_submits.lib.php:354 libraries/operations.lib.php:225 #: libraries/operations.lib.php:1288 @@ -9221,7 +9159,6 @@ msgstr "Megszorítás hozzáadása" #: libraries/operations.lib.php:953 libraries/operations.lib.php:1307 #: libraries/rte/rte_routines.lib.php:1000 #: templates/columns_definitions/table_fields_definitions.phtml:47 -#, fuzzy #| msgid "Adjust Privileges" msgid "Adjust privileges" msgstr "Jogosultságok módosítása" @@ -9470,10 +9407,9 @@ msgid "Log out" msgstr "Kilépés" #: libraries/navigation/NavigationHeader.php:172 -#, fuzzy #| msgid "Dumping data" msgid "Empty session data" -msgstr "Adatok kiíratása" +msgstr "Munkamenet-adatok kiürítése" #: libraries/navigation/NavigationHeader.php:188 msgid "phpMyAdmin documentation" @@ -9524,10 +9460,10 @@ msgid "Invalid class name \"%1$s\", using default of \"Node\"" msgstr "Érvénytelen osztálynév: \"%1$s\" \"Node\" alapértelmezése használva" #: libraries/navigation/NodeFactory.php:63 -#, fuzzy, php-format +#, php-format #| msgid "Could not add columns!" msgid "Could not load class \"%1$s\"" -msgstr "Nem sikerült oszlopokat hozzáadni!" +msgstr "Nem sikerült betölteni a(z) „%1$s” osztályt" #: libraries/navigation/nodes/Node.php:799 msgid "Expand/Collapse" @@ -9646,7 +9582,6 @@ msgstr "" "a táblában" #: libraries/normalization.lib.php:145 -#, fuzzy #| msgid "" #| "Select a column which can be split into more than one. (on select of 'no " #| "such column', it'll move to next step)" @@ -9654,8 +9589,8 @@ msgid "" "Select a column which can be split into more than one (on select of 'no such " "column', it'll move to next step)." msgstr "" -"Válasszon egy oszlopot, amelyet egynél több részre lehet szétvágni. (a " -"„nincs ilyen oszlop” választásakor a következő lépésre fog menni)" +"Válasszon egy oszlopot, amelyet egynél több részre lehet szétvágni (a „nincs " +"ilyen oszlop” választásakor a következő lépésre fog menni)." #: libraries/normalization.lib.php:152 normalization.php:17 msgid "Select one…" @@ -10531,10 +10466,10 @@ msgstr "" "(kevésbé hatékony, mivel az indexek a tábla létrehozása közben generálódnak)" #: libraries/plugins/export/ExportSql.php:293 -#, fuzzy, php-format +#, php-format #| msgid "Session value" msgid "%s value" -msgstr "Munkamenet értéke" +msgstr "%s érték" #: libraries/plugins/export/ExportSql.php:327 msgid "" @@ -10627,10 +10562,9 @@ msgstr "" "kiírását és újratölti a különböző időzónában lévő szerverek között)" #: libraries/plugins/export/ExportSql.php:515 -#, fuzzy #| msgid "It appears your database uses functions;" msgid "It appears your database uses routines;" -msgstr "Úgy tűnik, az adatbázis függvényeket használ;" +msgstr "Úgy tűnik, az adatbázis rutinokat használ;" #: libraries/plugins/export/ExportSql.php:518 #: libraries/plugins/export/ExportSql.php:1540 @@ -10643,16 +10577,16 @@ msgid "Metadata" msgstr "Metaadat" #: libraries/plugins/export/ExportSql.php:1076 -#, fuzzy, php-format +#, php-format #| msgid "Metadata for %s" msgid "Metadata for table %s" -msgstr "%s metaadatai" +msgstr "A(z) %s tábla metaadatai" #: libraries/plugins/export/ExportSql.php:1083 -#, fuzzy, php-format +#, php-format #| msgid "Metadata for %s" msgid "Metadata for database %s" -msgstr "%s metaadatai" +msgstr "A(z) %s adatbázis metaadatai" #: libraries/plugins/export/ExportSql.php:1415 #: libraries/plugins/schema/pdf/PdfRelationSchema.php:603 @@ -10920,10 +10854,9 @@ msgstr "Rács megjelenítése" #: libraries/plugins/schema/SchemaPdf.php:93 #: templates/database/structure/print_view_data_dictionary_link.phtml:6 -#, fuzzy #| msgid "Data Dictionary" msgid "Data dictionary" -msgstr "Adat szótár" +msgstr "Adatszótár" #: libraries/plugins/schema/SchemaPdf.php:99 msgid "Order of the tables" @@ -11019,7 +10952,6 @@ msgstr "" "kell állítania." #: libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php:28 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the column data " #| "via standard input. Returns the standard output of the application. The " @@ -11045,14 +10977,14 @@ msgid "" msgstr "" "CSAK LINUXHOZ: Elindít egy külső alkalmazást, amely hagyományos bemeneten " "keresztül kapja az oszlopadatokat. A sztenderd eredményt adja válaszul. " -"Alapértelmezés a Tidy rendezett HTML kódja. Biztonsági okokból a libraries/" -"plugins/transformations/output/Text_Plain_External.class.php fájlt kézzel " -"kell szerkeszteni, és beírni a hozzáférhető eszközök neveit. Ekkor az első " -"lehetőség a használni kívánt program száma, a második lehetőség a program " -"paraméterei. Ha a harmadik lehetőség 1-re állított, akkor konvertálja a " -"kimenetet a htmlspecialchars() eljárással (alapértelmezés: 1). Ha a negyedik " -"lehetőség 1-re van állítva, akkor megakadályozza a beágyazást, és " -"biztosítja, hogy a kimenet egysoros legyen (alapértelmezés: 1)." +"Alapértelmezés a Tidy rendezett HTML kódja. Biztonsági okokból a " +"libraries/plugins/transformations/output/Text_Plain_External.php fájlt " +"kézzel kell szerkeszteni, és beírni a hozzáférhető eszközök neveit. Ekkor az " +"első lehetőség a használni kívánt program száma, a második lehetőség a " +"program paraméterei. Ha a harmadik lehetőség 1-re állított, akkor " +"konvertálja a kimenetet a htmlspecialchars() eljárással (alapértelmezés: 1). " +"Ha a negyedik lehetőség 1-re van állítva, akkor megakadályozza a beágyazást, " +"és biztosítja, hogy a kimenet egysoros legyen (alapértelmezés: 1)." #: libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php:28 msgid "" @@ -11684,10 +11616,9 @@ msgid "Re-type" msgstr "Újraírás" #: libraries/replication_gui.lib.php:879 -#, fuzzy #| msgid "Generate password" msgid "Generate password:" -msgstr "Jelszó generálása" +msgstr "Jelszó előállítása:" #: libraries/replication_gui.lib.php:917 msgid "Replication started successfully." @@ -12145,10 +12076,9 @@ msgid "There are no events to display." msgstr "Nincsen megjeleníthető esemény." #: libraries/select_server.lib.php:40 libraries/select_server.lib.php:45 -#, fuzzy #| msgid "Current server" msgid "Current server:" -msgstr "Jelenlegi szerver" +msgstr "Jelenlegi kiszolgáló:" #: libraries/server_common.lib.php:24 msgid "Server variables and settings" @@ -12342,10 +12272,9 @@ msgid "User group" msgstr "Felhasználói csoport" #: libraries/server_privileges.lib.php:730 -#, fuzzy #| msgid "Requires SSL-encrypted connections." msgid "Does not require SSL-encrypted connections." -msgstr "SSL-lel titkosított kapcsolatokat igényel." +msgstr "Nem igényel SSL-lel titkosított kapcsolatokat." #: libraries/server_privileges.lib.php:751 msgid "Requires SSL-encrypted connections." @@ -12417,10 +12346,9 @@ msgstr "Korlátozza a felhasználó egyidejű kapcsolatainak számát." #: libraries/server_privileges.lib.php:3355 #: libraries/server_privileges.lib.php:4630 #: templates/privileges/edit_routine_privileges.phtml:11 -#, fuzzy #| msgid "Routines" msgid "Routine" -msgstr "Eljárások" +msgstr "Eljárás" #: libraries/server_privileges.lib.php:1035 #: libraries/server_privileges.lib.php:1409 server_privileges.php:72 @@ -12431,16 +12359,14 @@ msgstr "" "hozzáadását." #: libraries/server_privileges.lib.php:1042 -#, fuzzy #| msgid "Allows altering and dropping stored routines." msgid "Allows altering and dropping this routine." -msgstr "Engedélyezi a tárolt eljárások módosítását és eldobását." +msgstr "Engedélyezi az eljárás módosítását és eldobását." #: libraries/server_privileges.lib.php:1047 -#, fuzzy #| msgid "Allows executing stored routines." msgid "Allows executing this routine." -msgstr "Engedélyezi a tárolt eljárások végrehajtását." +msgstr "Engedélyezi az eljárás végrehajtását." #: libraries/server_privileges.lib.php:1097 #: libraries/server_privileges.lib.php:1266 @@ -12483,22 +12409,19 @@ msgid "Allows dropping tables." msgstr "Engedélyezi a táblák eldobását." #: libraries/server_privileges.lib.php:1541 -#, fuzzy #| msgid "Cookie authentication" msgid "Native MySQL authentication" -msgstr "Cookie hitelesítés" +msgstr "Natív MySQL hitelesítés" #: libraries/server_privileges.lib.php:1543 -#, fuzzy #| msgid "Signon authentication" msgid "SHA256 password authentication" -msgstr "Signon hitelesítés" +msgstr "SHA256 jelszavas hitelesítés" #: libraries/server_privileges.lib.php:1557 -#, fuzzy #| msgid "Cookie authentication" msgid "Native MySQL Authentication" -msgstr "Cookie hitelesítés" +msgstr "Natív MySQL hitelesítés" #: libraries/server_privileges.lib.php:1611 #: libraries/server_privileges.lib.php:3134 @@ -12540,10 +12463,9 @@ msgid "Authentication Plugin" msgstr "Hitelesítés bővítmény" #: libraries/server_privileges.lib.php:1835 -#, fuzzy #| msgid "Password Hashing:" msgid "Password Hashing Method" -msgstr "Jelszó hash:" +msgstr "Jelszó-titkosítási eljárás" #: libraries/server_privileges.lib.php:2119 #, php-format @@ -12626,10 +12548,9 @@ msgid "table-specific" msgstr "tábla-specifikus" #: libraries/server_privileges.lib.php:2905 -#, fuzzy #| msgid "Edit privileges:" msgid "Edit privileges" -msgstr "Jogok szerkesztése:" +msgstr "Jogosultságok szerkesztése" #: libraries/server_privileges.lib.php:2908 msgid "Revoke" @@ -12668,10 +12589,9 @@ msgstr "Új felhasználói fiók létrehozása ezekkel a jogokkal, és …" #: libraries/server_privileges.lib.php:3354 #: templates/privileges/edit_routine_privileges.phtml:12 -#, fuzzy #| msgid "Column-specific privileges" msgid "Routine-specific privileges" -msgstr "Oszlopspecifikus jogok" +msgstr "Eljárásra jellemző jogosultságok" #: libraries/server_privileges.lib.php:3739 msgid "Remove selected user accounts" @@ -13040,7 +12960,6 @@ msgid "Clear series" msgstr "Sorozatok törlése" #: libraries/server_status_monitor.lib.php:229 -#, fuzzy #| msgid "Series in Chart:" msgid "Series in chart:" msgstr "Sorozatok a diagramban:" @@ -13941,16 +13860,14 @@ msgid "An opening bracket was expected." msgstr "Nyitó kapcsos zárójelet vártunk." #: libraries/sql-parser/src/Components/CreateDefinition.php:225 -#, fuzzy #| msgid "Table name template" msgid "A symbol name was expected!" -msgstr "Táblanév sablon" +msgstr "Egy szimbólumnév várt!" #: libraries/sql-parser/src/Components/CreateDefinition.php:257 -#, fuzzy #| msgid "No tables selected." msgid "A comma or a closing bracket was expected." -msgstr "Nincsenek táblák kiválasztva." +msgstr "Egy vessző vagy egy záró zárójel várt." #: libraries/sql-parser/src/Components/CreateDefinition.php:273 msgid "A closing bracket was expected." @@ -13962,10 +13879,9 @@ msgstr "Felismerhetetlen adattípus." #: libraries/sql-parser/src/Components/Expression.php:249 #: libraries/sql-parser/src/Components/Expression.php:392 -#, fuzzy #| msgid "No tables selected." msgid "An alias was expected." -msgstr "Nincsenek táblák kiválasztva." +msgstr "Egy álnév várt." #: libraries/sql-parser/src/Components/Expression.php:330 #: libraries/sql-parser/src/Components/Expression.php:349 @@ -13978,10 +13894,9 @@ msgid "Unexpected dot." msgstr "Váratlan pont." #: libraries/sql-parser/src/Components/ExpressionArray.php:99 -#, fuzzy #| msgid "No versions selected." msgid "An expression was expected." -msgstr "Nincsenek verziók kijelölve." +msgstr "Egy kifejezés várt." #: libraries/sql-parser/src/Components/Limit.php:91 #: libraries/sql-parser/src/Components/Limit.php:113 @@ -13994,26 +13909,23 @@ msgid "This option conflicts with \"%1$s\"." msgstr "Ez a lehetőség ütközik ezzel: „%1$s”." #: libraries/sql-parser/src/Components/RenameOperation.php:102 -#, fuzzy #| msgid "The number of tables that are open." msgid "The old name of the table was expected." -msgstr "A megnyitott táblák száma." +msgstr "A tábla régi neve várt." #: libraries/sql-parser/src/Components/RenameOperation.php:112 msgid "Keyword \"TO\" was expected." msgstr "\"TO\" kulcsszavat vártunk." #: libraries/sql-parser/src/Components/RenameOperation.php:128 -#, fuzzy #| msgid "The number of tables that are open." msgid "The new name of the table was expected." -msgstr "A megnyitott táblák száma." +msgstr "A tábla új neve várt." #: libraries/sql-parser/src/Components/RenameOperation.php:146 -#, fuzzy #| msgid "Template was deleted." msgid "A rename operation was expected." -msgstr "A sablon törölve lett." +msgstr "Egy átnevezési művelet várt." #: libraries/sql-parser/src/Lexer.php:267 msgid "Unexpected character." @@ -14029,22 +13941,20 @@ msgid "Expected delimiter." msgstr "Határolót vártunk." #: libraries/sql-parser/src/Lexer.php:784 -#, fuzzy, php-format +#, php-format #| msgid "Event %1$s has been created." msgid "Ending quote %1$s was expected." -msgstr "A(z) %1$s esemény létrejött." +msgstr "A(z) %1$s záró idézés várt." #: libraries/sql-parser/src/Lexer.php:824 -#, fuzzy #| msgid "Table name template" msgid "Variable name was expected." -msgstr "Táblanév sablon" +msgstr "Változónév várt." #: libraries/sql-parser/src/Parser.php:431 -#, fuzzy #| msgid "at beginning of table" msgid "Unexpected beginning of statement." -msgstr "a tábla elejénél" +msgstr "Váratlan utasítás kezdet." #: libraries/sql-parser/src/Parser.php:450 msgid "Unrecognized statement type." @@ -14059,33 +13969,30 @@ msgid "Unexpected token." msgstr "Váratlan jelsor." #: libraries/sql-parser/src/Statement.php:284 -#, fuzzy #| msgid "No transaction was previously started." msgid "This type of clause was previously parsed." -msgstr "Nem volt korábban elindított tranzakció." +msgstr "A kikötés ezen típusa korábban fel lett dolgozva." #: libraries/sql-parser/src/Statement.php:312 -#, fuzzy #| msgid "A new statement was found, but no delimiter between them." msgid "" "A new statement was found, but no delimiter between it and the previous one." -msgstr "Egy új utasítás található, de nincs elválasztó köztük." +msgstr "" +"Egy új utasítás található, de nincs elválasztó közte és az előző között." #: libraries/sql-parser/src/Statement.php:332 msgid "Unrecognized keyword." msgstr "Felismerhetetlen kulcsszó." #: libraries/sql-parser/src/Statements/CreateStatement.php:368 -#, fuzzy #| msgid "The number of tables that are open." msgid "The name of the entity was expected." -msgstr "A megnyitott táblák száma." +msgstr "Az entitás neve várt." #: libraries/sql-parser/src/Statements/CreateStatement.php:407 -#, fuzzy #| msgid "Template was deleted." msgid "At least one column definition was expected." -msgstr "A sablon törölve lett." +msgstr "Legalább egy oszlopmeghatározás várt." #: libraries/sql-parser/src/Statements/CreateStatement.php:518 msgid "A \"RETURNS\" keyword was expected." @@ -14561,16 +14468,14 @@ msgstr "" "cserélni, használja a \"Jelszócsere\" fület." #: server_status.php:35 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view server status." -msgstr "Nincs elegendő jogosultság a felhasználók megtekintéséhez." +msgstr "Nincs elegendő jogosultság a kiszolgáló állapotának megtekintéséhez." #: server_status_advisor.php:33 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view the advisor." -msgstr "Nincs elegendő jogosultság a felhasználók megtekintéséhez." +msgstr "Nincs elegendő jogosultság a tanácsadó megtekintéséhez." #: server_status_processes.php:33 #, php-format @@ -14586,16 +14491,15 @@ msgstr "" "befejeződött." #: server_status_queries.php:42 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view query statistics." -msgstr "Nincs elegendő jogosultság a felhasználók megtekintéséhez." +msgstr "" +"Nincs elegendő jogosultság a lekérdezés statisztikáinak megtekintéséhez." #: server_status_variables.php:52 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view status variables." -msgstr "Nincs elegendő jogosultság a felhasználók megtekintéséhez." +msgstr "Nincs elegendő jogosultság az állapotváltozók megtekintéséhez." #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:289 msgid "Download" @@ -14656,10 +14560,9 @@ msgstr "" "könyvtárat." #: setup/frames/index.inc.php:132 -#, fuzzy #| msgid "Configuration saved." msgid "Configuration not saved!" -msgstr "Beállítások elmentve." +msgstr "A beállítások nincsenek elmentve!" #: setup/frames/index.inc.php:147 setup/frames/menu.inc.php:19 msgid "Overview" @@ -14781,7 +14684,7 @@ msgstr "Hibás adat" #: setup/validate.php:30 #, php-format msgid "Wrong data or no validation for %s" -msgstr "" +msgstr "Hibás adatok vagy nincs ellenőrzés ehhez: %s" #: tbl_create.php:30 tbl_get_field.php:26 #, php-format @@ -14807,10 +14710,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "Sor: %1$s, oszlop: %2$s, hiba: %3$s" #: tbl_row_action.php:71 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "Nincsenek verziók kijelölve." +msgstr "Nincs sor kijelölve." #: tbl_tracking.php:35 #, php-format @@ -14843,10 +14745,9 @@ msgid "Table name" msgstr "Tábla neve" #: templates/columns_definitions/column_definitions_form.phtml:65 -#, fuzzy #| msgid "Add column(s)" msgid "column(s)" -msgstr "Oszlop(ok) hozzáadása" +msgstr "oszlop(ok)" #: templates/columns_definitions/column_definitions_form.phtml:92 msgid "Collation:" @@ -14897,93 +14798,79 @@ msgid "after %s" msgstr "%s után" #: templates/columns_definitions/partitions.phtml:9 -#, fuzzy #| msgid "partitioned" msgid "Partition by:" -msgstr "particionált" +msgstr "Particionálás ez alapján:" #: templates/columns_definitions/partitions.phtml:25 #: templates/columns_definitions/partitions.phtml:54 -#, fuzzy #| msgid "Values for column %s" msgid "Expression or column list" -msgstr "„%s” oszlop értékei" +msgstr "Kifejezés vagy oszloplista" #: templates/columns_definitions/partitions.phtml:30 -#, fuzzy #| msgid "Partition %s" msgid "Partitions:" -msgstr "%s partíció" +msgstr "Partíciók:" #: templates/columns_definitions/partitions.phtml:38 -#, fuzzy #| msgid "partitioned" msgid "Subpartition by:" -msgstr "particionált" +msgstr "Alparticionálás ez alapján:" #: templates/columns_definitions/partitions.phtml:59 -#, fuzzy #| msgid "partitioned" msgid "Subpartitions:" -msgstr "particionált" +msgstr "Alpartíciók:" #: templates/columns_definitions/partitions.phtml:71 -#, fuzzy #| msgid "Partition %s" msgid "Partition" -msgstr "%s partíció" +msgstr "Partíció" #: templates/columns_definitions/partitions.phtml:73 -#, fuzzy #| msgid "Value" msgid "Values" -msgstr "Érték" +msgstr "Értékek" #: templates/columns_definitions/partitions.phtml:76 -#, fuzzy #| msgid "partitioned" msgid "Subpartition" -msgstr "particionált" +msgstr "Alpartíció" #: templates/columns_definitions/partitions.phtml:78 msgid "Engine" msgstr "Motor" #: templates/columns_definitions/partitions.phtml:80 -#, fuzzy #| msgid "Data home directory" msgid "Data directory" -msgstr "Adatok kezdőkönyvtára" +msgstr "Adatkönyvtár" #: templates/columns_definitions/partitions.phtml:81 -#, fuzzy #| msgid "Save directory" msgid "Index directory" -msgstr "Mentési könyvtár" +msgstr "Indexkönyvtár" #: templates/columns_definitions/partitions.phtml:82 -#, fuzzy #| msgid "Matched rows:" msgid "Max rows" -msgstr "Illeszkedő sorok:" +msgstr "Sorok legnagyobb száma" #: templates/columns_definitions/partitions.phtml:83 -#, fuzzy #| msgid "rows" msgid "Min rows" -msgstr "Tartalom" +msgstr "Sorok legkisebb száma" #: templates/columns_definitions/partitions.phtml:84 -#, fuzzy #| msgid "Table search" msgid "Table space" -msgstr "Táblakeresés" +msgstr "Táblaterület" #: templates/columns_definitions/partitions.phtml:85 -#, fuzzy #| msgid "User group" msgid "Node group" -msgstr "Felhasználói csoport" +msgstr "Csomópontcsoport" #: templates/columns_definitions/table_fields_definitions.phtml:16 msgid "" @@ -15075,10 +14962,9 @@ msgid "Operator" msgstr "Operátor" #: templates/database/designer/database_tables.phtml:29 -#, fuzzy #| msgid "Move columns" msgid "Show/hide columns" -msgstr "Oszlopok mozgatása" +msgstr "Oszlopok megjelenítése vagy elrejtése" #: templates/database/designer/database_tables.phtml:40 msgid "See table structure" @@ -15268,10 +15154,9 @@ msgid "Check tables having overhead" msgstr "A felülírott táblák kijelölése" #: templates/database/structure/check_all_tables.phtml:10 -#, fuzzy #| msgid "No tables" msgid "Copy table" -msgstr "Nincs tábla" +msgstr "Tábla másolása" #: templates/database/structure/check_all_tables.phtml:11 msgid "Show create" @@ -15350,7 +15235,6 @@ msgid "Tracking is not active." msgstr "Nyomkövetés inaktív." #: templates/error/report_form.phtml:7 -#, fuzzy #| msgid "" #| "phpMyAdmin has encountered an error. We have collected data about this " #| "error as well as information about relevant configuration settings to " @@ -15360,16 +15244,17 @@ msgid "" "about relevant configuration settings. It will be sent to the phpMyAdmin " "team for debugging the error." msgstr "" -"A phpMyAdmin hibába ütközött. Összegyűjtöttük az adatokat erről a hibáról, " -"valamint a hozzá tartozó konfigurációs beállításokkal kapcsolatos " -"információkról, hogy elküldje a phpMyAdmin csapatnak a probléma " -"megtalálásának segítségéül." +"Ez a jelentés automatikusan felveszi a hibával kapcsolatos adatokat és a " +"vonatkozó konfigurációs beállítások információit. El lesznek küldve a " +"phpMyAdmin csapatának a hiba kereséséhez." #: templates/error/report_form.phtml:14 msgid "" "Can you tell us the steps leading to this error? It decisively helps in " "debugging:" msgstr "" +"Meg tudja mondani nekünk azokat a lépéseket, amelyek ehhez a hibához " +"vezettek? Ez határozottan segít a hibakeresésben:" #: templates/error/report_form.phtml:21 msgid "You may examine the data in the error report:" @@ -15394,10 +15279,9 @@ msgstr "" "szövegkonstansként lehessen őket használni." #: templates/privileges/add_privileges_routine.phtml:3 -#, fuzzy #| msgid "Add privileges on the following table:" msgid "Add privileges on the following routine:" -msgstr "Jogok hozzáadása a következő táblán:" +msgstr "Jogosultságok hozzáadása a következő eljáráshoz:" #: templates/privileges/add_privileges_table.phtml:3 msgid "Add privileges on the following table:" @@ -15426,10 +15310,9 @@ msgid "Check privileges for database \"%s\"." msgstr "A(z) \"%s\" adatbázis jogainak ellenőrzése." #: templates/server/databases/table_row.phtml:62 -#, fuzzy #| msgid "Check Privileges" msgid "Check privileges" -msgstr "Jogok ellenőrzése" +msgstr "Jogosultságok ellenőrzése" #: templates/server/plugins/section.phtml:8 msgid "Plugin" @@ -15505,10 +15388,9 @@ msgid "Stacked" msgstr "Halmozott" #: templates/table/chart/tbl_chart.phtml:53 -#, fuzzy #| msgid "Chart title" msgid "Chart title:" -msgstr "Diagramcím" +msgstr "Diagramcím:" #: templates/table/chart/tbl_chart.phtml:58 msgid "X-Axis:" @@ -15774,53 +15656,45 @@ msgstr "a tábla elejénél" #: templates/table/structure/display_partitions.phtml:5 #: templates/table/structure/display_structure.phtml:183 -#, fuzzy #| msgid "Partition %s" msgid "Partitions" -msgstr "%s partíció" +msgstr "Partíciók" #: templates/table/structure/display_partitions.phtml:9 -#, fuzzy #| msgid "No index defined!" msgid "No partitioning defined!" -msgstr "Nincs meghatározott index!" +msgstr "Nincs particionálás meghatározva!" #: templates/table/structure/display_partitions.phtml:12 -#, fuzzy #| msgid "partitioned" msgid "Partitioned by:" -msgstr "particionált" +msgstr "Particionálva ez alapján:" #: templates/table/structure/display_partitions.phtml:17 -#, fuzzy #| msgid "partitioned" msgid "Sub partitioned by:" -msgstr "particionált" +msgstr "Alparticionálva ez alapján:" #: templates/table/structure/display_partitions.phtml:30 -#, fuzzy #| msgid "Row length" msgid "Data length" -msgstr "Sor hossza" +msgstr "Adathossz" #: templates/table/structure/display_partitions.phtml:31 -#, fuzzy #| msgid "Row length" msgid "Index length" -msgstr "Sor hossza" +msgstr "Indexhossz" #: templates/table/structure/display_partitions.phtml:135 -#, fuzzy #| msgid "partitioned" msgid "Partition table" -msgstr "particionált" +msgstr "Partíciós tábla" #: templates/table/structure/display_partitions.phtml:138 #: templates/table/structure/partition_definition_form.phtml:7 -#, fuzzy #| msgid "Remove partitioning" msgid "Edit partitioning" -msgstr "Particionálás eltávolítása" +msgstr "Particionálás szerkesztése" #: templates/table/structure/display_structure.phtml:129 view_create.php:200 msgid "Edit view" @@ -15914,10 +15788,9 @@ msgid "Description" msgstr "Leírás" #: url.php:41 -#, fuzzy #| msgid "Taking you to next step…" msgid "Taking you to the target site." -msgstr "Átvitel a következő lépésre…" +msgstr "Átvitel a céloldalra." #: user_password.php:34 msgid "You don't have sufficient privileges to be here right now!" @@ -15928,14 +15801,13 @@ msgid "The profile has been updated." msgstr "A profil frissítése megtörtént." #: user_password.php:124 -#, fuzzy #| msgid "Password Hashing:" msgid "Password is too long!" -msgstr "Jelszó hash:" +msgstr "A jelszó túl hosszú!" #: view_create.php:44 msgid "View name can not be empty" -msgstr "" +msgstr "A nézet neve nem lehet üres" #: view_create.php:247 msgid "VIEW name" @@ -16145,10 +16017,9 @@ msgid "Version less than 5.5.8 (the first GA release of 5.5)." msgstr "A verzió kisebb 5.5.8-nál." #: libraries/advisory_rules.txt:118 -#, fuzzy #| msgid "You should upgrade, to a stable version of MySQL 5.5" msgid "You should upgrade, to a stable version of MySQL 5.5." -msgstr "Frissítenie kellene a MySQL 5.5 stabil verziójára" +msgstr "Frissítenie kellene a MySQL 5.5 stabil verziójára." #: libraries/advisory_rules.txt:121 libraries/advisory_rules.txt:128 msgid "Distribution" @@ -16455,7 +16326,6 @@ msgid "Too many sorts are causing temporary tables." msgstr "Túl sok rendezés ideiglenes táblák létrejöttét okozza." #: libraries/advisory_rules.txt:208 libraries/advisory_rules.txt:215 -#, fuzzy #| msgid "" #| "Consider increasing {sort_buffer_size} and/or {read_rnd_buffer_size}, " #| "depending on your system memory limits" @@ -16463,9 +16333,9 @@ msgid "" "Consider increasing {sort_buffer_size} and/or {read_rnd_buffer_size}, " "depending on your system memory limits." msgstr "" -"Fontolja meg a {sort_buffer_size} és/vagy a {read_rnd_buffer_size} " -"növelését, attól függően, hogy a rendszerben milyen memóriára vonatkozó " -"korlátozások vannak" +"Fontolja meg a {sort_buffer_size} és/vagy a {read_rnd_buffer_size} növelését " +"attól függően, hogy a rendszeren milyen memóriára vonatkozó korlátozások " +"vannak." #: libraries/advisory_rules.txt:209 #, php-format @@ -16497,7 +16367,6 @@ msgid "There are lots of rows being sorted." msgstr "Sok sor lett rendezve." #: libraries/advisory_rules.txt:222 -#, fuzzy #| msgid "" #| "While there is nothing wrong with a high amount of row sorting, you might " #| "want to make sure that the queries which require a lot of sorting use " @@ -16512,7 +16381,7 @@ msgstr "" "Bár nincs baj a nagy mennyiségű sorba rendezéssel, érdemes megbizonyosodni " "afelől, hogy a lekérdezések, amelyek sok rendezést igényelnek, indexelt " "oszlopokat használnak az ORDER BY kifejezésben, mivel így sokkal gyorsabb a " -"rendezés" +"rendezés." #: libraries/advisory_rules.txt:223 #, php-format @@ -16528,7 +16397,6 @@ msgid "There are too many joins without indexes." msgstr "Túl sok kapcsolat van indexek nélkül." #: libraries/advisory_rules.txt:230 -#, fuzzy #| msgid "" #| "This means that joins are doing full table scans. Adding indexes for the " #| "columns being used in the join conditions will greatly speed up table " @@ -16539,7 +16407,7 @@ msgid "" msgstr "" "Ez azt jelenti, hogy az egyesítések teljes táblaletapogatást végeznek. Az " "egyesítés feltételeiben használt oszlopokhoz való indexek hozzáadásával " -"nagyban felgyorsíthatók a táblaegyesítések" +"nagyban felgyorsíthatók a táblaegyesítések." #: libraries/advisory_rules.txt:231 #, php-format @@ -16968,13 +16836,11 @@ msgid "Slow launch time" msgstr "Lassú indítási idő" #: libraries/advisory_rules.txt:368 -#, fuzzy #| msgid "Slow_launch_time is above 2s" msgid "Slow_launch_time is above 2s." -msgstr "Slow_launch_time 2s felett van" +msgstr "Slow_launch_time 2s fölött van." #: libraries/advisory_rules.txt:369 -#, fuzzy #| msgid "" #| "Set {slow_launch_time} to 1s or 2s to correctly count threads that are " #| "slow to launch" @@ -16983,7 +16849,7 @@ msgid "" "to launch." msgstr "" "Állítsa {slow_launch_time} értékét 1s vagy 2s-re, hogy pontosan " -"megszámolható legyen az indításhoz lassú szálak száma" +"megszámolható legyen az indításhoz lassú szálak száma." #: libraries/advisory_rules.txt:370 #, php-format From d008580ce51843379344343fdec4de907ffaedb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Sun, 4 Sep 2016 18:19:46 +0000 Subject: [PATCH 04/41] Translated using Weblate (Hungarian) Currently translated at 100.0% (3219 of 3219 strings) [CI skip] --- po/hu.po | 513 ++++++++++++++++++++----------------------------------- 1 file changed, 184 insertions(+), 329 deletions(-) diff --git a/po/hu.po b/po/hu.po index 802bf50e73..805db70aba 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4,19 +4,19 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:28+0200\n" -"PO-Revision-Date: 2016-06-08 14:42+0000\n" -"Last-Translator: Gergő Felföldi \n" -"Language-Team: Hungarian \n" +"PO-Revision-Date: 2016-09-04 18:19+0000\n" +"Last-Translator: Balázs Úr \n" +"Language-Team: Hungarian " +"\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.7-dev\n" +"X-Generator: Weblate 2.8\n" #: changelog.php:38 license.php:33 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The %s file is not available on this system, please visit www.phpmyadmin." #| "net for more information." @@ -24,8 +24,8 @@ msgid "" "The %s file is not available on this system, please visit %s for more " "information." msgstr "" -"A(z) %s fájl nem elérhető ezen a rendszeren, keresse fel a www.phpmyadmin." -"net oldalt további információkért." +"A(z) %s fájl nem érhető el ezen a rendszeren, keresse fel a %s oldalt a " +"további információkért." #: db_central_columns.php:107 msgid "The central list of columns for the current database is empty." @@ -777,7 +777,7 @@ msgstr "" #: index.php:529 msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "A titkos jelmondat a beállításokban (blowfish_secret) túl rövid." #: index.php:543 msgid "" @@ -844,6 +844,8 @@ msgstr "Ön a teljes adatbázis MEGSEMMISÍTÉSÉRE készül!" #: js/messages.php:53 msgid "Cannot rename database to the same name. Change the name and try again" msgstr "" +"Nem lehet átnevezni az adatbázist a séma nevére. Változtassa meg a nevet, és " +"próbálja újra" #: js/messages.php:55 msgid "You are about to DESTROY a complete table!" @@ -961,7 +963,6 @@ msgstr "" "adatokat?" #: js/messages.php:103 -#, fuzzy #| msgid "" #| "Through this operation, MySQL attempts to map the data values between " #| "collations. If the character sets are incompatible, there may be data " @@ -1210,19 +1211,16 @@ msgid "Total swap" msgstr "Teljes lapozófájl" #: js/messages.php:197 -#, fuzzy #| msgid "Cached Swap" msgid "Cached swap" msgstr "Gyorsítótárazott lapozófájl" #: js/messages.php:198 -#, fuzzy #| msgid "Used Swap" msgid "Used swap" msgstr "Használt lapozófájl" #: js/messages.php:199 -#, fuzzy #| msgid "Free Swap" msgid "Free swap" msgstr "Szabad lapozófájl" @@ -1640,7 +1638,6 @@ msgid "No files available on server for import!" msgstr "Nincs elérhető fájl a kiszolgálón az importáláshoz!" #: js/messages.php:336 -#, fuzzy #| msgid "Analyse Query" msgid "Analyse query" msgstr "Lekérdezés elemzése" @@ -1711,19 +1708,16 @@ msgid "Loading…" msgstr "Betöltés…" #: js/messages.php:363 -#, fuzzy #| msgid "Request Aborted!!" msgid "Request aborted!!" msgstr "Kérés megszakítva!" #: js/messages.php:364 -#, fuzzy #| msgid "Processing Request" msgid "Processing request" msgstr "Kérés feldolgozása" #: js/messages.php:365 -#, fuzzy #| msgid "Request Failed!!" msgid "Request failed!!" msgstr "A kérés sikertelen!" @@ -1749,13 +1743,11 @@ msgid "No databases selected." msgstr "Nincs kiválasztott adatbázis." #: js/messages.php:370 -#, fuzzy #| msgid "Dropping Column" msgid "Dropping column" -msgstr "Oszlop törlése" +msgstr "Oszlop eldobása" #: js/messages.php:371 -#, fuzzy #| msgid "Add primary key" msgid "Adding primary key" msgstr "Elsődleges kulcs hozzáadása" @@ -1775,22 +1767,19 @@ msgid "Click to dismiss this notification" msgstr "Kattintson az értesítés elutasításához" #: js/messages.php:376 -#, fuzzy #| msgid "Renaming Databases" msgid "Renaming databases" -msgstr "Adatbázis(ok) átnevezése" +msgstr "Adatbázisok átnevezése" #: js/messages.php:377 -#, fuzzy #| msgid "Copying Database" msgid "Copying database" msgstr "Adatbázis másolása" #: js/messages.php:378 -#, fuzzy #| msgid "Changing Charset" msgid "Changing charset" -msgstr "Karakterkészlet változtatása" +msgstr "Karakterkészlet megváltoztatása" #: js/messages.php:382 libraries/Util.php:3233 msgid "Enable foreign key checks" @@ -2184,7 +2173,6 @@ msgid "Geometry" msgstr "Geometria" #: js/messages.php:520 -#, fuzzy #| msgid "Inner Ring" msgid "Inner ring" msgstr "Belső gyűrű" @@ -2442,13 +2430,11 @@ msgid "More" msgstr "Több" #: js/messages.php:636 -#, fuzzy #| msgid "Show Panel" msgid "Show panel" msgstr "Panel megjelenítése" #: js/messages.php:637 -#, fuzzy #| msgid "Hide Panel" msgid "Hide panel" msgstr "Panel elrejtése" @@ -2493,13 +2479,11 @@ msgid "Create view" msgstr "Nézet létrehozása" #: js/messages.php:658 -#, fuzzy #| msgid "Send error reports" msgid "Send error report" -msgstr "Hibajelentések küldése" +msgstr "Hibajelentés küldése" #: js/messages.php:659 -#, fuzzy #| msgid "Submit Error Report" msgid "Submit error report" msgstr "Hibajelentés beküldése" @@ -2511,13 +2495,11 @@ msgid "" msgstr "Végzetes JavaScript hiba történt. Szeretne hibajelentést küldeni?" #: js/messages.php:663 -#, fuzzy #| msgid "Change Report Settings" msgid "Change report settings" -msgstr "Jelentés beállítások megváltoztatása" +msgstr "Jelentés beállításainak megváltoztatása" #: js/messages.php:664 -#, fuzzy #| msgid "Show Report Details" msgid "Show report details" msgstr "Jelentés részleteinek megjelenítése" @@ -2608,22 +2590,19 @@ msgstr "" "módú böngészés okozza." #: js/messages.php:716 -#, fuzzy #| msgid "Copy database to" msgid "Copy tables to" -msgstr "Adatbázis másolása ide" +msgstr "Táblák másolása ide" #: js/messages.php:717 -#, fuzzy #| msgid "Add table prefix:" msgid "Add table prefix" -msgstr "Tábla előtag hozzáadása:" +msgstr "Táblaelőtag hozzáadása" #: js/messages.php:718 -#, fuzzy #| msgid "Replace table prefix" msgid "Replace table with prefix" -msgstr "Tábla előtagjának lecserélése" +msgstr "Tábla cseréje előtaggal" #: js/messages.php:719 templates/database/structure/check_all_tables.phtml:29 msgid "Copy table with prefix" @@ -3114,7 +3093,7 @@ msgstr "Koreai" #: libraries/Charsets.php:313 msgid "Burmese" -msgstr "" +msgstr "Burmai" #: libraries/Charsets.php:316 msgid "Persian" @@ -3228,22 +3207,19 @@ msgid "unknown" msgstr "ismeretlen" #: libraries/Charsets.php:460 -#, fuzzy #| msgid "Collation" msgid "binary collation" -msgstr "Illesztés" +msgstr "bináris egyeztetés" #: libraries/Charsets.php:467 -#, fuzzy #| msgid "case-insensitive" msgid "case-insensitive collation" -msgstr "a kis- és nagybetű nem különbözik" +msgstr "kis- és nagybetű érzéketlen egyeztetés" #: libraries/Charsets.php:469 -#, fuzzy #| msgid "case-sensitive" msgid "case-sensitive collation" -msgstr "a kis- és nagybetű különbözik" +msgstr "kis- és nagybetű érzékeny egyeztetés" #: libraries/Config.php:1151 #, php-format @@ -3291,10 +3267,9 @@ msgid "SQL Query Console" msgstr "SQL lekérdezés konzol" #: libraries/DatabaseInterface.php:1409 -#, fuzzy #| msgid "Failed to read configuration file!" msgid "Failed to set configured collation connection!" -msgstr "A beállítófájl olvasása meghiúsult!" +msgstr "Nem sikerült beállítani a beállított egyeztetés kapcsolatot!" #: libraries/DatabaseInterface.php:2020 msgid "" @@ -3318,10 +3293,9 @@ msgid "Details…" msgstr "Részletek…" #: libraries/DatabaseInterface.php:2325 -#, fuzzy #| msgid "Missing parameter:" msgid "Missing connection parameters!" -msgstr "Hiányzó paraméter:" +msgstr "Hiányzó kapcsolat paraméterek!" #: libraries/DatabaseInterface.php:2358 msgid "Connection for controluser as defined in your configuration failed." @@ -3519,10 +3493,9 @@ msgstr "Belső táblák:" #: libraries/DbSearch.php:449 libraries/display_export.lib.php:50 #: libraries/replication_gui.lib.php:380 -#, fuzzy #| msgid "Unselect All" msgid "Unselect all" -msgstr "Minden kijelölés törlése" +msgstr "Összes kijelölésének megszüntetése" #: libraries/DbSearch.php:454 msgid "Inside column:" @@ -3628,10 +3601,9 @@ msgid "Relational key" msgstr "Relációs kulcs" #: libraries/DisplayResults.php:1744 -#, fuzzy #| msgid "Display foreign key relationships" msgid "Display column for relations" -msgstr "Idegen kulcsok kapcsolatainak megjelenítése" +msgstr "Oszlop megjelenítése a kapcsolatokhoz" #: libraries/DisplayResults.php:1760 msgid "Show binary contents" @@ -3720,10 +3692,9 @@ msgstr "A kijelöltekkel végzendő művelet:" #: templates/database/structure/check_all_tables.phtml:3 #: templates/database/structure/check_all_tables.phtml:4 #: templates/select_all.phtml:4 templates/select_all.phtml:5 -#, fuzzy #| msgid "Check All" msgid "Check all" -msgstr "Mind kijelölése" +msgstr "Összes bejelölése" #: libraries/DisplayResults.php:5026 msgid "Copy to clipboard" @@ -3808,7 +3779,7 @@ msgstr "Ismeretlen hiba a fájlfeltöltésben." #: libraries/File.php:424 msgid "File is a symbolic link" -msgstr "" +msgstr "A fájl egy szimbolikus link" #: libraries/File.php:429 libraries/File.php:532 msgid "File could not be read!" @@ -3825,7 +3796,6 @@ msgid "Error while moving uploaded file." msgstr "Hiba a feltöltött fájl mozgatása közben." #: libraries/File.php:507 -#, fuzzy #| msgid "Cannot read (moved) upload file." msgid "Cannot read uploaded file." msgstr "A feltöltött fájl nem olvasható." @@ -4822,19 +4792,16 @@ msgid "Analyze Explain at %s" msgstr "Magyarázat elemzése itt: %s" #: libraries/Util.php:1251 -#, fuzzy #| msgid "Without PHP Code" msgid "Without PHP code" -msgstr "PHP kód nélkül" +msgstr "PHP-kód nélkül" #: libraries/Util.php:1263 -#, fuzzy #| msgid "Submit Query" msgid "Submit query" msgstr "Lekérdezés indítása" #: libraries/Util.php:1274 libraries/config/messages.inc.php:894 -#, fuzzy #| msgid "Create PHP Code" msgid "Create PHP code" msgstr "PHP-kód létrehozása" @@ -5325,10 +5292,9 @@ msgid "You allow for connecting to the server without a password." msgstr "Ön engedélyezi a jelszó nélküli csatlakozást a kiszolgálóhoz." #: libraries/config/ServerConfigChecks.php:349 -#, fuzzy #| msgid "Key is too short, it should have at least 8 characters." msgid "Key is too short, it should have at least 32 characters." -msgstr "Túl rövid a kulcs, legalább 8 karakterből kell állnia." +msgstr "A kulcs túl rövid, legalább 32 karakterből kell állnia." #: libraries/config/ServerConfigChecks.php:359 msgid "Key should contain letters, numbers [em]and[/em] special characters." @@ -5474,10 +5440,9 @@ msgid "Could not connect to the database server!" msgstr "Nem sikerült kapcsolódni az adatbázis-kiszolgálóhoz!" #: libraries/config/Validator.php:243 -#, fuzzy #| msgid "Authentication type" msgid "Invalid authentication type!" -msgstr "Hitelesítés típusa" +msgstr "Érvénytelen hitelesítési típus!" #: libraries/config/Validator.php:250 msgid "Empty username while using [kbd]config[/kbd] authentication method!" @@ -5596,14 +5561,11 @@ msgid "Highlight pointer" msgstr "A mutató kiemelése" #: libraries/config/messages.inc.php:47 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " #| "import operations." msgid "Enable bzip2 compression for import operations." -msgstr "" -"A [a@https://en.wikipedia.org/wiki/Bzip2]bzip2[/a] tömörítés engedélyezése " -"az importálási műveletekhez." +msgstr "A bzip2 tömörítés engedélyezése az importálási műveletekhez." #: libraries/config/messages.inc.php:50 msgid "Bzip2" @@ -5624,7 +5586,6 @@ msgid "CHAR columns editing" msgstr "CHAR mezők szerkesztése" #: libraries/config/messages.inc.php:58 -#, fuzzy #| msgid "" #| "Use user-friendly editor for editing SQL queries ([a@https://codemirror." #| "net/]CodeMirror[/a]) with syntax highlighting and line numbers." @@ -5632,8 +5593,8 @@ msgid "" "Use user-friendly editor for editing SQL queries (CodeMirror) with syntax " "highlighting and line numbers." msgstr "" -"Felhasználóbarát szerkesztő használata az SQL-lekérdezésekhez ([a@https://" -"codemirror.net/]CodeMirror[/a]) szintaxis kiemelővel és sorszámozással." +"Felhasználóbarát szerkesztő használata az SQL-lekérdezések szerkesztéséhez " +"(CodeMirror) szintaxiskiemelővel és sorszámozással." #: libraries/config/messages.inc.php:62 msgid "Enable CodeMirror" @@ -5648,10 +5609,9 @@ msgstr "" "szükséges a működéshez." #: libraries/config/messages.inc.php:67 -#, fuzzy #| msgid "Enable SQL Validator" msgid "Enable linter" -msgstr "SQL Validator engedélyezése" +msgstr "Linter engedélyezése" #: libraries/config/messages.inc.php:69 msgid "" @@ -5775,10 +5735,9 @@ msgid "Whether the table structure actions should be hidden." msgstr "Legyenek-e rejtve a táblaszerkezet műveletei." #: libraries/config/messages.inc.php:117 -#, fuzzy #| msgid "Show table comments" msgid "Show column comments" -msgstr "Tábla megjegyzéseinek megjelenítése" +msgstr "Oszlopmegjegyzések megjelenítése" #: libraries/config/messages.inc.php:119 msgid "Whether column comments should be shown in table structure view" @@ -6400,14 +6359,12 @@ msgid "Disable some of the warnings shown by phpMyAdmin." msgstr "Egyes phpMyAdmin által megjelenített figyelmeztetések letiltása." #: libraries/config/messages.inc.php:353 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for " #| "import and export operations." msgid "Enable gzip compression for import and export operations." msgstr "" -"A [a@https://en.wikipedia.org/wiki/Gzip]gzip[/a] tömörítés engedélyezése az " -"importálási és az exportálási műveletekhez." +"A gzip tömörítés engedélyezése az importálási és exportálási műveletekhez." #: libraries/config/messages.inc.php:356 msgid "GZip" @@ -6658,7 +6615,6 @@ msgid "Maximum tables" msgstr "A táblák száma" #: libraries/config/messages.inc.php:466 -#, fuzzy #| msgid "" #| "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] " #| "([kbd]0[/kbd] for no limit)." @@ -6667,7 +6623,8 @@ msgid "" "([kbd]-1[/kbd] for no limit and [kbd]0[/kbd] for no change)." msgstr "" "Egy parancsfájl számára a lefoglaláshoz engedélyezett bájtok száma, például " -"[kbd]32M[/kbd] (korlátlan: [kbd]0[/kbd])." +"[kbd]32M[/kbd] ([kbd]-1[/kbd] esetén nincs korlát és [kbd]0[/kbd] esetén " +"nincs változtatás)." #: libraries/config/messages.inc.php:469 msgid "Memory limit" @@ -6863,10 +6820,9 @@ msgid "Show row links anyway" msgstr "Sorhivatkozások megjelenítése mindenképp" #: libraries/config/messages.inc.php:552 libraries/config/messages.inc.php:553 -#, fuzzy #| msgid "Disable foreign key checks" msgid "Disable shortcut keys" -msgstr "Az idegen kulcsok ellenőrzésének letiltása" +msgstr "Gyorsbillentyűk letiltása" #: libraries/config/messages.inc.php:555 msgid "Use natural order for sorting table and database names." @@ -7109,7 +7065,6 @@ msgid "Authentication type" msgstr "Hitelesítés típusa" #: libraries/config/messages.inc.php:640 -#, fuzzy #| msgid "" #| "Leave blank for no [a@https://wiki.phpmyadmin.net/pma/bookmark]bookmark[/" #| "a] support, suggested: [kbd]pma__bookmark[/kbd]" @@ -7117,8 +7072,8 @@ msgid "" "Leave blank for no [doc@bookmarks@]bookmark[/doc] support, suggested: " "[kbd]pma__bookmark[/kbd]" msgstr "" -"Hagyja üresen, ha nincs [a@https://wiki.phpmyadmin.net/pma/" -"bookmark]könyvjelző[/a] támogatás, alapértelmezés: [kbd]pma_bookmark[/kbd]" +"Hagyja üresen, ha nincs [doc@bookmarks@]könyvjelző[/doc] támogatás, javasolt:" +" [kbd]pma__bookmark[/kbd]" #: libraries/config/messages.inc.php:643 msgid "Bookmark table" @@ -7159,7 +7114,6 @@ msgid "Control user password" msgstr "A kontrollfelhasználó jelszava" #: libraries/config/messages.inc.php:656 -#, fuzzy #| msgid "" #| "A special MySQL user configured with limited permissions, more " #| "information available on [a@https://wiki.phpmyadmin.net/pma/" @@ -7168,9 +7122,8 @@ msgid "" "A special MySQL user configured with limited permissions, more information " "available on [doc@linked-tables]documentation[/doc]." msgstr "" -"Korlátozott jogokkal rendelkező, speciális MySQL felhasználó, további " -"információk érhetők el a [a@https://wiki.phpmyadmin.net/pma/" -"controluser]wiki[/a] oldalon." +"Korlátozott jogosultságokkal rendelkező, speciális MySQL felhasználó. " +"További információk érhetők el a [doc@linked-tables]dokumentációban[/doc]." #: libraries/config/messages.inc.php:659 msgid "Control user" @@ -7337,7 +7290,6 @@ msgid "PDF schema: pages table" msgstr "PDF-séma: pages table" #: libraries/config/messages.inc.php:723 -#, fuzzy #| msgid "" #| "Database used for relations, bookmarks, and PDF features. See [a@https://" #| "wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave " @@ -7348,8 +7300,8 @@ msgid "" "Suggested: [kbd]phpmyadmin[/kbd]." msgstr "" "A kapcsolatokhoz, könyvjelzőkhöz és PDF-funkciókhoz használt adatbázis. A " -"teljes információt lásd a [a@https://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] " -"oldalon. Hagyja üresen, ha nincs szükség a támogatására. Ajánlott: " +"teljes információkért nézze meg a [doc@linked-tables]pmadb[/doc] fejezetet. " +"Hagyja üresen, ha nincs szükség a támogatására. Ajánlott: " "[kbd]phpmyadmin[/kbd]." #: libraries/config/messages.inc.php:727 @@ -7392,7 +7344,6 @@ msgid "Favorites table" msgstr "Kedvencek tábla" #: libraries/config/messages.inc.php:742 -#, fuzzy #| msgid "" #| "Leave blank for no [a@https://wiki.phpmyadmin.net/pma/relation]relation-" #| "links[/a] support, suggested: [kbd]pma__relation[/kbd]." @@ -7400,23 +7351,20 @@ msgid "" "Leave blank for no [doc@relations@]relation-links[/doc] support, suggested: " "[kbd]pma__relation[/kbd]." msgstr "" -"Hagyja üresen, ha nincs [a@https://wiki.phpmyadmin.net/pma/relation]relációs " -"hivatkozás[/a] támogatás, ajánlott: [kbd]pma__relation[/kbd]." +"Hagyja üresen, ha nincs [doc@relations@]relációs hivatkozás[/doc] támogatás, " +"ajánlott: [kbd]pma__relation[/kbd]." #: libraries/config/messages.inc.php:746 msgid "Relation table" msgstr "Kapcsolat tábla" #: libraries/config/messages.inc.php:748 -#, fuzzy #| msgid "" #| "See [a@https://wiki.phpmyadmin.net/pma/auth_types#signon]authentication " #| "types[/a] for an example." msgid "" "See [doc@authentication-modes]authentication types[/doc] for an example." -msgstr "" -"Lásd a [a@https://wiki.phpmyadmin.net/pma/auth_types#signon]hitelesítési " -"típusok[/a] példáját." +msgstr "Lásd a [doc@authentication-modes]hitelesítési típusok[/doc] példáját." #: libraries/config/messages.inc.php:751 msgid "Signon session name" @@ -7662,7 +7610,6 @@ msgstr "" "minden táblánál." #: libraries/config/messages.inc.php:850 -#, fuzzy #| msgid "Show Creation timestamp" msgid "Show creation timestamp" msgstr "Létrehozás időbélyegének megjelenítése" @@ -7675,10 +7622,9 @@ msgstr "" "elrejtése minden táblánál." #: libraries/config/messages.inc.php:854 -#, fuzzy #| msgid "Show Last update timestamp" msgid "Show last update timestamp" -msgstr "Legutóbbi változás időbélyegének megjelenítése" +msgstr "Utolsó frissítés időbélyegének megjelenítése" #: libraries/config/messages.inc.php:856 msgid "" @@ -7688,24 +7634,21 @@ msgstr "" "elrejtése minden táblánál." #: libraries/config/messages.inc.php:858 -#, fuzzy #| msgid "Show Last check timestamp" msgid "Show last check timestamp" msgstr "Utolsó ellenőrzés időbélyegének megjelenítése" #: libraries/config/messages.inc.php:860 -#, fuzzy #| msgid "Show or hide a column displaying the comments for all tables." msgid "Show or hide a column displaying the charset for all tables." msgstr "" -"A megjegyzéseket megjelenítő oszlop megjelenítése vagy elrejtése minden " -"táblánál." +"A karakterkészletet megjelenítő oszlop megjelenítése vagy elrejtése az " +"összes táblánál." #: libraries/config/messages.inc.php:862 -#, fuzzy #| msgid "Show table comments" msgid "Show table charset" -msgstr "Tábla megjegyzéseinek megjelenítése" +msgstr "Tábla karakterkészletének megjelenítése" #: libraries/config/messages.inc.php:864 msgid "" @@ -7951,14 +7894,12 @@ msgid "Proxy password" msgstr "Proxy jelszó" #: libraries/config/messages.inc.php:973 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for " #| "import and export operations." msgid "Enable ZIP compression for import and export operations." msgstr "" -"A [a@https://en.wikipedia.org/wiki/Gzip]gzip[/a] tömörítés engedélyezése az " -"importálási és az exportálási műveletekhez." +"A ZIP tömörítés engedélyezése az importálási és exportálási műveletekhez." #: libraries/config/messages.inc.php:976 msgid "ZIP" @@ -8179,16 +8120,17 @@ msgstr "" #: libraries/controllers/server/ServerDatabasesController.php:582 #: libraries/controllers/server/ServerDatabasesController.php:588 -#, fuzzy #| msgid "Enable Statistics" msgid "Enable statistics" -msgstr "Statisztika engedélyezése" +msgstr "Statisztikák engedélyezése" #: libraries/controllers/server/ServerVariablesController.php:111 -#, fuzzy, php-format +#, php-format #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view server variables and settings. %s" -msgstr "Nincs elegendő jogosultság a felhasználók megtekintéséhez." +msgstr "" +"Nincs elegendő jogosultság a kiszolgáló változóinak és beállításainak " +"megtekintéséhez. %s" #: libraries/controllers/server/ServerVariablesController.php:229 msgid "Setting variable failed" @@ -8419,10 +8361,9 @@ msgid "Custom - display all possible options" msgstr "Egyedi - minden lehetséges opció megjelenítése" #: libraries/display_export.lib.php:338 -#, fuzzy #| msgid "Databases" msgid "Databases:" -msgstr "Adatbázisok" +msgstr "Adatbázisok:" #: libraries/display_export.lib.php:340 libraries/navigation/Navigation.php:196 msgid "Tables:" @@ -8636,7 +8577,6 @@ msgstr "" "lennie. Például: .sql.zip" #: libraries/display_import.lib.php:224 -#, fuzzy #| msgid "File to Import:" msgid "File to import:" msgstr "Az importálandó fájl:" @@ -8650,7 +8590,6 @@ msgid "File uploads are not allowed on this server." msgstr "A fájlfeltöltések nem engedélyezettek ezen a kiszolgálón." #: libraries/display_import.lib.php:284 -#, fuzzy #| msgid "Partial Import:" msgid "Partial import:" msgstr "Részleges importálás:" @@ -8674,17 +8613,13 @@ msgstr "" "jöhet, azonban meg tudja szakítani a tranzakciót.)" #: libraries/display_import.lib.php:315 -#, fuzzy #| msgid "" #| "Skip this number of queries (for SQL) or lines (for other formats), " #| "starting from the first one:" msgid "Skip this number of queries (for SQL) starting from the first one:" -msgstr "" -"Ennyi számú lekérdezés (SQL esetén) vagy sor (más formátumoknál) kihagyása " -"az elsőtől kezdve:" +msgstr "Ennyi számú lekérdezés (SQL esetén) kihagyása az elsőtől kezdve:" #: libraries/display_import.lib.php:345 -#, fuzzy #| msgid "Other Options:" msgid "Other options:" msgstr "Egyéb beállítások:" @@ -9240,14 +9175,13 @@ msgid "Edit next row" msgstr "Következő sor szerkesztése" #: libraries/insert_edit.lib.php:1606 -#, fuzzy #| msgid "" #| "Use TAB key to move from value to value, or CTRL+arrows to move anywhere" msgid "" "Use TAB key to move from value to value, or CTRL+arrows to move anywhere." msgstr "" "A TAB billentyűvel értékről értékre lépkedhet, vagy a CTRL+nyilakkal bárhová " -"léphet" +"léphet." #: libraries/insert_edit.lib.php:1643 libraries/replication_gui.lib.php:543 #: libraries/rte/rte_routines.lib.php:1588 @@ -9290,10 +9224,9 @@ msgid "Data only" msgstr "Csak az adatok" #: libraries/mult_submits.lib.php:353 -#, fuzzy #| msgid "Add AUTO_INCREMENT value" msgid "Add AUTO INCREMENT value" -msgstr "AUTO_INCREMENT érték hozzáadása" +msgstr "AUTO INCREMENT érték hozzáadása" #: libraries/mult_submits.lib.php:355 libraries/operations.lib.php:227 #: libraries/operations.lib.php:1288 @@ -9305,7 +9238,6 @@ msgstr "Megszorítás hozzáadása" #: libraries/operations.lib.php:954 libraries/operations.lib.php:1307 #: libraries/rte/rte_routines.lib.php:1000 #: templates/columns_definitions/table_fields_definitions.phtml:47 -#, fuzzy #| msgid "Adjust Privileges" msgid "Adjust privileges" msgstr "Jogosultságok módosítása" @@ -9364,10 +9296,9 @@ msgid "Log out" msgstr "Kilépés" #: libraries/navigation/NavigationHeader.php:173 -#, fuzzy #| msgid "Dumping data" msgid "Empty session data" -msgstr "Adatok kiíratása" +msgstr "Munkamenet-adatok kiürítése" #: libraries/navigation/NavigationHeader.php:189 msgid "phpMyAdmin documentation" @@ -9418,10 +9349,10 @@ msgid "Invalid class name \"%1$s\", using default of \"Node\"" msgstr "Érvénytelen osztálynév: \"%1$s\" \"Node\" alapértelmezése használva" #: libraries/navigation/NodeFactory.php:61 -#, fuzzy, php-format +#, php-format #| msgid "Could not add columns!" msgid "Could not load class \"%1$s\"" -msgstr "Nem sikerült oszlopokat hozzáadni!" +msgstr "Nem sikerült betölteni a(z) „%1$s” osztályt" #: libraries/navigation/nodes/Node.php:799 msgid "Expand/Collapse" @@ -9540,7 +9471,6 @@ msgstr "" "a táblában" #: libraries/normalization.lib.php:146 -#, fuzzy #| msgid "" #| "Select a column which can be split into more than one. (on select of 'no " #| "such column', it'll move to next step)" @@ -9548,8 +9478,8 @@ msgid "" "Select a column which can be split into more than one (on select of 'no such " "column', it'll move to next step)." msgstr "" -"Válasszon egy oszlopot, amelyet egynél több részre lehet szétvágni. (a " -"„nincs ilyen oszlop” választásakor a következő lépésre fog menni)" +"Válasszon egy oszlopot, amelyet egynél több részre lehet szétvágni (a „nincs " +"ilyen oszlop” választásakor a következő lépésre fog menni)." #: libraries/normalization.lib.php:153 normalization.php:18 msgid "Select one…" @@ -10425,10 +10355,10 @@ msgstr "" "(kevésbé hatékony, mivel az indexek a tábla létrehozása közben generálódnak)" #: libraries/plugins/export/ExportSql.php:294 -#, fuzzy, php-format +#, php-format #| msgid "Session value" msgid "%s value" -msgstr "Munkamenet értéke" +msgstr "%s érték" #: libraries/plugins/export/ExportSql.php:328 msgid "" @@ -10521,10 +10451,9 @@ msgstr "" "kiírását és újratölti a különböző időzónában lévő szerverek között)" #: libraries/plugins/export/ExportSql.php:516 -#, fuzzy #| msgid "It appears your database uses functions;" msgid "It appears your database uses routines;" -msgstr "Úgy tűnik, az adatbázis függvényeket használ;" +msgstr "Úgy tűnik, az adatbázis rutinokat használ;" #: libraries/plugins/export/ExportSql.php:519 #: libraries/plugins/export/ExportSql.php:1545 @@ -10537,16 +10466,16 @@ msgid "Metadata" msgstr "Metaadat" #: libraries/plugins/export/ExportSql.php:1076 -#, fuzzy, php-format +#, php-format #| msgid "Metadata for %s" msgid "Metadata for table %s" -msgstr "%s metaadatai" +msgstr "A(z) %s tábla metaadatai" #: libraries/plugins/export/ExportSql.php:1083 -#, fuzzy, php-format +#, php-format #| msgid "Metadata for %s" msgid "Metadata for database %s" -msgstr "%s metaadatai" +msgstr "A(z) %s adatbázis metaadatai" #: libraries/plugins/export/ExportSql.php:1415 #: libraries/plugins/schema/pdf/PdfRelationSchema.php:603 @@ -10564,10 +10493,10 @@ msgid "Last check:" msgstr "Utolsó ellenőrzés:" #: libraries/plugins/export/ExportSql.php:1488 -#, fuzzy, php-format +#, php-format #| msgid "Table structure for table" msgid "Error reading structure for table %s:" -msgstr "Tábla szerkezet ehhez a táblához" +msgstr "Hiba a(z) %s tábla szerkezetének olvasásakor:" #: libraries/plugins/export/ExportSql.php:1542 msgid "It appears your database uses views;" @@ -10619,10 +10548,10 @@ msgid "(See below for the actual view)" msgstr "(Lásd alább az aktuális nézetet)" #: libraries/plugins/export/ExportSql.php:2204 -#, fuzzy, php-format +#, php-format #| msgid "Error reading data:" msgid "Error reading data for table %s:" -msgstr "Hiba az adatolvasás közben:" +msgstr "Hiba a(z) %s tábla adatainak olvasásakor:" #: libraries/plugins/export/ExportXml.php:97 msgid "Object creation options (all are recommended)" @@ -10805,10 +10734,9 @@ msgstr "Rács megjelenítése" #: libraries/plugins/schema/SchemaPdf.php:93 #: templates/database/structure/print_view_data_dictionary_link.phtml:6 -#, fuzzy #| msgid "Data Dictionary" msgid "Data dictionary" -msgstr "Adat szótár" +msgstr "Adatszótár" #: libraries/plugins/schema/SchemaPdf.php:99 msgid "Order of the tables" @@ -10904,7 +10832,6 @@ msgstr "" "kell állítania." #: libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php:28 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the column data " #| "via standard input. Returns the standard output of the application. The " @@ -10930,14 +10857,14 @@ msgid "" msgstr "" "CSAK LINUXHOZ: Elindít egy külső alkalmazást, amely hagyományos bemeneten " "keresztül kapja az oszlopadatokat. A sztenderd eredményt adja válaszul. " -"Alapértelmezés a Tidy rendezett HTML kódja. Biztonsági okokból a libraries/" -"plugins/transformations/output/Text_Plain_External.class.php fájlt kézzel " -"kell szerkeszteni, és beírni a hozzáférhető eszközök neveit. Ekkor az első " -"lehetőség a használni kívánt program száma, a második lehetőség a program " -"paraméterei. Ha a harmadik lehetőség 1-re állított, akkor konvertálja a " -"kimenetet a htmlspecialchars() eljárással (alapértelmezés: 1). Ha a negyedik " -"lehetőség 1-re van állítva, akkor megakadályozza a beágyazást, és " -"biztosítja, hogy a kimenet egysoros legyen (alapértelmezés: 1)." +"Alapértelmezés a Tidy rendezett HTML kódja. Biztonsági okokból a " +"libraries/plugins/transformations/output/Text_Plain_External.php fájlt " +"kézzel kell szerkeszteni, és beírni a hozzáférhető eszközök neveit. Ekkor az " +"első lehetőség a használni kívánt program száma, a második lehetőség a " +"program paraméterei. Ha a harmadik lehetőség 1-re állított, akkor " +"konvertálja a kimenetet a htmlspecialchars() eljárással (alapértelmezés: 1). " +"Ha a negyedik lehetőség 1-re van állítva, akkor megakadályozza a beágyazást, " +"és biztosítja, hogy a kimenet egysoros legyen (alapértelmezés: 1)." #: libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php:28 msgid "" @@ -11569,10 +11496,9 @@ msgid "Re-type" msgstr "Újraírás" #: libraries/replication_gui.lib.php:880 -#, fuzzy #| msgid "Generate password" msgid "Generate password:" -msgstr "Jelszó generálása" +msgstr "Jelszó előállítása:" #: libraries/replication_gui.lib.php:918 msgid "Replication started successfully." @@ -12030,10 +11956,9 @@ msgid "There are no events to display." msgstr "Nincsen megjeleníthető esemény." #: libraries/select_server.lib.php:42 libraries/select_server.lib.php:47 -#, fuzzy #| msgid "Current server" msgid "Current server:" -msgstr "Jelenlegi szerver" +msgstr "Jelenlegi kiszolgáló:" #: libraries/server_common.lib.php:24 msgid "Server variables and settings" @@ -12227,10 +12152,9 @@ msgid "User group" msgstr "Felhasználói csoport" #: libraries/server_privileges.lib.php:732 -#, fuzzy #| msgid "Requires SSL-encrypted connections." msgid "Does not require SSL-encrypted connections." -msgstr "SSL-lel titkosított kapcsolatokat igényel." +msgstr "Nem igényel SSL-lel titkosított kapcsolatokat." #: libraries/server_privileges.lib.php:753 msgid "Requires SSL-encrypted connections." @@ -12302,10 +12226,9 @@ msgstr "Korlátozza a felhasználó egyidejű kapcsolatainak számát." #: libraries/server_privileges.lib.php:3379 #: libraries/server_privileges.lib.php:4644 #: templates/privileges/edit_routine_privileges.phtml:11 -#, fuzzy #| msgid "Routines" msgid "Routine" -msgstr "Eljárások" +msgstr "Eljárás" #: libraries/server_privileges.lib.php:1026 #: libraries/server_privileges.lib.php:1400 server_privileges.php:72 @@ -12316,16 +12239,14 @@ msgstr "" "hozzáadását." #: libraries/server_privileges.lib.php:1033 -#, fuzzy #| msgid "Allows altering and dropping stored routines." msgid "Allows altering and dropping this routine." -msgstr "Engedélyezi a tárolt eljárások módosítását és eldobását." +msgstr "Engedélyezi az eljárás módosítását és eldobását." #: libraries/server_privileges.lib.php:1038 -#, fuzzy #| msgid "Allows executing stored routines." msgid "Allows executing this routine." -msgstr "Engedélyezi a tárolt eljárások végrehajtását." +msgstr "Engedélyezi az eljárás végrehajtását." #: libraries/server_privileges.lib.php:1088 #: libraries/server_privileges.lib.php:1257 @@ -12368,22 +12289,19 @@ msgid "Allows dropping tables." msgstr "Engedélyezi a táblák eldobását." #: libraries/server_privileges.lib.php:1532 -#, fuzzy #| msgid "Cookie authentication" msgid "Native MySQL authentication" -msgstr "Cookie hitelesítés" +msgstr "Natív MySQL hitelesítés" #: libraries/server_privileges.lib.php:1534 -#, fuzzy #| msgid "Signon authentication" msgid "SHA256 password authentication" -msgstr "Signon hitelesítés" +msgstr "SHA256 jelszavas hitelesítés" #: libraries/server_privileges.lib.php:1548 -#, fuzzy #| msgid "Cookie authentication" msgid "Native MySQL Authentication" -msgstr "Cookie hitelesítés" +msgstr "Natív MySQL hitelesítés" #: libraries/server_privileges.lib.php:1602 #: libraries/server_privileges.lib.php:3134 @@ -12425,10 +12343,9 @@ msgid "Authentication Plugin" msgstr "Hitelesítés bővítmény" #: libraries/server_privileges.lib.php:1826 -#, fuzzy #| msgid "Password Hashing:" msgid "Password Hashing Method" -msgstr "Jelszó hash:" +msgstr "Jelszó-titkosítási eljárás" #: libraries/server_privileges.lib.php:2105 #, php-format @@ -12459,10 +12376,10 @@ msgstr "" "Az összes jog engedélyezése karakterhelyettesítős néven (username\\_%)." #: libraries/server_privileges.lib.php:2286 -#, fuzzy, php-format +#, php-format #| msgid "Grant all privileges on database \"%s\"." msgid "Grant all privileges on database %s." -msgstr "Az összes jog engedélyezése a(z) \"%s\" adatbázison." +msgstr "Az összes jogosultság megadása a(z) %s adatbázison." #: libraries/server_privileges.lib.php:2450 #: libraries/server_privileges.lib.php:2521 @@ -12512,10 +12429,9 @@ msgid "table-specific" msgstr "tábla-specifikus" #: libraries/server_privileges.lib.php:2905 -#, fuzzy #| msgid "Edit privileges:" msgid "Edit privileges" -msgstr "Jogok szerkesztése:" +msgstr "Jogosultságok szerkesztése" #: libraries/server_privileges.lib.php:2908 msgid "Revoke" @@ -12554,10 +12470,9 @@ msgstr "Új felhasználói fiók létrehozása ezekkel a jogokkal, és …" #: libraries/server_privileges.lib.php:3378 #: templates/privileges/edit_routine_privileges.phtml:12 -#, fuzzy #| msgid "Column-specific privileges" msgid "Routine-specific privileges" -msgstr "Oszlopspecifikus jogok" +msgstr "Eljárásra jellemző jogosultságok" #: libraries/server_privileges.lib.php:3758 msgid "Remove selected user accounts" @@ -12926,7 +12841,6 @@ msgid "Clear series" msgstr "Sorozatok törlése" #: libraries/server_status_monitor.lib.php:229 -#, fuzzy #| msgid "Series in Chart:" msgid "Series in chart:" msgstr "Sorozatok a diagramban:" @@ -14196,14 +14110,13 @@ msgid "Cannot save settings, submitted form contains errors!" msgstr "A beállítások nem menthetők, az elküldött űrlap hibákat tartalmaz!" #: prefs_manage.php:50 -#, fuzzy #| msgid "Missing phpMyAdmin configuration storage tables" msgid "phpMyAdmin configuration snippet" -msgstr "Hiányzó phpMyAdmin beállítástároló táblák" +msgstr "phpMyAdmin beállítás kódrészlet" #: prefs_manage.php:51 msgid "Paste it to your config.inc.php" -msgstr "" +msgstr "Illessze be a config.inc.php fájlba" #: prefs_manage.php:105 msgid "Could not import configuration" @@ -14255,10 +14168,9 @@ msgstr "" "%sBeállító parancsfájl%s használatával." #: prefs_manage.php:342 -#, fuzzy #| msgid "Save as file" msgid "Save as PHP file" -msgstr "Mentés fájlként" +msgstr "Mentés PHP-fájlként" #: prefs_manage.php:347 msgid "Save to browser's storage" @@ -14292,20 +14204,18 @@ msgid "" "Username and hostname didn't change. If you only want to change the " "password, 'Change password' tab should be used." msgstr "" -"A felhasználónév és a kiszolgálónév nem változott. Ha csak a jelszót óhajtja " -"cserélni, használja a \"Jelszócsere\" fület." +"A felhasználónév és a kiszolgálónév nem változott. Ha csak a jelszót " +"szeretné megváltoztatni, akkor használja a „Jelszócsere” lapot." #: server_status.php:35 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view server status." -msgstr "Nincs elegendő jogosultság a felhasználók megtekintéséhez." +msgstr "Nincs elegendő jogosultság a kiszolgáló állapotának megtekintéséhez." #: server_status_advisor.php:33 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view the advisor." -msgstr "Nincs elegendő jogosultság a felhasználók megtekintéséhez." +msgstr "Nincs elegendő jogosultság a tanácsadó megtekintéséhez." #: server_status_processes.php:33 #, php-format @@ -14321,16 +14231,15 @@ msgstr "" "befejeződött." #: server_status_queries.php:42 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view query statistics." -msgstr "Nincs elegendő jogosultság a felhasználók megtekintéséhez." +msgstr "" +"Nincs elegendő jogosultság a lekérdezés statisztikáinak megtekintéséhez." #: server_status_variables.php:52 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view status variables." -msgstr "Nincs elegendő jogosultság a felhasználók megtekintéséhez." +msgstr "Nincs elegendő jogosultság az állapotváltozók megtekintéséhez." #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:291 msgid "Download" @@ -14391,10 +14300,9 @@ msgstr "" "könyvtárat." #: setup/frames/index.inc.php:134 -#, fuzzy #| msgid "Configuration saved." msgid "Configuration not saved!" -msgstr "Beállítások elmentve." +msgstr "A beállítások nincsenek elmentve!" #: setup/frames/index.inc.php:149 setup/frames/menu.inc.php:20 msgid "Overview" @@ -14516,7 +14424,7 @@ msgstr "Hibás adat" #: setup/validate.php:30 #, php-format msgid "Wrong data or no validation for %s" -msgstr "" +msgstr "Hibás adatok vagy nincs ellenőrzés ehhez: %s" #: tbl_create.php:31 tbl_get_field.php:26 #, php-format @@ -14542,10 +14450,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "Sor: %1$s, oszlop: %2$s, hiba: %3$s" #: tbl_row_action.php:71 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "Nincsenek verziók kijelölve." +msgstr "Nincs sor kijelölve." #: tbl_tracking.php:35 #, php-format @@ -14583,10 +14490,9 @@ msgid "Add" msgstr "Hozzáadás" #: templates/columns_definitions/column_definitions_form.phtml:66 -#, fuzzy #| msgid "Add column(s)" msgid "column(s)" -msgstr "Oszlop(ok) hozzáadása" +msgstr "oszlop(ok)" #: templates/columns_definitions/column_definitions_form.phtml:93 msgid "Collation:" @@ -14637,93 +14543,79 @@ msgid "after %s" msgstr "%s után" #: templates/columns_definitions/partitions.phtml:9 -#, fuzzy #| msgid "partitioned" msgid "Partition by:" -msgstr "particionált" +msgstr "Particionálás ez alapján:" #: templates/columns_definitions/partitions.phtml:25 #: templates/columns_definitions/partitions.phtml:54 -#, fuzzy #| msgid "Values for column %s" msgid "Expression or column list" -msgstr "„%s” oszlop értékei" +msgstr "Kifejezés vagy oszloplista" #: templates/columns_definitions/partitions.phtml:30 -#, fuzzy #| msgid "Partition %s" msgid "Partitions:" -msgstr "%s partíció" +msgstr "Partíciók:" #: templates/columns_definitions/partitions.phtml:38 -#, fuzzy #| msgid "partitioned" msgid "Subpartition by:" -msgstr "particionált" +msgstr "Alparticionálás ez alapján:" #: templates/columns_definitions/partitions.phtml:59 -#, fuzzy #| msgid "partitioned" msgid "Subpartitions:" -msgstr "particionált" +msgstr "Alpartíciók:" #: templates/columns_definitions/partitions.phtml:71 -#, fuzzy #| msgid "Partition %s" msgid "Partition" -msgstr "%s partíció" +msgstr "Partíció" #: templates/columns_definitions/partitions.phtml:73 -#, fuzzy #| msgid "Value" msgid "Values" -msgstr "Érték" +msgstr "Értékek" #: templates/columns_definitions/partitions.phtml:76 -#, fuzzy #| msgid "partitioned" msgid "Subpartition" -msgstr "particionált" +msgstr "Alpartíció" #: templates/columns_definitions/partitions.phtml:78 msgid "Engine" msgstr "Motor" #: templates/columns_definitions/partitions.phtml:80 -#, fuzzy #| msgid "Data home directory" msgid "Data directory" -msgstr "Adatok kezdőkönyvtára" +msgstr "Adatkönyvtár" #: templates/columns_definitions/partitions.phtml:81 -#, fuzzy #| msgid "Save directory" msgid "Index directory" -msgstr "Mentési könyvtár" +msgstr "Indexkönyvtár" #: templates/columns_definitions/partitions.phtml:82 -#, fuzzy #| msgid "Matched rows:" msgid "Max rows" -msgstr "Illeszkedő sorok:" +msgstr "Sorok legnagyobb száma" #: templates/columns_definitions/partitions.phtml:83 -#, fuzzy #| msgid "rows" msgid "Min rows" -msgstr "Tartalom" +msgstr "Sorok legkisebb száma" #: templates/columns_definitions/partitions.phtml:84 -#, fuzzy #| msgid "Table search" msgid "Table space" -msgstr "Táblakeresés" +msgstr "Táblaterület" #: templates/columns_definitions/partitions.phtml:85 -#, fuzzy #| msgid "User group" msgid "Node group" -msgstr "Felhasználói csoport" +msgstr "Csomópontcsoport" #: templates/columns_definitions/table_fields_definitions.phtml:16 msgid "" @@ -14920,10 +14812,9 @@ msgid "Show query history at start" msgstr "Lekérdezés előzmények megjelenítése indításkor" #: templates/console/display.phtml:189 -#, fuzzy #| msgid "Show current browsing query" msgid "Show current browsing query" -msgstr "Az aktuális böngészés lekérdezéseinek megjelenítése" +msgstr "A jelenlegi böngészés lekérdezésének megjelenítése" #: templates/console/display.phtml:194 msgid "" @@ -14963,10 +14854,9 @@ msgid "Operator" msgstr "Operátor" #: templates/database/designer/database_tables.phtml:29 -#, fuzzy #| msgid "Move columns" msgid "Show/hide columns" -msgstr "Oszlopok mozgatása" +msgstr "Oszlopok megjelenítése vagy elrejtése" #: templates/database/designer/database_tables.phtml:40 msgid "See table structure" @@ -15156,10 +15046,9 @@ msgid "Check tables having overhead" msgstr "A felülírott táblák kijelölése" #: templates/database/structure/check_all_tables.phtml:10 -#, fuzzy #| msgid "No tables" msgid "Copy table" -msgstr "Nincs tábla" +msgstr "Tábla másolása" #: templates/database/structure/check_all_tables.phtml:11 msgid "Show create" @@ -15242,7 +15131,6 @@ msgid "Tracking is not active." msgstr "Nyomkövetés inaktív." #: templates/error/report_form.phtml:7 -#, fuzzy #| msgid "" #| "phpMyAdmin has encountered an error. We have collected data about this " #| "error as well as information about relevant configuration settings to " @@ -15252,16 +15140,17 @@ msgid "" "about relevant configuration settings. It will be sent to the phpMyAdmin " "team for debugging the error." msgstr "" -"A phpMyAdmin hibába ütközött. Összegyűjtöttük az adatokat erről a hibáról, " -"valamint a hozzá tartozó konfigurációs beállításokkal kapcsolatos " -"információkról, hogy elküldje a phpMyAdmin csapatnak a probléma " -"megtalálásának segítségéül." +"Ez a jelentés automatikusan felveszi a hibával kapcsolatos adatokat és a " +"vonatkozó konfigurációs beállítások információit. El lesznek küldve a " +"phpMyAdmin csapatának a hiba kereséséhez." #: templates/error/report_form.phtml:14 msgid "" "Can you tell us the steps leading to this error? It decisively helps in " "debugging:" msgstr "" +"El tudná mondani, milyen lépések vezettek a hibához? Ez jelentősen segít a " +"hiba megértésében:" #: templates/error/report_form.phtml:21 msgid "You may examine the data in the error report:" @@ -15286,10 +15175,9 @@ msgstr "" "szövegkonstansként lehessen őket használni." #: templates/privileges/add_privileges_routine.phtml:3 -#, fuzzy #| msgid "Add privileges on the following table:" msgid "Add privileges on the following routine:" -msgstr "Jogok hozzáadása a következő táblán:" +msgstr "Jogosultságok hozzáadása a következő eljáráshoz:" #: templates/privileges/add_privileges_table.phtml:3 msgid "Add privileges on the following table:" @@ -15318,10 +15206,9 @@ msgid "Check privileges for database \"%s\"." msgstr "A(z) \"%s\" adatbázis jogainak ellenőrzése." #: templates/server/databases/table_row.phtml:62 -#, fuzzy #| msgid "Check Privileges" msgid "Check privileges" -msgstr "Jogok ellenőrzése" +msgstr "Jogosultságok ellenőrzése" #: templates/server/plugins/section.phtml:8 msgid "Plugin" @@ -15397,10 +15284,9 @@ msgid "Stacked" msgstr "Halmozott" #: templates/table/chart/tbl_chart.phtml:52 -#, fuzzy #| msgid "Chart title" msgid "Chart title:" -msgstr "Diagramcím" +msgstr "Diagramcím:" #: templates/table/chart/tbl_chart.phtml:57 msgid "X-Axis:" @@ -15666,53 +15552,45 @@ msgstr "a tábla elejénél" #: templates/table/structure/display_partitions.phtml:6 #: templates/table/structure/display_structure.phtml:184 -#, fuzzy #| msgid "Partition %s" msgid "Partitions" -msgstr "%s partíció" +msgstr "Partíciók" #: templates/table/structure/display_partitions.phtml:10 -#, fuzzy #| msgid "No index defined!" msgid "No partitioning defined!" -msgstr "Nincs meghatározott index!" +msgstr "Nincs particionálás meghatározva!" #: templates/table/structure/display_partitions.phtml:13 -#, fuzzy #| msgid "partitioned" msgid "Partitioned by:" -msgstr "particionált" +msgstr "Particionálva ez alapján:" #: templates/table/structure/display_partitions.phtml:18 -#, fuzzy #| msgid "partitioned" msgid "Sub partitioned by:" -msgstr "particionált" +msgstr "Alparticionálva ez alapján:" #: templates/table/structure/display_partitions.phtml:31 -#, fuzzy #| msgid "Row length" msgid "Data length" -msgstr "Sor hossza" +msgstr "Adathossz" #: templates/table/structure/display_partitions.phtml:32 -#, fuzzy #| msgid "Row length" msgid "Index length" -msgstr "Sor hossza" +msgstr "Indexhossz" #: templates/table/structure/display_partitions.phtml:136 -#, fuzzy #| msgid "partitioned" msgid "Partition table" -msgstr "particionált" +msgstr "Partíciós tábla" #: templates/table/structure/display_partitions.phtml:139 #: templates/table/structure/partition_definition_form.phtml:7 -#, fuzzy #| msgid "Remove partitioning" msgid "Edit partitioning" -msgstr "Particionálás eltávolítása" +msgstr "Particionálás szerkesztése" #: templates/table/structure/display_structure.phtml:130 view_create.php:201 msgid "Edit view" @@ -15810,10 +15688,9 @@ msgid "Description" msgstr "Leírás" #: url.php:38 -#, fuzzy #| msgid "Taking you to next step…" msgid "Taking you to the target site." -msgstr "Átvitel a következő lépésre…" +msgstr "Átvitel a céloldalra." #: user_password.php:35 msgid "You don't have sufficient privileges to be here right now!" @@ -15824,26 +15701,24 @@ msgid "The profile has been updated." msgstr "A profil frissítése megtörtént." #: user_password.php:125 -#, fuzzy #| msgid "Password Hashing:" msgid "Password is too long!" -msgstr "Jelszó hash:" +msgstr "A jelszó túl hosszú!" #: vendor/phpmyadmin/motranslator/tests/MoFilesTest.php:24 -#, fuzzy #| msgid "Column names" msgid "Column parser" -msgstr "Oszlopnevek" +msgstr "Oszlopfeldolgozó" #: vendor/phpmyadmin/motranslator/tests/MoFilesTest.php:83 #: vendor/phpmyadmin/motranslator/tests/MoFilesTest.php:127 -#, fuzzy, php-format +#, php-format #| msgid "%d second" #| msgid_plural "%d seconds" msgid "\"%d\" second" msgid_plural "\"%d\" seconds" -msgstr[0] "%d másodperc" -msgstr[1] "%d másodperc" +msgstr[0] "„%d” másodperc" +msgstr[1] "„%d” másodperc" #: vendor/phpmyadmin/sql-parser/src/Component.php:48 #: vendor/phpmyadmin/sql-parser/src/Component.php:68 @@ -15869,16 +15744,14 @@ msgid "An opening bracket was expected." msgstr "Nyitó kapcsos zárójelet vártunk." #: vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php:225 -#, fuzzy #| msgid "Table name template" msgid "A symbol name was expected!" -msgstr "Táblanév sablon" +msgstr "Egy szimbólumnév várt!" #: vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php:257 -#, fuzzy #| msgid "No tables selected." msgid "A comma or a closing bracket was expected." -msgstr "Nincsenek táblák kiválasztva." +msgstr "Egy vessző vagy egy záró zárójel várt." #: vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php:273 msgid "A closing bracket was expected." @@ -15890,10 +15763,9 @@ msgstr "Felismerhetetlen adattípus." #: vendor/phpmyadmin/sql-parser/src/Components/Expression.php:249 #: vendor/phpmyadmin/sql-parser/src/Components/Expression.php:392 -#, fuzzy #| msgid "No tables selected." msgid "An alias was expected." -msgstr "Nincsenek táblák kiválasztva." +msgstr "Egy álnév várt." #: vendor/phpmyadmin/sql-parser/src/Components/Expression.php:330 #: vendor/phpmyadmin/sql-parser/src/Components/Expression.php:349 @@ -15906,10 +15778,9 @@ msgid "Unexpected dot." msgstr "Váratlan pont." #: vendor/phpmyadmin/sql-parser/src/Components/ExpressionArray.php:99 -#, fuzzy #| msgid "No versions selected." msgid "An expression was expected." -msgstr "Nincsenek verziók kijelölve." +msgstr "Egy kifejezés várt." #: vendor/phpmyadmin/sql-parser/src/Components/Limit.php:91 #: vendor/phpmyadmin/sql-parser/src/Components/Limit.php:113 @@ -15922,26 +15793,23 @@ msgid "This option conflicts with \"%1$s\"." msgstr "Ez a lehetőség ütközik ezzel: „%1$s”." #: vendor/phpmyadmin/sql-parser/src/Components/RenameOperation.php:102 -#, fuzzy #| msgid "The number of tables that are open." msgid "The old name of the table was expected." -msgstr "A megnyitott táblák száma." +msgstr "A tábla régi neve várt." #: vendor/phpmyadmin/sql-parser/src/Components/RenameOperation.php:112 msgid "Keyword \"TO\" was expected." msgstr "\"TO\" kulcsszavat vártunk." #: vendor/phpmyadmin/sql-parser/src/Components/RenameOperation.php:128 -#, fuzzy #| msgid "The number of tables that are open." msgid "The new name of the table was expected." -msgstr "A megnyitott táblák száma." +msgstr "A tábla új neve várt." #: vendor/phpmyadmin/sql-parser/src/Components/RenameOperation.php:146 -#, fuzzy #| msgid "Template was deleted." msgid "A rename operation was expected." -msgstr "A sablon törölve lett." +msgstr "Egy átnevezési művelet várt." #: vendor/phpmyadmin/sql-parser/src/Lexer.php:267 msgid "Unexpected character." @@ -15957,22 +15825,20 @@ msgid "Expected delimiter." msgstr "Határolót vártunk." #: vendor/phpmyadmin/sql-parser/src/Lexer.php:784 -#, fuzzy, php-format +#, php-format #| msgid "Event %1$s has been created." msgid "Ending quote %1$s was expected." -msgstr "A(z) %1$s esemény létrejött." +msgstr "A(z) %1$s záró idézés várt." #: vendor/phpmyadmin/sql-parser/src/Lexer.php:824 -#, fuzzy #| msgid "Table name template" msgid "Variable name was expected." -msgstr "Táblanév sablon" +msgstr "Változónév várt." #: vendor/phpmyadmin/sql-parser/src/Parser.php:431 -#, fuzzy #| msgid "at beginning of table" msgid "Unexpected beginning of statement." -msgstr "a tábla elejénél" +msgstr "Váratlan utasítás kezdet." #: vendor/phpmyadmin/sql-parser/src/Parser.php:450 msgid "Unrecognized statement type." @@ -15987,33 +15853,30 @@ msgid "Unexpected token." msgstr "Váratlan jelsor." #: vendor/phpmyadmin/sql-parser/src/Statement.php:284 -#, fuzzy #| msgid "No transaction was previously started." msgid "This type of clause was previously parsed." -msgstr "Nem volt korábban elindított tranzakció." +msgstr "A kikötés ezen típusa korábban fel lett dolgozva." #: vendor/phpmyadmin/sql-parser/src/Statement.php:312 -#, fuzzy #| msgid "A new statement was found, but no delimiter between them." msgid "" "A new statement was found, but no delimiter between it and the previous one." -msgstr "Egy új utasítás található, de nincs elválasztó köztük." +msgstr "" +"Egy új utasítás található, de nincs elválasztó közte és az előző között." #: vendor/phpmyadmin/sql-parser/src/Statement.php:332 msgid "Unrecognized keyword." msgstr "Felismerhetetlen kulcsszó." #: vendor/phpmyadmin/sql-parser/src/Statements/CreateStatement.php:368 -#, fuzzy #| msgid "The number of tables that are open." msgid "The name of the entity was expected." -msgstr "A megnyitott táblák száma." +msgstr "Az entitás neve várt." #: vendor/phpmyadmin/sql-parser/src/Statements/CreateStatement.php:407 -#, fuzzy #| msgid "Template was deleted." msgid "At least one column definition was expected." -msgstr "A sablon törölve lett." +msgstr "Legalább egy oszlopmeghatározás várt." #: vendor/phpmyadmin/sql-parser/src/Statements/CreateStatement.php:518 msgid "A \"RETURNS\" keyword was expected." @@ -16021,27 +15884,25 @@ msgstr "\"RETURNS\" kulcsszavat vártunk." #: vendor/phpmyadmin/sql-parser/tests/Lexer/LexerTest.php:21 #: vendor/phpmyadmin/sql-parser/tests/Parser/ParserTest.php:58 -#, fuzzy #| msgid "errors." msgid "error #1" -msgstr "hiba." +msgstr "hiba #1" #: vendor/phpmyadmin/sql-parser/tests/Lexer/LexerTest.php:23 #: vendor/phpmyadmin/sql-parser/tests/Parser/ParserTest.php:59 #, php-format msgid "%2$s #%1$d" -msgstr "" +msgstr "%2$s #%1$d" #: vendor/phpmyadmin/sql-parser/tests/Lexer/LexerTest.php:48 #: vendor/phpmyadmin/sql-parser/tests/Parser/ParserTest.php:80 -#, fuzzy #| msgid "Gather errors" msgid "strict error" -msgstr "Hibák összegyűjtése" +msgstr "szigorú hiba" #: view_create.php:45 msgid "View name can not be empty" -msgstr "" +msgstr "A nézet neve nem lehet üres" #: view_create.php:248 msgid "VIEW name" @@ -16251,10 +16112,9 @@ msgid "Version less than 5.5.8 (the first GA release of 5.5)." msgstr "A verzió kisebb 5.5.8-nál." #: libraries/advisory_rules.txt:118 -#, fuzzy #| msgid "You should upgrade, to a stable version of MySQL 5.5" msgid "You should upgrade, to a stable version of MySQL 5.5." -msgstr "Frissítenie kellene a MySQL 5.5 stabil verziójára" +msgstr "Frissítenie kellene a MySQL 5.5 stabil verziójára." #: libraries/advisory_rules.txt:121 libraries/advisory_rules.txt:128 msgid "Distribution" @@ -16561,7 +16421,6 @@ msgid "Too many sorts are causing temporary tables." msgstr "Túl sok rendezés ideiglenes táblák létrejöttét okozza." #: libraries/advisory_rules.txt:208 libraries/advisory_rules.txt:215 -#, fuzzy #| msgid "" #| "Consider increasing {sort_buffer_size} and/or {read_rnd_buffer_size}, " #| "depending on your system memory limits" @@ -16569,9 +16428,9 @@ msgid "" "Consider increasing {sort_buffer_size} and/or {read_rnd_buffer_size}, " "depending on your system memory limits." msgstr "" -"Fontolja meg a {sort_buffer_size} és/vagy a {read_rnd_buffer_size} " -"növelését, attól függően, hogy a rendszerben milyen memóriára vonatkozó " -"korlátozások vannak" +"Fontolja meg a {sort_buffer_size} és/vagy a {read_rnd_buffer_size} növelését " +"attól függően, hogy a rendszeren milyen memóriára vonatkozó korlátozások " +"vannak." #: libraries/advisory_rules.txt:209 #, php-format @@ -16603,7 +16462,6 @@ msgid "There are lots of rows being sorted." msgstr "Sok sor lett rendezve." #: libraries/advisory_rules.txt:222 -#, fuzzy #| msgid "" #| "While there is nothing wrong with a high amount of row sorting, you might " #| "want to make sure that the queries which require a lot of sorting use " @@ -16618,7 +16476,7 @@ msgstr "" "Bár nincs baj a nagy mennyiségű sorba rendezéssel, érdemes megbizonyosodni " "afelől, hogy a lekérdezések, amelyek sok rendezést igényelnek, indexelt " "oszlopokat használnak az ORDER BY kifejezésben, mivel így sokkal gyorsabb a " -"rendezés" +"rendezés." #: libraries/advisory_rules.txt:223 #, php-format @@ -16634,7 +16492,6 @@ msgid "There are too many joins without indexes." msgstr "Túl sok kapcsolat van indexek nélkül." #: libraries/advisory_rules.txt:230 -#, fuzzy #| msgid "" #| "This means that joins are doing full table scans. Adding indexes for the " #| "columns being used in the join conditions will greatly speed up table " @@ -16645,7 +16502,7 @@ msgid "" msgstr "" "Ez azt jelenti, hogy az egyesítések teljes táblaletapogatást végeznek. Az " "egyesítés feltételeiben használt oszlopokhoz való indexek hozzáadásával " -"nagyban felgyorsíthatók a táblaegyesítések" +"nagyban felgyorsíthatók a táblaegyesítések." #: libraries/advisory_rules.txt:231 #, php-format @@ -17074,13 +16931,11 @@ msgid "Slow launch time" msgstr "Lassú indítási idő" #: libraries/advisory_rules.txt:368 -#, fuzzy #| msgid "Slow_launch_time is above 2s" msgid "Slow_launch_time is above 2s." -msgstr "Slow_launch_time 2s felett van" +msgstr "Slow_launch_time 2s fölött van." #: libraries/advisory_rules.txt:369 -#, fuzzy #| msgid "" #| "Set {slow_launch_time} to 1s or 2s to correctly count threads that are " #| "slow to launch" @@ -17089,7 +16944,7 @@ msgid "" "to launch." msgstr "" "Állítsa {slow_launch_time} értékét 1s vagy 2s-re, hogy pontosan " -"megszámolható legyen az indításhoz lassú szálak száma" +"megszámolható legyen az indításhoz lassú szálak száma." #: libraries/advisory_rules.txt:370 #, php-format From 934c740c2ce454edd31b9540d76117f436ed1d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Sun, 4 Sep 2016 18:19:43 +0000 Subject: [PATCH 05/41] Translated using Weblate (Hungarian) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] --- po/hu.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/hu.po b/po/hu.po index fe6aa09467..d3c0dd5cca 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-09-04 18:17+0000\n" +"PO-Revision-Date: 2016-09-04 18:19+0000\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian " "\n" @@ -14464,8 +14464,8 @@ msgid "" "Username and hostname didn't change. If you only want to change the " "password, 'Change password' tab should be used." msgstr "" -"A felhasználónév és a kiszolgálónév nem változott. Ha csak a jelszót óhajtja " -"cserélni, használja a \"Jelszócsere\" fület." +"A felhasználónév és a kiszolgálónév nem változott. Ha csak a jelszót " +"szeretné megváltoztatni, akkor használja a „Jelszócsere” lapot." #: server_status.php:35 #| msgid "Not enough privilege to view users." @@ -15253,8 +15253,8 @@ msgid "" "Can you tell us the steps leading to this error? It decisively helps in " "debugging:" msgstr "" -"Meg tudja mondani nekünk azokat a lépéseket, amelyek ehhez a hibához " -"vezettek? Ez határozottan segít a hibakeresésben:" +"El tudná mondani, milyen lépések vezettek a hibához? Ez jelentősen segít a " +"hiba megértésében:" #: templates/error/report_form.phtml:21 msgid "You may examine the data in the error report:" From d15f505dfdddf92167625e25700e9644d4939dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 5 Sep 2016 17:30:50 +0200 Subject: [PATCH 06/41] Add PHP 7.1.0RC1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index af4368195e..765f5038a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ language: php php: + - "7.1.0RC1" - "7.0" - "5.6" - "5.5" From e52ceecb3debb52a128504e2e731fdc8c42eb0e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 5 Sep 2016 18:46:01 +0200 Subject: [PATCH 07/41] Ensure font size is integer, we do further calculations with it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/plugins/schema/svg/Svg.php | 6 +++--- libraries/plugins/schema/svg/SvgRelationSchema.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/plugins/schema/svg/Svg.php b/libraries/plugins/schema/svg/Svg.php index 0ea3c90adf..d0f4b44de4 100644 --- a/libraries/plugins/schema/svg/Svg.php +++ b/libraries/plugins/schema/svg/Svg.php @@ -104,7 +104,7 @@ class Svg extends XMLWriter /** * Set document font size * - * @param string $value sets the font size in pixels + * @param integer $value sets the font size in pixels * * @return void */ @@ -116,7 +116,7 @@ class Svg extends XMLWriter /** * Get document font size * - * @return string returns the font size + * @return integer returns the font size */ public function getFontSize() { @@ -240,7 +240,7 @@ class Svg extends XMLWriter $this->writeAttribute('style', $styles); if (isset($text)) { $this->writeAttribute('font-family', $this->font); - $this->writeAttribute('font-size', $this->fontSize); + $this->writeAttribute('font-size', $this->fontSize . 'px'); $this->text($text); } $this->endElement(); diff --git a/libraries/plugins/schema/svg/SvgRelationSchema.php b/libraries/plugins/schema/svg/SvgRelationSchema.php index 2ba33514d0..fa81b29df5 100644 --- a/libraries/plugins/schema/svg/SvgRelationSchema.php +++ b/libraries/plugins/schema/svg/SvgRelationSchema.php @@ -72,7 +72,7 @@ class SvgRelationSchema extends ExportRelationSchema ); $this->diagram->SetAuthor('phpMyAdmin ' . PMA_VERSION); $this->diagram->setFont('Arial'); - $this->diagram->setFontSize('16px'); + $this->diagram->setFontSize(16); $alltables = $this->getTablesFromRequest(); @@ -264,4 +264,4 @@ class SvgRelationSchema extends ExportRelationSchema $table->tableDraw($this->showColor); } } -} \ No newline at end of file +} From 6bcc593c84b3430c2b90b7d81e48c99b78a751a1 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Mon, 5 Sep 2016 23:00:12 +0530 Subject: [PATCH 08/41] Fix 'Unsupported query' message from Travis logs Signed-off-by: Deven Bansod --- libraries/dbi/DBIDummy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/dbi/DBIDummy.php b/libraries/dbi/DBIDummy.php index 8f74c9aaf3..36059217bf 100644 --- a/libraries/dbi/DBIDummy.php +++ b/libraries/dbi/DBIDummy.php @@ -696,7 +696,7 @@ $GLOBALS['dummy_queries'] = array( array( 'query' => "SELECT `PARTITION_METHOD` " . "FROM `information_schema`.`PARTITIONS` " - . "WHERE `TABLE_SCHEMA` = 'db' AND `TABLE_NAME` = 'table'", + . "WHERE `TABLE_SCHEMA` = 'db' AND `TABLE_NAME` = 'table' LIMIT 1", 'result' => array(), ), array( From f23c0b9db946f612f7f3f9fee4a1093f2e4ff833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 6 Sep 2016 09:48:14 +0200 Subject: [PATCH 09/41] Set correct Uptime value for tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MySQL returns this as integer, so we should do the same for tests. See also #12539 Signed-off-by: Michal Čihař --- test/libraries/PMA_server_status_queries_test.php | 3 +-- test/libraries/PMA_server_status_test.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php index f6b42a6c79..af23c3bfc3 100644 --- a/test/libraries/PMA_server_status_queries_test.php +++ b/test/libraries/PMA_server_status_queries_test.php @@ -106,8 +106,7 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase $GLOBALS['dbi'] = $dbi; $this->ServerStatusData = new ServerStatusData(); - $upTime = "10h"; - $this->ServerStatusData->status['Uptime'] = $upTime; + $this->ServerStatusData->status['Uptime'] = 36000; $this->ServerStatusData->used_queries = array( "Com_change_db" => "15", "Com_select" => "12", diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php index 9d9c4f0575..b17267073a 100644 --- a/test/libraries/PMA_server_status_test.php +++ b/test/libraries/PMA_server_status_test.php @@ -147,13 +147,12 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase public function testPMAGetHtmlForServerStatus() { //parameters - $upTime = "10h"; $bytes_received = 100; $bytes_sent = 200; $max_used_conn = 500; $aborted_conn = 200; $conn = 1000; - $this->ServerStatusData->status['Uptime'] = $upTime; + $this->ServerStatusData->status['Uptime'] = 36000; $this->ServerStatusData->status['Bytes_received'] = $bytes_received; $this->ServerStatusData->status['Bytes_sent'] = $bytes_sent; $this->ServerStatusData->status['Max_used_connections'] = $max_used_conn; From 46305f33868747b67f0e49210701b8fc8cd24275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevdimali=20=C4=B0sa?= Date: Tue, 6 Sep 2016 06:15:55 +0000 Subject: [PATCH 10/41] Translated using Weblate (Azerbaijani) Currently translated at 52.0% (1675 of 3219 strings) [CI skip] --- po/az.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/po/az.po b/po/az.po index 64c42b152e..76cc72f9df 100644 --- a/po/az.po +++ b/po/az.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:28+0200\n" -"PO-Revision-Date: 2016-07-29 19:10+0000\n" +"PO-Revision-Date: 2016-09-06 06:15+0000\n" "Last-Translator: Sevdimali İsa \n" -"Language-Team: Azerbaijani \n" +"Language-Team: Azerbaijani " +"\n" "Language: az\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.8-dev\n" +"X-Generator: Weblate 2.8\n" #: changelog.php:38 license.php:33 #, fuzzy, php-format @@ -3822,6 +3822,8 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" +"Dəstəklənməyən sıxışdırmayla (%s) fayl yükləməyi sınadınız. Ya bunun üçün " +"hələki dəstək tamamlanmadı ya da konfiqurasiyanız tərəfindən deaktiv edildi." #: libraries/Footer.php:74 #, php-format From 7cb6830ec8685a7c0d694a9caf157a506ce7437b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 6 Sep 2016 09:51:34 +0200 Subject: [PATCH 11/41] Fix test expectations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- test/libraries/PMA_server_status_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php index b17267073a..f86e0fe561 100644 --- a/test/libraries/PMA_server_status_test.php +++ b/test/libraries/PMA_server_status_test.php @@ -172,7 +172,7 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase ); //updatetime $upTime_html = 'This MySQL server has been running for ' - . '0 days, 0 hours, 0 minutes and 10h seconds'; + . '0 days, 10 hours, 0 minutes and 0 seconds'; $this->assertContains( $upTime_html, $html From eb233da10a432cd1c6f819ffda7f7e0115ae128d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 6 Sep 2016 10:00:14 +0200 Subject: [PATCH 12/41] Set reasonable mock value for tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set integer where we do a COUNT() SQL. See also #12539 Signed-off-by: Michal Čihař --- test/libraries/PMA_server_status_monitor_test.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php index 837d2a7c16..88a01b553a 100644 --- a/test/libraries/PMA_server_status_monitor_test.php +++ b/test/libraries/PMA_server_status_monitor_test.php @@ -239,12 +239,12 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase $value = array( 'sql_text' => 'insert sql_text', - '#' => 'types', + '#' => 11, ); $value2 = array( 'sql_text' => 'update sql_text', - '#' => 'types2', + '#' => 10, ); $dbi->expects($this->at(1))->method('fetchAssoc') @@ -262,10 +262,10 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase $ret = PMA_getJsonForLogDataTypeSlow($start, $end); $result_rows = array( - array('sql_text' => 'insert sql_text', '#' => 'types'), - array('sql_text' => 'update sql_text', '#' => 'types2') + array('sql_text' => 'insert sql_text', '#' => 11), + array('sql_text' => 'update sql_text', '#' => 10) ); - $result_sum = array('insert' =>0, 'TOTAL' =>0, 'update' => 0); + $result_sum = array('insert' =>11, 'TOTAL' =>21, 'update' => 10); $this->assertEquals( 2, $ret['numRows'] From b1d0589b51595bdd940d5dff5766c0331e59f0de Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Tue, 6 Sep 2016 12:10:23 +0530 Subject: [PATCH 13/41] Fix numeric errors Signed-off-by: Deven Bansod --- libraries/SysInfoLinux.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/SysInfoLinux.php b/libraries/SysInfoLinux.php index 6d66c9c279..c2afba8b12 100644 --- a/libraries/SysInfoLinux.php +++ b/libraries/SysInfoLinux.php @@ -76,16 +76,16 @@ class SysInfoLinux extends \PMA\libraries\SysInfo $mem = array_merge($defaults, $mem); + foreach ($mem as $idx => $value) { + $mem[$idx] = intval($value); + } + $mem['MemUsed'] = $mem['MemTotal'] - $mem['MemFree'] - $mem['Cached'] - $mem['Buffers']; $mem['SwapUsed'] = $mem['SwapTotal'] - $mem['SwapFree'] - $mem['SwapCached']; - foreach ($mem as $idx => $value) { - $mem[$idx] = intval($value); - } - return $mem; } } From 92cb95c6d5af2a750039c1e19d93846b784c4af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 6 Sep 2016 10:24:04 +0200 Subject: [PATCH 14/41] Fix other places of wrong value for # in tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- test/libraries/PMA_server_status_monitor_test.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php index 88a01b553a..9ba7acc482 100644 --- a/test/libraries/PMA_server_status_monitor_test.php +++ b/test/libraries/PMA_server_status_monitor_test.php @@ -296,13 +296,13 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase $value = array( 'sql_text' => 'insert sql_text', - '#' => 'types', + '#' => 10, 'argument' => 'argument argument2', ); $value2 = array( 'sql_text' => 'update sql_text', - '#' => 'types2', + '#' => 11, 'argument' => 'argument3 argument4', ); @@ -324,7 +324,7 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase $value, $value2, ); - $result_sum = array('argument' =>0, 'TOTAL' =>0, 'argument3' => 0); + $result_sum = array('argument' =>10, 'TOTAL' =>21, 'argument3' => 11); $this->assertEquals( 2, @@ -356,7 +356,7 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase $value = array( 'sql_text' => 'insert sql_text', - '#' => 'types', + '#' => 22, 'argument' => 'argument argument2', ); @@ -395,7 +395,7 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase $value = array( 'sql_text' => 'insert sql_text', - '#' => 'types', + '#' => 33, 'argument' => 'argument argument2', ); From 715403c0e7568390b2493651617319acb00a497b Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Sat, 3 Sep 2016 23:47:53 +0530 Subject: [PATCH 15/41] Fix #12531 : Properly flag queries as DROP DATABASE Parser recognizes various DROP statements correctly, but the flags set by SQL Parser are incorrectly used. In js/functions.js, removed the Regex-based matching, rather handle it in PHP as we have correct flags available from SQL Parser Signed-off-by: Deven Bansod --- import.php | 13 ++++ js/functions.js | 16 +---- js/messages.php | 5 -- libraries/import.lib.php | 108 ++++++++++++++------------------ libraries/sql.lib.php | 3 +- test/libraries/PMA_sql_test.php | 6 +- 6 files changed, 65 insertions(+), 86 deletions(-) diff --git a/import.php b/import.php index 5afdd869b4..72828e56fb 100644 --- a/import.php +++ b/import.php @@ -797,6 +797,19 @@ if ($go_sql) { // @todo: possibly refactor extract($analyzed_sql_results); + // Check if User is allowed to issue a 'DROP DATABASE' Statement + if (PMA_hasNoRightsToDropDatabase( + $analyzed_sql_results, $cfg['AllowUserDropDatabase'], $GLOBALS['is_superuser'] + )) { + PMA\libraries\Util::mysqlDie( + __('"DROP DATABASE" statements are disabled.'), + '', + false, + $_SESSION['Import_message']['go_back_url'] + ); + return; + } // end if + if ($table != $table_from_sql && !empty($table_from_sql)) { $table = $table_from_sql; } diff --git a/js/functions.js b/js/functions.js index bace1bf56d..103ba84707 100644 --- a/js/functions.js +++ b/js/functions.js @@ -629,8 +629,7 @@ function confirmLink(theLink, theSqlQuery) } // end of the 'confirmLink()' function /** - * Displays an error message if a "DROP DATABASE" statement is submitted - * while it isn't allowed, else confirms a "DROP/DELETE/ALTER" query before + * Confirms a "DROP/DELETE/ALTER" query before * submitting it if required. * This function is called by the 'checkSqlQuery()' js function. * @@ -648,17 +647,6 @@ function confirmQuery(theForm1, sqlQuery1) return true; } - // "DROP DATABASE" statement isn't allowed - if (PMA_messages.strNoDropDatabases !== '') { - var drop_re = new RegExp('(^|;)\\s*DROP\\s+(IF EXISTS\\s+)?DATABASE\\s', 'i'); - if (drop_re.test(sqlQuery1.value)) { - alert(PMA_messages.strNoDropDatabases); - theForm1.reset(); - sqlQuery1.focus(); - return false; - } // end if - } // end if - // Confirms a "DROP/DELETE/ALTER/TRUNCATE" statement // // TODO: find a way (if possible) to use the parser-analyser @@ -666,7 +654,7 @@ function confirmQuery(theForm1, sqlQuery1) // For now, I just added a ^ to check for the statement at // beginning of expression - var do_confirm_re_0 = new RegExp('^\\s*DROP\\s+(IF EXISTS\\s+)?(TABLE|DATABASE|PROCEDURE)\\s', 'i'); + var do_confirm_re_0 = new RegExp('^\\s*DROP\\s+(IF EXISTS\\s+)?(TABLE|PROCEDURE)\\s', 'i'); var do_confirm_re_1 = new RegExp('^\\s*ALTER\\s+TABLE\\s+((`[^`]+`)|([A-Za-z0-9_$]+))\\s+DROP\\s', 'i'); var do_confirm_re_2 = new RegExp('^\\s*DELETE\\s+FROM\\s', 'i'); var do_confirm_re_3 = new RegExp('^\\s*TRUNCATE\\s', 'i'); diff --git a/js/messages.php b/js/messages.php index f8e31e2cfa..9b8ecf2b33 100644 --- a/js/messages.php +++ b/js/messages.php @@ -36,11 +36,6 @@ register_shutdown_function( } ); -$js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements are disabled.'); -if ($cfg['AllowUserDropDatabase']) { - $js_messages['strNoDropDatabases'] = ''; -} - /* For confirmations */ $js_messages['strConfirm'] = __('Confirm'); $js_messages['strDoYouReally'] = __('Do you really want to execute "%s"?'); diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 13819a861b..9994fbb04f 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -18,11 +18,6 @@ if (! defined('PHPMYADMIN')) { */ require_once './libraries/check_user_privileges.lib.php'; -/** - * We do this check, DROP DATABASE does not need to be confirmed elsewhere - */ -define('PMA_CHK_DROP', 1); - /** * Checks whether timeout is getting close * @@ -189,7 +184,6 @@ function PMA_importRunQuery($sql = '', $full = '', &$sql_data = array()) if (! empty($import_run_buffer['sql']) && trim($import_run_buffer['sql']) != '' ) { - $max_sql_len = max( $max_sql_len, mb_strlen($import_run_buffer['sql']) @@ -197,63 +191,53 @@ function PMA_importRunQuery($sql = '', $full = '', &$sql_data = array()) if (! $sql_query_disabled) { $sql_query .= $import_run_buffer['full']; } - $pattern = '@^[[:space:]]*DROP[[:space:]]+(IF EXISTS[[:space:]]+)?' - . 'DATABASE @i'; - if (! $cfg['AllowUserDropDatabase'] - && ! $is_superuser - && preg_match($pattern, $import_run_buffer['sql']) - ) { - $GLOBALS['message'] = Message::error( - __('"DROP DATABASE" statements are disabled.') + + $executed_queries++; + + if ($run_query && $executed_queries < 50) { + $go_sql = true; + + if (! $sql_query_disabled) { + $complete_query = $sql_query; + $display_query = $sql_query; + } else { + $complete_query = ''; + $display_query = ''; + } + $sql_query = $import_run_buffer['sql']; + $sql_data['valid_sql'][] = $import_run_buffer['sql']; + $sql_data['valid_full'][] = $import_run_buffer['full']; + if (! isset($sql_data['valid_queries'])) { + $sql_data['valid_queries'] = 0; + } + $sql_data['valid_queries']++; + } elseif ($run_query) { + + /* Handle rollback from go_sql */ + if ($go_sql && isset($sql_data['valid_full'])) { + $queries = $sql_data['valid_sql']; + $fulls = $sql_data['valid_full']; + $count = $sql_data['valid_queries']; + $go_sql = false; + + $sql_data['valid_sql'] = array(); + $sql_data['valid_queries'] = 0; + unset($sql_data['valid_full']); + for ($i = 0; $i < $count; $i++) { + PMA_executeQuery( + $queries[$i], + $fulls[$i], + $sql_data + ); + } + } + + PMA_executeQuery( + $import_run_buffer['sql'], + $import_run_buffer['full'], + $sql_data ); - $error = true; - } else { - $executed_queries++; - - if ($run_query && $executed_queries < 50) { - $go_sql = true; - if (! $sql_query_disabled) { - $complete_query = $sql_query; - $display_query = $sql_query; - } else { - $complete_query = ''; - $display_query = ''; - } - $sql_query = $import_run_buffer['sql']; - $sql_data['valid_sql'][] = $import_run_buffer['sql']; - $sql_data['valid_full'][] = $import_run_buffer['full']; - if (! isset($sql_data['valid_queries'])) { - $sql_data['valid_queries'] = 0; - } - $sql_data['valid_queries']++; - } elseif ($run_query) { - - /* Handle rollback from go_sql */ - if ($go_sql && isset($sql_data['valid_full'])) { - $queries = $sql_data['valid_sql']; - $fulls = $sql_data['valid_full']; - $count = $sql_data['valid_queries']; - $go_sql = false; - - $sql_data['valid_sql'] = array(); - $sql_data['valid_queries'] = 0; - unset($sql_data['valid_full']); - for ($i = 0; $i < $count; $i++) { - PMA_executeQuery( - $queries[$i], - $fulls[$i], - $sql_data - ); - } - } - - PMA_executeQuery( - $import_run_buffer['sql'], - $import_run_buffer['full'], - $sql_data - ); - } // end run query - } // end if not DROP DATABASE + } // end run query // end non empty query } elseif (! empty($import_run_buffer['full'])) { if ($go_sql) { diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index fafeb40aaf..5ed4e8de54 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -687,8 +687,7 @@ function PMA_isDeleteTransformationInfo($analyzed_sql_results) function PMA_hasNoRightsToDropDatabase($analyzed_sql_results, $allowUserDropDatabase, $is_superuser ) { - return ! defined('PMA_CHK_DROP') - && ! $allowUserDropDatabase + return ! $allowUserDropDatabase && isset($analyzed_sql_results['drop_database']) && $analyzed_sql_results['drop_database'] && ! $is_superuser; diff --git a/test/libraries/PMA_sql_test.php b/test/libraries/PMA_sql_test.php index 800d1e854b..3efd0884b3 100644 --- a/test/libraries/PMA_sql_test.php +++ b/test/libraries/PMA_sql_test.php @@ -172,7 +172,7 @@ class PMA_SqlTest extends PHPUnit_Framework_TestCase public function testHasNoRightsToDropDatabase() { $this->assertEquals( - !defined('PMA_CHK_DROP'), + true, PMA_hasNoRightsToDropDatabase( PMA_parseAndAnalyze('DROP DATABASE db'), false, @@ -181,7 +181,7 @@ class PMA_SqlTest extends PHPUnit_Framework_TestCase ); $this->assertEquals( - !defined('PMA_CHK_DROP'), + false, PMA_hasNoRightsToDropDatabase( PMA_parseAndAnalyze('DROP TABLE tbl'), false, @@ -190,7 +190,7 @@ class PMA_SqlTest extends PHPUnit_Framework_TestCase ); $this->assertEquals( - !defined('PMA_CHK_DROP'), + false, PMA_hasNoRightsToDropDatabase( PMA_parseAndAnalyze('SELECT * from tbl'), false, From 954ebe9cbc210527298e873155f71682e78167a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevdimali=20=C4=B0sa?= Date: Tue, 6 Sep 2016 06:15:52 +0000 Subject: [PATCH 16/41] Translated using Weblate (Azerbaijani) Currently translated at 52.4% (1680 of 3206 strings) [CI skip] --- po/az.po | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/po/az.po b/po/az.po index f868cdb179..7d95d70ad4 100644 --- a/po/az.po +++ b/po/az.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-07-29 19:10+0000\n" +"PO-Revision-Date: 2016-09-06 06:15+0000\n" "Last-Translator: Sevdimali İsa \n" -"Language-Team: Azerbaijani \n" +"Language-Team: Azerbaijani " +"\n" "Language: az\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.8-dev\n" +"X-Generator: Weblate 2.8\n" #: changelog.php:38 license.php:33 #, php-format @@ -547,6 +547,8 @@ msgid "" "Uploaded file cannot be moved, because the server has open_basedir enabled " "without access to the %s directory (for temporary files)." msgstr "" +"Göndərilən fayl açıla bilmədi çünki server %s direktoriyasına (keçici " +"fayllar üçün) keçmədən open_basedir aktivləşdirildi." #: import.php:506 import.php:583 libraries/File.php:429 libraries/File.php:522 msgid "File could not be read!" @@ -559,6 +561,8 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" +"Dəstəklənməyən sıxışdırmayla (%s) fayl yükləməyi sınadınız. Ya bunun üçün " +"hələki dəstək tamamlanmadı ya da konfiqurasiyanız tərəfindən deaktiv edildi." #: import.php:590 msgid "" From 9df5aebc22542ce7cc087e0d3e1942f45f45455a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 6 Sep 2016 11:33:03 +0200 Subject: [PATCH 17/41] Changelog entry for #12531 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index be0fa788a9..d1b8e73d61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog - issue #12303 Fix number formatting with different settings of precision in PHP - issue #12405 Use single quotes in PHP code - issue #12534 Option for the dropped column is not removed from 'after_field' select, after the column is dropped +- issue #12531 Properly detect DROP DATABASE queries 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 From 40d9d82840490d06fcdbf5c594cd43ea7c32f5fc Mon Sep 17 00:00:00 2001 From: Sudheesh Singanamalla Date: Tue, 6 Sep 2016 15:28:38 +0530 Subject: [PATCH 18/41] Fixes #12470 Stores tab_id hash into a variable instead of location.hash Signed-off-by: Sudheesh Singanamalla --- js/config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/config.js b/js/config.js index 6630dd6c7c..d3d0c5f840 100644 --- a/js/config.js +++ b/js/config.js @@ -588,8 +588,9 @@ function setTab(tab_id) } $this.find('li').removeClass('active').find('a[href=#' + tab_id + ']').parent().addClass('active'); $this.parent().find('div.tabs_contents fieldset').hide().filter('#' + tab_id).show(); - location.hash = 'tab_' + tab_id; - $this.parent().find('input[name=tab_hash]').val(location.hash); + var hashValue = 'tab_' + tab_id; + location.hash = hashValue; + $this.parent().find('input[name=tab_hash]').val(hashValue); }); } From f3cd949738c49cc58315452bb218d443fd96c535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 6 Sep 2016 12:45:25 +0200 Subject: [PATCH 19/41] Changelog for issue #12470 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix possible race condition in setting URL hash Signed-off-by: Michal Čihař --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index d1b8e73d61..6703664aec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ phpMyAdmin - ChangeLog - issue #12405 Use single quotes in PHP code - issue #12534 Option for the dropped column is not removed from 'after_field' select, after the column is dropped - issue #12531 Properly detect DROP DATABASE queries +- issue #12470 Fix possible race condition in setting URL hash 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 From be315905bd84d30af340ecd4001ddcd194ba4469 Mon Sep 17 00:00:00 2001 From: Daniel Mossaband Date: Tue, 6 Sep 2016 09:01:09 -0700 Subject: [PATCH 20/41] Updated file locations (#12528) Documentation Update after PMASA-2016-54 fix #12507 Signed-off-by: Daniel Mossaband --- doc/transformations.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/transformations.rst b/doc/transformations.rst index df1e63fe3a..06c1ff1e8a 100644 --- a/doc/transformations.rst +++ b/doc/transformations.rst @@ -122,8 +122,8 @@ libraries/plugins/transformations/TEMPLATE\_ABSTRACT files for adding your own transformation plug-in. You can also generate a new transformation plug-in (with or without the abstract transformation class), by using -:file:`libraries/plugins/transformations/generator_plugin.sh` or -:file:`libraries/plugins/transformations/generator_main_class.sh`. +:file:`scripts/transformations_generator_plugin.sh` or +:file:`scripts/transformations_generator_main_class.sh`. The applyTransformation() method always gets passed three variables: From 42d54a938add52cd2f6961421fc679162dca5353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 8 Feb 2016 10:55:54 +0100 Subject: [PATCH 21/41] Remove MySQL version caching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In my testing the session/cache access is slower than fetching single value from MySQL and calculating the values. Also the caching would need some logic for invalidation as the server can be upgraded or configuration changed. Fixes #11924 Signed-off-by: Michal Čihař --- libraries/DatabaseInterface.php | 91 +++++++++----------------------- libraries/VersionInformation.php | 2 +- 2 files changed, 25 insertions(+), 68 deletions(-) diff --git a/libraries/DatabaseInterface.php b/libraries/DatabaseInterface.php index 600b473687..db86343fb3 100644 --- a/libraries/DatabaseInterface.php +++ b/libraries/DatabaseInterface.php @@ -1417,80 +1417,37 @@ class DatabaseInterface public function postConnect($link) { if (! defined('PMA_MYSQL_INT_VERSION')) { - if (Util::cacheExists('PMA_MYSQL_INT_VERSION')) { + $version = $this->fetchSingleRow( + 'SELECT @@version, @@version_comment', + 'ASSOC', + $link + ); + + if ($version) { + $match = explode('.', $version['@@version']); + define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]); define( 'PMA_MYSQL_INT_VERSION', - Util::cacheGet('PMA_MYSQL_INT_VERSION') - ); - define( - 'PMA_MYSQL_MAJOR_VERSION', - Util::cacheGet('PMA_MYSQL_MAJOR_VERSION') - ); - define( - 'PMA_MYSQL_STR_VERSION', - Util::cacheGet('PMA_MYSQL_STR_VERSION') + (int) sprintf( + '%d%02d%02d', $match[0], $match[1], intval($match[2]) + ) ); + define('PMA_MYSQL_STR_VERSION', $version['@@version']); define( 'PMA_MYSQL_VERSION_COMMENT', - Util::cacheGet('PMA_MYSQL_VERSION_COMMENT') - ); - define( - 'PMA_MARIADB', - Util::cacheGet('PMA_MARIADB') + $version['@@version_comment'] ); } else { - $version = $this->fetchSingleRow( - 'SELECT @@version, @@version_comment', - 'ASSOC', - $link - ); - - if ($version) { - $match = explode('.', $version['@@version']); - define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]); - define( - 'PMA_MYSQL_INT_VERSION', - (int) sprintf( - '%d%02d%02d', $match[0], $match[1], intval($match[2]) - ) - ); - define('PMA_MYSQL_STR_VERSION', $version['@@version']); - define( - 'PMA_MYSQL_VERSION_COMMENT', - $version['@@version_comment'] - ); - } else { - define('PMA_MYSQL_INT_VERSION', 50501); - define('PMA_MYSQL_MAJOR_VERSION', 5); - define('PMA_MYSQL_STR_VERSION', '5.05.01'); - define('PMA_MYSQL_VERSION_COMMENT', ''); - } - Util::cacheSet( - 'PMA_MYSQL_INT_VERSION', - PMA_MYSQL_INT_VERSION - ); - Util::cacheSet( - 'PMA_MYSQL_MAJOR_VERSION', - PMA_MYSQL_MAJOR_VERSION - ); - Util::cacheSet( - 'PMA_MYSQL_STR_VERSION', - PMA_MYSQL_STR_VERSION - ); - Util::cacheSet( - 'PMA_MYSQL_VERSION_COMMENT', - PMA_MYSQL_VERSION_COMMENT - ); - /* Detect MariaDB */ - if (mb_strpos(PMA_MYSQL_STR_VERSION, 'MariaDB') !== false) { - define('PMA_MARIADB', true); - } else { - define('PMA_MARIADB', false); - } - Util::cacheSet( - 'PMA_MARIADB', - PMA_MARIADB - ); + define('PMA_MYSQL_INT_VERSION', 50501); + define('PMA_MYSQL_MAJOR_VERSION', 5); + define('PMA_MYSQL_STR_VERSION', '5.05.01'); + define('PMA_MYSQL_VERSION_COMMENT', ''); + } + /* Detect MariaDB */ + if (mb_strpos(PMA_MYSQL_STR_VERSION, 'MariaDB') !== false) { + define('PMA_MARIADB', true); + } else { + define('PMA_MARIADB', false); } } diff --git a/libraries/VersionInformation.php b/libraries/VersionInformation.php index a49a1b97b5..dcfa362991 100644 --- a/libraries/VersionInformation.php +++ b/libraries/VersionInformation.php @@ -269,6 +269,6 @@ class VersionInformation */ protected function getMySQLVersion() { - return Util::cacheGet('PMA_MYSQL_STR_VERSION'); + return PMA_MYSQL_STR_VERSION; } } From 0bea337231db23da3050d01fbeaf7efa466688c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 7 Sep 2016 09:29:35 +0200 Subject: [PATCH 22/41] Changelog for #11924 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 6703664aec..b7e9275d7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ phpMyAdmin - ChangeLog - issue #12534 Option for the dropped column is not removed from 'after_field' select, after the column is dropped - issue #12531 Properly detect DROP DATABASE queries - issue #12470 Fix possible race condition in setting URL hash +- issue #11924 Remove caching of server information 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 From 7ce0234a2cc0f04d4f360a6521998e1cfff13b64 Mon Sep 17 00:00:00 2001 From: Volkan Ulukut Date: Mon, 5 Sep 2016 14:44:19 +0300 Subject: [PATCH 23/41] Using number_format parameters instead of Util::localizeNumber Signed-off-by: Volkan Ulukut --- libraries/Util.php | 52 +++++++++---------- .../common/PMA_formatNumberByteDown_test.php | 3 ++ 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/libraries/Util.php b/libraries/Util.php index 04ab553884..b61dd3c53c 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -1475,26 +1475,6 @@ class Util return array(trim($return_value), $unit); } // end of the 'formatByteDown' function - /** - * Changes thousands and decimal separators to locale specific values. - * - * @param string $value the value - * - * @return string - */ - public static function localizeNumber($value) - { - return str_replace( - array(',', '.'), - array( - /* l10n: Thousands separator */ - __(','), - /* l10n: Decimal separator */ - __('.'), - ), - $value - ); - } /** * Formats $value to the given length and appends SI prefixes @@ -1536,11 +1516,18 @@ class Util $originalValue = $value; //number_format is not multibyte safe, str_replace is safe if ($digits_left === 0) { - $value = number_format($value, $digits_right); + $value = number_format( + $value, + $digits_right, + /* l10n: Decimal separator */ + __('.'), + /* l10n: Thousands separator */ + __(',') + ); if (($originalValue != 0) && (floatval($value) == 0)) { $value = ' <' . (1 / self::pow(10, $digits_right)); } - return self::localizeNumber($value); + return $value; } // this units needs no translation, ISO @@ -1597,19 +1584,32 @@ class Util $unit = $units[$d]; // number_format is not multibyte safe, str_replace is safe - $formattedValue = number_format($value, $digits_right); + $formattedValue = number_format( + $value, + $digits_right, + /* l10n: Decimal separator */ + __('.'), + /* l10n: Thousands separator */ + __(',') + ); // If we don't want any zeros, remove them now if ($noTrailingZero && strpos($formattedValue, '.') !== false) { $formattedValue = preg_replace('/\.?0+$/', '', $formattedValue); } - $localizedValue = self::localizeNumber($formattedValue); if ($originalValue != 0 && floatval($value) == 0) { - return ' <' . self::localizeNumber((1 / self::pow(10, $digits_right))) + return ' <' . number_format( + (1 / self::pow(10, $digits_right)), + $digits_right, + /* l10n: Decimal separator */ + __('.'), + /* l10n: Thousands separator */ + __(',') + ) . ' ' . $unit; } - return $sign . $localizedValue . ' ' . $unit; + return $sign . $formattedValue . ' ' . $unit; } // end of the 'formatNumber' function /** diff --git a/test/libraries/common/PMA_formatNumberByteDown_test.php b/test/libraries/common/PMA_formatNumberByteDown_test.php index 604e59b3e3..81e00f0d0a 100644 --- a/test/libraries/common/PMA_formatNumberByteDown_test.php +++ b/test/libraries/common/PMA_formatNumberByteDown_test.php @@ -73,6 +73,9 @@ class PMA_FormatNumberByteDown_Test extends PHPUnit_Framework_TestCase array(21010101, 0, 2, '21,010,101.00'), array(20000, 2, 2, '20 k'), array(20011, 2, 2, '20.01 k'), + array(123456789, 6, 0, '123,457 k'), + array(-123456789, 4, 2, '-123.46 M'), + array(0, 6, 0, '0') ); } From 4984c708941330f5fd7ba866c89b8da527bb0b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 7 Sep 2016 12:07:01 +0200 Subject: [PATCH 24/41] Changelog entry for #12302 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index d7e37a9c63..012eefaa03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog - issue #12474 Broken links in Setup forms Navigation - issue #12494 Can't add a new User - issue #12523 Add 'token' Parameter in all POST requests (Fix 'Token mismatch' errors) +- issue #12302 Improved usage of number_format 4.6.5 (not yet released) - issue Remove potentionally license problematic sRGB profile From b7c66598a475c9244ebade22b4ff853f994e8e8a Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 7 Sep 2016 11:45:38 +0000 Subject: [PATCH 25/41] Translated using Weblate (Slovak) Currently translated at 83.0% (2673 of 3219 strings) [CI skip] --- po/sk.po | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/po/sk.po b/po/sk.po index 1ebd309051..eb6bd63a72 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:28+0200\n" -"PO-Revision-Date: 2016-08-31 15:54+0000\n" -"Last-Translator: Jozef Pistej \n" +"PO-Revision-Date: 2016-09-07 11:45+0000\n" +"Last-Translator: Martin Lacina \n" "Language-Team: Slovak " "\n" "Language: sk\n" @@ -5319,10 +5319,9 @@ msgid "Could not connect to the database server!" msgstr "Nepodarilo sa pripojiť k databázovému serveru!" #: libraries/config/Validator.php:243 -#, fuzzy #| msgid "Authentication type" msgid "Invalid authentication type!" -msgstr "Typ overovania" +msgstr "Neplatný typ overenia!" #: libraries/config/Validator.php:250 msgid "Empty username while using [kbd]config[/kbd] authentication method!" @@ -5437,14 +5436,11 @@ msgid "Highlight pointer" msgstr "Zvýrazňovač" #: libraries/config/messages.inc.php:47 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " #| "import operations." msgid "Enable bzip2 compression for import operations." -msgstr "" -"Povoliť [a@https://en.wikipedia.org/wiki/Bzip2]bzip2[/a] kompresiu pre " -"importovanie." +msgstr "Povoliť bzip2 kompresiu pre operácie importu." #: libraries/config/messages.inc.php:50 msgid "Bzip2" @@ -5465,7 +5461,6 @@ msgid "CHAR columns editing" msgstr "Úprava polí typu CHAR" #: libraries/config/messages.inc.php:58 -#, fuzzy #| msgid "" #| "Use user-friendly editor for editing SQL queries ([a@https://codemirror." #| "net/]CodeMirror[/a]) with syntax highlighting and line numbers." @@ -5473,8 +5468,8 @@ msgid "" "Use user-friendly editor for editing SQL queries (CodeMirror) with syntax " "highlighting and line numbers." msgstr "" -"Použiť užívateľsky príjemný editor na úpravu SQL dozatazov ([a@https://" -"codemirror.net/]CodeMirror[/a]) s číslovaním riadkov a zvýrazňovaním syntaxe." +"Použiť užívateľsky príjemný editor na úpravu SQL dozatazov CodeMirror) s " +"číslovaním riadkov a zvýrazňovaním syntaxe." #: libraries/config/messages.inc.php:62 msgid "Enable CodeMirror" @@ -6225,14 +6220,11 @@ msgid "Disable some of the warnings shown by phpMyAdmin." msgstr "Vypnúť niektoré varovania zobrazované phpMyAdminom." #: libraries/config/messages.inc.php:353 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for " #| "import and export operations." msgid "Enable gzip compression for import and export operations." -msgstr "" -"Povolí [a@https://sk.wikipedia.org/wiki/GZ_(súborový_formát)]gzip[/a] " -"kompresiu pre importovanie a exportovanie." +msgstr "Povolí gzip kompresiu pre importovanie a exportovanie." #: libraries/config/messages.inc.php:356 msgid "GZip" @@ -6922,7 +6914,6 @@ msgid "Authentication type" msgstr "Typ overovania" #: libraries/config/messages.inc.php:640 -#, fuzzy #| msgid "" #| "Leave blank for no [a@https://wiki.phpmyadmin.net/pma/bookmark]bookmark[/" #| "a] support, suggested: [kbd]pma__bookmark[/kbd]" @@ -6930,8 +6921,8 @@ msgid "" "Leave blank for no [doc@bookmarks@]bookmark[/doc] support, suggested: " "[kbd]pma__bookmark[/kbd]" msgstr "" -"Nechajte prázdne pre žiadnu podporu [a@https://wiki.phpmyadmin.net/pma/" -"bookmark]záložiek[/a], navrhované: [kbd]pma__bookmark[/kbd]" +"Nechajte prázdne pre žiadnu podporu [doc@bookmarks@]záložiek[/doc], " +"navrhované: [kbd]pma__bookmark[/kbd]" #: libraries/config/messages.inc.php:643 msgid "Bookmark table" @@ -10727,7 +10718,7 @@ msgstr "Zapnuté" #: libraries/relation.lib.php:102 msgid "Configuration of pmadb…" -msgstr "Konfigurácia pmadb... " +msgstr "Konfigurácia pmadb…" #: libraries/relation.lib.php:106 libraries/relation.lib.php:142 msgid "General relation features" From 35bf74a174004f77f342e3ad3a25dc140db916e4 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 7 Sep 2016 11:45:34 +0000 Subject: [PATCH 26/41] Translated using Weblate (Slovak) Currently translated at 83.5% (2680 of 3206 strings) [CI skip] --- po/sk.po | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/po/sk.po b/po/sk.po index a113f46863..a0f4908228 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-08-31 15:54+0000\n" -"Last-Translator: Jozef Pistej \n" +"PO-Revision-Date: 2016-09-07 11:45+0000\n" +"Last-Translator: Martin Lacina \n" "Language-Team: Slovak " "\n" "Language: sk\n" @@ -5236,10 +5236,9 @@ msgid "Could not connect to the database server!" msgstr "Nepodarilo sa pripojiť k databázovému serveru!" #: libraries/config/Validator.php:243 -#, fuzzy #| msgid "Authentication type" msgid "Invalid authentication type!" -msgstr "Typ overovania" +msgstr "Neplatný typ overenia!" #: libraries/config/Validator.php:250 msgid "Empty username while using [kbd]config[/kbd] authentication method!" @@ -5354,14 +5353,11 @@ msgid "Highlight pointer" msgstr "Zvýrazňovač" #: libraries/config/messages.inc.php:47 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " #| "import operations." msgid "Enable bzip2 compression for import operations." -msgstr "" -"Povoliť [a@https://en.wikipedia.org/wiki/Bzip2]bzip2[/a] kompresiu pre " -"importovanie." +msgstr "Povoliť bzip2 kompresiu pre operácie importu." #: libraries/config/messages.inc.php:50 msgid "Bzip2" @@ -5382,7 +5378,6 @@ msgid "CHAR columns editing" msgstr "Úprava polí typu CHAR" #: libraries/config/messages.inc.php:58 -#, fuzzy #| msgid "" #| "Use user-friendly editor for editing SQL queries ([a@https://codemirror." #| "net/]CodeMirror[/a]) with syntax highlighting and line numbers." @@ -5390,8 +5385,8 @@ msgid "" "Use user-friendly editor for editing SQL queries (CodeMirror) with syntax " "highlighting and line numbers." msgstr "" -"Použiť užívateľsky príjemný editor na úpravu SQL dozatazov ([a@https://" -"codemirror.net/]CodeMirror[/a]) s číslovaním riadkov a zvýrazňovaním syntaxe." +"Použiť užívateľsky príjemný editor na úpravu SQL dozatazov CodeMirror) s " +"číslovaním riadkov a zvýrazňovaním syntaxe." #: libraries/config/messages.inc.php:62 msgid "Enable CodeMirror" @@ -6137,14 +6132,11 @@ msgid "Disable some of the warnings shown by phpMyAdmin." msgstr "Vypnúť niektoré varovania zobrazované phpMyAdminom." #: libraries/config/messages.inc.php:353 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for " #| "import and export operations." msgid "Enable gzip compression for import and export operations." -msgstr "" -"Povolí [a@https://sk.wikipedia.org/wiki/GZ_(súborový_formát)]gzip[/a] " -"kompresiu pre importovanie a exportovanie." +msgstr "Povolí gzip kompresiu pre importovanie a exportovanie." #: libraries/config/messages.inc.php:356 msgid "GZip" @@ -6828,7 +6820,6 @@ msgid "Authentication type" msgstr "Typ overovania" #: libraries/config/messages.inc.php:638 -#, fuzzy #| msgid "" #| "Leave blank for no [a@https://wiki.phpmyadmin.net/pma/bookmark]bookmark[/" #| "a] support, suggested: [kbd]pma__bookmark[/kbd]" @@ -6836,8 +6827,8 @@ msgid "" "Leave blank for no [doc@bookmarks@]bookmark[/doc] support, suggested: " "[kbd]pma__bookmark[/kbd]" msgstr "" -"Nechajte prázdne pre žiadnu podporu [a@https://wiki.phpmyadmin.net/pma/" -"bookmark]záložiek[/a], navrhované: [kbd]pma__bookmark[/kbd]" +"Nechajte prázdne pre žiadnu podporu [doc@bookmarks@]záložiek[/doc], " +"navrhované: [kbd]pma__bookmark[/kbd]" #: libraries/config/messages.inc.php:641 msgid "Bookmark table" @@ -10839,7 +10830,7 @@ msgstr "Zapnuté" #: libraries/relation.lib.php:101 msgid "Configuration of pmadb…" -msgstr "Konfigurácia pmadb... " +msgstr "Konfigurácia pmadb…" #: libraries/relation.lib.php:105 libraries/relation.lib.php:141 msgid "General relation features" From eacc094242b15a49e54168b5a035e56823e72196 Mon Sep 17 00:00:00 2001 From: jin123456bat <326550324@qq.com> Date: Fri, 9 Sep 2016 03:15:14 +0000 Subject: [PATCH 27/41] Translated using Weblate (Chinese (China)) Currently translated at 87.4% (2815 of 3219 strings) [CI skip] --- po/zh_CN.po | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 7148ccfb57..b384f44ccb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:28+0200\n" -"PO-Revision-Date: 2016-06-18 09:31+0000\n" -"Last-Translator: uncle_cat \n" -"Language-Team: Chinese (China) \n" +"PO-Revision-Date: 2016-09-09 03:15+0000\n" +"Last-Translator: jin123456bat <326550324@qq.com>\n" +"Language-Team: Chinese (China) " +"\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.7-dev\n" +"X-Generator: Weblate 2.8\n" #: changelog.php:38 license.php:33 #, fuzzy, php-format @@ -753,7 +753,7 @@ msgstr "配置文件现在需要一个短语密码。" #: index.php:529 msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "配置文件中的密文(blowfish_secret)太短。" #: index.php:543 msgid "" @@ -2453,7 +2453,6 @@ msgid "Time taken:" msgstr "用时：" #: js/messages.php:714 -#, fuzzy msgid "" "There was a problem accessing your browser storage, some features may not " "work properly for you. It is likely that the browser doesn't support storage " @@ -2461,11 +2460,9 @@ msgid "" "cause such a problem, clearing your \"Offline Website Data\" might help. In " "Safari, such problem is commonly caused by \"Private Mode Browsing\"." msgstr "" -"查看你的浏览器保存数据时出现错误，因此一些功能可能不能正常工作。造成这个问题" -"的原因可能是你的浏览器不支持保存数据或者浏览器能够保存的数据达到极限。另外对" -"于Firefox浏览器，这个问题可能是由于浏览器存储数据被损坏导致，清理浏览器的“离" -"线网站数据”可能会解决这个问题。对于Safari浏览器，这个问题通常是由于“隐私浏览" -"模式”导致的。" +"查看你的浏览器保存数据时出现错误，因此一些功能可能不能正常工作。造成这个问题的原因可能是你的浏览器不支持保存数据或者浏览器能够保存的数据达到极限。另外对于" +"Firefox浏览器，这个问题可能是由于浏览器存储数据被损坏导致，清理浏览器的“离线网站数据”可能会解决这个问题。对于Safari浏览器，这个问题通常是由" +"于“隐私浏览模式”导致的。" #: js/messages.php:716 msgid "Copy tables to" @@ -3632,7 +3629,7 @@ msgstr "上传文件时发生未知错误。" #: libraries/File.php:424 msgid "File is a symbolic link" -msgstr "" +msgstr "文件是一个符号链接" #: libraries/File.php:429 libraries/File.php:532 msgid "File could not be read!" @@ -5093,10 +5090,9 @@ msgid "You allow for connecting to the server without a password." msgstr "该服务器现在允许空密码登录。" #: libraries/config/ServerConfigChecks.php:349 -#, fuzzy #| msgid "Key is too short, it should have at least 8 characters." msgid "Key is too short, it should have at least 32 characters." -msgstr "短语密码太短，至少应有 8 个字符。" +msgstr "短语密码太短，至少应有 32 个字符。" #: libraries/config/ServerConfigChecks.php:359 msgid "Key should contain letters, numbers [em]and[/em] special characters." @@ -5217,10 +5213,9 @@ msgid "Could not connect to the database server!" msgstr "无法连接到数据库！" #: libraries/config/Validator.php:243 -#, fuzzy #| msgid "Authentication type" msgid "Invalid authentication type!" -msgstr "认证方式" +msgstr "无效的认证方式！" #: libraries/config/Validator.php:250 msgid "Empty username while using [kbd]config[/kbd] authentication method!" @@ -5321,12 +5316,11 @@ msgid "Highlight pointer" msgstr "高亮指针" #: libraries/config/messages.inc.php:47 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " #| "import operations." msgid "Enable bzip2 compression for import operations." -msgstr "允许在导入的时候使用bzip2进行压缩" +msgstr "导入的时候使用bzip2进行压缩。" #: libraries/config/messages.inc.php:50 msgid "Bzip2" From f797a8d87d8bf3cab3380747194ddd3c5db195e1 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Fri, 9 Sep 2016 20:25:12 +0530 Subject: [PATCH 28/41] Variables must be defined even if it's a GET Request Signed-off-by: Deven Bansod --- libraries/common.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index a7d9b78a9b..b757e744db 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -380,10 +380,10 @@ if (PMA_checkPageValidity($_REQUEST['back'], $goto_whitelist)) { * f.e. lang, server, collation_connection in PMA\libraries\Config */ -if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $token_mismatch = true; - $token_provided = false; +$token_mismatch = true; +$token_provided = false; +if ($_SERVER['REQUEST_METHOD'] == 'POST') { if (PMA_isValid($_POST['token'])) { $token_provided = true; $token_mismatch = ! hash_equals($_SESSION[' PMA_token '], $_POST['token']); From c73c720cb34eb4c050717c5def342b6655607ceb Mon Sep 17 00:00:00 2001 From: jin123456bat <326550324@qq.com> Date: Fri, 9 Sep 2016 03:15:10 +0000 Subject: [PATCH 29/41] Translated using Weblate (Chinese (China)) Currently translated at 87.9% (2819 of 3206 strings) [CI skip] --- po/zh_CN.po | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9835240f3a..acc410fd54 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-06-18 09:30+0000\n" -"Last-Translator: uncle_cat \n" -"Language-Team: Chinese (China) \n" +"PO-Revision-Date: 2016-09-09 03:15+0000\n" +"Last-Translator: jin123456bat <326550324@qq.com>\n" +"Language-Team: Chinese (China) " +"\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.7-dev\n" +"X-Generator: Weblate 2.8\n" #: changelog.php:38 license.php:33 #, php-format @@ -769,7 +769,7 @@ msgstr "配置文件现在需要一个短语密码。" #: index.php:525 msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "配置文件中的密文(blowfish_secret)太短。" #: index.php:539 msgid "" @@ -2462,7 +2462,6 @@ msgid "Time taken:" msgstr "用时：" #: js/messages.php:709 -#, fuzzy msgid "" "There was a problem accessing your browser storage, some features may not " "work properly for you. It is likely that the browser doesn't support storage " @@ -2470,11 +2469,9 @@ msgid "" "cause such a problem, clearing your \"Offline Website Data\" might help. In " "Safari, such problem is commonly caused by \"Private Mode Browsing\"." msgstr "" -"查看你的浏览器保存数据时出现错误，因此一些功能可能不能正常工作。造成这个问题" -"的原因可能是你的浏览器不支持保存数据或者浏览器能够保存的数据达到极限。另外对" -"于Firefox浏览器，这个问题可能是由于浏览器存储数据被损坏导致，清理浏览器的“离" -"线网站数据”可能会解决这个问题。对于Safari浏览器，这个问题通常是由于“隐私浏览" -"模式”导致的。" +"查看你的浏览器保存数据时出现错误，因此一些功能可能不能正常工作。造成这个问题的原因可能是你的浏览器不支持保存数据或者浏览器能够保存的数据达到极限。另外对于" +"Firefox浏览器，这个问题可能是由于浏览器存储数据被损坏导致，清理浏览器的“离线网站数据”可能会解决这个问题。对于Safari浏览器，这个问题通常是由" +"于“隐私浏览模式”导致的。" #: js/messages.php:711 msgid "Copy tables to" @@ -3563,7 +3560,7 @@ msgstr "上传文件时发生未知错误。" #: libraries/File.php:424 msgid "File is a symbolic link" -msgstr "" +msgstr "文件是一个符号链接" #: libraries/File.php:470 msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]." @@ -5014,10 +5011,9 @@ msgid "You allow for connecting to the server without a password." msgstr "该服务器现在允许空密码登录。" #: libraries/config/ServerConfigChecks.php:347 -#, fuzzy #| msgid "Key is too short, it should have at least 8 characters." msgid "Key is too short, it should have at least 32 characters." -msgstr "短语密码太短，至少应有 8 个字符。" +msgstr "短语密码太短，至少应有 32 个字符。" #: libraries/config/ServerConfigChecks.php:357 msgid "Key should contain letters, numbers [em]and[/em] special characters." @@ -5138,10 +5134,9 @@ msgid "Could not connect to the database server!" msgstr "无法连接到数据库！" #: libraries/config/Validator.php:243 -#, fuzzy #| msgid "Authentication type" msgid "Invalid authentication type!" -msgstr "认证方式" +msgstr "无效的认证方式！" #: libraries/config/Validator.php:250 msgid "Empty username while using [kbd]config[/kbd] authentication method!" @@ -5242,12 +5237,11 @@ msgid "Highlight pointer" msgstr "高亮指针" #: libraries/config/messages.inc.php:47 -#, fuzzy #| msgid "" #| "Enable [a@https://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " #| "import operations." msgid "Enable bzip2 compression for import operations." -msgstr "允许在导入的时候使用bzip2进行压缩" +msgstr "导入的时候使用bzip2进行压缩。" #: libraries/config/messages.inc.php:50 msgid "Bzip2" From 7fdffa313fb692675118720f2289b8712438b435 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Tue, 13 Sep 2016 01:08:56 +0530 Subject: [PATCH 30/41] Fix label for Add User Group form Signed-off-by: Deven Bansod --- libraries/server_user_groups.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/server_user_groups.lib.php b/libraries/server_user_groups.lib.php index 70368f0531..421b6b12ef 100644 --- a/libraries/server_user_groups.lib.php +++ b/libraries/server_user_groups.lib.php @@ -227,7 +227,8 @@ function PMA_getHtmlToEditUserGroup($userGroup = null) $html_output .= '
'; $html_output .= '' . __('User group menu assignments') . '   ' - . '' + . '' . '' . ''; From bc589dfbbf5202266a961927d439033f7f6e208a Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Tue, 13 Sep 2016 01:13:55 +0530 Subject: [PATCH 31/41] Fix Class name Signed-off-by: Deven Bansod --- libraries/server_user_groups.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/server_user_groups.lib.php b/libraries/server_user_groups.lib.php index 421b6b12ef..6b033b4cb1 100644 --- a/libraries/server_user_groups.lib.php +++ b/libraries/server_user_groups.lib.php @@ -352,7 +352,7 @@ function PMA_editUserGroup($userGroup, $new = false) } $tabName = $tabGroupName . '_' . $tab; $allowed = isset($_REQUEST[$tabName]) && $_REQUEST[$tabName] == 'Y'; - $sql_query .= "('" . PMA_Util::sqlAddSlashes($userGroup) . "', '" . $tabName . "', '" + $sql_query .= "('" . PMA\libraries\Util::sqlAddSlashes($userGroup) . "', '" . $tabName . "', '" . ($allowed ? "Y" : "N") . "')"; $first = false; } From 16474f3ddee0b194c3afcf8bffaba8df887a40f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 13 Sep 2016 11:04:07 +0200 Subject: [PATCH 32/41] Update SQL parser to 3.4.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - issue #11628 Proper parsing of INSERT ... ON DUPLICATE KEY queries - issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries Signed-off-by: Michal Čihař --- ChangeLog | 2 + .../src/Components/AlterOperation.php | 13 ++ .../src/Components/CreateDefinition.php | 17 ++ .../sql-parser/src/Components/IntoKeyword.php | 2 +- .../src/Components/OptionsArray.php | 19 ++ .../src/Components/PartitionDefinition.php | 2 +- .../src/Contexts/ContextMySql50000.php | 40 ++-- .../src/Contexts/ContextMySql50100.php | 45 +++-- .../src/Contexts/ContextMySql50500.php | 45 +++-- .../src/Contexts/ContextMySql50600.php | 53 ++--- .../src/Contexts/ContextMySql50700.php | 59 +++--- .../src/Statements/CreateStatement.php | 51 ++++- .../src/Statements/InsertStatement.php | 188 +++++++++++++++++- .../src/Statements/SetStatement.php | 29 +++ 14 files changed, 445 insertions(+), 120 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7e9275d7f..2c36696489 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,8 @@ phpMyAdmin - ChangeLog - issue #12531 Properly detect DROP DATABASE queries - issue #12470 Fix possible race condition in setting URL hash - issue #11924 Remove caching of server information +- issue #11628 Proper parsing of INSERT ... ON DUPLICATE KEY queries +- issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 diff --git a/libraries/sql-parser/src/Components/AlterOperation.php b/libraries/sql-parser/src/Components/AlterOperation.php index 10c27eac1f..3481e985df 100644 --- a/libraries/sql-parser/src/Components/AlterOperation.php +++ b/libraries/sql-parser/src/Components/AlterOperation.php @@ -51,6 +51,7 @@ class AlterOperation extends Component 'AVG_ROW_LENGTH' => array(1, 'var'), 'MAX_ROWS' => array(1, 'var'), 'ROW_FORMAT' => array(1, 'var'), + 'COMMENT' => array(1, 'var'), 'ADD' => 1, 'ALTER' => 1, 'ANALYZE' => 1, @@ -219,6 +220,17 @@ class AlterOperation extends Component } elseif (($token->value === ',') && ($brackets === 0)) { break; } + } elseif (!empty(Parser::$STATEMENT_PARSERS[$token->value])) { + // We have reached the end of ALTER operation and suddenly found + // a start to new statement, but have not find a delimiter between them + + if (! ($token->value == 'SET' && $list->tokens[$list->idx - 1]->value == 'CHARACTER')) { + $parser->error( + __('A new statement was found, but no delimiter between it and the previous one.'), + $token + ); + break; + } } $ret->unknown[] = $token; } @@ -232,6 +244,7 @@ class AlterOperation extends Component } --$list->idx; + return $ret; } diff --git a/libraries/sql-parser/src/Components/CreateDefinition.php b/libraries/sql-parser/src/Components/CreateDefinition.php index c6f0bb0a45..6e302d08d1 100644 --- a/libraries/sql-parser/src/Components/CreateDefinition.php +++ b/libraries/sql-parser/src/Components/CreateDefinition.php @@ -220,6 +220,23 @@ class CreateDefinition extends Component if (!$expr->isConstraint) { $state = 2; } + } else if ($token->type === Token::TYPE_KEYWORD) { + if ($token->flags & Token::FLAG_KEYWORD_RESERVED) { + // Reserved keywords can't be used + // as field names without backquotes + $parser->error( + __('A symbol name was expected! ' + . 'A reserved keyword can not be used ' + . 'as a field name without backquotes.' + ), + $token + ); + return $ret; + } else { + // Non-reserved keywords are allowed without backquotes + $expr->name = $token->value; + $state = 2; + } } else { $parser->error( __('A symbol name was expected!'), diff --git a/libraries/sql-parser/src/Components/IntoKeyword.php b/libraries/sql-parser/src/Components/IntoKeyword.php index 56f349feb6..783ac3cdb3 100644 --- a/libraries/sql-parser/src/Components/IntoKeyword.php +++ b/libraries/sql-parser/src/Components/IntoKeyword.php @@ -139,7 +139,7 @@ class IntoKeyword extends Component { if ($component->dest instanceof Expression) { $columns = !empty($component->columns) ? - '(' . implode(', ', $component->columns) . ')' : ''; + '(`' . implode('`, `', $component->columns) . '`)' : ''; return $component->dest . $columns; } else { return 'OUTFILE "' . $component->dest . '"'; diff --git a/libraries/sql-parser/src/Components/OptionsArray.php b/libraries/sql-parser/src/Components/OptionsArray.php index 3d2fdedd7e..c048e19b29 100644 --- a/libraries/sql-parser/src/Components/OptionsArray.php +++ b/libraries/sql-parser/src/Components/OptionsArray.php @@ -242,6 +242,25 @@ class OptionsArray extends Component } } + /* + * We reached the end of statement without getting a value + * for an option for which a value was required + */ + if ($state === 1 + && $lastOption + && ($lastOption[1] == 'expr' + || $lastOption[1] == 'var' + || $lastOption[1] == 'var=') + ) { + $parser->error( + sprintf( + __('Value/Expression for the option %1$s was expected'), + $ret->options[$lastOptionId]['name'] + ), + $list->tokens[$list->idx - 1] + ); + } + if (empty($options['_UNSORTED'])) { ksort($ret->options); } diff --git a/libraries/sql-parser/src/Components/PartitionDefinition.php b/libraries/sql-parser/src/Components/PartitionDefinition.php index 06dc5fc0d8..85342d7050 100644 --- a/libraries/sql-parser/src/Components/PartitionDefinition.php +++ b/libraries/sql-parser/src/Components/PartitionDefinition.php @@ -215,7 +215,7 @@ class PartitionDefinition extends Component ? '' : ' ' . PartitionDefinition::build($component->subpartitions); return trim( 'PARTITION ' . $component->name - . (empty($component->type) ? '' : ' VALUES ' . $component->type . ' ' . $component->expr) + . (empty($component->type) ? '' : ' VALUES ' . $component->type . ' ' . $component->expr . ' ') . $component->options . $subpartitions ); } diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/libraries/sql-parser/src/Contexts/ContextMySql50000.php index 93f026810f..d9a254479b 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50000.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50000.php @@ -66,11 +66,10 @@ class ContextMySql50000 extends Context 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'VIRTUAL' => 1, 'CASCADED' => 1, 'CHECKSUM' => 1, 'DUMPFILE' => 1, 'EXTENDED' => 1, - 'FUNCTION' => 1, 'GEOMETRY' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1, - 'MAX_ROWS' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, - 'ONE_SHOT' => 1, 'PROFILES' => 1, 'ROLLBACK' => 1, 'SECURITY' => 1, - 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, 'TRIGGERS' => 1, - 'WARNINGS' => 1, + 'FUNCTION' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1, 'MAX_ROWS' => 1, + 'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, 'ONE_SHOT' => 1, + 'PROFILES' => 1, 'ROLLBACK' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1, + 'SNAPSHOT' => 1, 'SWITCHES' => 1, 'TRIGGERS' => 1, 'WARNINGS' => 1, 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1, 'PACK_KEYS' => 1, 'RAID_TYPE' => 1, 'REDUNDANT' => 1, 'SAVEPOINT' => 1, @@ -167,7 +166,9 @@ class ContextMySql50000 extends Context 'ARRAY' => 9, 'SERIAL' => 9, 'BOOLEAN' => 9, - 'DATETIME' => 9, 'MULTISET' => 9, + 'DATETIME' => 9, 'GEOMETRY' => 9, 'MULTISET' => 9, + 'MULTILINEPOINT' => 9, + 'MULTILINEPOLYGON' => 9, 'INT' => 11, 'SET' => 11, 'BLOB' => 11, 'REAL' => 11, @@ -206,9 +207,9 @@ class ContextMySql50000 extends Context 'UUID' => 33, 'WEEK' => 33, 'ASCII' => 33, 'ATAN2' => 33, 'COUNT' => 33, 'CRC32' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33, 'LEAST' => 33, 'LOG10' => 33, - 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33, 'POINT' => 33, 'POWER' => 33, - 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, 'SLEEP' => 33, 'SPACE' => 33, - 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, + 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33, 'POWER' => 33, 'QUOTE' => 33, + 'ROUND' => 33, 'RTRIM' => 33, 'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33, + 'UNHEX' => 33, 'UPPER' => 33, 'ASTEXT' => 33, 'BIT_OR' => 33, 'CONCAT' => 33, 'DECODE' => 33, 'ENCODE' => 33, 'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, 'LENGTH' => 33, 'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, 'SECOND' => 33, @@ -216,9 +217,9 @@ class ContextMySql50000 extends Context 'ADDDATE' => 33, 'ADDTIME' => 33, 'AGAINST' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33, 'CEILING' => 33, 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33, 'DAYNAME' => 33, 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33, - 'ISEMPTY' => 33, 'POLYGON' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, - 'SOUNDEX' => 33, 'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, - 'TO_DAYS' => 33, 'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33, + 'ISEMPTY' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, 'SOUNDEX' => 33, + 'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, + 'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33, 'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33, 'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33, 'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33, @@ -232,9 +233,9 @@ class ContextMySql50000 extends Context 'MBRWITHIN' => 33, 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33, 'SUBSTRING' => 33, 'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33, - 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'LINESTRING' => 33, - 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, - 'STARTPOINT' => 33, 'STDDEV_POP' => 33, 'UNCOMPRESS' => 33, 'WEEKOFYEAR' => 33, + 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'MBRTOUCHES' => 33, + 'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33, + 'STDDEV_POP' => 33, 'UNCOMPRESS' => 33, 'WEEKOFYEAR' => 33, 'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33, 'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'GEOMFROMWKB' => 33, 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, 'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33, @@ -252,10 +253,8 @@ class ContextMySql50000 extends Context 'MPOLYFROMTEXT' => 33, 'NUMGEOMETRIES' => 33, 'POINTFROMTEXT' => 33, 'TIMESTAMPDIFF' => 33, 'LAST_INSERT_ID' => 33, 'MPOINTFROMTEXT' => 33, 'UNIX_TIMESTAMP' => 33, - 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'MULTILINESTRING' => 33, - 'SUBSTRING_INDEX' => 33, + 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'SUBSTRING_INDEX' => 33, 'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'NUMINTERIORRINGS' => 33, - 'GEOMETRYCOLLECTION' => 33, 'UNCOMPRESSED_LENGTH' => 33, 'IF' => 35, 'IN' => 35, @@ -274,7 +273,12 @@ class ContextMySql50000 extends Context 'NOT IN' => 39, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, + 'POINT' => 41, + 'POLYGON' => 41, 'TIMESTAMP' => 41, + 'LINESTRING' => 41, + 'MULTILINESTRING' => 41, + 'GEOMETRYCOLLECTION' => 41, 'CHAR' => 43, 'INTERVAL' => 43, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/libraries/sql-parser/src/Contexts/ContextMySql50100.php index 5b15f5f118..ffa8ad8cc9 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50100.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50100.php @@ -71,12 +71,12 @@ class ContextMySql50100 extends Context 'STORAGE' => 1, 'STRIPED' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'VIRTUAL' => 1, 'WRAPPER' => 1, 'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1, - 'EXTENDED' => 1, 'FUNCTION' => 1, 'GEOMETRY' => 1, 'INNOBASE' => 1, - 'LANGUAGE' => 1, 'MAXVALUE' => 1, 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, - 'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, 'ONE_SHOT' => 1, - 'PRESERVE' => 1, 'PROFILES' => 1, 'REDOFILE' => 1, 'ROLLBACK' => 1, - 'SCHEDULE' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, - 'SWITCHES' => 1, 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'EXTENDED' => 1, 'FUNCTION' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1, + 'MAXVALUE' => 1, 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, + 'NATIONAL' => 1, 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PRESERVE' => 1, + 'PROFILES' => 1, 'REDOFILE' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, + 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, + 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'PARTITION' => 1, 'RAID_TYPE' => 1, @@ -180,7 +180,9 @@ class ContextMySql50100 extends Context 'ARRAY' => 9, 'SERIAL' => 9, 'BOOLEAN' => 9, - 'DATETIME' => 9, 'MULTISET' => 9, + 'DATETIME' => 9, 'GEOMETRY' => 9, 'MULTISET' => 9, + 'MULTILINEPOINT' => 9, + 'MULTILINEPOLYGON' => 9, 'INT' => 11, 'SET' => 11, 'BLOB' => 11, 'REAL' => 11, @@ -220,9 +222,8 @@ class ContextMySql50100 extends Context 'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33, 'CRC32' => 33, 'DECOD' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33, 'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33, - 'MONTH' => 33, 'POINT' => 33, 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, - 'RTRIM' => 33, 'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, - 'UPPER' => 33, + 'MONTH' => 33, 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, + 'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, 'ASTEXT' => 33, 'BIT_OR' => 33, 'CONCAT' => 33, 'ENCODE' => 33, 'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, 'LENGTH' => 33, 'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, 'SECOND' => 33, 'STDDEV' => 33, @@ -230,9 +231,9 @@ class ContextMySql50100 extends Context 'ADDDATE' => 33, 'ADDTIME' => 33, 'AGAINST' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33, 'CEILING' => 33, 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33, 'DAYNAME' => 33, 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33, - 'ISEMPTY' => 33, 'POLYGON' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, - 'SOUNDEX' => 33, 'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, - 'TO_DAYS' => 33, 'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33, + 'ISEMPTY' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, 'SOUNDEX' => 33, + 'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, + 'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33, 'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33, 'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33, 'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33, @@ -246,10 +247,9 @@ class ContextMySql50100 extends Context 'MBRWITHIN' => 33, 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33, 'SUBSTRING' => 33, 'UPDATEXML' => 33, 'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33, - 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'LINESTRING' => 33, - 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, - 'STARTPOINT' => 33, 'STDDEV_POP' => 33, 'UNCOMPRESS' => 33, 'UUID_SHORT' => 33, - 'WEEKOFYEAR' => 33, + 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'MBRTOUCHES' => 33, + 'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33, + 'STDDEV_POP' => 33, 'UNCOMPRESS' => 33, 'UUID_SHORT' => 33, 'WEEKOFYEAR' => 33, 'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33, 'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'GEOMFROMWKB' => 33, 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, 'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33, @@ -269,12 +269,12 @@ class ContextMySql50100 extends Context 'TIMESTAMPDIFF' => 33, 'LAST_INSERT_ID' => 33, 'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33, 'UNIX_TIMESTAMP' => 33, - 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'MULTILINESTRING' => 33, - 'POLYGONFROMTEXT' => 33, 'SUBSTRING_INDEX' => 33, + 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'POLYGONFROMTEXT' => 33, + 'SUBSTRING_INDEX' => 33, 'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33, 'NUMINTERIORRINGS' => 33, 'LINESTRINGFROMWKB' => 33, 'MULTIPOINTFROMWKB' => 33, - 'GEOMETRYCOLLECTION' => 33, 'MULTIPOINTFROMTEXT' => 33, + 'MULTIPOINTFROMTEXT' => 33, 'MULTIPOLYGONFROMWKB' => 33, 'UNCOMPRESSED_LENGTH' => 33, 'MULTIPOLYGONFROMTEXT' => 33, 'MULTILINESTRINGFROMWKB' => 33, @@ -298,7 +298,12 @@ class ContextMySql50100 extends Context 'NOT IN' => 39, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, + 'POINT' => 41, + 'POLYGON' => 41, 'TIMESTAMP' => 41, + 'LINESTRING' => 41, + 'MULTILINESTRING' => 41, + 'GEOMETRYCOLLECTION' => 41, 'CHAR' => 43, 'INTERVAL' => 43, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/libraries/sql-parser/src/Contexts/ContextMySql50500.php index cb5fdc3c22..ed64233200 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50500.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50500.php @@ -71,12 +71,12 @@ class ContextMySql50500 extends Context 'SESSION' => 1, 'STORAGE' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'VIRTUAL' => 1, 'WRAPPER' => 1, 'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1, - 'EXTENDED' => 1, 'FUNCTION' => 1, 'GEOMETRY' => 1, 'INNOBASE' => 1, - 'LANGUAGE' => 1, 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, - 'NATIONAL' => 1, 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PRESERVE' => 1, - 'PROFILES' => 1, 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, - 'SCHEDULE' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, - 'SWITCHES' => 1, 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'EXTENDED' => 1, 'FUNCTION' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1, + 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, + 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PRESERVE' => 1, 'PROFILES' => 1, + 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, + 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, + 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'PARTITION' => 1, 'READ_ONLY' => 1, @@ -184,7 +184,9 @@ class ContextMySql50500 extends Context 'ARRAY' => 9, 'SERIAL' => 9, 'BOOLEAN' => 9, - 'DATETIME' => 9, 'MULTISET' => 9, + 'DATETIME' => 9, 'GEOMETRY' => 9, 'MULTISET' => 9, + 'MULTILINEPOINT' => 9, + 'MULTILINEPOLYGON' => 9, 'INT' => 11, 'SET' => 11, 'BLOB' => 11, 'REAL' => 11, @@ -224,8 +226,8 @@ class ContextMySql50500 extends Context 'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33, 'CRC32' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33, 'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33, - 'POINT' => 33, 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, - 'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, + 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, 'SLEEP' => 33, + 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, 'ASTEXT' => 33, 'BIT_OR' => 33, 'CONCAT' => 33, 'DECODE' => 33, 'ENCODE' => 33, 'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, 'LENGTH' => 33, 'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, 'SECOND' => 33, @@ -233,9 +235,9 @@ class ContextMySql50500 extends Context 'ADDDATE' => 33, 'ADDTIME' => 33, 'AGAINST' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33, 'CEILING' => 33, 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33, 'DAYNAME' => 33, 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33, - 'ISEMPTY' => 33, 'POLYGON' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, - 'SOUNDEX' => 33, 'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, - 'TO_DAYS' => 33, 'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33, + 'ISEMPTY' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, 'SOUNDEX' => 33, + 'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, + 'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33, 'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33, 'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33, 'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33, @@ -249,10 +251,10 @@ class ContextMySql50500 extends Context 'MBRWITHIN' => 33, 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33, 'SUBSTRING' => 33, 'UPDATEXML' => 33, 'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33, - 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'LINESTRING' => 33, - 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, - 'STARTPOINT' => 33, 'STDDEV_POP' => 33, 'TO_SECONDS' => 33, 'UNCOMPRESS' => 33, - 'UUID_SHORT' => 33, 'WEEKOFYEAR' => 33, + 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'MBRTOUCHES' => 33, + 'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33, + 'STDDEV_POP' => 33, 'TO_SECONDS' => 33, 'UNCOMPRESS' => 33, 'UUID_SHORT' => 33, + 'WEEKOFYEAR' => 33, 'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33, 'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'GEOMFROMWKB' => 33, 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, 'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33, @@ -272,12 +274,12 @@ class ContextMySql50500 extends Context 'TIMESTAMPDIFF' => 33, 'LAST_INSERT_ID' => 33, 'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33, 'UNIX_TIMESTAMP' => 33, - 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'MULTILINESTRING' => 33, - 'POLYGONFROMTEXT' => 33, 'SUBSTRING_INDEX' => 33, + 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'POLYGONFROMTEXT' => 33, + 'SUBSTRING_INDEX' => 33, 'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33, 'NUMINTERIORRINGS' => 33, 'LINESTRINGFROMWKB' => 33, 'MULTIPOINTFROMWKB' => 33, - 'GEOMETRYCOLLECTION' => 33, 'MULTIPOINTFROMTEXT' => 33, + 'MULTIPOINTFROMTEXT' => 33, 'MULTIPOLYGONFROMWKB' => 33, 'UNCOMPRESSED_LENGTH' => 33, 'MULTIPOLYGONFROMTEXT' => 33, 'MULTILINESTRINGFROMWKB' => 33, @@ -301,7 +303,12 @@ class ContextMySql50500 extends Context 'NOT IN' => 39, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, + 'POINT' => 41, + 'POLYGON' => 41, 'TIMESTAMP' => 41, + 'LINESTRING' => 41, + 'MULTILINESTRING' => 41, + 'GEOMETRYCOLLECTION' => 41, 'CHAR' => 43, 'INTERVAL' => 43, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/libraries/sql-parser/src/Contexts/ContextMySql50600.php index aca5f7bbcd..4a2c132528 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50600.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50600.php @@ -72,12 +72,12 @@ class ContextMySql50600 extends Context 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'VIRTUAL' => 1, 'WRAPPER' => 1, 'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1, - 'EXCHANGE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, 'GEOMETRY' => 1, - 'LANGUAGE' => 1, 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, - 'NATIONAL' => 1, 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PRESERVE' => 1, - 'PROFILES' => 1, 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, - 'SCHEDULE' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, - 'SWITCHES' => 1, 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'EXCHANGE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, 'LANGUAGE' => 1, + 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, + 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PRESERVE' => 1, 'PROFILES' => 1, + 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, + 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, + 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'READ_ONLY' => 1, 'REDUNDANT' => 1, @@ -190,7 +190,9 @@ class ContextMySql50600 extends Context 'ARRAY' => 9, 'SERIAL' => 9, 'BOOLEAN' => 9, - 'DATETIME' => 9, 'MULTISET' => 9, + 'DATETIME' => 9, 'GEOMETRY' => 9, 'MULTISET' => 9, + 'MULTILINEPOINT' => 9, + 'MULTILINEPOLYGON' => 9, 'INT' => 11, 'SET' => 11, 'BLOB' => 11, 'REAL' => 11, @@ -230,8 +232,8 @@ class ContextMySql50600 extends Context 'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33, 'CRC32' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33, 'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33, - 'POINT' => 33, 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, - 'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, + 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, 'SLEEP' => 33, + 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, 'ASTEXT' => 33, 'BIT_OR' => 33, 'BUFFER' => 33, 'CONCAT' => 33, 'DECODE' => 33, 'ENCODE' => 33, 'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, 'LENGTH' => 33, 'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, @@ -239,10 +241,10 @@ class ContextMySql50600 extends Context 'ADDDATE' => 33, 'ADDTIME' => 33, 'AGAINST' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33, 'CEILING' => 33, 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33, 'DAYNAME' => 33, 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33, - 'ISEMPTY' => 33, 'IS_IPV4' => 33, 'IS_IPV6' => 33, 'POLYGON' => 33, 'QUARTER' => 33, - 'RADIANS' => 33, 'REVERSE' => 33, 'SOUNDEX' => 33, 'ST_AREA' => 33, 'ST_SRID' => 33, - 'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, - 'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33, + 'ISEMPTY' => 33, 'IS_IPV4' => 33, 'IS_IPV6' => 33, 'QUARTER' => 33, 'RADIANS' => 33, + 'REVERSE' => 33, 'SOUNDEX' => 33, 'ST_AREA' => 33, 'ST_SRID' => 33, 'SUBDATE' => 33, + 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, 'VAR_POP' => 33, + 'VERSION' => 33, 'WEEKDAY' => 33, 'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33, 'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33, 'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33, @@ -259,10 +261,10 @@ class ContextMySql50600 extends Context 'ST_WITHIN' => 33, 'SUBSTRING' => 33, 'TO_BASE64' => 33, 'UPDATEXML' => 33, 'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33, 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INET6_ATON' => 33, 'INET6_NTOA' => 33, - 'INTERSECTS' => 33, 'LINESTRING' => 33, 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33, - 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33, 'STDDEV_POP' => 33, - 'ST_CROSSES' => 33, 'ST_ISEMPTY' => 33, 'ST_TOUCHES' => 33, 'TO_SECONDS' => 33, - 'UNCOMPRESS' => 33, 'UUID_SHORT' => 33, 'WEEKOFYEAR' => 33, + 'INTERSECTS' => 33, 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33, 'NAME_CONST' => 33, + 'PERIOD_ADD' => 33, 'STARTPOINT' => 33, 'STDDEV_POP' => 33, 'ST_CROSSES' => 33, + 'ST_ISEMPTY' => 33, 'ST_TOUCHES' => 33, 'TO_SECONDS' => 33, 'UNCOMPRESS' => 33, + 'UUID_SHORT' => 33, 'WEEKOFYEAR' => 33, 'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33, 'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'FROM_BASE64' => 33, 'GEOMFROMWKB' => 33, 'GTID_SUBSET' => 33, 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, @@ -290,18 +292,16 @@ class ContextMySql50600 extends Context 'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33, 'ST_GEOMFROMWKB' => 33, 'ST_LINEFROMWKB' => 33, 'ST_POLYFROMWKB' => 33, 'UNIX_TIMESTAMP' => 33, 'ASYMMETRIC_SIGN' => 33, 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, - 'MULTILINESTRING' => 33, 'POLYGONFROMTEXT' => 33, 'ST_EXTERIORRING' => 33, - 'ST_GEOMETRYTYPE' => 33, 'ST_GEOMFROMTEXT' => 33, 'ST_INTERSECTION' => 33, - 'ST_LINEFROMTEXT' => 33, 'ST_POINTFROMWKB' => 33, 'ST_POLYFROMTEXT' => 33, - 'SUBSTRING_INDEX' => 33, + 'POLYGONFROMTEXT' => 33, 'ST_EXTERIORRING' => 33, 'ST_GEOMETRYTYPE' => 33, + 'ST_GEOMFROMTEXT' => 33, 'ST_INTERSECTION' => 33, 'ST_LINEFROMTEXT' => 33, + 'ST_POINTFROMWKB' => 33, 'ST_POLYFROMTEXT' => 33, 'SUBSTRING_INDEX' => 33, 'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33, 'NUMINTERIORRINGS' => 33, 'ST_INTERIORRINGN' => 33, 'ST_NUMGEOMETRIES' => 33, 'ST_POINTFROMTEXT' => 33, 'ST_SYMDIFFERENCE' => 33, 'ASYMMETRIC_DERIVE' => 33, 'ASYMMETRIC_VERIFY' => 33, 'LINESTRINGFROMWKB' => 33, 'MULTIPOINTFROMWKB' => 33, 'ST_POLYGONFROMWKB' => 33, - 'ASYMMETRIC_DECRYPT' => 33, 'ASYMMETRIC_ENCRYPT' => 33, 'GEOMETRYCOLLECTION' => 33, - 'MULTIPOINTFROMTEXT' => 33, 'ST_GEOMCOLLFROMTXT' => 33, 'ST_GEOMCOLLFROMWKB' => 33, - 'ST_POLYGONFROMTEXT' => 33, + 'ASYMMETRIC_DECRYPT' => 33, 'ASYMMETRIC_ENCRYPT' => 33, 'MULTIPOINTFROMTEXT' => 33, + 'ST_GEOMCOLLFROMTXT' => 33, 'ST_GEOMCOLLFROMWKB' => 33, 'ST_POLYGONFROMTEXT' => 33, 'MULTIPOLYGONFROMWKB' => 33, 'ST_GEOMCOLLFROMTEXT' => 33, 'ST_GEOMETRYFROMTEXT' => 33, 'ST_NUMINTERIORRINGS' => 33, 'UNCOMPRESSED_LENGTH' => 33, 'CREATE_DH_PARAMETERS' => 33, 'MULTIPOLYGONFROMTEXT' => 33, @@ -332,7 +332,12 @@ class ContextMySql50600 extends Context 'NOT IN' => 39, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, + 'POINT' => 41, + 'POLYGON' => 41, 'TIMESTAMP' => 41, + 'LINESTRING' => 41, + 'MULTILINESTRING' => 41, + 'GEOMETRYCOLLECTION' => 41, 'CHAR' => 43, 'INTERVAL' => 43, diff --git a/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/libraries/sql-parser/src/Contexts/ContextMySql50700.php index 3f425169e2..1b6eb9c18c 100644 --- a/libraries/sql-parser/src/Contexts/ContextMySql50700.php +++ b/libraries/sql-parser/src/Contexts/ContextMySql50700.php @@ -73,12 +73,12 @@ class ContextMySql50700 extends Context 'STACKED' => 1, 'STORAGE' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'WITHOUT' => 1, 'WRAPPER' => 1, 'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1, - 'EXCHANGE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, 'GEOMETRY' => 1, - 'LANGUAGE' => 1, 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, - 'NATIONAL' => 1, 'NVARCHAR' => 1, 'PRECEDES' => 1, 'PRESERVE' => 1, - 'PROFILES' => 1, 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, - 'SCHEDULE' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, - 'SWITCHES' => 1, 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, + 'EXCHANGE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, 'LANGUAGE' => 1, + 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1, + 'NVARCHAR' => 1, 'PRECEDES' => 1, 'PRESERVE' => 1, 'PROFILES' => 1, + 'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1, + 'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1, + 'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1, 'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1, 'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1, 'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'READ_ONLY' => 1, 'REDUNDANT' => 1, @@ -196,7 +196,9 @@ class ContextMySql50700 extends Context 'ARRAY' => 9, 'SERIAL' => 9, 'BOOLEAN' => 9, - 'DATETIME' => 9, 'MULTISET' => 9, + 'DATETIME' => 9, 'GEOMETRY' => 9, 'MULTISET' => 9, + 'MULTILINEPOINT' => 9, + 'MULTILINEPOLYGON' => 9, 'INT' => 11, 'SET' => 11, 'BLOB' => 11, 'REAL' => 11, @@ -236,8 +238,8 @@ class ContextMySql50700 extends Context 'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33, 'CRC32' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33, 'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33, - 'POINT' => 33, 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, - 'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, + 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, 'SLEEP' => 33, + 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33, 'ASTEXT' => 33, 'BIT_OR' => 33, 'BUFFER' => 33, 'CONCAT' => 33, 'DECODE' => 33, 'ENCODE' => 33, 'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, 'LENGTH' => 33, 'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, @@ -245,10 +247,10 @@ class ContextMySql50700 extends Context 'ADDDATE' => 33, 'ADDTIME' => 33, 'AGAINST' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33, 'CEILING' => 33, 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33, 'DAYNAME' => 33, 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33, - 'ISEMPTY' => 33, 'IS_IPV4' => 33, 'IS_IPV6' => 33, 'POLYGON' => 33, 'QUARTER' => 33, - 'RADIANS' => 33, 'REVERSE' => 33, 'SOUNDEX' => 33, 'ST_AREA' => 33, 'ST_SRID' => 33, - 'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, - 'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33, + 'ISEMPTY' => 33, 'IS_IPV4' => 33, 'IS_IPV6' => 33, 'QUARTER' => 33, 'RADIANS' => 33, + 'REVERSE' => 33, 'SOUNDEX' => 33, 'ST_AREA' => 33, 'ST_SRID' => 33, 'SUBDATE' => 33, + 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, 'VAR_POP' => 33, + 'VERSION' => 33, 'WEEKDAY' => 33, 'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33, 'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33, 'DISJOINT' => 33, 'DISTANCE' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, @@ -266,11 +268,11 @@ class ContextMySql50700 extends Context 'ST_WITHIN' => 33, 'SUBSTRING' => 33, 'TO_BASE64' => 33, 'UPDATEXML' => 33, 'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'CONVEXHULL' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33, 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INET6_ATON' => 33, - 'INET6_NTOA' => 33, 'INTERSECTS' => 33, 'LINESTRING' => 33, 'MBRTOUCHES' => 33, - 'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33, - 'STDDEV_POP' => 33, 'ST_CROSSES' => 33, 'ST_GEOHASH' => 33, 'ST_ISEMPTY' => 33, - 'ST_ISVALID' => 33, 'ST_TOUCHES' => 33, 'TO_SECONDS' => 33, 'UNCOMPRESS' => 33, - 'UUID_SHORT' => 33, 'WEEKOFYEAR' => 33, + 'INET6_NTOA' => 33, 'INTERSECTS' => 33, 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33, + 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33, 'STDDEV_POP' => 33, + 'ST_CROSSES' => 33, 'ST_GEOHASH' => 33, 'ST_ISEMPTY' => 33, 'ST_ISVALID' => 33, + 'ST_TOUCHES' => 33, 'TO_SECONDS' => 33, 'UNCOMPRESS' => 33, 'UUID_SHORT' => 33, + 'WEEKOFYEAR' => 33, 'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33, 'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'FROM_BASE64' => 33, 'GEOMFROMWKB' => 33, 'GTID_SUBSET' => 33, 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, @@ -298,20 +300,20 @@ class ContextMySql50700 extends Context 'IS_IPV4_COMPAT' => 33, 'IS_IPV4_MAPPED' => 33, 'LAST_INSERT_ID' => 33, 'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33, 'ST_GEOMFROMWKB' => 33, 'ST_LINEFROMWKB' => 33, 'ST_POLYFROMWKB' => 33, 'UNIX_TIMESTAMP' => 33, - 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'MULTILINESTRING' => 33, - 'POLYGONFROMTEXT' => 33, 'ST_EXTERIORRING' => 33, 'ST_GEOMETRYTYPE' => 33, - 'ST_GEOMFROMTEXT' => 33, 'ST_INTERSECTION' => 33, 'ST_LINEFROMTEXT' => 33, - 'ST_MAKEENVELOPE' => 33, 'ST_MLINEFROMWKB' => 33, 'ST_MPOLYFROMWKB' => 33, - 'ST_POINTFROMWKB' => 33, 'ST_POLYFROMTEXT' => 33, 'SUBSTRING_INDEX' => 33, + 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'POLYGONFROMTEXT' => 33, + 'ST_EXTERIORRING' => 33, 'ST_GEOMETRYTYPE' => 33, 'ST_GEOMFROMTEXT' => 33, + 'ST_INTERSECTION' => 33, 'ST_LINEFROMTEXT' => 33, 'ST_MAKEENVELOPE' => 33, + 'ST_MLINEFROMWKB' => 33, 'ST_MPOLYFROMWKB' => 33, 'ST_POINTFROMWKB' => 33, + 'ST_POLYFROMTEXT' => 33, 'SUBSTRING_INDEX' => 33, 'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33, 'NUMINTERIORRINGS' => 33, 'ST_INTERIORRINGN' => 33, 'ST_MLINEFROMTEXT' => 33, 'ST_MPOINTFROMWKB' => 33, 'ST_MPOLYFROMTEXT' => 33, 'ST_NUMGEOMETRIES' => 33, 'ST_POINTFROMTEXT' => 33, 'ST_SYMDIFFERENCE' => 33, 'LINESTRINGFROMWKB' => 33, 'MULTIPOINTFROMWKB' => 33, 'RELEASE_ALL_LOCKS' => 33, 'ST_LATFROMGEOHASH' => 33, 'ST_MPOINTFROMTEXT' => 33, 'ST_POLYGONFROMWKB' => 33, - 'GEOMETRYCOLLECTION' => 33, 'MULTIPOINTFROMTEXT' => 33, 'ST_BUFFER_STRATEGY' => 33, - 'ST_DISTANCE_SPHERE' => 33, 'ST_GEOMCOLLFROMTXT' => 33, 'ST_GEOMCOLLFROMWKB' => 33, - 'ST_GEOMFROMGEOJSON' => 33, 'ST_LONGFROMGEOHASH' => 33, 'ST_POLYGONFROMTEXT' => 33, + 'MULTIPOINTFROMTEXT' => 33, 'ST_BUFFER_STRATEGY' => 33, 'ST_DISTANCE_SPHERE' => 33, + 'ST_GEOMCOLLFROMTXT' => 33, 'ST_GEOMCOLLFROMWKB' => 33, 'ST_GEOMFROMGEOJSON' => 33, + 'ST_LONGFROMGEOHASH' => 33, 'ST_POLYGONFROMTEXT' => 33, 'MULTIPOLYGONFROMWKB' => 33, 'ST_GEOMCOLLFROMTEXT' => 33, 'ST_GEOMETRYFROMTEXT' => 33, 'ST_NUMINTERIORRINGS' => 33, 'ST_POINTFROMGEOHASH' => 33, 'UNCOMPRESSED_LENGTH' => 33, 'MULTIPOLYGONFROMTEXT' => 33, 'ST_LINESTRINGFROMWKB' => 33, @@ -342,7 +344,12 @@ class ContextMySql50700 extends Context 'NOT IN' => 39, 'DATE' => 41, 'TIME' => 41, 'YEAR' => 41, + 'POINT' => 41, + 'POLYGON' => 41, 'TIMESTAMP' => 41, + 'LINESTRING' => 41, + 'MULTILINESTRING' => 41, + 'GEOMETRYCOLLECTION' => 41, 'CHAR' => 43, 'INTERVAL' => 43, diff --git a/libraries/sql-parser/src/Statements/CreateStatement.php b/libraries/sql-parser/src/Statements/CreateStatement.php index 3ccf78f7dc..47340b572f 100644 --- a/libraries/sql-parser/src/Statements/CreateStatement.php +++ b/libraries/sql-parser/src/Statements/CreateStatement.php @@ -11,6 +11,7 @@ namespace SqlParser\Statements; use SqlParser\Parser; use SqlParser\Statement; use SqlParser\Token; +use SqlParser\Context; use SqlParser\TokensList; use SqlParser\Components\ArrayObj; use SqlParser\Components\DataType; @@ -187,6 +188,15 @@ class CreateStatement extends Statement */ public $select; + /** + * If `CREATE TABLE ... LIKE` + * + * Used by `CREATE TABLE` + * + * @var Expression + */ + public $like; + /** * Expression used for partitioning. * @@ -282,6 +292,11 @@ class CreateStatement extends Statement . OptionsArray::build($this->options) . ' ' . Expression::build($this->name) . ' ' . $this->select->build(); + } elseif ($this->options->has('TABLE') && !is_null($this->like)) { + return 'CREATE ' + . OptionsArray::build($this->options) . ' ' + . Expression::build($this->name) . ' LIKE ' + . Expression::build($this->like); } elseif ($this->options->has('TABLE')) { $partition = ''; @@ -389,17 +404,41 @@ class CreateStatement extends Statement $list, static::$DB_OPTIONS ); - } elseif ($this->options->has('TABLE') && ($token->type == Token::TYPE_KEYWORD) && ($token->value == 'SELECT')) { + } elseif ($this->options->has('TABLE') + && ($token->type == Token::TYPE_KEYWORD) + && ($token->value == 'SELECT') + ) { /* CREATE TABLE ... SELECT */ $this->select = new SelectStatement($parser, $list); - } elseif ( - $this->options->has('TABLE') && - ($token->type == Token::TYPE_KEYWORD) && ($token->value == 'AS') && - ($list->tokens[$nextidx]->type == Token::TYPE_KEYWORD) && ($list->tokens[$nextidx]->value == 'SELECT') - ) { + } elseif ($this->options->has('TABLE') + && ($token->type == Token::TYPE_KEYWORD) && ($token->value == 'AS') + && ($list->tokens[$nextidx]->type == Token::TYPE_KEYWORD) + && ($list->tokens[$nextidx]->value == 'SELECT') + ) { /* CREATE TABLE ... AS SELECT */ $list->idx = $nextidx; $this->select = new SelectStatement($parser, $list); + } elseif ($this->options->has('TABLE') + && $token->type == Token::TYPE_KEYWORD + && $token->value == 'LIKE' + ) { + /* CREATE TABLE `new_tbl` LIKE 'orig_tbl' */ + $list->idx = $nextidx; + $this->like = Expression::parse( + $parser, + $list, + array( + 'parseField' => 'table', + 'breakOnAlias' => true, + ) + ); + // The 'LIKE' keyword was found, but no table_name was found next to it + if ($this->like == null) { + $parser->error( + __('A table name was expected.'), + $list->tokens[$list->idx] + ); + } } elseif ($this->options->has('TABLE')) { $this->fields = CreateDefinition::parse($parser, $list); if (empty($this->fields)) { diff --git a/libraries/sql-parser/src/Statements/InsertStatement.php b/libraries/sql-parser/src/Statements/InsertStatement.php index c2a02b0ec0..e684c4e203 100644 --- a/libraries/sql-parser/src/Statements/InsertStatement.php +++ b/libraries/sql-parser/src/Statements/InsertStatement.php @@ -8,10 +8,15 @@ */ namespace SqlParser\Statements; +use SqlParser\Parser; +use SqlParser\Token; +use SqlParser\TokensList; use SqlParser\Statement; +use SqlParser\Statements\SelectStatement; use SqlParser\Components\IntoKeyword; use SqlParser\Components\Array2d; -use SqlParser\Components\ArrayObj; +use SqlParser\Components\OptionsArray; +use SqlParser\Components\SetOperation; /** * `INSERT` statement. @@ -77,17 +82,190 @@ class InsertStatement extends Statement /** * Values to be inserted. * - * @var ArrayObj[] + * @var Array2d */ public $values; + /** + * If SET clause is present + * holds the SetOperation + * + * @var SetOperation[] + */ + public $set; + + /** + * If SELECT clause is present + * holds the SelectStatement + * + * @var SelectStatement + */ + public $select; + + /** + * If ON DUPLICATE KEY UPDATE clause is present + * holds the SetOperation + * + * @var SetOperation[] + */ + public $onDuplicateSet; + /** * @return string */ public function build() { - return 'INSERT ' . $this->options - . ' INTO ' . $this->into - . ' VALUES ' . ArrayObj::build($this->values); + $ret = 'INSERT ' . $this->options + . ' INTO ' . $this->into; + + if ($this->values != NULL && count($this->values) > 0) { + $ret .= ' VALUES ' . Array2d::build($this->values); + } elseif ($this->set != NULL && count($this->set) > 0) { + $ret .= ' SET ' . SetOperation::build($this->set); + } elseif ($this->select != NULL && count($this->select) > 0) { + $ret .= ' ' . $this->select->build(); + } + + if ($this->onDuplicateSet != NULL && count($this->onDuplicateSet) > 0) { + $ret .= ' ON DUPLICATE KEY UPDATE ' . SetOperation::build($this->onDuplicateSet); + } + + return $ret; + + } + + + /** + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + * + * @return void + */ + public function parse(Parser $parser, TokensList $list) + { + ++$list->idx; // Skipping `INSERT`. + + // parse any options if provided + $this->options = OptionsArray::parse( + $parser, + $list, + static::$OPTIONS + ); + ++$list->idx; + + $token = $list->tokens[$list->idx]; + + /** + * The state of the parser. + * + * Below are the states of the parser. + * + * 0 ---------------------------------[ INTO ]----------------------------------> 1 + * + * 1 -------------------------[ VALUES/VALUE/SET/SELECT ]-----------------------> 2 + * + * 2 -------------------------[ ON DUPLICATE KEY UPDATE ]-----------------------> 3 + * + * @var int $state + */ + $state = 0; + + /** + * For keeping track of semi-states on encountering + * ON DUPLICATE KEY UPDATE ... + * + */ + $miniState = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** + * Token parsed at this moment. + * + * @var Token $token + */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + if ($token->type === Token::TYPE_KEYWORD + && $token->value !== 'INTO' + ) { + $parser->error(__('Unexpected keyword.'), $token); + break; + } else { + ++$list->idx; + $this->into = IntoKeyword::parse($parser, $list); + } + + $state = 1; + } elseif ($state === 1) { + if ($token->type === Token::TYPE_KEYWORD) { + if ($token->value === 'VALUE' + || $token->value === 'VALUES' + ) { + ++$list->idx; // skip VALUES + + $this->values = Array2d::parse($parser, $list); + } elseif ($token->value === 'SET') { + ++$list->idx; // skip SET + + $this->set = SetOperation::parse($parser, $list); + } elseif ($token->value === 'SELECT') { + $this->select = new SelectStatement($parser, $list); + } else { + $parser->error( + __('Unexpected keyword.'), + $token + ); + break; + } + $state = 2; + $miniState = 1; + } else { + $parser->error( + __('Unexpected token.'), + $token + ); + break; + } + } elseif ($state == 2) { + $lastCount = $miniState; + + if ($miniState === 1 && $token->value === 'ON') { + $miniState++; + } elseif ($miniState === 2 && $token->value === 'DUPLICATE') { + $miniState++; + } elseif ($miniState === 3 && $token->value === 'KEY') { + $miniState++; + } elseif ($miniState === 4 && $token->value === 'UPDATE') { + $miniState++; + } + + if ($lastCount === $miniState) { + $parser->error( + __('Unexpected token.'), + $token + ); + break; + } + + if ($miniState === 5) { + ++$list->idx; + $this->onDuplicateSet = SetOperation::parse($parser, $list); + $state = 3; + } + } + } + + --$list->idx; } } diff --git a/libraries/sql-parser/src/Statements/SetStatement.php b/libraries/sql-parser/src/Statements/SetStatement.php index d4128533a8..a5cffa2609 100644 --- a/libraries/sql-parser/src/Statements/SetStatement.php +++ b/libraries/sql-parser/src/Statements/SetStatement.php @@ -10,6 +10,7 @@ namespace SqlParser\Statements; use SqlParser\Statement; use SqlParser\Components\SetOperation; +use SqlParser\Components\OptionsArray; /** * `SET` statement. @@ -34,10 +35,38 @@ class SetStatement extends Statement 'SET' => array('SET', 3), ); + /** + * Possible exceptions in SET statment + * + * @var array + */ + public static $OPTIONS = array( + 'CHARSET' => array(3, 'var'), + 'CHARACTER SET' => array(3, 'var'), + 'NAMES' => array(3, 'var'), + 'PASSWORD' => array(3, 'expr'), + ); + + /** + * Options used in current statement + * + * @var OptionsArray[] + */ + public $options; + /** * The updated values. * * @var SetOperation[] */ public $set; + + /** + * @return string + */ + public function build() + { + return 'SET ' . OptionsArray::build($this->options) + . ' ' . SetOperation::build($this->set); + } } From b593bfeb7c00ec9c49adcefb925aa1966e6b7c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 13 Sep 2016 16:04:50 +0200 Subject: [PATCH 33/41] Update SQL parser to 3.4.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/sql-parser/src/Statement.php | 26 +++ .../src/Statements/ReplaceStatement.php | 162 ++++++++++++++++-- libraries/sql-parser/src/Utils/CLI.php | 12 +- libraries/sql-parser/src/Utils/Formatter.php | 18 +- 4 files changed, 188 insertions(+), 30 deletions(-) diff --git a/libraries/sql-parser/src/Statement.php b/libraries/sql-parser/src/Statement.php index 2b81a844df..9f3341ea25 100644 --- a/libraries/sql-parser/src/Statement.php +++ b/libraries/sql-parser/src/Statement.php @@ -254,6 +254,32 @@ abstract class Statement break; } + $lastIdx = $list->idx; + + // ON DUPLICATE KEY UPDATE ... + // has to be parsed in parent statement (INSERT or REPLACE) + // so look for it and break + if (get_class($this) === 'SqlParser\Statements\SelectStatement' + && $token->value === 'ON' + ) { + ++$list->idx; // Skip ON + + // look for ON DUPLICATE KEY UPDATE + $first = $list->getNextOfType(Token::TYPE_KEYWORD); + $second = $list->getNextOfType(Token::TYPE_KEYWORD); + $third = $list->getNextOfType(Token::TYPE_KEYWORD); + + if ($first && $second && $third + && $first->value === 'DUPLICATE' + && $second->value === 'KEY' + && $third->value === 'UPDATE' + ) { + $list->idx = $lastIdx; + break; + } + } + $list->idx = $lastIdx; + /** * The name of the class that is used for parsing. * diff --git a/libraries/sql-parser/src/Statements/ReplaceStatement.php b/libraries/sql-parser/src/Statements/ReplaceStatement.php index 10c5e6312a..df00272657 100644 --- a/libraries/sql-parser/src/Statements/ReplaceStatement.php +++ b/libraries/sql-parser/src/Statements/ReplaceStatement.php @@ -8,10 +8,15 @@ */ namespace SqlParser\Statements; +use SqlParser\Parser; +use SqlParser\Token; +use SqlParser\TokensList; use SqlParser\Statement; -use SqlParser\Components\IntoKeyword; -use SqlParser\Components\SetOperation; +use SqlParser\Statements\SelectStatement; use SqlParser\Components\Array2d; +use SqlParser\Components\IntoKeyword; +use SqlParser\Components\OptionsArray; +use SqlParser\Components\SetOperation; /** * `REPLACE` statement. @@ -26,6 +31,14 @@ use SqlParser\Components\Array2d; * [INTO] tbl_name * SET col_name={expr | DEFAULT}, ... * + * or + * + * REPLACE [LOW_PRIORITY | DELAYED] + * [INTO] tbl_name + * [PARTITION (partition_name,...)] + * [(col_name,...)] + * SELECT ... + * * @category Statements * @package SqlParser * @subpackage Statements @@ -45,22 +58,6 @@ class ReplaceStatement extends Statement 'DELAYED' => 1, ); - /** - * The clauses of this statement, in order. - * - * @see Statement::$CLAUSES - * - * @var array - */ - public static $CLAUSES = array( - 'REPLACE' => array('REPLACE', 2), - // Used for options. - '_OPTIONS' => array('_OPTIONS', 1), - 'INTO' => array('FROM', 3), - 'VALUES' => array('VALUES', 1), - 'SET' => array('PARTITION', 3), - ); - /** * Tables used as target for this statement. * @@ -76,9 +73,136 @@ class ReplaceStatement extends Statement public $values; /** - * The replaced values. + * If SET clause is present + * holds the SetOperation * * @var SetOperation[] */ public $set; + + /** + * If SELECT clause is present + * holds the SelectStatement + * + * @var SelectStatement + */ + public $select; + + /** + * @return string + */ + public function build() + { + $ret = 'REPLACE ' . $this->options + . ' INTO ' . $this->into; + + if ($this->values != NULL && count($this->values) > 0) { + $ret .= ' VALUES ' . Array2d::build($this->values); + } elseif ($this->set != NULL && count($this->set) > 0) { + $ret .= ' SET ' . SetOperation::build($this->set); + } elseif ($this->select != NULL && count($this->select) > 0) { + $ret .= ' ' . $this->select->build(); + } + + return $ret; + } + + + /** + * @param Parser $parser The instance that requests parsing. + * @param TokensList $list The list of tokens to be parsed. + * + * @return void + */ + public function parse(Parser $parser, TokensList $list) + { + ++$list->idx; // Skipping `REPLACE`. + + // parse any options if provided + $this->options = OptionsArray::parse( + $parser, + $list, + static::$OPTIONS + ); + ++$list->idx; + + $token = $list->tokens[$list->idx]; + + /** + * The state of the parser. + * + * Below are the states of the parser. + * + * 0 ---------------------------------[ INTO ]----------------------------------> 1 + * + * 1 -------------------------[ VALUES/VALUE/SET/SELECT ]-----------------------> 2 + * + * @var int $state + */ + $state = 0; + + for (; $list->idx < $list->count; ++$list->idx) { + /** + * Token parsed at this moment. + * + * @var Token $token + */ + $token = $list->tokens[$list->idx]; + + // End of statement. + if ($token->type === Token::TYPE_DELIMITER) { + break; + } + + // Skipping whitespaces and comments. + if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) { + continue; + } + + if ($state === 0) { + if ($token->type === Token::TYPE_KEYWORD + && $token->value !== 'INTO' + ) { + $parser->error(__('Unexpected keyword.'), $token); + break; + } else { + ++$list->idx; + $this->into = IntoKeyword::parse($parser, $list); + } + + $state = 1; + } elseif ($state === 1) { + if ($token->type === Token::TYPE_KEYWORD) { + if ($token->value === 'VALUE' + || $token->value === 'VALUES' + ) { + ++$list->idx; // skip VALUES + + $this->values = Array2d::parse($parser, $list); + } elseif ($token->value === 'SET') { + ++$list->idx; // skip SET + + $this->set = SetOperation::parse($parser, $list); + } elseif ($token->value === 'SELECT') { + $this->select = new SelectStatement($parser, $list); + } else { + $parser->error( + __('Unexpected keyword.'), + $token + ); + break; + } + $state = 2; + } else { + $parser->error( + __('Unexpected token.'), + $token + ); + break; + } + } + } + + --$list->idx; + } } diff --git a/libraries/sql-parser/src/Utils/CLI.php b/libraries/sql-parser/src/Utils/CLI.php index 306de04f2b..b6ce35e687 100644 --- a/libraries/sql-parser/src/Utils/CLI.php +++ b/libraries/sql-parser/src/Utils/CLI.php @@ -37,12 +37,20 @@ class CLI echo "Usage: highlight-query --query SQL [--format html|cli|text]\n"; } + public function getopt($opt, $long) + { + return getopt($opt, $long); + } + public function parseHighlight() { $longopts = array('help', 'query:', 'format:'); - $params = getopt( + $params = $this->getopt( 'hq:f:', $longopts ); + if ($params === false) { + return false; + } $this->mergeLongOpts($params, $longopts); if (! isset($params['f'])) { $params['f'] = 'cli'; @@ -84,7 +92,7 @@ class CLI public function parseLint() { $longopts = array('help', 'query:'); - $params = getopt( + $params = $this->getopt( 'hq:', $longopts ); $this->mergeLongOpts($params, $longopts); diff --git a/libraries/sql-parser/src/Utils/Formatter.php b/libraries/sql-parser/src/Utils/Formatter.php index fd41f9e1ab..56691ebbfb 100644 --- a/libraries/sql-parser/src/Utils/Formatter.php +++ b/libraries/sql-parser/src/Utils/Formatter.php @@ -122,49 +122,49 @@ class Formatter 'type' => Token::TYPE_KEYWORD, 'flags' => Token::FLAG_KEYWORD_RESERVED, 'html' => 'class="sql-reserved"', - 'cli' => "\e[35m", + 'cli' => "\x1b[35m", 'function' => 'strtoupper', ), array( 'type' => Token::TYPE_KEYWORD, 'flags' => 0, 'html' => 'class="sql-keyword"', - 'cli' => "\e[95m", + 'cli' => "\x1b[95m", 'function' => 'strtoupper', ), array( 'type' => Token::TYPE_COMMENT, 'flags' => 0, 'html' => 'class="sql-comment"', - 'cli' => "\e[37m", + 'cli' => "\x1b[37m", 'function' => '', ), array( 'type' => Token::TYPE_BOOL, 'flags' => 0, 'html' => 'class="sql-atom"', - 'cli' => "\e[36m", + 'cli' => "\x1b[36m", 'function' => 'strtoupper', ), array( 'type' => Token::TYPE_NUMBER, 'flags' => 0, 'html' => 'class="sql-number"', - 'cli' => "\e[92m", + 'cli' => "\x1b[92m", 'function' => 'strtolower', ), array( 'type' => Token::TYPE_STRING, 'flags' => 0, 'html' => 'class="sql-string"', - 'cli' => "\e[91m", + 'cli' => "\x1b[91m", 'function' => '', ), array( 'type' => Token::TYPE_SYMBOL, 'flags' => 0, 'html' => 'class="sql-variable"', - 'cli' => "\e[36m", + 'cli' => "\x1b[36m", 'function' => '', ), ) @@ -420,7 +420,7 @@ class Formatter } if ($this->options['type'] === 'cli') { - return $ret . "\e[0m"; + return $ret . "\x1b[0m"; } return $ret; @@ -459,7 +459,7 @@ class Formatter } if ($this->options['type'] === 'cli') { - return "\e[39m" . $text; + return "\x1b[39m" . $text; } return $text; } From d6b80ad910302c23399335dd83a2e1bd947196fc Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Wed, 14 Sep 2016 23:02:11 +0530 Subject: [PATCH 34/41] ChangeLog entry for #12473 Signed-off-by: Deven Bansod --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 2c36696489..5f3ae63570 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ phpMyAdmin - ChangeLog - issue #11924 Remove caching of server information - issue #11628 Proper parsing of INSERT ... ON DUPLICATE KEY queries - issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries +- issue #12473 Code can throw unhandled exception 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 From 10e4f0a3ddcf7d8d540322b8a0fbc07a01171bbb Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Wed, 14 Sep 2016 23:06:25 +0530 Subject: [PATCH 35/41] Check if the regex matching returns null before using it further Fix #12473 : Code can throw unhandled exception Signed-off-by: Deven Bansod --- js/functions.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/functions.js b/js/functions.js index 103ba84707..99eff84673 100644 --- a/js/functions.js +++ b/js/functions.js @@ -613,8 +613,12 @@ function confirmLink(theLink, theSqlQuery) if (is_confirmed) { if ($(theLink).hasClass('formLinkSubmit')) { var name = 'is_js_confirmed'; + if ($(theLink).attr('href').indexOf('usesubform') != -1) { - name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]'; + var matches = $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i); + if (matches != null) { + name = 'subform[' + matches[1] + '][is_js_confirmed]'; + } } $(theLink).parents('form').append(''); From e285135deb40a56177094b13416ab8bf91c54312 Mon Sep 17 00:00:00 2001 From: Dadan Setia Date: Fri, 16 Sep 2016 00:03:33 +0000 Subject: [PATCH 36/41] Translated using Weblate (Indonesian) Currently translated at 68.8% (2208 of 3206 strings) [CI skip] --- po/id.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/id.po b/po/id.po index b5d4e2bf61..e3a68ab22f 100644 --- a/po/id.po +++ b/po/id.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-08-12 14:41+0000\n" +"PO-Revision-Date: 2016-09-16 00:03+0000\n" "Last-Translator: Dadan Setia \n" -"Language-Team: Indonesian \n" +"Language-Team: Indonesian " +"\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.8-dev\n" +"X-Generator: Weblate 2.9-dev\n" "X-Poedit-Basepath: ../../..\n" #: changelog.php:38 license.php:33 @@ -793,8 +793,9 @@ msgstr "" "File konfigurasi membutuhkan susunan kata-kata rahasia (blowfish_secret)." #: index.php:525 +#, fuzzy msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "Konfigurasi Passphrase rahasia (blowfish_secret) terlalu pendek." #: index.php:539 msgid "" @@ -944,16 +945,15 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?" msgstr "Apakah anda yakin melakukan TRUNCATE pada partisi terpilih?" #: js/messages.php:85 -#, fuzzy #| msgid "Do you really want to delete the search \"%s\"?" msgid "Do you really want to remove partitioning?" -msgstr "Apakah anda yakin ingin menghapus pencarian \"%s\"?" +msgstr "Anda yakin ingin menghapus partisi?" #: js/messages.php:86 #, fuzzy #| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to RESET SLAVE?" -msgstr "Anda yakin akan menjalankan \"%s\"?" +msgstr "Anda yakin akan melakukan RESET SLAVE?" #: js/messages.php:88 #, fuzzy @@ -971,7 +971,6 @@ msgstr "" "asli dan simak tips di " #: js/messages.php:94 -#, fuzzy msgid "Garbled Data" msgstr "Data yang kacau" @@ -3819,8 +3818,9 @@ msgid "Unknown error in file upload." msgstr "Galat tidak dikenal sewaktu mengunggah berkas." #: libraries/File.php:424 +#, fuzzy msgid "File is a symbolic link" -msgstr "" +msgstr "File merupakan tautan simbolik" #: libraries/File.php:470 msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]." From 168a419f48201eeaf10764bb45a409346c4f5a8e Mon Sep 17 00:00:00 2001 From: yanagimoto Date: Fri, 16 Sep 2016 05:38:09 +0000 Subject: [PATCH 37/41] Translated using Weblate (Japanese) Currently translated at 70.9% (2276 of 3206 strings) [CI skip] --- po/ja.po | 64 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/po/ja.po b/po/ja.po index d121d18f50..85910c0f22 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-08-02 16:59+0000\n" -"Last-Translator: Masahiro Nishi \n" -"Language-Team: Japanese \n" +"PO-Revision-Date: 2016-09-16 05:38+0000\n" +"Last-Translator: yanagimoto \n" +"Language-Team: Japanese " +"\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.8-dev\n" +"X-Generator: Weblate 2.9-dev\n" #: changelog.php:38 license.php:33 #, php-format @@ -793,7 +793,7 @@ msgstr "" #: index.php:525 msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "設定ファイルの中に記述されているパスフレーズ（blowfish_secret）が短すぎます。" #: index.php:539 msgid "" @@ -1444,7 +1444,7 @@ msgstr "一般クエリログより" #: js/messages.php:265 msgid "The database name is not known for this query in the server's logs." -msgstr "" +msgstr "サーバーログ内にあるこのクエリに記述されたデータベース名が認識できません。" #: js/messages.php:267 msgid "Analysing logs" @@ -2009,7 +2009,7 @@ msgstr "テーブルのデータサイズと列数に応じて数秒かかる場 #: js/messages.php:456 msgid "Step" -msgstr "" +msgstr "手順" #: js/messages.php:458 #, fuzzy @@ -2174,7 +2174,7 @@ msgstr "暗号化鍵" msgid "" "Indicates that you have made changes to this page; you will be prompted for " "confirmation before abandoning changes" -msgstr "" +msgstr "あなたがこのページに変更を加えた場合、変更を破棄する前に確認画面が表示されるでしょう。" #: js/messages.php:530 msgid "Select referenced key" @@ -2526,7 +2526,7 @@ msgstr "全て無視" #: js/messages.php:688 msgid "" "As per your settings, they are being submitted currently, please be patient." -msgstr "" +msgstr "設定に従って現在これらを送信しています。気長にお待ちください。" #: js/messages.php:698 msgid "Execute this query again?" @@ -3761,7 +3761,7 @@ msgstr "ファイルのアップロード中に予期しないエラーが発生 #: libraries/File.php:424 msgid "File is a symbolic link" -msgstr "" +msgstr "このファイルはシンボリックリンクです" #: libraries/File.php:470 #, fuzzy @@ -3923,7 +3923,7 @@ msgstr "サポートされていない言語のコードを無視します。" #: libraries/Linter.php:99 msgid "" "Linting is disabled for this query because it exceeds the maximum length." -msgstr "" +msgstr "文字列の長さが最大値を超えているため、このクエリに対する構文チェックは無効になっています。" #: libraries/Linter.php:165 #, php-format @@ -4041,7 +4041,7 @@ msgstr "イベント" #: libraries/Menu.php:500 libraries/Util.php:4360 msgid "Designer" -msgstr "" +msgstr "デザイナ" #: libraries/Menu.php:509 libraries/Util.php:4361 #: templates/database/structure/check_all_tables.phtml:34 @@ -4174,7 +4174,7 @@ msgstr "変数" #: libraries/SavedSearches.php:246 msgid "Please provide a name for this bookmarked search." -msgstr "" +msgstr "このブックマークされた検索に名前を付けてください。" #: libraries/SavedSearches.php:261 #, fuzzy @@ -4194,7 +4194,7 @@ msgstr "" #: libraries/SavedSearches.php:375 msgid "Missing information to load the search." -msgstr "" +msgstr "この検索を呼び出すための情報に誤りがあります。" #: libraries/SavedSearches.php:394 #, fuzzy @@ -4746,7 +4746,7 @@ msgstr "統計データ" #: libraries/Util.php:691 #, php-format msgid "%d errors were found during analysis." -msgstr "" +msgstr "解析中に %d 個のエラーが見つかりました。" #: libraries/Util.php:754 libraries/rte/rte_events.lib.php:113 #: libraries/rte/rte_events.lib.php:122 libraries/rte/rte_events.lib.php:153 @@ -5057,7 +5057,7 @@ msgstr "%s を %s 以降にアップグレードしてください。" #: libraries/common.inc.php:1000 msgid "Error: Token mismatch" -msgstr "" +msgstr "エラー: トークンが一致しません" #: libraries/common.inc.php:1018 msgid "GLOBALS overwrite attempt" @@ -5142,15 +5142,15 @@ msgstr "閉じておく" #: libraries/config.values.php:128 msgid "Ask before sending error reports" -msgstr "" +msgstr "エラーレポートを送信する前に確認する" #: libraries/config.values.php:129 msgid "Always send error reports" -msgstr "" +msgstr "常にエラーレポートを送信する" #: libraries/config.values.php:130 msgid "Never send error reports" -msgstr "" +msgstr "エラーレポートを送らない" #: libraries/config.values.php:133 #, fuzzy @@ -6601,7 +6601,7 @@ msgstr "" #: libraries/config/messages.inc.php:376 libraries/config/messages.inc.php:390 msgid "Update data when duplicate keys found on import" -msgstr "" +msgstr "インポート中に重複したキーが見つかった場合も更新する" #: libraries/config/messages.inc.php:380 #, fuzzy @@ -8378,7 +8378,7 @@ msgstr "" #: libraries/config/messages.inc.php:981 msgid "Choose the default action when sending error reports." -msgstr "" +msgstr "エラーレポートを送信する際の既定の動作を選択してください。" #: libraries/config/messages.inc.php:983 #, fuzzy @@ -8402,7 +8402,7 @@ msgstr "実行されたクエリ" msgid "" "Enable Zero Configuration mode which lets you setup phpMyAdmin configuration " "storage tables automatically." -msgstr "" +msgstr "ゼロコンフィギュレーションモードを有効にします。これによりphpMyAdminのコンフィギュレーションストレージテーブルは自動設定されます。" #: libraries/config/messages.inc.php:995 #, fuzzy @@ -8464,7 +8464,7 @@ msgstr "Open Document テキスト" #: libraries/controllers/database/DatabaseStructureController.php:266 msgid "Favorite List is full!" -msgstr "" +msgstr "お気に入りリストが一杯です！" #: libraries/controllers/database/DatabaseStructureController.php:544 #: tbl_operations.php:380 @@ -8734,7 +8734,7 @@ msgstr "" msgid "" "You are using the mysql extension which is deprecated in phpMyAdmin. Please " "consider installing the mysqli extension." -msgstr "" +msgstr "phpMyAdminで非推奨のmysql拡張機能を使用しています。mysqli拡張機能の導入を検討してください。" #: libraries/db_designer.lib.php:119 #, fuzzy @@ -9172,15 +9172,15 @@ msgstr "インポートファイルをアップロードしています…" #: libraries/display_import.lib.php:488 #, php-format msgid "%s/sec." -msgstr "" +msgstr "%s/秒" #: libraries/display_import.lib.php:489 msgid "About %MIN min. %SEC sec. remaining." -msgstr "" +msgstr "残り時間 約 %MIN 分 %SEC 秒" #: libraries/display_import.lib.php:490 msgid "About %SEC sec. remaining." -msgstr "" +msgstr "残り時間 約 %SEC 秒" #: libraries/display_import.lib.php:492 msgid "The file is being processed, please be patient." @@ -9558,7 +9558,7 @@ msgstr "返り値が空でした (行数 0)。" #: libraries/import.lib.php:288 libraries/sql.lib.php:1382 msgid "[ROLLBACK occurred.]" -msgstr "" +msgstr "ロールバックが発生しました。" #: libraries/import.lib.php:1254 msgid "" @@ -9751,7 +9751,7 @@ msgstr "全角カナに変換する" #: libraries/mult_submits.inc.php:329 msgid "Success!" -msgstr "" +msgstr "成功！" #: libraries/mult_submits.lib.php:344 libraries/operations.lib.php:169 #: libraries/operations.lib.php:1263 libraries/tracking.lib.php:529 @@ -9907,7 +9907,7 @@ msgstr "ルーマニア語" #: libraries/mysql_charsets.lib.php:235 msgid "Sinhalese" -msgstr "" +msgstr "シンハラ語" #: libraries/mysql_charsets.lib.php:238 msgid "Slovak" @@ -9999,7 +9999,7 @@ msgstr "チェコのスロバキア語" #: libraries/navigation/Navigation.php:53 msgid "An error has occurred while loading the navigation display" -msgstr "" +msgstr "ナビゲーション画面を読み込み中にエラーが発生しました。" #: libraries/navigation/Navigation.php:191 #, fuzzy From 54e3434c0fc79737927e6f5f4e227a19daef5197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 16 Sep 2016 09:35:08 +0200 Subject: [PATCH 38/41] Do not try to keep alive session even after expiry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no sense in sending keepalive requests even after potential session expiry. So limit sending of these only as long we're not idle over cookie login validity. Fixes #12550 Signed-off-by: Michal Čihař --- ChangeLog | 1 + js/functions.js | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f3ae63570..b687d9d18b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog - issue #11628 Proper parsing of INSERT ... ON DUPLICATE KEY queries - issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries - issue #12473 Code can throw unhandled exception +- issue #12550 Do not try to keep alive session even after expiry 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 diff --git a/js/functions.js b/js/functions.js index 99eff84673..9fa445f314 100644 --- a/js/functions.js +++ b/js/functions.js @@ -903,13 +903,13 @@ AJAX.registerOnload('functions.js', function () { data: params, success: function (data) { if (data.success) { - if (PMA_commonParams.get('LoginCookieValidity')-_idleSecondsCounter > 5) { - var interval = (PMA_commonParams.get('LoginCookieValidity') - _idleSecondsCounter - 5) * 1000; - if (interval > Math.pow(2, 31) - 1) { // max value for setInterval() function - interval = Math.pow(2, 31) - 1; - } + var remaining = PMA_commonParams.get('LoginCookieValidity') - _idleSecondsCounter; + if (remaining > 5) { + // max value for setInterval() function + var interval = min(remaining * 1000, Math.pow(2, 31) - 1); updateTimeout = window.setTimeout(UpdateIdleTime, interval); - } else { + } else if (remaining > 0) { + // We're close to session expiry updateTimeout = window.setTimeout(UpdateIdleTime, 2000); } } else { //timeout occurred From 1c82b79524a9c0040ecefc0f8a2c2b74ad36836a Mon Sep 17 00:00:00 2001 From: Dadan Setia Date: Fri, 16 Sep 2016 00:03:31 +0000 Subject: [PATCH 39/41] Translated using Weblate (Indonesian) Currently translated at 68.4% (2205 of 3219 strings) [CI skip] --- po/id.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/po/id.po b/po/id.po index ec92e25ba3..9acc6ac062 100644 --- a/po/id.po +++ b/po/id.po @@ -4,20 +4,20 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:28+0200\n" -"PO-Revision-Date: 2016-08-12 14:41+0000\n" +"PO-Revision-Date: 2016-09-16 00:03+0000\n" "Last-Translator: Dadan Setia \n" -"Language-Team: Indonesian \n" +"Language-Team: Indonesian " +"\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.8-dev\n" +"X-Generator: Weblate 2.9-dev\n" "X-Poedit-Basepath: ../../..\n" #: changelog.php:38 license.php:33 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The %s file is not available on this system, please visit www.phpmyadmin." #| "net for more information." @@ -25,8 +25,8 @@ msgid "" "The %s file is not available on this system, please visit %s for more " "information." msgstr "" -"Berkas %s tidak ditemukan dalam sistem ini, harap kunjungi www.phpmyadmin." -"net untuk informasi lebih lanjut." +"Berkas %s tidak tersedia pada sistem ini, silahkan kunjungi %s untuk " +"informasi lebih lanjut." #: db_central_columns.php:107 msgid "The central list of columns for the current database is empty." @@ -777,8 +777,9 @@ msgstr "" "File konfigurasi membutuhkan susunan kata-kata rahasia (blowfish_secret)." #: index.php:529 +#, fuzzy msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "Konfigurasi Passphrase rahasia (blowfish_secret) terlalu pendek." #: index.php:543 msgid "" @@ -932,16 +933,15 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?" msgstr "Apakah anda yakin melakukan TRUNCATE pada partisi terpilih?" #: js/messages.php:90 -#, fuzzy #| msgid "Do you really want to delete the search \"%s\"?" msgid "Do you really want to remove partitioning?" -msgstr "Apakah anda yakin ingin menghapus pencarian \"%s\"?" +msgstr "Anda yakin ingin menghapus partisi?" #: js/messages.php:91 #, fuzzy #| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to RESET SLAVE?" -msgstr "Anda yakin akan menjalankan \"%s\"?" +msgstr "Anda yakin akan melakukan RESET SLAVE?" #: js/messages.php:93 #, fuzzy @@ -959,7 +959,6 @@ msgstr "" "asli dan simak tips di " #: js/messages.php:99 -#, fuzzy msgid "Garbled Data" msgstr "Data yang kacau" @@ -3873,8 +3872,9 @@ msgid "Unknown error in file upload." msgstr "Galat tidak dikenal sewaktu mengunggah berkas." #: libraries/File.php:424 +#, fuzzy msgid "File is a symbolic link" -msgstr "" +msgstr "File merupakan tautan simbolik" #: libraries/File.php:429 libraries/File.php:532 msgid "File could not be read!" From 9b3a04b8110d3a361cc49eddd98ee2911b518ac9 Mon Sep 17 00:00:00 2001 From: yanagimoto Date: Fri, 16 Sep 2016 05:38:07 +0000 Subject: [PATCH 40/41] Translated using Weblate (Japanese) Currently translated at 70.5% (2271 of 3219 strings) [CI skip] --- po/ja.po | 64 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/po/ja.po b/po/ja.po index 9e598dc51a..3b1eb96b52 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:28+0200\n" -"PO-Revision-Date: 2016-08-02 16:59+0000\n" -"Last-Translator: Masahiro Nishi \n" -"Language-Team: Japanese \n" +"PO-Revision-Date: 2016-09-16 05:38+0000\n" +"Last-Translator: yanagimoto \n" +"Language-Team: Japanese " +"\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.8-dev\n" +"X-Generator: Weblate 2.9-dev\n" #: changelog.php:38 license.php:33 #, fuzzy, php-format @@ -776,7 +776,7 @@ msgstr "" #: index.php:529 msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "設定ファイルの中に記述されているパスフレーズ（blowfish_secret）が短すぎます。" #: index.php:543 msgid "" @@ -1433,7 +1433,7 @@ msgstr "一般クエリログより" #: js/messages.php:270 msgid "The database name is not known for this query in the server's logs." -msgstr "" +msgstr "サーバーログ内にあるこのクエリに記述されたデータベース名が認識できません。" #: js/messages.php:272 msgid "Analysing logs" @@ -2001,7 +2001,7 @@ msgstr "テーブルのデータサイズと列数に応じて数秒かかる場 #: js/messages.php:461 msgid "Step" -msgstr "" +msgstr "手順" #: js/messages.php:463 #, fuzzy @@ -2166,7 +2166,7 @@ msgstr "暗号化鍵" msgid "" "Indicates that you have made changes to this page; you will be prompted for " "confirmation before abandoning changes" -msgstr "" +msgstr "あなたがこのページに変更を加えた場合、変更を破棄する前に確認画面が表示されるでしょう。" #: js/messages.php:535 msgid "Select referenced key" @@ -2518,7 +2518,7 @@ msgstr "全て無視" #: js/messages.php:693 msgid "" "As per your settings, they are being submitted currently, please be patient." -msgstr "" +msgstr "設定に従って現在これらを送信しています。気長にお待ちください。" #: js/messages.php:703 msgid "Execute this query again?" @@ -3092,7 +3092,7 @@ msgstr "ルーマニア語" #: libraries/Charsets.php:328 msgid "Sinhalese" -msgstr "" +msgstr "シンハラ語" #: libraries/Charsets.php:331 msgid "Slovak" @@ -3787,7 +3787,7 @@ msgstr "ファイルのアップロード中に予期しないエラーが発生 #: libraries/File.php:424 msgid "File is a symbolic link" -msgstr "" +msgstr "このファイルはシンボリックリンクです" #: libraries/File.php:429 libraries/File.php:532 msgid "File could not be read!" @@ -3946,7 +3946,7 @@ msgstr "サポートされていない言語のコードを無視します。" #: libraries/Linter.php:99 msgid "" "Linting is disabled for this query because it exceeds the maximum length." -msgstr "" +msgstr "文字列の長さが最大値を超えているため、このクエリに対する構文チェックは無効になっています。" #: libraries/Linter.php:165 #, php-format @@ -4084,7 +4084,7 @@ msgstr "イベント" #: libraries/Menu.php:507 libraries/Util.php:4275 msgid "Designer" -msgstr "" +msgstr "デザイナ" #: libraries/Menu.php:516 libraries/Util.php:4276 #: templates/database/structure/check_all_tables.phtml:34 @@ -4217,7 +4217,7 @@ msgstr "変数" #: libraries/SavedSearches.php:246 msgid "Please provide a name for this bookmarked search." -msgstr "" +msgstr "このブックマークされた検索に名前を付けてください。" #: libraries/SavedSearches.php:261 #, fuzzy @@ -4237,7 +4237,7 @@ msgstr "" #: libraries/SavedSearches.php:375 msgid "Missing information to load the search." -msgstr "" +msgstr "この検索を呼び出すための情報に誤りがあります。" #: libraries/SavedSearches.php:394 #, fuzzy @@ -4797,7 +4797,7 @@ msgstr "統計データ" #: libraries/Util.php:690 #, php-format msgid "%d errors were found during analysis." -msgstr "" +msgstr "解析中に %d 個のエラーが見つかりました。" #: libraries/Util.php:753 libraries/rte/rte_events.lib.php:114 #: libraries/rte/rte_events.lib.php:123 libraries/rte/rte_events.lib.php:154 @@ -5093,7 +5093,7 @@ msgstr "%s を %s 以降にアップグレードしてください。" #: libraries/common.inc.php:901 msgid "Error: Token mismatch" -msgstr "" +msgstr "エラー: トークンが一致しません" #: libraries/common.inc.php:919 msgid "GLOBALS overwrite attempt" @@ -5174,15 +5174,15 @@ msgstr "閉じておく" #: libraries/config.values.php:128 msgid "Ask before sending error reports" -msgstr "" +msgstr "エラーレポートを送信する前に確認する" #: libraries/config.values.php:129 msgid "Always send error reports" -msgstr "" +msgstr "常にエラーレポートを送信する" #: libraries/config.values.php:130 msgid "Never send error reports" -msgstr "" +msgstr "エラーレポートを送らない" #: libraries/config.values.php:133 #, fuzzy @@ -6638,7 +6638,7 @@ msgstr "" #: libraries/config/messages.inc.php:376 libraries/config/messages.inc.php:390 msgid "Update data when duplicate keys found on import" -msgstr "" +msgstr "インポート中に重複したキーが見つかった場合も更新する" #: libraries/config/messages.inc.php:380 #, fuzzy @@ -8434,7 +8434,7 @@ msgstr "" #: libraries/config/messages.inc.php:987 msgid "Choose the default action when sending error reports." -msgstr "" +msgstr "エラーレポートを送信する際の既定の動作を選択してください。" #: libraries/config/messages.inc.php:989 #, fuzzy @@ -8458,7 +8458,7 @@ msgstr "実行されたクエリ" msgid "" "Enable Zero Configuration mode which lets you setup phpMyAdmin configuration " "storage tables automatically." -msgstr "" +msgstr "ゼロコンフィギュレーションモードを有効にします。これによりphpMyAdminのコンフィギュレーションストレージテーブルは自動設定されます。" #: libraries/config/messages.inc.php:1001 #, fuzzy @@ -8520,7 +8520,7 @@ msgstr "Open Document テキスト" #: libraries/controllers/database/DatabaseStructureController.php:268 msgid "Favorite List is full!" -msgstr "" +msgstr "お気に入りリストが一杯です！" #: libraries/controllers/database/DatabaseStructureController.php:554 #: tbl_operations.php:375 @@ -8785,7 +8785,7 @@ msgstr "" msgid "" "You are using the mysql extension which is deprecated in phpMyAdmin. Please " "consider installing the mysqli extension." -msgstr "" +msgstr "phpMyAdminで非推奨のmysql拡張機能を使用しています。mysqli拡張機能の導入を検討してください。" #: libraries/db_designer.lib.php:119 #, fuzzy @@ -9223,15 +9223,15 @@ msgstr "インポートファイルをアップロードしています…" #: libraries/display_import.lib.php:491 #, php-format msgid "%s/sec." -msgstr "" +msgstr "%s/秒" #: libraries/display_import.lib.php:492 msgid "About %MIN min. %SEC sec. remaining." -msgstr "" +msgstr "残り時間 約 %MIN 分 %SEC 秒" #: libraries/display_import.lib.php:493 msgid "About %SEC sec. remaining." -msgstr "" +msgstr "残り時間 約 %SEC 秒" #: libraries/display_import.lib.php:495 msgid "The file is being processed, please be patient." @@ -9609,7 +9609,7 @@ msgstr "返り値が空でした (行数 0)。" #: libraries/import.lib.php:273 libraries/sql.lib.php:1382 msgid "[ROLLBACK occurred.]" -msgstr "" +msgstr "ロールバックが発生しました。" #: libraries/import.lib.php:1219 msgid "" @@ -9786,7 +9786,7 @@ msgstr "id %1$d の行を挿入しました" #: libraries/mult_submits.inc.php:328 msgid "Success!" -msgstr "" +msgstr "成功！" #: libraries/mult_submits.lib.php:345 libraries/operations.lib.php:171 #: libraries/operations.lib.php:1263 libraries/tracking.lib.php:534 @@ -9842,7 +9842,7 @@ msgstr "以下のクエリを本当に実行しますか?" #: libraries/navigation/Navigation.php:54 msgid "An error has occurred while loading the navigation display" -msgstr "" +msgstr "ナビゲーション画面を読み込み中にエラーが発生しました。" #: libraries/navigation/Navigation.php:192 #, fuzzy From ee7d7d0b45b6b20cd51b41762df7a9f8b30cb79b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 16 Sep 2016 09:47:29 +0200 Subject: [PATCH 41/41] Fixed rendering BBCode links in setup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The URL validation needs to be adjusted for setup as the links need to go one level up. Fixes #12512 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/sanitizing.lib.php | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index b687d9d18b..703d330f71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ phpMyAdmin - ChangeLog - issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries - issue #12473 Code can throw unhandled exception - issue #12550 Do not try to keep alive session even after expiry +- issue #12512 Fixed rendering BBCode links in setup 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 4591bf3da2..e5c1c42ed4 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -43,6 +43,14 @@ function PMA_checkLink($url, $http=false, $other=false) './server_privileges.php?', './tbl_structure.php?', ); + // Adjust path to setup script location + if (defined('PMA_SETUP')) { + foreach ($valid_starts as $key => $value) { + if (substr($value, 0, 2) === './') { + $valid_starts[$key] = '.' . $value; + } + } + } if ($other) { $valid_starts[] = 'mailto:'; $valid_starts[] = 'ftp://';