From 71fcb2fe2cf74cdafe804154eba3e713fbfcd2ee Mon Sep 17 00:00:00 2001 From: xmujay Date: Mon, 29 Jul 2013 20:32:45 +0800 Subject: [PATCH 01/41] refactor server_status_queries.php: 1. move functions to lib file --- libraries/server_status_queries.lib.php | 145 ++++++++++++++++++++++++ server_status_queries.php | 134 +--------------------- 2 files changed, 148 insertions(+), 131 deletions(-) create mode 100644 libraries/server_status_queries.lib.php diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php new file mode 100644 index 0000000000..c77da248c2 --- /dev/null +++ b/libraries/server_status_queries.lib.php @@ -0,0 +1,145 @@ +status['Uptime']; + $used_queries = $ServerStatusData->used_queries; + $total_queries = array_sum($used_queries); + + $retval .= '

'; + /* l10n: Questions is the name of a MySQL Status variable */ + $retval .= sprintf( + __('Questions since startup: %s'), + PMA_Util::formatNumber($total_queries, 0) + ); + $retval .= ' '; + $retval .= PMA_Util::showMySQLDocu( + 'server-status-variables', + 'server-status-variables', + false, + 'statvar_Questions' + ); + $retval .= '
'; + $retval .= ''; + $retval .= 'ø ' . __('per hour:') . ' '; + $retval .= PMA_Util::formatNumber($total_queries * $hour_factor, 0); + $retval .= '
'; + $retval .= 'ø ' . __('per minute:') . ' '; + $retval .= PMA_Util::formatNumber($total_queries * 60 / $ServerStatusData->status['Uptime'], 0); + $retval .= '
'; + if ($total_queries / $ServerStatusData->status['Uptime'] >= 1) { + $retval .= 'ø ' . __('per second:') . ' '; + $retval .= PMA_Util::formatNumber($total_queries / $ServerStatusData->status['Uptime'], 0); + } + $retval .= ''; + $retval .= '

