common.lib.php should REALLY REALLY and ALWAYS be the first include

NenadGajic · Nov 18, 2005 · fcf387b · fcf387b
1 parent 7a56c56
commit fcf387b
Show file tree

Hide file tree

Showing 52 changed files with 46 additions and 57 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -17,6 +17,8 @@ $Source$
     * lang/english-*: small improvements
     * tbl_properties_structure.php
       - do not truncate rowcount and next autoindex
+    * /*
+      - common.lib.php should REALLY REALLY and ALWAYS be the first include
 
 2005-11-17 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html: patch #1353283, thanks to Isaac Bennetch

diff --git a/calendar.php b/calendar.php
@@ -1,7 +1,6 @@
 <?php
 /* $Id$ */
 
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 require_once('./libraries/header_http.inc.php');
 $page_title = $strCalendar;

diff --git a/chk_rel.php b/chk_rel.php
@@ -6,7 +6,6 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 require_once('./db_details_common.php');
 require_once('./libraries/relation.lib.php');

diff --git a/db_create.php b/db_create.php
@@ -6,10 +6,9 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/grab_globals.lib.php');
+require_once('./libraries/common.lib.php');
 $js_to_run = 'functions.js';
 require_once('./header.inc.php');
-require_once('./libraries/common.lib.php');
 require_once('./libraries/mysql_charsets.lib.php');
 
 

diff --git a/db_datadict.php b/db_datadict.php
@@ -5,8 +5,9 @@
 /**
  * Gets the variables sent or posted to this script, then displays headers
  */
+require_once('./libraries/common.lib.php');
+
 if (!isset($selected_tbl)) {
-    require_once('./libraries/grab_globals.lib.php');
     require_once('./header.inc.php');
 }
 

diff --git a/db_details.php b/db_details.php
@@ -2,6 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Runs common work

diff --git a/db_details_export.php b/db_details_export.php
@@ -13,6 +13,8 @@
 /**
  * Gets some core libraries
  */
+require_once('./libraries/common.lib.php');
+
 $sub_part  = '_export';
 require_once('./db_details_common.php');
 $url_query .= '&amp;goto=db_details_export.php';

diff --git a/db_details_importdocsql.php b/db_details_importdocsql.php
@@ -2,6 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * This script imports relation infos from docSQL (www.databay.de)
@@ -13,13 +14,8 @@
  * the headers
  */
 require_once('./libraries/read_dump.lib.php');
-require_once('./libraries/grab_globals.lib.php');
 require_once('./header.inc.php');
 
-//require common added for string importing - Robbat2, 15 January 2003 9.34PM
-//all hardcoded strings converted by Robbat2, 15 January 2003 9.34PM
-require_once('./libraries/common.lib.php');
-
 // Check parameters
 PMA_checkParameters(array('db'));
 

diff --git a/db_details_links.php b/db_details_links.php
@@ -2,6 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * If coming from a Show MySQL link on the home page,

diff --git a/db_details_qbe.php b/db_details_qbe.php
@@ -2,12 +2,10 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
-
 /**
  * Get the values of the variables posted or sent to this script and display
  * the headers
  */
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 require_once('./libraries/relation.lib.php');
 

diff --git a/db_import.php b/db_import.php
@@ -2,6 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Gets tables informations and displays top links

diff --git a/db_operations.php b/db_operations.php
@@ -2,7 +2,6 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 require_once('./libraries/mysql_charsets.lib.php');
 /**

diff --git a/db_printview.php b/db_printview.php
@@ -2,16 +2,14 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Gets the variables sent or posted to this script, then displays headers
  */
-require_once('./libraries/grab_globals.lib.php');
 $print_view = TRUE;
 require_once('./header.inc.php');
 
-// Check parameters
-require_once('./libraries/common.lib.php');
 
 PMA_checkParameters(array('db'));
 

diff --git a/db_search.php b/db_search.php
@@ -5,6 +5,7 @@
  * Credits for this script goes to Thomas Chaumeny <chaume92 at aol.com>
  */
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Gets some core libraries and send headers

diff --git a/export.php b/export.php
@@ -5,7 +5,6 @@
 /**
  * Get the variables sent or posted to this script and a core script
  */
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 require_once('./libraries/zip.lib.php');
 

