[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16250-ge82d3c7

Sun, 21 Aug 2011 14:37:00 -0700 

The branch, master has been updated
       via  e82d3c7136425fbe51ed26f8bf95cf932740ddd8 (commit)
       via  0c6dbb530d4d1b594a72c1f99bf384a46d6f7c92 (commit)
      from  20a6232173e08810211412c8ed7cfe84b9561b82 (commit)


- Log -----------------------------------------------------------------
commit e82d3c7136425fbe51ed26f8bf95cf932740ddd8
Author: Dieter Adriaenssens <[email protected]>
Date:   Sun Aug 21 23:36:10 2011 +0200

    require/include are statements not functions; no parentheses are required

commit 0c6dbb530d4d1b594a72c1f99bf384a46d6f7c92
Author: Dieter Adriaenssens <[email protected]>
Date:   Sun Aug 21 23:19:30 2011 +0200

    coding style

-----------------------------------------------------------------------

Summary of changes:
 index.php                                        |    2 +-
 libraries/Advisor.class.php                      |    2 +-
 libraries/Config.class.php                       |   23 ++++++++++-----------
 libraries/PDF.class.php                          |    4 +-
 libraries/core.lib.php                           |    2 +-
 libraries/display_import_ajax.lib.php            |    2 +-
 libraries/mult_submits.inc.php                   |    2 +-
 libraries/schema/User_Schema.class.php           |    2 +-
 libraries/schema/Visio_Relation_Schema.class.php |    2 +-
 main.php                                         |    2 +-
 schema_export.php                                |    4 +-
 server_status.php                                |    6 ++--
 test/selenium/PmaSeleniumLoginTest.php           |    2 +-
 test/selenium/PmaSeleniumPrivilegesTest.php      |    2 +-
 test/selenium/PmaSeleniumXssTest.php             |    2 +-
 15 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/index.php b/index.php
index 5e0fa36..9add876 100644
--- a/index.php
+++ b/index.php
@@ -69,7 +69,7 @@ $lang_iso_code = 
$GLOBALS['available_languages'][$GLOBALS['lang']][1];
 
 
 // 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
index b681155..12fdcad 100644
--- a/libraries/Advisor.class.php
+++ b/libraries/Advisor.class.php
@@ -22,7 +22,7 @@ class Advisor
             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/Config.class.php b/libraries/Config.class.php
index fe24009..7beb4cc 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -219,9 +219,10 @@ class PMA_Config
         } elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) {
             $this->set('PMA_USR_BROWSER_VER', '1.9');
             $this->set('PMA_USR_BROWSER_AGENT', 'GECKO');
-        } elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@'
-            , $HTTP_USER_AGENT
-            , $log_version)
+        } elseif (
+            preg_match('@Mozilla/([0-9].[0-9]{1,2})@',
+            $HTTP_USER_AGENT,
+            $log_version)
         ) {
             $this->set('PMA_USR_BROWSER_VER', $log_version[1]);
             $this->set('PMA_USR_BROWSER_AGENT', 'MOZILLA');
@@ -342,10 +343,7 @@ class PMA_Config
             }
             $this->set(
                 'PMA_PHP_INT_VERSION',
-                (int) sprintf('%d%02d%02d',
-                $match[1],
-                $match[2],
-                $match[3])
+                (int) sprintf('%d%02d%02d', $match[1], $match[2], $match[3])
             );
         } else {
             $this->set('PMA_PHP_INT_VERSION', 0);
@@ -495,7 +493,7 @@ class PMA_Config
                 || $_SESSION['cache'][$cache_key]['config_mtime'] < 
$config_mtime
             ) {
                 // load required libraries
-                require_once './libraries/user_preferences.lib.php';
+                include_once './libraries/user_preferences.lib.php';
                 $prefs = PMA_load_userprefs();
                 $_SESSION['cache'][$cache_key]['userprefs']
                     = PMA_apply_userprefs($prefs['config_data']);
@@ -668,6 +666,7 @@ class PMA_Config
 
     /**
      * set source
+     *
      * @param string  $source
      *
      * @return nothing
@@ -743,9 +742,9 @@ class PMA_Config
     /**
      * returns specific config setting
      *
-     * @param string  $setting
+     * @param string $setting
      *
-     * @return  mixed   value
+     * @return mixed value
      */
     function get($setting)
     {
@@ -758,8 +757,8 @@ class 
PMA_Coettings($prefs['config_data']);;onfig_mtime[1];30.126]���
+r)�
+�ϗl�`Зl�u��
+�ʳ
+��
+���+`Зl����+Pŗl� 
ėl�k��
+6 
��!�!�ϗl�`Зl�xt�+PƗl����
+���
+�ϗl�`��
+/Зl��o3+u��
+`3+�d3+�i3+�ʳ
+xt�+PƗl� ŗl�k��
+�!�!�ϗl�`Зl�H>�+0Ǘl����
+���
+�ϗl�`��
+/Зl� Зl�Зl�8��
+�p�`Зl�u��
+�ʳ
+0Ǘl�Ɨl�k��
+GHIJKMNOP�ϗl�`Зl�H��+�ȗl����
+���
+�ϗl�0o3+u��
+��+�)c+`3+�d3+�i3+�ʳ
+H��+�ȗl�Ǘl�k��
+8��+�ȗl�@Ǘl�k��
+(��+�ȗl�pǗl�k��
+��+�ȗl��Ǘl�k��
+    �n3+u��
+�i3+ —l��xc+e��
+�d3+@ȗl�yxc+e��
+`3+pȗl�Zxc+e��
+�$c+��+�)c+`3+؄�+�d3+�i3+�ʳ
+8��
+�.+`Зl�p�b+ 
ʗl��ȗl�k��
+5678:<=>?@BD�ϗl�`Зl���++`Зl�u��
+��
+�ȗl��.+e��
+��
+�_@f�S Q��l����
+`Зl���++0˗l�ʗl�k��
+u]��        4Q��U^Qʉ��u������*ēv�ϗl�`Зl�H>�
+�4+�їl����+���
+��1+/Зl�`їl�Зl��̗l���+u��
+؄�+�җl����+�їl�@͗l������������
+hЗl�nfig
     /**
      * sets configuration variable
      *
-     * @param string  $setting configuration option
-     * @param string  $value   new value for configuration option
+     * @param string $setting configuration option
+     * @param string $value   new value for configuration option
      *
      * @return nothing
      */
diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php
index 3f4f2f1..0be8997 100644
--- a/libraries/PDF.class.php
+++ b/libraries/PDF.class.php
@@ -77,9 +77,9 @@ class PMA_PDF extends TCPDF
      */
     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
index a277f29..29d2f43 100644
--- 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
index f0c271d..3495a52 100644
--- a/libraries/display_import_ajax.lib.php
+++ b/libraries/display_import_ajax.lib.php
@@ -38,7 +38,7 @@ foreach ($plugins as $plugin) {
 
     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
index 3339aaf..6a16541 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -47,7 +47,7 @@ if (! empty($submit_mult)
                    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
index 41a2b9e..538ceed 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -585,7 +585,7 @@ class PMA_User_Schema
 
         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
index cf7bab2..be5028d 100644
--- 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
index fd4d448..2ba3267 100644
--- a/main.php
+++ b/main.php
@@ -354,7 +354,7 @@ if (!function_exists('mcrypt_encrypt') && 
!$GLOBALS['cfg']['McryptDisableWarning
  * 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
index 2abe91f..30384e8 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -21,7 +21,7 @@ $cfgRelation = PMA_getRelationsParam();
 
 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 @@ $path = PMA_securePath(ucfirst($export_type));
 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
index 1dd4852..5490400 100644
--- a/server_status.php
+++ b/server_status.php
@@ -123,7 +123,7 @@ if (isset($_REQUEST['ajax_request']) && 
$_REQUEST['ajax_request'] == true) {
 
                         case 'cpu':
                             if (!$sysinfo) {
-                                require_once('libraries/sysinfo.lib.php');
+                                require_once 'libraries/sysinfo.lib.php';
                                 $sysinfo = getSysInfo();
                             }
                             if (!$cpuload) {
@@ -140,7 +140,7 @@ if (isset($_REQUEST['ajax_request']) && 
$_REQUEST['ajax_request'] == true) {
 
                         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['ajax_request']) && 
$_REQUEST['ajax_request'] == true) {
     }
 
     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
index 8f14fce..dc0fc80 100644
--- 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
index a325347..7eddf7a 100644
--- 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
index 4f551a0..06f960e 100644
--- 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 
 {


hooks/post-receive
-- 
phpMyAdmin


------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system, 
user administration capabilities and model configuration. Take 
the hassle out of deploying and managing Subversion and the 
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to