Merge branch 'MAINT_4_4_11' into STABLE

CONTRIBUTING.md

@@ -22,4 +22,4 @@ tag, you are giving permission to license the patch as GPLv2-or-later.  See
 
 You can find more information on our website:
 
-http://www.phpmyadmin.net/home_page/improve.php
+https://www.phpmyadmin.net/contribute/

ChangeLog

@@ -1,6 +1,15 @@
 phpMyAdmin - ChangeLog
 ======================
 
+4.4.11.0 (2015-07-06)
+- bug       Missing selected/entered values when editing active options in visual query builder
+- bug #4969 Autoload from prefs_storage not behaving properly
+- bug #4972 Incorrect length computed for binary data
+- bug       Remove character set from create_tables_drizzle.sql
+- bug #4973 Users overview needs clarification
+- bug #4974 Creating a database from console doesn't update navigation panel
+- bug #4844 FAQ 1.17 needs an update
+
 4.4.10.0 (2015-06-17)
 - bug #4950 Issues in database selection for replication
 - bug #4951 Trying to save chart as image crashes the browser

README

@@ -1,11 +1,11 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.4.10
+Version 4.4.11
 
 A set of PHP-scripts to manage MySQL over the web.
 
-http://www.phpmyadmin.net/
+https://www.phpmyadmin.net/
 
 Summary
 -------

README.rst

@@ -3,7 +3,7 @@ phpMyAdmin
 
 A set of PHP-scripts to manage MySQL over the web.
 
-http://www.phpmyadmin.net/
+https://www.phpmyadmin.net/
 
 Code status
 -----------
@@ -23,12 +23,12 @@ Code status
     :target: https://scrutinizer-ci.com/g/phpmyadmin/phpmyadmin/
 
 .. image:: https://img.shields.io/sourceforge/dm/phpmyadmin.svg
-    :target: http://www.phpmyadmin.net/home_page/downloads.php
+    :target: https://www.phpmyadmin.net/downloads/
 
 Download
 --------
 
-You can get the newest release at http://www.phpmyadmin.net/.
+You can get the newest release at https://www.phpmyadmin.net/.
 
 If you prefer to follow the git repository, the following branch and tag names may be of interest:
 
@@ -42,5 +42,4 @@ More Information
 Please see the documentation in the doc folder or at http://docs.phpmyadmin.net/.
 
 For support or to learn how to contribute code or by translating to your language,
-visit http://www.phpmyadmin.net/
-
+visit https://www.phpmyadmin.net/

changelog.php

@@ -108,7 +108,7 @@
 
     // PMASAentries
     '/(PMASA-[0-9]+-[0-9]+)/'
-    => '<a href="http://www.phpmyadmin.net/home_page/security/\\1.php">\\1</a>',
+    => '<a href="https://www.phpmyadmin.net/security/\\1/">\\1</a>',
 
     // Highlight releases (with links)
     '/([0-9]+)\.([0-9]+)\.([0-9]+)\.0 (\([0-9-]+\))/'

composer.json

@@ -3,17 +3,17 @@
     "type": "application",
     "description": "MySQL web administration tool",
     "keywords": ["phpmyadmin","mysql","web"],
