Move server_{links,common}.inc.php to libraries folder as it does not…

… require direct access.
NenadGajic · Nov 24, 2005 · 66aa9d2 · 66aa9d2
1 parent f5f7fc3
commit 66aa9d2
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 25 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -14,6 +14,9 @@ $Source$
       tbl_row_action.php, libraries/mult_submits.inc.php: Move
       mult_submits.inc.php to libraries folder as it does not require direct
       access.
+    * server_*, sql.php, libraries/server_common.inc.php,
+      libraries/server_links.inc.php: Move server_{links,common}.inc.php to
+      libraries folder as it does not require direct access.
 
 2005-11-24 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * themes/original/*, css/phpmyadmin.css.php:

diff --git a/server_common.inc.php → libraries/server_common.inc.php b/server_common.inc.php → libraries/server_common.inc.php
diff --git a/server_links.inc.php → libraries/server_links.inc.php b/server_links.inc.php → libraries/server_links.inc.php
@@ -5,7 +5,7 @@
 // Check parameters
 
 require_once('./libraries/common.lib.php');
-require_once('./server_common.inc.php');
+require_once('./libraries/server_common.inc.php');
 
 PMA_checkParameters(array('is_superuser', 'url_query'), TRUE, FALSE);
 

diff --git a/server_binlog.php b/server_binlog.php
@@ -7,13 +7,13 @@
 /**
  * Does the common work
  */
-require_once('./server_common.inc.php');
+require_once('./libraries/server_common.inc.php');
 
 
 /**
  * Displays the links
  */
-require('./server_links.inc.php');
+require('./libraries/server_links.inc.php');
 
 
 /**

diff --git a/server_collations.php b/server_collations.php
@@ -7,13 +7,13 @@
 /**
  * Does the common work
  */
-require('./server_common.inc.php');
+require('./libraries/server_common.inc.php');
 
 
 /**
  * Displays the links
  */
-require('./server_links.inc.php');
+require('./libraries/server_links.inc.php');
 
 
 /**

diff --git a/server_databases.php b/server_databases.php
@@ -9,7 +9,7 @@
 
 
 $js_to_run = 'functions.js';
-require('./server_common.inc.php');
+require('./libraries/server_common.inc.php');
 
 /**
  * Sorts the databases array according to the user's choice
@@ -85,7 +85,7 @@ function PMA_dbCmp($a, $b) {
 /**
  * Displays the links
  */
-require('./server_links.inc.php');
+require('./libraries/server_links.inc.php');
 
 
 /**

diff --git a/server_engines.php b/server_engines.php
@@ -7,14 +7,14 @@
 /**
  * Does the common work
  */
-require('./server_common.inc.php');
+require('./libraries/server_common.inc.php');
 require('./libraries/storage_engines.lib.php');
 
 
 /**
  * Displays the links
  */
-require('./server_links.inc.php');
+require('./libraries/server_links.inc.php');
 
 
 /**

diff --git a/server_export.php b/server_export.php
@@ -12,7 +12,7 @@
 /**
  * Displays the links
  */
-require('./server_links.inc.php');
+require('./libraries/server_links.inc.php');
 
 /**
  * Gets the databases list - if it has not been built yet

diff --git a/server_import.php b/server_import.php
@@ -7,13 +7,13 @@
 /**
  * Does the common work
  */
-require('./server_common.inc.php');
+require('./libraries/server_common.inc.php');
 
 
 /**
  * Displays the links
  */
-require('./server_links.inc.php');
+require('./libraries/server_links.inc.php');
 
 $import_type = 'server';
 require('./libraries/display_import.lib.php');

diff --git a/server_privileges.php b/server_privileges.php
@@ -8,7 +8,7 @@
  * Does the common work
  */
 $js_to_run = 'server_privileges.js';
-require('./server_common.inc.php');
+require('./libraries/server_common.inc.php');
 
 
 /**
@@ -37,7 +37,7 @@
  * Checks if the user is allowed to do what he tries to...
  */
 if (!$is_superuser) {
-    require('./server_links.inc.php');
+    require('./libraries/server_links.inc.php');
     echo '<h2>' . "\n"
        . ($GLOBALS['cfg']['MainPageIconic'] ? '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 'b_usrlist.png" alt="" />' : '')
        . $GLOBALS['strPrivileges'] . "\n"
@@ -1203,7 +1203,7 @@ function PMA_displayLoginInformationFields($mode = 'new', $indent = 0 ) {
      require('./db_details_db_info.php');
      echo "\n";
 } else {
-    require('./server_links.inc.php');
+    require('./libraries/server_links.inc.php');
 }
 
 

diff --git a/server_processlist.php b/server_processlist.php
@@ -7,7 +7,7 @@
 /**
  * Does the common work
  */
-require_once('./server_common.inc.php');
+require_once('./libraries/server_common.inc.php');
 
 
 /**
@@ -25,7 +25,7 @@
 /**
  * Displays the links
  */
-require('./server_links.inc.php');
+require('./libraries/server_links.inc.php');
 
 
 /**

diff --git a/server_sql.php b/server_sql.php
@@ -8,14 +8,14 @@
  * Does the common work
  */
 $js_to_run = 'functions.js';
-require_once './server_common.inc.php';
+require_once './libraries/server_common.inc.php';
 require_once './libraries/sql_query_form.lib.php';
 
 
 /**
  * Displays the links
  */
-require './server_links.inc.php';
+require './libraries/server_links.inc.php';
 
 
 /**

diff --git a/server_status.php b/server_status.php
@@ -11,13 +11,13 @@
 /**
  * Does the common work
  */
-require './server_common.inc.php';
+require './libraries/server_common.inc.php';
 
 
 /**
  * Displays the links
  */
-require './server_links.inc.php';
+require './libraries/server_links.inc.php';
 
 
 /**

diff --git a/server_variables.php b/server_variables.php
@@ -7,13 +7,13 @@
 /**
  * Does the common work
  */
-require('./server_common.inc.php');
+require('./libraries/server_common.inc.php');
 
 
 /**
  * Displays the links
  */
-require('./server_links.inc.php');
+require('./libraries/server_links.inc.php');
 
 
 /**

diff --git a/sql.php b/sql.php
@@ -699,8 +699,8 @@
                 require('./db_details_db_info.php');
             }
             else {
-                require('./server_common.inc.php');
-                require('./server_links.inc.php');
+                require('./libraries/server_common.inc.php');
+                require('./libraries/server_links.inc.php');
             }
         }