From 6617a14297ef1f41933f93dfdf4cf5c2b79d76c9 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Mon, 25 Apr 2011 14:19:43 +0200
Subject: [PATCH 1/2] Add a loop to remove code duplication

---
 server_privileges.php | 74 ++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 51 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index 09104e15bb..1e6aa5a9a1 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -509,6 +509,8 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE)
 
         // g l o b a l    o r    d b - s p e c i f i c
         //
+        $privTable_names = array(0 => __('Data'), 1 => __('Structure'), 2 => __('Administration'));
+
         // d a t a
         $privTable[0] = array(
             array('Select', 'SELECT', __('Allows reading data.')),
@@ -582,59 +584,29 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE)
             . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'addUsersForm_' . $random_n . '\', false); return false;">'
             . __('Uncheck All') . '</a>)' . "\n"
            . '    </legend>' . "\n"
-           . '    <p><small><i>' . __(' Note: MySQL privilege names are expressed in English ') . '</i></small></p>' . "\n"
-           . '    <fieldset>' . "\n"
-           . '        <legend>' . __('Data') . '</legend>' . "\n";
-        foreach ($privTable[0] as $priv)
-        {
-            echo '        <div class="item">' . "\n"
-               . '            <input type="checkbox"'
-                . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-                . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0]
-                . '_priv" value="Y" '
-                . ($row[$priv[0] . '_priv'] == 'Y' ? 'checked="checked" ' : '')
-                . 'title="' . $priv[2] . '"/>' . "\n"
-               . '            <label for="checkbox_' . $priv[0]
-                . '_priv"><tt><dfn title="' . $priv[2] . '">' . $priv[1]
-                . '</dfn></tt></label>' . "\n"
-               . '        </div>' . "\n";
-        }
-        echo '    </fieldset>' . "\n"
-           . '    <fieldset>' . "\n"
-           . '        <legend>' . __('Structure') . '</legend>' . "\n";
-        foreach ($privTable[1] as $priv)
-        {
-            echo '        <div class="item">' . "\n"
-               . '            <input type="checkbox"'
-                . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-                . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0]
-                . '_priv" value="Y" '
-                . ($row[$priv[0] . '_priv'] == 'Y' ? 'checked="checked" ' : '')
-                . 'title="' . $priv[2] . '"/>' . "\n"
-               . '            <label for="checkbox_' . $priv[0]
-                . '_priv"><tt><dfn title="' . $priv[2] . '">' . $priv[1]
-                . '</dfn></tt></label>' . "\n"
-               . '        </div>' . "\n";
-        }
-        echo '    </fieldset>' . "\n"
-           . '    <fieldset>' . "\n"
-           . '        <legend>' . __('Administration') . '</legend>' . "\n";
-        foreach ($privTable[2] as $priv)
-        {
-            echo '        <div class="item">' . "\n"
-               . '            <input type="checkbox"'
-                . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-                . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0]
-                . '_priv" value="Y" '
-                . ($row[$priv[0] . '_priv'] == 'Y' ? 'checked="checked" ' : '')
-                . 'title="' . $priv[2] . '"/>' . "\n"
-               . '            <label for="checkbox_' . $priv[0]
-                . '_priv"><tt><dfn title="' . $priv[2] . '">' . $priv[1]
-                . '</dfn></tt></label>' . "\n"
-               . '        </div>' . "\n";
+           . '    <p><small><i>' . __(' Note: MySQL privilege names are expressed in English ') . '</i></small></p>' . "\n";
+
+        // Output the Global privilege tables
+        foreach($privTable as $i => $table) {
+            echo '    <fieldset>' . "\n"
+                . '        <legend>' . __($privTable_names[$i]) . '</legend>' . "\n";
+            foreach ($table as $priv)
+            {
+                echo '        <div class="item">' . "\n"
+                    . '            <input type="checkbox"'
+                    . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
+                    . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0]
+                    . '_priv" value="Y" '
+                    . ($row[$priv[0] . '_priv'] == 'Y' ? 'checked="checked" ' : '')
+                    . 'title="' . $priv[2] . '"/>' . "\n"
+                    . '            <label for="checkbox_' . $priv[0]
+                    . '_priv"><tt><dfn title="' . $priv[2] . '">' . $priv[1]
+                    . '</dfn></tt></label>' . "\n"
+                    . '        </div>' . "\n";
+            }
+            echo '    </fieldset>' . "\n";
         }
 
-        echo '    </fieldset>' . "\n";
         // The "Resource limits" box is not displayed for db-specific privs
         if ($db == '*') {
             echo '    <fieldset>' . "\n"

From b3f0c8f7edf2b615f8ea3540dfc928ec81ab8e5b Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Mon, 25 Apr 2011 15:07:55 +0200
Subject: [PATCH 2/2] Formatted code and removed duplicate output of
 checked=checked

---
 server_privileges.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index 1e6aa5a9a1..ba2d3b4ed8 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -586,7 +586,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE)
            . '    </legend>' . "\n"
            . '    <p><small><i>' . __(' Note: MySQL privilege names are expressed in English ') . '</i></small></p>' . "\n";
 
-        // Output the Global privilege tables
+        // Output the Global privilege tables with checkboxes
         foreach($privTable as $i => $table) {
             echo '    <fieldset>' . "\n"
                 . '        <legend>' . __($privTable_names[$i]) . '</legend>' . "\n";
@@ -594,14 +594,12 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE)
             {
                 echo '        <div class="item">' . "\n"
                     . '            <input type="checkbox"'
-                    . (empty($GLOBALS['checkall']) ?  '' : ' checked="checked"')
-                    . ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0]
-                    . '_priv" value="Y" '
-                    . ($row[$priv[0] . '_priv'] == 'Y' ? 'checked="checked" ' : '')
-                    . 'title="' . $priv[2] . '"/>' . "\n"
-                    . '            <label for="checkbox_' . $priv[0]
-                    . '_priv"><tt><dfn title="' . $priv[2] . '">' . $priv[1]
-                    . '</dfn></tt></label>' . "\n"
+                    .                   ' name="' . $priv[0] . '_priv" id="checkbox_' . $priv[0] . '_priv"'
+                    .                   ' value="Y" title="' . $priv[2] . '"'
+                    .                   ((!empty($GLOBALS['checkall']) || $row[$priv[0] . '_priv'] == 'Y') ?  ' checked="checked"' : '')
+                    .               '/>' . "\n"
+                    . '            <label for="checkbox_' . $priv[0] . '_priv"><tt><dfn title="' . $priv[2] . '">'
+                    .                    $priv[1] . '</dfn></tt></label>' . "\n"
                     . '        </div>' . "\n";
             }
             echo '    </fieldset>' . "\n";