michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-08-04 15:10:41 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Start of work on ui-lib cleanup for Shorewall module

Browse Source
This commit is contained in:
Jamie Cameron
2026-08-03 14:37:19 -07:00
parent b52cbb98d4
commit 1ff83263cd
4 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shorewall/check.cgi
View File

@@ -4,6 +4,7 @@
require './shorewall-lib.pl';
&ui_print_header(undef, $text{'check_title'}, "");
print "<b>$text{'check_cmd'}</b><br>\n";
print "<font size=-1><pre>";
open(STATUS, "$config{'shorewall'} check 2>&1 |");
@@ -18,5 +19,6 @@ if ($?) {
else {
print "<b>$text{'check_ok'}</b><p>\n";
}
&ui_print_footer("", $text{'index_return'});

2
shorewall/dump.cgi
View File

@@ -4,6 +4,7 @@
require './shorewall-lib.pl';
&ui_print_header(undef, $text{'dump_title'}, "");
print "<font size=-1><pre>";
open(DUMP, "$config{'shorewall'} dump 2>&1 |");
while(<DUMP>) {
@@ -11,5 +12,6 @@ while(<DUMP>) {
}
close(DUMP);
print "</pre></font>\n";
&ui_print_footer("", $text{'index_return'});

29
shorewall/edit.cgi
View File

@@ -23,33 +23,26 @@ else {
$row = $table[$in{'idx'}];
}
print "<form action=save.cgi>\n";
print "<input type=hidden name=table value='$in{'table'}'>\n";
print "<input type=hidden name=idx value='$in{'idx'}'>\n";
print "<input type=hidden name=new value='$in{'new'}'>\n";
print "<input type=hidden name=before value='$in{'before'}'>\n";
print "<input type=hidden name=after value='$in{'after'}'>\n";
print &ui_form_start("save.cgi", "post");
print &ui_hidden("table", $in{'table'});
print &ui_hidden("idx", $in{'idx'});
print &ui_hidden("new", $in{'new'});
print &ui_hidden("before", $in{'before'});
print &ui_hidden("after", $in{'after'});
print "<table border width=100%>\n";
print "<tr $tb> <td><b>",$text{$in{'tableclean'}."_header"},"</b></td> </tr>\n";
print "<tr $cb> <td><table width=100%>\n";
print &ui_table_start($text{$in{'tableclean'}."_header"}, "width=100%", 4);
$ffunc = $in{'tableclean'}."_form";
&$ffunc(@$row);
print "</table></td></tr></table>\n";
print "<table width=100%>\n";
print &ui_table_end();
if ($in{'new'}) {
print "<td><input type=submit value='$text{'create'}'></td>\n";
print &ui_form_end([ [ undef, $text{'create'} ] ]);
}
else {
print "<td><input type=submit value='$text{'save'}'></td>\n";
print "<td align=right><input type=submit name=delete ",
"value='$text{'delete'}'></td>\n";
print &ui_form_end([ [ undef, $text{'save'} ],
[ 'delete', $text{'delete'} ] ]);
}
print "</table>\n";
print "</form>\n";
&ui_print_footer("list.cgi?table=$in{'table'}", $text{$in{'tableclean'}."_return"});

43
shorewall/list.cgi
View File

@@ -56,9 +56,10 @@ if (@table) {
local @tds;
if ($t[0] =~ /\??COMMENT/) {
# Special case - a comment line
push(@cols, "<a href='editcmt.cgi?table=$in{'table'}&".
"idx=$i'><i>".join(" ", @t[1..$#t]).
"</i></a>" );
push(@cols, &ui_link(
"editcmt.cgi?table=".&urlize($in{'table'}).
"&idx=".&urlize($i),
"<i>".join(" ", @t[1..$#t])."</i>"));
@tds = ( "width=5", "colspan=".scalar(@colnames) );
}
else {
@@ -68,7 +69,9 @@ if (@table) {
}
for($j=0; $j<@colnames; $j++) {
if ($j == 0) {
$lnk = &ui_link("edit.cgi?table=$in{'table'}&idx=$i",$t[$j]);
$lnk = &ui_link(
"edit.cgi?table=".&urlize($in{'table'}).
"&idx=".&urlize($i), $t[$j]);
}
else {
$lnk = $t[$j];
@@ -78,26 +81,20 @@ if (@table) {
@tds = ( "width=5" );
}
if (@table > 1) {
$mover = "";
if ($i == 0) {
$mover .= "<img src=images/gap.gif>";
}
else {
$mover .= &ui_link("up.cgi?table=$in{'table'}&idx=$i","<img src=images/up.gif border=0>")."\n";
}
if ($i == $#table) {
$mover .= "<img src=images/gap.gif>";
}
else {
$mover .= &ui_link("down.cgi?table=$in{'table'}&idx=$i","<img src=images/down.gif border=0>")."\n";
}
push(@cols, $mover);
push(@cols, &ui_up_down_arrows(
"up.cgi?table=".&urlize($in{'table'})."&idx=".&urlize($i),
"down.cgi?table=".&urlize($in{'table'})."&idx=".&urlize($i),
$i > 0, $i != $#table,
"images/up.gif", "images/down.gif"));
}
push(@cols,
"<a href='edit.cgi?table=$in{'table'}&new=1&before=$i'>".
"<img src=images/before.gif border=0></a>\n".
"<a href='edit.cgi?table=$in{'table'}&new=1&after=$i'>".
"<img src=images/after.gif border=0></a>\n");
push(@cols, &ui_link(
"edit.cgi?table=".&urlize($in{'table'}).
"&new=1&before=".&urlize($i),
"<img src=images/before.gif border=0>").
&ui_link(
"edit.cgi?table=".&urlize($in{'table'}).
"&new=1&after=".&urlize($i),
"<img src=images/after.gif border=0>"));
print &ui_checked_columns_row(\@cols, \@tds, "d", $i);
}
print &ui_columns_end();