From 1f74a9cdf15a448fe3d1b7cb08b870c6edbed01a Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sun, 29 Dec 2013 17:39:16 +0800 Subject: [PATCH 01/12] cleanup itsecur-firewall/edit_sep.cgi --- itsecur-firewall/edit_sep.cgi | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/itsecur-firewall/edit_sep.cgi b/itsecur-firewall/edit_sep.cgi index eb3b6c427..54984af3a 100755 --- a/itsecur-firewall/edit_sep.cgi +++ b/itsecur-firewall/edit_sep.cgi @@ -25,7 +25,8 @@ foreach my $th ('new', 'idx', 'insert') { print &ui_table_start($text{'sep_header'}, undef, 2); print &ui_table_row($text{'sep_desc'}, - &ui_textbox("desc", ( $rule->{'desc'} eq "*" ? "" : $rule->{'desc'} ), 60) ); + &ui_textbox("desc", ( $rule->{'desc'} eq "*" ? "" : $rule->{'desc'} ), 60), + undef, ["valign=middle","valign=middle"] ); # Show input for position of rule my @sel; @@ -41,15 +42,15 @@ foreach $br (@rules) { } } push(@sel, [ -1, $text{'rule_end'}, ($in{'new'} || $rule eq $rules[$#rules] ? "selected" : "") ] ); -print &ui_table_row($text{'rule_atpos'}, &ui_select("pos", undef, \@sel, 1) ); +print &ui_table_row($text{'rule_atpos'}, &ui_select("pos", undef, \@sel, 1), undef, ["valign=middle","valign=middle"] ); print &ui_table_end(); - +print "

"; if ($in{'new'}) { - print &ui_hidden($text{'create'}); + print &ui_submit($text{'create'}); } else { - print &ui_hidden($text{'save'}); - print &ui_hidden($text{'delete'}, "delete"); + print &ui_submit($text{'save'}); + print &ui_submit($text{'delete'}, "delete"); } print &ui_form_end(); From 660bb0147bb40675a4e0a5a3ce4a4f0714d6edc3 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sun, 29 Dec 2013 17:39:30 +0800 Subject: [PATCH 02/12] cleanup itsecur-firewall/edit_rule.cgi --- itsecur-firewall/edit_rule.cgi | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/itsecur-firewall/edit_rule.cgi b/itsecur-firewall/edit_rule.cgi index 0587ccb89..6909a174c 100755 --- a/itsecur-firewall/edit_rule.cgi +++ b/itsecur-firewall/edit_rule.cgi @@ -50,7 +50,7 @@ foreach $s ('source', 'dest') { &ui_oneradio(${s}."_mode", 1, $text{'rule_host'}, ($sm == 1 ? 1 : 0))." ". &ui_textbox(${s}."_host", ($sm == 1 ? $rule->{$s} : ""), 30)." ".$text{'rule_named'}." ". &ui_textbox(${s}."_name", undef, 15)."
". - &ui_checkbox(${s}."_resolv", 1, $text{'rule_resolv'}), undef, ["valign=top","valign=middle"] ); + &ui_checkbox(${s}."_resolv", 1, $text{'rule_resolv'},undef,"style=margin-left:15px;"), undef, ["valign=top","valign=middle"] ); # Host group option local $gv; @@ -61,8 +61,8 @@ foreach $s ('source', 'dest') { $gi = &group_input("${s}_group", $gv, 0, 1); if ($gi || $sm == 2) { print &ui_table_row(" ", - &ui_oneradio(${s}."_mode", 2, $text{'rule_group'}, ($sm == 2 ? 1 : 0))." ". - $gi); + "
".&ui_oneradio(${s}."_mode", 2, $text{'rule_group'}, ($sm == 2 ? 1 : 0))."". + $gi."
",undef,["valign=top","valign=top"]); } # Interface option @@ -87,8 +87,8 @@ print &ui_table_row(" ", # Show action upon match print &ui_table_row($text{'rule_action'}, &action_input("action", $rule->{'action'}). - " — ".&ui_checkbox("log", 1, $text{'rule_log'}, ($rule->{'log'} ? 1 : 0) ) - ); + "  ".&ui_checkbox("log", 1, $text{'rule_log'}, ($rule->{'log'} ? 1 : 0) ) + ,undef, ["valign=middle","valign=middle"]); # Show time that this rule applies @@ -119,9 +119,11 @@ foreach $br (@rules) { } } push(@sel, [ -1, $text{'rule_end'}, ($in{'new'} || $rule eq $rules[$#rules] ? "selected" : "") ] ); -print &ui_table_row($text{'rule_atpos'}, &ui_select("pos", undef, \@sel, 1) ); +print &ui_table_row($text{'rule_atpos'}, &ui_select("pos", undef, \@sel, 1), undef, ["valign=middle","valign=middle"] ); print &ui_table_end(); +print "

