From 5672f6bfce50c7f340dd6101bf79004b6b075436 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Fri, 15 Dec 2023 20:55:10 -0800
Subject: [PATCH] Finished off ui-lib conversion

---
 proftpd/anon_index.cgi      | 38 +++++++++++++------------------------
 proftpd/create_dirlimit.cgi |  7 +++++--
 proftpd/dir_index.cgi       | 22 ++++++++++-----------
 proftpd/virt_index.cgi      | 35 ++++++++++++----------------------
 4 files changed, 40 insertions(+), 62 deletions(-)

diff --git a/proftpd/anon_index.cgi b/proftpd/anon_index.cgi
index d0694a2c9..d6ced0c32 100755
--- a/proftpd/anon_index.cgi
+++ b/proftpd/anon_index.cgi
@@ -46,34 +46,22 @@ if (@dir) {
 		}
 	&icons_table(\@links, \@titles, \@icons, 3);
 	}
+print "<p>\n";
 
-print "<table width=100%><tr><td>\n";
+print &ui_form_start("create_dirlimit.cgi", "post");
+print &ui_hidden("virt", $in{'virt'});
+print &ui_hidden("anon", 1);
+print &ui_table_start($text{'index_dlheader'}, undef, 2);
 
-print "<form action=create_dir.cgi>\n";
-print "<input type=hidden name=virt value='$in{'virt'}'>\n";
-print "<input type=hidden name=anon value=1>\n";
-print "<table border>\n";
-print "<tr $tb> <td><b>$text{'virt_adddir'}</b></td> </tr>\n";
-print "<tr $cb> <td><table>\n";
-print "<tr> <td><b>$text{'virt_path'}</b></td>\n";
-print "<td><input name=dir size=30>\n";
-print "<input type=submit value=\"$text{'create'}\"></td> </tr>\n";
-print "</table></td></tr></table></form>\n";
+print &ui_table_row($text{'index_dlmode'},
+	&ui_radio_table("mode", 0,
+		[ [ 0, $text{'virt_path'},
+		    &ui_textbox("dir", undef, 50) ],
+		  [ 1, $text{'virt_cmds'},
+		    &ui_textbox("cmd", undef, 30) ] ]));
 
-print "</td><td>\n";
-
-print "<form action=create_limit.cgi>\n";
-print "<input type=hidden name=virt value='$in{'virt'}'>\n";
-print "<input type=hidden name=anon value=1>\n";
-print "<table border>\n";
-print "<tr $tb> <td><b>$text{'virt_addlimit'}</b></td> </tr>\n";
-print "<tr $cb> <td><table>\n";
-print "<tr> <td><b>$text{'virt_cmds'}</b></td>\n";
-print "<td><input name=cmd size=20>\n";
-print "<input type=submit value=\"$text{'create'}\"></td> </tr>\n";
-print "</table></td></tr></table></form>\n";
-
-print "</td></tr></table>\n";
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'create'} ] ]);
 
 &ui_print_footer("virt_index.cgi?virt=$in{'virt'}", $text{'virt_return'},
 	"", $text{'index_return'});
diff --git a/proftpd/create_dirlimit.cgi b/proftpd/create_dirlimit.cgi
index 00ea1c3db..b8aa3fe82 100644
--- a/proftpd/create_dirlimit.cgi
+++ b/proftpd/create_dirlimit.cgi
@@ -3,11 +3,14 @@
 
 require './proftpd-lib.pl';
 &ReadParse();
