From 53f96bd760ee1b1a89db397f71962152764c9a07 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Mon, 6 Aug 2012 09:20:07 +0200 Subject: [PATCH 1/3] bug #3546277 [core] Call to undefined function __() when config file has wrong permissions --- ChangeLog | 3 ++- libraries/Config.class.php | 2 -- libraries/common.inc.php | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00919acfc1..452ff5e1a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,7 +12,8 @@ phpMyAdmin - ChangeLog - bug #3547825 [edit] BLOB download no longer works - bug #3541966 [config] Error in generated configuration arrray - bug #3553551 [GUI] Invalid HTML code in multi submits confirmation form -[interface] Designer sometimes places tables on the top menu +- [interface] Designer sometimes places tables on the top menu +- bug #3546277 [core] Call to undefined function __() when config file has wrong permissions 3.5.2.1 (2012-08-03) - [security] Fixed local path disclosure vulnerability, see PMASA-2012-3 diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 7244312db6..ac67f39725 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -445,8 +445,6 @@ class PMA_Config $this->checkPmaAbsoluteUri(); $this->checkFontsize(); - $this->checkPermissions(); - // Handling of the collation must be done after merging of $cfg // (from config.inc.php) so that $cfg['DefaultConnectionCollation'] // can have an effect. Note that the presence of collation diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 72368b7e5d..c0d52dea43 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -618,6 +618,8 @@ require './libraries/select_lang.lib.php'; * check for errors occurred while loading configuration * this check is done here after loading language files to present errors in locale */ +$GLOBALS['PMA_Config']->checkPermissions(); + if ($GLOBALS['PMA_Config']->error_config_file) { $error = '

' . __('Failed to read configuration file') . '

' . _('This usually means there is a syntax error in it, please check any errors shown below.') From b024d858b8062b4ae0b0544dab3b9fa70207b413 Mon Sep 17 00:00:00 2001 From: Aputsiaq Niels Janussen Date: Sun, 5 Aug 2012 01:39:37 +0200 Subject: [PATCH 2/3] Translated using Weblate. --- po/da.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/po/da.po b/po/da.po index 3d47785aaf..0ca8df410f 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-08-05 01:36+0200\n" +"PO-Revision-Date: 2012-08-05 01:39+0200\n" "Last-Translator: Aputsiaq Niels Janussen \n" "Language-Team: Danish \n" "Language: da\n" @@ -5291,7 +5291,7 @@ msgid "" "possible) or keep the text field empty" msgstr "" "Foreslå et databasenavn på formularen for "Opret database" (hvis " -"muligt) eller lad feltet være tomt " +"muligt) eller lad feltet være tomt" #: libraries/config/messages.inc.php:496 msgid "Suggest new database name" @@ -6248,7 +6248,7 @@ msgstr "" #: libraries/engines/pbms.lib.php:30 msgid "Garbage Threshold" -msgstr "Tærskel for garbage " +msgstr "Tærskel for garbage" #: libraries/engines/pbms.lib.php:31 msgid "The percentage of garbage in a repository file before it is compacted." @@ -6267,7 +6267,7 @@ msgid "" "will disable HTTP communication with the daemon." msgstr "" "Porten for PBMS stream-baseret kommunikation. Sættes denne værdi til 0 vil " -"HTTP-kommunikation med dæmonen deaktiveres. " +"HTTP-kommunikation med dæmonen deaktiveres." #: libraries/engines/pbms.lib.php:40 msgid "Repository Threshold" @@ -6281,7 +6281,7 @@ msgid "" msgstr "" "Den maksimale størrelse af en BLOB repositoryfil. Du kan bruge Kb, MB eller " "GB for at angive værdiens enhed. En værdi i bytes antages, når ingen enhed " -"angives" +"angives." #: libraries/engines/pbms.lib.php:45 msgid "Temp Blob Timeout" @@ -6307,7 +6307,7 @@ msgid "" msgstr "" "Den maksimale størrelse af en midlertidig BLOB logfil. Du kan bruge Kb, MB " "eller GB for at angive værdiens enhed. En værdi i bytes antages, når ingen " -"enhed angives" +"enhed angives." #: libraries/engines/pbms.lib.php:55 msgid "Max Keep Alive" @@ -8597,10 +8597,11 @@ msgid "" "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" -"Din PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] er mindre end cooki " -"gyldighed konfigureret i phpMyAdmin; på grund af dette vil din login session " -"udløbe tidligere end konfigureret i phpMyAdmin" +"Din PHP parameter " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] er mindre end cooki gyldighed " +"konfigureret i phpMyAdmin; på grund af dette vil din login session udløbe " +"tidligere end konfigureret i phpMyAdmin." #: main.php:299 msgid "" From 7e0028e4afab115a89a18c1257c6132aa123fd25 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 6 Aug 2012 21:44:16 +0530 Subject: [PATCH 3/3] bug #3540922 [edit] Error searching table with many fields --- ChangeLog | 1 + js/tbl_select.js | 34 +++++++++++++++++++++++++++++++++- tbl_select.php | 6 +++--- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 452ff5e1a7..b88ef558a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog - bug #3553551 [GUI] Invalid HTML code in multi submits confirmation form - [interface] Designer sometimes places tables on the top menu - bug #3546277 [core] Call to undefined function __() when config file has wrong permissions +- bug #3540922 [edit] Error searching table with many fields 3.5.2.1 (2012-08-03) - [security] Fixed local path disclosure vulnerability, see PMASA-2012-3 diff --git a/js/tbl_select.js b/js/tbl_select.js index ba144959a4..f0558dcae1 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -53,7 +53,39 @@ $(document).ready(function() { PMA_prepareForAjaxRequest($search_form); - $.post($search_form.attr('action'), $search_form.serialize(), function(response) { + var values = {}; + $search_form.find(':input').each(function() { + var $input = $(this); + if ($input.attr('type') == 'checkbox' || $input.attr('type') == 'radio') { + if ($input.is(':checked')) { + values[this.name] = $input.val(); + } + } else { + values[this.name] = $input.val(); + } + }); + var columnCount = $('select[name="param[]"] option').length; + // Submit values only for the columns that have a search criteria + for (var a = 0; a < columnCount; a++) { + if (values['fields[' + a + ']'] == '') { + delete values['fields[' + a + ']']; + delete values['func[' + a + ']']; + delete values['names[' + a + ']']; + delete values['types[' + a + ']']; + delete values['collations[' + a + ']']; + } + } + // If all columns are selected, use a single parameter to indicate that + if (values['param[]'] != null) { + if (values['param[]'].length == columnCount) { + delete values['param[]']; + values['displayAllColumns'] = true; + } + } else { + values['displayAllColumns'] = true; + } + + $.post($search_form.attr('action'), values, function(response) { PMA_ajaxRemoveMessage($msgbox); if (typeof response == 'string') { // found results diff --git a/tbl_select.php b/tbl_select.php index 81ca73403a..5e5114feee 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -33,7 +33,7 @@ $geom_types = PMA_getGISDatatypes(); /** * Not selection yet required -> displays the selection form */ -if (! isset($param) || $param[0] == '') { +if ((! isset($param) || $param[0] == '') && ! isset($displayAllColumns)) { // Gets some core libraries include_once './libraries/tbl_common.php'; //$err_url = 'tbl_select.php' . $err_url; @@ -117,7 +117,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2'); -