From adb39168cc384d7a808f836cf2e9f9585b82f864 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Sun, 1 Apr 2007 09:51:41 +0000
Subject: [PATCH] coding standard: no braces around include

---
 browse_foreigners.php                         | 12 ++++-----
 calendar.php                                  |  6 ++---
 chk_rel.php                                   |  8 +++---
 db_create.php                                 |  8 +++---
 db_datadict.php                               | 10 +++----
 db_export.php                                 | 12 ++++-----
 db_import.php                                 | 10 +++----
 db_sql.php                                    |  6 ++---
 import.php                                    | 22 ++++++++--------
 libraries/auth/config.auth.lib.php            |  6 ++---
 libraries/auth/http.auth.lib.php              |  4 +--
 libraries/charset_conversion.lib.php          | 14 +++++-----
 libraries/common.inc.php                      |  2 +-
 libraries/database_interface.lib.php          |  6 ++---
 libraries/db_common.inc.php                   |  6 ++---
 libraries/db_links.inc.php                    |  2 +-
 libraries/display_create_database.lib.php     |  4 +--
 libraries/display_create_table.lib.php        |  2 +-
 libraries/display_export.lib.php              |  8 +++---
 libraries/display_import.lib.php              |  6 ++---
 libraries/export/excel.php                    |  2 +-
 libraries/export/ods.php                      |  4 +--
 libraries/export/odt.php                      |  4 +--
 libraries/export/pdf.php                      |  2 +-
 libraries/export/xls.php                      |  2 +-
 libraries/footer.inc.php                      |  2 +-
 libraries/header_printview.inc.php            |  6 ++---
 libraries/language.lib.php                    |  2 +-
 libraries/mult_submits.inc.php                | 20 +++++++-------
 libraries/navigation_header.inc.php           |  2 +-
 libraries/opendocument.lib.php                |  2 +-
 libraries/relation_cleanup.lib.php            |  2 +-
 libraries/server_links.inc.php                |  4 +--
 libraries/sqlparser.lib.php                   |  6 ++---
 libraries/sqlvalidator.class.php              |  2 +-
 libraries/sqlvalidator.lib.php                |  2 +-
 libraries/storage_engines.lib.php             |  2 +-
 libraries/tbl_common.php                      |  6 ++---
 libraries/tbl_info.inc.php                    |  2 +-
 libraries/tbl_links.inc.php                   |  6 ++---
 libraries/tbl_properties.inc.php              | 10 +++----
 .../application_octetstream__hex.inc.php      |  2 +-
 .../image_jpeg__inline.inc.php                |  2 +-
 .../transformations/image_jpeg__link.inc.php  |  2 +-
 .../transformations/image_png__inline.inc.php |  2 +-
 .../text_plain__dateformat.inc.php            |  2 +-
 .../text_plain__external.inc.php              |  2 +-
 .../text_plain__imagelink.inc.php             |  2 +-
 .../transformations/text_plain__link.inc.php  |  2 +-
 .../text_plain__substr.inc.php                |  2 +-
 pdf_pages.php                                 | 12 ++++-----
 pdf_schema.php                                | 12 ++++-----
 phpinfo.php                                   |  2 +-
 scripts/check_lang.php                        |  2 +-
 scripts/setup.php                             |  2 +-
 server_collations.php                         | 12 ++++-----
 server_engines.php                            | 10 +++----
 server_export.php                             |  8 +++---
 server_import.php                             | 10 +++----
 server_privileges.php                         | 26 +++++++++----------
 server_processlist.php                        |  8 +++---
 server_sql.php                                |  2 +-
 show_config_errors.php                        |  2 +-
 sql.php                                       |  2 +-
 tbl_addfield.php                              | 16 ++++++------
 tbl_alter.php                                 | 22 ++++++++--------
 tbl_export.php                                | 12 ++++-----
 tbl_import.php                                | 12 ++++-----
 tbl_relation.php                              | 12 ++++-----
 tbl_row_action.php                            | 16 ++++++------
 tbl_select.php                                | 18 ++++++-------
 tbl_sql.php                                   | 12 ++++-----
 themes.php                                    |  6 ++---
 transformation_wrapper.php                    | 10 +++----
 user_password.php                             | 12 ++++-----
 75 files changed, 260 insertions(+), 260 deletions(-)

diff --git a/browse_foreigners.php b/browse_foreigners.php
index 4ea4bef50..13daf3454 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -9,22 +9,22 @@
 /**
  * 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';
 $field = urldecode($field);
 
 /**
  * Displays the frame
  */
 $per_page = 200;
-require_once('./libraries/relation.lib.php'); // foreign keys
-require_once('./libraries/transformations.lib.php'); // Transformations
+require_once './libraries/relation.lib.php'; // foreign keys
+require_once './libraries/transformations.lib.php'; // Transformations
 $cfgRelation = PMA_getRelationsParam();
 $foreigners  = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE);
 
@@ -39,7 +39,7 @@ if (isset($foreign_navig) && $foreign_navig == $strShowAll) {
     unset($foreign_limit);
 }
 
