From ba137a85f8ba90aab4d8b4f2fd95d63c95d15e62 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Sat, 2 Nov 2013 02:32:18 +0530
Subject: [PATCH 1/3] bug fix 4148

---
 libraries/server_privileges.lib.php | 44 +++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 8e4752972e..f83f05e698 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2232,6 +2232,24 @@ function PMA_getUserExportLink($username, $hostname, $initial = '')
         . '</a>';
 }
 
+/**
+ * Returns user group edit link
+ * 
+ * @param string $username User name
+ * 
+ * @return HTML code with link
+ */
+function PMA_getUserGroupEditLink($username)
+{
+     return '<a class="edit_user_group_anchor ajax"'
+        . ' href="server_privileges.php'
+        . PMA_URL_getCommon(array('username' => $username))
+        . '">'
+        . PMA_Util::getIcon('b_usrlist.png', __('Edit user group'))
+        . '</a>'
+        . '</td>';
+}
+
 /**
  * This function return the extra data array for the ajax behavior
  *
@@ -2291,9 +2309,16 @@ function PMA_getExtraDataForAjaxBehavior(
         $new_user_string .= '<td>'
             . '<code>' . join(', ', PMA_extractPrivInfo('', true)) . '</code>'
             . '</td>'; //Fill in privileges here
-        $new_user_string .= '<td class="usrGroup"></td>';
+        
+        // if $cfg['Servers'][$i]['users'] and $cfg['Servers'][$i]['usergroups'] are
+        // enabled
+        $cfgRelation = PMA_getRelationsParam();
+        if (isset($cfgRelation['users']) && isset($cfgRelation['usergroups'])) {
+            $new_user_string .= '<td class="usrGroup"></td>';
+        }
+        
         $new_user_string .= '<td>';
-
+        
         if ((isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y')) {
             $new_user_string .= __('Yes');
         } else {
@@ -2305,6 +2330,13 @@ function PMA_getExtraDataForAjaxBehavior(
         $new_user_string .= '<td>'
             . PMA_getUserEditLink($username, $hostname)
             . '</td>' . "\n";
+        
+        if (isset($cfgRelation['users']) && isset($cfgRelation['usergroups'])) {
+            $new_user_string .= '<td>'
+                . PMA_getUserGroupEditLink($username)
+                . '</td>' . "\n";
+        }
+        
         $new_user_string .= '<td>'
             . PMA_getUserExportLink(
                 $username,
@@ -2975,13 +3007,7 @@ function PMA_getTableBodyForUserRightsTable($db_rights)
                     $html_output .= '<td class="center"></td>';
                 } else {
                     $html_output .= '<td class="center">'
-                        . '<a class="edit_user_group_anchor ajax"'
-                        . ' href="server_privileges.php'
-                        . PMA_URL_getCommon(array('username' => $host['User']))
-                        . '">'
-                        . PMA_Util::getIcon('b_usrlist.png', __('Edit user group'))
-                        . '</a>'
-                        . '</td>';
+                        . PMA_getUserGroupEditLink($host['User']);
                 }
             }
             $html_output .= '<td class="center">'

From 8860c81ab8adb654d8e23462edabcc535b4d40f6 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Sat, 2 Nov 2013 14:43:04 +0530
Subject: [PATCH 2/3] balanced html tags

---
 libraries/server_privileges.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index f83f05e698..c52770269d 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2246,8 +2246,7 @@ function PMA_getUserGroupEditLink($username)
         . PMA_URL_getCommon(array('username' => $username))
         . '">'
         . PMA_Util::getIcon('b_usrlist.png', __('Edit user group'))
-        . '</a>'
-        . '</td>';
+        . '</a>';
 }
 
 /**
@@ -3007,7 +3006,8 @@ function PMA_getTableBodyForUserRightsTable($db_rights)
                     $html_output .= '<td class="center"></td>';
                 } else {
                     $html_output .= '<td class="center">'
-                        . PMA_getUserGroupEditLink($host['User']);
+                        . PMA_getUserGroupEditLink($host['User'])
+                        .'</td>';
                 }
             }
             $html_output .= '<td class="center">'

From d0631be88dd526bf1ad45551b8c35931d6123741 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Sat, 2 Nov 2013 14:45:44 +0530
Subject: [PATCH 3/3] removed trailing white spaces.

---
 libraries/server_privileges.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index c52770269d..18a1f6cf1d 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2315,9 +2315,9 @@ function PMA_getExtraDataForAjaxBehavior(
         if (isset($cfgRelation['users']) && isset($cfgRelation['usergroups'])) {
             $new_user_string .= '<td class="usrGroup"></td>';
         }
-        
+
         $new_user_string .= '<td>';
-        
+
         if ((isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y')) {
             $new_user_string .= __('Yes');
         } else {