-    "homepage": "http://www.phpmyadmin.net/",
+    "homepage": "https://www.phpmyadmin.net/",
     "license": "GPL-2.0+",
     "authors": [
         {
             "name": "The phpMyAdmin Team",
             "email": "phpmyadmin-devel@lists.sourceforge.net",
-            "homepage": "http://www.phpmyadmin.net/home_page/team.php"
+            "homepage": "https://www.phpmyadmin.net/team/"
         }
     ],
     "support": {
-        "forum": "https://sourceforge.net/p/phpmyadmin/discussion/Help",
+        "forum": "https://www.phpmyadmin.net/support/",
         "issues": "https://sourceforge.net/p/phpmyadmin/bugs/",
         "wiki": "http://wiki.phpmyadmin.net/",
         "source": "https://github.com/phpmyadmin/phpmyadmin"

doc/conf.py

@@ -51,7 +51,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.4.10'
+version = '4.4.11'
 # The full version, including alpha/beta/rc tags.
 release = version
 

doc/developers.rst

@@ -9,4 +9,4 @@ to make phpMyAdmin a useful tool.
 
 You can check out all the possibilities to contribute in the
 `contribute section on our website
-<http://www.phpmyadmin.net/home_page/improve.php>`_.
+<https://www.phpmyadmin.net/contribute/>`_.

doc/faq.rst

@@ -4,7 +4,7 @@ FAQ - Frequently Asked Questions
 ================================
 
 Please have a look at our `Link section
-<http://www.phpmyadmin.net/home_page/docs.php>`_ on the official
+<https://www.phpmyadmin.net/docs/>`_ on the official
 phpMyAdmin homepage for in-depth coverage of phpMyAdmin's features and
 or interface.
 
@@ -186,24 +186,16 @@ hosting provider is unwilling to change the settings:
 
 .. _faq1_17:
 
-1.17 Which MySQL versions does phpMyAdmin support?
---------------------------------------------------
+1.17 Which Database versions does phpMyAdmin support?
+-----------------------------------------------------
+
+For `MySQL <http://www.mysql.com/>`_, versions 5.5 and newer are supported. 
+For older MySQL versions, our `Downloads <https://www.phpmyadmin.net/downloads/>`_ page offers older phpMyAdmin versions 
+(which may have become unsupported).
+
+For `MariaDB <http://mariadb.org/>`_, versions 5.5 and newer are supported.
 
-Since phpMyAdmin 3.0.x, only MySQL 5.0.1 and newer are supported. For
-older MySQL versions, you need to use the latest 2.x branch.
-phpMyAdmin can connect to your MySQL server using PHP's classic `MySQL
-extension <http://php.net/mysql>`_ as well as the `improved MySQL
-extension (MySQLi) <http://php.net/mysqli>`_ that is available in PHP
-5.0. The latter one should be used unless you have a good reason not
-to do so. When compiling PHP, we strongly recommend that you manually
-link the MySQL extension of your choice to a MySQL client library of
-at least the same minor version since the one that is bundled with
-some PHP distributions is rather old and might cause problems see
-:ref:`faq1_17a`. `MariaDB <http://mariadb.org/>`_ is also supported
-(versions 5.1 and 5.2 were tested).
-
-.. versionchanged:: 3.5
-    Since phpMyAdmin 3.5 `Drizzle <http://www.drizzle.org/>`_ is supported.
+For `Drizzle <http://www.drizzle.org>`_, versions 7.1 and newer are supported.
 
 .. _faq1_17a:
 
@@ -902,7 +894,7 @@ just put your own input-elements inside. If you use a custom submit
 input field, the form will submit itself to the displaying page again,
 where you can validate the $HTTP\_POST\_VARS in a transformation. For
 a tutorial on how to effectively use transformations, see our `Link
-section <http://www.phpmyadmin.net/home_page/docs.php>`_ on the
+section <https://www.phpmyadmin.net/docs/>`_ on the
 official phpMyAdmin-homepage.
 
 .. _faq3_9:
@@ -1886,7 +1878,7 @@ to display the plot.
 After the plot is generated, you can use the
 mousewheel to zoom in and out of the plot. In addition, panning
 feature is enabled to navigate through the plot. You can zoom-in to a
-certail level of detail and use panning to locate your area of
+certain level of detail and use panning to locate your area of
 interest. Clicking on a point opens a dialogue box, displaying field
 values of the data row represented by the point. You can edit the
 values if required and click on submit to issue an update query. Basic
@@ -1988,7 +1980,7 @@ On startup of the wizard, user gets to select upto what normal form they want to
 normalize the table structure.
 
 Here is an example table which you can use to test all of the three First, Second and
-Third Normal From.
+Third Normal Form.
 
 .. code-block:: mysql
 
@@ -2031,7 +2023,7 @@ phpMyAdmin project
 
 Our Bug Tracker is located at <http://sf.net/projects/phpmyadmin/> under the
 Bugs section. But please first discuss your bug with other users:
-<https://sourceforge.net/projects/phpmyadmin/forums>.
+<https://www.phpmyadmin.net/support/>
 
 .. _faq7_2:
 
@@ -2042,7 +2034,7 @@ Translations are very welcome and all you need to have are the
 language skills. The easiest way is to use our `online translation
 service <https://hosted.weblate.org/projects/phpmyadmin/>`_. You can check
 out all the possibilities to translate in the `translate section on
-our website <http://www.phpmyadmin.net/home_page/translate.php>`_.
+our website <https://www.phpmyadmin.net/translate/>`_.
 
 .. _faq7_3:
 
@@ -2052,7 +2044,7 @@ our website <http://www.phpmyadmin.net/home_page/translate.php>`_.
 We welcome every contribution to the development of phpMyAdmin. You
 can check out all the possibilities to contribute in the `contribute
 section on our website
-<http://www.phpmyadmin.net/home_page/improve.php>`_.
+<https://www.phpmyadmin.net/contribute/>`_.
 
 .. seealso:: :ref:`developers`
 
@@ -2066,7 +2058,7 @@ Security
 8.1 Where can I get information about the security alerts issued for phpMyAdmin?
 --------------------------------------------------------------------------------
 
-Please refer to <http://www.phpmyadmin.net/home_page/security.php>.
+Please refer to <https://www.phpmyadmin.net/security/>.
 
 .. _faq8_2:
 

doc/intro.rst

@@ -44,8 +44,8 @@ Currently phpMyAdmin can:
 * support mysqli, the improved MySQL extension see :ref:`faq1_17`
 * create, edit, call, export and drop stored procedures and functions
 * create, edit, export and drop events and triggers
-* communicate in `62 different languages
-  <http://www.phpmyadmin.net/home_page/translations.php>`_
+* communicate in `80 different languages
+  <https://www.phpmyadmin.net/translations/>`_
 
 
 A word about users

doc/other.rst

@@ -8,7 +8,7 @@ The definitive guide to using phpMyAdmin is the book Mastering phpMyAdmin for
 Effective MySQL Management by Marc Delisle. You can get information on that
 book and other officially endorsed `books at the phpMyAdmin site`_.
 
-.. _books at the phpMyAdmin site: http://www.phpmyadmin.net/home_page/docs.php?books
+.. _books at the phpMyAdmin site: https://www.phpmyadmin.net/docs/
 
 Tutorials
 ---------

doc/setup.rst

@@ -511,7 +511,7 @@ each user with their Swekey Id. It is important to place this file
 outside of your web server's document root (in the example, it is
 located in ``/etc``). Feel free to use it with your own users'
 information. If you want to purchase a Swekey please visit