-require('./libraries/get_foreign.lib.php');
+require './libraries/get_foreign.lib.php';
 
 if (isset($pk)) {
     $pk_uri = '&amp;pk=' . urlencode($pk);
diff --git a/calendar.php b/calendar.php
index fe46fc35e..64262f7c5 100644
--- a/calendar.php
+++ b/calendar.php
@@ -8,10 +8,10 @@
 /**
  *
  */
-require_once('./libraries/common.inc.php');
-require_once('./libraries/header_http.inc.php');
+require_once './libraries/common.inc.php';
+require_once './libraries/header_http.inc.php';
 $page_title = $strCalendar;
-require('./libraries/header_meta_style.inc.php');
+require './libraries/header_meta_style.inc.php';
 ?>
 <script type="text/javascript" language="javascript" src="./js/tbl_change.js"></script>
 <script type="text/javascript" language="javascript">
diff --git a/chk_rel.php b/chk_rel.php
index 9c0bcf747..a70e86ceb 100644
--- a/chk_rel.php
+++ b/chk_rel.php
@@ -8,9 +8,9 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/common.inc.php');
-require_once('./libraries/db_common.inc.php');
-require_once('./libraries/relation.lib.php');
+require_once './libraries/common.inc.php';
+require_once './libraries/db_common.inc.php';
+require_once './libraries/relation.lib.php';
 
 
 /**
@@ -22,5 +22,5 @@ $cfgRelation = PMA_getRelationsParam(TRUE);
 /**
  * Displays the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/db_create.php b/db_create.php
index 35542cc49..8e86c622e 100644
--- a/db_create.php
+++ b/db_create.php
@@ -8,10 +8,10 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 $js_to_run = 'functions.js';
-require_once('./libraries/header.inc.php');
-require_once('./libraries/mysql_charsets.lib.php');
+require_once './libraries/header.inc.php';
+require_once './libraries/mysql_charsets.lib.php';
 
 
 PMA_checkParameters(array('db'));
@@ -41,6 +41,6 @@ $result = PMA_DBI_query($sql_query);
  * Displays the result and calls default page
  */
 $message = $strDatabase . ' ' . htmlspecialchars($db) . ' ' . $strHasBeenCreated;
-require_once('./' . $cfg['DefaultTabDatabase']);
+require_once './' . $cfg['DefaultTabDatabase'];
 
 ?>
diff --git a/db_datadict.php b/db_datadict.php
index 69cd5d0cc..8c61a0404 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -8,18 +8,18 @@
 /**
  * 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)) {
-    require_once('./libraries/header.inc.php');
+    require_once './libraries/header.inc.php';
 }
 
 
 /**
  * Gets the relations settings
  */
-require_once('./libraries/relation.lib.php');
-require_once('./libraries/transformations.lib.php');
+require_once './libraries/relation.lib.php';
+require_once './libraries/transformations.lib.php';
 
 $cfgRelation  = PMA_getRelationsParam();
 
@@ -322,5 +322,5 @@ function printPage()
 <?php
 echo '<br /><br /><input type="button" id="print" value="' . $strPrint . '" onclick="printPage()" />';
 
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/db_export.php b/db_export.php
index 180e082b2..0f63fdcd8 100644
--- a/db_export.php
+++ b/db_export.php
@@ -13,12 +13,12 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 $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
@@ -28,7 +28,7 @@ $export_page_title = $strViewDumpDB;
 // exit if no tables in db found
 if ( $num_tables < 1 ) {
     echo $strDatabaseNoTable;
-    require('./libraries/footer.inc.php');
+    require './libraries/footer.inc.php';
     exit;
 } // end if
 
@@ -65,10 +65,10 @@ $multi_values .= '<br />
         <a href="' . $checkall_url . '&amp;unselectall=1" onclick="setSelectOptions(\'dump\', \'table_select[]\', false); return false;">' . $strUnselectAll . '</a>';
 
 $export_type = 'database';
-require_once('./libraries/display_export.lib.php');
+require_once './libraries/display_export.lib.php';
 
 /**
  * Displays the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/db_import.php b/db_import.php
index f5fbe7d23..94fd9f037 100644
--- a/db_import.php
+++ b/db_import.php
@@ -8,20 +8,20 @@
 /**
  *
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * 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';
 ?>
 
diff --git a/db_sql.php b/db_sql.php
index 77aeef90e..473aeda5f 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -8,19 +8,19 @@
 /**
  *
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Runs common work
  */
-require('./libraries/db_common.inc.php');
+require './libraries/db_common.inc.php';
 require_once './libraries/sql_query_form.lib.php';
 
 /**
  * Gets informations about the database and, if it is empty, move to the
  * "db_structure.php" script where table can be created
  */
-require('./libraries/db_info.inc.php');
+require './libraries/db_info.inc.php';
 if ( $num_tables == 0 && empty( $db_query_force ) ) {
     $sub_part   = '';
     $is_info    = TRUE;
diff --git a/import.php b/import.php
index 9b1d70293..e68ab3206 100644
--- a/import.php
+++ b/import.php
@@ -9,7 +9,7 @@
 /**
  * Get the variables sent or posted to this script and a core script
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 $js_to_run = 'functions.js';
 
 // default values
@@ -49,10 +49,10 @@ if (!empty($sql_query)) {
 // If we didn't get any parameters, either user called this directly, or
 // upload limit has been reached, let's assume the second possibility.
 if ($_POST == array() && $_GET == array()) {
-    require_once('./libraries/header.inc.php');
+    require_once './libraries/header.inc.php';
     $show_error_header = TRUE;
     PMA_showMessage(sprintf($strUploadLimit, '[a@./Documentation.html#faq1_16@_blank]', '[/a]'));
-    require('./libraries/footer.inc.php');
+    require './libraries/footer.inc.php';
 }
 
 // Check needed parameters
@@ -62,7 +62,7 @@ PMA_checkParameters(array('import_type', 'format'));
 $format = PMA_securePath($format);
 
 // Import functions
-require_once('./libraries/import.lib.php');
+require_once './libraries/import.lib.php';
 
 // Create error and goto url
 if ($import_type == 'table') {
@@ -132,7 +132,7 @@ $bookmark_created = FALSE;
 
 // Bookmark Support: get a query back from bookmark if required
 if (!empty($id_bookmark)) {
-    require_once('./libraries/bookmark.lib.php');
+    require_once './libraries/bookmark.lib.php';
     switch ($action_bookmark) {
         case 0: // bookmarked query that have to be run
             $import_text = PMA_queryBookmarks($db, $cfg['Bookmark'], $id_bookmark, 'id', isset($action_bookmark_all));
@@ -167,7 +167,7 @@ if (isset($GLOBALS['show_as_php'])) {
 
 // Store the query as a bookmark before executing it if bookmarklabel was given
 if (!empty($bkm_label) && !empty($import_text)) {
-    require_once('./libraries/bookmark.lib.php');
+    require_once './libraries/bookmark.lib.php';
     $bfields = array(
                  'dbase' => $db,
                  'user'  => $cfg['Bookmark']['user'],
@@ -276,7 +276,7 @@ if ($import_file != 'none' && !$error) {
                 break;
             case 'application/zip':
                 if ($cfg['GZipDump'] && @function_exists('gzinflate')) {
-                    include_once('./libraries/unzip.lib.php');
+                    include_once './libraries/unzip.lib.php';
                     $import_handle = new SimpleUnzip();
                     $import_handle->ReadFile($import_file);
                     if ($import_handle->Count() == 0) {
@@ -355,7 +355,7 @@ if (!$error) {
     } else {
         // Do the real import
         $plugin_param = $import_type;
-        require('./libraries/import/' . $format . '.php');
+        require './libraries/import/' . $format . '.php';
     }
 }
 
@@ -397,7 +397,7 @@ if ($timeout_passed) {
 
 // Parse and analyze the query, for correct db and table name
 // in case of a query typed in the query window
-require_once('./libraries/parse_analyze.lib.php');
+require_once './libraries/parse_analyze.lib.php';
 
 // There was an error?
 if (isset($my_die)) {
@@ -414,10 +414,10 @@ if ($go_sql) {
         // Set pos to zero to possibly append limit
         $pos = 0;
     }
-    require('./sql.php');
+    require './sql.php';
 } else {
     $active_page = $goto;
-    require('./' . $goto);
+    require './' . $goto;
 }
 exit();
 ?>
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index 8bc8baaa5..817b6c263 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -81,7 +81,7 @@ function PMA_auth_fails()
     header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
     /* HTML header */
     $page_title = $GLOBALS['strAccessDenied'];
-    require('./libraries/header_meta_style.inc.php');
+    require './libraries/header_meta_style.inc.php';
     ?>
 </head>
 
@@ -137,7 +137,7 @@ function PMA_auth_fails()
 <?php
     if (count($GLOBALS['cfg']['Servers']) > 1) {
         // offer a chance to login to other servers if the current one failed
-        require_once('./libraries/select_server.lib.php');
+        require_once './libraries/select_server.lib.php';
         echo '<tr>' . "\n";
         echo ' <td>' . "\n";
         PMA_select_server(TRUE, TRUE);
@@ -145,7 +145,7 @@ function PMA_auth_fails()
         echo '</tr>' . "\n";
     }
     echo '</table>' . "\n";
-    require_once('./libraries/footer.inc.php');
+    require_once './libraries/footer.inc.php';
     return TRUE;
 } // end of the 'PMA_auth_fails()' function
 
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
index 404146d64..8d8191e71 100644
--- a/libraries/auth/http.auth.lib.php
+++ b/libraries/auth/http.auth.lib.php
@@ -47,7 +47,7 @@ function PMA_auth() {
 </head>
 <body>
 <?php if (file_exists('./config.header.inc.php')) {
-          require('./config.header.inc.php');
+          require './config.header.inc.php';
       }
  ?>
 
@@ -59,7 +59,7 @@ function PMA_auth() {
 <div class="warning"><?php echo $GLOBALS['strWrongUser']; ?></div>
 
 <?php if (file_exists('./config.footer.inc.php')) {
-         require('./config.footer.inc.php');
+         require './config.footer.inc.php';
       }
  ?>
 
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index 110c69cef..d4d699ae7 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -85,10 +85,10 @@ if (isset($cfg['AllowAnywhereRecoding'])
             $PMA_recoding_engine = PMA_CHARSET_NONE;
 
             if (!isset($GLOBALS['is_header_sent'])) {
-                include('./libraries/header.inc.php');
+                include './libraries/header.inc.php';
             }
             echo $strCantUseRecodeIconv;
-            require_once('./libraries/footer.inc.php');
+            require_once './libraries/footer.inc.php';
             exit();
         }
     } elseif ($PMA_recoding_engine == 'recode') {
@@ -97,9 +97,9 @@ if (isset($cfg['AllowAnywhereRecoding'])
         } else {
             $PMA_recoding_engine = PMA_CHARSET_NONE;
 
-            require_once('./libraries/header.inc.php');
+            require_once './libraries/header.inc.php';
             echo $strCantUseRecodeIconv;
-            require_once('./libraries/footer.inc.php');
+            require_once './libraries/footer.inc.php';
             exit;
         }
     } else {
@@ -116,9 +116,9 @@ if (isset($cfg['AllowAnywhereRecoding'])
         } else {
             $PMA_recoding_engine = PMA_CHARSET_NONE;
 
-            require_once('./libraries/header.inc.php');
+            require_once './libraries/header.inc.php';
             echo $strCantUseRecodeIconv;
-            require_once('./libraries/footer.inc.php');
+            require_once './libraries/footer.inc.php';
             exit;
         }
     }
@@ -128,7 +128,7 @@ if (isset($cfg['AllowAnywhereRecoding'])
 
 /* Load AIX iconv wrapper if needed */
 if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) {
-    require_once('./libraries/iconv_wrapper.lib.php');
+    require_once './libraries/iconv_wrapper.lib.php';
 }
 
 /**
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 7910f91f9..2f76062ff 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -381,7 +381,7 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
     /**
      * Require cleanup functions
      */
-    require_once('./libraries/cleanup.lib.php');
+    require_once './libraries/cleanup.lib.php';
     /**
      * Do actual cleanup
      */
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 4b9046f78..61543e480 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -74,7 +74,7 @@ if ( ! PMA_DBI_checkAndLoadMysqlExtension( $GLOBALS['cfg']['Server']['extension'
 /**
  * Including The DBI Plugin
  */
-require_once('./libraries/dbi/' . $GLOBALS['cfg']['Server']['extension'] . '.dbi.lib.php');
+require_once './libraries/dbi/' . $GLOBALS['cfg']['Server']['extension'] . '.dbi.lib.php';
 
 /**
  * Common Functions
@@ -143,7 +143,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');
+                require_once './libraries/iconv_wrapper.lib.php';
                 $message = PMA_aix_iconv_wrapper( $encodings[$server_language],
                     $GLOBALS['charset'] . $GLOBALS['cfg']['IconvExtraParams'], $message);
             } else {
@@ -875,7 +875,7 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
             $GLOBALS['cfg']['ColumnTypes'][] = 'VARBINARY';
         }
     } else {
-        require_once('./libraries/charset_conversion.lib.php');
+        require_once './libraries/charset_conversion.lib.php';
     }
 }
 
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index 8a3f69ae4..7f0ebbe65 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -8,8 +8,8 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/common.inc.php');
-require_once('./libraries/bookmark.lib.php');
+require_once './libraries/common.inc.php';
+require_once './libraries/bookmark.lib.php';
 
 PMA_checkParameters(array('db'));
 
@@ -56,7 +56,7 @@ if (isset($submitcollation) && !empty($db_collation) && PMA_MYSQL_INT_VERSION >=
 }
 
 $js_to_run = 'functions.js';
-require_once('./libraries/header.inc.php');
+require_once './libraries/header.inc.php';
 
 /**
  * Set parameters for links
diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index 1bd1be587..80b10b3e4 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 require_once './libraries/relation.lib.php';
 /**
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
index 75a06d70f..65c37d6c8 100644
--- a/libraries/display_create_database.lib.php
+++ b/libraries/display_create_database.lib.php
@@ -9,7 +9,7 @@
 /**
  *
  */
-require_once('./libraries/check_user_privileges.lib.php');
+require_once './libraries/check_user_privileges.lib.php';
 
 if ($is_create_db_priv) {
     // The user is allowed to create a db
@@ -21,7 +21,7 @@ if ($is_create_db_priv) {
             <input type="text" name="db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" id="text_create_db"/>
             <?php
     if (PMA_MYSQL_INT_VERSION >= 40101) {
-        require_once('./libraries/mysql_charsets.lib.php');
+        require_once './libraries/mysql_charsets.lib.php';
         echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', null, null, TRUE, 5);
     }
             ?>
diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php
index 2102f7145..4e9e5b772 100644
--- a/libraries/display_create_table.lib.php
+++ b/libraries/display_create_table.lib.php
@@ -9,7 +9,7 @@
 /**
  *
  */
-require_once('./libraries/check_user_privileges.lib.php');
+require_once './libraries/check_user_privileges.lib.php';
 
 // for MySQL >= 4.1.0, we should be able to detect if user has a CREATE
 // privilege by looking at SHOW GRANTS output;
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 5a8c42738..ee8047bea 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -11,12 +11,12 @@
 require_once './libraries/Table.class.php';
 
 // Get relations & co. status
-require_once('./libraries/relation.lib.php');
+require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 
-require_once('./libraries/file_listing.php');
-require_once('./libraries/plugin_interface.lib.php');
+require_once './libraries/file_listing.php';
+require_once './libraries/plugin_interface.lib.php';
 
 function PMA_exportCheckboxCheck($str) {
     if (isset($GLOBALS['cfg']['Export'][$str]) && $GLOBALS['cfg']['Export'][$str]) {
@@ -38,7 +38,7 @@ if (empty($export_list)) {
     $GLOBALS['show_error_header'] = TRUE;
     PMA_showMessage($strCanNotLoadExportPlugins);
     unset($GLOBALS['show_error_header']);
-    require('./libraries/footer.inc.php');
+    require './libraries/footer.inc.php';
 }
 ?>
 
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index ed0f4bf2a..af1296ec0 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -8,8 +8,8 @@
 /**
  *
  */
-require_once('./libraries/file_listing.php');
-require_once('./libraries/plugin_interface.lib.php');
+require_once './libraries/file_listing.php';
+require_once './libraries/plugin_interface.lib.php';
 
 /* Scan for plugins */
 $import_list = PMA_getPlugins('./libraries/import/', $import_type);
@@ -19,7 +19,7 @@ if (empty($import_list)) {
     $GLOBALS['show_error_header'] = TRUE;
     PMA_showMessage($strCanNotLoadImportPlugins);
     unset($GLOBALS['show_error_header']);
-    require('./libraries/footer.inc.php');
+    require './libraries/footer.inc.php';
 }
 ?>
 
diff --git a/libraries/export/excel.php b/libraries/export/excel.php
index 667182fea..efa859871 100644
--- a/libraries/export/excel.php
+++ b/libraries/export/excel.php
@@ -24,6 +24,6 @@ if (isset($plugin_list)) {
         );
 } else {
     /* Everything rest is coded in csv plugin */
-    require('./libraries/export/csv.php');
+    require './libraries/export/csv.php';
 }
 ?>
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index 764bc8ff8..09ba82505 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -25,7 +25,7 @@ if (isset($plugin_list)) {
 } else {
 
 $GLOBALS['ods_buffer'] = '';
-require_once('./libraries/opendocument.lib.php');
+require_once './libraries/opendocument.lib.php';
 
 /**
  * Outputs comment
@@ -155,7 +155,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
                 $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
                     . '<text:p>' . htmlspecialchars($GLOBALS[$what . '_null']) . '</text:p>'
                     . '</table:table-cell>';
-            // ignore BLOB 
+            // ignore BLOB
             } elseif (stristr($field_flags[$j], 'BINARY')
                     && $fields_meta[$j]->blob) {
                 $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index b3f74bf4d..c4a106ab0 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -53,7 +53,7 @@ if (isset($plugin_list)) {
 } else {
 
 $GLOBALS['odt_buffer'] = '';
-require_once('./libraries/opendocument.lib.php');
+require_once './libraries/opendocument.lib.php';
 
 /**
  * Outputs comment
@@ -186,7 +186,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
                 $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
                     . '<text:p>' . htmlspecialchars($GLOBALS[$what . '_null']) . '</text:p>'
                     . '</table:table-cell>';
-            // ignore BLOB 
+            // ignore BLOB
             } elseif (stristr($field_flags[$j], 'BINARY')
                     && $fields_meta[$j]->blob) {
                 $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index bfbef260a..cd181aa2c 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -30,7 +30,7 @@ if (isset($plugin_list)) {
  * @todo Make this configuratble (at least Sans/Serif).
  */
 define('PMA_PDF_FONT', 'DejaVuSans');
-require_once('./libraries/tcpdf/tcpdf.php');
+require_once './libraries/tcpdf/tcpdf.php';
 
 // Adapted from a LGPL script by Philip Clarke
 
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index 8b88bf3f4..65b6daafd 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -11,7 +11,7 @@
  */
 // Check if we have native MS Excel export using PEAR class Spreadsheet_Excel_Writer
 if (!empty($GLOBALS['cfg']['TempDir'])) {
-    @include_once('Spreadsheet/Excel/Writer.php');
+    @include_once 'Spreadsheet/Excel/Writer.php';
     if (class_exists('Spreadsheet_Excel_Writer')) {
         $xls = TRUE;
     } else {
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 5e3528523..17190bba0 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -162,7 +162,7 @@ if (! empty($GLOBALS['userlink'])) {
 
 // Include possible custom footers
 if (file_exists('./config.footer.inc.php')) {
-    require('./config.footer.inc.php');
+    require './config.footer.inc.php';
 }
 
 
diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
index a766bbd03..0eb0ab300 100644
--- a/libraries/header_printview.inc.php
+++ b/libraries/header_printview.inc.php
@@ -8,8 +8,8 @@
 /**
  * Gets a core script and starts output buffering work
  */
-require_once('./libraries/common.inc.php');
-require_once('./libraries/ob.lib.php');
+require_once './libraries/common.inc.php';
+require_once './libraries/ob.lib.php';
 PMA_outBufferPre();
 
 // Check parameters
@@ -21,7 +21,7 @@ PMA_checkParameters(array('db', 'full_sql_query'));
 // to a seperate file. It can now be included by libraries/header.inc.php,
 // querywindow.php.
 
-require_once('./libraries/header_http.inc.php');
+require_once './libraries/header_http.inc.php';
 
 /**
  * Sends the beginning of the html page then returns to the calling script
diff --git a/libraries/language.lib.php b/libraries/language.lib.php
index d8e8d6105..cc2a606bb 100644
--- a/libraries/language.lib.php
+++ b/libraries/language.lib.php
@@ -9,7 +9,7 @@
 /**
  * lang detection is done here
  */
-require_once('./libraries/select_lang.lib.php');
+require_once './libraries/select_lang.lib.php';
 
 // Load the translation
 require_once $lang_path . $available_languages[$GLOBALS['lang']][1] . '.inc.php';
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index ecb1c8ac7..9b7b7f279 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -21,7 +21,7 @@ if (!empty($submit_mult)
         $what         = 'drop_db';
     } elseif (isset($selected_tbl) && !empty($selected_tbl)) {
         if ($submit_mult == $strPrintView) {
-            require('./tbl_printview.php');
+            require './tbl_printview.php';
         } else {
            $selected = $selected_tbl;
            switch ($submit_mult) {
@@ -100,7 +100,7 @@ if (!empty($submit_mult)
                 $mult_btn   = $strYes;
                 break;
             case $strChange:
-                require('./tbl_alter.php');
+                require './tbl_alter.php';
                 break;
             case $strBrowse:
                 $sql_query = '';
@@ -112,7 +112,7 @@ if (!empty($submit_mult)
                     }
                 }
                 $sql_query .= ' FROM ' . PMA_backquote(htmlspecialchars($table));
-                require('./sql.php');
+                require './sql.php';
                 break;
         }
     } else {
@@ -129,12 +129,12 @@ if ( !empty($submit_mult) && !empty($what)) {
     $js_to_run = 'functions.js';
     unset($message);
     if (strlen($table)) {
-        require('./libraries/tbl_common.php');
+        require './libraries/tbl_common.php';
         $url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
-        require('./libraries/tbl_info.inc.php');
+        require './libraries/tbl_info.inc.php';
     } elseif (strlen($db)) {
-        require('./libraries/db_common.inc.php');
-        require('./libraries/db_info.inc.php');
+        require './libraries/db_common.inc.php';
+        require './libraries/db_info.inc.php';
     }
     // Builds the query
     $full_query     = '';
@@ -270,7 +270,7 @@ if ( !empty($submit_mult) && !empty($what)) {
     <input type="submit" name="mult_btn" value="<?php echo $strNo; ?>" id="buttonNo" />
 </fieldset>
     <?php
-    require_once('./libraries/footer.inc.php');
+    require_once './libraries/footer.inc.php';
 } // end if
 
 
@@ -280,7 +280,7 @@ if ( !empty($submit_mult) && !empty($what)) {
 elseif ($mult_btn == $strYes) {
 
     if ($query_type == 'drop_db' || $query_type == 'drop_tbl' || $query_type == 'drop_fld') {
-        require_once('./libraries/relation_cleanup.lib.php');
+        require_once './libraries/relation_cleanup.lib.php';
     }
 
     $sql_query      = '';
@@ -420,7 +420,7 @@ elseif ($mult_btn == $strYes) {
     }
 
     if ($use_sql) {
-        require('./sql.php');
+        require './sql.php';
     } elseif (!$run_parts) {
         PMA_DBI_select_db($db);
         $result = PMA_DBI_query($sql_query);
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 88ab9d3b5..f84920f3b 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -92,7 +92,7 @@ echo '</div>' . "\n";
  * Displays the MySQL servers choice form
  */
 if ($GLOBALS['cfg']['LeftDisplayServers'] && (count($GLOBALS['cfg']['Servers']) > 1 || $server == 0 && count($GLOBALS['cfg']['Servers']) == 1)) {
-    include('./libraries/select_server.lib.php');
+    include './libraries/select_server.lib.php';
     PMA_select_server(true, true);
     echo '<hr />';
 } // end if LeftDisplayServers
diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php
index 72c7cf169..116655607 100644
--- a/libraries/opendocument.lib.php
+++ b/libraries/opendocument.lib.php
@@ -9,7 +9,7 @@
 /**
  *
  */
-require_once('./libraries/zip.lib.php');
+require_once './libraries/zip.lib.php';
 
 $GLOBALS['OpenDocumentNS'] = 'xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" '
                 . 'xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" '
diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php
index ac371be22..65d034e9d 100644
--- a/libraries/relation_cleanup.lib.php
+++ b/libraries/relation_cleanup.lib.php
@@ -9,7 +9,7 @@
 /**
  *
  */
-require_once('./libraries/relation.lib.php');
+require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 function PMA_relationsCleanupColumn($db, $table, $column) {
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index 6b12cabca..321a68e29 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -8,8 +8,8 @@
 /**
  * Check parameters
  */
-require_once('./libraries/common.inc.php');
-require_once('./libraries/server_common.inc.php');
+require_once './libraries/common.inc.php';
+require_once './libraries/server_common.inc.php';
 
 PMA_checkParameters(array('is_superuser', 'url_query'), TRUE, FALSE);
 
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index c656806c1..2c38b44f9 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -38,13 +38,13 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
     /**
      * Include the string library as we use it heavily
      */
-    require_once('./libraries/string.lib.php');
+    require_once './libraries/string.lib.php';
 
     /**
      * Include data for the SQL Parser
      */
-    require_once('./libraries/sqlparser.data.php');
-    require_once('./libraries/mysql_charsets.lib.php');
+    require_once './libraries/sqlparser.data.php';
+    require_once './libraries/mysql_charsets.lib.php';
     if (!isset($mysql_charsets)) {
         $mysql_charsets = array();
         $mysql_charsets_count = 0;
diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php
index a1b825385..95ccd498a 100644
--- a/libraries/sqlvalidator.class.php
+++ b/libraries/sqlvalidator.class.php
@@ -28,7 +28,7 @@
 * @version  $Id$
 */
 
-@include_once('SOAP/Client.php');
+@include_once 'SOAP/Client.php';
 
 if (!function_exists('class_exists') || !class_exists('SOAP_Client')) {
     $GLOBALS['sqlvalidator_error'] = TRUE;
diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php
index eb7fa1617..a2d61e154 100644
--- a/libraries/sqlvalidator.lib.php
+++ b/libraries/sqlvalidator.lib.php
@@ -36,7 +36,7 @@
  * For now we actually use a configuration flag
  */
 if ($cfg['SQLValidator']['use'] == TRUE)  {
-    require_once('./libraries/sqlvalidator.class.php');
+    require_once './libraries/sqlvalidator.class.php';
 } // if ($cfg['SQLValidator']['use'] == TRUE)
 
 
diff --git a/libraries/storage_engines.lib.php b/libraries/storage_engines.lib.php
index f388ab669..6471e6a1a 100644
--- a/libraries/storage_engines.lib.php
+++ b/libraries/storage_engines.lib.php
@@ -151,7 +151,7 @@ class PMA_StorageEngine
     {
         $engine = str_replace('/', '', str_replace('.', '', $engine));
         if (file_exists('./libraries/engines/' . $engine . '.lib.php')
-          && include_once('./libraries/engines/' . $engine . '.lib.php')) {
+          && include_once './libraries/engines/' . $engine . '.lib.php') {
             $class_name = 'PMA_StorageEngine_' . $engine;
             $engine_object = new $class_name($engine);
         } else {
diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php
index f6d215fa0..1c259a6a0 100644
--- a/libraries/tbl_common.php
+++ b/libraries/tbl_common.php
@@ -8,8 +8,8 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/common.inc.php');
-require_once('./libraries/bookmark.lib.php');
+require_once './libraries/common.inc.php';
+require_once './libraries/bookmark.lib.php';
 
 // Check parameters
 PMA_checkParameters(array('db', 'table'));
@@ -39,6 +39,6 @@ $err_url   = $cfg['DefaultTabTable'] . PMA_generate_common_url( $url_params );
 /**
  * Ensures the database and the table exist (else move to the "parent" script)
  */
-require_once('./libraries/db_table_exists.lib.php');
+require_once './libraries/db_table_exists.lib.php';
 
 ?>
diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php
index e1b154a67..cda254ae3 100644
--- a/libraries/tbl_info.inc.php
+++ b/libraries/tbl_info.inc.php
@@ -20,7 +20,7 @@ require_once './libraries/Table.class.php';
 /**
  * requirements
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 // Check parameters
 PMA_checkParameters(array('db', 'table'));
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index b25493764..3691b6046 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -8,14 +8,14 @@
 /**
  * Check parameters
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 PMA_checkParameters(array('db', 'table'));
 
 /**
  * Prepares links
  */
-require_once('./libraries/bookmark.lib.php');
+require_once './libraries/bookmark.lib.php';
 
 
 /**
@@ -38,7 +38,7 @@ $err_url   = $cfg['DefaultTabTable'] . PMA_generate_common_url( $url_params );
  * Displays headers
  */
 $js_to_run = 'functions.js';
-require_once('./libraries/header.inc.php');
+require_once './libraries/header.inc.php';
 
 /**
  * Displays links
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index a897ff5d8..c4807192c 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -8,13 +8,13 @@
 /**
  * Check parameters
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 PMA_checkParameters(array('db', 'table', 'action', 'num_fields'));
 
 
 // Get available character sets and storage engines
-require_once('./libraries/mysql_charsets.lib.php');
-require_once('./libraries/storage_engines.lib.php');
+require_once './libraries/mysql_charsets.lib.php';
+require_once './libraries/storage_engines.lib.php';
 
 if (is_int($cfg['DefaultPropDisplay'])) {
     if ($num_fields <= $cfg['DefaultPropDisplay']) {
@@ -148,8 +148,8 @@ if (!$is_backup) {
     $header_cells[] = $cfg['PropertiesIconic'] ? '<img class="icon" src="' . $pmaThemeImage . 'b_ftext.png" width="16" height="16" alt="' . $strIdxFulltext . '" title="' . $strIdxFulltext . '" />' : $strIdxFulltext;
 }
 
-require_once('./libraries/relation.lib.php');
-require_once('./libraries/transformations.lib.php');
+require_once './libraries/relation.lib.php';
+require_once './libraries/transformations.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 $comments_map = array();
diff --git a/libraries/transformations/application_octetstream__hex.inc.php b/libraries/transformations/application_octetstream__hex.inc.php
index c4e675e80..38c0e0e9d 100644
--- a/libraries/transformations/application_octetstream__hex.inc.php
+++ b/libraries/transformations/application_octetstream__hex.inc.php
@@ -10,7 +10,7 @@
  */
 function PMA_transformation_application_octetstream__hex($buffer, $options = array(), $meta = '') {
     // possibly use a global transform and feed it with special options:
-    // include('./libraries/transformations/global.inc.php');
+    // include './libraries/transformations/global.inc.php';
     if (!isset($options[0])) {
         $options[0] = 2;
     } else {
diff --git a/libraries/transformations/image_jpeg__inline.inc.php b/libraries/transformations/image_jpeg__inline.inc.php
index 4ed92005e..37f9270a0 100644
--- a/libraries/transformations/image_jpeg__inline.inc.php
+++ b/libraries/transformations/image_jpeg__inline.inc.php
@@ -9,7 +9,7 @@
  *
  */
 function PMA_transformation_image_jpeg__inline($buffer, $options = array(), $meta = '') {
-    require_once('./libraries/transformations/global.inc.php');
+    require_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>');
diff --git a/libraries/transformations/image_jpeg__link.inc.php b/libraries/transformations/image_jpeg__link.inc.php
index 7b46e185d..f81a492f5 100644
--- a/libraries/transformations/image_jpeg__link.inc.php
+++ b/libraries/transformations/image_jpeg__link.inc.php
@@ -9,7 +9,7 @@
  *
  */
 function PMA_transformation_image_jpeg__link($buffer, $options = array(), $meta = '') {
-    require_once('./libraries/transformations/global.inc.php');
+    require_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);
diff --git a/libraries/transformations/image_png__inline.inc.php b/libraries/transformations/image_png__inline.inc.php
index 37a4c18c7..39f31574f 100644
--- a/libraries/transformations/image_png__inline.inc.php
+++ b/libraries/transformations/image_png__inline.inc.php
@@ -9,7 +9,7 @@
  *
  */
 function PMA_transformation_image_png__inline($buffer, $options = array(), $meta = '') {
-    require_once('./libraries/transformations/global.inc.php');
+    require_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>');
diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php
index 6c83746ba..de2f56a64 100644
--- a/libraries/transformations/text_plain__dateformat.inc.php
+++ b/libraries/transformations/text_plain__dateformat.inc.php
@@ -10,7 +10,7 @@
  */
 function PMA_transformation_text_plain__dateformat($buffer, $options = array(), $meta = '') {
     // possibly use a global transform and feed it with special options:
-    // include('./libraries/transformations/global.inc.php');
+    // include './libraries/transformations/global.inc.php';
 
     // further operations on $buffer using the $options[] array.
     if (empty($options[0])) {
diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php
index 44cca5c95..2342362b5 100644
--- a/libraries/transformations/text_plain__external.inc.php
+++ b/libraries/transformations/text_plain__external.inc.php
@@ -22,7 +22,7 @@ function PMA_transformation_text_plain__external_nowrap($options = array()) {
 
 function PMA_transformation_text_plain__external($buffer, $options = array(), $meta = '') {
     // possibly use a global transform and feed it with special options:
-    // include('./libraries/transformations/global.inc.php');
+    // include './libraries/transformations/global.inc.php';
 
     // further operations on $buffer using the $options[] array.
 
diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php
index b8446e78b..729a066a7 100644
--- a/libraries/transformations/text_plain__imagelink.inc.php
+++ b/libraries/transformations/text_plain__imagelink.inc.php
@@ -9,7 +9,7 @@
  *
  */
 function PMA_transformation_text_plain__imagelink($buffer, $options = array(), $meta = '') {
-    require_once('./libraries/transformations/global.inc.php');
+    require_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);
diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php
index ebbf253e1..abe05f220 100644
--- a/libraries/transformations/text_plain__link.inc.php
+++ b/libraries/transformations/text_plain__link.inc.php
@@ -9,7 +9,7 @@
  *
  */
 function PMA_transformation_text_plain__link($buffer, $options = array(), $meta = '') {
-    require_once('./libraries/transformations/global.inc.php');
+    require_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>');
 
diff --git a/libraries/transformations/text_plain__substr.inc.php b/libraries/transformations/text_plain__substr.inc.php
index 4fd1fc141..958e956f9 100644
--- a/libraries/transformations/text_plain__substr.inc.php
+++ b/libraries/transformations/text_plain__substr.inc.php
@@ -10,7 +10,7 @@
  */
 function PMA_transformation_text_plain__substr($buffer, $options = array(), $meta = '') {
     // possibly use a global transform and feed it with special options:
-    // include('./libraries/transformations/global.inc.php');
+    // include './libraries/transformations/global.inc.php';
 
     // further operations on $buffer using the $options[] array.
     if (!isset($options[0]) ||  $options[0] == '') {
diff --git a/pdf_pages.php b/pdf_pages.php
index 5ef6007fb..70394a361 100644
--- a/pdf_pages.php
+++ b/pdf_pages.php
@@ -8,14 +8,14 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/common.inc.php');
-require_once('./libraries/db_common.inc.php');
+require_once './libraries/common.inc.php';
+require_once './libraries/db_common.inc.php';
 
 
 /**
  * Settings for relation stuff
  */
-require_once('./libraries/relation.lib.php');
+require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 // This is to avoid "Command out of sync" errors. Before switching this to
@@ -34,13 +34,13 @@ $query_default_option = PMA_DBI_QUERY_STORE;
 if (!$cfgRelation['relwork']) {
     echo sprintf($strNotSet, 'relation', 'config.inc.php') . '<br />' . "\n"
          . '<a href="./Documentation.html#relation" target="documentation">' . $strDocu . '</a>' . "\n";
-    require_once('./libraries/footer.inc.php');
+    require_once './libraries/footer.inc.php';
 }
 
 if (!$cfgRelation['displaywork']) {
     echo sprintf($strNotSet, 'table_info', 'config.inc.php') . '<br />' . "\n"
          . '<a href="./Documentation.html#table_info" target="documentation">' . $strDocu . '</a>' . "\n";
-    require_once('./libraries/footer.inc.php');
+    require_once './libraries/footer.inc.php';
 }
 
 if (!isset($cfgRelation['table_coords'])){
@@ -567,5 +567,5 @@ ToggleDragDrop('pdflayout');
  * Displays the footer
  */
 echo "\n";
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/pdf_schema.php b/pdf_schema.php
index cbdedc01c..2ff0ba967 100644
--- a/pdf_schema.php
+++ b/pdf_schema.php
@@ -9,13 +9,13 @@
 /**
  * Gets some core scripts
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Settings for relation stuff
  */
-require_once('./libraries/relation.lib.php');
-require_once('./libraries/transformations.lib.php');
+require_once './libraries/relation.lib.php';
+require_once './libraries/transformations.lib.php';
 
 $cfgRelation = PMA_getRelationsParam();
 
@@ -39,7 +39,7 @@ if (!$cfgRelation['pdfwork']) {
  * @todo Make this configuratble (at least Sans/Serif).
  */
 define('PMA_PDF_FONT', 'DejaVuSans');
-require_once('./libraries/tcpdf/tcpdf.php');
+require_once './libraries/tcpdf/tcpdf.php';
 
 /**
  * Extends the "FPDF" class and prepares the work
@@ -228,7 +228,7 @@ class PMA_PDF extends TCPDF {
         global $server, $lang, $convcharset, $db;
         global $charset, $text_dir, $strRunning, $strDatabase;
 
-        require_once('./libraries/header.inc.php');
+        require_once './libraries/header.inc.php';
 
         echo '<p><b>PDF - ' . $GLOBALS['strError'] . '</b></p>' . "\n";
         if (!empty($error_message)) {
@@ -242,7 +242,7 @@ class PMA_PDF extends TCPDF {
          . '">' . $GLOBALS['strBack'] . '</a>';
         echo "\n";
 
-        require_once('./libraries/footer.inc.php');
+        require_once './libraries/footer.inc.php';
     } // end of the "PMA_PDF_die()" function
     /**
      * Aliases the "Error()" function from the FPDF class to the
diff --git a/phpinfo.php b/phpinfo.php
index 461cbf115..7ce16b547 100644
--- a/phpinfo.php
+++ b/phpinfo.php
@@ -9,7 +9,7 @@
  * Gets core libraries and defines some variables
  */
 define( 'PMA_MINIMUM_COMMON', true );
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 
 /**
diff --git a/scripts/check_lang.php b/scripts/check_lang.php
index 5a07c7a88..4ecf9070b 100644
--- a/scripts/check_lang.php
+++ b/scripts/check_lang.php
@@ -19,7 +19,7 @@ $languageDirectory = dir('../lang');
 while ($name = $languageDirectory->read()) {
     if (strpos($name, '.inc.php')) {
         // 1.1 Checks parse errors and extra blank line
-        include('../lang/' . $name);
+        include '../lang/' . $name;
         header('X-Ping: pong');
         // 1.1 Checks "^M"
         $content = fread(fopen('../lang/' . $name, 'r'), filesize('../lang/' . $name));
diff --git a/scripts/setup.php b/scripts/setup.php
index 4ad5a69b7..8fa45e52d 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -16,7 +16,7 @@
 // Grab phpMyAdmin version and PMA_dl function
 define( 'PMA_MINIMUM_COMMON', TRUE );
 chdir('..');
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 // Grab configuration defaults
 // Do not use $PMA_Config, it interferes with the one in $_SESSION
diff --git a/server_collations.php b/server_collations.php
index 9e5a5d4d8..cea97a2a1 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -11,18 +11,18 @@
 if ( ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
     define( 'PMA_NO_VARIABLES_IMPORT', true );
 }
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Does the common work
  */
-require('./libraries/server_common.inc.php');
+require './libraries/server_common.inc.php';
 
 
 /**
  * Displays the links
  */
-require('./libraries/server_links.inc.php');
+require './libraries/server_links.inc.php';
 
 
 /**
@@ -41,14 +41,14 @@ echo '<h2>' . "\n"
  * @todo Some nice Message :-)
  */
 if (PMA_MYSQL_INT_VERSION < 40100) {
-    require_once('./libraries/footer.inc.php');
+    require_once './libraries/footer.inc.php';
 }
 
 
 /**
  * Includes the required charset library
  */
-require_once('./libraries/mysql_charsets.lib.php');
+require_once './libraries/mysql_charsets.lib.php';
 
 
 /**
@@ -101,6 +101,6 @@ unset($table_row_count);
 echo '</table>' . "\n"
    . '</div>' . "\n";
 
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 
 ?>
diff --git a/server_engines.php b/server_engines.php
index 97b156872..7e7361425 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -16,19 +16,19 @@ if ( ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
 /**
  * requirements
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Does the common work
  */
-require('./libraries/server_common.inc.php');
-require('./libraries/storage_engines.lib.php');
+require './libraries/server_common.inc.php';
+require './libraries/storage_engines.lib.php';
 
 
 /**
  * Displays the links
  */
-require('./libraries/server_links.inc.php');
+require './libraries/server_links.inc.php';
 
 /**
  * defines
@@ -250,6 +250,6 @@ if ( empty($_REQUEST['engine'])
 /**
  * Sends the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 
 ?>
diff --git a/server_export.php b/server_export.php
index 856c16741..45a405963 100644
--- a/server_export.php
+++ b/server_export.php
@@ -8,14 +8,14 @@
 /**
  * Does the common work
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 $js_to_run = 'functions.js';
 
 /**
  * Displays the links
  */
-require('./libraries/server_links.inc.php');
+require './libraries/server_links.inc.php';
 
 $export_page_title = $strViewDumpDatabases . "\n";
 $multi_values = '<div align="center"><select name="db_select[]" size="6" multiple="multiple">';
@@ -44,11 +44,11 @@ $multi_values .= '<br />
         <br /><br />';
 
 $export_type = 'server';
-require_once('./libraries/display_export.lib.php');
+require_once './libraries/display_export.lib.php';
 
 
 /**
  * Displays the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/server_import.php b/server_import.php
index cfbfdf50e..4622ab982 100644
--- a/server_import.php
+++ b/server_import.php
@@ -8,24 +8,24 @@
 /**
  *
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Does the common work
  */
-require('./libraries/server_common.inc.php');
+require './libraries/server_common.inc.php';
 
 
 /**
  * Displays the links
  */
-require('./libraries/server_links.inc.php');
+require './libraries/server_links.inc.php';
 
 $import_type = 'server';
-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';
 ?>
 
diff --git a/server_privileges.php b/server_privileges.php
index c45ff1a7a..28f156bbb 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -8,13 +8,13 @@
 /**
  *
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Does the common work
  */
 $js_to_run = 'server_privileges.js';
-require('./libraries/server_common.inc.php');
+require './libraries/server_common.inc.php';
 
 
 /**
@@ -43,13 +43,13 @@ if ( isset( $dbname ) ) {
  * Checks if the user is allowed to do what he tries to...
  */
 if (!$is_superuser) {
-    require('./libraries/server_links.inc.php');
+    require './libraries/server_links.inc.php';
     echo '<h2>' . "\n"
        . ($GLOBALS['cfg']['MainPageIconic'] ? '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 'b_usrlist.png" alt="" />' : '')
        . $GLOBALS['strPrivileges'] . "\n"
        . '</h2>' . "\n"
        . $GLOBALS['strNoPrivileges'] . "\n";
-    require_once('./libraries/footer.inc.php');
+    require_once './libraries/footer.inc.php';
 }
 
 /**
@@ -1236,15 +1236,15 @@ if (!empty($flush_privileges)) {
  * Displays the links
  */
 if (isset($viewing_mode) && $viewing_mode == 'db') {
-     $db = $checkprivs;
-     $url_query .= '&amp;goto=db_operations.php';
+    $db = $checkprivs;
+    $url_query .= '&amp;goto=db_operations.php';
 
-     // Gets the database structure
-     $sub_part = '_structure';
-     require('./libraries/db_info.inc.php');
-     echo "\n";
+    // Gets the database structure
+    $sub_part = '_structure';
+    require './libraries/db_info.inc.php';
+    echo "\n";
 } else {
-    require('./libraries/server_links.inc.php');
+    require './libraries/server_links.inc.php';
 }
 
 
@@ -1603,7 +1603,7 @@ if ( empty( $adduser ) && ( ! isset( $checkprivs ) || ! strlen($checkprivs) ) )
         if ( $user_does_not_exists ) {
             echo $GLOBALS['strUserNotFound'];
             PMA_displayLoginInformationFields();
-            //require_once('./libraries/footer.inc.php');
+            //require_once './libraries/footer.inc.php';
         }
         echo '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post">' . "\n"
            . PMA_generate_common_hidden_inputs('', '', 3)
@@ -2182,6 +2182,6 @@ if ( empty( $adduser ) && ( ! isset( $checkprivs ) || ! strlen($checkprivs) ) )
  * Displays the footer
  */
 echo "\n\n";
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 
 ?>
diff --git a/server_processlist.php b/server_processlist.php
index b483de234..a112da32d 100644
--- a/server_processlist.php
+++ b/server_processlist.php
@@ -8,12 +8,12 @@
 /**
  *
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Does the common work
  */
-require_once('./libraries/server_common.inc.php');
+require_once './libraries/server_common.inc.php';
 
 
 /**
@@ -31,7 +31,7 @@ if (!empty($kill)) {
 /**
  * Displays the links
  */
-require('./libraries/server_links.inc.php');
+require './libraries/server_links.inc.php';
 
 
 /**
@@ -100,5 +100,5 @@ while($process = PMA_DBI_fetch_assoc($result)) {
 /**
  * Sends the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/server_sql.php b/server_sql.php
index 53518bc93..449025aa3 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Does the common work
diff --git a/show_config_errors.php b/show_config_errors.php
index 7b13c812a..2b6508fd0 100644
--- a/show_config_errors.php
+++ b/show_config_errors.php
@@ -12,6 +12,6 @@
 echo "Starting to parse config file...\n";
 
 error_reporting(E_ALL);
-require('./config.inc.php');
+require './config.inc.php';
 
 ?>
diff --git a/sql.php b/sql.php
index da3a41649..e9346535a 100644
--- a/sql.php
+++ b/sql.php
@@ -136,7 +136,7 @@ if (isset($btnDrop) || isset($navig)) {
 /**
  * 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
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 0112ae97f..c5ae997e7 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -163,8 +163,8 @@ if (isset($submit_num_fields)) {
         } // end if
 
         // garvin: If comments were sent, enable relation stuff
-        require_once('./libraries/relation.lib.php');
-        require_once('./libraries/transformations.lib.php');
+        require_once './libraries/relation.lib.php';
+        require_once './libraries/transformations.lib.php';
 
         $cfgRelation = PMA_getRelationsParam();
 
@@ -191,7 +191,7 @@ if (isset($submit_num_fields)) {
         unset($sql_query_cpy);
         $message   = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenAltered;
         $active_page = 'tbl_structure.php';
-        require('./tbl_structure.php');
+        require './tbl_structure.php';
     } else {
         PMA_mysqlDie('', '', '', $err_url, FALSE);
         // garvin: An error happened while inserting/updating a table definition.
@@ -215,22 +215,22 @@ if ($abort == FALSE) {
     /**
      * Gets tables informations
      */
-    require_once('./libraries/tbl_common.php');
-    require_once('./libraries/tbl_info.inc.php');
+    require_once './libraries/tbl_common.php';
+    require_once './libraries/tbl_info.inc.php';
     /**
      * Displays top menu links
      */
     $active_page = 'tbl_structure.php';
-    require_once('./libraries/tbl_links.inc.php');
+    require_once './libraries/tbl_links.inc.php';
     /**
      * Display the form
      */
     $action = 'tbl_addfield.php';
-    require_once('./libraries/tbl_properties.inc.php');
+    require_once './libraries/tbl_properties.inc.php';
 
     // Diplays the footer
     echo "\n";
-    require_once('./libraries/footer.inc.php');
+    require_once './libraries/footer.inc.php';
 }
 
 ?>
diff --git a/tbl_alter.php b/tbl_alter.php
index a8336bbc6..520e024e7 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -8,11 +8,11 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/common.inc.php');
-require_once('./libraries/Table.class.php');
+require_once './libraries/common.inc.php';
+require_once './libraries/Table.class.php';
 
 $js_to_run = 'functions.js';
-require_once('./libraries/header.inc.php');
+require_once './libraries/header.inc.php';
 
 // Check parameters
 PMA_checkParameters(array('db', 'table'));
@@ -20,14 +20,14 @@ PMA_checkParameters(array('db', 'table'));
 /**
  * Gets tables informations
  */
-require_once('./libraries/tbl_common.php');
-require_once('./libraries/tbl_info.inc.php');
+require_once './libraries/tbl_common.php';
+require_once './libraries/tbl_info.inc.php';
 /**
  * Displays top menu links
  */
 $active_page = 'tbl_structure.php';
 // I don't see the need to display the links here, they will be displayed later
-//require('./libraries/tbl_links.inc.php');
+//require './libraries/tbl_links.inc.php';
 
 
 /**
@@ -78,8 +78,8 @@ if (isset($do_save_data)) {
         $btnDrop   = 'Fake';
 
         // garvin: If comments were sent, enable relation stuff
-        require_once('./libraries/relation.lib.php');
-        require_once('./libraries/transformations.lib.php');
+        require_once './libraries/relation.lib.php';
+        require_once './libraries/transformations.lib.php';
 
         $cfgRelation = PMA_getRelationsParam();
 
@@ -141,7 +141,7 @@ if (isset($do_save_data)) {
         }
 
         $active_page = 'tbl_structure.php';
-        require('./tbl_structure.php');
+        require './tbl_structure.php';
     } else {
         PMA_mysqlDie('', '', '', $err_url, FALSE);
         // garvin: An error happened while inserting/updating a table definition.
@@ -202,12 +202,12 @@ if ($abort == FALSE) {
         0, 1 );
     $analyzed_sql = PMA_SQP_analyze( PMA_SQP_parse( $show_create_table ) );
 
-    require('./libraries/tbl_properties.inc.php');
+    require './libraries/tbl_properties.inc.php';
 }
 
 
 /**
  * Displays the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/tbl_export.php b/tbl_export.php
index dd651859f..9a553ae10 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -8,14 +8,14 @@
 /**
  *
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Gets tables informations and displays top links
  */
-require_once('./libraries/tbl_common.php');
+require_once './libraries/tbl_common.php';
 $url_query .= '&amp;goto=tbl_export.php&amp;back=tbl_export.php';
-require_once('./libraries/tbl_info.inc.php');
+require_once './libraries/tbl_info.inc.php';
 
 // Dump of a table
 
@@ -114,14 +114,14 @@ if (! empty($sql_query)) {
 /**
  * Displays top menu links
  */
-require('./libraries/tbl_links.inc.php');
+require './libraries/tbl_links.inc.php';
 
 $export_type = 'table';
-require_once('./libraries/display_export.lib.php');
+require_once './libraries/display_export.lib.php';
 
 
 /**
  * Displays the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/tbl_import.php b/tbl_import.php
index 7f971b97a..242c91146 100644
--- a/tbl_import.php
+++ b/tbl_import.php
@@ -8,26 +8,26 @@
 /**
  *
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Gets tables informations and displays top links
  */
-require_once('./libraries/tbl_common.php');
+require_once './libraries/tbl_common.php';
 $url_query .= '&amp;goto=tbl_import.php&amp;back=tbl_import.php';
 
-require_once('./libraries/tbl_info.inc.php');
+require_once './libraries/tbl_info.inc.php';
 /**
  * Displays top menu links
  */
-require_once('./libraries/tbl_links.inc.php');
+require_once './libraries/tbl_links.inc.php';
 
 $import_type = 'table';
-require_once('./libraries/display_import.lib.php');
+require_once './libraries/display_import.lib.php';
 
 /**
  * Displays the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>
 
diff --git a/tbl_relation.php b/tbl_relation.php
index ad053628f..11387a825 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -8,15 +8,15 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/common.inc.php');
-require_once('./libraries/tbl_common.php');
+require_once './libraries/common.inc.php';
+require_once './libraries/tbl_common.php';
 $url_query .= '&amp;goto=tbl_sql.php';
 
 
 /**
  * Gets tables informations
  */
-require_once('./libraries/tbl_info.inc.php');
+require_once './libraries/tbl_info.inc.php';
 
 // Note: in libraries/tbl_links.inc.php we get and display the table comment.
 // For InnoDB, this comment contains the REFER information but any update
@@ -26,9 +26,9 @@ $avoid_show_comment = TRUE;
 /**
  * Displays top menu links
  */
-require_once('./libraries/tbl_links.inc.php');
+require_once './libraries/tbl_links.inc.php';
 
-require_once('./libraries/relation.lib.php');
+require_once './libraries/relation.lib.php';
 
 $options_array = array('CASCADE' => 'CASCADE', 'SET_NULL' => 'SET NULL', 'NO_ACTION' => 'NO ACTION', 'RESTRICT' => 'RESTRICT');
 
@@ -567,5 +567,5 @@ if ( $tbl_type === 'INNODB' && PMA_MYSQL_INT_VERSION < 40013 ) {
 /**
  * Displays the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/tbl_row_action.php b/tbl_row_action.php
index abc5f849f..577c9c3df 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -8,8 +8,8 @@
 /**
  *
  */
-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';
 
 /**
  * Avoids undefined variables
@@ -24,8 +24,8 @@ if (!isset($pos)) {
 if ((!isset($rows_to_delete) || !is_array($rows_to_delete)) && !isset($mult_btn)) {
     $disp_message = $strNoRowsSelected;
     $disp_query = '';
-    require('./sql.php');
-    require_once('./libraries/footer.inc.php');
+    require './sql.php';
+    require_once './libraries/footer.inc.php';
 }
 
 /**
@@ -77,7 +77,7 @@ if ($submit_mult == 'row_delete' || $submit_mult == 'row_export') {
     $js_to_run = 'functions.js';
 }
 
-require_once('./libraries/header.inc.php');
+require_once './libraries/header.inc.php';
 
 if (!empty($submit_mult)) {
     switch($submit_mult) {
@@ -118,7 +118,7 @@ if (!empty($submit_mult)) {
                 $original_url_query = $url_query;
                 $original_pos       = $pos;
             }
-            require('./libraries/mult_submits.inc.php');
+            require './libraries/mult_submits.inc.php';
             $url_query = PMA_generate_common_url($db, $table)
                        . '&amp;goto=tbl_sql.php';
 
@@ -150,12 +150,12 @@ if (!empty($submit_mult)) {
             unset($mult_btn);
 
             $active_page = 'sql.php';
-            require('./sql.php');
+            require './sql.php';
 
             /**
              * Displays the footer
              */
-            require_once('./libraries/footer.inc.php');
+            require_once './libraries/footer.inc.php';
         break;
     }
 }
diff --git a/tbl_select.php b/tbl_select.php
index a486ad0b7..9439117c9 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -8,9 +8,9 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/common.inc.php');
-require_once('./libraries/relation.lib.php'); // foreign keys
-require_once('./libraries/mysql_charsets.lib.php');
+require_once './libraries/common.inc.php';
+require_once './libraries/relation.lib.php'; // foreign keys
+require_once './libraries/mysql_charsets.lib.php';
 
 if ( $GLOBALS['cfg']['PropertiesIconic'] == true ) {
     $titles['Browse'] =
@@ -30,19 +30,19 @@ if ( $GLOBALS['cfg']['PropertiesIconic'] == true ) {
  */
 if (!isset($param) || $param[0] == '') {
     // Gets some core libraries
-    require_once('./libraries/tbl_common.php');
+    require_once './libraries/tbl_common.php';
     //$err_url   = 'tbl_select.php' . $err_url;
     $url_query .= '&amp;goto=tbl_select.php&amp;back=tbl_select.php';
 
     /**
      * Gets tables informations
      */
-    require_once('./libraries/tbl_info.inc.php');
+    require_once './libraries/tbl_info.inc.php';
 
     /**
      * Displays top menu links
      */
-    require_once('./libraries/tbl_links.inc.php');
+    require_once './libraries/tbl_links.inc.php';
 
     if (!isset($goto)) {
         $goto = $GLOBALS['cfg']['DefaultTabTable'];
@@ -242,7 +242,7 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) {
         $field = $fields_list[$i];
 
         // do not use require_once here
-        require('./libraries/get_foreign.lib.php');
+        require './libraries/get_foreign.lib.php';
 
         // we got a bug report: in some cases, even if $disp is true,
         // there are no rows, so we add a fetch_array
@@ -315,7 +315,7 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) {
 </fieldset>
 </form>
     <?php
-    require_once('./libraries/footer.inc.php');
+    require_once './libraries/footer.inc.php';
 }
 
 
@@ -432,7 +432,7 @@ else {
     if ($orderField != '--nil--') {
         $sql_query .= ' ORDER BY ' . PMA_backquote(urldecode($orderField)) . ' ' . $order;
     } // end if
-    include('./sql.php');
+    include './sql.php';
 }
 
 ?>
diff --git a/tbl_sql.php b/tbl_sql.php
index 1943ecbb6..2e5e2a808 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -8,15 +8,15 @@
 /**
  *
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Runs common work
  */
-require('./libraries/tbl_common.php');
+require './libraries/tbl_common.php';
 $url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
 
-require_once('./libraries/sql_query_form.lib.php');
+require_once './libraries/sql_query_form.lib.php';
 
 $err_url   = 'tbl_sql.php' . $err_url;
 $goto = 'tbl_sql.php';
@@ -25,12 +25,12 @@ $back = 'tbl_sql.php';
 /**
  * Get table information
  */
-require_once('./libraries/tbl_info.inc.php');
+require_once './libraries/tbl_info.inc.php';
 
 /**
  * Displays top menu links
  */
-require_once('./libraries/tbl_links.inc.php');
+require_once './libraries/tbl_links.inc.php';
 
 /**
  * Query box, bookmark, insert data from textfile
@@ -40,5 +40,5 @@ PMA_sqlQueryForm();
 /**
  * Displays the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>
diff --git a/themes.php b/themes.php
index 6edbeaa02..d12c9fe85 100644
--- a/themes.php
+++ b/themes.php
@@ -8,17 +8,17 @@
 /**
  * get some globals
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /* Theme Select */
 $path_to_themes = $cfg['ThemePath'] . '/';
 
 /* set language and charset */
-require_once('./libraries/header_http.inc.php');
+require_once './libraries/header_http.inc.php';
 
 /* HTML header */
 $page_title = 'phpMyAdmin - ' . $strTheme;
-require('./libraries/header_meta_style.inc.php');
+require './libraries/header_meta_style.inc.php';
 ?>
 <script type="text/javascript" language="javascript">
 // <![CDATA[
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 377aea967..1bcd43931 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -13,15 +13,15 @@ define('IS_TRANSFORMATION_WRAPPER', true);
 /**
  * Gets a core script and starts output buffering work
  */
-require_once('./libraries/common.inc.php');
-require_once('./libraries/relation.lib.php'); // foreign keys
-require_once('./libraries/transformations.lib.php'); // Transformations
+require_once './libraries/common.inc.php';
+require_once './libraries/relation.lib.php'; // foreign keys
+require_once './libraries/transformations.lib.php'; // Transformations
 $cfgRelation = PMA_getRelationsParam();
 
 /**
  * Ensures db and table are valid, else moves to the "parent" script
  */
-require_once('./libraries/db_table_exists.lib.php');
+require_once './libraries/db_table_exists.lib.php';
 
 
 /**
@@ -59,7 +59,7 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework']) {
 // to a seperate file. It can now be included by libraries/header.inc.php,
 // querywindow.php.
 
-require_once('./libraries/header_http.inc.php');
+require_once './libraries/header_http.inc.php';
 // [MIME]
 if (isset($ct) && !empty($ct)) {
     $content_type = 'Content-Type: ' . urldecode($ct);
diff --git a/user_password.php b/user_password.php
index e9222ea71..7b9b89fe0 100644
--- a/user_password.php
+++ b/user_password.php
@@ -8,7 +8,7 @@
 /**
  * Gets some core libraries
  */
-require_once('./libraries/common.inc.php');
+require_once './libraries/common.inc.php';
 
 /**
  * Displays an error message and exits if the user isn't allowed to use this
@@ -18,10 +18,10 @@ if (!$cfg['ShowChgPassword']) {
     $cfg['ShowChgPassword'] = PMA_DBI_select_db('mysql');
 }
 if ($cfg['Server']['auth_type'] == 'config' || !$cfg['ShowChgPassword']) {
-    require_once('./libraries/header.inc.php');
+    require_once './libraries/header.inc.php';
     echo '<p><b>' . $strError . '</b></p>' . "\n"
        . '<p>&nbsp;&nbsp;&nbsp;&nbsp;' .  $strNoRights . '</p>' . "\n";
-    require_once('./libraries/footer.inc.php');
+    require_once './libraries/footer.inc.php';
 } // end if
 
 
@@ -69,7 +69,7 @@ if (isset($nopass)) {
                      : '';
 
         // Displays the page
-        require_once('./libraries/header.inc.php');
+        require_once './libraries/header.inc.php';
         echo '<h1>' . $strChangePassword . '</h1>' . "\n\n";
         $show_query = 'y';
         PMA_showMessage($strUpdateProfileMessage);
@@ -88,7 +88,7 @@ if (isset($nopass)) {
  */
 // Loads the headers
 $js_to_run = 'user_password.js';
-require_once('./libraries/header.inc.php');
+require_once './libraries/header.inc.php';
 echo '<h1>' . $strChangePassword . '</h1>' . "\n\n";
 
 // Displays an error message if required
@@ -168,5 +168,5 @@ if (PMA_MYSQL_INT_VERSION >= 40102) {
 /**
  * Displays the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 ?>