From 44301dd2502a409be99dfa34185bcef94d0fbae7 Mon Sep 17 00:00:00 2001
From: Rouslan <roccivic@roccivic-pc.(none)>
Date: Sat, 21 May 2011 17:43:19 +0100
Subject: [PATCH] Added new tabs for Routines, Triggers and Events

---
 libraries/db_links.inc.php  | 20 ++++++++++++++++++++
 libraries/tbl_links.inc.php | 18 ++++++++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index 7eaf343a4e..8bbb6a9f57 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -93,6 +93,17 @@ if (! $db_is_information_schema) {
         $tab_privileges['text'] = __('Privileges');
         $tab_privileges['icon'] = 's_rights.png';
     }
+    $tab_routines['link']   = 'db_routines.php';
+    $tab_routines['text']   = __('Routines');
+    $tab_routines['icon']   = 'b_routines.png';
+
+    $tab_events['link']     = 'db_events.php';
+    $tab_events['text']     = __('Events');
+    $tab_events['icon']     = 'b_events.png';
+
+    $tab_triggers['link']   = 'db_triggers.php';
+    $tab_triggers['text']   = __('Triggers');
+    $tab_triggers['icon']   = 'b_triggers.png';
 }
 
 /**
@@ -110,6 +121,15 @@ if (! $db_is_information_schema) {
     if ($is_superuser) {
         $tabs[] =& $tab_privileges;
     }
+    if (PMA_MYSQL_INT_VERSION >= 50002) {
+        $tabs[] =& $tab_routines;
+    }
+    if (PMA_MYSQL_INT_VERSION >= 50106) {
+        $tabs[] =& $tab_events;
+    }
+    if (PMA_MYSQL_INT_VERSION >= 50002) {
+        $tabs[] =& $tab_triggers;
+    }
 }
 if (PMA_Tracker::isActive()) {
     $tabs[] =& $tab_tracking;
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index e31dd5305f..1a09a577ee 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -39,6 +39,13 @@ $err_url   = $cfg['DefaultTabTable'] . PMA_generate_common_url($url_params);
  */
 require_once './libraries/header.inc.php';
 
+/**
+ * Ensure that $db_is_information_schema is not null
+ */
+if (! isset($db_is_information_schema)) {
+    $db_is_information_schema = false;
+}
+
 /**
  * Displays links
  */
@@ -61,7 +68,7 @@ $tabs['search']['icon'] = 'b_search.png';
 $tabs['search']['text'] = __('Search');
 $tabs['search']['link'] = 'tbl_select.php';
 
-if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
+if (!$db_is_information_schema) {
     $tabs['insert']['icon'] = 'b_insrow.png';
     $tabs['insert']['link'] = 'tbl_change.php';
     $tabs['insert']['text'] = __('Insert');
@@ -76,7 +83,7 @@ $tabs['export']['text'] = __('Export');
  * Don't display "Import" and "Operations"
  * for views and information_schema
  */
-if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_schema)) {
+if (! $tbl_is_view && !$db_is_information_schema) {
     $tabs['import']['icon'] = 'b_tblimport.png';
     $tabs['import']['link'] = 'tbl_import.php';
     $tabs['import']['text'] = __('Import');
@@ -90,13 +97,16 @@ if(PMA_Tracker::isActive()) {
     $tabs['tracking']['text'] = __('Tracking');
     $tabs['tracking']['link'] = 'tbl_tracking.php';
 }
-if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_schema)) {
+if (! $db_is_information_schema && PMA_MYSQL_INT_VERSION >= 50002) {
+    $tabs['triggers']['link'] = 'tbl_triggers.php';
+    $tabs['triggers']['text'] = __('Triggers');
+    $tabs['triggers']['icon'] = 'b_triggers.png';
 }
 
 /**
  * Views support a limited number of operations
  */
-if ($tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_schema)) {
+if ($tbl_is_view && !$db_is_information_schema) {
     $tabs['operation']['icon'] = 'b_tblops.png';
     $tabs['operation']['link'] = 'view_operations.php';
     $tabs['operation']['text'] = __('Operations');