Remove duplicated options

diff --git a/usermin/change_session.cgi b/usermin/change_session.cgi
index 6a513cc..b8cac67 100755 (executable)
--- a/usermin/change_session.cgi
+++ b/usermin/change_session.cgi
@@ -131,7 +131,6 @@ if ($ver >= 1.153) {
 &get_usermin_config(\%uconfig);
 #$uconfig{'locking'} = $in{'locking'};
 $uconfig{'noremember'} = !$in{'remember'};
-$uconfig{'nohostname'} = !$in{'hostname'};
 $uconfig{'realname'} = $in{'realname'};
 if ($in{'passwd_file'}) {
        $uconfig{'passwd_file'} = $in{'passwd_file'};

diff --git a/usermin/edit_session.cgi b/usermin/edit_session.cgi
index fdb51f6..959c9dc 100755 (executable)
--- a/usermin/edit_session.cgi
+++ b/usermin/edit_session.cgi
@@ -63,10 +63,7 @@ print &webmin::text('session_logout',
 printf "&nbsp;&nbsp;&nbsp;<input type=checkbox name=remember value=1 %s>\n",
        $uconfig{'noremember'} ? "" : "checked";
 print "$webmin::text{'session_remember'}<br>\n";
-printf "&nbsp;&nbsp;&nbsp;<input type=checkbox name=hostname value=1 %s>\n",
-       $uconfig{'nohostname'} ? "" : "checked";
-print "$webmin::text{'session_hostname'}<br>\n";
-print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
+print "&nbsp;&nbsp;&nbsp;";
 printf "<input type=checkbox name=realname value=1 %s>\n",
        $uconfig{'realname'} ? "checked" : "";
 print "$webmin::text{'session_realname'}<br>\n";

diff --git a/usermin/edit_ui.cgi b/usermin/edit_ui.cgi
index 38a3cbc..f76137f 100755 (executable)
--- a/usermin/edit_ui.cgi
+++ b/usermin/edit_ui.cgi
@@ -33,7 +33,11 @@ print &ui_table_row($text{'ui_hostnamemode'},
       " ".&ui_textbox("hostnamedisplay", $uconfig{'hostnamedisplay'}, 20));
 
 print &ui_table_row($webmin::text{'ui_showlogin'},
-      &ui_yesno_radio("showlogin", int($uconfig{'showlogin'})));
+      &ui_yesno_radio("showlogin", $uconfig{'showlogin'}));
+
+print &ui_table_row($webmin::text{'startpage_nohost'},
+      &ui_radio("nohostname", $uconfig{'nohostname'} ? 1 : 0,
+                 [ [ 0, $text{'yes'} ], [ 1, $text{'no'} ] ]));
 
 print &ui_table_row($webmin::text{'startpage_gotoone'},
       &ui_yesno_radio("gotoone", int($uconfig{'gotoone'})));

diff --git a/webmin/change_session.cgi b/webmin/change_session.cgi
index 196a830..4e56719 100755 (executable)
--- a/webmin/change_session.cgi
+++ b/webmin/change_session.cgi
@@ -91,7 +91,6 @@ $miniserv{'utmp'} = $in{'utmp'};
 &lock_file("$config_directory/config");
 #$gconfig{'locking'} = $in{'locking'};
 $gconfig{'noremember'} = !$in{'remember'};
-$gconfig{'nohostname'} = !$in{'hostname'};
 $gconfig{'realname'} = $in{'realname'};
 if ($in{'passwd_file'}) {
        $gconfig{'passwd_file'} = $in{'passwd_file'};

diff --git a/webmin/edit_session.cgi b/webmin/edit_session.cgi
index c340548..5693659 100755 (executable)
--- a/webmin/edit_session.cgi
+++ b/webmin/edit_session.cgi
@@ -63,9 +63,7 @@ print text('session_logout',
 #print "$text{'session_locking'}<br>\n";
 print '&nbsp;&nbsp;&nbsp;', ui_checkbox('remember', 1, $text{'session_remember'},
        !$gconfig{'noremember'}), "<br>\n";
-print '&nbsp;&nbsp;&nbsp;', ui_checkbox('hostname', 1, $text{'session_hostname'},
-       !$gconfig{'nohostname'}), "<br>\n";
-print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;', ui_checkbox('realname', 1,
+print '&nbsp;&nbsp;&nbsp;', ui_checkbox('realname', 1,
        $text{'session_realname'}, $gconfig{'realname'}), "<br>\n";
 print '&nbsp;&nbsp;&nbsp;', ui_checkbox('utmp', 1, $text{'session_utmp'},
        $miniserv{'utmp'}), "<br>\n";