From d4fdf5a6c4b79af845051ac8e2a1b21cca1052bc Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 20 Apr 2012 23:29:54 +0200
Subject: [PATCH 1/7] Fix undefined variable $cfg in user_password.php

---
 user_password.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_password.php b/user_password.php
index d7b8cc03e5..a9e21827b3 100644
--- a/user_password.php
+++ b/user_password.php
@@ -175,14 +175,14 @@ function PMA_changePassAuthType($_url_params, $password)
      * Changes password cookie if required
      * Duration = till the browser is closed for password (we don't want this to be saved)
      */
-    if ($cfg['Server']['auth_type'] == 'cookie') {
+    if ($GLOBALS['cfg']['Server']['auth_type'] == 'cookie') {
         $GLOBALS['PMA_Config']->setCookie('pmaPass-' . $server, PMA_blowfish_encrypt($password, $GLOBALS['cfg']['blowfish_secret']));
     }
     /**
      * For http auth. mode, the "back" link will also enforce new
      * authentication
      */
-    if ($cfg['Server']['auth_type'] == 'http') {
+    if ($GLOBALS['cfg']['Server']['auth_type'] == 'http') {
         $_url_params['old_usr'] = 'relog';
     }
     return $_url_params;

From 42959cbde9a60719d1a45912cacd224690d18072 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 20 Apr 2012 23:32:44 +0200
Subject: [PATCH 2/7] Fix Undefined index: db in libraries/Tracker.class.php

---
 libraries/Tracker.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
index 590b81e376..eee5ffd6a4 100644
--- a/libraries/Tracker.class.php
+++ b/libraries/Tracker.class.php
@@ -874,7 +874,7 @@ class PMA_Tracker
         $result = self::parseQuery($query);
 
         // Get database name
-        $dbname = trim($GLOBALS['db'], '`');
+        $dbname = trim(isset($GLOBALS['db']) ? $GLOBALS['db'] : '', '`');
         // $dbname can be empty, for example when coming from Synchronize
         // and this is a query for the remote server
         if (empty($dbname)) {

From f1b43c6113e3f569e7dc942aa9773d4f0cacec05 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 20 Apr 2012 23:38:26 +0200
Subject: [PATCH 3/7] When adding user in server privileges, autofocus username
 input

---
 js/server_privileges.js | 1 +
 server_privileges.php   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/server_privileges.js b/js/server_privileges.js
index 9edd6a71fe..8eefef7280 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -263,6 +263,7 @@ $(document).ready(function() {
             displayPasswordGenerateButton();
             PMA_convertFootnotesToTooltips($div);
             PMA_ajaxRemoveMessage($msgbox);
+            $div.find("input[autofocus]").focus();
         }); // end $.get()
 
     });//end of Add New User AJAX event handler
diff --git a/server_privileges.php b/server_privileges.php
index 749e33e5bd..8c39fc2dff 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -882,7 +882,7 @@ function PMA_displayLoginInformationFields($mode = 'new')
                : $GLOBALS['username']
            ) . '"'
        )
-       . ' onchange="pred_username.value = \'userdefined\';" />' . "\n"
+       . ' onchange="pred_username.value = \'userdefined\';" autofocus="autofocus" />' . "\n"
        . '</div>' . "\n"
        . '<div class="item">' . "\n"
        . '<label for="select_pred_hostname">' . "\n"

From 72663d0bd4a4921c4a5f1d68ad660145866d7f00 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 20 Apr 2012 23:45:56 +0200
Subject: [PATCH 4/7] Align server sync form fields properly, add labels

---
 server_synchronize.php | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/server_synchronize.php b/server_synchronize.php