"; + if ($in{'new'}) { print &ui_submit($text{'create'}); } From 7b61f214f9bd0457a03789f3db8c32c1e04bdfe3 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sun, 29 Dec 2013 17:39:46 +0800 Subject: [PATCH 03/12] cleanup itsecur-firewall/index.cgi --- itsecur-firewall/index.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/itsecur-firewall/index.cgi b/itsecur-firewall/index.cgi index 1e64908ca..3bc026345 100755 --- a/itsecur-firewall/index.cgi +++ b/itsecur-firewall/index.cgi @@ -6,7 +6,7 @@ require './itsecur-lib.pl'; &header($text{'index_title'}, "", undef, 1, 1, 0, &apply_button(), undef, undef, &text('index_version', $module_info{'version'})); -print "

"; +print &ui_hr(); # Icons table @can_opts = grep { $_ eq "backup" || $_ eq "restore" || $_ eq "remote" || $_ eq "import" ? &can_edit($_) : &can_use($_) } @opts; From 06d3dc00b1ea8daf414542c05466897d2969cca7 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sun, 29 Dec 2013 17:43:07 +0800 Subject: [PATCH 04/12] cleanup itsecur-firewall/edit_group.cgi --- itsecur-firewall/edit_group.cgi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/itsecur-firewall/edit_group.cgi b/itsecur-firewall/edit_group.cgi index 2bc459dcc..46325b2e9 100755 --- a/itsecur-firewall/edit_group.cgi +++ b/itsecur-firewall/edit_group.cgi @@ -30,7 +30,8 @@ print &ui_hidden("from", $in{'from'}); print &ui_table_start($text{'group_header'}, undef, 2); print &ui_table_row($text{'group_name'}, - &ui_textbox("name", $group->{'name'}, 20) ); + &ui_textbox("name", $group->{'name'}, 20), + undef, ["valign=middle","valign=middle"] ); my $tx = ""; $tx .= &ui_columns_start(undef); @@ -41,7 +42,7 @@ foreach $m (( grep { !/\!?\@/ } @{$group->{'members'}} ), my @cols; push(@cols, &ui_textbox("member_".$i, $m, 40) ); push(@cols, &ui_checkbox("neg_".$i, "!", $text{'group_neg'}, ($neg ? 1 : 0 ) ) ); - $tx .= &ui_columns_row(\@cols); + $tx .= &ui_columns_row(\@cols, ["valign=middle","valign=middle"]); $i++; } $tx .= &ui_columns_row([ &ui_checkbox("resolv", 1, $text{'group_resolv'}) ], ["colspan=2"]); @@ -63,7 +64,7 @@ $tx .= ui_columns_end(); print &ui_table_row($text{'group_members2'}, $tx); print &ui_table_end(); - +print "

