require/include are statements not functions; no parentheses are requ…

…ired
phpmyadmin · Aug 21, 2011 · e82d3c7 · e82d3c7
1 parent 0c6dbb5
commit e82d3c7
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/index.php b/index.php
@@ -69,7 +69,7 @@
 
 
 // start output
-include ('./libraries/header_http.inc.php');
+include './libraries/header_http.inc.php';
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">

diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php
@@ -22,7 +22,7 @@ function run() {
             PMA_DBI_fetch_result('SHOW GLOBAL VARIABLES', 0, 1)
         );
         // Add total memory to variables as well
-        require_once('libraries/sysinfo.lib.php');
+        require_once 'libraries/sysinfo.lib.php';
         $sysinfo = getSysInfo();
         $memory  = $sysinfo->memory();
         $this->variables['system_memory'] = $memory['MemTotal'];

diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php
@@ -77,9 +77,9 @@ function _putpages()
      */
     function Error($error_message = '')
     {
-        include('./libraries/header.inc.php');
+        include './libraries/header.inc.php';
         PMA_Message::error(__('Error while creating PDF:') . ' ' . $error_message)->display();
-        include('./libraries/footer.inc.php');
+        include './libraries/footer.inc.php';
     }
 
     /**

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
@@ -223,7 +223,7 @@ function PMA_fatalError($error_message, $message_args = null)
         $GLOBALS['PMA_Config']->removeCookie($GLOBALS['session_name']);
     }
 
-    require('./libraries/error.inc.php');
+    require './libraries/error.inc.php';
 
     if (!defined('TESTSUITE')) {
         exit;

diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php
@@ -38,7 +38,7 @@
 
     if ($check()) {
         $_SESSION[$SESSION_KEY]["handler"] = $plugin;
-        include_once("import/upload/" . $plugin . ".php");
+        include_once "import/upload/" . $plugin . ".php";
         break;
     }
 }

diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
@@ -47,7 +47,7 @@
                    break;
                case 'export':
                    unset($submit_mult);
-                   require('db_export.php');
+                   require 'db_export.php';
                    exit;
                    break;
            } // end switch

diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
@@ -585,7 +585,7 @@ private function _processExportSchema()
 
         PMA_DBI_select_db($db);
 
-        include("./libraries/schema/".ucfirst($export_type)."_Relation_Schema.class.php");
+        include "./libraries/schema/".ucfirst($export_type)."_Relation_Schema.class.php";
         $obj_schema = eval("new PMA_".ucfirst($export_type)."_Relation_Schema();");
     }
 

diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php
@@ -5,7 +5,7 @@
  * @package phpMyAdmin
  */
 
-include_once("Export_Relation_Schema.class.php");
+include_once "Export_Relation_Schema.class.php";
 
 /**
  * This Class inherits the XMLwriter class and

diff --git a/main.php b/main.php
@@ -354,7 +354,7 @@
  * The data file is created while creating release by ./scripts/remove-incomplete-mo
  */
 if (file_exists('./libraries/language_stats.inc.php')) {
-    include('./libraries/language_stats.inc.php');
+    include './libraries/language_stats.inc.php';
     /*
      * This message is intentionally not translated, because we're
      * handling incomplete translations here and focus on english

diff --git a/schema_export.php b/schema_export.php
@@ -21,7 +21,7 @@
 
 require_once './libraries/transformations.lib.php';
 require_once './libraries/Index.class.php';
-include_once("./libraries/schema/Export_Relation_Schema.class.php");
+include_once "./libraries/schema/Export_Relation_Schema.class.php";
 
 /**
  * get all the export options and verify
@@ -38,5 +38,5 @@
 if (!file_exists('./libraries/schema/' . $path . '_Relation_Schema.class.php')) {
     PMA_Export_Relation_Schema::dieSchema($_POST['chpage'],$export_type,__('File doesn\'t exist'));
 }
-include("./libraries/schema/".$path."_Relation_Schema.class.php");
+include "./libraries/schema/".$path."_Relation_Schema.class.php";
 $obj_schema = eval("new PMA_".$path."_Relation_Schema();");
diff --git a/server_status.php b/server_status.php
@@ -123,7 +123,7 @@
 
                         case 'cpu':
                             if (!$sysinfo) {
-                                require_once('libraries/sysinfo.lib.php');
+                                require_once 'libraries/sysinfo.lib.php';
                                 $sysinfo = getSysInfo();
                             }
                             if (!$cpuload) {
@@ -140,7 +140,7 @@
 
                         case 'memory':
                             if (!$sysinfo) {
-                                require_once('libraries/sysinfo.lib.php');
+                                require_once 'libraries/sysinfo.lib.php';
                                 $sysinfo = getSysInfo();
                             }
                             if (!$memory) {
@@ -379,7 +379,7 @@
     }
 
     if (isset($_REQUEST['advisor'])) {
-        include('libraries/Advisor.class.php');
+        include 'libraries/Advisor.class.php';
         $advisor = new Advisor();
         exit(json_encode($advisor->run()));
     }

diff --git a/test/selenium/PmaSeleniumLoginTest.php b/test/selenium/PmaSeleniumLoginTest.php
@@ -7,7 +7,7 @@
  * @group Selenium
  */
 
-require_once('PmaSeleniumTestCase.php');
+require_once 'PmaSeleniumTestCase.php';
 
 
 class PmaSeleniumLoginTest extends PmaSeleniumTestCase 

diff --git a/test/selenium/PmaSeleniumPrivilegesTest.php b/test/selenium/PmaSeleniumPrivilegesTest.php
@@ -7,7 +7,7 @@
  * @group Selenium
  */
 
-require_once('PmaSeleniumTestCase.php');
+require_once 'PmaSeleniumTestCase.php';
 
 
 class PmaSeleniumPrivilegesTest extends PmaSeleniumTestCase 

diff --git a/test/selenium/PmaSeleniumXssTest.php b/test/selenium/PmaSeleniumXssTest.php
@@ -7,7 +7,7 @@
  * @group Selenium
  */
 
-require_once('PmaSeleniumTestCase.php');
+require_once 'PmaSeleniumTestCase.php';
 
 class PmaSeleniumXSSTest extends PmaSeleniumTestCase 
 {