From ffe62c9951d5aa537ec3ba28a29bb6b5d40ef400 Mon Sep 17 00:00:00 2001 From: John Crisp Date: Fri, 13 Jun 2025 16:49:27 +0200 Subject: [PATCH] Portforwarding panels modified --- .../templates/partials/_pf_del.html.ep | 138 ++++++++------ .../templates/partials/_pf_list.html.ep | 175 +++++++++--------- .../AdminLTE/templates/portforwarding.html.ep | 37 ++-- 3 files changed, 181 insertions(+), 169 deletions(-) diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep index bf63e0f..c5fad48 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_del.html.ep @@ -7,67 +7,83 @@ % my $dhost = $pf_datas->{dhost}; % my $cmmnt = $pf_datas->{cmmnt}; % my $allow = $pf_datas->{allow}; - - % if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $c->stash("ret") - %= dumper %$pf_datas -

- % } - - %= form_for '/portforwardinge' => (method => 'POST') => begin -
- %= l "pf_SUMMARY_REMOVE_DESC" -


- - %=l "pf_LABEL_PROTOCOL" - - - %=$proto -

- - %=l "pf_LABEL_SOURCE_PORT" - - - %=$sport - -

- - %=l "pf_LABEL_DESTINATION_HOST" - - - %=$dport - -

- - %=l "pf_LABEL_DESTINATION_PORT" - - - %=$dhost - -

- - %=l "pf_RULE_COMMENT" - - - %=$cmmnt - -

- - %=l "pf_ALLOW_HOSTS" - - - %=$allow - -

- %#} - %= hidden_field sport=>$sport - %= hidden_field proto=>$proto -
- %= submit_button "$btn", class => "" -

- %end + % if (config->{debug} == 0) { + 
+            <%= dumper $c->current_route %>
+            <%= dumper $c->stash("ret") %>
+            <%= dumper %$pf_datas %>
+
+ % } + +
+ +
+
+ <%= l 'pf_SUMMARY_REMOVE_DESC' %> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ <% l 'pf_LABEL_PROTOCOL' %> + + <%= $proto %> +
+ <% l 'pf_LABEL_SOURCE_PORT' %> + + <%= $sport %> +
+ <% l 'pf_LABEL_DESTINATION_HOST' %> + + <%= $dport %> +
+ <% l 'pf_LABEL_DESTINATION_PORT' %> + + <%= $dhost %> +
+ <% l 'pf_RULE_COMMENT' %> + + <%= $cmmnt %> +
+ <% l 'pf_ALLOW_HOSTS' %> + + <%= $allow %> +
+ + <%= hidden_field sport=>$sport %> + <%= hidden_field proto=>$proto %> + +
+
+ +
+
+
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep index 58a9566..661157c 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pf_list.html.ep @@ -1,12 +1,16 @@
- % my $btn = l('pf_CREATE_RULE'); - %= form_for '/portforwardinga' => (method => 'POST') => begin + + + +
+ +
% my $retref= $c->stash("ret"); % my %ret; % unless (length($retref)) {%ret = (ret=>"");} % else {%ret = %$retref;} - + % my $numtcpforwards = @$tcpforwards; % my $numudpforwards = @$udpforwards; @@ -18,103 +22,94 @@ % my $var5 = @vars[4]; % my $var6 = @vars[5]; - %if ($ret{ret} eq "") { - %= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); - %} elsif (index($ret{ret},"SUCCESS") != -1) { + % if ($ret{ret} eq "") { + <%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %> + % } elsif (index($ret{ret},"SUCCESS") != -1) {
-
- - %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); +
+

Operation Status Report

+ <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
- %} else { + % } else {
-
- - %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); +
+

Operation Status Report - Error

+ <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
- %} + % } -


- %= submit_button "$btn", class => "" -