"; if ($in{'new'}) { print &ui_submit($text{'create'}); } From a55daa22f24576a5146ac5df1a2fec89ab4306b5 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sun, 29 Dec 2013 17:45:05 +0800 Subject: [PATCH 05/12] cleanup itsecur-firewall/edit_service.cgi --- itsecur-firewall/edit_service.cgi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/itsecur-firewall/edit_service.cgi b/itsecur-firewall/edit_service.cgi index 3b826f1a7..6875a2c02 100755 --- a/itsecur-firewall/edit_service.cgi +++ b/itsecur-firewall/edit_service.cgi @@ -31,7 +31,8 @@ print &ui_hidden("idx", $in{'idx'}); print &ui_table_start($text{'service_header'}, undef, 2); # Show service name input -print &ui_table_row($text{'service_name'}, &ui_textbox("name", $service->{'name'}, 20) ); +print &ui_table_row($text{'service_name'}, &ui_textbox("name", $service->{'name'}, 20), + undef, ["valign=middle","valign=middle"] ); # Show protocols and ports my $tx = ""; @@ -40,7 +41,7 @@ for($i=0; $i<@{$service->{'protos'}}+6; $i++) { my @cols; push(@cols, &protocol_input("proto_$i", $service->{'protos'}->[$i]) ); push(@cols, &ui_textbox("port_".$i, $service->{'ports'}->[$i], 20) ); - $tx .= &ui_columns_row(\@cols); + $tx .= &ui_columns_row(\@cols, ["valign=middle","valign=middle"]); } $tx .= ui_columns_end(); @@ -51,6 +52,7 @@ print &ui_table_row($text{'service_members'}, &service_input("others", join(",", @{$service->{'others'}}), 0, 1) ); print &ui_table_end(); +print "

"; if ($in{'new'}) { print &ui_submit($text{'create'}); From d2e92adbfd1350a7d28dcd234c01afde0b848a24 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sun, 29 Dec 2013 19:10:38 +0800 Subject: [PATCH 06/12] ui-lib conversion -> itsecur-firewall/list_nat.cgi --- itsecur-firewall/list_nat.cgi | 91 +++++++++++++++++------------------ 1 file changed, 44 insertions(+), 47 deletions(-) diff --git a/itsecur-firewall/list_nat.cgi b/itsecur-firewall/list_nat.cgi index c344d90b3..44dba0bcf 100755 --- a/itsecur-firewall/list_nat.cgi +++ b/itsecur-firewall/list_nat.cgi @@ -6,70 +6,67 @@ require './itsecur-lib.pl'; &can_use_error("nat"); &header($text{'nat_title'}, "", undef, undef, undef, undef, &apply_button()); -print "

\n"; -print "
\n"; -print "\n"; -print "\n"; -print "\n"; +$tx .= "
$text{'nat_header'}
\n"; +print &ui_hr(); -($iface, @nets) = &get_nat(); -@maps = grep { ref($_) } @nets; -@nets = grep { !ref($_) } @nets; -print "\n"; +print &ui_form_start("save_nat.cgi","post"); +print &ui_table_start($text{'nat_header'},undef,2); -print "\n"; -print ""; -print "\n"; -print ""; +$tx .= "
$text{'nat_desc'} \n"; -printf " %s
\n", - $iface ? "" : "checked", $text{'nat_disabled'}; -printf " %s\n", - $iface ? "checked" : "", $text{'nat_enabled'}; -print &iface_input("iface", $iface); -print "
$text{'nat_nets'}\n"; -$i = 0; +my ($iface, @nets) = &get_nat(); +my @maps = grep { ref($_) } @nets; +my @nets = grep { !ref($_) } @nets; + +print &ui_table_row($text{'nat_desc'}, + &ui_radio("nat", ( $iface ? 1 : 0 ), [ + [0,$text{'nat_disabled'}."
"],[1,$text{'nat_enabled'}] + ]).&iface_input("iface", $iface) ); + + +my $style = "style='margin:0;padding:0;'"; +my $tx = ""; +$tx .= "
\n"; +$tx .= "
"; +$tx .= ""; +my $i = 0; foreach $n ((grep { $_ !~ /^\!/ } @nets), undef, undef, undef) { - print "\n"; + $tx .= ""; $i++; } -print "
",&group_input("net_$i", $n, 1),"
".&group_input("net_$i", $n, 1)."
$text{'nat_excl'}\n"; +$tx .= ""; +$tx .= "\n"; +$tx .= "
    $text{'nat_excl'}"; $i = 0; foreach $n ((grep { $_ =~ /^\!/ } @nets), undef, undef, undef) { - print "\n"; + $tx .= ""; $i++; } -print "
