diff --git a/ChangeLog b/ChangeLog index 1f2c001cea..65cc9cf577 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ phpMyAdmin - ChangeLog ====================== +4.8.2 (2018-06-21) +- issue #14370 WHERE 0 causes Fatal error +- issue #14225 Fix missing index icon +- issue [security] XSS vulnerability in Designer, see PMASA-2018-3 +- issue [security] File inclusion and remote code execution vulnerability, see PMASA-2018-4 + 4.8.1 (2018-05-24) - issue #12772 Fix case where the central columns attributes don't get filled in - issue #14049 Fix case where the query builder doesn't work when selected column is * diff --git a/README b/README index 771f670e7b..614f90c8c0 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.8.1 +Version 4.8.2 A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index 5654a8310b..09b1740027 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2018, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.8.1' +version = '4.8.2' # The full version, including alpha/beta/rc tags. release = version diff --git a/doc/faq.rst b/doc/faq.rst index 3402919881..1beb140931 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -178,7 +178,7 @@ big or your hosting provider is unwilling to change the settings: then able to import the files from the temporary directory. More information is available in the :ref:`config` of this document. * Using a utility (such as `BigDump - `_) to split the files before + `_) to split the files before uploading. We cannot support this or any third party applications, but are aware of users having success with it. * If you have shell (command line) access, use MySQL to import the files diff --git a/doc/import_export.rst b/doc/import_export.rst index 12ad5cc1e1..42714959e9 100644 --- a/doc/import_export.rst +++ b/doc/import_export.rst @@ -347,4 +347,4 @@ YAML ---- YAML is a data serialization format which is both human readable and -computationally powerful ( ). +computationally powerful ( ). diff --git a/doc/other.rst b/doc/other.rst index 7fbd90aa71..98d1dca1cd 100644 --- a/doc/other.rst +++ b/doc/other.rst @@ -23,7 +23,7 @@ Third party tutorials and articles which you might find interesting: English +++++++ -- `Having fun with phpMyAdmin's MIME-transformations & PDF-features `_ +- `Having fun with phpMyAdmin's MIME-transformations & PDF-features `_ - `Learning SQL Using phpMyAdmin (old tutorial) `_ Русский (Russian) diff --git a/doc/setup.rst b/doc/setup.rst index f4009b839e..b6c82ee7d9 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -38,7 +38,7 @@ some ways from the official phpMyAdmin documentation. Specifically it does: .. seealso:: - More information can be found in `README.Debian `_ + More information can be found in `README.Debian `_ (it is installed as :file:`/usr/share/doc/phmyadmin/README.Debian` with the package). OpenSUSE @@ -596,7 +596,7 @@ Setup script on openSUSE Some openSUSE releases do not include setup script in the package. In case you want to generate configuration on these you can either download original package from or use setup script on our demo -server: . +server: . .. _verify: diff --git a/doc/two_factor.rst b/doc/two_factor.rst index ac3f446d44..9902a41adb 100644 --- a/doc/two_factor.rst +++ b/doc/two_factor.rst @@ -50,9 +50,8 @@ tokens. There are several manufacturers of these tokens, for example: -* `youbico FIDO U2F Security Key `_ +* `youbico FIDO U2F Security Key `_ * `HyperFIDO `_ -* `ePass FIDO USB `_ * `TREZOR Bitcoin wallet `_ can `act as an U2F token `_ .. _simple2fa: diff --git a/index.php b/index.php index cc492e77ee..0ac91de52f 100644 --- a/index.php +++ b/index.php @@ -56,7 +56,7 @@ if (! empty($_REQUEST['target']) && is_string($_REQUEST['target']) && ! preg_match('/^index/', $_REQUEST['target']) && ! in_array($_REQUEST['target'], $target_blacklist) - && Core::checkPageValidity($_REQUEST['target']) + && Core::checkPageValidity($_REQUEST['target'], [], true) ) { include $_REQUEST['target']; exit; diff --git a/js/designer/move.js b/js/designer/move.js index e7d18d6fc0..04f785bd2a 100644 --- a/js/designer/move.js +++ b/js/designer/move.js @@ -1117,7 +1117,7 @@ function Load_page (page) { if (page !== null) { param_page = argsep + 'page=' + page; } - $('') + $('') .appendTo($('#page_content')) .click(); } else { diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 225ca8b9ca..0c8d6642b0 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -116,7 +116,7 @@ class Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.8.1'); + $this->set('PMA_VERSION', '4.8.2'); /* Major version */ $this->set( 'PMA_MAJOR_VERSION', diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 4a0687ddea..d574138e37 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -435,12 +435,13 @@ class Core * checks given $page against given $whitelist and returns true if valid * it optionally ignores query parameters in $page (script.php?ignored) * - * @param string &$page page to check - * @param array $whitelist whitelist to check page against + * @param string &$page page to check + * @param array $whitelist whitelist to check page against + * @param boolean $include whether the page is going to be included * * @return boolean whether $page is valid or not (in $whitelist or not) */ - public static function checkPageValidity(&$page, array $whitelist = []) + public static function checkPageValidity(&$page, array $whitelist = [], $include = false) { if (empty($whitelist)) { $whitelist = self::$goto_whitelist; @@ -452,6 +453,9 @@ class Core if (in_array($page, $whitelist)) { return true; } + if ($include) { + return false; + } $_page = mb_substr( $page, diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index eceebadaa8..84c8c3f7d9 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -4727,6 +4727,11 @@ class Results $GLOBALS['dbi']->dataSeek($dt_result, $this->__get('num_rows') - 1); $row = $GLOBALS['dbi']->fetchRow($dt_result); + // @see DbiMysqi::fetchRow & DatabaseInterface::fetchRow + if (! is_array($row)) { + $row = array(); + } + // $clause_is_unique is needed by getTable() to generate the proper param // in the multi-edit and multi-delete form list($where_clause, $clause_is_unique, $condition_array) diff --git a/po/ca.po b/po/ca.po index 4216ca2dce..ad7b63183c 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-02-23 15:09+0000\n" +"PO-Revision-Date: 2018-05-31 08:35+0000\n" "Last-Translator: Robert Antoni Buj Gelonch \n" -"Language-Team: Catalan " -"\n" +"Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.20-dev\n" +"X-Generator: Weblate 3.0-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100 msgid "Bad type!" @@ -1973,7 +1973,7 @@ msgstr "Navega pels valors forans" #: js/messages.php:422 msgid "No auto-saved query" -msgstr "No hi ha cap consulta desada automàticament" +msgstr "No hi ha cap consulta auto-desada" #: js/messages.php:423 #, php-format @@ -13197,7 +13197,7 @@ msgstr "Neteja" #: libraries/classes/SqlQueryForm.php:254 msgid "Get auto-saved query" -msgstr "Obtén una consulta desada automàticament" +msgstr "Obtén la consulta auto-desada" #: libraries/classes/SqlQueryForm.php:260 msgid "Bind parameters" diff --git a/po/fi.po b/po/fi.po index 90b0274732..b903ef6286 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-04-21 08:36+0000\n" -"Last-Translator: Pyscowicz \n" +"PO-Revision-Date: 2018-06-11 21:37+0000\n" +"Last-Translator: Santeri Hietanen \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.0-dev\n" +"X-Generator: Weblate 3.0.1\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100 msgid "Bad type!" @@ -7115,8 +7115,9 @@ msgid "The server is not responding." msgstr "Palvelin ei vastaa." #: libraries/classes/DatabaseInterface.php:2131 +#, fuzzy msgid "Logout and try as another user." -msgstr "" +msgstr "Kirjaudu ulos ja yritä toisella käyttäjällä." #: libraries/classes/DatabaseInterface.php:2137 msgid "Please check privileges of directory containing database." diff --git a/po/he.po b/po/he.po index 48bf214161..0ccf3d2e6d 100644 --- a/po/he.po +++ b/po/he.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-05-23 14:38+0000\n" +"PO-Revision-Date: 2018-06-15 13:38+0000\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 3.0-dev\n" +"X-Generator: Weblate 3.0.1\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100 msgid "Bad type!" @@ -3624,61 +3624,63 @@ msgstr "" #: libraries/classes/Config/Descriptions.php:151 msgid "Check config file permissions" -msgstr "" +msgstr "יש לבדוק את הרשאות קובץ ההגדרות" #: libraries/classes/Config/Descriptions.php:154 msgid "" "Compress gzip exports on the fly without the need for much memory; if you " "encounter problems with created gzip files disable this feature." msgstr "" +"ניתן לדחוס נתונים מיוצאים עם gzip על הדרך מבלי לצרוך הרבה זיכרון, אם נתקלת " +"בבעיות עם קובצי gzip שנוצרו דרך כאן יש להשבית את התכונה הזו." #: libraries/classes/Config/Descriptions.php:158 msgid "Compress on the fly" -msgstr "" +msgstr "דחיסה על הדרך" #: libraries/classes/Config/Descriptions.php:161 msgid "" "Whether a warning (\"Are your really sure…\") should be displayed when " "you're about to lose data." -msgstr "" +msgstr "האם יש להציג אזהרה כשעלול להתרחש אובדן נתונים." #: libraries/classes/Config/Descriptions.php:165 msgid "Confirm DROP queries" -msgstr "" +msgstr "אישור שאילתות השמטה (DROP)" #: libraries/classes/Config/Descriptions.php:167 msgid "" "Log SQL queries and their execution time, to be displayed in the console" -msgstr "" +msgstr "תיעוד שאילתות SQL ואת זמן ההפעלה שלהן, יוצג במסוף" #: libraries/classes/Config/Descriptions.php:169 #: templates/console/display.twig:11 templates/console/display.twig:64 msgid "Debug SQL" -msgstr "" +msgstr "ניפוי שגיאות SQL" #: libraries/classes/Config/Descriptions.php:171 msgid "Tab that is displayed when entering a database." -msgstr "" +msgstr "לשונית שמופיעה בעת כניסה למסד הנתונים." #: libraries/classes/Config/Descriptions.php:173 msgid "Default database tab" -msgstr "לשונית מסד נתונים כבררת מחדל" +msgstr "לשונית בררת מחדל למסדי נתונים" #: libraries/classes/Config/Descriptions.php:175 msgid "Tab that is displayed when entering a server." -msgstr "" +msgstr "לשונית שמוצגת בעת כניסה לשרת." #: libraries/classes/Config/Descriptions.php:177 msgid "Default server tab" -msgstr "" +msgstr "לשונית שרת כבררת מחדל" #: libraries/classes/Config/Descriptions.php:179 msgid "Tab that is displayed when entering a table." -msgstr "" +msgstr "לשונית שמופיעה בעת כניסה לטבלה." #: libraries/classes/Config/Descriptions.php:181 msgid "Default table tab" -msgstr "" +msgstr "לשונית טבלה כבררת מחדל" #: libraries/classes/Config/Descriptions.php:183 msgid "Autocomplete of the table and column names in the SQL queries." @@ -5764,10 +5766,8 @@ msgid "The password for authenticating with the proxy." msgstr "" #: libraries/classes/Config/Descriptions.php:1430 -#, fuzzy -#| msgid "Password" msgid "Proxy password" -msgstr "סיסמא" +msgstr "ססמת המתווך" #: libraries/classes/Config/Descriptions.php:1433 msgid "Enable ZIP compression for import and export operations." @@ -5798,9 +5798,8 @@ msgid "Choose the default action when sending error reports." msgstr "" #: libraries/classes/Config/Descriptions.php:1448 -#, fuzzy msgid "Send error reports" -msgstr "קוד שרת (ID)" +msgstr "שליחת דוחות שגיאה" #: libraries/classes/Config/Descriptions.php:1452 msgid "" @@ -5809,9 +5808,8 @@ msgid "" msgstr "" #: libraries/classes/Config/Descriptions.php:1456 -#, fuzzy msgid "Enter executes queries in console" -msgstr "שאילתת SQL" +msgstr "Enter מפעיל שאילתות במסוף" #: libraries/classes/Config/Descriptions.php:1460 msgid "" @@ -5820,16 +5818,13 @@ msgid "" msgstr "" #: libraries/classes/Config/Descriptions.php:1464 -#, fuzzy -#| msgid "Local monitor configuration incompatible" msgid "Enable Zero Configuration mode" -msgstr "תצורת מעקב מקומית אינה נתמכת" +msgstr "הפעלת מצב אפס תצורה" #: libraries/classes/Config/Descriptions.php:1466 #: templates/console/display.twig:153 -#, fuzzy msgid "Show query history at start" -msgstr "שאילתת SQL" +msgstr "הצגת היסטוריית שאילתות בהתחלה" #: libraries/classes/Config/Descriptions.php:1468 #: templates/console/display.twig:149 @@ -6496,10 +6491,8 @@ msgid "possible exploit" msgstr "" #: libraries/classes/Database/Designer.php:108 -#, fuzzy -#| msgid "Could not load import plugins, please check your installation!" msgid "Could not load schema plugins, please check your installation!" -msgstr "לא ניתן לטעון את תוספי הייבוא, נא לבדוק האם ההתקנה שלך תקינה!" +msgstr "לא ניתן לטעון את תוספי הסכמה, נא לבדוק האם ההתקנה שלך תקינה!" #: libraries/classes/Database/Qbe.php:447 #: templates/table/search/search_and_replace.twig:6 @@ -7310,10 +7303,8 @@ msgid "Currently running Git revision %1$s from the %2$s branch." msgstr "" #: libraries/classes/Footer.php:86 -#, fuzzy -#| msgid "Version information" msgid "Git information missing!" -msgstr "מידע גרסאות" +msgstr "פרטי ה־Git חסרים!" #: libraries/classes/Footer.php:201 libraries/classes/Footer.php:205 #: libraries/classes/Footer.php:208 @@ -7329,10 +7320,8 @@ msgid "Click on the bar to scroll to top of page" msgstr "" #: libraries/classes/Header.php:767 templates/login/header.twig:8 -#, fuzzy -#| msgid "Cookies must be enabled past this point." msgid "Javascript must be enabled past this point!" -msgstr "עוגיות (Cookies) חייבות לפעול מנקודה זאת." +msgstr "יש להפעיל Javascript מעבר לנקודה זו!" #: libraries/classes/Import.php:130 libraries/classes/InsertEdit.php:172 #: libraries/classes/Rte/Routines.php:1483 libraries/classes/Sql.php:1406 @@ -7390,9 +7379,8 @@ msgstr "" #: templates/console/display.twig:7 templates/console/display.twig:140 #: templates/table/search/options.twig:1 #: templates/display/results/options_block.twig:10 -#, fuzzy msgid "Options" -msgstr "פעולות" +msgstr "אפשרויות" #: libraries/classes/Import.php:1224 #, php-format @@ -7410,10 +7398,9 @@ msgid "Go to table: %s" msgstr "מעבר לטבלה: %s" #: libraries/classes/Import.php:1267 -#, fuzzy, php-format -#| msgid "Structure only" +#, php-format msgid "Structure of %s" -msgstr "מבנה בלבד" +msgstr "מבנה של %s" #: libraries/classes/Import.php:1285 #, php-format @@ -7431,10 +7418,9 @@ msgid "" msgstr "" #: libraries/classes/Index.php:658 -#, fuzzy, php-format -#| msgid "Create an index on %s columns" +#, php-format msgid "Create an index on  %s columns" -msgstr "יצירת אינדקס על %s  עמודות" +msgstr "יצירת אינדקס על  %s  עמודות" #: libraries/classes/Index.php:690 msgid "No index defined!" @@ -7457,9 +7443,8 @@ msgstr "מספור" #: templates/table/structure/display_partitions.twig:31 #: templates/table/tracking/structure_snapshot_indexes.twig:13 #: templates/table/tracking/structure_snapshot_columns.twig:12 -#, fuzzy msgid "Comment" -msgstr "הערות" +msgstr "הערה" #: libraries/classes/Index.php:753 msgid "The primary key has been dropped." @@ -8119,10 +8104,8 @@ msgid "" msgstr "" #: libraries/classes/Normalization.php:294 -#, fuzzy -#| msgid "Remove selected users" msgid "Remove selected" -msgstr "הסרת משתמשים שנבחרו" +msgstr "הסרת נבחרים" #: libraries/classes/Normalization.php:295 #, fuzzy @@ -8248,10 +8231,8 @@ msgid "Selected repeating group has been moved to the table '%s'" msgstr "" #: libraries/classes/Normalization.php:787 -#, fuzzy -#| msgid "Sep" msgid "Step 3." -msgstr "ספטמבר" +msgstr "שלב 3." #: libraries/classes/Normalization.php:787 msgid "Find transitive dependencies" @@ -8310,8 +8291,6 @@ msgid "No partial dependencies found!" msgstr "" #: libraries/classes/Operations.php:90 -#, fuzzy -#| msgid "Rename database to" msgid "Rename database to" msgstr "שינוי שם מסד הנתונים לשם" @@ -8319,12 +8298,11 @@ msgstr "שינוי שם מסד הנתונים לשם" #: libraries/classes/Operations.php:863 libraries/classes/Operations.php:950 #: libraries/classes/Operations.php:1304 #: templates/columns_definitions/column_adjust_privileges.twig:15 -#, fuzzy -#| msgid "You don't have sufficient privileges to be here right now!" msgid "" "You don't have sufficient privileges to perform this operation; Please refer " "to the documentation for more details" -msgstr "אין לך הרשאות מספיקות להיות כאן כרגע!" +msgstr "" +"אין לך מספיק הרשאות כדי לבצע פעולה זו, נא לפנות לתיעוד לקבלת פרטים נוספים" #: libraries/classes/Operations.php:144 #, php-format @@ -8436,10 +8414,8 @@ msgid "Table %s has been flushed." msgstr "הטבלה %s אופסה." #: libraries/classes/Operations.php:1437 -#, fuzzy -#| msgid "Flush the table (\"FLUSH\")" msgid "Flush the table (FLUSH)" -msgstr "ריקון טבלה (\"FLUSH\")" +msgstr "פינוי הטבלה (FLUSH)" #: libraries/classes/Operations.php:1451 #: templates/database/structure/check_all_tables.twig:22 @@ -8455,10 +8431,8 @@ msgstr "תיקון טבלה" #: libraries/classes/Operations.php:1512 #: templates/database/structure/check_all_tables.twig:14 #: view_operations.php:136 -#, fuzzy -#| msgid "Dumping data for table" msgid "Delete data or table" -msgstr "הוצאת מידע עבור טבלה" +msgstr "מחיקת נתונים או טבלה" #: libraries/classes/Operations.php:1520 msgid "Empty the table (TRUNCATE)" @@ -8475,9 +8449,8 @@ msgstr "" #: libraries/classes/Operations.php:1569 #: templates/table/structure/display_structure.twig:179 -#, fuzzy msgid "Check" -msgstr "צ'יכית" +msgstr "בדיקה" #: libraries/classes/Operations.php:1570 #: templates/table/structure/display_structure.twig:179 @@ -8491,9 +8464,8 @@ msgstr "" #: libraries/classes/Operations.php:1572 #: templates/table/structure/display_structure.twig:179 -#, fuzzy msgid "Repair" -msgstr "תיקון טבלה" +msgstr "תיקון" #: libraries/classes/Operations.php:1573 #: templates/table/structure/display_structure.twig:179 @@ -8501,15 +8473,12 @@ msgid "Truncate" msgstr "" #: libraries/classes/Operations.php:1587 -#, fuzzy -#| msgid "Close" msgid "Coalesce" -msgstr "סגירה" +msgstr "ליכוד" #: libraries/classes/Operations.php:1596 -#, fuzzy msgid "Partition maintenance" -msgstr "אחזקת טבלה" +msgstr "אחזקת מחיצות" #: libraries/classes/Operations.php:1613 #, php-format @@ -8526,35 +8495,32 @@ msgid "Check referential integrity:" msgstr "" #: libraries/classes/Operations.php:2043 -#, fuzzy msgid "Can't move table to same one!" -msgstr "לא ניתן להעתיק טבלה אל אותה אחת!" +msgstr "לא ניתן להעתיק טבלה לאותה אחת!" #: libraries/classes/Operations.php:2045 msgid "Can't copy table to same one!" msgstr "לא ניתן להעתיק טבלה אל אותה אחת!" #: libraries/classes/Operations.php:2069 -#, fuzzy, php-format -#| msgid "Table %s has been moved to %s." +#, php-format msgid "Table %s has been moved to %s. Privileges have been adjusted." -msgstr "הטבלה %s הועברה ל- %s." +msgstr "הטבלה %s הועברה ל־%s. ההרשאות עברו התאמה." #: libraries/classes/Operations.php:2076 -#, fuzzy, php-format -#| msgid "Table %s has been copied to %s." +#, php-format msgid "Table %s has been copied to %s. Privileges have been adjusted." -msgstr "טבלה %s הועתקה אל %s." +msgstr "הטבלה %s הועתקה ל־%s. ההרשאות עברו התאמה." #: libraries/classes/Operations.php:2085 #, php-format msgid "Table %s has been moved to %s." -msgstr "הטבלה %s הועברה ל- %s." +msgstr "הטבלה %s הועברה ל־%s." #: libraries/classes/Operations.php:2089 #, php-format msgid "Table %s has been copied to %s." -msgstr "טבלה %s הועתקה אל %s." +msgstr "הטבלה %s הועתקה ל־%s." #: libraries/classes/Operations.php:2117 msgid "The table name is empty!" @@ -16416,15 +16382,15 @@ msgstr "" #, php-format msgid "" "Rate of reading next table row: %s, this value should be less than 1 per hour" -msgstr "" +msgstr "קצב קריאת השורה הבאה בטבלה: %s, ערך זה אמור להיות פחות מ־1 בשעה" #: libraries/advisory_rules.txt:255 msgid "Different tmp_table_size and max_heap_table_size" -msgstr "" +msgstr "tmp_table_size ו־max_heap_table_size שונים" #: libraries/advisory_rules.txt:258 msgid "{tmp_table_size} and {max_heap_table_size} are not the same." -msgstr "" +msgstr "{tmp_table_size} ו־{max_heap_table_size} אינם זהים." #: libraries/advisory_rules.txt:259 msgid "" @@ -16437,7 +16403,7 @@ msgstr "" #: libraries/advisory_rules.txt:260 #, php-format msgid "Current values are tmp_table_size: %s, max_heap_table_size: %s" -msgstr "" +msgstr "הערכים הנוכחיים הם tmp_table_size: %s,‏ max_heap_table_size: %s" #: libraries/advisory_rules.txt:262 msgid "Percentage of temp tables on disk" @@ -16447,7 +16413,7 @@ msgstr "אחוז הטבלאות הזמניות בכונן" msgid "" "Many temporary tables are being written to disk instead of being kept in " "memory." -msgstr "" +msgstr "טבלאות זמניות רבות נכתבות לכונן במקום שתישמרנה בזיכרון." #: libraries/advisory_rules.txt:266 msgid "" @@ -16465,7 +16431,7 @@ msgstr "" msgid "" "%s%% of all temporary tables are being written to disk, this value should be " "below 25%%" -msgstr "" +msgstr "%s%% מכל הטבלאות הזמניות נכתבות לכונן, ערך זה אמור להיות מתחת ל־25%%" #: libraries/advisory_rules.txt:269 msgid "Temp disk rate" @@ -16487,7 +16453,7 @@ msgstr "" msgid "" "Rate of temporary tables being written to disk: %s, this value should be " "less than 1 per hour" -msgstr "" +msgstr "קצב הטבלאות הזמניות שנכתבות לכונן: %s, ערך זה אמור להיות פחות מ־1 בשעה" #: libraries/advisory_rules.txt:278 #, fuzzy @@ -16506,7 +16472,7 @@ msgstr "" #: libraries/advisory_rules.txt:283 msgid "key_buffer_size is 0" -msgstr "" +msgstr "key_buffer_size הוא 0" #: libraries/advisory_rules.txt:285 #, fuzzy, php-format @@ -16553,7 +16519,7 @@ msgstr "" #: libraries/advisory_rules.txt:304 msgid "You may need to increase {key_buffer_size}." -msgstr "" +msgstr "יתכן שיהיה עליך להגדיל את {key_buffer_size}." #: libraries/advisory_rules.txt:305 #, php-format @@ -16573,6 +16539,8 @@ msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" +"פתיחת טבלאות דורשת פעילות קלט/פלט בכונן שהיא פעולה בזבזנית. הגדלת " +"{table_open_cache} עשויה למנוע זאת." #: libraries/advisory_rules.txt:314 #, php-format @@ -16588,12 +16556,16 @@ msgid "" "The number of open files is approaching the max number of open files. You " "may get a \"Too many open files\" error." msgstr "" +"מספר הקבצים הפתוחים מגיע לסף המרבי של קבצים פתוחים. יתכן ותתקבל שגיאת „יותר " +"מדי קבצים פתוחים”." #: libraries/advisory_rules.txt:320 libraries/advisory_rules.txt:327 msgid "" "Consider increasing {open_files_limit}, and check the error log when " "restarting after changing {open_files_limit}." msgstr "" +"כדאי לנסות להגדיל את {open_files_limit}, ולבדוק מה כתוב ברישום השגיאות בעת " +"הפעלה מחדש לאחר השינוי של {open_files_limit}." #: libraries/advisory_rules.txt:321 #, php-format diff --git a/po/pl.po b/po/pl.po index 33c3ca48ba..da3e3e67cf 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-02-27 21:31+0000\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Polish " -"\n" +"PO-Revision-Date: 2018-06-15 18:33+0000\n" +"Last-Translator: Kuba Niewiarowski \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.20-dev\n" +"X-Generator: Weblate 3.0.1\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100 msgid "Bad type!" @@ -1880,8 +1880,7 @@ msgstr "Eksport" #: js/messages.php:401 msgid "No routine is exportable. Required privileges may be lacking." msgstr "" -"Nie można eksportować żadnej procedury. Wymagane uprawnienia mogą być " -"niewystarczające." +"Brak procedury eksportowania. Możliwe, że brakuje odpowiednich uprawnień." #: js/messages.php:404 libraries/classes/Rte/Routines.php:760 msgid "ENUM/SET editor" @@ -1997,7 +1996,7 @@ msgstr "Zobacz więcej" #: js/messages.php:434 msgid "Are you sure?" -msgstr "Jesteś pewny?" +msgstr "Czy jesteś pewny?" #: js/messages.php:436 msgid "" @@ -2078,8 +2077,8 @@ msgid "" "Sit tight! It may take few seconds depending on data size and column count " "of the table." msgstr "" -"Nie ruszać się z miejsca! Może to potrwać kilka sekund w zależności od " -"rozmiaru danych i liczby kolumn w tabeli." +"Poczekaj chwilę! To może zająć chwilę w zależności od wielkości bazy i " +"ilości tabel." #: js/messages.php:465 msgid "Step" @@ -2087,12 +2086,12 @@ msgstr "Krok" #: js/messages.php:467 msgid "The following actions will be performed:" -msgstr "Zostaną wykonane następujące działania:" +msgstr "Zostaną wykonane następujące operacje:" #: js/messages.php:468 #, php-format msgid "DROP columns %s from the table %s" -msgstr "DROP kolumny %s z tabeli %s" +msgstr "Usuń kolumny %s z tabeli %s (DROP)" #: js/messages.php:469 msgid "Create the following table" @@ -7223,7 +7222,7 @@ msgstr "Serwer nie odpowiada." #: libraries/classes/DatabaseInterface.php:2131 msgid "Logout and try as another user." -msgstr "" +msgstr "Wyloguj się i spróbuj jako inny użytkownik." #: libraries/classes/DatabaseInterface.php:2137 msgid "Please check privileges of directory containing database." @@ -10351,7 +10350,7 @@ msgstr "Zarejestruj się na uwierzytelnianiu" #: libraries/classes/Plugins/TwoFactor/Simple.php:62 msgid "For testing purposes only!" -msgstr "" +msgstr "Tylko do celów testowych!" #: libraries/classes/Plugins/TwoFactorPlugin.php:70 #, fuzzy, php-format @@ -16017,7 +16016,7 @@ msgstr "Brakuje tabel przechowujących konfigurację phpMyAdmin" #: templates/prefs_twofactor.twig:33 msgid "You have enabled two factor authentication." -msgstr "" +msgstr "Aktywowałeś podwójną weryfikację." #: templates/prefs_twofactor.twig:43 templates/prefs_twofactor.twig:54 #: templates/prefs_twofactor_configure.twig:2 diff --git a/po/sl.po b/po/sl.po index e9978d47c4..96183d8240 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-03-21 14:10+0000\n" +"PO-Revision-Date: 2018-05-25 03:31+0000\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian \n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " "n%100==4 ? 2 : 3;\n" -"X-Generator: Weblate 2.20-dev\n" +"X-Generator: Weblate 3.0-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100 msgid "Bad type!" @@ -13649,7 +13649,7 @@ msgstr "Največja velikost: %s %s" #: libraries/classes/Util.php:549 msgid "Static analysis:" -msgstr "Statični analiza:" +msgstr "Statična analiza:" #: libraries/classes/Util.php:552 #, php-format diff --git a/po/ug.po b/po/ug.po index bae39e1608..dd92617a12 100644 --- a/po/ug.po +++ b/po/ug.po @@ -7,22 +7,20 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2015-10-15 11:03+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Uighur \n" +"PO-Revision-Date: 2018-06-08 04:43+0000\n" +"Last-Translator: ۋولقان \n" +"Language-Team: Uyghur \n" "Language: ug\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.5-dev\n" +"X-Generator: Weblate 3.0\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100 -#, fuzzy -#| msgid "Bar type" msgid "Bad type!" -msgstr "چىقىرىش" +msgstr "بوزۇق تىپ!" #: changelog.php:39 license.php:34 #, php-format @@ -345,10 +343,8 @@ msgstr "" "%sبۇ يەرنى كۆرۈڭ%s." #: db_qbe.php:130 -#, fuzzy -#| msgid "You have to choose at least one column to display" msgid "You have to choose at least one column to display!" -msgstr "بۇنى بىجىرىش ئۈچۈن مەزمۇن تاللانغان بولۇشى كېرەك" +msgstr "ئەڭ ئاز بىرقۇرنى كۆرسىتىشكە تاللىشىڭىز كېرەك!" #: db_qbe.php:148 #, php-format @@ -360,7 +356,7 @@ msgstr "" #: libraries/classes/Plugins/Auth/AuthenticationHttp.php:78 #: libraries/classes/Plugins/AuthenticationPlugin.php:171 msgid "Access denied!" -msgstr "رەت قىلىندى" +msgstr "زىيارەت رەت قىلىندى!" #: db_tracking.php:55 db_tracking.php:80 #, fuzzy @@ -3845,7 +3841,7 @@ msgstr "" #: libraries/classes/Config/Descriptions.php:64 msgid "Allow login to any MySQL server" -msgstr "" +msgstr "ھەرقانداق MySQL مۇلازىمىتىرىگە كىرىشكە قوشۇل" #: libraries/classes/Config/Descriptions.php:67 msgid "" @@ -3855,10 +3851,8 @@ msgid "" msgstr "" #: libraries/classes/Config/Descriptions.php:72 -#, fuzzy -#| msgid "Cannot log in to the MySQL server" msgid "Restrict login to MySQL server" -msgstr "MySQL مۇلازىمىتېرىغا ئۇلىنالمىدى." +msgstr "MySQL مۇلازىمىتېرىغا كىرىشنى چەكلە." #: libraries/classes/Config/Descriptions.php:75 msgid "" diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig index 54595957d6..873c2be091 100644 --- a/templates/table/structure/display_structure.twig +++ b/templates/table/structure/display_structure.twig @@ -64,7 +64,7 @@ {% endif %} {% if field_name in columns_with_index %} {% set displayed_field_name = displayed_field_name ~ Util_getImage( - 'b_key', 'Index'|trans + 'bd_primary', 'Index'|trans ) %} {% endif %} diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php index 7a04cf763c..ddda7b7010 100644 --- a/test/classes/CoreTest.php +++ b/test/classes/CoreTest.php @@ -267,9 +267,9 @@ class CoreTest extends PmaTestCase * * @dataProvider providerTestGotoNowhere */ - function testGotoNowhere($page, $whiteList, $expected) + function testGotoNowhere($page, $whiteList, $include, $expected) { - $this->assertSame($expected, Core::checkPageValidity($page, $whiteList)); + $this->assertSame($expected, Core::checkPageValidity($page, $whiteList, $include)); } /** @@ -280,12 +280,18 @@ class CoreTest extends PmaTestCase public function providerTestGotoNowhere() { return array( - array(null, [], false), - array('export.php', [], true), - array('export.php', $this->goto_whitelist, true), - array('shell.php', $this->goto_whitelist, false), - array('index.php?sql.php&test=true', $this->goto_whitelist, true), - array('index.php%3Fsql.php%26test%3Dtrue', $this->goto_whitelist, true), + array(null, [], false, false), + array(null, [], true, false), + array('export.php', [], false, true), + array('export.php', [], true, true), + array('export.php', $this->goto_whitelist, false, true), + array('export.php', $this->goto_whitelist, true, true), + array('shell.php', $this->goto_whitelist, false, false), + array('shell.php', $this->goto_whitelist, true, false), + array('index.php?sql.php&test=true', $this->goto_whitelist, false, true), + array('index.php?sql.php&test=true', $this->goto_whitelist, true, false), + array('index.php%3Fsql.php%26test%3Dtrue', $this->goto_whitelist, false, true), + array('index.php%3Fsql.php%26test%3Dtrue', $this->goto_whitelist, true, false), ); }