From 48a95cb47936f0bb06b9b7d1728045889af19889 Mon Sep 17 00:00:00 2001
From: Thilanka Kaushalya <lgtkaushalya@gmail.com>
Date: Sun, 7 Aug 2011 16:19:14 +0530
Subject: [PATCH 1/4] Ajaxify table maintenance in table operations

---
 js/functions.js    | 41 +++++++++++++++++++++++++++++++++++------
 sql.php            |  7 +++++++
 tbl_operations.php |  2 +-
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index bc94a89610..84181567ba 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1964,7 +1964,7 @@ $(document).ready(function() {
     **/
     $("#alterTableOrderby.ajax").live('submit', function(event) {
         event.preventDefault();
-        $form = $(this);
+        var $form = $(this);
 
         PMA_prepareForAjaxRequest($form);
         /*variables which stores the common attributes*/
@@ -1982,9 +1982,9 @@ $(document).ready(function() {
                 $("#result_query .notice").remove();
                 $("#result_query").prepend((data.message));
             } else {
-                $temp_div = $("<div id='temp_div'></div>")
+                var $temp_div = $("<div id='temp_div'></div>")
                 $temp_div.html(data.error);
-                $error = $temp_div.find("code").addClass("error");
+                var $error = $temp_div.find("code").addClass("error");
                 PMA_ajaxShowMessage($error);
             }
         }) // end $.post()
@@ -1995,7 +1995,7 @@ $(document).ready(function() {
     **/
     $("#copyTable.ajax input[name='submit_copy']").live('click', function(event) {
         event.preventDefault();
-        $form = $("#copyTable");
+        var $form = $("#copyTable");
         if($form.find("input[name='switch_to_new']").attr('checked')) {
             $form.append('<input type="hidden" name="submit_copy" value="Go" />');
             $form.removeClass('ajax');
@@ -2024,15 +2024,44 @@ $(document).ready(function() {
                         window.parent.frame_navigation.location.reload();
                     }
                 } else {
-                    $temp_div = $("<div id='temp_div'></div>")
+                    var $temp_div = $("<div id='temp_div'></div>");
                     $temp_div.html(data.error);
-                    $error = $temp_div.find("code").addClass("error");
+                    var $error = $temp_div.find("code").addClass("error");
                     PMA_ajaxShowMessage($error);
                 }
             }) // end $.post()
         }
     });//end of copyTable ajax submit
 
+    /**
+     *Ajax events for actions in the "Table maintenance"
+    **/
+    $("#tbl_maintenance.ajax li").live('click', function(event) {
+        event.preventDefault();
+        var $link = $(this);
+        var href = $link.find("a").first().attr("href");
+        href = href.split('?');
+        //variables which stores the common attributes
+        $.post(href[0], href[1]+"&ajax_request=true", function(data) {
+            if ($("#sqlqueryresults").length != 0) {
+                $("#sqlqueryresults").remove();
+            }
+            if ($("#result_query").length != 0) {
+                $("#result_query").remove();
+            }
+            if (data.success == true) {
+                PMA_ajaxShowMessage(data.message);
+                $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer");
+                $("#sqlqueryresults").html(data.sql_query);
+            } else {
+                var $temp_div = $("<div id='temp_div'></div>")
+                $temp_div.html(data.error);
+                var $error = $temp_div.find("code").addClass("error");
+                PMA_ajaxShowMessage($error);
+            }
+        }) // end $.post()
+    });//end of table maintanance ajax click
+
 }, 'top.frame_content'); //end $(document).ready for 'Table operations'
 
 
diff --git a/sql.php b/sql.php
index 94a0b0d1e5..5af92914df 100644
--- a/sql.php
+++ b/sql.php
@@ -866,6 +866,13 @@ else {
         PMA_ajaxResponse(NULL, true, $extra_data);
     }
 
+    if (isset($_REQUEST['ajax_request']) && isset($_REQUEST['table_maintenance'])) {
+        echo $show_query;
+        $message = PMA_Message::success($message);
+        $extra_data['sql_query'] = PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
+        PMA_ajaxResponse($message,$message->isSuccess(),$extra_data);
+    }
+
     // Displays the headers
     if (isset($show_query)) {
         unset($show_query);
diff --git a/tbl_operations.php b/tbl_operations.php
index 3e9bdebc4d..90e2fd4ca4 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -598,7 +598,7 @@ if (isset($possible_row_formats[$tbl_type])) {
 <fieldset>
  <legend><?php echo __('Table maintenance'); ?></legend>
 
-<ul>
+<ul id="tbl_maintenance" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?>>
 <?php
 // Note: BERKELEY (BDB) is no longer supported, starting with MySQL 5.1
 if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {

From 3fdf5dd2ea03fafcf37308e85a72b6427a043924 Mon Sep 17 00:00:00 2001
From: Thilanka Kaushalya <lgtkaushalya@gmail.com>
Date: Mon, 8 Aug 2011 09:24:38 +0530
Subject: [PATCH 2/4] Changed the logic of truncate table in table operations

---
 js/functions.js    | 29 +++++++++++++++++++++--------
 tbl_operations.php |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index f79d19dcdc..9fba964cac 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3012,7 +3012,7 @@ $(document).ready(function() {
     $("#drop_tbl_anchor").live('click', function(event) {
         event.preventDefault();
 
-        //context is top.frame_content, so we need to use window.parent.db to access the db var
+        //context is top.frame_content, so we need to use window.parent.table to access the table var
         /**
          * @var question    String containing the question to be asked for confirmation
          */
@@ -3040,10 +3040,10 @@ $(document).ready(function() {
  * @see $cfg['AjaxEnable']
  */
 $(document).ready(function() {
-    $("#truncate_tbl_anchor").live('click', function(event) {
+    $("#truncate_tbl_anchor.ajax").live('click', function(event) {
         event.preventDefault();
 
-        //context is top.frame_content, so we need to use window.parent.db to access the db var
+      //context is top.frame_content, so we need to use window.parent.table to access the table var
         /**
          * @var question    String containing the question to be asked for confirmation
          */
@@ -3053,13 +3053,26 @@ $(document).ready(function() {
 
             PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
             $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) {
-                //Database deleted successfully, refresh both the frames
-                window.parent.refreshNavigation();
-                window.parent.refreshMain();
+                if ($("#sqlqueryresults").length != 0) {
+                    $("#sqlqueryresults").remove();
+                }
+                if ($("#result_query").length != 0) {
+                    $("#result_query").remove();
+                }
+                if (data.success == true) {
+                    PMA_ajaxShowMessage(data.message);
+                    $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer");
+                    $("#sqlqueryresults").html(data.sql_query);
+                } else {
+                    var $temp_div = $("<div id='temp_div'></div>")
+                    $temp_div.html(data.error);
+                    var $error = $temp_div.find("code").addClass("error");
+                    PMA_ajaxShowMessage($error);
+                }
             }) // end $.get()
         }); // end $.PMA_confirm()
-    }); //end of Drop Table Ajax action
-}) // end of $(document).ready() for Drop Table
+    }); //end of Truncate Table Ajax action
+}) // end of $(document).ready() for Truncate Table
 
 /**
  * Attach CodeMirror2 editor to SQL edit area.
diff --git a/tbl_operations.php b/tbl_operations.php
index f4216b7015..7972ebd498 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -692,7 +692,7 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_
             'message_to_show' => sprintf(__('Table %s has been emptied'), htmlspecialchars($table)),
         ));
     ?>
-    <li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'id="truncate_tbl_anchor"' : ''); ?>>
+    <li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'id="truncate_tbl_anchor" class="ajax"' : ''); ?>>
             <?php echo __('Empty the table (TRUNCATE)'); ?></a>
         <?php echo PMA_showMySQLDocu('SQL-Syntax', 'TRUNCATE_TABLE'); ?>
     </li>

From 6b3f10523e1b00a072fd2a6ad24aeb86dc534bca Mon Sep 17 00:00:00 2001
From: Thilanka Kaushalya <lgtkaushalya@gmail.com>
Date: Fri, 12 Aug 2011 22:47:23 +0530
Subject: [PATCH 3/4] Added table results for actions in Table maintenance in
 Table options

---
 js/functions.js | 27 ++++++++++++++++++---------
 sql.php         | 27 ++++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 9fba964cac..d1818bd5a7 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2069,20 +2069,29 @@ $(document).ready(function() {
         var $link = $(this);
         var href = $link.find("a").first().attr("href");
         href = href.split('?');
+        if ($("#sqlqueryresults").length != 0) {
+            $("#sqlqueryresults").remove();
+        }
+        if ($("#result_query").length != 0) {
+            $("#result_query").remove();
+        }
         //variables which stores the common attributes
         $.post(href[0], href[1]+"&ajax_request=true", function(data) {
-            if ($("#sqlqueryresults").length != 0) {
-                $("#sqlqueryresults").remove();
-            }
-            if ($("#result_query").length != 0) {
-                $("#result_query").remove();
-            }
-            if (data.success == true) {
+            if (data.success == undefined) {
+                var $temp_div = $("<div id='temp_div'></div>");
+                $temp_div.html(data);
+                var $success = $temp_div.find("#result_query .success");
+                PMA_ajaxShowMessage($success);
+                $("<div id='sqlqueryresults' class='ajax'></div>").insertAfter("#topmenucontainer");
+                $("#sqlqueryresults").html(data);
+                PMA_init_slider();
+                $("#sqlqueryresults").children("fieldset").remove();
+            } else if (data.success == true ) {
                 PMA_ajaxShowMessage(data.message);
-                $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer");
+                $("<div id='sqlqueryresults' class='ajax'></div>").insertAfter("#topmenucontainer");
                 $("#sqlqueryresults").html(data.sql_query);
             } else {
-                var $temp_div = $("<div id='temp_div'></div>")
+                var $temp_div = $("<div id='temp_div'></div>");
                 $temp_div.html(data.error);
                 var $error = $temp_div.find("code").addClass("error");
                 PMA_ajaxShowMessage($error);
diff --git a/sql.php b/sql.php
index d629860c18..d46d0645cb 100644
--- a/sql.php
+++ b/sql.php
@@ -867,10 +867,31 @@ else {
     }
 
     if (isset($_REQUEST['ajax_request']) && isset($_REQUEST['table_maintenance'])) {
-        echo $show_query;
+        $GLOBALS['js_include'][] = 'functions.js';
+        $GLOBALS['js_include'][] = 'makegrid.js';
+        $GLOBALS['js_include'][] = 'sql.js';
+        
+        // Gets the list of fields properties
+        if (isset($result) && $result) {
+            $fields_meta = PMA_DBI_get_fields_meta($result);
+            $fields_cnt  = count($fields_meta);
+        }
+
+        if (empty($disp_mode)) {
+            // see the "PMA_setDisplayMode()" function in
+            // libraries/display_tbl.lib.php
+            $disp_mode = 'urdr111101';
+        }
+
+        // hide edit and delete links for information_schema
+        if ($db == 'information_schema') {
+            $disp_mode = 'nnnn110111';
+        }
+        
         $message = PMA_Message::success($message);
-        $extra_data['sql_query'] = PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
-        PMA_ajaxResponse($message,$message->isSuccess(),$extra_data);
+        echo PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
+        PMA_displayTable($result, $disp_mode, $analyzed_sql);
+        exit();
     }
 
     // Displays the headers

From 90c010f9ca0dd52ce322c133f84b5321c2f40264 Mon Sep 17 00:00:00 2001
From: Thilanka Kaushalya <lgtkaushalya@gmail.com>
Date: Sat, 13 Aug 2011 07:00:50 +0530
Subject: [PATCH 4/4] Fixed the issue of not showing the Docuemnts

---
 js/functions.js    |  4 ++--
 tbl_operations.php | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 8115ae8ec5..ee83b8acfd 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2064,10 +2064,10 @@ $(document).ready(function() {
     /**
      *Ajax events for actions in the "Table maintenance"
     **/
-    $("#tbl_maintenance.ajax li").live('click', function(event) {
+    $("#tbl_maintenance.ajax li a.maintain_action").live('click', function(event) {
         event.preventDefault();
         var $link = $(this);
-        var href = $link.find("a").first().attr("href");
+        var href = $link.attr("href");
         href = href.split('?');
         if ($("#sqlqueryresults").length != 0) {
             $("#sqlqueryresults").remove();
diff --git a/tbl_operations.php b/tbl_operations.php
index 7972ebd498..3e536c2f92 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -604,7 +604,7 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
                 'table_maintenance' => 'Go',
                 ));
         ?>
-    <li><a href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
+    <li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
             <?php echo __('Check table'); ?></a>
         <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'CHECK_TABLE'); ?>
     </li>
@@ -614,7 +614,7 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
         $this_url_params = array_merge($url_params,
             array('sql_query' => 'ALTER TABLE ' . PMA_backquote($GLOBALS['table']) . ' ENGINE = InnoDB'));
         ?>
-    <li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>">
+    <li><a class='maintain_action' href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>">
             <?php echo __('Defragment table'); ?></a>
         <?php echo PMA_showMySQLDocu('Table_types', 'InnoDB_File_Defragmenting'); ?>
     </li>
@@ -627,7 +627,7 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
                 'table_maintenance' => 'Go',
                 ));
         ?>
-    <li><a href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
+    <li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
             <?php echo __('Analyze table'); ?></a>
         <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'ANALYZE_TABLE');?>
     </li>
@@ -640,7 +640,7 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
                 'table_maintenance' => 'Go',
                 ));
         ?>
-    <li><a href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
+    <li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
             <?php echo __('Repair table'); ?></a>
         <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'REPAIR_TABLE'); ?>
     </li>
@@ -653,7 +653,7 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
                 'table_maintenance' => 'Go',
                 ));
         ?>
-    <li><a href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
+    <li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
             <?php echo __('Optimize table'); ?></a>
         <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'OPTIMIZE_TABLE'); ?>
     </li>
@@ -668,7 +668,7 @@ $this_url_params = array_merge($url_params,
         'reload'    => 1,
         ));
 ?>
-    <li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>">
+    <li><a class='maintain_action' href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>">
             <?php echo __('Flush the table (FLUSH)'); ?></a>
         <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'FLUSH'); ?>
     </li>