Skip to content

Commit

Permalink
Leading ./ paths for includes can be omitted, part 2
Browse files Browse the repository at this point in the history
  • Loading branch information
mynetx committed Mar 16, 2012
1 parent 3b56f6a commit b2fd866
Show file tree
Hide file tree
Showing 74 changed files with 490 additions and 490 deletions.
10 changes: 5 additions & 5 deletions browse_foreigners.php
Expand Up @@ -9,19 +9,19 @@
/**
* Gets a core script and starts output buffering work
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';

PMA_checkParameters(array('db', 'table', 'field'));

require_once './libraries/ob.lib.php';
require_once 'libraries/ob.lib.php';
PMA_outBufferPre();

require_once './libraries/header_http.inc.php';
require_once 'libraries/header_http.inc.php';

/**
* Displays the frame
*/
require_once './libraries/transformations.lib.php'; // Transformations
require_once 'libraries/transformations.lib.php'; // Transformations
$cfgRelation = PMA_getRelationsParam();
$foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : false);

Expand Down Expand Up @@ -85,7 +85,7 @@
href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=right&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<?php
// includes everything asked for by libraries/common.inc.php
require_once './libraries/header_scripts.inc.php';
require_once 'libraries/header_scripts.inc.php';
?>
<script type="text/javascript">
//<![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion changelog.php
Expand Up @@ -9,7 +9,7 @@
/**
* Gets core libraries and defines some variables
*/
require './libraries/common.inc.php';
require 'libraries/common.inc.php';

$filename = CHANGELOG_FILE;

Expand Down
6 changes: 3 additions & 3 deletions chk_rel.php
Expand Up @@ -8,8 +8,8 @@
/**
* Gets some core libraries
*/
require_once './libraries/common.inc.php';
require_once './libraries/header.inc.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/header.inc.php';


/**
Expand All @@ -21,5 +21,5 @@
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>
16 changes: 8 additions & 8 deletions db_create.php
Expand Up @@ -8,15 +8,15 @@
/**
* Gets some core libraries
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';

require_once './libraries/mysql_charsets.lib.php';
require_once 'libraries/mysql_charsets.lib.php';
if (!PMA_DRIZZLE) {
include_once './libraries/replication.inc.php';
include_once 'libraries/replication.inc.php';
}
require './libraries/build_html_for_db.lib.php';
require 'libraries/build_html_for_db.lib.php';

/**
* Sets globals from $_POST
Expand Down Expand Up @@ -67,8 +67,8 @@
PMA_ajaxResponse($message, false);
}

include_once './libraries/header.inc.php';
include_once './main.php';
include_once 'libraries/header.inc.php';
include_once 'main.php';
} else {
$message = PMA_Message::success(__('Database %1$s has been created.'));
$message->addParam($new_db);
Expand Down Expand Up @@ -138,7 +138,7 @@
PMA_ajaxResponse($message, true, $extra_data);
}

include_once './libraries/header.inc.php';
include_once './' . $cfg['DefaultTabDatabase'];
include_once 'libraries/header.inc.php';
include_once '' . $cfg['DefaultTabDatabase'];
}
?>
10 changes: 5 additions & 5 deletions db_datadict.php
Expand Up @@ -8,11 +8,11 @@
/**
* Gets the variables sent or posted to this script, then displays headers
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';

if (! isset($selected_tbl)) {
include './libraries/db_common.inc.php';
include './libraries/db_info.inc.php';
include 'libraries/db_common.inc.php';
include 'libraries/db_info.inc.php';
}


Expand All @@ -21,7 +21,7 @@
*/
$cfgRelation = PMA_getRelationsParam();

require_once './libraries/transformations.lib.php';
require_once 'libraries/transformations.lib.php';


/**
Expand Down Expand Up @@ -271,5 +271,5 @@
*/
PMA_printButton();

require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>
8 changes: 4 additions & 4 deletions db_events.php
Expand Up @@ -9,8 +9,8 @@
/**
* Include required files
*/
require_once './libraries/common.inc.php';
require_once './libraries/common.lib.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/common.lib.php';

/**
* Include JavaScript libraries
Expand All @@ -25,12 +25,12 @@
/**
* Include all other files
*/
require_once './libraries/rte/rte_events.lib.php';
require_once 'libraries/rte/rte_events.lib.php';

/**
* Do the magic
*/
$_PMA_RTE = 'EVN';
require_once './libraries/rte/rte_main.inc.php';
require_once 'libraries/rte/rte_main.inc.php';

?>
12 changes: 6 additions & 6 deletions db_export.php
Expand Up @@ -9,16 +9,16 @@
/**
* Gets some core libraries
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';

$GLOBALS['js_include'][] = 'export.js';

// $sub_part is also used in db_info.inc.php to see if we are coming from
// db_export.php, in which case we don't obey $cfg['MaxTableList']
$sub_part = '_export';
require_once './libraries/db_common.inc.php';
require_once 'libraries/db_common.inc.php';
$url_query .= '&amp;goto=db_export.php';
require_once './libraries/db_info.inc.php';
require_once 'libraries/db_info.inc.php';

/**
* Displays the form
Expand All @@ -28,7 +28,7 @@
// exit if no tables in db found
if ($num_tables < 1) {
PMA_Message::error(__('No tables found in database.'))->display();
include './libraries/footer.inc.php';
include 'libraries/footer.inc.php';
exit;
} // end if

Expand Down Expand Up @@ -77,10 +77,10 @@
$multi_values .= '</select></div>';

$export_type = 'database';
require_once './libraries/display_export.lib.php';
require_once 'libraries/display_export.lib.php';

/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>
10 changes: 5 additions & 5 deletions db_import.php
Expand Up @@ -8,22 +8,22 @@
/**
*
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';

$GLOBALS['js_include'][] = 'import.js';

/**
* Gets tables informations and displays top links
*/
require './libraries/db_common.inc.php';
require './libraries/db_info.inc.php';
require 'libraries/db_common.inc.php';
require 'libraries/db_info.inc.php';