'; + + $retval .= PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData); + + return $retval; +} + +/** + * Returns the html content for the query details + * + * @param object $ServerStatusData An instance of the PMA_ServerStatusData class + * + * @return string + */ +function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData) +{ + $hour_factor = 3600 / $ServerStatusData->status['Uptime']; + $used_queries = $ServerStatusData->used_queries; + $total_queries = array_sum($used_queries); + // reverse sort by value to show most used statements first + arsort($used_queries); + + $odd_row = true; + $perc_factor = 100 / $total_queries; //(- $ServerStatusData->status['Connections']); + + $retval = ''; + $retval .= ''; + $retval .= ''; + $retval .= ''; + $retval .= ''; + $retval .= ''; + $retval .= ''; + $retval .= ''; + $retval .= ''; + $retval .= ''; + $retval .= ''; + + $chart_json = array(); + $query_sum = array_sum($used_queries); + $other_sum = 0; + foreach ($used_queries as $name => $value) { + $odd_row = !$odd_row; + // For the percentage column, use Questions - Connections, because + // the number of connections is not an item of the Query types + // but is included in Questions. Then the total of the percentages is 100. + $name = str_replace(array('Com_', '_'), array('', ' '), $name); + // Group together values that make out less than 2% into "Other", but only + // if we have more than 6 fractions already + if ($value < $query_sum * 0.02 && count($chart_json)>6) { + $other_sum += $value; + } else { + $chart_json[$name] = $value; + } + $retval .= ''; + $retval .= ''; + $retval .= ''; + $retval .= ''; + $retval .= ''; + $retval .= ''; + } + $retval .= ''; + $retval .= '
' . __('Statements') . ''; + /* l10n: # = Amount of queries */ + $retval .= __('#'); + $retval .= 'ø ' . __('per hour') . '%
' . htmlspecialchars($name) . ''; + $retval .= htmlspecialchars(PMA_Util::formatNumber($value, 5, 0, true)); + $retval .= ''; + $retval .= htmlspecialchars( + PMA_Util::formatNumber($value * $hour_factor, 4, 1, true) + ); + $retval .= ''; + $retval .= htmlspecialchars( + PMA_Util::formatNumber($value * $perc_factor, 0, 2) + ); + $retval .= '
'; + + $retval .= '
'; + $retval .= ''; + + return $retval; +} + +?> diff --git a/server_status_queries.php b/server_status_queries.php index febdbb85b6..8f2e00d9cb 100644 --- a/server_status_queries.php +++ b/server_status_queries.php @@ -9,6 +9,8 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/server_common.inc.php'; require_once 'libraries/ServerStatusData.class.php'; +require_once 'libraries/server_status_queries.lib.php'; + if (PMA_DRIZZLE) { $server_master_status = false; $server_slave_status = false; @@ -42,138 +44,8 @@ $scripts->addFile('server_status_sorter.js'); // Add the html content to the response $response->addHTML('
'); $response->addHTML($ServerStatusData->getMenuHtml()); -$response->addHTML(PMA_getQueryStatisticsHtml($ServerStatusData)); +$response->addHTML(PMA_getHtmlForQueryStatistics($ServerStatusData)); $response->addHTML('
'); exit; -/** - * Returns the html content for the query statistics - * - * @param object $ServerStatusData An instance of the PMA_ServerStatusData class - * - * @return string - */ -function PMA_getQueryStatisticsHtml($ServerStatusData) -{ - $retval = ''; - - $hour_factor = 3600 / $ServerStatusData->status['Uptime']; - $used_queries = $ServerStatusData->used_queries; - $total_queries = array_sum($used_queries); - - $retval .= '

'; - /* l10n: Questions is the name of a MySQL Status variable */ - $retval .= sprintf( - __('Questions since startup: %s'), - PMA_Util::formatNumber($total_queries, 0) - ); - $retval .= ' '; - $retval .= PMA_Util::showMySQLDocu( - 'server-status-variables', - 'server-status-variables', - false, - 'statvar_Questions' - ); - $retval .= '
'; - $retval .= ''; - $retval .= 'ø ' . __('per hour:') . ' '; - $retval .= PMA_Util::formatNumber($total_queries * $hour_factor, 0); - $retval .= '
'; - $retval .= 'ø ' . __('per minute:') . ' '; - $retval .= PMA_Util::formatNumber($total_queries * 60 / $ServerStatusData->status['Uptime'], 0); - $retval .= '
'; - if ($total_queries / $ServerStatusData->status['Uptime'] >= 1) { - $retval .= 'ø ' . __('per second:') . ' '; - $retval .= PMA_Util::formatNumber($total_queries / $ServerStatusData->status['Uptime'], 0); - } - $retval .= ''; - $retval .= '

'; - - $retval .= PMA_getServerStatusQueriesDetailsHtml($ServerStatusData); - - return $retval; -} - -/** - * Returns the html content for the query details - * - * @param object $ServerStatusData An instance of the PMA_ServerStatusData class - * - * @return string - */ -function PMA_getServerStatusQueriesDetailsHtml($ServerStatusData) -{ - $hour_factor = 3600 / $ServerStatusData->status['Uptime']; - $used_queries = $ServerStatusData->used_queries; - $total_queries = array_sum($used_queries); - // reverse sort by value to show most used statements first - arsort($used_queries); - - $odd_row = true; - $perc_factor = 100 / $total_queries; //(- $ServerStatusData->status['Connections']); - - $retval = ''; - $retval .= ''; - $retval .= ''; - $retval .= ''; - $retval .= ''; - $retval .= ''; - $retval .= ''; - $retval .= ''; - $retval .= ''; - $retval .= ''; - $retval .= ''; - - $chart_json = array(); - $query_sum = array_sum($used_queries); - $other_sum = 0; - foreach ($used_queries as $name => $value) { - $odd_row = !$odd_row; - // For the percentage column, use Questions - Connections, because - // the number of connections is not an item of the Query types - // but is included in Questions. Then the total of the percentages is 100. - $name = str_replace(array('Com_', '_'), array('', ' '), $name); - // Group together values that make out less than 2% into "Other", but only - // if we have more than 6 fractions already - if ($value < $query_sum * 0.02 && count($chart_json)>6) { - $other_sum += $value; - } else { - $chart_json[$name] = $value; - } - $retval .= ''; - $retval .= ''; - $retval .= ''; - $retval .= ''; - $retval .= ''; - $retval .= ''; - } - $retval .= ''; - $retval .= '
' . __('Statements') . ''; - /* l10n: # = Amount of queries */ - $retval .= __('#'); - $retval .= 'ø ' . __('per hour') . '%
' . htmlspecialchars($name) . ''; - $retval .= htmlspecialchars(PMA_Util::formatNumber($value, 5, 0, true)); - $retval .= ''; - $retval .= htmlspecialchars( - PMA_Util::formatNumber($value * $hour_factor, 4, 1, true) - ); - $retval .= ''; - $retval .= htmlspecialchars( - PMA_Util::formatNumber($value * $perc_factor, 0, 2) - ); - $retval .= '
'; - - $retval .= '
'; - $retval .= ''; - - return $retval; -} - ?> From fcd83fca5e0a071541332db8bc1d2a2129a93ad2 Mon Sep 17 00:00:00 2001 From: xmujay Date: Mon, 29 Jul 2013 20:40:53 +0800 Subject: [PATCH 02/41] fix the code style of server_status_queries.php --- libraries/server_status_queries.lib.php | 17 +++++++++++++---- server_status_queries.php | 2 ++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php index c77da248c2..c43773b905 100644 --- a/libraries/server_status_queries.lib.php +++ b/libraries/server_status_queries.lib.php @@ -46,11 +46,17 @@ function PMA_getHtmlForQueryStatistics($ServerStatusData) $retval .= PMA_Util::formatNumber($total_queries * $hour_factor, 0); $retval .= '
'; $retval .= 'ø ' . __('per minute:') . ' '; - $retval .= PMA_Util::formatNumber($total_queries * 60 / $ServerStatusData->status['Uptime'], 0); + $retval .= PMA_Util::formatNumber( + $total_queries * 60 / $ServerStatusData->status['Uptime'], + 0 + ); $retval .= '
'; if ($total_queries / $ServerStatusData->status['Uptime'] >= 1) { $retval .= 'ø ' . __('per second:') . ' '; - $retval .= PMA_Util::formatNumber($total_queries / $ServerStatusData->status['Uptime'], 0); + $retval .= PMA_Util::formatNumber( + $total_queries / $ServerStatusData->status['Uptime'], + 0 + ); } $retval .= ''; $retval .= ''; @@ -76,9 +82,12 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData) arsort($used_queries); $odd_row = true; - $perc_factor = 100 / $total_queries; //(- $ServerStatusData->status['Connections']); + + //(- $ServerStatusData->status['Connections']); + $perc_factor = 100 / $total_queries; - $retval = ''; + $retval = '
'; $retval .= ''; $retval .= ''; $retval .= ''; diff --git a/server_status_queries.php b/server_status_queries.php index 8f2e00d9cb..b895843292 100644 --- a/server_status_queries.php +++ b/server_status_queries.php @@ -1,5 +1,6 @@ getHeader(); $scripts = $header->getScripts(); $scripts->addFile('server_status_queries.js'); + /* < IE 9 doesn't support canvas natively */ if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) { $scripts->addFile('jqplot/excanvas.js'); From fda943a92461198aac0d40cdbf6b66f7c192e6b0 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 29 Jul 2013 20:31:02 +0200 Subject: [PATCH 03/41] Translated using Weblate (Turkish) Currently translated at 100.0% (2609 of 2609) --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 1bbca3896a..43823d5b22 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 15:07+0200\n" -"PO-Revision-Date: 2013-07-29 20:20+0200\n" +"PO-Revision-Date: 2013-07-29 20:30+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish \n" "Language: tr\n" @@ -7418,7 +7418,7 @@ msgstr "Çekçe-Slovakça" #: libraries/mysql_charsets.lib.php:436 libraries/mysql_charsets.lib.php:443 #: libraries/structure.lib.php:1068 msgid "unknown" -msgstr "bilinmeyen" +msgstr "bilinmiyor" #: libraries/navigation/Navigation.class.php:61 msgid "An error has occured while loading the navigation tree" From 8476f94f6c6ef7fa89a6f74f51b5956ed6aa6b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Tue, 30 Jul 2013 07:13:19 +0200 Subject: [PATCH 04/41] Translated using Weblate (Estonian) Currently translated at 100.0% (2708.0 of 2708) --- po/et.po | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/po/et.po b/po/et.po index 9cf491f6aa..066537fe36 100644 --- a/po/et.po +++ b/po/et.po @@ -6,10 +6,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 13:37-0400\n" -"PO-Revision-Date: 2013-07-29 16:09+0200\n" +"PO-Revision-Date: 2013-07-30 07:13+0200\n" "Last-Translator: Kristjan Räts \n" -"Language-Team: Estonian \n" +"Language-Team: Estonian " +"\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10158,21 +10158,18 @@ msgstr "Kasutajate grupid" #: libraries/server_privileges.lib.php:3236 #: libraries/server_privileges.lib.php:3402 -#, fuzzy #| msgid "Server level tabs" msgid "Server-level tabs" msgstr "Serveri tasemete sakid" #: libraries/server_privileges.lib.php:3237 #: libraries/server_privileges.lib.php:3405 -#, fuzzy #| msgid "Database level tabs" msgid "Database-level tabs" msgstr "Andmebaasi tasemete sakid" #: libraries/server_privileges.lib.php:3238 #: libraries/server_privileges.lib.php:3408 -#, fuzzy #| msgid "Table level tabs" msgid "Table-level tabs" msgstr "Tabeli tasemete sakid" From 7903415bfaa954a76e493f26314e736cafbdcda7 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 30 Jul 2013 07:54:42 +0200 Subject: [PATCH 05/41] Translated using Weblate (Greek) Currently translated at 100.0% (2708.0 of 2708) --- po/el.po | 94 ++++++++++++++++++++++---------------------------------- 1 file changed, 36 insertions(+), 58 deletions(-) diff --git a/po/el.po b/po/el.po index 80976ef950..47717571c8 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 13:37-0400\n" -"PO-Revision-Date: 2013-07-15 07:46+0200\n" +"PO-Revision-Date: 2013-07-30 07:54+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: Greek \n" "Language: el\n" @@ -12,7 +12,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 1.6-dev\n" +"X-Generator: Weblate 1.6\n" #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:339 #: libraries/DisplayResults.class.php:813 @@ -1950,10 +1950,9 @@ msgid "Hide Panel" msgstr "Απόκρυψη Πίνακα" #: js/messages.php:369 -#, fuzzy #| msgid "Show logo in navigation panel" msgid "Show hidden navigation tree items" -msgstr "Προβολή λογοτύπου στον πίνακα πλοήγησης" +msgstr "Προβολή κρυφών αντικειμένων δέντρου πλοήγησης" #: js/messages.php:372 msgid "The requested page was not found in the history, it may have expired." @@ -2674,16 +2673,16 @@ msgstr "" "%sτεκμηρίωση%s." #: libraries/DisplayResults.class.php:4921 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows" msgid "Showing rows %1s - %2s" -msgstr "Εμφάνιση εγγραφών" +msgstr "Εμφάνιση εγγραφών %1s - %2s" #: libraries/DisplayResults.class.php:4933 -#, fuzzy, php-format +#, php-format #| msgid "total" msgid "%d total" -msgstr "συνολικά" +msgstr "%d συνολικά" #: libraries/DisplayResults.class.php:4945 libraries/sql.lib.php:1640 #, php-format @@ -6112,7 +6111,6 @@ msgid "User preferences storage table" msgstr "Πίνακας αποθήκευσης προτιμήσεων χρήστη" #: libraries/config/messages.inc.php:455 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma__userconfig[/kbd]" @@ -6120,17 +6118,15 @@ msgid "" "Leave blank to disable configurable menus feature, suggested: [kbd]pma__users" "[/kbd]" msgstr "" -"Αφήστε το κενό για μη αποθήκευση των ρυθμίσεων χρήστη, προτείνεται: [kbd]" -"pma__userconfig[/kbd]" +"Αφήστε το κενό για απενεργοποίηση του χαρακτηριστικού προσαρμόσιμων μενού, " +"προτείνεται: [kbd]pma__users[/kbd]" #: libraries/config/messages.inc.php:456 -#, fuzzy #| msgid "Use Tables" msgid "Users table" -msgstr "Χρήση Πινάκων" +msgstr "Πίνακας χρηστών" #: libraries/config/messages.inc.php:457 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma__userconfig[/kbd]" @@ -6138,17 +6134,15 @@ msgid "" "Leave blank to disable configurable menus feature, suggested: [kbd]" "pma__usergroups[/kbd]" msgstr "" -"Αφήστε το κενό για μη αποθήκευση των ρυθμίσεων χρήστη, προτείνεται: [kbd]" -"pma__userconfig[/kbd]" +"Αφήστε το κενό για απενεργοποίηση του χαρακτηριστικού προσαρμόσιμων μενού, " +"προτείνεται: [kbd]pma__usergroups[/kbd]" #: libraries/config/messages.inc.php:458 -#, fuzzy #| msgid "Use Host Table" msgid "User groups table" -msgstr "Χρήση Οικείου Πίνακα" +msgstr "Πίνακας ομάδων χρηστών" #: libraries/config/messages.inc.php:459 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma__userconfig[/kbd]" @@ -6156,12 +6150,12 @@ msgid "" "Leave blank to disable the feature to hide and show navigation items, " "suggested: [kbd]pma__navigationhiding[/kbd]" msgstr "" -"Αφήστε το κενό για μη αποθήκευση των ρυθμίσεων χρήστη, προτείνεται: [kbd]" -"pma__userconfig[/kbd]" +"Αφήστε το κενό για απενεργοποίηση του χαρακτηριστικού προσαρμόσιμων μενού, " +"προτείνεται: [kbd]pma__navigationhiding[/kbd]" #: libraries/config/messages.inc.php:460 msgid "Hidden navigation items table" -msgstr "" +msgstr "Πίνακας κρυφών αντικειμένων πλοήγησης" #: libraries/config/messages.inc.php:462 msgid "User for config auth" @@ -7741,34 +7735,29 @@ msgid "An error has occured while loading the navigation tree" msgstr "Ένα σφάλμα συμβαίνει κατά τη φόρτωση του δέντρου πλοήγησης" #: libraries/navigation/Navigation.class.php:172 -#, fuzzy #| msgid "Events" msgid "Events:" -msgstr "Συμβάντα" +msgstr "Συμβάντα:" #: libraries/navigation/Navigation.class.php:173 -#, fuzzy #| msgid "Functions" msgid "Functions:" -msgstr "Συναρτήσεις" +msgstr "Συναρτήσεις:" #: libraries/navigation/Navigation.class.php:174 -#, fuzzy #| msgid "Procedures" msgid "Procedures:" -msgstr "Διαδικασίες" +msgstr "Διαδικασίες:" #: libraries/navigation/Navigation.class.php:175 -#, fuzzy #| msgid "Tables" msgid "Tables:" -msgstr "Πίνακες" +msgstr "Πίνακες:" #: libraries/navigation/Navigation.class.php:176 -#, fuzzy #| msgid "Views" msgid "Views:" -msgstr "Προβολές" +msgstr "Προβολές:" #: libraries/navigation/NavigationHeader.class.php:183 msgid "Home" @@ -8874,16 +8863,14 @@ msgid "User preferences" msgstr "Ρυθμίσεις χρήστη" #: libraries/relation.lib.php:264 -#, fuzzy #| msgid "Configuration: %s" msgid "Configurable menus" -msgstr "Ρύθμιση: %s" +msgstr "Προσαρμόσιμα μενού" #: libraries/relation.lib.php:275 -#, fuzzy #| msgid "Reload navigation frame" msgid "Hide/show navigation items" -msgstr "Επαναφόρτωση πλαισίου πλοήγησης" +msgstr "Απόκρυψη/εμφάνιση αντικειμένων πλοήγησης" #: libraries/relation.lib.php:281 msgid "Quick steps to setup advanced features:" @@ -10056,7 +10043,7 @@ msgstr "Κανένα" #: libraries/server_privileges.lib.php:2531 #: libraries/server_privileges.lib.php:3235 msgid "User group" -msgstr "" +msgstr "Ομάδας χρηστών" #: libraries/server_privileges.lib.php:618 msgid "Resource limits" @@ -10295,10 +10282,9 @@ msgid "Add privileges on the following table:" msgstr "Προσθήκη δεδομένων στον ακόλουθο πίνακα:" #: libraries/server_privileges.lib.php:2599 -#, fuzzy #| msgid "Edit server" msgid "Edit user group" -msgstr "Επεξεργασία διακομιστή" +msgstr "Επεξεργασία ομάδας χρηστών" #: libraries/server_privileges.lib.php:2714 msgid "Remove selected users" @@ -10363,69 +10349,61 @@ msgstr "" #: libraries/server_privileges.lib.php:3187 #, php-format msgid "Users of '%s' user group" -msgstr "" +msgstr "Χρήστες της ομάδας χρηστών «%s»" #: libraries/server_privileges.lib.php:3198 msgid "No users were found belonging to this user group." -msgstr "" +msgstr "Κανένας χρήστης δεν βρέθηκε να ανήκει σε αυτή την ομάδα χρηστών." #: libraries/server_privileges.lib.php:3229 #: libraries/server_privileges.lib.php:3878 -#, fuzzy #| msgid "Users" msgid "User groups" -msgstr "Χρήστες" +msgstr "Ομάδες χρηστών" #: libraries/server_privileges.lib.php:3236 #: libraries/server_privileges.lib.php:3402 -#, fuzzy #| msgid "Server version" msgid "Server-level tabs" -msgstr "Έκδοση διακομιστή" +msgstr "Καρτέλες επιπέδου διακομιστή" #: libraries/server_privileges.lib.php:3237 #: libraries/server_privileges.lib.php:3405 -#, fuzzy #| msgid "Database server" msgid "Database-level tabs" -msgstr "Διακομιστής βάσης δεδομένων" +msgstr "Καρτέλες επιπέδου βάσης δεδομένων" #: libraries/server_privileges.lib.php:3238 #: libraries/server_privileges.lib.php:3408 -#, fuzzy #| msgid "Table comments" msgid "Table-level tabs" -msgstr "Σχόλια πίνακα" +msgstr "Καρτέλες επιπέδου πίνακα" #: libraries/server_privileges.lib.php:3260 -#, fuzzy #| msgid "Views" msgid "View users" -msgstr "Προβολές" +msgstr "Χρήστες προβολών" #: libraries/server_privileges.lib.php:3288 #: libraries/server_privileges.lib.php:3344 -#, fuzzy #| msgid "Add user" msgid "Add user group" -msgstr "Προσθήκη χρήστη" +msgstr "Προσθήκη ομάδας χρηστών" #: libraries/server_privileges.lib.php:3347 #, php-format msgid "Edit user group: '%s'" -msgstr "" +msgstr "Επεξεργασία ομάδας χρηστών: «%s»" #: libraries/server_privileges.lib.php:3363 -#, fuzzy #| msgid "No privileges." msgid "User group privileges" -msgstr "Χωρίς δικαιώματα." +msgstr "Δικαιώματα ομάδας χρηστών" #: libraries/server_privileges.lib.php:3370 -#, fuzzy #| msgid "Column names: " msgid "Group name:" -msgstr "Ονόματα στηλών: " +msgstr "Όνομα ομάδας:" #: libraries/server_privileges.lib.php:3521 msgid "The selected user was not found in the privilege table." From a283c38a96f8df0f0b1abc578e1ce8403fdd2358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 07:59:12 +0200 Subject: [PATCH 06/41] Translated using Weblate (Czech) Currently translated at 100.0% (2708.0 of 2708) --- po/cs.po | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/po/cs.po b/po/cs.po index 7c3ff1db6c..e29c42d9ee 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 13:37-0400\n" -"PO-Revision-Date: 2013-07-29 15:37+0200\n" +"PO-Revision-Date: 2013-07-30 07:59+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: Czech \n" "Language: cs\n" @@ -10157,7 +10157,6 @@ msgid "Users of '%s' user group" msgstr "Uživatelé ze skupiny '%s'" #: libraries/server_privileges.lib.php:3198 -#, fuzzy #| msgid "No users were found belonging to this user group" msgid "No users were found belonging to this user group." msgstr "V této skupině nebyli nalezeni žádní uživatelé." @@ -10169,21 +10168,18 @@ msgstr "Skupiny" #: libraries/server_privileges.lib.php:3236 #: libraries/server_privileges.lib.php:3402 -#, fuzzy #| msgid "Server level tabs" msgid "Server-level tabs" msgstr "Záložky pro práci se serverem" #: libraries/server_privileges.lib.php:3237 #: libraries/server_privileges.lib.php:3405 -#, fuzzy #| msgid "Database level tabs" msgid "Database-level tabs" msgstr "Záložky pro práci s databází" #: libraries/server_privileges.lib.php:3238 #: libraries/server_privileges.lib.php:3408 -#, fuzzy #| msgid "Table level tabs" msgid "Table-level tabs" msgstr "Záložky pro práci s tabulkou" @@ -10207,10 +10203,9 @@ msgid "User group privileges" msgstr "Oprávnění skupiny" #: libraries/server_privileges.lib.php:3370 -#, fuzzy #| msgid "Group name: " msgid "Group name:" -msgstr "Název skupiny: " +msgstr "Název skupiny:" #: libraries/server_privileges.lib.php:3521 msgid "The selected user was not found in the privilege table." From 7dc178ce49ab0a6148995fb1dcc048e763bff6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 09:14:47 +0200 Subject: [PATCH 07/41] Avoid double saving of version into session cache --- libraries/Util.class.php | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/libraries/Util.class.php b/libraries/Util.class.php index b1a0faf1e5..ba11d6c2d7 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -4264,24 +4264,16 @@ class PMA_Util } } - if ($save) { - $_SESSION['cache']['version_check'] = array( - 'response' => $response, - 'timestamp' => time() - ); - } - $data = json_decode($response); if (is_object($data) && strlen($data->version) && strlen($data->date) + && $save ) { - if ($save) { - $_SESSION['cache']['version_check'] = array( - 'response' => $response, - 'timestamp' => time() - ); - } + $_SESSION['cache']['version_check'] = array( + 'response' => $response, + 'timestamp' => time() + ); } return $data; From da4042fb6c4365dc8187765c3bf525043687c66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 09:40:56 +0200 Subject: [PATCH 08/41] Display none only if protection is enabled --- libraries/Header.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/Header.class.php b/libraries/Header.class.php index 8e4ba3393d..f8b6a1038c 100644 --- a/libraries/Header.class.php +++ b/libraries/Header.class.php @@ -531,7 +531,9 @@ class PMA_Header $retval = ''; $retval .= ''; $retval .= ''; - $retval .= ''; + if (! $GLOBALS['cfg']['AllowThirdPartyFraming']) { + $retval .= ''; + } return $retval; } From 4da684e7b67f51c245103a0bbb2096938ba2df0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 10:17:32 +0200 Subject: [PATCH 09/41] Fixed escaping in error message asking for translations --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 0e87ccdaf0..a87f5f1e3d 100644 --- a/index.php +++ b/index.php @@ -560,7 +560,7 @@ if (file_exists('libraries/language_stats.inc.php')) { && $GLOBALS['language_stats'][$lang] < $cfg['TranslationWarningThreshold'] ) { trigger_error( - 'You are using an incomplete translation, please help to make it better by contributing.', + 'You are using an incomplete translation, please help to make it better by [a@http://www.phpmyadmin.net/home_page/improve.php#translate@_blank]contributing[/a].', E_USER_NOTICE ); } From 637ce0ced085e1f03fdfdf0e6b9dd3a872508a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 10:23:02 +0200 Subject: [PATCH 10/41] Fix number of user prefs I wonder whether it really makes sense to test against count of configurable properties... --- test/libraries/PMA_user_preferences_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php index 11382a45dc..6cd8283036 100644 --- a/test/libraries/PMA_user_preferences_test.php +++ b/test/libraries/PMA_user_preferences_test.php @@ -299,7 +299,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase public function testReadUserprefsFieldNames() { $this->assertCount( - 216, + 217, PMA_readUserprefsFieldNames() ); From ac1b040d7a186a73f3a294aac18a8127410d31ea Mon Sep 17 00:00:00 2001 From: Tony Chen Date: Tue, 30 Jul 2013 11:00:59 +0200 Subject: [PATCH 11/41] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2708.0 of 2708) --- po/zh_TW.po | 104 +++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 63 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 76f32a673b..db8886ce9e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 13:37-0400\n" -"PO-Revision-Date: 2013-07-13 20:32+0200\n" +"PO-Revision-Date: 2013-07-30 11:00+0200\n" "Last-Translator: Tony Chen \n" -"Language-Team: Traditional Chinese \n" +"Language-Team: Traditional Chinese " +"\n" "Language: zh_TW\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 1.6-dev\n" +"X-Generator: Weblate 1.6\n" #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:339 #: libraries/DisplayResults.class.php:813 @@ -1885,10 +1885,9 @@ msgid "Hide Panel" msgstr "隱藏控制面板" #: js/messages.php:369 -#, fuzzy #| msgid "Show logo in navigation panel" msgid "Show hidden navigation tree items" -msgstr "在左側面板中顯示 logo" +msgstr "顯示隱藏的導覽樹項目" #: js/messages.php:372 msgid "The requested page was not found in the history, it may have expired." @@ -2603,16 +2602,16 @@ msgid "" msgstr "這個檢視至少需包含這個數目的資料，請參考%sdocumentation%s。" #: libraries/DisplayResults.class.php:4921 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows" msgid "Showing rows %1s - %2s" -msgstr "顯示行" +msgstr "顯示行 %1s-%2s" #: libraries/DisplayResults.class.php:4933 -#, fuzzy, php-format +#, php-format #| msgid "total" msgid "%d total" -msgstr "總計" +msgstr "總數 %d" #: libraries/DisplayResults.class.php:4945 libraries/sql.lib.php:1640 #, php-format @@ -5164,7 +5163,7 @@ msgstr "內存限制" #: libraries/config/messages.inc.php:299 msgid "Show logo in navigation panel" -msgstr "在左側面板中顯示 logo" +msgstr "在導覽面板中顯示 logo" #: libraries/config/messages.inc.php:300 msgid "Display logo" @@ -5190,7 +5189,7 @@ msgstr "Logo 連結目標" #: libraries/config/messages.inc.php:305 msgid "Display server choice at the top of the navigation panel" -msgstr "在左側面板頂部顯示伺服器選擇" +msgstr "在導覽面板頂部顯示伺服器選擇" #: libraries/config/messages.inc.php:306 msgid "Display servers selection" @@ -5283,7 +5282,7 @@ msgstr "僅使用圖示、文字或都使用" #: libraries/config/messages.inc.php:327 msgid "Table navigation bar" -msgstr "資料表導航欄" +msgstr "資料表導覽欄" #: libraries/config/messages.inc.php:328 msgid "use GZip output buffering for increased speed in HTTP transfers" @@ -5864,50 +5863,45 @@ msgid "User preferences storage table" msgstr "使用者偏好表" #: libraries/config/messages.inc.php:455 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma__userconfig[/kbd]" msgid "" "Leave blank to disable configurable menus feature, suggested: [kbd]pma__users" "[/kbd]" -msgstr "不在資料庫中儲存使用者偏好請留空，建議值：[kbd]pma__config[/kbd]" +msgstr "空白為禁用配置的選單功能，建議值：[kbd]pma__users[/kbd]" #: libraries/config/messages.inc.php:456 -#, fuzzy #| msgid "Use Tables" msgid "Users table" -msgstr "使用表" +msgstr "使用者資料表" #: libraries/config/messages.inc.php:457 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma__userconfig[/kbd]" msgid "" "Leave blank to disable configurable menus feature, suggested: [kbd]" "pma__usergroups[/kbd]" -msgstr "不在資料庫中儲存使用者偏好請留空，建議值：[kbd]pma__config[/kbd]" +msgstr "空白為禁用配置的選單功能，建議值：[kbd]pma__usergroups[/kbd]" #: libraries/config/messages.inc.php:458 -#, fuzzy #| msgid "Use Host Table" msgid "User groups table" -msgstr "使用主機表" +msgstr "用戶群組主機表" #: libraries/config/messages.inc.php:459 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma__userconfig[/kbd]" msgid "" "Leave blank to disable the feature to hide and show navigation items, " "suggested: [kbd]pma__navigationhiding[/kbd]" -msgstr "不在資料庫中儲存使用者偏好請留空，建議值：[kbd]pma__config[/kbd]" +msgstr "空白為禁用隱藏和顯示項目的功能，建議值：[kbd]pma__navigationhiding[/kbd]" #: libraries/config/messages.inc.php:460 msgid "Hidden navigation items table" -msgstr "" +msgstr "隱藏導覽項目資料表" #: libraries/config/messages.inc.php:462 msgid "User for config auth" @@ -7389,37 +7383,32 @@ msgstr "未知" #: libraries/navigation/Navigation.class.php:61 msgid "An error has occured while loading the navigation tree" -msgstr "載入導航樹時出錯" +msgstr "載入導覽樹時出錯" #: libraries/navigation/Navigation.class.php:172 -#, fuzzy #| msgid "Events" msgid "Events:" -msgstr "事件" +msgstr "事件：" #: libraries/navigation/Navigation.class.php:173 -#, fuzzy #| msgid "Functions" msgid "Functions:" -msgstr "函數" +msgstr "函數：" #: libraries/navigation/Navigation.class.php:174 -#, fuzzy #| msgid "Procedures" msgid "Procedures:" -msgstr "Procedure" +msgstr "Procedure：" #: libraries/navigation/Navigation.class.php:175 -#, fuzzy #| msgid "Tables" msgid "Tables:" -msgstr "資料表" +msgstr "資料表：" #: libraries/navigation/Navigation.class.php:176 -#, fuzzy #| msgid "Views" msgid "Views:" -msgstr "視表" +msgstr "視表：" #: libraries/navigation/NavigationHeader.class.php:183 msgid "Home" @@ -7435,7 +7424,7 @@ msgstr "phpMyAdmin 檔案" #: libraries/navigation/NavigationHeader.class.php:243 msgid "Reload navigation frame" -msgstr "重新整理導覽框架" +msgstr "重新整理導覽區" #: libraries/navigation/NavigationTree.class.php:712 #, php-format @@ -8474,16 +8463,14 @@ msgid "User preferences" msgstr "使用者偏好" #: libraries/relation.lib.php:264 -#, fuzzy #| msgid "Configuration: %s" msgid "Configurable menus" -msgstr "設定: %s" +msgstr "配置選單" #: libraries/relation.lib.php:275 -#, fuzzy #| msgid "Reload navigation frame" msgid "Hide/show navigation items" -msgstr "重新整理導覽框架" +msgstr "隱藏/顯示導覽項目" #: libraries/relation.lib.php:281 msgid "Quick steps to setup advanced features:" @@ -9616,7 +9603,7 @@ msgstr "無" #: libraries/server_privileges.lib.php:2531 #: libraries/server_privileges.lib.php:3235 msgid "User group" -msgstr "" +msgstr "使用者群組" #: libraries/server_privileges.lib.php:618 msgid "Resource limits" @@ -9839,10 +9826,9 @@ msgid "Add privileges on the following table:" msgstr "在下列資料表新增權限：" #: libraries/server_privileges.lib.php:2599 -#, fuzzy #| msgid "Edit server" msgid "Edit user group" -msgstr "編輯伺服器" +msgstr "編輯用戶群組" #: libraries/server_privileges.lib.php:2714 msgid "Remove selected users" @@ -9904,69 +9890,61 @@ msgstr "" #: libraries/server_privileges.lib.php:3187 #, php-format msgid "Users of '%s' user group" -msgstr "" +msgstr "使用者群組 '%s' 清單" #: libraries/server_privileges.lib.php:3198 msgid "No users were found belonging to this user group." -msgstr "" +msgstr "這個使用者群組為空的。" #: libraries/server_privileges.lib.php:3229 #: libraries/server_privileges.lib.php:3878 -#, fuzzy #| msgid "Users" msgid "User groups" -msgstr "使用者" +msgstr "使用者群組" #: libraries/server_privileges.lib.php:3236 #: libraries/server_privileges.lib.php:3402 -#, fuzzy #| msgid "Server version" msgid "Server-level tabs" -msgstr "伺服器版本" +msgstr "服務器級標籤" #: libraries/server_privileges.lib.php:3237 #: libraries/server_privileges.lib.php:3405 -#, fuzzy #| msgid "Database server" msgid "Database-level tabs" -msgstr "資料庫伺服器" +msgstr "資料庫級標籤" #: libraries/server_privileges.lib.php:3238 #: libraries/server_privileges.lib.php:3408 -#, fuzzy #| msgid "Table comments" msgid "Table-level tabs" -msgstr "表註釋" +msgstr "資料表級標籤" #: libraries/server_privileges.lib.php:3260 -#, fuzzy #| msgid "Views" msgid "View users" -msgstr "視表" +msgstr "檢視用戶" #: libraries/server_privileges.lib.php:3288 #: libraries/server_privileges.lib.php:3344 -#, fuzzy #| msgid "Add user" msgid "Add user group" -msgstr "新增使用者" +msgstr "新增使用者群組" #: libraries/server_privileges.lib.php:3347 #, php-format msgid "Edit user group: '%s'" -msgstr "" +msgstr "編輯使用者群組: '%s'" #: libraries/server_privileges.lib.php:3363 -#, fuzzy #| msgid "No privileges." msgid "User group privileges" -msgstr "沒有權限。" +msgstr "使用者群組權限" #: libraries/server_privileges.lib.php:3370 -#, fuzzy #| msgid "Column names: " msgid "Group name:" -msgstr "欄位名稱： " +msgstr "群組名稱：" #: libraries/server_privileges.lib.php:3521 msgid "The selected user was not found in the privilege table." @@ -11473,7 +11451,7 @@ msgstr "ZIP 包中有錯誤:" #: navigation.php:20 msgid "Fatal error: The navigation can only be accessed via AJAX" -msgstr "錯誤: 只能經由 AJAX 使用導航" +msgstr "錯誤: 只能經由 AJAX 使用導覽" #: pmd_display_field.php:49 pmd_save_pos.php:75 msgid "Modifications have been saved" From cb1c893934e3dc466ced61ee7c215030a1c07d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:05:37 +0200 Subject: [PATCH 12/41] Fixed indentation --- export.php | 2 +- libraries/DatabaseInterface.class.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/export.php b/export.php index e17897b68c..081eddf4b3 100644 --- a/export.php +++ b/export.php @@ -324,7 +324,7 @@ function PMA_exportOutputHandler($line) ) { $dump_buffer = bzcompress($dump_buffer); } elseif ($GLOBALS['compression'] == 'gzip' - && PMA_gzencodeNeeded() + && PMA_gzencodeNeeded() ) { // as a gzipped file // without the optional parameter level because it bugs diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php index 5f7d91e611..9143e27321 100644 --- a/libraries/DatabaseInterface.class.php +++ b/libraries/DatabaseInterface.class.php @@ -619,7 +619,8 @@ class PMA_DatabaseInterface $each_tables[$table_name]['Type'] =& $each_tables[$table_name]['Engine']; } elseif (! isset($each_tables[$table_name]['Engine']) - && isset($each_tables[$table_name]['Type'])) { + && isset($each_tables[$table_name]['Type']) + ) { // old MySQL reports Type, newer MySQL reports Engine $each_tables[$table_name]['Engine'] =& $each_tables[$table_name]['Type']; From 0bf3f009abe69f74ad44102bc2e1f05ec8e7d626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:09:34 +0200 Subject: [PATCH 13/41] Simplify params processing by using local variable --- libraries/DisplayResults.class.php | 88 +++++++++++++++--------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 1acf310f77..98cbbf99e4 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4212,8 +4212,9 @@ class PMA_DisplayResults { $sql_md5 = md5($this->__get('sql_query')); + $session_data = $_SESSION['tmp_user_values']['query'][$sql_md5]; - $_SESSION['tmp_user_values']['query'][$sql_md5]['sql'] + $session_data['sql'] = $this->__get('sql_query'); $valid_disp_dir = PMA_isValid( @@ -4224,20 +4225,20 @@ class PMA_DisplayResults ); if ($valid_disp_dir) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction'] + $session_data['disp_direction'] = $_REQUEST['disp_direction']; unset($_REQUEST['disp_direction']); } elseif ( - empty($_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction']) + empty($session_data['disp_direction']) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction'] + $session_data['disp_direction'] = $GLOBALS['cfg']['DefaultDisplay']; } if ( - empty($_SESSION['tmp_user_values']['query'][$sql_md5]['repeat_cells']) + empty($session_data['repeat_cells']) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['repeat_cells'] + $session_data['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; } @@ -4247,22 +4248,22 @@ class PMA_DisplayResults && ((int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows'])) || ($_REQUEST['session_max_rows'] == self::ALL_ROWS) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'] + $session_data['max_rows'] = $_REQUEST['session_max_rows']; unset($_REQUEST['session_max_rows']); } elseif ( - empty($_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows']) + empty($session_data['max_rows']) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'] + $session_data['max_rows'] = $GLOBALS['cfg']['MaxRows']; } if (PMA_isValid($_REQUEST['pos'], 'numeric')) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['pos'] + $session_data['pos'] = $_REQUEST['pos']; unset($_REQUEST['pos']); - } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_md5]['pos'])) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['pos'] = 0; + } elseif (empty($session_data['pos'])) { + $session_data['pos'] = 0; } if (PMA_isValid( @@ -4272,13 +4273,13 @@ class PMA_DisplayResults ) ) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_text'] + $session_data['display_text'] = $_REQUEST['display_text']; unset($_REQUEST['display_text']); } elseif ( - empty($_SESSION['tmp_user_values']['query'][$sql_md5]['display_text']) + empty($session_data['display_text']) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_text'] + $session_data['display_text'] = self::DISPLAY_PARTIAL_TEXT; } @@ -4289,15 +4290,15 @@ class PMA_DisplayResults ) ) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display'] + $session_data['relational_display'] = $_REQUEST['relational_display']; unset($_REQUEST['relational_display']); } elseif ( empty( - $_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display'] + $session_data['relational_display'] ) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display'] + $session_data['relational_display'] = self::RELATIONAL_KEY; } @@ -4309,40 +4310,40 @@ class PMA_DisplayResults ) ) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['geometry_display'] + $session_data['geometry_display'] = $_REQUEST['geometry_display']; unset($_REQUEST['geometry_display']); } elseif ( empty( - $_SESSION['tmp_user_values']['query'][$sql_md5]['geometry_display'] + $session_data['geometry_display'] ) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['geometry_display'] + $session_data['geometry_display'] = self::GEOMETRY_DISP_GEOM; } if (isset($_REQUEST['display_binary'])) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary'] = true; + $session_data['display_binary'] = true; unset($_REQUEST['display_binary']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary']); + unset($session_data['display_binary']); } elseif (isset($_REQUEST['full_text_button'])) { // do nothing to keep the value that is there in the session } else { // selected by default because some operations like OPTIMIZE TABLE // and all queries involving functions return "binary" contents, // according to low-level field flags - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary'] = true; + $session_data['display_binary'] = true; } if (isset($_REQUEST['display_binary_as_hex'])) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary_as_hex'] + $session_data['display_binary_as_hex'] = true; unset($_REQUEST['display_binary_as_hex']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_md5] + unset($session_data ['display_binary_as_hex'] ); } elseif (isset($_REQUEST['full_text_button'])) { @@ -4352,26 +4353,26 @@ class PMA_DisplayResults if (isset($GLOBALS['cfg']['DisplayBinaryAsHex']) && ($GLOBALS['cfg']['DisplayBinaryAsHex'] === true) ) { - $_SESSION['tmp_user_values']['query'][$sql_md5] + $session_data ['display_binary_as_hex'] = true; } } if (isset($_REQUEST['display_blob'])) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['display_blob'] = true; + $session_data['display_blob'] = true; unset($_REQUEST['display_blob']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_blob']); + unset($session_data['display_blob']); } if (isset($_REQUEST['hide_transformation'])) { - $_SESSION['tmp_user_values']['query'][$sql_md5]['hide_transformation'] + $session_data['hide_transformation'] = true; unset($_REQUEST['hide_transformation']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_md5] + unset($session_data ['hide_transformation'] ); } @@ -4379,9 +4380,8 @@ class PMA_DisplayResults // move current query to the last position, to be removed last // so only least executed query will be removed if maximum remembered queries // limit is reached - $tmp = $_SESSION['tmp_user_values']['query'][$sql_md5]; unset($_SESSION['tmp_user_values']['query'][$sql_md5]); - $_SESSION['tmp_user_values']['query'][$sql_md5] = $tmp; + $_SESSION['tmp_user_values']['query'][$sql_md5] = $session_data; // do not exceed a maximum number of queries to remember if (count($_SESSION['tmp_user_values']['query']) > 10) { @@ -4391,41 +4391,41 @@ class PMA_DisplayResults // populate query configuration $_SESSION['tmp_user_values']['display_text'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['display_text']; + = $session_data['display_text']; $_SESSION['tmp_user_values']['relational_display'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display']; + = $session_data['relational_display']; $_SESSION['tmp_user_values']['geometry_display'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['geometry_display']; + = $session_data['geometry_display']; $_SESSION['tmp_user_values']['display_binary'] - = isset($_SESSION['tmp_user_values']['query'][$sql_md5] + = isset($session_data ['display_binary'] ) ? true : false; $_SESSION['tmp_user_values']['display_binary_as_hex'] - = isset($_SESSION['tmp_user_values']['query'][$sql_md5] + = isset($session_data ['display_binary_as_hex'] ) ? true : false; $_SESSION['tmp_user_values']['display_blob'] - = isset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_blob']) + = isset($session_data['display_blob']) ? true : false; $_SESSION['tmp_user_values']['hide_transformation'] - = isset($_SESSION['tmp_user_values']['query'][$sql_md5] + = isset($session_data ['hide_transformation'] ) ? true : false; $_SESSION['tmp_user_values']['pos'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['pos']; + = $session_data['pos']; $_SESSION['tmp_user_values']['max_rows'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows']; + = $session_data['max_rows']; $_SESSION['tmp_user_values']['repeat_cells'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['repeat_cells']; + = $session_data['repeat_cells']; $_SESSION['tmp_user_values']['disp_direction'] - = $_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction']; + = $session_data['disp_direction']; } From c09a7e5345748ae33ce4ec095e1eea98ea7e5efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:12:10 +0200 Subject: [PATCH 14/41] Reindent some lines --- libraries/DisplayResults.class.php | 88 +++++++++--------------------- 1 file changed, 26 insertions(+), 62 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 98cbbf99e4..69a31d3c7f 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4214,8 +4214,7 @@ class PMA_DisplayResults $sql_md5 = md5($this->__get('sql_query')); $session_data = $_SESSION['tmp_user_values']['query'][$sql_md5]; - $session_data['sql'] - = $this->__get('sql_query'); + $session_data['sql'] = $this->__get('sql_query'); $valid_disp_dir = PMA_isValid( $_REQUEST['disp_direction'], @@ -4225,21 +4224,14 @@ class PMA_DisplayResults ); if ($valid_disp_dir) { - $session_data['disp_direction'] - = $_REQUEST['disp_direction']; + $session_data['disp_direction'] = $_REQUEST['disp_direction']; unset($_REQUEST['disp_direction']); - } elseif ( - empty($session_data['disp_direction']) - ) { - $session_data['disp_direction'] - = $GLOBALS['cfg']['DefaultDisplay']; + } elseif (empty($session_data['disp_direction'])) { + $session_data['disp_direction'] = $GLOBALS['cfg']['DefaultDisplay']; } - if ( - empty($session_data['repeat_cells']) - ) { - $session_data['repeat_cells'] - = $GLOBALS['cfg']['RepeatCells']; + if (empty($session_data['repeat_cells'])) { + $session_data['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; } // as this is a form value, the type is always string so we cannot @@ -4248,19 +4240,14 @@ class PMA_DisplayResults && ((int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows'])) || ($_REQUEST['session_max_rows'] == self::ALL_ROWS) ) { - $session_data['max_rows'] - = $_REQUEST['session_max_rows']; + $session_data['max_rows'] = $_REQUEST['session_max_rows']; unset($_REQUEST['session_max_rows']); - } elseif ( - empty($session_data['max_rows']) - ) { - $session_data['max_rows'] - = $GLOBALS['cfg']['MaxRows']; + } elseif (empty($session_data['max_rows'])) { + $session_data['max_rows'] = $GLOBALS['cfg']['MaxRows']; } if (PMA_isValid($_REQUEST['pos'], 'numeric')) { - $session_data['pos'] - = $_REQUEST['pos']; + $session_data['pos'] = $_REQUEST['pos']; unset($_REQUEST['pos']); } elseif (empty($session_data['pos'])) { $session_data['pos'] = 0; @@ -4273,14 +4260,10 @@ class PMA_DisplayResults ) ) ) { - $session_data['display_text'] - = $_REQUEST['display_text']; + $session_data['display_text'] = $_REQUEST['display_text']; unset($_REQUEST['display_text']); - } elseif ( - empty($session_data['display_text']) - ) { - $session_data['display_text'] - = self::DISPLAY_PARTIAL_TEXT; + } elseif (empty($session_data['display_text'])) { + $session_data['display_text'] = self::DISPLAY_PARTIAL_TEXT; } if (PMA_isValid( @@ -4290,16 +4273,10 @@ class PMA_DisplayResults ) ) ) { - $session_data['relational_display'] - = $_REQUEST['relational_display']; + $session_data['relational_display'] = $_REQUEST['relational_display']; unset($_REQUEST['relational_display']); - } elseif ( - empty( - $session_data['relational_display'] - ) - ) { - $session_data['relational_display'] - = self::RELATIONAL_KEY; + } elseif (empty($session_data['relational_display'])) { + $session_data['relational_display'] = self::RELATIONAL_KEY; } if (PMA_isValid( @@ -4310,16 +4287,10 @@ class PMA_DisplayResults ) ) ) { - $session_data['geometry_display'] - = $_REQUEST['geometry_display']; + $session_data['geometry_display'] = $_REQUEST['geometry_display']; unset($_REQUEST['geometry_display']); - } elseif ( - empty( - $session_data['geometry_display'] - ) - ) { - $session_data['geometry_display'] - = self::GEOMETRY_DISP_GEOM; + } elseif (empty($session_data['geometry_display'])) { + $session_data['geometry_display'] = self::GEOMETRY_DISP_GEOM; } if (isset($_REQUEST['display_binary'])) { @@ -4338,14 +4309,11 @@ class PMA_DisplayResults } if (isset($_REQUEST['display_binary_as_hex'])) { - $session_data['display_binary_as_hex'] - = true; + $session_data['display_binary_as_hex'] = true; unset($_REQUEST['display_binary_as_hex']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data - ['display_binary_as_hex'] - ); + unset($session_data['display_binary_as_hex']); } elseif (isset($_REQUEST['full_text_button'])) { // do nothing to keep the value that is there in the session } else { @@ -4353,8 +4321,7 @@ class PMA_DisplayResults if (isset($GLOBALS['cfg']['DisplayBinaryAsHex']) && ($GLOBALS['cfg']['DisplayBinaryAsHex'] === true) ) { - $session_data - ['display_binary_as_hex'] = true; + $session_data['display_binary_as_hex'] = true; } } @@ -4367,19 +4334,16 @@ class PMA_DisplayResults } if (isset($_REQUEST['hide_transformation'])) { - $session_data['hide_transformation'] - = true; + $session_data['hide_transformation'] = true; unset($_REQUEST['hide_transformation']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data - ['hide_transformation'] - ); + unset($session_data['hide_transformation']); } // move current query to the last position, to be removed last - // so only least executed query will be removed if maximum remembered queries - // limit is reached + // so only least executed query will be removed if maximum remembered + // queries limit is reached unset($_SESSION['tmp_user_values']['query'][$sql_md5]); $_SESSION['tmp_user_values']['query'][$sql_md5] = $session_data; From 8dcdd6de7a93809b190331a113605f63a51c9248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:13:30 +0200 Subject: [PATCH 15/41] Better variable name --- libraries/DisplayResults.class.php | 88 +++++++++++++++--------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 69a31d3c7f..8af4c3a156 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4212,9 +4212,9 @@ class PMA_DisplayResults { $sql_md5 = md5($this->__get('sql_query')); - $session_data = $_SESSION['tmp_user_values']['query'][$sql_md5]; + $query = $_SESSION['tmp_user_values']['query'][$sql_md5]; - $session_data['sql'] = $this->__get('sql_query'); + $query['sql'] = $this->__get('sql_query'); $valid_disp_dir = PMA_isValid( $_REQUEST['disp_direction'], @@ -4224,14 +4224,14 @@ class PMA_DisplayResults ); if ($valid_disp_dir) { - $session_data['disp_direction'] = $_REQUEST['disp_direction']; + $query['disp_direction'] = $_REQUEST['disp_direction']; unset($_REQUEST['disp_direction']); - } elseif (empty($session_data['disp_direction'])) { - $session_data['disp_direction'] = $GLOBALS['cfg']['DefaultDisplay']; + } elseif (empty($query['disp_direction'])) { + $query['disp_direction'] = $GLOBALS['cfg']['DefaultDisplay']; } - if (empty($session_data['repeat_cells'])) { - $session_data['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; + if (empty($query['repeat_cells'])) { + $query['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; } // as this is a form value, the type is always string so we cannot @@ -4240,17 +4240,17 @@ class PMA_DisplayResults && ((int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows'])) || ($_REQUEST['session_max_rows'] == self::ALL_ROWS) ) { - $session_data['max_rows'] = $_REQUEST['session_max_rows']; + $query['max_rows'] = $_REQUEST['session_max_rows']; unset($_REQUEST['session_max_rows']); - } elseif (empty($session_data['max_rows'])) { - $session_data['max_rows'] = $GLOBALS['cfg']['MaxRows']; + } elseif (empty($query['max_rows'])) { + $query['max_rows'] = $GLOBALS['cfg']['MaxRows']; } if (PMA_isValid($_REQUEST['pos'], 'numeric')) { - $session_data['pos'] = $_REQUEST['pos']; + $query['pos'] = $_REQUEST['pos']; unset($_REQUEST['pos']); - } elseif (empty($session_data['pos'])) { - $session_data['pos'] = 0; + } elseif (empty($query['pos'])) { + $query['pos'] = 0; } if (PMA_isValid( @@ -4260,10 +4260,10 @@ class PMA_DisplayResults ) ) ) { - $session_data['display_text'] = $_REQUEST['display_text']; + $query['display_text'] = $_REQUEST['display_text']; unset($_REQUEST['display_text']); - } elseif (empty($session_data['display_text'])) { - $session_data['display_text'] = self::DISPLAY_PARTIAL_TEXT; + } elseif (empty($query['display_text'])) { + $query['display_text'] = self::DISPLAY_PARTIAL_TEXT; } if (PMA_isValid( @@ -4273,10 +4273,10 @@ class PMA_DisplayResults ) ) ) { - $session_data['relational_display'] = $_REQUEST['relational_display']; + $query['relational_display'] = $_REQUEST['relational_display']; unset($_REQUEST['relational_display']); - } elseif (empty($session_data['relational_display'])) { - $session_data['relational_display'] = self::RELATIONAL_KEY; + } elseif (empty($query['relational_display'])) { + $query['relational_display'] = self::RELATIONAL_KEY; } if (PMA_isValid( @@ -4287,33 +4287,33 @@ class PMA_DisplayResults ) ) ) { - $session_data['geometry_display'] = $_REQUEST['geometry_display']; + $query['geometry_display'] = $_REQUEST['geometry_display']; unset($_REQUEST['geometry_display']); - } elseif (empty($session_data['geometry_display'])) { - $session_data['geometry_display'] = self::GEOMETRY_DISP_GEOM; + } elseif (empty($query['geometry_display'])) { + $query['geometry_display'] = self::GEOMETRY_DISP_GEOM; } if (isset($_REQUEST['display_binary'])) { - $session_data['display_binary'] = true; + $query['display_binary'] = true; unset($_REQUEST['display_binary']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data['display_binary']); + unset($query['display_binary']); } elseif (isset($_REQUEST['full_text_button'])) { // do nothing to keep the value that is there in the session } else { // selected by default because some operations like OPTIMIZE TABLE // and all queries involving functions return "binary" contents, // according to low-level field flags - $session_data['display_binary'] = true; + $query['display_binary'] = true; } if (isset($_REQUEST['display_binary_as_hex'])) { - $session_data['display_binary_as_hex'] = true; + $query['display_binary_as_hex'] = true; unset($_REQUEST['display_binary_as_hex']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data['display_binary_as_hex']); + unset($query['display_binary_as_hex']); } elseif (isset($_REQUEST['full_text_button'])) { // do nothing to keep the value that is there in the session } else { @@ -4321,31 +4321,31 @@ class PMA_DisplayResults if (isset($GLOBALS['cfg']['DisplayBinaryAsHex']) && ($GLOBALS['cfg']['DisplayBinaryAsHex'] === true) ) { - $session_data['display_binary_as_hex'] = true; + $query['display_binary_as_hex'] = true; } } if (isset($_REQUEST['display_blob'])) { - $session_data['display_blob'] = true; + $query['display_blob'] = true; unset($_REQUEST['display_blob']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data['display_blob']); + unset($query['display_blob']); } if (isset($_REQUEST['hide_transformation'])) { - $session_data['hide_transformation'] = true; + $query['hide_transformation'] = true; unset($_REQUEST['hide_transformation']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($session_data['hide_transformation']); + unset($query['hide_transformation']); } // move current query to the last position, to be removed last // so only least executed query will be removed if maximum remembered // queries limit is reached unset($_SESSION['tmp_user_values']['query'][$sql_md5]); - $_SESSION['tmp_user_values']['query'][$sql_md5] = $session_data; + $_SESSION['tmp_user_values']['query'][$sql_md5] = $query; // do not exceed a maximum number of queries to remember if (count($_SESSION['tmp_user_values']['query']) > 10) { @@ -4355,41 +4355,41 @@ class PMA_DisplayResults // populate query configuration $_SESSION['tmp_user_values']['display_text'] - = $session_data['display_text']; + = $query['display_text']; $_SESSION['tmp_user_values']['relational_display'] - = $session_data['relational_display']; + = $query['relational_display']; $_SESSION['tmp_user_values']['geometry_display'] - = $session_data['geometry_display']; + = $query['geometry_display']; $_SESSION['tmp_user_values']['display_binary'] - = isset($session_data + = isset($query ['display_binary'] ) ? true : false; $_SESSION['tmp_user_values']['display_binary_as_hex'] - = isset($session_data + = isset($query ['display_binary_as_hex'] ) ? true : false; $_SESSION['tmp_user_values']['display_blob'] - = isset($session_data['display_blob']) + = isset($query['display_blob']) ? true : false; $_SESSION['tmp_user_values']['hide_transformation'] - = isset($session_data + = isset($query ['hide_transformation'] ) ? true : false; $_SESSION['tmp_user_values']['pos'] - = $session_data['pos']; + = $query['pos']; $_SESSION['tmp_user_values']['max_rows'] - = $session_data['max_rows']; + = $query['max_rows']; $_SESSION['tmp_user_values']['repeat_cells'] - = $session_data['repeat_cells']; + = $query['repeat_cells']; $_SESSION['tmp_user_values']['disp_direction'] - = $session_data['disp_direction']; + = $query['disp_direction']; } From 750c0902495714c5eff17f63a2d134f87581a98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:16:35 +0200 Subject: [PATCH 16/41] Separete checks for numeric and all and directly convert value --- libraries/DisplayResults.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 8af4c3a156..0811e0314e 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4236,11 +4236,11 @@ class PMA_DisplayResults // as this is a form value, the type is always string so we cannot // use PMA_isValid($_REQUEST['session_max_rows'], 'integer') - if ((PMA_isValid($_REQUEST['session_max_rows'], 'numeric') - && ((int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows'])) - || ($_REQUEST['session_max_rows'] == self::ALL_ROWS) - ) { - $query['max_rows'] = $_REQUEST['session_max_rows']; + if (PMA_isValid($_REQUEST['session_max_rows'], 'numeric')) { + $query['max_rows'] = (int)$_REQUEST['session_max_rows']; + unset($_REQUEST['session_max_rows']); + } elseif ($_REQUEST['session_max_rows'] == self::ALL_ROWS) { + $query['max_rows'] = self::ALL_ROWS; unset($_REQUEST['session_max_rows']); } elseif (empty($query['max_rows'])) { $query['max_rows'] = $GLOBALS['cfg']['MaxRows']; From 2f38880f41749790dece7de95cf4ece2e8b744f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:17:39 +0200 Subject: [PATCH 17/41] Function isset already returns boolean, no need to process it again --- libraries/DisplayResults.class.php | 34 +++++++++++------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 0811e0314e..d6756667ef 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4360,28 +4360,18 @@ class PMA_DisplayResults = $query['relational_display']; $_SESSION['tmp_user_values']['geometry_display'] = $query['geometry_display']; - $_SESSION['tmp_user_values']['display_binary'] - = isset($query - ['display_binary'] - ) - ? true - : false; - $_SESSION['tmp_user_values']['display_binary_as_hex'] - = isset($query - ['display_binary_as_hex'] - ) - ? true - : false; - $_SESSION['tmp_user_values']['display_blob'] - = isset($query['display_blob']) - ? true - : false; - $_SESSION['tmp_user_values']['hide_transformation'] - = isset($query - ['hide_transformation'] - ) - ? true - : false; + $_SESSION['tmp_user_values']['display_binary'] = isset( + $query['display_binary'] + ); + $_SESSION['tmp_user_values']['display_binary_as_hex'] = isset( + $query['display_binary_as_hex'] + ); + $_SESSION['tmp_user_values']['display_blob'] = isset( + $query['display_blob'] + ); + $_SESSION['tmp_user_values']['hide_transformation'] = isset( + $query['hide_transformation'] + ); $_SESSION['tmp_user_values']['pos'] = $query['pos']; $_SESSION['tmp_user_values']['max_rows'] From 659156aeba56a89f35b59ab8d49ee44ca2f05e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:18:47 +0200 Subject: [PATCH 18/41] Wrap long line --- libraries/DisplayResults.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index d6756667ef..2e4fb54311 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -4401,7 +4401,8 @@ class PMA_DisplayResults * @see sql.php file */ public function getTable( - &$dt_result, &$the_disp_mode, $analyzed_sql, $is_limited_display = false + &$dt_result, &$the_disp_mode, $analyzed_sql, + $is_limited_display = false ) { $table_html = ''; From 9310e76a0e809c3118c9359ffeca840bfb553e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:19:26 +0200 Subject: [PATCH 19/41] Fix indentation --- libraries/File.class.php | 3 ++- libraries/ServerStatusData.class.php | 5 +++-- libraries/Util.class.php | 10 ++++++---- libraries/core.lib.php | 3 ++- libraries/plugins/import/ImportMediawiki.class.php | 6 +++--- libraries/server_privileges.lib.php | 10 +++++----- libraries/transformations.lib.php | 6 ++++-- server_replication.php | 7 ++++--- 8 files changed, 29 insertions(+), 21 deletions(-) diff --git a/libraries/File.class.php b/libraries/File.class.php index d20e2db5c3..e26ef30f28 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -791,7 +791,8 @@ class PMA_File $result = substr($result, 3); // UTF-16 BE, LE } elseif (strncmp($result, "\xFE\xFF", 2) == 0 - || strncmp($result, "\xFF\xFE", 2) == 0) { + || strncmp($result, "\xFF\xFE", 2) == 0 + ) { $result = substr($result, 2); } } diff --git a/libraries/ServerStatusData.class.php b/libraries/ServerStatusData.class.php index 47c8c0d3a2..324493a348 100644 --- a/libraries/ServerStatusData.class.php +++ b/libraries/ServerStatusData.class.php @@ -62,7 +62,7 @@ class PMA_ServerStatusData $server_status = $GLOBALS['dbi']->fetchResult('SHOW GLOBAL STATUS', 0, 1); if (PMA_DRIZZLE) { // Drizzle doesn't put query statistics into variables, add it - $sql = "SELECT concat('Com_', variable_name), variable_value " + $sql = "SELECT concat('Com_', variable_name), variable_value " . "FROM data_dictionary.GLOBAL_STATEMENTS"; $statements = $GLOBALS['dbi']->fetchResult($sql, 0, 1); $server_status = array_merge($server_status, $statements); @@ -93,7 +93,8 @@ class PMA_ServerStatusData / $server_variables['key_buffer_size'] * 100; } elseif (isset($server_status['Key_blocks_used']) - && isset($server_variables['key_buffer_size'])) { + && isset($server_variables['key_buffer_size']) + ) { $server_status['Key_buffer_fraction_%'] = $server_status['Key_blocks_used'] * 1024 diff --git a/libraries/Util.class.php b/libraries/Util.class.php index ba11d6c2d7..ea210f328a 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -1116,7 +1116,8 @@ class PMA_Util ) ); } elseif (! empty($GLOBALS['parsed_sql']) - && $query_base == $GLOBALS['parsed_sql']['raw']) { + && $query_base == $GLOBALS['parsed_sql']['raw'] + ) { // (here, use "! empty" because when deleting a bookmark, // $GLOBALS['parsed_sql'] is set but empty $parsed_sql = $GLOBALS['parsed_sql']; @@ -1743,7 +1744,8 @@ class PMA_Util ) { $tab['class'] = 'active'; } elseif (is_null($tab['active']) && empty($GLOBALS['active_page']) - && (basename($GLOBALS['PMA_PHP_SELF']) == $tab['link'])) { + && (basename($GLOBALS['PMA_PHP_SELF']) == $tab['link']) + ) { $tab['class'] = 'active'; } } @@ -2229,8 +2231,8 @@ class PMA_Util $con_val = '= ' . $row[$i]; } elseif ((($meta->type == 'blob') || ($meta->type == 'string')) // hexify only if this is a true not empty BLOB or a BINARY - && stristr($field_flags, 'BINARY') - && ! empty($row[$i]) + && stristr($field_flags, 'BINARY') + && ! empty($row[$i]) ) { // do not waste memory building a too big condition if (strlen($row[$i]) < 1000) { diff --git a/libraries/core.lib.php b/libraries/core.lib.php index fe26d3f2f3..7292477e62 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -515,7 +515,8 @@ function PMA_getenv($var_name) } elseif (getenv($var_name)) { return getenv($var_name); } elseif (function_exists('apache_getenv') - && apache_getenv($var_name, true)) { + && apache_getenv($var_name, true) + ) { return apache_getenv($var_name, true); } diff --git a/libraries/plugins/import/ImportMediawiki.class.php b/libraries/plugins/import/ImportMediawiki.class.php index 48870f7018..3011b4e730 100644 --- a/libraries/plugins/import/ImportMediawiki.class.php +++ b/libraries/plugins/import/ImportMediawiki.class.php @@ -217,8 +217,8 @@ class ImportMediawiki extends ImportPlugin // End processing because the current line does not // contain any column information } elseif (substr($cur_buffer_line, 0, 2) === '|-' - || substr($cur_buffer_line, 0, 2) === '|+' - || substr($cur_buffer_line, 0, 2) === '|}' + || substr($cur_buffer_line, 0, 2) === '|+' + || substr($cur_buffer_line, 0, 2) === '|}' ) { // Check begin row or end table @@ -570,4 +570,4 @@ class ImportMediawiki extends ImportPlugin { $this->_analyze = $analyze; } -} \ No newline at end of file +} diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 314ec1cdc4..e39ff57a27 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -115,8 +115,9 @@ function PMA_extractPrivInfo($row = '', $enableHTML = false) $privs[] = $current_grant[1]; } } elseif (! empty($GLOBALS[$current_grant[0]]) - && is_array($GLOBALS[$current_grant[0]]) - && empty($GLOBALS[$current_grant[0] . '_none'])) { + && is_array($GLOBALS[$current_grant[0]]) + && empty($GLOBALS[$current_grant[0] . '_none']) + ) { if ($enableHTML) { $priv_string = '' . $current_grant[1] . ''; @@ -137,9 +138,8 @@ function PMA_extractPrivInfo($row = '', $enableHTML = false) $privs[] = 'USAGE'; } } elseif ($allPrivileges - && (! isset($_POST['grant_count']) - || count($privs) == $_POST['grant_count']) - ) { + && (! isset($_POST['grant_count']) || count($privs) == $_POST['grant_count']) + ) { if ($enableHTML) { $privs = array('\n" -"Language-Team: Swedish \n" +"Language-Team: Swedish " +"\n" "Language: sv\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 1.6-dev\n" +"X-Generator: Weblate 1.6\n" #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:339 #: libraries/DisplayResults.class.php:813 @@ -2646,16 +2646,16 @@ msgid "" msgstr "Denna vy har åtminstone detta antal rader. Se %sdokumentationen%s." #: libraries/DisplayResults.class.php:4921 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows" msgid "Showing rows %1s - %2s" -msgstr "Visar rader" +msgstr "Visar raderna %1s - %2s" #: libraries/DisplayResults.class.php:4933 -#, fuzzy, php-format +#, php-format #| msgid "total" msgid "%d total" -msgstr "totalt" +msgstr "%d totalt" #: libraries/DisplayResults.class.php:4945 libraries/sql.lib.php:1640 #, php-format @@ -7636,34 +7636,29 @@ msgid "An error has occured while loading the navigation tree" msgstr "Ett fel uppstod vid inläsning av navigeringsträdet" #: libraries/navigation/Navigation.class.php:172 -#, fuzzy #| msgid "Events" msgid "Events:" -msgstr "Händelser" +msgstr "Händelser:" #: libraries/navigation/Navigation.class.php:173 -#, fuzzy #| msgid "Functions" msgid "Functions:" -msgstr "Funktioner" +msgstr "Funktioner:" #: libraries/navigation/Navigation.class.php:174 -#, fuzzy #| msgid "Procedures" msgid "Procedures:" -msgstr "Procedurer" +msgstr "Procedurer:" #: libraries/navigation/Navigation.class.php:175 -#, fuzzy #| msgid "Tables" msgid "Tables:" -msgstr "Tabeller" +msgstr "Tabeller:" #: libraries/navigation/Navigation.class.php:176 -#, fuzzy #| msgid "Views" msgid "Views:" -msgstr "Vy" +msgstr "Vyer:" #: libraries/navigation/NavigationHeader.class.php:183 msgid "Home" From 95f569e3cc7ede81e1d31f22d3d37fa33175abcf Mon Sep 17 00:00:00 2001 From: Tony Chen Date: Tue, 30 Jul 2013 11:12:10 +0200 Subject: [PATCH 21/41] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2708 of 2708) --- po/zh_TW.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index db8886ce9e..8067ce46f1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 13:37-0400\n" -"PO-Revision-Date: 2013-07-30 11:00+0200\n" +"PO-Revision-Date: 2013-07-30 11:12+0200\n" "Last-Translator: Tony Chen \n" "Language-Team: Traditional Chinese " "\n" @@ -5888,7 +5888,7 @@ msgstr "空白為禁用配置的選單功能，建議值：[kbd]pma__usergroups[ #: libraries/config/messages.inc.php:458 #| msgid "Use Host Table" msgid "User groups table" -msgstr "用戶群組主機表" +msgstr "使用者群組資料表" #: libraries/config/messages.inc.php:459 #| msgid "" @@ -9828,7 +9828,7 @@ msgstr "在下列資料表新增權限：" #: libraries/server_privileges.lib.php:2599 #| msgid "Edit server" msgid "Edit user group" -msgstr "編輯用戶群組" +msgstr "編輯使用者群組" #: libraries/server_privileges.lib.php:2714 msgid "Remove selected users" @@ -9906,24 +9906,24 @@ msgstr "使用者群組" #: libraries/server_privileges.lib.php:3402 #| msgid "Server version" msgid "Server-level tabs" -msgstr "服務器級標籤" +msgstr "主機級別標籤頁" #: libraries/server_privileges.lib.php:3237 #: libraries/server_privileges.lib.php:3405 #| msgid "Database server" msgid "Database-level tabs" -msgstr "資料庫級標籤" +msgstr "資料庫級別標籤頁" #: libraries/server_privileges.lib.php:3238 #: libraries/server_privileges.lib.php:3408 #| msgid "Table comments" msgid "Table-level tabs" -msgstr "資料表級標籤" +msgstr "資料表級別標籤頁" #: libraries/server_privileges.lib.php:3260 #| msgid "Views" msgid "View users" -msgstr "檢視用戶" +msgstr "檢視使用者" #: libraries/server_privileges.lib.php:3288 #: libraries/server_privileges.lib.php:3344 From 20a0b158b1b9c65c16ed365ad7900c47ca206d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:24:55 +0200 Subject: [PATCH 22/41] Reindent --- version_check.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/version_check.php b/version_check.php index d4ad963802..fda43ad2f0 100644 --- a/version_check.php +++ b/version_check.php @@ -16,9 +16,11 @@ header('Content-type: application/json; charset=UTF-8'); $version = PMA_Util::getLatestVersion(); -echo json_encode(array( - 'version' => $version->version, - 'date' => $version->date, -)); +echo json_encode( + array( + 'version' => $version->version, + 'date' => $version->date, + ) +); ?> From eebdc0ce06b7588c9417767bdb99fb4f32684ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:27:50 +0200 Subject: [PATCH 23/41] This test takes sometimes longer --- .../auth/PMA_AuthenticationHttp_test.php | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php b/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php index 068f946bb1..e0bab34f40 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php @@ -39,7 +39,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase /** * tearDown for test cases - * + * * @return void */ public function tearDown() @@ -49,7 +49,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase /** * Test for AuthenticationHttp::auth - * + * * @return void */ public function testAuth() @@ -73,7 +73,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase ); // case 2 - + $restoreInstance = PMA_Response::getInstance(); // mock footer @@ -98,7 +98,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase $mockHeader->expects($this->once()) ->method('setBodyId') ->with('loginform'); - + $mockHeader->expects($this->once()) ->method('setTitle') ->with('Access denied'); @@ -128,7 +128,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase ->with(); $attrInstance = new ReflectionProperty('PMA_Response', '_instance'); - $attrInstance->setAccessible(true); + $attrInstance->setAccessible(true); $attrInstance->setValue(null, $mockResponse); $GLOBALS['header'] = array(); @@ -151,7 +151,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase $attrInstance->setValue(null, $restoreInstance); // case 3 - + $GLOBALS['header'] = array(); $GLOBALS['cfg']['Server']['verbose'] = ''; $GLOBALS['cfg']['Server']['host'] = 'hòst'; @@ -169,7 +169,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase ); // case 4 - + $GLOBALS['header'] = array(); $GLOBALS['cfg']['Server']['host'] = ''; $GLOBALS['cfg']['Server']['auth_http_realm'] = 'rêäealmmessage'; @@ -189,7 +189,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase /** * Test for AuthenticationHttp::authCheck - * + * * @param string $user test username * @param string $pass test password * @param string $userIndex index to test username against @@ -198,7 +198,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase * @param string $expectedUser expected username to be set * @param string $expectedPass expected password to be set * @param string $old_usr value for $_REQUEST['old_usr'] - * + * * @return void * @dataProvider authCheckProvider */ @@ -217,7 +217,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase $expectedReturn, $this->object->authCheck() ); - + $this->assertEquals( $expectedUser, $GLOBALS['PHP_AUTH_USER'] @@ -234,7 +234,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase /** * Data provider for testAuthCheck - * + * * @return array Test data */ public function authCheckProvider() @@ -291,7 +291,7 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase /** * Test for AuthenticationHttp::authSetUser - * + * * @return void */ public function testAuthSetUser() @@ -399,8 +399,10 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase /** * Test for AuthenticationHttp::authSetFails - * + * * @return void + * + * @group medium */ public function testAuthFails() { From 1e33a3b5a62be96e734973ec25b419b740ef5991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:29:37 +0200 Subject: [PATCH 24/41] Fix multi function indent --- libraries/tbl_gis_visualization.lib.php | 60 ++++++++++++------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/libraries/tbl_gis_visualization.lib.php b/libraries/tbl_gis_visualization.lib.php index 1e899bf877..d69a9e8e54 100644 --- a/libraries/tbl_gis_visualization.lib.php +++ b/libraries/tbl_gis_visualization.lib.php @@ -188,10 +188,10 @@ function PMA_GIS_saveToFile($data, $visualizationSettings, $format, $fileName) /** * Function to get html for the options lists - * + * * @param array $options array of options * @param String $select the item that shoul be selected by default - * + * * @return string $html the html for the options lists */ function PMA_getHtmlForOptionsList($options, $select) @@ -204,13 +204,13 @@ function PMA_getHtmlForOptionsList($options, $select) } $html .= '>' . htmlspecialchars($option) . ''; } - + return $html; } /** * Function to get html for the lebel column and spatial column - * + * * @param String $column the column type. i.e either "labelColumn" * or "spatialColumn" * @param array $columnCandidates the list of select options @@ -220,38 +220,38 @@ function PMA_getHtmlForOptionsList($options, $select) function PMA_getHtmlForColumn($column, $columnCandidates, $visualizationSettings) { $html = ''; - + $html .= ''; $html .= ''; - + return $html; } /** * Function to get html for the option of using oprn street maps - * + * * @param boolean $isSelected the default value - * + * * @return string $html */ function PMA_getHtmlForUseOpenStreetMaps($isSelected) { $html = ''; $html .= ''; - + $html .= ''; $html .= ''; - + $html .= ''; $html .= ''; $html .= '
'; $html .= ''; - + $html .= '
'; $html .= '
'; $html .= PMA_generate_common_hidden_inputs($url_params); $html .= ''; - - $html .= PMA_getHtmlForColumn("labelColumn", $labelCandidates, - $visualizationSettings + + $html .= PMA_getHtmlForColumn( + "labelColumn", $labelCandidates, $visualizationSettings ); - $html .= PMA_getHtmlForColumn("spatialColumn", $spatialCandidates, - $visualizationSettings + $html .= PMA_getHtmlForColumn( + "spatialColumn", $spatialCandidates, $visualizationSettings ); $html .= ''; @@ -308,7 +308,7 @@ function PMA_getHtmlForGisVisualization( $isSelected = isset($visualizationSettings['choice']) ? true : false; $html .= PMA_getHtmlForUseOpenStreetMaps($isSelected); } - + $html .= '
'; $html .= ''; $html .= ''; $html .= __("File name") . '
'; - + $html .= ''; $html .= ''; @@ -353,14 +353,14 @@ function PMA_getHtmlForGisVisualization( $html .= htmlspecialchars($visualizationSettings['height']) . 'px;">'; $html .= $visualization; $html .= ''; - + $html .= '
'; $html .= ''; $html .= ''; $html .= ''; $html .= ''; - + return $html; } ?> From 6c3099cae1f8ae8126dea39ccc60238e925e36b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 30 Jul 2013 13:30:50 +0200 Subject: [PATCH 25/41] Remove double ; --- libraries/tbl_gis_visualization.lib.php | 2 +- tbl_tracking.php | 2 +- themes/original/css/common.css.php | 2 +- themes/pmahomme/css/common.css.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tbl_gis_visualization.lib.php b/libraries/tbl_gis_visualization.lib.php index d69a9e8e54..424eefe237 100644 --- a/libraries/tbl_gis_visualization.lib.php +++ b/libraries/tbl_gis_visualization.lib.php @@ -220,7 +220,7 @@ function PMA_getHtmlForOptionsList($options, $select) function PMA_getHtmlForColumn($column, $columnCandidates, $visualizationSettings) { $html = ''; $html .= ''; $html_output .= '