More ui-lib conversion

diff --git a/sshd/edit_net.cgi b/sshd/edit_net.cgi
index 50e6c96..f744b88 100755 (executable)
--- a/sshd/edit_net.cgi
+++ b/sshd/edit_net.cgi
@@ -11,34 +11,25 @@ print &ui_table_start($text{'net_header'}, "width=100%", 2);
 
 if ($version{'type'} eq 'openssh' && $version{'number'} >= 3) {
        # Multiple listen addresses supported
-       # XXX
-       &scmd(1);
        @listens = &find("ListenAddress", $conf);
-       print "<td valign=top><b>$text{'net_listen2'}</b></td>\n";
-       print "<td colspan=3>\n";
-       printf "<input type=radio name=listen_def value=1 %s> %s\n",
-               @listens ? "" : "checked", $text{'net_listen_def'};
-       printf "<input type=radio name=listen_def value=0 %s> %s<br>\n",
-               @listens ? "checked" : "", $text{'net_below'};
-       print "<table border>\n";
-       print "<tr $tb> <td><b>$text{'net_laddress'}</b></td> ",
-             "<td><b>$text{'net_lport'}</b></td> </tr>\n";
        $i = 0;
+       @table = ( );
        foreach $l (@listens, { }) {
                local ($a, $p) = $l->{'values'}->[0] =~ /^(.*):(\d+)$/ ?
                                   ($1, $2) : ($l->{'values'}->[0]);
-               print "<tr $cb>\n";
-               print "<td><input name=address_$i size=25 value='$a'></td>\n";
-               printf "<td><input type=radio name=port_def_$i value=1 %s> %s ",
-                       $p ? "" : "checked", $text{'default'};
-               printf "<input type=radio name=port_def_$i value=0 %s>\n",
-                       $p ? "checked" : "";
-               print "<input name=port_$i size=6 value='$p'></td>\n";
-               print "</tr>\n";
+               push(@table, [
+                       &ui_textbox("address_$i", $a, 25),
+                       &ui_opt_textbox("port_$i", $p, 6, $text{'default'})
+                       ]);
                $i++;
                }
-       print "</table>\n";
-       &ecmd();
+       print &ui_table_row($text{'net_listen2'},
+               &ui_radio("listen_def", @listens ? 0 : 1,
+                         [ [ 1, $text{'net_listen_def'} ],
+                           [ 0, $text{'net_below'} ] ])."<br>\n".
+               &ui_columns_table([ $text{'net_laddress'},
+                                   $text{'net_lport'} ],
+                                 undef, \@table));
        }
 else {
        # Just one listen address
@@ -61,8 +52,8 @@ if ($version{'type'} eq 'openssh' && $version{'number'} >= 2) {
                 $version{'number'} >= 2.9 ? (1, 2) : (1);
        $cbs = "";
        foreach $p (1, 2) {
-               $cbs .= &ui_checkbox("prots", $p, &indexof($p, @prots) >= 0,
-                                    $text{"net_prots_$p"})." ";
+               $cbs .= &ui_checkbox("prots", $p, $text{"net_prots_$p"},
+                                    &indexof($p, @prots) >= 0)." ";
                }
        print &ui_table_row($text{'net_prots'}, $cbs);
        }
@@ -77,7 +68,7 @@ if ($version{'type'} eq 'ssh' &&
        print &ui_table_row($text{'net_idle'},
                &ui_radio("idle_def", $idle ? 0 : 1,
                  [ [ 1, $text{'default'} ],
-                   [ 0, &ui_textbox("idle", $idle", 6)." ".
+                   [ 0, &ui_textbox("idle", $idle, 6)." ".
                         &ui_select("idle_units", $units,
                                [ map { [ $_, $text{"net_idle_".$_} ] }
                                      ('s', 'm', 'h', 'd', 'w') ]) ] ]));
@@ -94,42 +85,29 @@ print &ui_table_row($text{'net_grace'},
        &ui_opt_textbox("grace", $grace, 6, $text{'net_grace_def'})." ".
        $text{'net_grace_s'});
 
-# XXX
 if ($version{'type'} ne 'openssh' || $version{'number'} >= 2) {
-       &scmd();
+       # Allow port forwarding?
        $tcp = &find_value("AllowTcpForwarding", $conf);
-       print "<td><b>$text{'net_tcp'}</b></td> <td>\n";
-       printf "<input type=radio name=tcp value=1 %s> %s\n",
-               lc($tcp) eq 'no' ? "" : "checked", $text{'yes'};
-       printf "<input type=radio name=tcp value=0 %s> %s</td>\n",
-               lc($tcp) eq 'no' ? "checked" : "", $text{'no'};
-       &ecmd();
+       print &ui_table_row($text{'net_tcp'},
+               &ui_yesno_radio("tcp", lc($tcp) ne 'no'));
        }
 
 if ($version{'type'} eq 'openssh' && $version{'number'} >= 2) {
-       &scmd();
+       # Allow connections to forwarded ports
        $gateway = &find_value("GatewayPorts", $conf);
-       print "<td><b>$text{'net_gateway'}</b></td> <td>\n";
-       printf "<input type=radio name=gateway value=1 %s> %s\n",
-               lc($gateway) eq 'yes' ? "checked" : "", $text{'yes'};
-       printf "<input type=radio name=gateway value=0 %s> %s</td>\n",
-               lc($gateway) eq 'yes' ? "" : "checked", $text{'no'};
-       &ecmd();
+       print &ui_table_row($text{'net_gateway'},
+               &ui_yesno_radio("gateway", lc($gateway) eq 'yes'));
 
        if ($version{'number'} > 2.3 && $version{'number'} < 3.7) {
-               &scmd();
+               # Validate reverse IP
                $reverse = &find_value("ReverseMappingCheck", $conf);
-               print "<td><b>$text{'net_reverse'}</b></td> <td>\n";
-               printf "<input type=radio name=reverse value=1 %s> %s\n",
-                       lc($reverse) eq 'yes' ? "checked" : "", $text{'yes'};
-               printf "<input type=radio name=reverse value=0 %s> %s</td>\n",
-                       lc($reverse) eq 'yes' ? "" : "checked", $text{'no'};
-               &ecmd();
+               print &ui_table_row($text{'net_reverse'},
+                       &ui_yesno_radio("reverse", lc($reverse) eq 'yes'));
                }
        }
 
-print "</table></td></tr></table>\n";
-print "<input type=submit value='$text{'save'}'></form>\n";
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'save'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});
 

diff --git a/sshd/edit_users.cgi b/sshd/edit_users.cgi
index b85abd9..3024a9a 100755 (executable)
--- a/sshd/edit_users.cgi
+++ b/sshd/edit_users.cgi
@@ -6,167 +6,98 @@ require './sshd-lib.pl';
 &ui_print_header(undef, $text{'users_title'}, "", "users");
 $conf = &get_sshd_config();
 
-print "<form action=save_users.cgi>\n";
-print "<table border width=100%>\n";
-print "<tr $tb> <td><b>$text{'users_header'}</b></td> </tr>\n";
-print "<tr $cb> <td><table width=100%>\n";
+print &ui_form_start("save_users.cgi", "post");
+print &ui_table_start($text{'users_header'}, "width=100%", 2);
 
 if ($version{'type'} eq 'ssh' && $version{'number'} < 2) {
-       &scmd();
+       # Days before account expires to warn
        $expire = &find_value("AccountExpireWarningDays", $conf);
-       print "<td><b>$text{'users_expire'}</b></td> <td nowrap>\n";
-       printf "<input type=radio name=expire_def value=1 %s> %s\n",
-               $expire ? "" : "checked", $text{'users_expire_def'};
-       printf "<input type=radio name=expire_def value=0 %s>\n",
-               $expire ? "checked" : "";
-       print "<input name=expire size=3 value='$expire'></td>\n";
-       &ecmd();
+       print &ui_table_row($text{'users_expire'},
+               &ui_opt_textbox("expire", $expire, 5,
+                               $text{'users_expire_def'}));
        }
 
+# Notify users of new email
 $mail = &find_value("CheckMail", $conf);
 if ($version{'type'} eq 'ssh') {
-       &scmd();
-       print "<td><b>$text{'users_mail'}</b></td> <td nowrap>\n";
-       printf "<input type=radio name=mail value=1 %s> %s\n",
-               lc($mail) eq 'no' ? "" : "checked", $text{'yes'};
-       printf "<input type=radio name=mail value=0 %s> %s</td>\n",
-               lc($mail) eq 'no' ? "checked" : "", $text{'no'};
-       &ecmd();
+       print &ui_table_row($text{'users_mail'},
+               &ui_yesno_radio("mail", lc($mail) ne 'no'));
        }
 elsif ($version{'number'} < 3.1) {
-       &scmd();
-       print "<td><b>$text{'users_mail'}</b></td> <td nowrap>\n";
-       printf "<input type=radio name=mail value=1 %s> %s\n",
-               lc($mail) eq 'yes' ? "checked" : "", $text{'yes'};
-       printf "<input type=radio name=mail value=0 %s> %s</td>\n",
-               lc($mail) eq 'yes' ? "" : "checked", $text{'no'};
-       &ecmd();
+       print &ui_table_row($text{'users_mail'},
+               &ui_yesno_radio("mail", lc($mail) eq 'yes'));
        }
 
-# XXX are these supported?
-#$empty = &find_value("ForcedEmptyPasswdChange", $conf);
-#print "<tr> <td><b>$text{'users_empty'}</b></td> <td>\n";
-#printf "<input type=radio name=empty value=1 %s> %s\n",
-#      lc($empty) eq 'yes' ? "checked" : "", $text{'yes'};
-#printf "<input type=radio name=empty value=0 %s> %s</td>\n",
-#      lc($empty) eq 'yes' ? "" : "checked", $text{'no'};
-
-#$passwd = &find_value("ForcedPasswdChange", $conf);
-#print "<td><b>$text{'users_passwd'}</b></td> <td>\n";
-#printf "<input type=radio name=passwd value=1 %s> %s\n",
-#      lc($passwd) eq 'no' ? "" : "checked", $text{'yes'};
-#printf "<input type=radio name=passwd value=0 %s> %s</td> </tr>\n",
-#      lc($passwd) eq 'no' ? "checked" : "", $text{'no'};
-
 if ($version{'type'} eq 'ssh' && $version{'number'} < 2) {
-       &scmd();
+       # Days before password expires to warn
        $pexpire = &find_value("PasswordExpireWarningDays", $conf);
-       print "<td><b>$text{'users_pexpire'}</b></td> <td nowrap>\n";
-       printf "<input type=radio name=pexpire_def value=1 %s> %s\n",
-               $pexpire ? "" : "checked", $text{'users_pexpire_def'};
-       printf "<input type=radio name=pexpire_def value=0 %s>\n",
-               $pexpire ? "checked" : "";
-       print "<input name=pexpire size=3 value='$pexpire'></td>\n";
-       &ecmd();
+       print &ui_table_row($text{'users_pexpire'},
+               &ui_opt_textbox("pexpire", $pexpire, 5,
+                               $text{'users_pexpire_def'}));
        }
 
 if ($version{'type'} ne 'ssh' || $version{'number'} < 3) {
-       &scmd();
+       # Allow password authentication?
        $auth = &find_value("PasswordAuthentication", $conf);
-       print "<td><b>$text{'users_auth'}</b></td> <td nowrap>\n";
-       printf "<input type=radio name=auth value=1 %s> %s\n",
-               lc($auth) eq 'no' ? "" : "checked", $text{'yes'};
-       printf "<input type=radio name=auth value=0 %s> %s</td>\n",
-               lc($auth) eq 'no' ? "checked" : "", $text{'no'};
-       &ecmd();
+       print &ui_table_row($text{'users_auth'},
+               &ui_yesno_radio("auth", lc($auth) ne 'no'));
        }
 
-&scmd();
+# Allow empty passwords?
 $pempty = &find_value("PermitEmptyPasswords", $conf);
-print "<td><b>$text{'users_pempty'}</b></td> <td nowrap>\n";
 if ($version{'type'} eq 'ssh') {
-       printf "<input type=radio name=pempty value=1 %s> %s\n",
-               lc($pempty) eq 'no' ? "" : "checked", $text{'yes'};
-       printf "<input type=radio name=pempty value=0 %s> %s</td>\n",
-               lc($pempty) eq 'no' ? "checked" : "", $text{'no'};
+       print &ui_table_row($text{'users_pempty'},
+               &ui_yesno_radio("pempty", lc($pempty) ne 'no'));
        }
 else {
-       printf "<input type=radio name=pempty value=1 %s> %s\n",
-               lc($pempty) eq 'yes' ? "checked" : "", $text{'yes'};
-       printf "<input type=radio name=pempty value=0 %s> %s</td>\n",
-               lc($pempty) eq 'yes' ? "" : "checked", $text{'no'};
+       print &ui_table_row($text{'users_pempty'},
+               &ui_yesno_radio("pempty", lc($pempty) eq 'yes'));
        }
-&ecmd();
 
-&scmd();
+# Allow logins by root
 $root = &find_value("PermitRootLogin", $conf);
 if (!$root) {
        # Default ways seems to be 'yes'
        $root = "yes";
        }
-print "<td><b>$text{'users_root'}</b></td> <td nowrap><select name=root>\n";
-printf "<option value=yes %s> %s\n",
-       lc($root) eq 'yes' || !$root ? "selected" : "", $text{'yes'};
-printf "<option value=no %s> %s\n",
-       lc($root) eq 'no' ? "selected" : "", $text{'no'};
+@opts = ( [ 'yes', $text{'yes'} ],
+         [ 'no', $text{'no'} ] );
 if ($version{'type'} eq 'ssh') {
-       printf "<option value=nopwd %s> %s\n",
-               lc($root) eq 'nopwd' ? "selected" : "", $text{'users_nopwd'};
+       push(@opts, [ 'nopwd', $text{'users_nopwd'} ]);
        }
 else {
-       printf "<option value=without-password %s> %s\n",
-               lc($root) eq 'without-password' ? "selected" : "",
-               $text{'users_nopwd'};
+       push(@opts, [ 'without-password', $text{'users_nopwd'} ]);
        if ($version{'number'} >= 2) {
-               printf "<option value=forced-commands-only %s> %s\n",
-                       lc($root) eq 'forced-commands-only' ? "selected" : "",
-                       $text{'users_fcmd'};
+               push(@opts, [ 'forced-commands-only', $text{'users_fcmd'} ]);
                }
        }
 print "</select></td>\n";
-&ecmd();
+print &ui_table_row($text{'users_root'},
+       &ui_select("root", lc($root), \@opts));
 
 # SSH 1 RSA authentication
 if ($version{'type'} ne 'ssh' || $version{'number'} < 3) {
-       &scmd();
        $rsa = &find_value("RSAAuthentication", $conf);
-       print "<td><b>$text{'users_rsa'}</b></td> <td nowrap>\n";
-       printf "<input type=radio name=rsa value=1 %s> %s\n",
-               lc($rsa) eq 'no' ? "" : "checked", $text{'yes'};
-       printf "<input type=radio name=rsa value=0 %s> %s</td>\n",
-               lc($rsa) eq 'no' ? "checked" : "", $text{'no'};
-       &ecmd();
+       print &ui_table_row($text{'users_rsa'},
+               &ui_yesno_radio('rsa', lc($rsa) ne 'no'));
        }
 
 # SSH 2 DSA authentication
 if ($version{'type'} eq 'openssh' && $version{'number'} >= 3) {
-       &scmd();
        $rsa = &find_value("PubkeyAuthentication", $conf);
-       print "<td><b>$text{'users_dsa'}</b></td> <td nowrap>\n";
-       printf "<input type=radio name=dsa value=1 %s> %s\n",
-               lc($rsa) eq 'no' ? "" : "checked", $text{'yes'};
-       printf "<input type=radio name=dsa value=0 %s> %s</td>\n",
-               lc($rsa) eq 'no' ? "checked" : "", $text{'no'};
-       &ecmd();
+       print &ui_table_row($text{'users_dsa'},
+               &ui_yesno_radio('dsa', lc($dsa) ne 'no'));
        }
 
-&scmd();
+# Strictly check permissions
 $strict = &find_value("StrictModes", $conf);
-print "<td><b>$text{'users_strict'}</b></td> <td nowrap>\n";
-printf "<input type=radio name=strict value=1 %s> %s\n",
-       lc($strict) eq 'no' ? "" : "checked", $text{'yes'};
-printf "<input type=radio name=strict value=0 %s> %s</td>\n",
-       lc($strict) eq 'no' ? "checked" : "", $text{'no'};
-&ecmd();
+print &ui_table_row($text{'users_strict'},
+       &ui_yesno_radio('strict', lc($strict) ne 'no'));
 
-&scmd();
+# Show message of the day
 $motd = &find_value("PrintMotd", $conf);
-print "<td><b>$text{'users_motd'}</b></td> <td nowrap>\n";
-printf "<input type=radio name=motd value=1 %s> %s\n",
-       lc($motd) eq 'no' ? "" : "checked", $text{'yes'};
-printf "<input type=radio name=motd value=0 %s> %s</td>\n",
-       lc($motd) eq 'no' ? "checked" : "", $text{'no'};
-&ecmd();
+print &ui_table_row($text{'users_motd'},
+       &ui_yesno_radio('motd', lc($motd) ne 'no'));
 
 if ($version{'type'} eq 'openssh') {
        &scmd();

diff --git a/sshd/save_net.cgi b/sshd/save_net.cgi
index 218c278..523935f 100755 (executable)
--- a/sshd/save_net.cgi
+++ b/sshd/save_net.cgi
@@ -18,7 +18,7 @@ if ($version{'type'} eq 'openssh' && $version{'number'} >= 3) {
                        next if (!$a);
                        &check_ipaddress($a) || gethostbyname($a) ||
                                &error(&text('net_eladdress', $a));
-                       if ($in{"port_def_$i"}) {
+                       if ($in{"port_${i}_def"}) {
                                push(@listens, $a);
                                }
                        else {