From 6d051c10cab806b5b585261d9d0b1152dc0509da Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sat, 28 Dec 2013 01:27:57 +0800 Subject: [PATCH 1/2] ui-lib conversion -> itsecur-firewall --- itsecur-firewall/index.cgi | 7 +++-- itsecur-firewall/list_groups.cgi | 44 +++++++++++++++----------------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/itsecur-firewall/index.cgi b/itsecur-firewall/index.cgi index 15f7222b9..1e64908ca 100755 --- a/itsecur-firewall/index.cgi +++ b/itsecur-firewall/index.cgi @@ -50,10 +50,9 @@ if (defined(&theme_icons_table)) { &theme_icons_table(@_); return; } -local ($i, $need_tr); -local $cols = $_[3] ? $_[3] : 4; -local $per = int(100.0 / $cols); -print "\n"; +my ($i, $need_tr); +my $cols = $_[3] ? $_[3] : 4; +my $per = int(100.0 / $cols); print &ui_table_start(undef,"width=100% cellpadding=5",2); for($i=0; $i<@{$_[0]}; $i++) { if ($i%$cols == 0) { print "\n"; } diff --git a/itsecur-firewall/list_groups.cgi b/itsecur-firewall/list_groups.cgi index bf60d475e..5929ac2ff 100755 --- a/itsecur-firewall/list_groups.cgi +++ b/itsecur-firewall/list_groups.cgi @@ -6,35 +6,31 @@ require './itsecur-lib.pl'; &can_use_error("groups"); &header($text{'groups_title'}, "", undef, undef, undef, undef, &apply_button()); -print "
\n"; +print &ui_hr(); + +my @groups = &list_groups(); +my $edit = &can_edit("groups"); -@groups = &list_groups(); -$edit = &can_edit("groups"); if (@groups) { - print "$text{'groups_add'}
\n" - if ($edit); - print "
\n"; - print " ", - "\n"; - foreach $g (@groups) { - print "\n"; - print "\n"; - @mems = @{$g->{'members'}}; + print &ui_link("edit_group.cgi?new=1", $text{'groups_add'}) if ($edit); + print &ui_columns_start([$text{'group_name'}, $text{'group_members'}]); + foreach my $g (@groups) { + my @cols_row; + my $tx = ""; + my $link = &ui_link("edit_group.cgi?idx=".$g->{'index'}, $g->{'name'}); + push(@cols_row, ( $edit ? $link : $g->{'name'} ) ); + my @mems = @{$g->{'members'}}; if (@mems > 5) { - @mems = (@mems[0..4], "..."); - } - print "\n"; - print "\n"; - } - print "
$text{'group_name'}$text{'group_members'}
", - "$g->{'name'}",join(" , ", - map { &group_name($_) } @mems),"
\n"; + @mems = (@mems[0..4], "..."); + } + push(@cols_row, join(" , ", map { &group_name($_) } @mems) ); + print &ui_columns_row(\@cols_row); + } + print &ui_columns_end(); } else { print "$text{'groups_none'}

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

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

\n"; +print &ui_link("edit_group.cgi?new=1", $text{'groups_add'}) if ($edit); +print &ui_hr(); &footer("", $text{'index_return'}); From f2a1cc9421b4223f0b51a810708b8dda00c0c0a6 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Sat, 28 Dec 2013 01:49:54 +0800 Subject: [PATCH 2/2] ui-lib conversion -> itsecur-firewall/edit_group.cgi --- itsecur-firewall/edit_group.cgi | 60 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/itsecur-firewall/edit_group.cgi b/itsecur-firewall/edit_group.cgi index f253675d0..2bc459dcc 100755 --- a/itsecur-firewall/edit_group.cgi +++ b/itsecur-firewall/edit_group.cgi @@ -21,62 +21,60 @@ else { $in{'idx'} = $group->{'index'}; } } -print "
\n"; +print &ui_hr(); -print "
\n"; -print "\n"; -print "\n"; -print "\n"; -print "\n"; -print "\n"; -print "
$text{'group_header'}
\n"; +print &ui_form_start("save_group.cgi", "post"); +print &ui_hidden("new", $in{'new'}); +print &ui_hidden("idx", $in{'idx'}); +print &ui_hidden("from", $in{'from'}); +print &ui_table_start($text{'group_header'}, undef, 2); -print "\n"; -printf "\n", - $group->{'name'}; +print &ui_table_row($text{'group_name'}, + &ui_textbox("name", $group->{'name'}, 20) ); -print "\n"; -print "\n"; +$tx .= &ui_columns_row([ &ui_checkbox("resolv", 1, $text{'group_resolv'}) ], ["colspan=2"]); +$tx .= ui_columns_end(); + +print &ui_table_row($text{'group_members'}, $tx); # Show member groups -print "\n"; -print "\n"; +$tx .= ui_columns_end(); +print &ui_table_row($text{'group_members2'}, $tx); + +print &ui_table_end(); -print "
$text{'group_name'}
$text{'group_members'}\n"; +my $tx = ""; +$tx .= &ui_columns_start(undef); $i = 0; foreach $m (( grep { !/\!?\@/ } @{$group->{'members'}} ), $blank, $blank, $blank, $blank, $blank, $blank) { $neg = ($m =~ s/^\!//); - print "\n"; - print " $text{'group_neg'}
\n"; + 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); $i++; } -print "
\n"; -print " $text{'group_resolv'}\n"; -print "
$text{'group_members2'}\n"; $i = 0; +$tx = &ui_columns_start(undef); foreach $m (( grep { /\!?\@/ } @{$group->{'members'}} ), $blank, $blank, $blank, $blank, $blank, $blank) { $neg = ($m =~ s/^\!//); $m =~ s/^\@//; - print "\n"; + $tx .= &ui_columns_row([&group_input("group_$i", $m, 1)]); $i++; } -print "
\n"; - print &group_input("group_$i", $m, 1); - print "
\n"; if ($in{'new'}) { - print "\n"; + print &ui_submit($text{'create'}); } else { - print "\n"; - print "\n"; + print &ui_submit($text{'save'}); + print &ui_submit($text{'delete'}, "delete"); } -print "
\n"; +print &ui_form_end(undef,undef,1); &can_edit_disable("groups"); -print "
\n"; +print &ui_hr(); $from = $in{'from'} || "groups"; &footer("list_${from}.cgi", $text{$from.'_return'});