ui-lib

diff --git a/usermin/edit_bind.cgi b/usermin/edit_bind.cgi
index c6bad88..f9f5b59 100755 (executable)
--- a/usermin/edit_bind.cgi
+++ b/usermin/edit_bind.cgi
@@ -9,58 +9,47 @@ $access{'bind'} || &error($text{'acl_ecannot'});
 
 print $text{'bind_desc2'},"<p>\n";
 
-print "<form action=change_bind.cgi>\n";
-print "<table border>\n";
-print "<tr $tb> <td><b>$webmin::text{'bind_header'}</b></td> </tr>\n";
-print "<tr $cb> <td><table width=100%>\n";
+print &ui_form_start("change_bind.cgi", "post");
+print &ui_table_start($webmin::text{'bind_header'}, undef, 2, [ "width=30%" ]);
 
 # Build list of sockets
-@sockets = &webmin::get_miniserv_sockets(\%miniserv);
+my @sockets = &webmin::get_miniserv_sockets(\%miniserv);
 
 # Show table of all bound IPs and ports
-print "<tr> <td valign=top><b>$webmin::text{'bind_sockets'}</b></td>\n";
-print "<td><table border>\n";
-print "<tr $tb> <td><b>$webmin::text{'bind_sip'}</b></td> ",
-      "<td><b>$webmin::text{'bind_sport'}</b></td> </tr>\n";
-$i = 0;
+my $stable = &ui_columns_start([ $webmin::text{'bind_sip'}, $webmin::text{'bind_sport'} ]);
+my $i = 0;
 foreach $s (@sockets, [ undef, "*" ]) {
-       print "<tr $cb>\n";
-       print "<td><select name=ip_def_$i>\n";
-       printf "<option value=0 %s>&nbsp;\n",
-               $s->[0] ? "" : "selected";
-       printf "<option value=1 %s>%s\n",
-               $s->[0] eq "*" ? "selected" : "", $webmin::text{'bind_sip1'};
-       printf "<option value=2 %s>%s\n",
-               $s->[0] eq "*" || !$s->[0] ? "" : "selected",$webmin::text{'bind_sip2'};
-       print "</select>\n";
-       printf "<input name=ip_$i size=20 value='%s'></td>\n",
-               $s->[0] eq "*" ? undef : $s->[0];
-
-       print "<td>\n";
-       print "<select name=port_def_$i>\n";
-       if ($i) {
-               printf "<option value=0 %s>%s\n",
-                       $s->[1] eq "*" ? "selected" : "", $webmin::text{'bind_sport0'};
-               }
-       printf "<option value=1 %s>%s\n",
-               $s->[1] eq "*" ? "" : "selected", $webmin::text{'bind_sport1'};
-       print "</select>\n";
-       printf "<input name=port_$i size=5 value='%s'></td>\n",
-               $s->[1] eq "*" ? undef : $s->[1];
-       print "</tr>\n";
+       use Data::Dumper;
+       print "<!-- " . Dumper($s) . " -->\n";
+       # IP address
+       my @cols;
+       push(@cols, &ui_select("ip_def_$i",
+                              $s->[0] eq "" ? 0 :
+                             $s->[0] eq "*" ? 1 : 2,
+                              [ [ 0, "&nbsp;" ],
+                              [ 1, $webmin::text{'bind_sip1'} ],
+                              [ 2, $webmin::text{'bind_sip2'} ] ])." ".
+                              &ui_textbox("ip_$i", $s->[0] eq "*" ? undef : $s->[0], 20));
+
+       # Port
+       push(@cols, &ui_select("port_def_$i", $s->[1] eq "*" ? 0 : 1,
+                 [ $i ? ( [ 0, $webmin::text{'bind_sport0'} ] ) : ( ),
+            [ 1, $webmin::text{'bind_sport1'} ] ])." ".
+             &ui_textbox("port_$i", $s->[1] eq "*" ? undef : $s->[1],5));
+       $stable .= &ui_columns_row(\@cols, [ "nowrap", "nowrap" ]);
        $i++;
        }
-print "</table></td> </tr>\n";
+$stable .= &ui_columns_end();
+print &ui_table_row($webmin::text{'bind_sockets'}, $stable);
 
 # Show web server hostname
-print "<tr> <td nowrap><b>$webmin::text{'bind_hostname'}</b></td>\n";
-print "<td>",&ui_radio("hostname_def", $miniserv{"host"} ? 0 : 1,
-       [ [ 1, $webmin::text{'bind_auto'} ],
-         [ 0, &ui_textbox("hostname", $miniserv{"host"}, 25) ] ]),
-       "</td> </tr>\n";
+print &ui_table_row($webmin::text{'bind_hostname'},
+      &ui_radio("hostname_def", $miniserv{"host"} ? 0 : 1,
+      [ [ 1, $webmin::text{'bind_auto'} ],
+      [ 0, &ui_textbox("hostname", $miniserv{"host"}, 25) ] ]));
 
-print "</table></td></tr></table>\n";
-print "<input type=submit value=\"$text{'save'}\"></form>\n";
+print &ui_table_end();
+print &ui_form_end([ [ "save", $text{'save'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});