[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-448-g5c39c55

[Piotr Przybylski]

The branch, master has been updated
       via  5c39c5511f20662878a75da8e1db07f354dcdfc8 (commit)
      from  f25945b8bee7b5025abe4e4e054cf6732dcca6ec (commit)


- Log -----------------------------------------------------------------
commit 5c39c5511f20662878a75da8e1db07f354dcdfc8
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Mon May 2 20:50:16 2011 +0200

    Comments formatting and PHPDoc fixes

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

Summary of changes:
 libraries/Message.class.php          |   11 +++++------
 libraries/common.inc.php             |    2 +-
 libraries/common.lib.php             |   10 +++++-----
 libraries/database_interface.lib.php |   19 +++++++++----------
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/libraries/Message.class.php b/libraries/Message.class.php
index 908a1d7..5c46e86 100644
--- a/libraries/Message.class.php
+++ b/libraries/Message.class.php
@@ -151,8 +151,8 @@ class PMA_Message
      * @uses    PMA_Message::SANITIZE_PARAMS
      * @param   string  $string
      * @param   integer $number
-     * @param   array   $$params
-     * @param   boolean $sanitize
+     * @param   array   $params
+     * @param   integer $sanitize
      */
     public function __construct($string = '', $number = PMA_Message::NOTICE,
         $params = array(), $sanitize = PMA_Message::SANITIZE_NONE)
@@ -624,9 +624,9 @@ class PMA_Message
      * @static
      * @uses    is_array()
      * @uses    htmlspecialchars()
-     * @uses    PMA_Message::sanitize() recursiv
-     * @param   mixed   the message(s)
-     * @return  mixed   the sanitized message(s)
+     * @uses    PMA_Message::sanitize() recursive
+     * @param   mixed  $message the message(s)
+     * @return  mixed  the sanitized message(s)
      * @access  public
      */
     static public function sanitize($message)
@@ -686,7 +686,6 @@ class PMA_Message
      * @uses    PMA_Message::$_string
      * @uses    PMA_Message::$_message
      * @uses    md5()
-     * @param   string $file
      * @return  string PMA_Message::$_hash
      */
     public function getHash()
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 906b6f6..49937c8 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -838,7 +838,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         // http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.37&content-type=text/vnd.viewcvs-markup
         // Look at: "static int check_dir_access(request_rec *r)"
         if (isset($cfg['Server']['AllowDeny'])
-          && isset($cfg['Server']['AllowDeny']['order'])) {
+                && isset($cfg['Server']['AllowDeny']['order'])) {
 
             /**
              * ip based access library
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 8be5c0e..3161132 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -706,11 +706,11 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
  * @uses    uksort()
  * @uses    strstr()
  * @uses    explode()
- * @param   string  $db     name of db
- * @param   string  $tables name of tables
- * @param   integer $limit_offset   list offset
- * @param   integer $limit_count    max tables to return
- * return   array   (recursive) grouped table list
+ * @param   string   $db     name of db
+ * @param   string   $tables name of tables
+ * @param   integer  $limit_offset   list offset
+ * @param   int|bool $limit_count    max tables to return
+ * @return  array    (recursive) grouped table list
  */
 function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = false)
 {
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index c1b34e0..842b891 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -254,7 +254,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
     $tables = array();
 
     if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-      // get table information from information_schema
+        // get table information from information_schema
         if ($table) {
             if (true === $tbl_is_group) {
                 $sql_where_table = 'AND `TABLE_NAME` LIKE \''
@@ -269,13 +269,13 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
             $sql_where_table = '';
         }
 
-      // for PMA bc:
-      // `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME`
-      //
-      // on non-Windows servers,
-      // added BINARY in the WHERE clause to force a case sensitive
-      // comparison (if we are looking for the db Aa we don't want
-      // to find the db aa)
+        // for PMA bc:
+        // `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME`
+        //
+        // on non-Windows servers,
+        // added BINARY in the WHERE clause to force a case sensitive
+        // comparison (if we are looking for the db Aa we don't want
+        // to find the db aa)
         $this_databases = array_map('PMA_sqlAddslashes', $databases);
 
         $sql = '
@@ -945,7 +945,6 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null
  * @uses    $GLOBALS['mysql_charset_map']
  * @uses    $GLOBALS['charset']
  * @uses    $GLOBALS['lang']
- * @uses    $GLOBALS['server']
  * @uses    $GLOBALS['cfg']['Lang']
  * @uses    defined()
  * @uses    explode()
@@ -989,7 +988,7 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
         define('PMA_DRIZZLE', PMA_MYSQL_MAJOR_VERSION >= 2009);
     }
 
-    /* Skip charsets for Drizzle */
+    // Skip charsets for Drizzle
     if (!PMA_DRIZZLE) {
         if (! empty($GLOBALS['collation_connection'])) {
             PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE);


hooks/post-receive
-- 
phpMyAdmin