gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

File is being conditionally included; use "include" instead

Browse Source
This commit is contained in:
Madhura Jayaratne 2011-09-23 10:56:30 +05:30
parent e67a0a2531
commit 9bcb83af03
40 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/database_interface.lib.php
View File

@ -203,7 +203,7 @@ function PMA_DBI_convert_message($message)
if (! empty($server_language) && isset($encodings[$server_language])) {
if (function_exists('iconv')) {
if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
require_once './libraries/iconv_wrapper.lib.php';
include_once './libraries/iconv_wrapper.lib.php';
$message = PMA_aix_iconv_wrapper($encodings[$server_language],
'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], $message);
} else {
@ -730,7 +730,7 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false,
$databases[$database_name]['SCHEMA_NAME'] = $database_name;
if ($force_stats) {
require_once './libraries/mysql_charsets.lib.php';
include_once './libraries/mysql_charsets.lib.php';
$databases[$database_name]['DEFAULT_COLLATION_NAME']
= PMA_getDbCollation($database_name);

2
libraries/db_info.inc.php
View File

@ -257,6 +257,6 @@ unset($each_table, $tbl_group_sql, $db_info_result);
* If in an Ajax request, we do not need to show this
*/
if ($GLOBALS['is_ajax_request'] != true) {
require './libraries/db_links.inc.php';
include './libraries/db_links.inc.php';
}
?>

2
libraries/db_table_exists.lib.php
View File

@ -73,7 +73,7 @@ if (empty($is_table) && !defined('PMA_SUBMIT_MULT') && ! defined('TABLE_MAY_BE_A
}
if (! $is_table) {
require './db_sql.php';
include './db_sql.php';
exit;
}
}

2
libraries/display_create_database.lib.php
View File

@ -23,7 +23,7 @@ if ($is_create_db_priv) {
<input type="hidden" name="reload" value="1" />
<input type="text" name="new_db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" id="text_create_db"/>
<?php
require_once './libraries/mysql_charsets.lib.php';
include_once './libraries/mysql_charsets.lib.php';
echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', null, null, true, 5);
if (! empty($dbstats)) {

2
libraries/display_export.lib.php
View File

@ -35,7 +35,7 @@ $export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $exp
/* Fail if we didn't find any plugin */
if (empty($export_list)) {
PMA_Message::error( __('Could not load export plugins, please check your installation!'))->display();
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
}
?>

2
libraries/display_import.lib.php
View File

@ -21,7 +21,7 @@ $import_list = PMA_getPlugins('./libraries/import/', $import_type);
/* Fail if we didn't find any plugin */
if (empty($import_list)) {
PMA_Message::error(__('Could not load import plugins, please check your installation!'))->display();
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
}
?>

2
libraries/export/excel.php
View File

@ -38,6 +38,6 @@ if (isset($plugin_list)) {
);
} else {
/* Everything rest is coded in csv plugin */
require './libraries/export/csv.php';
include './libraries/export/csv.php';
}
?>

2
libraries/export/ods.php
View File

@ -31,7 +31,7 @@ if (isset($plugin_list)) {
} else {
$GLOBALS['ods_buffer'] = '';
require_once './libraries/opendocument.lib.php';
include_once './libraries/opendocument.lib.php';
/**
* Outputs export footer

2
libraries/export/odt.php
View File

@ -63,7 +63,7 @@ if (isset($plugin_list)) {
} else {
$GLOBALS['odt_buffer'] = '';
require_once './libraries/opendocument.lib.php';
include_once './libraries/opendocument.lib.php';
/**
* Outputs export footer

2
libraries/export/pdf.php
View File

@ -30,7 +30,7 @@ if (isset($plugin_list)) {
);
} else {
require_once './libraries/PDF.class.php';
include_once './libraries/PDF.class.php';
/**
* Adapted from a LGPL script by Philip Clarke

2
libraries/footer.inc.php
View File

@ -174,7 +174,7 @@ setURLHash("<?php echo PMA_generate_common_url($url_params, 'text', ''); ?>");
// Include possible custom footers
if (! $GLOBALS['is_ajax_request'] && file_exists(CUSTOM_FOOTER_FILE)) {
require CUSTOM_FOOTER_FILE;
include CUSTOM_FOOTER_FILE;
}
/**

2
libraries/pmd_common.php
View File

@ -172,7 +172,7 @@ function get_pk_or_unique_keys()
*/
function get_all_keys($unique_only = false)
{
require_once './libraries/Index.class.php';
include_once './libraries/Index.class.php';
$keys = array();

4
libraries/relation.lib.php
View File

@ -440,10 +440,10 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
if (($is_information_schema || $is_data_dictionary) && ($source == 'internal' || $source == 'both')) {
if ($is_information_schema) {
$relations_key = 'information_schema_relations';
require_once './libraries/information_schema_relations.lib.php';
include_once './libraries/information_schema_relations.lib.php';
} else {
$relations_key = 'data_dictionary_relations';
require_once './libraries/data_dictionary_relations.lib.php';
include_once './libraries/data_dictionary_relations.lib.php';
}
if (isset($GLOBALS[$relations_key][$table])) {
foreach ($GLOBALS[$relations_key][$table] as $field => $relations) {

2
libraries/rte/rte_events.lib.php
View File

@ -205,7 +205,7 @@ function PMA_EVN_handleEditor()
} else {
echo "\n\n<h2>$title</h2>\n\n$editor";
unset($_POST);
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
}
// exit;
} else {

4
libraries/rte/rte_routines.lib.php
View File

@ -366,7 +366,7 @@ function PMA_RTN_handleEditor()
PMA_ajaxResponse($editor, true, $extra_data);
}
echo "\n\n<h2>$title</h2>\n\n$editor";
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
// exit;
} else {
$message = __('Error in processing request') . ' : ';
@ -1297,7 +1297,7 @@ function PMA_RTN_handleExecute()
} else {
echo "\n\n<h2>" . __("Execute routine") . "</h2>\n\n";
echo $form;
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
// exit;
}
} else if (($GLOBALS['is_ajax_request'] == true)) {

2
libraries/rte/rte_triggers.lib.php
View File

@ -180,7 +180,7 @@ function PMA_TRI_handleEditor()
} else {
echo "\n\n<h2>$title</h2>\n\n$editor";
unset($_POST);
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
}
// exit;
} else {

6
libraries/sqlparser.lib.php
View File

@ -37,14 +37,14 @@ if (! defined('PMA_MINIMUM_COMMON')) {
/**
* Include the string library as we use it heavily
*/
require_once './libraries/string.lib.php';
include_once './libraries/string.lib.php';
/**
* Include data for the SQL Parser
*/
require_once './libraries/sqlparser.data.php';
include_once './libraries/sqlparser.data.php';
if (!defined('TESTSUITE')) {
require_once './libraries/mysql_charsets.lib.php';
include_once './libraries/mysql_charsets.lib.php';
}
if (! isset($mysql_charsets)) {
$mysql_charsets = array();

2
libraries/sqlvalidator.lib.php
View File

@ -39,7 +39,7 @@ if (! defined('PHPMYADMIN')) {
* For now we actually use a configuration flag
*/
if ($cfg['SQLValidator']['use'] == true) {
require_once './libraries/sqlvalidator.class.php';
include_once './libraries/sqlvalidator.class.php';
} // if ($cfg['SQLValidator']['use'] == true)

4
libraries/tbl_properties.inc.php
View File

@ -29,9 +29,9 @@ require_once './libraries/Partition.class.php';
// load additional configuration variables
if (PMA_DRIZZLE) {
require_once './libraries/data_drizzle.inc.php';
include_once './libraries/data_drizzle.inc.php';
} else {
require_once './libraries/data_mysql.inc.php';
include_once './libraries/data_mysql.inc.php';
}
if (is_int($cfg['DefaultPropDisplay'])) {

2
libraries/transformations/image_jpeg__inline.inc.php
View File

@ -16,7 +16,7 @@ function PMA_transformation_image_jpeg__inline_info()
*/
function PMA_transformation_image_jpeg__inline($buffer, $options = array(), $meta = '')
{
require_once './libraries/transformations/global.inc.php';
include_once './libraries/transformations/global.inc.php';
if (PMA_IS_GD2) {
$transform_options = array ('string' => '<a href="transformation_wrapper.php' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php' . $options['wrapper_link'] . '&amp;resize=jpeg&amp;newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&amp;newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0" /></a>');

2
libraries/transformations/image_jpeg__link.inc.php
View File

@ -16,7 +16,7 @@ function PMA_transformation_image_jpeg__link_info()
*/
function PMA_transformation_image_jpeg__link($buffer, $options = array(), $meta = '')
{
require_once './libraries/transformations/global.inc.php';
include_once './libraries/transformations/global.inc.php';
$transform_options = array ('string' => '<a href="transformation_wrapper.php' . $options['wrapper_link'] . '" alt="[__BUFFER__]">[BLOB]</a>');
$buffer = PMA_transformation_global_html_replace($buffer, $transform_options);

2
libraries/transformations/image_png__inline.inc.php
View File

@ -16,7 +16,7 @@ function PMA_transformation_image_png__inline_info()
*/
function PMA_transformation_image_png__inline($buffer, $options = array(), $meta = '')
{
require_once './libraries/transformations/global.inc.php';
include_once './libraries/transformations/global.inc.php';
if (PMA_IS_GD2) {
$transform_options = array ('string' => '<a href="transformation_wrapper.php' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php' . $options['wrapper_link'] . '&amp;resize=png&amp;newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&amp;newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0" /></a>');

2
libraries/transformations/text_plain__imagelink.inc.php
View File

@ -16,7 +16,7 @@ function PMA_transformation_text_plain__imagelink_info()
*/
function PMA_transformation_text_plain__imagelink($buffer, $options = array(), $meta = '')
{
require_once './libraries/transformations/global.inc.php';
include_once './libraries/transformations/global.inc.php';
$transform_options = array ('string' => '<a href="' . (isset($options[0]) ? $options[0] : '') . $buffer . '" target="_blank"><img src="' . (isset($options[0]) ? $options[0] : '') . $buffer . '" border="0" width="' . (isset($options[1]) ? $options[1] : 100) . '" height="' . (isset($options[2]) ? $options[2] : 50) . '" />' . $buffer . '</a>');
$buffer = PMA_transformation_global_html_replace($buffer, $transform_options);

2
libraries/transformations/text_plain__link.inc.php
View File

@ -16,7 +16,7 @@ function PMA_transformation_text_plain__link_info()
*/
function PMA_transformation_text_plain__link($buffer, $options = array(), $meta = '')
{
require_once './libraries/transformations/global.inc.php';
include_once './libraries/transformations/global.inc.php';
// $transform_options = array ('string' => '<a href="' . (isset($options[0]) ? $options[0] : '') . '%1$s" title="' . (isset($options[1]) ? $options[1] : '%1$s') . '">' . (isset($options[1]) ? $options[1] : '%1$s') . '</a>');

6
prefs_manage.php
View File

@ -105,8 +105,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
}
if (!$all_ok) {
// mimic original form and post json in a hidden field
require './libraries/header.inc.php';
require './libraries/user_preferences.inc.php';
include './libraries/header.inc.php';
include './libraries/user_preferences.inc.php';
$msg = PMA_Message::error(__('Configuration contains incorrect data for some fields.'));
$msg->display();
echo '<div class="config-form">';
@ -128,7 +128,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
<input type="submit" name="submit_ignore" value="<?php echo __('No') ?>" />
</form>
<?php
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
return;
}

6
querywindow.php
View File

@ -95,11 +95,11 @@ if ($no_js) {
// ... we redirect to appropriate query sql page
// works only full if $db and $table is also stored/grabbed from $_COOKIE
if (strlen($table)) {
require './tbl_sql.php';
include './tbl_sql.php';
} elseif (strlen($db)) {
require './db_sql.php';
include './db_sql.php';
} else {
require './server_sql.php';
include './server_sql.php';
}
exit;
}

6
server_databases.php
View File

@ -12,7 +12,7 @@ require_once './libraries/common.inc.php';
require './libraries/server_common.inc.php';
if (!PMA_DRIZZLE) {
require './libraries/replication.inc.php';
include './libraries/replication.inc.php';
} else {
$replication_types = array();
$replication_info = null;
@ -74,7 +74,7 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
if (isset($_REQUEST['selected_dbs'])) {
$selected_db = $_REQUEST['selected_dbs'];
}
require './libraries/mult_submits.inc.php';
include './libraries/mult_submits.inc.php';
unset($action, $submit_mult, $err_url, $selected_db, $GLOBALS['db']);
if (empty($message)) {
$message = PMA_Message::success(__('%s databases have been dropped successfully.'));
@ -109,7 +109,7 @@ echo '<h2>' . "\n"
*/
if ($cfg['ShowCreateDb']) {
echo '<ul><li id="li_create_database">' . "\n";
require './libraries/display_create_database.lib.php';
include './libraries/display_create_database.lib.php';
echo ' </li>' . "\n";
echo '</ul>' . "\n";
}

6
server_replication.php
View File

@ -25,13 +25,13 @@ require_once './libraries/server_synchronize.lib.php';
* Checks if the user is allowed to do what he tries to...
*/
if (! $is_superuser) {
require './libraries/server_links.inc.php';
include './libraries/server_links.inc.php';
echo '<h2>' . "\n"
. PMA_getIcon('s_replication.png')
. __('Replication') . "\n"
. '</h2>' . "\n";
PMA_Message::error(__('No Privileges'))->display();
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
}
/**
@ -234,7 +234,7 @@ if (isset($GLOBALS['mr_configure'])) {
echo ' </form>';
echo '</fieldset>';
require './libraries/footer.inc.php';
include './libraries/footer.inc.php';
exit;
}

2
setup/config.php
View File

@ -54,7 +54,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
// Load config file from the server
//
$cfg = array();
require_once $config_file_path;
include_once $config_file_path;
ConfigFile::getInstance()->setConfigData($cfg);
header('HTTP/1.1 303 See Other');
header('Location: index.php');

8
tbl_indexes.php
View File

@ -97,20 +97,20 @@ if (isset($_REQUEST['do_save_data'])) {
PMA_DBI_query($sql_query);
$message = PMA_Message::success(__('Table %1$s has been altered successfully'));
$message->addParam($table);
if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['index_table'] = PMA_Index::getView($table, $db);
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}
$active_page = 'tbl_structure.php';
require './tbl_structure.php';
include './tbl_structure.php';
exit;
} else {
if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['error'] = $error;
PMA_ajaxResponse($error,false);
PMA_ajaxResponse($error, false);
}
$error->display();
}

4
tbl_printview.php
View File

@ -17,7 +17,7 @@ require './libraries/tbl_common.php';
*/
$print_view = true;
if (! isset($selected_tbl)) {
require_once './libraries/header.inc.php';
include_once './libraries/header.inc.php';
}
// Check parameters
@ -62,7 +62,7 @@ $multi_tables = (count($the_tables) > 1);
if ($multi_tables) {
if (empty($GLOBALS['is_header_sent'])) {
require_once './libraries/header.inc.php';
include_once './libraries/header.inc.php';
}
$tbl_list = '';
foreach ($the_tables as $key => $table) {

2
tbl_tracking.php
View File

@ -219,7 +219,7 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump')
$table_temp = $table;
$db = $table = '';
require_once './libraries/sql_query_form.lib.php';
include_once './libraries/sql_query_form.lib.php';
PMA_sqlQueryForm($new_query, 'sql');

4
test/libraries/common/PMA_getDbLink_test.php
View File

@ -21,8 +21,8 @@ class PMA_getDbLink_test extends PHPUnit_Framework_TestCase
function setUp()
{
global $cfg;
require_once 'libraries/vendor_config.php';
require 'libraries/config.default.php';
include_once 'libraries/vendor_config.php';
include 'libraries/config.default.php';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$GLOBALS['server'] = 99;

2
test/libraries/common/PMA_showMessage_test_disabled.php
View File

@ -23,7 +23,7 @@ class PMA_showMessage_test extends PHPUnit_Extensions_OutputTestCase
function setUp()
{
global $cfg;
require 'libraries/config.default.php';
include 'libraries/config.default.php';
}
function testShowMessageNotAjax()

2
test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
View File

@ -21,7 +21,7 @@ class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase
global $cfg;
$cfg['ShowFunctionFields'] = false;
require 'libraries/data_mysql.inc.php';
include 'libraries/data_mysql.inc.php';
}
/**

2
test/libraries/rte/PMA_RTN_getEditorForm_test.php
View File

@ -20,7 +20,7 @@ class PMA_RTN_getEditorForm_test extends PHPUnit_Framework_TestCase
global $cfg;
$cfg['ShowFunctionFields'] = false;
require 'libraries/data_mysql.inc.php';
include 'libraries/data_mysql.inc.php';
if (! function_exists('PMA_generateCharsetDropdownBox')) {
function PMA_generateCharsetDropdownBox() {}

2
test/libraries/rte/PMA_RTN_getExecuteForm_test.php
View File

@ -54,7 +54,7 @@ class PMA_RTN_getExecuteForm_test extends PHPUnit_Framework_TestCase
$cfg['DefaultFunctions']['FUNC_SPATIAL'] = 'GeomFromText';
$GLOBALS['tear_down']['default'] = true;
}
require 'libraries/data_mysql.inc.php';
include 'libraries/data_mysql.inc.php';
}
public function tearDown()

2
test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
View File

@ -29,7 +29,7 @@ class PMA_RTN_getQueryFromRequest_test extends PHPUnit_Framework_TestCase
$cfg['ShowFunctionFields'] = false;
require 'libraries/data_mysql.inc.php';
include 'libraries/data_mysql.inc.php';
$errors = array();
PMA_RTN_setGlobals();

2
transformation_overview.php
View File

@ -52,7 +52,7 @@ foreach ($types['mimetype'] as $key => $mimetype) {
$odd_row = true;
foreach ($types['transformation'] as $key => $transform) {
$func = strtolower(str_ireplace('.inc.php', '', $types['transformation_file'][$key]));
require './libraries/transformations/' . $types['transformation_file'][$key];
include './libraries/transformations/' . $types['transformation_file'][$key];
$funcname = 'PMA_transformation_' . $func . '_info';
$desc = '<i>' . sprintf(__('No description is available for this transformation.<br />Please ask the author what %s does.'), 'PMA_transformation_' . $func . '()') . '</i>';
if (function_exists($funcname)) {

2
view_create.php
View File

@ -72,7 +72,7 @@ if (isset($_REQUEST['createview'])) {
if (PMA_DBI_try_query($sql_query)) {
$message = PMA_Message::success();
require './' . $cfg['DefaultTabDatabase'];
include './' . $cfg['DefaultTabDatabase'];
exit();
} else {
$message = PMA_Message::rawError(PMA_DBI_getError());