Leading ./ paths for includes can be omitted, part 2

1 files changed, 28 insertions, 28 deletions

diff --git a/sql.php b/sql.php
index 7bc9a4656c..95b28b0067 100644
--- a/sql.php
+++ b/sql.php
@@ -9,10 +9,10 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/Table.class.php';
-require_once './libraries/check_user_privileges.lib.php';
-require_once './libraries/bookmark.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/Table.class.php';
+require_once 'libraries/check_user_privileges.lib.php';
+require_once 'libraries/bookmark.lib.php';
 
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
@@ -74,7 +74,7 @@ if (isset($_SESSION['profiling'])) {
 // Security checkings
 if (! empty($goto)) {
     $is_gotofile     = preg_replace('@^([^?]+).*$@s', '\\1', $goto);
-    if (! @file_exists('./' . $is_gotofile)) {
+    if (! @file_exists('' . $is_gotofile)) {
         unset($goto);
     } else {
         $is_gotofile = ($is_gotofile == $goto);
@@ -237,7 +237,7 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
 // Default to browse if no query set and we have table
 // (needed for browsing from DefaultTabTable)
 if (empty($sql_query) && strlen($table) && strlen($db)) {
-    include_once './libraries/bookmark.lib.php';
+    include_once 'libraries/bookmark.lib.php';
     $book_sql_query = PMA_Bookmark_get(
         $db,
         '\'' . PMA_sqlAddSlashes($table) . '\'',
@@ -281,11 +281,11 @@ if (! defined('PMA_CHK_DROP')
     && $is_drop_database
     && ! $is_superuser
 ) {
-    include_once './libraries/header.inc.php';
+    include_once 'libraries/header.inc.php';
     PMA_mysqlDie(__('"DROP DATABASE" statements are disabled.'), '', '', $err_url);
 } // end if
 
-require_once './libraries/display_tbl.lib.php';
+require_once 'libraries/display_tbl.lib.php';
 PMA_displayTable_checkConfigParams();
 
 /**
@@ -309,7 +309,7 @@ if (isset($store_bkm)) {
 /**
  * Parse and analyze the query
  */
-require_once './libraries/parse_analyze.lib.php';
+require_once 'libraries/parse_analyze.lib.php';
 
 /**
  * Sets or modifies the $goto variable if required
@@ -334,7 +334,7 @@ if (isset($btnDrop) && $btnDrop == __('No')) {
             $table = '';
         }
         $active_page = $goto;
-        include './' . PMA_securePath($goto);
+        include '' . PMA_securePath($goto);
     } else {
         PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . str_replace('&', '&', $goto));
     }
@@ -366,7 +366,7 @@ if (! $cfg['Confirm']
 
 if ($do_confirm) {
     $stripped_sql_query = $sql_query;
-    include_once './libraries/header.inc.php';
+    include_once 'libraries/header.inc.php';
     if ($is_drop_database) {
         echo '<h1 class="error">' . __('You are about to DESTROY a complete database!') . '</h1>';
     }
@@ -397,7 +397,7 @@ if ($do_confirm) {
     /**
      * Displays the footer and exit
      */
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
 } // end if $do_confirm
 
 
@@ -560,7 +560,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
             /**
              * Go to target path.
              */
-            include './' . PMA_securePath($goto);
+            include '' . PMA_securePath($goto);
         } else {
             $full_err_url = (preg_match('@^(db|tbl)_@', $err_url))
                           ? $err_url . '&amp;show_query=1&amp;sql_query=' . urlencode($sql_query)
@@ -697,7 +697,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
         /**
          * Cleanup relations.
          */
-        include_once './libraries/relation_cleanup.lib.php';
+        include_once 'libraries/relation_cleanup.lib.php';
 
         if (strlen($table) && strlen($db)) {
             PMA_relationsCleanupTable($db, $table);
@@ -710,7 +710,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
 
     // If a column gets dropped, do relation magic.
     if (isset($dropped_column) && strlen($db) && strlen($table) && ! empty($dropped_column)) {
-        include_once './libraries/relation_cleanup.lib.php';
+        include_once 'libraries/relation_cleanup.lib.php';
         PMA_relationsCleanupColumn($db, $table, $dropped_column);
         // to refresh the list of indexes (Ajax mode)
         $extra_data['indexes_list'] = PMA_Index::getView($table, $db);
@@ -805,10 +805,10 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
         }
         // Loads to target script
         if ($goto != 'main.php') {
-            include_once './libraries/header.inc.php';
+            include_once 'libraries/header.inc.php';
         }
         $active_page = $goto;
-        include './' . $goto;
+        include '' . $goto;
     } else {
         // avoid a redirect loop when last record was deleted
         if (0 == $num_rows && 'sql.php' == $cfg['DefaultTabTable']) {
@@ -862,7 +862,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
         unset($show_query);
     }
     if (isset($printview) && $printview == '1') {
-        include_once './libraries/header_printview.inc.php';
+        include_once 'libraries/header_printview.inc.php';
     } else {
 
         $GLOBALS['js_include'][] = 'functions.js';
@@ -873,19 +873,19 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
 
         if (! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) {
             if (strlen($table)) {
-                include './libraries/tbl_common.php';
+                include 'libraries/tbl_common.php';
                 $url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
-                include './libraries/tbl_info.inc.php';
-                include './libraries/tbl_links.inc.php';
+                include 'libraries/tbl_info.inc.php';
+                include 'libraries/tbl_links.inc.php';
             } elseif (strlen($db)) {
-                include './libraries/db_common.inc.php';
-                include './libraries/db_info.inc.php';
+                include 'libraries/db_common.inc.php';
+                include 'libraries/db_info.inc.php';
             } else {
-                include './libraries/server_common.inc.php';
-                include './libraries/server_links.inc.php';
+                include 'libraries/server_common.inc.php';
+                include 'libraries/server_links.inc.php';
             }
         } else {
-            include_once './libraries/header.inc.php';
+            include_once 'libraries/header.inc.php';
             //we don't need to buffer the output in PMA_showMessage here.
             //set a global variable and check against it in the function
             $GLOBALS['buffer_message'] = false;
@@ -943,7 +943,7 @@ $(document).ready(makeProfilingChart);
 
         echo '</table>' . "\n";
         echo '</div>';
-        //require_once './libraries/chart.lib.php';
+        //require_once 'libraries/chart.lib.php';
         echo '<div id="profilingchart" style="display:none;">';
         //PMA_chart_profiling($profiling_results);
         echo json_encode($chart_json);
@@ -1041,6 +1041,6 @@ $(document).ready(makeProfilingChart);
  * Displays the footer
  */
 if (! isset($_REQUEST['table_maintenance'])) {
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
 }
 ?>