+$args = "global=".&urlize($in{'global'})."&".
+	"virt=".&urlize($in{'virt'})."&".
+	"anon=".&urlize($in{'anon'});
 if ($in{'mode'} == 0) {
-	&redirect("create_dir.cgi?global=".&urlize($in{'global'}).
+	&redirect("create_dir.cgi?$args".
 		  "&dir=".&urlize($in{'dir'}));
 	}
 else {
-	&redirect("create_limit.cgi?global=".&urlize($in{'global'}).
+	&redirect("create_limit.cgi?$args".
 		  "&cmd=".&urlize($in{'cmd'}));
 	}
diff --git a/proftpd/dir_index.cgi b/proftpd/dir_index.cgi
index e536bfe7c..59c499a4b 100755
--- a/proftpd/dir_index.cgi
+++ b/proftpd/dir_index.cgi
@@ -48,18 +48,16 @@ if (@lim) {
 	&icons_table(\@links, \@titles, \@icons, 3);
 	}
 
-print "<form action=create_limit.cgi>\n";
-print "<input type=hidden name=virt value='$in{'virt'}'>\n";
-print "<input type=hidden name=idx value='$in{'idx'}'>\n";
-print "<input type=hidden name=anon value='$in{'anon'}'>\n";
-print "<input type=hidden name=global value='$in{'global'}'>\n";
-print "<table border>\n";
-print "<tr $tb> <td><b>$text{'virt_addlimit'}</b></td> </tr>\n";
-print "<tr $cb> <td><table>\n";
-print "<tr> <td><b>$text{'virt_cmds'}</b></td>\n";
-print "<td><input name=cmd size=20>\n";
-print "<input type=submit value=\"$text{'create'}\"></td> </tr>\n";
-print "</table></td></tr></table></form>\n";
+print &ui_form_start("create_limit.cgi");
+print &ui_hidden("virt", $in{'virt'});
+print &ui_hidden("idx", $in{'idx'});
+print &ui_hidden("anon", $in{'anon'});
+print &ui_hidden("global", $in{'global'});
+print &ui_table_start($text{'virt_addlimit'}, undef, 2);
+print &ui_table_row($text{'virt_cmds'},
+	&ui_textbox("cmd", undef, 30));
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'create'} ] ]);
 
 if ($in{'global'}) {
 	&ui_print_footer("", $text{'index_return'});
diff --git a/proftpd/virt_index.cgi b/proftpd/virt_index.cgi
index 359405b7c..0a2a35ea2 100755
--- a/proftpd/virt_index.cgi
+++ b/proftpd/virt_index.cgi
@@ -46,32 +46,21 @@ if (@dir) {
 		}
 	&icons_table(\@links, \@titles, \@icons, 3);
 	}
+print "<p>\n";
 
-print "<table width=100%><tr><td>\n";
+print &ui_form_start("create_dirlimit.cgi", "post");
+print &ui_hidden("virt", $in{'virt'});
+print &ui_table_start($text{'index_dlheader'}, undef, 2);
 
-print "<form action=create_dir.cgi>\n";
-print "<input type=hidden name=virt value='$in{'virt'}'>\n";
-print "<table border>\n";
-print "<tr $tb> <td><b>$text{'virt_adddir'}</b></td> </tr>\n";
-print "<tr $cb> <td><table>\n";
-print "<tr> <td><b>$text{'virt_path'}</b></td>\n";
-print "<td><input name=dir size=30>\n";
-print "<input type=submit value=\"$text{'create'}\"></td> </tr>\n";
-print "</table></td></tr></table></form>\n";
+print &ui_table_row($text{'index_dlmode'},
+	&ui_radio_table("mode", 0,
+		[ [ 0, $text{'virt_path'},
+		    &ui_textbox("dir", undef, 50) ],
+		  [ 1, $text{'virt_cmds'},
+		    &ui_textbox("cmd", undef, 30) ] ]));
 
-print "</td><td>\n";
-
-print "<form action=create_limit.cgi>\n";
-print "<input type=hidden name=virt value='$in{'virt'}'>\n";
-print "<table border>\n";
-print "<tr $tb> <td><b>$text{'virt_addlimit'}</b></td> </tr>\n";
-print "<tr $cb> <td><table>\n";
-print "<tr> <td><b>$text{'virt_cmds'}</b></td>\n";
-print "<td><input name=cmd size=20>\n";
-print "<input type=submit value=\"$text{'create'}\"></td> </tr>\n";
-print "</table></td></tr></table></form>\n";
-
-print "</td></tr></table>\n";
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'create'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});