diff --git a/header.inc.php b/header.inc.php
@@ -2,6 +2,8 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
+
 if (empty($GLOBALS['is_header_sent'])) {
 
     /**

diff --git a/import.php b/import.php
@@ -7,9 +7,8 @@
 /**
  * Get the variables sent or posted to this script and a core script
  */
-require_once('./libraries/grab_globals.lib.php');
-$js_to_run = 'functions.js';
 require_once('./libraries/common.lib.php');
+$js_to_run = 'functions.js';
 
 // Are we just executing plain query or sql file? (eg. non import, but query box/window run)
 if (!empty($sql_query)) {

diff --git a/index.php b/index.php
@@ -38,7 +38,6 @@
 /**
  * Gets core libraries and defines some variables
  */
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 /**
  * Includes the ThemeManager if it hasn't been included yet

diff --git a/pdf_pages.php b/pdf_pages.php
@@ -5,7 +5,6 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 require_once('./db_details_common.php');
 

diff --git a/pdf_schema.php b/pdf_schema.php
@@ -10,7 +10,6 @@
 /**
  * Gets some core scripts
  */
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 
 

diff --git a/phpinfo.php b/phpinfo.php
@@ -6,7 +6,6 @@
 /**
  * Gets core libraries and defines some variables
  */
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 
 

diff --git a/querywindow.php b/querywindow.php
@@ -2,12 +2,12 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Gets the variables sent to this script, retains the db name that may have
  * been defined as startup option and include a core library
  */
-require_once('./libraries/grab_globals.lib.php');
 if (!empty($db)) {
     $db_start = $db;
 }
@@ -16,7 +16,6 @@
 /**
  * Gets a core script and starts output buffering work
  */
-require_once('./libraries/common.lib.php');
 require_once './libraries/sql_query_form.lib.php';
 require_once('./libraries/ob.lib.php');
 if ( $GLOBALS['cfg']['OBGzip'] ) {

diff --git a/server_binlog.php b/server_binlog.php
@@ -2,6 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Does the common work

diff --git a/server_collations.php b/server_collations.php
@@ -2,6 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Does the common work

diff --git a/server_common.inc.php b/server_common.inc.php
@@ -5,7 +5,6 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 
 /**

diff --git a/server_engines.php b/server_engines.php
@@ -2,6 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Does the common work

diff --git a/server_export.php b/server_export.php
@@ -2,19 +2,12 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
-
-/**
- * Checks if the left frame has to be reloaded
- */
-require_once('./libraries/grab_globals.lib.php');
-
-
 /**
  * Does the common work
  */
-$js_to_run = 'functions.js';
-require('./server_common.inc.php');
+require_once('./libraries/common.lib.php');
 
+$js_to_run = 'functions.js';
 
 /**
  * Displays the links

diff --git a/server_import.php b/server_import.php
@@ -2,6 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Does the common work

diff --git a/server_privileges.php b/server_privileges.php
@@ -2,6 +2,8 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
+
 /**
  * Does the common work
  */

diff --git a/server_processlist.php b/server_processlist.php
@@ -2,6 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Does the common work

diff --git a/server_sql.php b/server_sql.php
@@ -2,10 +2,12 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Does the common work
  */
+$js_to_run = 'functions.js';
 require_once './server_common.inc.php';
 require_once './libraries/sql_query_form.lib.php';
 

diff --git a/server_status.php b/server_status.php
@@ -6,6 +6,8 @@
  *  + reset status vriales
  */
 
+require_once('./libraries/common.lib.php');
+
 /**
  * Does the common work
  */

diff --git a/server_variables.php b/server_variables.php
@@ -2,6 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Does the common work

diff --git a/tbl_addfield.php b/tbl_addfield.php
@@ -5,7 +5,8 @@
 /**
  * Get some core libraries
  */
-require_once('./libraries/grab_globals.lib.php');
+require_once('./libraries/common.lib.php');
+
 $js_to_run = 'functions.js';
 require_once('./header.inc.php');
 

diff --git a/tbl_alter.php b/tbl_alter.php
@@ -5,7 +5,8 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/grab_globals.lib.php');
+require_once('./libraries/common.lib.php');
+
 $js_to_run = 'functions.js';
 require_once('./header.inc.php');
 

diff --git a/tbl_change.php b/tbl_change.php
@@ -5,7 +5,8 @@
 /**
  * Get the variables sent or posted to this script and displays the header
  */
-require_once('./libraries/grab_globals.lib.php');
+require_once('./libraries/common.lib.php');
+
 $js_to_run = 'tbl_change.js';
 require_once('./header.inc.php');
 require_once('./libraries/relation.lib.php'); // foreign keys

diff --git a/tbl_create.php b/tbl_create.php
@@ -5,11 +5,10 @@
 /**
  * Get some core libraries
  */
-require_once('./libraries/grab_globals.lib.php');
-$js_to_run = 'functions.js';
-
 require_once('./libraries/common.lib.php');
 
+$js_to_run = 'functions.js';
+
 if (isset($table)) {
     $table = PMA_sanitize($table);
 }

diff --git a/tbl_import.php b/tbl_import.php
@@ -2,6 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+require_once('./libraries/common.lib.php');
 
 /**
  * Gets tables informations and displays top links
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
      * Credits for this script goes to Thomas Chaumeny <chaume92 at aol.com>
      */
+    require_once('./libraries/common.lib.php');
     /**
      * Gets some core libraries and send headers
@@ Expand Down @@