diff --git a/libraries/header.inc.php b/libraries/header.inc.php index eb17e4cc98..54c59b2a6a 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -39,7 +39,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { /** * Gets a core script and starts output buffering work */ - require_once './libraries/ob.lib.php'; + include_once './libraries/ob.lib.php'; PMA_outBufferPre(); // if database storage for user preferences is transient, offer to load @@ -54,9 +54,9 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { // to a seperate file. It can now be included by header.inc.php, // querywindow.php. - require_once './libraries/header_http.inc.php'; - require_once './libraries/header_meta_style.inc.php'; - require_once './libraries/header_scripts.inc.php'; + include_once './libraries/header_http.inc.php'; + include_once './libraries/header_meta_style.inc.php'; + include_once './libraries/header_scripts.inc.php'; ?> @@ -76,7 +76,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { // Include possible custom headers if (file_exists(CUSTOM_HEADER_FILE)) { - require CUSTOM_HEADER_FILE; + include CUSTOM_HEADER_FILE; } @@ -89,7 +89,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { // offer to load user preferences from localStorage if ($userprefs_offer_import) { - require_once './libraries/user_preferences.lib.php'; + include_once './libraries/user_preferences.lib.php'; PMA_userprefs_autoload_header(); } @@ -148,7 +148,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { // if the table is being dropped, $_REQUEST['purge'] is set to '1' // so do not display the table name in upper div if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')) { - require_once './libraries/tbl_info.inc.php'; + include_once './libraries/tbl_info.inc.php'; echo $separator; printf($item, @@ -179,7 +179,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { /** * Settings for relations stuff */ - require_once './libraries/relation.lib.php'; + include_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); // Get additional information about tables for tooltip is done @@ -208,7 +208,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { } //end if (!$GLOBALS['is_ajax_request']) else { if (empty($GLOBALS['is_header_sent'])) { - require_once './libraries/header_http.inc.php'; + include_once './libraries/header_http.inc.php'; $GLOBALS['is_header_sent'] = true; } } diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 6a165417c3..6a4c2422a8 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -25,7 +25,7 @@ if (! empty($submit_mult) } elseif (isset($selected_tbl) && !empty($selected_tbl)) { // coming from database structure view - do something with selected tables if ($submit_mult == 'print') { - require './tbl_printview.php'; + include './tbl_printview.php'; } else { $selected = $selected_tbl; switch ($submit_mult) { @@ -47,7 +47,7 @@ if (! empty($submit_mult) break; case 'export': unset($submit_mult); - require 'db_export.php'; + include 'db_export.php'; exit; break; } // end switch @@ -102,7 +102,7 @@ if (! empty($submit_mult) $mult_btn = __('Yes'); break; case 'change': - require './tbl_alter.php'; + include './tbl_alter.php'; break; case 'browse': // this should already be handled by tbl_structure.php @@ -121,18 +121,18 @@ if (! empty($submit_mult) if (!empty($submit_mult) && !empty($what)) { unset($message); - require_once './libraries/header.inc.php'; + include_once './libraries/header.inc.php'; if (strlen($table)) { - require './libraries/tbl_common.php'; + include './libraries/tbl_common.php'; $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; - require './libraries/tbl_info.inc.php'; - require_once './libraries/tbl_links.inc.php'; + include './libraries/tbl_info.inc.php'; + include_once './libraries/tbl_links.inc.php'; } elseif (strlen($db)) { - require './libraries/db_common.inc.php'; - require './libraries/db_info.inc.php'; + include './libraries/db_common.inc.php'; + include './libraries/db_info.inc.php'; } else { - require_once './libraries/server_common.inc.php'; - require_once './libraries/server_links.inc.php'; + include_once './libraries/server_common.inc.php'; + include_once './libraries/server_links.inc.php'; } // Builds the query @@ -288,7 +288,7 @@ if (!empty($submit_mult) && !empty($what)) { diff --git a/libraries/string.lib.php b/libraries/string.lib.php index 0e9f974347..9773820268 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -24,18 +24,18 @@ if (! defined('PHPMYADMIN')) { */ if (@function_exists('mb_strlen')) { mb_internal_encoding('utf-8'); - require './libraries/string_mb.lib.php'; + include './libraries/string_mb.lib.php'; } else { - require './libraries/string_native.lib.php'; + include './libraries/string_native.lib.php'; } /** * Load ctype handler. */ if (@extension_loaded('ctype')) { - require './libraries/string_type_ctype.lib.php'; + include './libraries/string_type_ctype.lib.php'; } else { - require './libraries/string_type_native.lib.php'; + include './libraries/string_type_native.lib.php'; } /** diff --git a/main.php b/main.php index 0325f08599..f85f1c011b 100644 --- a/main.php +++ b/main.php @@ -30,9 +30,9 @@ $common_url_query = PMA_generate_common_url('', ''); // when $server > 0, a server has been chosen so we can display // all MySQL-related information if ($server > 0) { - require './libraries/server_common.inc.php'; - require './libraries/StorageEngine.class.php'; - require './libraries/server_links.inc.php'; + 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 @@ -71,7 +71,7 @@ if ($server > 0 if (! $cfg['LeftDisplayServers'] && (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)) { echo '
  • '; - require_once './libraries/select_server.lib.php'; + include_once './libraries/select_server.lib.php'; PMA_select_server(true, true); echo '
  • '; } @@ -80,7 +80,7 @@ if ($server > 0 * Displays the mysql server related links */ if ($server > 0 && !PMA_DRIZZLE) { - require_once './libraries/check_user_privileges.lib.php'; + include_once './libraries/check_user_privileges.lib.php'; // Logout for advanced authentication if ($cfg['Server']['auth_type'] != 'config') { @@ -119,7 +119,7 @@ echo '