Show SSL mode in user list

diff --git a/mysql/edit_user.cgi b/mysql/edit_user.cgi
index 956598c..39cf2e7 100755 (executable)
--- a/mysql/edit_user.cgi
+++ b/mysql/edit_user.cgi
@@ -67,9 +67,9 @@ print &ui_table_row($text{'user_perms'},
 # SSL needed?
 if ($mysql_version >= 5 && $fieldmap{'ssl_type'}) {
        print &ui_table_row($text{'user_ssl'},
-               &ui_select("ssl_type", $u->[$fieldmap{'ssl_type'}],
-                       [ [ '', $text{'user_ssl_none'} ],
-                         [ 'ANY', $text{'user_ssl_ssl'} ],
+               &ui_select("ssl_type", uc($u->[$fieldmap{'ssl_type'}]),
+                       [ [ '', $text{'user_ssl_'} ],
+                         [ 'ANY', $text{'user_ssl_any'} ],
                          [ 'X509', $text{'user_ssl_x509'} ] ],
                        1, 0, 1));
        }

diff --git a/mysql/lang/en b/mysql/lang/en
index a256f30..227a14a 100644 (file)
--- a/mysql/lang/en
+++ b/mysql/lang/en
@@ -259,6 +259,7 @@ users_sync_sel=Specific host
 users_delete=Delete Selected
 users_derr=Failed to delete users
 users_enone=No users selected
+users_ssl=Certificate
 
 user_title1=Create User
 user_title2=Edit User
@@ -302,8 +303,8 @@ user_err=Failed to save user
 user_euser=Missing or invalid username
 user_ehost=Missing or invalid allow host(s)
 user_ssl=Required certificate type
-user_ssl_none=None needed
-user_ssl_ssl=SSL
+user_ssl_=None
+user_ssl_any=SSL
 user_ssl_x509=X509
 
 dbs_title=Database Permissions

diff --git a/mysql/list_users.cgi b/mysql/list_users.cgi
index dfa9dd8..405a2df 100755 (executable)
--- a/mysql/list_users.cgi
+++ b/mysql/list_users.cgi
@@ -16,8 +16,11 @@ print &ui_columns_start([ "",
                          $text{'users_user'},
                          $text{'users_host'},
                          $text{'users_pass'},
+                         $mysql_version >= 5 ? ( $text{'users_ssl'} ) : ( ),
                          $text{'users_perms'} ], 100, 0, \@tds);
 $d = &execute_sql_safe($master_db, "select * from user order by user");
+%fieldmap = map { $_->{'field'}, $_->{'index'} }
+               &table_structure($master_db, "user");
 $i = 0;
 foreach $u (@{$d->{'data'}}) {
        local @cols;
@@ -27,6 +30,10 @@ foreach $u (@{$d->{'data'}}) {
        push(@cols, $u->[0] eq '' || $u->[0] eq '%' ?
                      $text{'user_any'} : &html_escape($u->[0]));
        push(@cols, &html_escape($u->[2]));
+       if ($mysql_version >= 5) {
+               $ssl = $u->[$fieldmap{'ssl_type'}];
+               push(@cols, $text{'user_ssl_'.lc($ssl)} || $ssl);
+               }
        local @priv;
        for($j=3; $j<=&user_priv_cols()+3-1; $j++) {
                push(@priv, $text{"users_priv$j"}) if ($u->[$j] eq 'Y');