-`http://phpmyadmin.net/auth\_key <http://phpmyadmin.net/auth_key>`_
+`https://www.phpmyadmin.net/auth\_key/ <https://www.phpmyadmin.net/auth_key/>`_
 since this link provides funding for phpMyAdmin.
 
 A self documented sample file is provided in the

examples/swekey.sample.conf

@@ -9,7 +9,7 @@
 # If you don't know the id of a Swekey just visit http://www.swekey.com?sel=support
 # while your Swekey is connected.
 #
-# If you need to purchase a Swekey please visit http://phpmyadmin.net/auth_key
+# If you need to purchase a Swekey please visit https://www.phpmyadmin.net/auth_key/
 # since this link provides funding to PhpMyAdmin.
 #
 

index.php

@@ -410,14 +410,14 @@
 PMA_printListItem(
     __('Contribute'),
     'li_pma_contribute',
-    PMA_linkURL('http://www.phpmyadmin.net/home_page/improve.php'),
+    PMA_linkURL('https://www.phpmyadmin.net/contribute/'),
     null,
     '_blank'
 );
 PMA_printListItem(
     __('Get support'),
     'li_pma_support',
-    PMA_linkURL('http://www.phpmyadmin.net/home_page/support.php'),
+    PMA_linkURL('https://www.phpmyadmin.net/support/'),
     null,
     '_blank'
 );
