refactor server_databases: add function for drop multiple databases

2 files changed, 56 insertions, 43 deletions

diff --git a/libraries/server_databases.lib.php b/libraries/server_databases.lib.php
index 25c4b5de81..7dc451b67a 100644
--- a/libraries/server_databases.lib.php
+++ b/libraries/server_databases.lib.php
@@ -449,4 +449,59 @@ function PMA_getListForSortDatabase()
     return array($sort_by, $sort_order);
 }
 
+/**
+ * Deal with Drops multiple databases
+ *
+ * @return null
+ */
+function PMA_dropMultiDatabases()
+{
+    if (! isset($_REQUEST['selected_dbs']) && ! isset($_REQUEST['query_type'])) {
+        $message = PMA_Message::error(__('No databases selected.'));
+    } else {
+        $action = 'server_databases.php';
+        $submit_mult = 'drop_db';
+        $err_url = 'server_databases.php?' . PMA_URL_getCommon();
+        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']);
+        }
+        //the following variables will be used on mult_submits.inc.php
+        global $query_type, $selected, $mult_btn;
+        
+        include 'libraries/mult_submits.inc.php';
+        unset($action, $submit_mult, $err_url, $selected_db, $GLOBALS['db']);
+        if (empty($message)) {
+            if ($mult_btn == __('Yes')) {
+                $number_of_databases = count($selected);
+            } else {
+                $number_of_databases = 0;
+            }
+            $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) {
+        $response = PMA_Response::getInstance();
+        $response->isSuccess($message->isSuccess());
+        $response->addJSON('message', $message);
+        exit;
+    }
+}
+
 ?>
diff --git a/server_databases.php b/server_databases.php
index 30d9f94e6b..4ecc5938fb 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -58,49 +58,7 @@ if (isset($_REQUEST['drop_selected_dbs_x'])) {
 if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
     && ($is_superuser || $cfg['AllowUserDropDatabase'])
 ) {
-    if (! isset($_REQUEST['selected_dbs']) && ! isset($_REQUEST['query_type'])) {
-        $message = PMA_Message::error(__('No databases selected.'));
-    } else {
-        $action = 'server_databases.php';
-        $submit_mult = 'drop_db';
-        $err_url = 'server_databases.php?' . PMA_URL_getCommon();
-        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)) {
-            if ($mult_btn == __('Yes')) {
-                $number_of_databases = count($selected);
-            } else {
-                $number_of_databases = 0;
-            }
-            $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) {
-        $response = PMA_Response::getInstance();
-        $response->isSuccess($message->isSuccess());
-        $response->addJSON('message', $message);
-        exit;
-    }
+    PMA_dropMultiDatabases();
 }
 
 /**