",&group_input("excl_$i", $n =~ /^\!(.*)/ ? $1 : undef, 1),"
".&group_input("excl_$i", $n =~ /^\!(.*)/ ? $1 : undef, 1)."
"; -print "
$text{'nat_maps'}", - "
$text{'nat_mapsdesc'}		 \n"; -print "\n"; -print " ", - " ", - "\n"; +print &ui_table_row($text{'nat_nets'}, $tx, undef, ["valign=top","valign=top"]); + +$tx = "
$text{'nat_ext'}$text{'nat_int'}$text{'nat_virt'}
"; +$tx .= "". + "". + ""; $i = 0; foreach $m (@maps, [ ], [ ], [ ]) { - #print "\n"; - #printf "\n", - # $i, $m->[0]; - #printf "\n", - # $i, $m->[1]; - #print "\n"; - #print "\n"; - print "" ; - printf "\n", - $i, $m->[0]; - print "\n"; - print "\n"; - print "\n"; + $tx .= ""; + $tx .= "", + $tx .= ""; + $tx .= ""; + $tx .= ""; $i++; } -print "
$text{'nat_ext'}  $text{'nat_int'}    $text{'nat_virt'}
",&iface_input("virt_$i", $m->[2], 1, 1, 1),"
",&group_input("int_$i", $m->[1], 1),"",&iface_input("virt_$i", $m->[2], 1, 1, 1),"
".&ui_textbox("ext_".$i, $m->[0], 20)."  ".&group_input("int_$i", $m->[1], 1)."    ".&iface_input("virt_$i", $m->[2], 1, 1, 1)."
"; -print "\n"; -print "
\n"; +print &ui_table_row($text{'nat_maps'}."
".$text{'nat_mapsdesc'}."", $tx, undef, ["valign=top","valign=top"]); + +print &ui_table_end(); +print "

"; +print &ui_submit($text{'save'}); +print &ui_form_end(undef,undef,1); &can_edit_disable("nat"); -print "

\n"; +print &ui_hr(); &footer("", $text{'index_return'}); From 1fd9eb7de267d88106da309b483ae40bc2bd1e4e Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sun, 29 Dec 2013 19:10:43 +0800 Subject: [PATCH 07/12] ui-lib conversion -> itsecur-firewall/list_nat2.cgi --- itsecur-firewall/list_nat2.cgi | 86 ++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/itsecur-firewall/list_nat2.cgi b/itsecur-firewall/list_nat2.cgi index 0612a8dcf..098bc2e90 100755 --- a/itsecur-firewall/list_nat2.cgi +++ b/itsecur-firewall/list_nat2.cgi @@ -6,64 +6,68 @@ require './itsecur-lib.pl'; &can_use_error("nat2"); &header($text{'nat2_title'}, "", undef, undef, undef, undef, &apply_button()); -print "
\n"; -print "
\n"; -print "\n"; -print "\n"; -print "\n"; +$tx .= "
$text{'nat_header'}
\n"; +print &ui_hr(); +print &ui_form_start("save_nat2.cgi","post"); +print &ui_table_start($text{'nat_header'},undef,2); -($iface, @nets) = &get_nat($nat2_file); -@maps = grep { ref($_) } @nets; -@nets = grep { !ref($_) } @nets; -print "\n"; +my ($iface, @nets) = &get_nat($nat2_file); +my @maps = grep { ref($_) } @nets; +my @nets = grep { !ref($_) } @nets; -print "\n"; -print ""; -print "\n"; -print ""; +$tx .= "
$text{'nat_desc'} \n"; -printf " %s
\n", - $iface ? "" : "checked", $text{'nat_disabled'}; -printf " %s\n", - $iface ? "checked" : "", $text{'nat_enabled'}; -print &iface_input("iface", $iface); -print "
$text{'nat_nets'}\n"; -$i = 0; +print &ui_table_row($text{'nat_desc'}, + &ui_radio("nat", ( $iface ? 1 : 0 ), [ + [0,$text{'nat_disabled'}."
"],[1,$text{'nat_enabled'}] + ]).&iface_input("iface", $iface) ); + + +my $style = "style='margin:0;padding:0;'"; +my $tx = ""; +$tx .= "
\n"; +$tx .= "
"; +$tx .= ""; +my $i = 0; foreach $n ((grep { $_ !~ /^\!/ } @nets), undef, undef, undef) { - print "\n"; + $tx .= ""; $i++; } -print "
",&group_input("net_$i", $n, 1),"
".&group_input("net_$i", $n, 1)."
$text{'nat_excl'}\n"; +$tx .= ""; +$tx .= "\n"; +$tx .= "
    $text{'nat_excl'}"; $i = 0; foreach $n ((grep { $_ =~ /^\!/ } @nets), undef, undef, undef) { - print "\n"; + $tx .= ""; $i++; } -print "