@@ -643,7 +643,7 @@
     ) {
         trigger_error(
             'You are using an incomplete translation, please help to make it '
-            . 'better by [a@http://www.phpmyadmin.net/home_page/improve.php'
+            . 'better by [a@https://www.phpmyadmin.net/contribute/'
             . '#translate@_blank]contributing[/a].',
             E_USER_NOTICE
         );

js/console.js

@@ -173,7 +173,7 @@ var PMA_console = {
                     PMA_console.ajaxCallback(data);
                 } catch (e) {
                     console.log("Invalid JSON!" + e.message);
-                    if(AJAX.xhr.status === 0 && AJAX.xhr.statusText !== 'abort') {
+                    if(AJAX.xhr && AJAX.xhr.status === 0 && AJAX.xhr.statusText !== 'abort') {
                         PMA_ajaxShowMessage($('<div />',{class:'error',html:PMA_messages.strRequestFailed+' ( '+AJAX.xhr.statusText+' )'}));
                         AJAX.active = false;
                         AJAX.xhr = null;
@@ -235,6 +235,7 @@ var PMA_console = {
             .val(PMA_consoleMessages.appendQuery({sql_query: queryString}).message_id);
         PMA_console.$requestForm.trigger('submit');
         PMA_consoleInput.clear();
+        PMA_reloadNavigation();
     },
     ajaxCallback: function(data) {
         if(data && data.console_message_id) {

js/pmd/history.js

@@ -199,6 +199,7 @@ function history_edit(index)
         document.getElementById('query_having').style.display = 'block';
     }
     if (type == "Rename") {
+        document.getElementById('e_rename').value = history_array[index].get_obj().getrename_to();
         document.getElementById('query_rename_to').style.left =  '530px';
         document.getElementById('query_rename_to').style.top  = '130px';
         document.getElementById('query_rename_to').style.position  = 'absolute';
@@ -207,6 +208,7 @@ function history_edit(index)
         document.getElementById('query_rename_to').style.display = 'block';
     }
     if (type == "Aggregate") {
+        document.getElementById('e_operator').value = history_array[index].get_obj().get_operator();
         document.getElementById('query_Aggregate').style.left = '530px';
         document.getElementById('query_Aggregate').style.top  = '130px';
         document.getElementById('query_Aggregate').style.position  = 'absolute';

libraries/Config.class.php

@@ -114,7 +114,7 @@ function __construct($source = null)
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.4.10');
+        $this->set('PMA_VERSION', '4.4.11');
         /**
          * @deprecated
          */

libraries/DisplayResults.class.php

@@ -5126,7 +5126,7 @@ private function _handleNonPrintableContents(
 
         if (isset($content)) {
 
-            $size = /*overload*/mb_strlen($content);
+            $size = /*overload*/mb_strlen($content, '8bit');
             $display_size = PMA_Util::formatByteDown($size, 3, 1);
             $result .= ' - ' . $display_size[0] . ' ' . $display_size[1];
 

libraries/Util.class.php

@@ -4270,7 +4270,7 @@ public static function getLatestVersion()
             $response = $_SESSION['cache']['version_check']['response'];
         } else {
             $save = true;
-            $file = 'http://www.phpmyadmin.net/home_page/version.json';
+            $file = 'https://www.phpmyadmin.net/home_page/version.json';
             if (ini_get('allow_url_fopen')) {
                 $context = array(
                     'http' => array(

libraries/db_designer.lib.php

@@ -1233,7 +1233,7 @@ function PMA_getAggregateQueryPanel()
     $html .= '<option value="min"> MIN </option>';
     $html .= '<option value="max"> MAX </option>';
     $html .= '<option value="avg"> AVG </option>';
-    $html .= '<option value="avg"> COUNT </option>';
+    $html .= '<option value="count"> COUNT </option>';
     $html .= '</select>';
     $html .= '</td></tr>';
     $html .= '</tbody>';

libraries/plugins/auth/AuthenticationCookie.class.php

@@ -117,7 +117,7 @@ public function auth()
         echo '
     <div class="container">
     <a href="';
-        echo PMA_linkURL('http://www.phpmyadmin.net/');
+        echo PMA_linkURL('https://www.phpmyadmin.net/');
         echo '" target="_blank" class="logo">';
         $logo_image = $GLOBALS['pmaThemeImage'] . 'logo_right.png';
         if (@file_exists($logo_image)) {

libraries/plugins/auth/swekey/swekey.auth.lib.php

@@ -271,7 +271,7 @@ function Swekey_login($input_name, $input_go)
         ?>
             function open_swekey_site()
             {
-                window.open("<?php echo PMA_linkURL('http://phpmyadmin.net/auth_key'); ?>");
+                window.open("<?php echo PMA_linkURL('https://www.phpmyadmin.net/auth_key/'); ?>");
             }
 
             var input_username = document.getElementById("<?php echo $input_name; ?>");

libraries/plugins/export/ExportXml.class.php

@@ -177,7 +177,7 @@ public function exportHeader ()
                .  '<!--' . $crlf
                .  '- phpMyAdmin XML Dump' . $crlf
                .  '- version ' . PMA_VERSION . $crlf
-               .  '- http://www.phpmyadmin.net' . $crlf
+               .  '- https://www.phpmyadmin.net' . $crlf
                .  '-' . $crlf
                .  '- ' . __('Host:') . ' ' . $cfg['Server']['host'];
         if (! empty($cfg['Server']['port'])) {

libraries/server_privileges.lib.php

@@ -3211,7 +3211,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
         . '<table id="tableuserrights" class="data">' . "\n"
         . '<thead>' . "\n"
         . '<tr><th></th>' . "\n"
-        . '<th>' . __('User') . '</th>' . "\n"
+        . '<th>' . __('User name') . '</th>' . "\n"
         . '<th>' . __('Host') . '</th>' . "\n"
         . '<th>' . __('Password') . '</th>' . "\n"
         . '<th>' . __('Global privileges') . ' '

libraries/user_preferences.lib.php

@@ -279,7 +279,7 @@ function PMA_userprefsAutoloadGetHeader()
         );
 
         $retval .= '<div id="prefs_autoload" class="notice" style="display:none">';
-        $retval .= '<form action="prefs_manage.php" method="post">';
+        $retval .= '<form action="prefs_manage.php" method="post" class="disableAjax">';
         $retval .= PMA_URL_getHiddenInputs();
         $retval .= '<input type="hidden" name="json" value="" />';
         $retval .= '<input type="hidden" name="submit_import" value="1" />';