From 05e78b2778830b29b3919fd742658d8d82851e7b Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 22 Aug 2011 06:46:39 +0530
Subject: [PATCH] Proper coding style for multi line if statements

---
 libraries/common.lib.php | 47 ++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index f232b985cb..6c34c84839 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2254,7 +2254,7 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1,
         } else {
             $selected = '';
         }
-        $gotopage .= '                <option ' . $selected 
+        $gotopage .= '                <option ' . $selected
             . ' value="' . (($i - 1) * $rows) . '">' . $i . '</option>' . "\n";
     }
 
@@ -3485,21 +3485,31 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
     $query = "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`%s` "
            . "WHERE GRANTEE='%s' AND PRIVILEGE_TYPE='%s'";
     // Check global privileges first.
-    if (PMA_DBI_fetch_value(sprintf($query,
-                                    'USER_PRIVILEGES',
-                                    $username,
-                                    $priv))) {
+    if (PMA_DBI_fetch_value(
+        sprintf(
+            $query,
+            'USER_PRIVILEGES',
+            $username,
+            $priv
+        )
+    )
+    ) {
         return true;
     }
     // If a database name was provided and user does not have the
     // required global privilege, try database-wise permissions.
     if ($db !== null) {
         $query .= " AND TABLE_SCHEMA='%s'";
-        if (PMA_DBI_fetch_value(sprintf($query,
-                                        'SCHEMA_PRIVILEGES',
-                                        $username,
-                                        $priv,
-                                        PMA_sqlAddSlashes($db)))) {
+        if (PMA_DBI_fetch_value(
+            sprintf(
+                $query,
+                'SCHEMA_PRIVILEGES',
+                $username,
+                $priv,
+                PMA_sqlAddSlashes($db)
+            )
+        )
+        ) {
             return true;
         }
     } else {
@@ -3511,12 +3521,17 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
     // find any valid privileges, try table-wise privileges.
     if ($tbl !== null) {
         $query .= " AND TABLE_NAME='%s'";
-        if ($retval = PMA_DBI_fetch_value(sprintf($query,
-                                                  'TABLE_PRIVILEGES',
-                                                  $username,
-                                                  $priv,
-                                                  PMA_sqlAddSlashes($db),
-                                                  PMA_sqlAddSlashes($tbl)))) {
+        if ($retval = PMA_DBI_fetch_value(
+            sprintf(
+                $query,
+                'TABLE_PRIVILEGES',
+                $username,
+                $priv,
+                PMA_sqlAddSlashes($db),
+                PMA_sqlAddSlashes($tbl)
+            )
+        )
+        ) {
             return true;
         }
     }