",&group_input("excl_$i", $n =~ /^\!(.*)/ ? $1 : undef, 1),"
".&group_input("excl_$i", $n =~ /^\!(.*)/ ? $1 : undef, 1)."
"; -print "
$text{'nat_maps'}", - "
$text{'nat_mapsdesc'}		 \n"; -print "\n"; -print " ", - " ", - "\n"; +print &ui_table_row($text{'nat_nets'}, $tx, undef, ["valign=top","valign=top"]); + +$tx = "
$text{'nat_ext'}$text{'nat_int'}$text{'nat_virt'}
"; +$tx .= "". + "". + ""; $i = 0; foreach $m (@maps, [ ], [ ], [ ]) { - print "\n"; - printf "\n", - $i, $m->[0]; - printf "\n", - $i, $m->[1]; - print "\n"; - print "\n"; + $tx .= ""; + $tx .= "", + $tx .= ""; + $tx .= ""; + $tx .= ""; $i++; } -print "
$text{'nat_ext'}  $text{'nat_int'}    $text{'nat_virt'}
",&iface_input("virt_$i", $m->[2], 1, 1, 1),"
".&ui_textbox("ext_".$i, $m->[0], 20)."  ".&ui_textbox("int_".$i, $m->[0], 20)."    ".&iface_input("virt_$i", $m->[2], 1, 1, 1)."
"; + +print &ui_table_row($text{'nat_maps'}."
".$text{'nat_mapsdesc'}."", $tx, undef, ["valign=top","valign=top"]); + + +print &ui_table_end(); +print "

"; +print &ui_submit($text{'save'}); +print &ui_form_end(undef,undef,1); -print "\n"; -print "