+ + % my $btn = l('pf_CREATE_RULE'); + +
+
+ +
+
+ + - % end - - % if ($empty){ + + % if ($empty){
- %=l 'pf_NO_FORWARDS' - % } else { -
- %=l 'pf_SHOW_FORWARDS' -

- - - - - - - - - - - - - - % my %forwards = (); - % $forwards{TCP} = $tcpforwards; - % $forwards{UDP} = $udpforwards; - - % foreach my $proto (sort keys %forwards) { - - % if (@{ $forwards{$proto} }) { - % foreach my $entry (@{ $forwards{$proto} }) { + <%= l 'pf_NO_FORWARDS' %> + % } else { +
+ <%= l 'pf_SHOW_FORWARDS' %> +

+
- %=l 'pf_LABEL_PROTOCOL' - - %=l 'pf_LABEL_SOURCE_PORT' - - %=l 'pf_LABEL_DESTINATION_HOST' - - %=l 'pf_LABEL_DESTINATION_PORT' - - %=l 'pf_ALLOW_HOSTS' - - %=l 'pf_RULE_COMMENT' - - %=l 'ACTION' -
+ - % my $sport = $entry->key; - % my $dhost = $entry->prop('DestHost'); - % my $dport = $entry->prop('DestPort') || ''; - % my $cmmnt = $entry->prop('Comment') || ''; - % my $allow = $entry->prop('AllowHosts') || ''; - %= t td => (class => "") => $proto - %= t td => (class => "") => $sport - %= t td => (class => "") => $dhost - %= t td => (class => "") => $dport - %= t td => (class => "") => $allow - %= t td => (class => "") => $cmmnt - + + + + + + + - % } - % } - %} - %} - + + + % my %forwards = (); + % $forwards{TCP} = $tcpforwards; + % $forwards{UDP} = $udpforwards; + + % foreach my $proto (sort keys %forwards) { + + % if (@{ $forwards{$proto} }) { + % foreach my $entry (@{ $forwards{$proto} }) { + + % my $sport = $entry->key; + % my $dhost = $entry->prop('DestHost'); + % my $dport = $entry->prop('DestPort') || ''; + % my $cmmnt = $entry->prop('Comment') || ''; + % my $allow = $entry->prop('AllowHosts') || ''; + + + + + + + % my $remove_text = l('REMOVE'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $actionRemove = qq{ + % + % + % + % }; + + + + % } + % } + % } + % } +
- %my $remove_text = l('REMOVE'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $actionRemove = qq{ - % - % - % - %}; - <%= $c->render_to_string(inline => $actionRemove) %> - <%= l 'pf_LABEL_PROTOCOL' %><%= l 'pf_LABEL_SOURCE_PORT' %><%= l 'pf_LABEL_DESTINATION_HOST' %><%= l 'pf_LABEL_DESTINATION_PORT' %><%= l 'pf_ALLOW_HOSTS' %><%= l 'pf_RULE_COMMENT' %><%= l 'ACTION' %>
<%= $proto %><%= $sport %><%= $dhost %><%= $dport %><%= $allow %><%= $cmmnt %><%= $c->render_to_string(inline => $actionRemove) %>
- %= hidden_field 'trt' => $pf_datas->{trt} - + <%= hidden_field 'trt' => $pf_datas->{trt} %> +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep index c4f2d46..7cd93ae 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep @@ -5,28 +5,29 @@
% if (config->{debug} == 1) { -

- %= dumper "".$c->current_route - %= dumper $c->stash("ret") - %= dumper $c->stash("portforwarding") - % my $ref = $pf_datas->{portforwarding}; - %= dumper $ref->{TCP}->[0]."" -

+ 
+        <%= dumper "".$c->current_route %>
+        <%= dumper $c->stash("ret") %>
+        <%= dumper $c->stash("portforwarding") %>
+        %  my $ref = $pf_datas->{portforwarding}; %>
+        <%= dumper $ref->{TCP}->[0]."" %>
+
% } - +

<%= $title%>

- %= $modul + + %= $modul % if ($pf_datas->{trt} eq 'ADD') { - %= include 'partials/_pf_add' - %} elsif ($pf_datas->{trt} eq 'ADD1') { - %= include 'partials/_pf_add' - %} elsif ($pf_datas->{trt} eq 'DEL') { - %= include 'partials/_pf_del' - %} elsif ($pf_datas->{trt} eq 'DEL1'){ - %= include 'partials/_pf_list' - %} else { - %= include 'partials/_pf_list' + <%= include 'partials/_pf_add' %> + % } elsif ($pf_datas->{trt} eq 'ADD1') { + <%= include 'partials/_pf_add' %> + % } elsif ($pf_datas->{trt} eq 'DEL') { + <%= include 'partials/_pf_del' %> + % } elsif ($pf_datas->{trt} eq 'DEL1'){ + <%= include 'partials/_pf_list' %> + % } else { + <%= include 'partials/_pf_list' %> %}