index a9c4f19501..d6948664d6 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -1334,32 +1334,32 @@ if (! isset($_REQUEST['submit_connect'])
          </select>
       </td>
       </tr>
-    <tr class="even toggler remote-server">
-        <td><?php echo __('Server'); ?></td>
-        <td><input type="text" name="<?php echo $type; ?>_host" class="server-host" <?php echo $possibly_readonly; ?>/></td>
+    <tr class="even toggler remote-server vmiddle">
+        <td><label for="<?php echo $type; ?>_host"><?php echo __('Server'); ?></label></td>
+        <td><input type="text" name="<?php echo $type; ?>_host" id="<?php echo $type; ?>_host" class="server-host" <?php echo $possibly_readonly; ?>/></td>
     </tr>
-    <tr class="odd toggler remote-server">
-        <td><?php echo __('Port'); ?></td>
-        <td><input type="text" name="<?php echo $type; ?>_port" class="server-port" <?php echo $possibly_readonly; ?> value="3306" maxlength="5" size="5" /></td>
+    <tr class="odd toggler remote-server vmiddle">
+        <td><label for="<?php echo $type; ?>_port"><?php echo __('Port'); ?></label></td>
+        <td><input type="text" name="<?php echo $type; ?>_port" id="<?php echo $type; ?>_port" class="server-port" <?php echo $possibly_readonly; ?> value="3306" maxlength="5" size="5" /></td>
     </tr>
-    <tr class="even toggler remote-server">
-        <td><?php echo __('Socket'); ?></td>
-        <td><input type="text" name="<?php echo $type; ?>_socket" class="server-socket" <?php echo $possibly_readonly; ?>/></td>
+    <tr class="even toggler remote-server vmiddle">
+        <td><label for="<?php echo $type; ?>_socket"><?php echo __('Socket'); ?></label></td>
+        <td><input type="text" name="<?php echo $type; ?>_socket" id="<?php echo $type; ?>_socket" class="server-socket" <?php echo $possibly_readonly; ?>/></td>
     </tr>
-    <tr class="odd toggler remote-server">
-        <td><?php echo __('User name'); ?></td>
-        <td><input type="text" name="<?php echo $type; ?>_username" class="server-user" /></td>
+    <tr class="odd toggler remote-server vmiddle">
+        <td><label for="<?php echo $type; ?>_username"><?php echo __('User name'); ?></label></td>
+        <td><input type="text" name="<?php echo $type; ?>_username" id="<?php echo $type; ?>_username" class="server-user" /></td>
     </tr>
-    <tr class="even toggler remote-server">
-        <td><?php echo __('Password'); ?></td>
-        <td><input type="password" name="<?php echo $type; ?>_pass" class="server-pass" /> </td>
+    <tr class="even toggler remote-server vmiddle">
+        <td><label for="<?php echo $type; ?>_pass"><?php echo __('Password'); ?></label></td>
+        <td><input type="password" name="<?php echo $type; ?>_pass" id="<?php echo $type; ?>_pass" class="server-pass" /> </td>
     </tr>
-    <tr class="odd toggler remote-server">
-        <td><?php echo __('Database'); ?></td>
-        <td><input type="text" name="<?php echo $type; ?>_db" class="server-db" /></td>
+    <tr class="odd toggler remote-server vmiddle">
+        <td><label for="<?php echo $type; ?>_db"><?php echo __('Database'); ?></label></td>
+        <td><input type="text" name="<?php echo $type; ?>_db" id="<?php echo $type; ?>_db" class="server-db" /></td>
     </tr>
-    <tr class="even toggler current-server" style="display: none;">
-        <td><?php echo __('Database'); ?></td>
+    <tr class="even toggler current-server vmiddle" style="display: none;">
+        <td><label for="<?php echo $type; ?>_db_sel"><?php echo __('Database'); ?></label></td>
         <td>
 <?php
     $options_list = '';
@@ -1374,7 +1374,7 @@ if (! isset($_REQUEST['submit_connect'])
     if (count($databases) == 0) {
         echo __('No databases');
     } else {
-        echo '<select name="' . $type . '_db_sel">'
+        echo '<select name="' . $type . '_db_sel" id="' . $type . '_db_sel">'
          . $options_list
          . '</select>';
         unset($options_list);

From c23fc1efe666acca3d9b2d4abe1f58014cbd6f77 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Fri, 20 Apr 2012 23:51:13 +0200
Subject: [PATCH 5/7] Don't allow to truncate empty tables in database
 structure

---
 db_structure.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/db_structure.php b/db_structure.php
index e190025f7a..11bab14581 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -356,22 +356,23 @@ foreach ($tables as $keyname => $each_table) {
     $browse_table_label = '<a href="sql.php?' . $tbl_url_query . '&amp;pos=0">' . $truename . '</a>';
 
     if (! $db_is_information_schema) {
-        $empty_table = '<a ';
-        if ($GLOBALS['cfg']['AjaxEnable']) {
-            $empty_table .= 'class="truncate_table_anchor"';
-        }
-        $empty_table .= ' href="sql.php?' . $tbl_url_query
-            . '&amp;sql_query=';
-        $empty_table .= urlencode('TRUNCATE ' . PMA_backquote($each_table['TABLE_NAME']))
-            . '&amp;message_to_show='
-            . urlencode(sprintf(__('Table %s has been emptied'), htmlspecialchars($each_table['TABLE_NAME'])))
-            .'">';
         if ($may_have_rows) {
+            $empty_table = '<a ';
+            if ($GLOBALS['cfg']['AjaxEnable']) {
+                $empty_table .= 'class="truncate_table_anchor"';
+            }
+            $empty_table .= ' href="sql.php?' . $tbl_url_query
+                . '&amp;sql_query=';
+            $empty_table .= urlencode('TRUNCATE ' . PMA_backquote($each_table['TABLE_NAME']))
+                . '&amp;message_to_show='
+                . urlencode(sprintf(__('Table %s has been emptied'), htmlspecialchars($each_table['TABLE_NAME'])))
+                .'">';
+            
             $empty_table .= $titles['Empty'];
+            $empty_table .= '</a>';
         } else {
-            $empty_table .= $titles['NoEmpty'];
+            $empty_table = $titles['NoEmpty'];
         }
-        $empty_table .= '</a>';
         // truncating views doesn't work
         if ($table_is_view) {
             $empty_table = '&nbsp;';

From d49c63424ff18a5ae46590aa9161c36d17f3438f Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sat, 21 Apr 2012 00:14:02 +0200
Subject: [PATCH 6/7] Add loading indicator to server variables editor

---
 js/server_variables.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/server_variables.js b/js/server_variables.js
index 55d2b41357..f81266d003 100644
--- a/js/server_variables.js
+++ b/js/server_variables.js
@@ -132,12 +132,14 @@ function editVariable(link)
     var mySaveLink = $(saveLink);
     var myCancelLink = $(cancelLink);
     var $cell = $(link).parent();
+    var $msgbox = PMA_ajaxShowMessage();
 
     $cell.addClass('edit');
     // remove edit link
     $cell.find('a.editLink').remove();
 
     mySaveLink.click(function() {
+        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
         $.get('server_variables.php?' + url_query, {
                 ajax_request: true,
                 type: 'setval',
@@ -146,6 +148,7 @@ function editVariable(link)
             }, function(data) {
                 if (data.success) {
                     $cell.html(data.variable);
+                    PMA_ajaxRemoveMessage($msgbox);
                 } else {
                     PMA_ajaxShowMessage(data.error, false);
                     $cell.html($cell.find('span.oldContent').html());
@@ -184,6 +187,7 @@ function editVariable(link)
                 // Escape key
                 if(event.keyCode == 27) myCancelLink.trigger('click');
             });
+            PMA_ajaxRemoveMessage($msgbox);
         });
 
     return false;

From 62b2d09da18ef40cdd6008dba5f9f60027831070 Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Sat, 21 Apr 2012 02:13:48 +0200
Subject: [PATCH 7/7] Delete databases with Ajax

---
 js/messages.php        |  1 +
 js/server_databases.js | 69 ++++++++++++++++++++++++++++++++++++++++++
 server_databases.php   | 22 +++++++++++---
 3 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 js/server_databases.js

diff --git a/js/messages.php b/js/messages.php
index eab572caa6..96e3c01bbf 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -231,6 +231,7 @@ $js_messages['strCancel'] = __('Cancel');
 $js_messages['strLoading'] = __('Loading');
 $js_messages['strProcessingRequest'] = __('Processing Request');
 $js_messages['strErrorProcessingRequest'] = __('Error in Processing Request');
+$js_messages['strNoDatabasesSelected'] = __('No databases selected.');
 $js_messages['strDroppingColumn'] = __('Dropping Column');
 $js_messages['strAddingPrimaryKey'] = __('Adding Primary Key');
 $js_messages['strOK'] = __('OK');
diff --git a/js/server_databases.js b/js/server_databases.js
new file mode 100644
index 0000000000..6436e9f5fb
--- /dev/null
+++ b/js/server_databases.js
@@ -0,0 +1,69 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @fileoverview    functions used on the server databases list page
+ * @name            Server Databases
+ *
+ * @requires    jQuery
+ * @requires    jQueryUI
+ * @required    js/functions.js
+ */
+
+/**
+ * AJAX scripts for server_databases.php
+ *
+ * Actions ajaxified here:
+ * Drop Databases
+ *
+ */
+$(document).ready(function() {
+    /**
+     * Attach Event Handler for 'Drop Databases'
+     *
+     * (see $GLOBALS['cfg']['AjaxEnable'])
+     */
+    $("button[name=drop_selected_dbs].ajax").live('click', function(event) {
+        event.preventDefault();
+
+        var $form = $(this.form);
+
+        /**
+         * @var selected_dbs Array containing the names of the checked databases
+         */
+        var selected_dbs = [];
+        $form.find('input:checkbox:checked').each(function () {
+            selected_dbs[selected_dbs.length] = 'DROP DATABASE `' + escapeHtml($(this).val()) + '`;';
+        });
+        if (! selected_dbs.length) {
+            PMA_ajaxShowMessage(PMA_messages.strNoDatabasesSelected, 2000);
+            return;
+        }
+        /**
+         * @var question    String containing the question to be asked for confirmation
+         */
+        var question = 
+            PMA_messages.strDropDatabaseStrongWarning + ' '
+            + $.sprintf(PMA_messages.strDoYouReally, selected_dbs.join('<br />'));
+
+        $(this).PMA_confirm(
+            question,
+            $form.prop('action')
+                + '?' + $(this.form).serialize()
+                + '&drop_selected_dbs=1&is_js_confirmed=1&ajax_request=true',
+            function(url) {
+                PMA_ajaxShowMessage(PMA_messages.strProcessingRequest, false);
+
+                $.post(url, function(data) {
+                    if(data.success == true) {
+                        PMA_ajaxShowMessage(data.message);
+                        if (window.parent && window.parent.frame_navigation) {
+                            window.parent.frame_navigation.location.reload();
+                        }
+                        $('#tableslistcontainer').load('server_databases.php form#dbStatsForm');
+                    }
+                    else {
+                        PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + ": " + data.error, false);
+                    }
+                }); // end $.post()
+        }); // end $.PMA_confirm()
+    }) ; //end of Drop Database action
+}); // end $(document).ready()
diff --git a/server_databases.php b/server_databases.php
index 7ad910fcfb..b822e792e9 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -10,6 +10,9 @@
  */
 require_once 'libraries/common.inc.php';
 
+$GLOBALS['js_include'][] = 'server_databases.js';
+$GLOBALS['js_include'][] = 'functions.js';
+
 require 'libraries/server_common.inc.php';
 if (! PMA_DRIZZLE) {
     include_once 'libraries/replication.inc.php';
@@ -85,11 +88,20 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
         $message = PMA_Message::error(__('No databases selected.'));
     } else {
         $action = 'server_databases.php';
-        $submit_mult = 'drop_db' ;
+        $submit_mult = 'drop_db';
         $err_url = 'server_databases.php?' . PMA_generate_common_url();
-        if (isset($_REQUEST['selected_dbs'])) {
+        if (isset($_REQUEST['selected_dbs']) 
+            && !isset($_REQUEST['is_js_confirmed'])) {
             $selected_db = $_REQUEST['selected_dbs'];
         }
+        if (isset($_REQUEST['is_js_confirmed'])) {
+            $_REQUEST = array(
+                'query_type' => $submit_mult,
+                'selected' => $_REQUEST['selected_dbs'],
+                'mult_btn' => __('Yes'),
+                'db' => $GLOBALS['db'],
+                'table' => $GLOBALS['table']);
+        }
         include 'libraries/mult_submits.inc.php';
         unset($action, $submit_mult, $err_url, $selected_db, $GLOBALS['db']);
         if (empty($message)) {
@@ -101,7 +113,9 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
             $message = PMA_Message::success(_ngettext('%1$d database has been dropped successfully.', '%1$d databases have been dropped successfully.', $number_of_databases));
             $message->addParam($number_of_databases);
         }
-
+    }
+    if ($GLOBALS['is_ajax_request'] && $message instanceof PMA_Message) {
+        PMA_ajaxResponse($message, $message->isSuccess());
     }
 }
 
@@ -282,7 +296,7 @@ if ($databases_count > 0) {
            . '<a href="server_databases.php' . $common_url_query . '" onclick="if (unMarkAllRows(\'tabledatabases\')) return false;">' . "\n"
            . '    ' . __('Uncheck All') . '</a>' . "\n"
            . '<i>' . __('With selected:') . '</i>' . "\n";
-        PMA_buttonOrImage('drop_selected_dbs', 'mult_submit', 'drop_selected_dbs', __('Drop'), 'b_deltbl.png');
+        PMA_buttonOrImage('drop_selected_dbs', 'mult_submit' . ($cfg['AjaxEnable'] ? ' ajax' : ''), 'drop_selected_dbs', __('Drop'), 'b_deltbl.png');
     }
 
     if (empty($dbstats)) {