\n"; &can_edit_disable("nat"); -print "
\n"; +print &ui_hr(); &footer("", $text{'index_return'}); From 35bf97f9eac706fda77729e4e6b38f5b2e303efb Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sun, 29 Dec 2013 19:27:16 +0800 Subject: [PATCH 08/12] ui-lib conversion -> itsecur-firewall/list_pat.cgi --- itsecur-firewall/list_pat.cgi | 45 ++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/itsecur-firewall/list_pat.cgi b/itsecur-firewall/list_pat.cgi index beaa72de3..df8d630d4 100755 --- a/itsecur-firewall/list_pat.cgi +++ b/itsecur-firewall/list_pat.cgi @@ -6,34 +6,35 @@ require './itsecur-lib.pl'; &can_use_error("pat"); &header($text{'pat_title'}, "", undef, undef, undef, undef, &apply_button()); -print "
\n"; -@forwards = &get_pat(); -print "
\n"; -print "\n"; -print "\n"; -print "
$text{'pat_header'}
\n"; +print &ui_hr(); -print " ", - "\n"; +$tx .= &ui_columns_end(); -print "
$text{'pat_forward'}\n"; -print " ", - " ", - "\n"; -$j = 0; +my @forwards = &get_pat(); +print &ui_form_start("save_pat.cgi","post"); +print &ui_table_start($text{'pat_header'}, undef, 2); + +my $tx = &ui_columns_start([$text{'pat_service'}, + $text{'pat_host'}, + $text{'pat_iface'}]); + +my $j = 0; foreach $f (@forwards, { }, { }, { }) { - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + my @cols; + push(@cols, &service_input("service_$j", $f->{'service'}, 1) ); + push(@cols, &ui_textbox("host_".$j, $f->{'host'}, 30) ); + push(@cols, &iface_input("iface_$j", $f->{'iface'}, 0, 1, 1) ); + $tx .= &ui_columns_row(\@cols); $j++; } -print "
$text{'pat_service'}$text{'pat_host'}$text{'pat_iface'}
",&service_input("service_$j", $f->{'service'}, 1),"",&iface_input("iface_$j", $f->{'iface'}, - 0, 1, 1),"
\n"; -print "
\n"; +print &ui_table_row($text{'pat_forward'}, $tx); + +print &ui_table_end(); +print "

"; +print &ui_submit($text{'save'}); +print &ui_form_end(undef,undef,1); &can_edit_disable("pat"); -print "

\n"; +print &ui_hr(); &footer("", $text{'index_return'}); From 7b879d6404f868034c9e1b76aa83f624ef907020 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sun, 29 Dec 2013 19:36:25 +0800 Subject: [PATCH 09/12] ui-lib conversion -> itsecur-firewall/list_spoof.cgi --- itsecur-firewall/list_spoof.cgi | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/itsecur-firewall/list_spoof.cgi b/itsecur-firewall/list_spoof.cgi index 67c9a0b22..19f471b3a 100755 --- a/itsecur-firewall/list_spoof.cgi +++ b/itsecur-firewall/list_spoof.cgi @@ -6,29 +6,24 @@ require './itsecur-lib.pl'; &can_use_error("spoof"); &header($text{'spoof_title'}, "", undef, undef, undef, undef, &apply_button()); -print "
\n"; -print "
\n"; -print "\n"; -print "\n"; -print "
$text{'spoof_header'}
\n"; +print &ui_hr(); -($iface, @nets) = &get_spoof(); -print "\n"; +print &ui_form_start("save_spoof.cgi", "post"); +print &ui_table_start($text{'spoof_header'}, undef, 2); -print "\n"; +my ($iface, @nets) = &get_spoof(); -print "
$text{'spoof_desc'} \n"; -printf " %s
\n", - $iface ? "" : "checked", $text{'spoof_disabled'}; -printf " %s\n", - $iface ? "checked" : "", $text{'spoof_enabled'}; -print &iface_input("iface", $iface); -print "
$text{'spoof_nets'} \n"; -print "
\n"; -print "
\n"; +print &ui_table_row($text{'spoof_desc'}, + &ui_radio("spoof", ( $iface ? 1 : 0 ), [ + [0,$text{'spoof_disabled'}."
"],[1,$text{'spoof_enabled'}] + ]).&iface_input("iface", $iface) ); + +print &ui_table_row($text{'spoof_nets'}, &ui_textarea("nets", join("\n", @nets), 5, 40) ); +print &ui_table_end(); +print &ui_submit($text{'save'}); +print &ui_form_end(undef,undef,1); &can_edit_disable("spoof"); -print "
\n"; +print &ui_hr(); &footer("", $text{'index_return'}); From b731dcbd42c7738bdd05c654258500bfc0e65518 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sun, 29 Dec 2013 19:46:21 +0800 Subject: [PATCH 10/12] ui-lib conversion -> itsecur-firewall/list_syn.cgi --- itsecur-firewall/list_spoof.cgi | 1 + itsecur-firewall/list_syn.cgi | 43 +++++++++++++++------------------ 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/itsecur-firewall/list_spoof.cgi b/itsecur-firewall/list_spoof.cgi index 19f471b3a..863af8df0 100755 --- a/itsecur-firewall/list_spoof.cgi +++ b/itsecur-firewall/list_spoof.cgi @@ -21,6 +21,7 @@ print &ui_table_row($text{'spoof_desc'}, print &ui_table_row($text{'spoof_nets'}, &ui_textarea("nets", join("\n", @nets), 5, 40) ); print &ui_table_end(); +print "

