Dropped server_links.inc.php

sfobiwahn · May 5, 2012 · 7b85c70 · 7b85c70
1 parent 7245a3b
commit 7b85c70
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 98 deletions.
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
@@ -154,7 +154,6 @@
         include './libraries/db_info.inc.php';
     } else {
         include_once './libraries/server_common.inc.php';
-        include_once './libraries/server_links.inc.php';
     }
 
     // Builds the query

diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php
@@ -53,4 +53,6 @@
 $binary_logs = PMA_DRIZZLE
     ? null
     : PMA_DBI_fetch_result('SHOW MASTER LOGS', 'Log_name', null, null, PMA_DBI_QUERY_STORE);
+
+PMA_checkParameters(array('is_superuser', 'url_query'), false);
 ?>
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
@@ -8,10 +8,6 @@
 if (!defined('PHPMYADMIN')) {
     exit;
 }
-
-// show server tabs
-require './libraries/server_links.inc.php';
-
 // build user preferences menu
 
 $form_param = filter_input(INPUT_GET, 'form');

diff --git a/main.php b/main.php
@@ -41,7 +41,6 @@
 if ($server > 0) {
     include 'libraries/server_common.inc.php';
     include 'libraries/StorageEngine.class.php';
-    include 'libraries/server_links.inc.php';
 
     // Use the verbose name of the server instead of the hostname
     // if a value is set

diff --git a/server_binlog.php b/server_binlog.php
@@ -16,11 +16,6 @@
  */
 require_once 'libraries/server_common.inc.php';
 
-/**
- * Displays the links
- */
-require_once 'libraries/server_links.inc.php';
-
 $url_params = array();
 
 /**

diff --git a/server_collations.php b/server_collations.php
@@ -16,12 +16,6 @@
 require 'libraries/server_common.inc.php';
 
 
-/**
- * Displays the links
- */
-require 'libraries/server_links.inc.php';
-
-
 /**
  * Displays the sub-page heading
  */

diff --git a/server_databases.php b/server_databases.php
@@ -120,12 +120,6 @@
     }
 }
 
-/**
- * Displays the links
- */
-require 'libraries/server_links.inc.php';
-
-
 /**
  * Displays the sub-page heading
  */

diff --git a/server_engines.php b/server_engines.php
@@ -17,12 +17,6 @@
 require 'libraries/server_common.inc.php';
 require 'libraries/StorageEngine.class.php';
 
-
-/**
- * Displays the links
- */
-require 'libraries/server_links.inc.php';
-
 /**
  * Did the user request information about a certain storage engine?
  */

diff --git a/server_export.php b/server_export.php
@@ -9,14 +9,10 @@
  * Does the common work
  */
 require_once 'libraries/common.inc.php';
+require 'libraries/server_common.inc.php';
 
 $GLOBALS['js_include'][] = 'export.js';
 
-/**
- * Displays the links
- */
-require 'libraries/server_links.inc.php';
-
 $export_page_title = __('View dump (schema) of databases') . "\n";
 $checkall_url = 'server_export.php?'
               . PMA_generate_common_url()

diff --git a/server_import.php b/server_import.php
@@ -17,12 +17,6 @@
  */
 require 'libraries/server_common.inc.php';
 
-
-/**
- * Displays the links
- */
-require 'libraries/server_links.inc.php';
-
 $import_type = 'server';
 require 'libraries/display_import.lib.php';
 /**

diff --git a/server_plugins.php b/server_plugins.php
@@ -22,12 +22,6 @@
  */
 require 'libraries/server_common.inc.php';
 
-
-/**
- * Displays the links
- */
-require 'libraries/server_links.inc.php';
-
 /**
  * Displays the sub-page heading
  */

diff --git a/server_privileges.php b/server_privileges.php
@@ -173,7 +173,7 @@
  * Checks if the user is allowed to do what he tries to...
  */
 if (! $is_superuser) {
-    include 'libraries/server_links.inc.php';
+    include 'libraries/header.inc.php';
     echo '<h2>' . "\n"
        . PMA_getIcon('b_usrlist.png')
        . __('Privileges') . "\n"
@@ -1656,7 +1656,10 @@ function PMA_getGrants($user, $host)
     include 'libraries/db_info.inc.php';
     echo "\n";
 } else {
-    include 'libraries/server_links.inc.php';
+    if (! empty($GLOBALS['message'])) {
+        PMA_showMessage($GLOBALS['message']);
+        unset($GLOBALS['message']);
+    }
 }
 
 

diff --git a/server_replication.php b/server_replication.php
@@ -25,7 +25,7 @@
  * Checks if the user is allowed to do what he tries to...
  */
 if (! $is_superuser) {
-    include 'libraries/server_links.inc.php';
+    include 'libraries/header.inc.php';
     echo '<h2>' . "\n"
         . PMA_getIcon('s_replication.png')
         . __('Replication') . "\n"
@@ -181,10 +181,7 @@
     }
     unset($refresh);
 }
-/**
- * Displays the links
- */
-require 'libraries/server_links.inc.php';
+
 
 echo '<div id="replication">';
 echo ' <h2>';

diff --git a/server_sql.php b/server_sql.php
@@ -20,13 +20,6 @@
 require_once 'libraries/server_common.inc.php';
 require_once 'libraries/sql_query_form.lib.php';
 
-
-/**
- * Displays the links
- */
-require 'libraries/server_links.inc.php';
-
-
 /**
  * Query box, bookmark, insert data from textfile
  */

diff --git a/server_status.php b/server_status.php
@@ -772,13 +772,6 @@
  */
 require 'libraries/server_common.inc.php';
 
-
-
-/**
- * Displays the links
- */
-require 'libraries/server_links.inc.php';
-
 ?>
 <div id="serverstatus">
     <h2><?php

diff --git a/server_synchronize.php b/server_synchronize.php
@@ -27,11 +27,6 @@
  */
 @set_time_limit($cfg['ExecTimeLimit']);
 
-/**
- * Displays the links
- */
-require 'libraries/server_links.inc.php';
-
 /**
 * Enables warnings on the page
 */

diff --git a/server_variables.php b/server_variables.php
@@ -96,12 +96,6 @@
     }
 }
 
-/**
- * Displays the links
- */
-require 'libraries/server_links.inc.php';
-
-
 /**
  * Displays the sub-page heading
  */

diff --git a/sql.php b/sql.php
@@ -929,7 +929,6 @@
                 include 'libraries/db_info.inc.php';
             } else {
                 include 'libraries/server_common.inc.php';
-                include 'libraries/server_links.inc.php';
             }
         } else {
             include_once 'libraries/header.inc.php';

diff --git a/tbl_chart.php b/tbl_chart.php
@@ -39,7 +39,6 @@
     $url_params['goto'] = $cfg['DefaultTabServer'];
     $url_params['back'] = 'sql.php';
     include 'libraries/server_common.inc.php';
-    include 'libraries/server_links.inc.php';
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,12 +120,6 @@ @@
         }
     }
-    /**
-     * Displays the links
-     */
-    require 'libraries/server_links.inc.php';
     /**
      * Displays the sub-page heading
      */
@@ Expand Down @@