diff --git a/ChangeLog b/ChangeLog index 4e08075c0..04eb2cd07 100755 --- 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 * themes/original/*, css/phpmyadmin.css.php: diff --git a/server_common.inc.php b/libraries/server_common.inc.php similarity index 100% rename from server_common.inc.php rename to libraries/server_common.inc.php diff --git a/server_links.inc.php b/libraries/server_links.inc.php similarity index 97% rename from server_links.inc.php rename to libraries/server_links.inc.php index 50c4f677b..e9c947564 100644 --- a/server_links.inc.php +++ b/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 index b86475aa7..2657e0304 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -7,13 +7,13 @@ require_once('./libraries/common.lib.php'); /** * 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 index ad8c1bdd3..b466a668b 100644 --- a/server_collations.php +++ b/server_collations.php @@ -7,13 +7,13 @@ require_once('./libraries/common.lib.php'); /** * 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 index 07f09c5df..354abfe6e 100644 --- a/server_databases.php +++ b/server_databases.php @@ -9,7 +9,7 @@ require_once('./libraries/common.lib.php'); $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 @@ if ((!empty($drop_selected_dbs) || isset($query_type)) && ($is_superuser || $cfg /** * Displays the links */ -require('./server_links.inc.php'); +require('./libraries/server_links.inc.php'); /** diff --git a/server_engines.php b/server_engines.php index 2aa7a49ce..c3896c3c0 100644 --- a/server_engines.php +++ b/server_engines.php @@ -7,14 +7,14 @@ require_once('./libraries/common.lib.php'); /** * 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 index f3b9c49a9..c591ad10d 100644 --- a/server_export.php +++ b/server_export.php @@ -12,7 +12,7 @@ $js_to_run = 'functions.js'; /** * 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 index c4ca3a7cf..0bd5cee42 100644 --- a/server_import.php +++ b/server_import.php @@ -7,13 +7,13 @@ require_once('./libraries/common.lib.php'); /** * 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 index dddf5d8dd..97c18ec58 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -8,7 +8,7 @@ require_once('./libraries/common.lib.php'); * 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 @@ if ( isset( $dbname ) ) { * 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 '

' . "\n" . ($GLOBALS['cfg']['MainPageIconic'] ? '' : '') . $GLOBALS['strPrivileges'] . "\n" @@ -1203,7 +1203,7 @@ if (isset($viewing_mode) && $viewing_mode == 'db') { 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 index 8b5615fd8..13c9b20ba 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -7,7 +7,7 @@ require_once('./libraries/common.lib.php'); /** * Does the common work */ -require_once('./server_common.inc.php'); +require_once('./libraries/server_common.inc.php'); /** @@ -25,7 +25,7 @@ if (!empty($kill)) { /** * Displays the links */ -require('./server_links.inc.php'); +require('./libraries/server_links.inc.php'); /** diff --git a/server_sql.php b/server_sql.php index 3e7d83e55..a10d2672e 100644 --- a/server_sql.php +++ b/server_sql.php @@ -8,14 +8,14 @@ require_once('./libraries/common.lib.php'); * 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 index dc1a7f933..dab784c84 100644 --- a/server_status.php +++ b/server_status.php @@ -11,13 +11,13 @@ require_once('./libraries/common.lib.php'); /** * 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 index 7bb273a6b..2c0e93358 100644 --- a/server_variables.php +++ b/server_variables.php @@ -7,13 +7,13 @@ require_once('./libraries/common.lib.php'); /** * 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 index f6d9ddea6..57d347134 100644 --- a/sql.php +++ b/sql.php @@ -699,8 +699,8 @@ else { 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'); } }