"; print &ui_submit($text{'save'}); print &ui_form_end(undef,undef,1); &can_edit_disable("spoof"); diff --git a/itsecur-firewall/list_syn.cgi b/itsecur-firewall/list_syn.cgi index d318967a4..7caf8e0df 100755 --- a/itsecur-firewall/list_syn.cgi +++ b/itsecur-firewall/list_syn.cgi @@ -6,36 +6,31 @@ require './itsecur-lib.pl'; &can_use_error("syn"); &header($text{'syn_title'}, "", undef, undef, undef, undef, &apply_button()); -print "

\n"; -print "
\n"; -print "\n"; -print "\n"; -print "
$text{'syn_header'}
\n"; +print &ui_hr(); -($flood, $spoof, $fin) = &get_syn(); +print &ui_form_start("save_syn.cgi", "post"); +print &ui_table_start($text{'syn_header'}, undef, 2); -print "\n", - $flood ? "" : "checked", $text{'no'}; +my ($flood, $spoof, $fin) = &get_syn(); -print "\n", - $spoof ? "" : "checked", $text{'no'}; +print &ui_table_row($text{'syn_flood'}, + &ui_yesno_radio("flood", ($flood ? 1 : 0 ), 1, 0 ) + ); + +print &ui_table_row($text{'syn_spoof'}, + &ui_yesno_radio("spoof", ($spoof ? 1 : 0 ), 1, 0 ) + ); -print "\n", - $fin ? "" : "checked", $text{'no'}; +print &ui_table_row($text{'syn_fin'}, + &ui_yesno_radio("fin", ($fin ? 1 : 0 ), 1, 0 ) + ); -print "
$text{'syn_flood'} \n"; -printf " %s\n", - $flood ? "checked" : "", $text{'yes'}; -printf " %s
$text{'syn_spoof'} \n"; -printf " %s\n", - $spoof ? "checked" : "", $text{'yes'}; -printf " %s
$text{'syn_fin'} \n"; -printf " %s\n", - $fin ? "checked" : "", $text{'yes'}; -printf " %s
\n"; -print "
\n"; +print &ui_table_end(); +print "

"; +print &ui_submit($text{'save'}); +print &ui_form_end(undef,undef,1); &can_edit_disable("syn"); -print "

\n"; +print &ui_hr(); &footer("", $text{'index_return'}); From 2acb819870a7c53b6eb79c592abcd88eb98cacfb Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sun, 29 Dec 2013 19:54:25 +0800 Subject: [PATCH 11/12] itsecur-firewall/list_authlogs.cgi,list_logs.cgi --- itsecur-firewall/list_authlogs.cgi | 5 ++--- itsecur-firewall/list_logs.cgi | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/itsecur-firewall/list_authlogs.cgi b/itsecur-firewall/list_authlogs.cgi index 5648190fc..214dfd584 100755 --- a/itsecur-firewall/list_authlogs.cgi +++ b/itsecur-firewall/list_authlogs.cgi @@ -7,7 +7,7 @@ require './itsecur-lib.pl'; $theme_no_table++; $| = 1; &header($text{'authlogs_title'}, ""); -print "
\n"; +print &ui_hr(); $log = $config{'authlog'} || &get_authlog_file(); print "",&text('logs_viewing', "$log"),"

\n"; @@ -20,8 +20,7 @@ if ($session_id) { print "\n"; } print "\n"; -print "\n"; -print "

