Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

ChangeLog

@@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
 - bug #4423 Moving fields not working
 - bug #4424 Table indexes disappear after altering field
 - bug #4432 Error while displaying chart at server level
+- bug #4405 Cannot import (open_basedir)
 
 4.2.2.0 (2014-05-20)
 - bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree

db_search.php

@@ -58,6 +58,6 @@
     '<div id="togglesearchresultsdiv"><a id="togglesearchresultlink"></a></div>'
     . '<br class="clearfloat" />'
 );
-$response->addHTML($db_search->getSelectionForm($url_params));
+$response->addHTML($db_search->getSelectionForm());
 $response->addHTML($db_search->getResultDivs());
 ?>

doc/_ext/configext.py

@@ -1,4 +1,3 @@
-from sphinx.locale import l_, _
 from sphinx.domains import Domain, ObjType
 from sphinx.roles import XRefRole
 from sphinx.domains.std import GenericObject, StandardDomain
@@ -23,15 +22,15 @@ def get_id_from_cfg(text):
 
 
 class ConfigOption(ObjectDescription):
-    indextemplate = l_('configuration option; %s')
+    indextemplate = 'configuration option; %s'
     parse_node = None
 
     has_arguments = True
 
     doc_field_types = [
-        Field('default', label=l_('Default value'), has_arg=False,
+        Field('default', label='Default value', has_arg=False,
               names=('default', )),
-        Field('type', label=l_('Type'), has_arg=False,
+        Field('type', label='Type', has_arg=False,
               names=('type',)),
     ]
 
@@ -60,7 +59,7 @@ def add_target_and_index(self, name, sig, signode):
         # Server section
         if targetparts[0] == 'Servers' and len(targetparts) > 1:
             indexname = ', '.join(targetparts[1:])
-            self.indexnode['entries'].append((indextype, l_('server configuration; %s') % indexname,
+            self.indexnode['entries'].append((indextype, 'server configuration; %s' % indexname,
                                               targetname, targetname))
             self.indexnode['entries'].append((indextype, indexname,
                                               targetname, targetname))
@@ -86,14 +85,14 @@ def result_nodes(self, document, env, node, is_ref):
         indexnode = addnodes.index()
         indexnode['entries'] = [
             ('single', varname, tgtid, varname),
-            ('single', _('configuration section; %s') % varname, tgtid, varname)
+            ('single', 'configuration section; %s' % varname, tgtid, varname)
         ]
         targetnode = nodes.target('', '', ids=[tgtid])
         document.note_explicit_target(targetnode)
         return [indexnode, targetnode, node], []
 
 class ConfigSection(ObjectDescription):
-    indextemplate = l_('configuration section; %s')
+    indextemplate = 'configuration section; %s'
     parse_node = None
 
     def handle_signature(self, sig, signode):
@@ -137,7 +136,7 @@ def result_nodes(self, document, env, node, is_ref):
         indexnode = addnodes.index()
         indexnode['entries'] = [
             ('single', varname, tgtid, varname),
-            ('single', _('configuration option; %s') % varname, tgtid, varname)
+            ('single', 'configuration option; %s' % varname, tgtid, varname)
         ]
         targetnode = nodes.target('', '', ids=[tgtid])
         document.note_explicit_target(targetnode)
@@ -149,8 +148,8 @@ class ConfigFileDomain(Domain):
     label = 'Config'
 
     object_types = {
-            'option':  ObjType(l_('config option'), 'option'),
-            'section':  ObjType(l_('config section'), 'section'),
+            'option':  ObjType('config option', 'option'),
+            'section':  ObjType('config section', 'section'),
             }
     directives = {
             'option': ConfigOption,

doc/config.rst

@@ -738,19 +738,33 @@ Server connection settings
     :type: string
     :default: ``''``
 
-    Since release 4.1.0 you can have a central list of columns per database.
+    Since release 4.3.0 you can have a central list of columns per database.
     You can add/remove columns to the list as per your requirement. These columns 
-    in the central list will be available to use while you create a new coulmn for
+    in the central list will be available to use while you create a new column for
     a table or create a table itself. You can select a column from central list 
-    while creating a new column, it will save you from writting same column definition
-    over again or from writting different names for similar column.
+    while creating a new column, it will save you from writing the same column definition
+    over again or from writing different names for similar column.
 
     To allow the usage of this functionality:
 
     * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
     * put the table name in :config:option:`$cfg['Servers'][$i]['central_columns']` (e.g.
       ``pma__central_columns``)
-
+
+.. _savedsearches:
+.. config:option:: $cfg['Servers'][$i]['savedsearches']
+
+    :type: string
+    :default: ``''``
+
+    Since release 4.2.0 you can save and load query-by-example searches from the Database > Query panel. 
+
+    To allow the usage of this functionality:
+
+    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
+    * put the table name in :config:option:`$cfg['Servers'][$i]['savedsearches']` (e.g.
+      ``pma__savedsearches``)
+
 .. _tracking:
 .. config:option:: $cfg['Servers'][$i]['tracking']
 

doc/setup.rst

@@ -224,11 +224,11 @@ options which the setup script does not provide.
    a login dialog if using :term:`HTTP` or
    cookie authentication mode.
 #. You should deny access to the ``./libraries`` and ``./setup/lib``
-   subfolders in your webserver configuration. For Apache you can use
-   supplied :term:`.htaccess`  file in that folder, for other webservers, you should
-   configure this yourself. Such configuration prevents from possible
+   subfolders in your webserver configuration.
+   Such configuration prevents from possible
    path exposure and cross side scripting vulnerabilities that might
-   happen to be found in that code.
+   happen to be found in that code. For the Apache webserver, this is
+   often accomplished with a :term:`.htaccess` file in those directories.
 #. It is generally a good idea to protect a public phpMyAdmin installation
    against access by robots as they usually can not do anything good
    there. You can do this using ``robots.txt`` file in root of your

error_report.php

@@ -19,7 +19,8 @@
         $success = false;
     } else {
         $decoded_response = json_decode($server_response, true);
-        $success = !empty($decoded_response) ? $decoded_response["success"] : false; }
+        $success = !empty($decoded_response) ? $decoded_response["success"] : false;
+    }
 
     /* Message to show to the user */
     if ($success) {

import.php

@@ -373,7 +373,7 @@
          * @todo make use of the config's temp dir with fallback to the
          * system's tmp dir
          */
-        $tmp_subdir = sys_get_temp_dir();
+        $tmp_subdir = ini_get('upload_tmp_dir'); 
 
         if (is_writable($tmp_subdir)) {
 

libraries/DbSearch.class.php

@@ -196,7 +196,6 @@ private function _getSearchSqls($table)
      */
     private function _getWhereClause($table)
     {
-        $where_clause = '';
         // Columns to select
         $allColumns = $GLOBALS['dbi']->getColumns($GLOBALS['db'], $table);
         $likeClauses = array();
@@ -371,11 +370,9 @@ private function _getResultsRow($each_table, $newsearchsqls, $odd_row, $res_cnt)
     /**
      * Provides the main search form's html
      *
-     * @param array $url_params URL parameters
-     *
      * @return string HTML for selection form
      */
-    public function getSelectionForm($url_params)
+    public function getSelectionForm()
     {
         $html_output = '<a id="db_search"></a>';
         $html_output .= '<form id="db_search_form"'

libraries/Table.class.php

@@ -913,7 +913,6 @@ static public function moveCopy($source_db, $source_table, $target_db,
             /* Generate query back */
             $sql_structure = PMA_SQP_format($parsed_sql, 'query_only');
             // If table exists, and 'add drop table' is selected: Drop it!
-            $drop_query = '';
             if (isset($_REQUEST['drop_if_exists'])
                 && $_REQUEST['drop_if_exists'] == 'true'
             ) {

libraries/plugins/export/ExportSql.class.php

@@ -1874,8 +1874,6 @@ public function exportData($db, $table, $crlf, $error_url, $sql_query)
                         . $crlf;
                     PMA_exportOutputHandler($truncatehead);
                     PMA_exportOutputHandler($truncate);
-                } else {
-                    $truncate = '';
                 }
 
                 // scheme for inserting fields

libraries/structure.lib.php

@@ -336,7 +336,7 @@ function PMA_getHtmlForCheckAllTables($pmaThemeImage, $text_dir,
             . __('Copy table with prefix') . '</option>' . "\n";
         if ($GLOBALS['cfgRelation']['central_columnswork']) {
             $html_output .= '<option value="sync_unique_columns_central_list" >'
-                . __('Add unique columns to central list') . '</option>' . "\n";
+                . __('Add columns to central list') . '</option>' . "\n";
             $html_output .= '<option value="delete_unique_columns_central_list" >'
                 . __('Remove columns from central list') . '</option>' . "\n";
         }

po/af.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.3.0-dev\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2014-05-26 15:16-0400\n"
+"POT-Creation-Date: 2014-05-28 08:21-0400\n"
 "PO-Revision-Date: 2014-03-28 11:05+0200\n"
 "Last-Translator: Michal Čihař <[email protected]>\n"
 "Language-Team: Afrikaans <https://l10n.cihar.com/projects/phpmyadmin/master/"
@@ -423,39 +423,34 @@ msgstr "Volg tabel"
 msgid "Database Log"
 msgstr "Databasis opname"
 
-#: error_report.php:33
+#: error_report.php:31
 msgid ""
 "An error has been detected and an error report has been automatically "
 "submitted based on your settings."
 msgstr ""
 "n Fout is opgemerk en n fout verslag is outomaties versent gebaseer op jou "
 "verstellings."
 
-#: error_report.php:37 error_report.php:54 error_report.php:65
-#: error_report.php:81
-msgid "You may want to refresh the page."
-msgstr "Dit sal goed wees om die bladsy oor te laai."
+#: error_report.php:35
+msgid "Thank you for submitting this report."
+msgstr "Dankie vir die voorlegging van die verslag."
 
-#: error_report.php:45
+#: error_report.php:39
 msgid ""
 "An error has been detected and an error report has been generated but failed "
 "to be sent."
 msgstr ""
 "n Fout is opgemerk en n fout verslag is gegenereer maar het misluk om te "
 "versend."
 
-#: error_report.php:50 error_report.php:77
+#: error_report.php:44
 msgid "If you experience any problems please submit a bug report manually."
 msgstr ""
 "Indien jy enige probleme ondervind stuur asb n hand verwerkte fout verslag."
 
-#: error_report.php:63 error_report.php:72
-msgid "Thank you for submitting this report."
-msgstr "Dankie vir die voorlegging van die verslag."
-
-#: error_report.php:74
-msgid "Unfortunately the submission failed."
-msgstr "Ongelukkig het die indienig gefaal."
+#: error_report.php:48
+msgid "You may want to refresh the page."
+msgstr "Dit sal goed wees om die bladsy oor te laai."
 
 #: export.php:179
 msgid "Bad type!"
@@ -3305,7 +3300,7 @@ msgstr ""
 
 #: libraries/Message.class.php:199 libraries/Util.class.php:626
 #: libraries/core.lib.php:229 libraries/import.lib.php:181
-#: libraries/insert_edit.lib.php:1231 tbl_chart.php:24 tbl_operations.php:187
+#: libraries/insert_edit.lib.php:1231 tbl_operations.php:187
 #: view_operations.php:63
 msgid "Error"
 msgstr "Fout"
@@ -12081,8 +12076,9 @@ msgid "Copy table with prefix"
 msgstr "Vervang tabel data met leer (file)"
 
 #: libraries/structure.lib.php:339
-msgid "Add unique columns to central list"
-msgstr ""
+#, fuzzy
+msgid "Add columns to central list"
+msgstr "Voeg 'n nuwe veld by"
 
 #: libraries/structure.lib.php:341
 msgid "Remove columns from central list"
@@ -13291,17 +13287,17 @@ msgstr ""
 msgid "Wrong data"
 msgstr "Geen databasisse"
 
-#: tbl_chart.php:38
+#: tbl_chart.php:34
 #, fuzzy
 #| msgid "No databases"
 msgid "No data to display"
 msgstr "Geen databasisse"
 
-#: tbl_chart.php:62 tbl_gis_visualization.php:24
+#: tbl_chart.php:58 tbl_gis_visualization.php:24
 msgid "No SQL query was set to fetch data."
 msgstr ""
 
-#: tbl_chart.php:120
+#: tbl_chart.php:116
 msgid "No numeric columns present in the table to plot."
 msgstr ""
 
@@ -14507,6 +14503,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr ""
 
+#~ msgid "Unfortunately the submission failed."
+#~ msgstr "Ongelukkig het die indienig gefaal."
+
 #~ msgid "Skip Validate SQL"
 #~ msgstr "Ignoreer SQL Validasie"