$import_type = 'database';
require './libraries/display_import.lib.php';
require 'libraries/display_import.lib.php';

/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>

16 changes: 8 additions & 8 deletions db_operations.php
Expand Up @@ -15,8 +15,8 @@
/**
* requirements
*/
require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/mysql_charsets.lib.php';

// add a javascript file for jQuery functions to handle Ajax actions
// also add jQueryUI
Expand Down Expand Up @@ -129,7 +129,7 @@
$views = array();

// remove all foreign key constraints, otherwise we can get errors
include_once './libraries/export/sql.php';
include_once 'libraries/export/sql.php';
foreach ($tables_full as $each_table => $tmp) {
$sql_constraints = '';
$sql_drop_foreign_keys = '';
Expand Down Expand Up @@ -289,7 +289,7 @@
/**
* cleanup pmadb stuff for this db
*/
include_once './libraries/relation_cleanup.lib.php';
include_once 'libraries/relation_cleanup.lib.php';
PMA_relationsCleanupDatabase($db);

// if someday the RENAME DATABASE reappears, do not DROP
Expand Down Expand Up @@ -355,12 +355,12 @@
* because there is no table in the database ($is_info is true)
*/
if (empty($is_info)) {
include './libraries/db_common.inc.php';
include 'libraries/db_common.inc.php';
$url_query .= '&amp;goto=db_operations.php';

// Gets the database structure
$sub_part = '_structure';
include './libraries/db_info.inc.php';
include 'libraries/db_info.inc.php';
echo "\n";

if (isset($message)) {
Expand Down Expand Up @@ -403,7 +403,7 @@
}
?>
<div class="operations_half_width">
<?php include './libraries/display_create_table.lib.php'; ?>
<?php include 'libraries/display_create_table.lib.php'; ?>
</div>
<?php
/**
Expand Down Expand Up @@ -618,5 +618,5 @@
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>
6 changes: 3 additions & 3 deletions db_printview.php
Expand Up @@ -8,13 +8,13 @@
/**
*
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';

/**
* Gets the variables sent or posted to this script, then displays headers
*/
$print_view = true;
require_once './libraries/header.inc.php';
require_once 'libraries/header.inc.php';

PMA_checkParameters(array('db'));

Expand Down Expand Up @@ -248,5 +248,5 @@

echo "<div id='PMA_disable_floating_menubar'></div>\n";

require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>
12 changes: 6 additions & 6 deletions db_qbe.php
Expand Up @@ -9,7 +9,7 @@
/**
* requirements
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.inc.php';

/**
* Gets the relation settings
Expand All @@ -26,16 +26,16 @@
$message_to_display = true;
} else {
$goto = 'db_sql.php';
include './sql.php';
include 'sql.php';
exit;
}
}

$sub_part = '_qbe';
require './libraries/db_common.inc.php';
require 'libraries/db_common.inc.php';
$url_query .= '&amp;goto=db_qbe.php';
$url_params['goto'] = 'db_qbe.php';
require './libraries/db_info.inc.php';
require 'libraries/db_info.inc.php';

if ($message_to_display) {
PMA_Message::error(__('You have to choose at least one column to display'))->display();
Expand Down Expand Up @@ -99,7 +99,7 @@
$tbl_result_cnt = PMA_DBI_num_rows($tbl_result);
if (0 == $tbl_result_cnt) {
PMA_Message::error(__('No tables found in database.'))->display();
include './libraries/footer.inc.php';
include 'libraries/footer.inc.php';
exit;
}

Expand Down Expand Up @@ -962,5 +962,5 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
/**
* Displays the footer
*/
require './libraries/footer.inc.php';
require 'libraries/footer.inc.php';
?>
14 changes: 7 additions & 7 deletions db_routines.php
Expand Up @@ -9,13 +9,13 @@
/**
* Include required files
*/
require_once './libraries/common.inc.php';
require_once './libraries/common.lib.php';
require_once './libraries/mysql_charsets.lib.php';
require_once 'libraries/common.inc.php';
require_once 'libraries/common.lib.php';
require_once 'libraries/mysql_charsets.lib.php';
if (PMA_DRIZZLE) {
include_once './libraries/data_drizzle.inc.php';
include_once 'libraries/data_drizzle.inc.php';
} else {
include_once './libraries/data_mysql.inc.php';
include_once 'libraries/data_mysql.inc.php';
}

/**
Expand All @@ -31,12 +31,12 @@
/**
* Include all other files
*/
require_once './libraries/rte/rte_routines.lib.php';
require_once 'libraries/rte/rte_routines.lib.php';

/**
* Do the magic
*/
$_PMA_RTE = 'RTN';
require_once './libraries/rte/rte_main.inc.php';
require_once 'libraries/rte/rte_main.inc.php';

?>

0 comments on commit b2fd866

Please sign in to comment.