\n"; +print &ui_hr(); &footer("", $text{'index_return'}); diff --git a/itsecur-firewall/list_logs.cgi b/itsecur-firewall/list_logs.cgi index 2b56fb8b0..bc32ff2ce 100755 --- a/itsecur-firewall/list_logs.cgi +++ b/itsecur-firewall/list_logs.cgi @@ -7,7 +7,7 @@ require './itsecur-lib.pl'; $theme_no_table++; $| = 1; &header($text{'logs_title'}, ""); -print "
\n"; +print &ui_hr(); $log = $config{'log'} || &get_log_file(); print "",&text('logs_viewing', "$log"),"

\n"; @@ -20,8 +20,7 @@ if ($session_id) { print "\n"; } print "\n"; -print "\n"; -print "

\n"; +print &ui_hr(); &footer("", $text{'index_return'}); From f4e4209620daf477ae3747f1fc11f91e2cec9f79 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Mon, 30 Dec 2013 01:46:45 +0800 Subject: [PATCH 12/12] ui-lib conversion -> itsecur-firewall/list_users.cgi --- itsecur-firewall/list_users.cgi | 50 +++++++++++++++------------------ 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/itsecur-firewall/list_users.cgi b/itsecur-firewall/list_users.cgi index b611f3c89..1718b376c 100755 --- a/itsecur-firewall/list_users.cgi +++ b/itsecur-firewall/list_users.cgi @@ -7,12 +7,13 @@ require './itsecur-lib.pl'; &can_use_error("users"); &header($text{'users_title'}, "", undef, undef, undef, undef, &apply_button()); -print "
\n"; + +print &ui_hr(); # Work out which users have access to this module -@users = &acl::list_users(); +my @users = &acl::list_users(); foreach $u (@users) { - @m = @{$u->{'modules'}}; + my @m = @{$u->{'modules'}}; if ($u->{'name'} ne "root" && &indexof($module_name, @m) >= 0) { push(@musers, $u); @@ -20,42 +21,37 @@ foreach $u (@users) { } #print "$text{'users_desc'}

\n"; -$edit = &can_edit("users"); +my $edit = &can_edit("users"); +my $link = ( $edit ? &ui_link("edit_user.cgi?new=1", $text{'users_add'}) : "" ); if (@musers) { - print "$text{'users_add'}
\n" - if ($edit); - print "\n"; - print " ", - " ", - " ", - " ", - "\n"; + print $link; + my @cols; + print &ui_columns_start([$text{'users_name'}, $text{'users_ips'}, $text{'users_enabled'}]); foreach $u (@musers) { - print "\n"; - print "\n"; - print "\n"; - print "\n"; - %uaccess = &get_module_acl($u->{'name'}); - print "\n"; + push(@cols, $tx); + push(@cols, ($u->{'pass'} =~ /^\*LK\*/ ? $text{'rule_no'} : $text{'rule_yes'}) ); + #%uaccess = &get_module_acl($u->{'name'}); } - print "
$text{'users_name'}$text{'users_ips'}$text{'users_enabled'}
$u->{'name'}\n"; + push(@cols, &ui_link("edit_user.cgi?name=".$u->{'name'},$u->{'name'}) ); + my $tx = ""; if ($u->{'allow'}) { - print &text('users_allow', $u->{'allow'}); + $tx = &text('users_allow', $u->{'allow'}); } elsif ($u->{'deny'}) { - print &text('users_deny', $u->{'deny'}); + $tx = &text('users_deny', $u->{'deny'}); } else { - print $text{'users_all'}; + $tx = $text{'users_all'}; } - print "",$u->{'pass'} =~ /^\*LK\*/ ? $text{'rule_no'} : $text{'rule_yes'},"
\n"; + print &ui_columns_row(\@cols); + print &ui_columns_end(); } else { print "$text{'users_none'}

\n"; } -print "$text{'users_add'}

\n" - if ($edit); -print "

\n"; + +print $link; + +print &ui_hr(); &footer("", $text{'index_return'});