From c468705538f034e06447b85123063cdcfffc1b59 Mon Sep 17 00:00:00 2001
From: Aris Feryanto <aris_feryanto@yahoo.com>
Date: Tue, 10 May 2011 01:55:02 +0700
Subject: [PATCH] Add PMA_addRecentTable function, jQuery for recent tables
 'onchange' event

---
 Documentation.html              | 25 +++++++++++++++++++++++++
 js/navigation.js                | 10 ++++++++++
 libraries/RecentTable.class.php | 17 +++++++----------
 libraries/header.inc.php        | 26 ++++++++++++++++++--------
 navigation.php                  |  2 +-
 5 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index cee6a4211e..55bc56d0c1 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1054,6 +1054,27 @@ ALTER TABLE `pma_column_comments`
         </ul>
     </dd>
 
+    <dt id="recent">
+        <span id="cfg_Servers_recent">$cfg['Servers'][$i]['recent']</span> string
+    </dt>
+    <dd>
+        Since release ??? you can show recently used tables in the left navigation frame.
+        It helps you to jump across table directly, without the need to select the database,
+        and then select the table. Using
+        <a href="#cfg_LeftRecentTable" class="configrule">$cfg['LeftRecentTable']</a>
+        you can configure the maximum number of recent tables shown.<br/><br/>
+
+        Without configuring the storage, you can still access the recently used tables,
+        but it will disappear after you logout.<br/><br/>
+
+        To allow the usage of this functionality:
+
+        <ul>
+            <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
+            <li>put the table name in <tt>$cfg['Servers'][$i]['recent']</tt> (e.g. 'pma_recent')</li>
+        </ul>
+    </dd>
+
     <dt id="tracking">
         <span id="cfg_Servers_tracking">$cfg['Servers'][$i]['tracking']</span> string
     </dt>
@@ -1467,6 +1488,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>Defines how many sublevels should be displayed when splitting
         up tables by the above separator.</dd>
 
+    <dt id="cfg_LeftRecentTable">$cfg['LeftRecentTable'] integer</dt>
+    <dd>The maximum number of recently used tables shown in the left navigation
+        frame. Set this to 0 (zero) to disable the recent tables.</dd>
+
     <dt id="cfg_ShowTooltip">$cfg['ShowTooltip'] boolean</dt>
     <dd>Defines whether to display table comment as tool-tip in left frame or
         not.</dd>
diff --git a/js/navigation.js b/js/navigation.js
index ed6dcb1049..9403ade8d4 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -177,4 +177,14 @@ $(document).ready(function(){
     $('#clear_fast_filter').click(clear_fast_filter);
     $('#fast_filter').focus(function (evt) {evt.target.select();});
     $('#fast_filter').keyup(function (evt) {fast_filter(evt.target.value);});
+
+    /* Jump to recent table */
+    $('#recentTable').change(function() {
+        if (this.value != '') {
+            var arr = this.value.split('.');
+            window.parent.setDb(arr[0]);
+            window.parent.setTable(arr[1]);
+            window.parent.refreshMain($('#LeftDefaultTabTable')[0].value);
+        }
+    });
 });
diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php
index 387879e7a2..635b659a02 100644
--- a/libraries/RecentTable.class.php
+++ b/libraries/RecentTable.class.php
@@ -10,8 +10,7 @@ require_once './libraries/Message.class.php';
 /**
  * Handles the recently used tables.
  *
- * @TODO Add documentation about configuration LeftRecentTable
- * @TODO Add documentation about table pma_recent (#recent) in Documentation.html
+ * @TODO Change the release version in table pma_recent (#recent in Documentation.html)
  *
  * @package phpMyAdmin
  */
@@ -124,7 +123,8 @@ class RecentTable
      */
     public function trim()
     {
-        while (count($this->tables) > $GLOBALS['cfg']['LeftRecentTable']) {
+        $max = max($GLOBALS['cfg']['LeftRecentTable'], 0);
+        while (count($this->tables) > $max) {
             array_pop($this->tables);
         }
     }
@@ -137,13 +137,10 @@ class RecentTable
     public function getHtmlSelect()
     {
         $this->trim();
-        
-        $html = '<select onchange="if (this.value != \'\') {'.
-                        'arr=this.value.split(\'.\');'.
-                        'window.parent.setDb(arr[0]);'.
-                        'window.parent.setTable(arr[1]);'.
-                        'window.parent.refreshMain(\'' . $GLOBALS['cfg']['LeftDefaultTabTable'] . '\');'.
-                    '}">';
+
+        $html  = '<input type="hidden" id="LeftDefaultTabTable" value="' .
+                         $GLOBALS['cfg']['LeftDefaultTabTable'] . '" />';
+        $html .= '<select id="recentTable">';
         $html .= '<option value="">(' . __('Recent tables') . ') ...</option>';
         foreach ($this->tables as $table) {
             $html .= '<option value="' . $table . '">' . $table . '</option>';
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 3d10821782..9385b894fb 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -12,6 +12,23 @@ require_once './libraries/common.inc.php';
 require_once './libraries/RecentTable.class.php';
 
 
+/**
+ * Add recently used table and reload the navigation.
+ *
+ * @param string $db Database name where the table is located.
+ * @param string $table The table name
+ */
+function PMA_addRecentTable($db, $table) {
+    $tmp_result = RecentTable::getInstance()->add($db, $table);
+    if ($tmp_result === true) {
+        $GLOBALS['reload'] = true;
+        PMA_reloadNavigation();
+    } else {
+        $error = $tmp_result;
+        $error->display();
+    }
+}
+
 /**
  * This is not an Ajax request so we need to generate all this output.
  */
@@ -151,14 +168,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
                         } // end if
 
                         // add recently used table and reload the navigation
-                        $tmp_result = RecentTable::getInstance()->add($GLOBALS['db'], $GLOBALS['table']);
-                        if ($tmp_result === true) {
-                            $GLOBALS['reload'] = true;
-                            PMA_reloadNavigation();
-                        } else {
-                            $error = $tmp_result;
-                            $error->display();
-                        }
+                        PMA_addRecentTable($GLOBALS['db'], $GLOBALS['table']);
                     } else {
                         // no table selected, display database comment if present
                         /**
diff --git a/navigation.php b/navigation.php
index 2bff387795..6c39e52073 100644
--- a/navigation.php
+++ b/navigation.php
@@ -183,7 +183,7 @@ require './libraries/navigation_header.inc.php';
 require_once './libraries/RecentTable.class.php';
 
 // display recently used tables
-if ($GLOBALS['cfg']['LeftRecentTable'] && count(RecentTable::getInstance()->tables)) {
+if (($GLOBALS['cfg']['LeftRecentTable'] > 0) && count(RecentTable::getInstance()->tables)) {
     echo '<div id="recentTableList">';
     echo RecentTable::getInstance()->getHtmlSelect();
     echo '</div>';