ui-lib conversion

diff --git a/usermin/edit_access.cgi b/usermin/edit_access.cgi
index 6ba6aa8..5594015 100755 (executable)
--- a/usermin/edit_access.cgi
+++ b/usermin/edit_access.cgi
@@ -9,37 +9,31 @@ $access{'access'} || &error($text{'acl_ecannot'});
 
 print $text{'access_desc'},"<p>\n";
 
-print "<form action=change_access.cgi method=post>\n";
-print "<table border>\n";
-print "<tr $tb> <td><b>$webmin::text{'access_header'}</b></td> </tr>\n";
-print "<tr $cb> <td><table><tr><td valign=top nowrap>\n";
-printf "<input type=radio name=access value=0 %s>\n",
-       $miniserv{"allow"} || $miniserv{"deny"} ? "" : "checked";
-print "$webmin::text{'access_all'}<br>\n";
-printf "<input type=radio name=access value=1 %s>\n",
-       $miniserv{"allow"} ? "checked" : "";
-print "$webmin::text{'access_allow'}<br>\n";
-printf "<input type=radio name=access value=2 %s>\n",
-       $miniserv{"deny"} ? "checked" : "";
-print "$webmin::text{'access_deny'}<br>\n";
-print "</td> <td valign=top>\n";
-printf "<textarea name=ip rows=6 cols=30>%s</textarea></td> </tr>\n",
-       $miniserv{"allow"} ? join("\n", split(/\s+/, $miniserv{"allow"})) :
-       $miniserv{"deny"} ? join("\n", split(/\s+/, $miniserv{"deny"})) : "";
-
-print "<tr> <td colspan=2>\n";
-printf "<input type=checkbox name=alwaysresolve value=1 %s> %s</td> </tr>\n",
-       $miniserv{'alwaysresolve'} ? 'checked' : '', $webmin::text{'access_always'};
+print &ui_form_start("change_access.cgi", "post");
+print &ui_table_start($webmin::text{'access_header'}, undef, 2, [ "width=30%" ]);
+
+$access = $miniserv{"allow"} ? 1 : $miniserv{"deny"} ? 2 : 0;
+print &ui_table_row($webmin::text{'access_ip'},
+  &ui_radio("access", $access,
+      [ [ 0, $webmin::text{'access_all'} ],
+        [ 1, $webmin::text{'access_allow'} ],
+        [ 2, $webmin::text{'access_deny'} ] ])."<br>\n".
+  &ui_textarea("ip",
+    $access == 1 ? join("\n", split(/\s+/, $miniserv{"allow"})) :
+    $access == 2 ? join("\n", split(/\s+/, $miniserv{"deny"})) : "",
+    6, 30));
+
+print &ui_table_row($webmin::text{'access_always'},
+  &ui_yesno_radio("alwaysresolve", int($miniserv{'alwaysresolve'})));
 
 eval "use Authen::Libwrap qw(hosts_ctl STRING_UNKNOWN)";
 if (!$@) {
-       print "<tr> <td colspan=2>\n";
-       printf "<input type=checkbox name=libwrap value=1 %s> %s</td> </tr>\n",
-               $miniserv{'libwrap'} ? 'checked' : '', $webmin::text{'access_libwrap'};
-       }
+  print &ui_table_row($webmin::text{'access_libwrap'},
+    &ui_yesno_radio("libwrap", int($miniserv{'libwrap'})));
+  }
 
-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'});