From 8d43951bcd8466e810ecc205c1afb1944d5425db Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 18 Jul 2012 07:28:58 +0530
Subject: [PATCH] improve coding style

---
 libraries/server_privileges.lib.php | 25 ++++++++++++++++++-------
 server_privileges.php               | 27 ++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 55eae0c0f5..1198d52e64 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -3127,12 +3127,15 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser($queries, $username, $
  * 
  * @return array  $sql_query, $message
  */
-function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $username, $hostname)
-{
+function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query,
+    $username, $hostname
+) {
     $common_functions = PMA_CommonFunctions::getInstance();
     
     if ($_error || ! PMA_DBI_try_query($real_sql_query)) {
-        $_REQUEST['createdb-1'] = $_REQUEST['createdb-2'] = $_REQUEST['createdb-3'] = false;
+        $_REQUEST['createdb-1'] = $_REQUEST['createdb-2']
+            = $_REQUEST['createdb-3']
+            = false;
         $message = PMA_Message::rawError(PMA_DBI_getError());
     } else {
         $message = PMA_Message::success(__('You have added a new user.'));
@@ -3141,7 +3144,9 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $use
     if (isset($_REQUEST['createdb-1'])) {
         // Create database with same name and grant all privileges
         $q = 'CREATE DATABASE IF NOT EXISTS '
-            . $common_functions->backquote($common_functions->sqlAddSlashes($username)) . ';';
+            . $common_functions->backquote(
+                $common_functions->sqlAddSlashes($username)
+            ) . ';';
         $sql_query .= $q;
         if (! PMA_DBI_try_query($q)) {
             $message = PMA_Message::rawError(PMA_DBI_getError());
@@ -3159,7 +3164,9 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $use
 
         $q = 'GRANT ALL PRIVILEGES ON '
             . $common_functions->backquote(
-                $common_functions->escapeMysqlWildcards($common_functions->sqlAddSlashes($username))
+                $common_functions->escapeMysqlWildcards(
+                    $common_functions->sqlAddSlashes($username)
+                )
             ) . '.* TO \''
             . $common_functions->sqlAddSlashes($username)
             . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
@@ -3172,7 +3179,9 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $use
     if (isset($_REQUEST['createdb-2'])) {
         // Grant all privileges on wildcard name (username\_%)
         $q = 'GRANT ALL PRIVILEGES ON '
-            . $common_functions->backquote($common_functions->sqlAddSlashes($username) . '\_%') . '.* TO \''
+            . $common_functions->backquote(
+                $common_functions->sqlAddSlashes($username) . '\_%'
+            ) . '.* TO \''
             . $common_functions->sqlAddSlashes($username)
             . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
         $sql_query .= $q;
@@ -3184,7 +3193,9 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query, $use
     if (isset($_REQUEST['createdb-3'])) {
         // Grant all privileges on the specified database to the new user
         $q = 'GRANT ALL PRIVILEGES ON '
-        . $common_functions->backquote($common_functions->sqlAddSlashes($dbname)) . '.* TO \''
+        . $common_functions->backquote(
+            $common_functions->sqlAddSlashes($dbname)
+        ) . '.* TO \''
         . $common_functions->sqlAddSlashes($username)
         . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\';';
         $sql_query .= $q;
diff --git a/server_privileges.php b/server_privileges.php
index 02d5ebc9c3..56d4faa5d9 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -250,16 +250,22 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
         $_add_user_error = true;
     } else {
 
-        $create_user_real = 'CREATE USER \'' . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\'';
+        $create_user_real = 'CREATE USER \'' 
+            . $common_functions->sqlAddSlashes($username) . '\'@\'' 
+            . $common_functions->sqlAddSlashes($hostname) . '\'';
 
         $real_sql_query = 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON *.* TO \''
-            . $common_functions->sqlAddSlashes($username) . '\'@\'' . $common_functions->sqlAddSlashes($hostname) . '\'';
+            . $common_functions->sqlAddSlashes($username) . '\'@\'' 
+            . $common_functions->sqlAddSlashes($hostname) . '\'';
+        
         if ($pred_password != 'none' && $pred_password != 'keep') {
             $sql_query = $real_sql_query . ' IDENTIFIED BY \'***\'';
-            $real_sql_query .= ' IDENTIFIED BY \'' . $common_functions->sqlAddSlashes($pma_pw) . '\'';
+            $real_sql_query .= ' IDENTIFIED BY \'' 
+                . $common_functions->sqlAddSlashes($pma_pw) . '\'';
             if (isset($create_user_real)) {
                 $create_user_show = $create_user_real . ' IDENTIFIED BY \'***\'';
-                $create_user_real .= ' IDENTIFIED BY \'' . $common_functions->sqlAddSlashes($pma_pw) . '\'';
+                $create_user_real .= ' IDENTIFIED BY \''
+                    . $common_functions->sqlAddSlashes($pma_pw) . '\'';
             }
         } else {
             if ($pred_password == 'keep' && ! empty($password)) {
@@ -370,15 +376,22 @@ if (isset($_REQUEST['delete'])
     || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4)
 ) {
     if (isset($_REQUEST['change_copy'])) {
-        $selected_usr = array($_REQUEST['old_username'] . '&amp;#27;' . $_REQUEST['old_hostname']);
+        $selected_usr = array(
+            $_REQUEST['old_username'] . '&amp;#27;' . $_REQUEST['old_hostname']
+        );
     } else {
         $selected_usr = $_REQUEST['selected_usr'];
         $queries = array();
     }
     foreach ($selected_usr as $each_user) {
         list($this_user, $this_host) = explode('&amp;#27;', $each_user);
-        $queries[] = '# ' . sprintf(__('Deleting %s'), '\'' . $this_user . '\'@\'' . $this_host . '\'') . ' ...';
-        $queries[] = 'DROP USER \'' . $common_functions->sqlAddSlashes($this_user) . '\'@\'' . $common_functions->sqlAddSlashes($this_host) . '\';';
+        $queries[] = '# ' 
+            . sprintf(__('Deleting %s'),
+                '\'' . $this_user . '\'@\'' . $this_host . '\''
+            ) . ' ...';
+        $queries[] = 'DROP USER \'' 
+            . $common_functions->sqlAddSlashes($this_user) 
+            . '\'@\'' . $common_functions->sqlAddSlashes($this_host) . '\';';
 
         if (isset($_REQUEST['drop_users_db'])) {
             $queries[] = 'DROP DATABASE IF EXISTS ' . $common_functions->backquote($this_user) . ';';