rename user field

diff --git a/postgresql/edit_user.cgi b/postgresql/edit_user.cgi
index 49bae86..211aef3 100755 (executable)
--- a/postgresql/edit_user.cgi
+++ b/postgresql/edit_user.cgi
@@ -24,25 +24,25 @@ print &ui_table_start($text{'user_header'}, undef, 2);
 # Username, not always editable
 print &ui_table_row($text{'user_name'},
        $in{'new'} || &get_postgresql_version() >= 7.4 ?
-               &ui_textbox("name", $user[0], 40) :
+               &ui_textbox("pname", $user[0], 40) :
                $user[0]);
 
 if ($in{'new'}) {
        # For new users, can select empty or specific password
        print &ui_table_row($text{'user_passwd'},
-             &ui_radio("pass_def", 1,
+             &ui_radio("ppass_def", 1,
                        [ [ 1, $text{'user_none'} ],
                          [ 0, $text{'user_setto'} ] ])." ".
-                    &ui_password("pass", undef, 20));
+                    &ui_password("ppass", undef, 20));
        }
 else {
        # For existing users, can select empty, leave unchanged or
        # specific password
        print &ui_table_row($text{'user_passwd'},
-             &ui_radio("pass_def", 2,
+             &ui_radio("ppass_def", 2,
                        [ [ 2, $text{'user_nochange'} ],
                          [ 0, $text{'user_setto'} ] ])." ".
-                    &ui_password("pass", undef, 20));
+                    &ui_password("ppass", undef, 20));
        }
 
 # Can create databases?

diff --git a/postgresql/save_user.cgi b/postgresql/save_user.cgi
index 7aab539..200b44e 100755 (executable)
--- a/postgresql/save_user.cgi
+++ b/postgresql/save_user.cgi
@@ -15,10 +15,10 @@ if ($in{'delete'}) {
 else {
        # parse inputs
        $version = &get_postgresql_version();
-       if ($in{'pass_def'} == 0) {
-               $in{'pass'} =~ /^\S+$/ || &error($text{'user_epass'});
-               $sql .= $version >= 7 ? " with password '$in{'pass'}'"
-                                     : " with password $in{'pass'}";
+       if ($in{'ppass_def'} == 0) {
+               $in{'ppass'} =~ /^\S+$/ || &error($text{'user_epass'});
+               $sql .= $version >= 7 ? " with password '$in{'ppass'}'"
+                                     : " with password $in{'ppass'}";
                }
        elsif ($in{'pass_def'} == 1) {
                $sql .= " with password ''";
@@ -39,20 +39,20 @@ else {
                $sql .= " valid until '$in{'until'}'";
                }
        if ($in{'new'}) {
-               $in{'name'} =~ /^\S+$/ || &error($text{'user_ename'});
+               $in{'pname'} =~ /^\S+$/ || &error($text{'user_ename'});
                &execute_sql_logged($config{'basedb'},
-                                   "create user \"$in{'name'}\" $sql");
-               &webmin_log("create", "user", $in{'name'});
+                                   "create user \"$in{'pname'}\" $sql");
+               &webmin_log("create", "user", $in{'pname'});
                }
        else {
                &execute_sql_logged($config{'basedb'},
                                    "alter user \"$in{'user'}\" $sql");
                if (&get_postgresql_version() >= 7.4 &&
-                   $in{'name'} ne $in{'user'}) {
+                   $in{'pname'} ne $in{'user'}) {
                        # Rename too
                        &execute_sql_logged($config{'basedb'},
                                "alter user \"$in{'user'}\" ".
-                               "rename to \"$in{'name'}\"");
+                               "rename to \"$in{'pname'}\"");
                        }
                &webmin_log("modify", "user", $in{'user'});
                }