- <%=l "ln_REMOVE_DESC" %>
+ <%= l "ln_REMOVE_DESC" %>
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep
index 66b051b..10ffba1 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep
@@ -5,37 +5,31 @@
% my $retref = $c->stash("ret");
- % my %ret;
- % unless (length($retref)) {%ret = (ret=>"");}
- % else {%ret = %$retref;}
+ % my %ret = $retref ? %$retref : (ret => "");
+ % my @vars = split(/,/, $ret{vars} // '');
+ % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
-
+ % if ($c->app->config->{debug}) {
+
+
+ <%= dumper { ret_data => \%ret } %>
+
+ % }
- %# my $element_count = scalar(@ret);
-
- %# if (length $element_count == 0) {
- % my @vars = split(",",$ret{vars});
- % my $var1 = $vars[0];
- % my $var2 = $vars[1];
- % my $var3 = $vars[2];
- % my $var4 = $vars[3];
- % my $var5 = $vars[4];
- % my $var6 = $vars[5];
- % my $var7 = $vars[6];
- %# }
-
- %if ($ret{ret} eq "") {
+ % if ($ret{ret} eq "") {
<%= l "ln_FIRSTPAGE_DESC" %>
% } elsif (index($ret{ret},"SUCCESS") != -1) {
+
Operation Status Report
-
Operation Status Report
- <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
+ <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
% } else {
-
+
Operation Status Report - Error
+
+
Operation Status Report - Error
- <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
+ <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
% }
@@ -63,7 +57,7 @@
<%= l 'ln_SUBNET_MASK' %>
<%= l 'ln_NUMBER_OF_HOSTS' %>
<%= l 'ROUTER' %>
-
<%= l 'ACTION' %>
+
<%= l 'ACTION' %>
@@ -90,7 +84,7 @@
%
%};
% }
- <%= $c->render_to_string(inline => $actionRemove) %>
+ <%= $c->render_to_string(inline => $actionRemove) %>
% }
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep
index 37104f6..7dd9090 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep
@@ -17,7 +17,7 @@
-
+
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep
index 3c6ba24..2b57c36 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep
@@ -22,9 +22,9 @@
- <%= l 'pse_PSEUDONYM' %>
- <%= l 'pse_USER_OR_GROUP' %>
- <%= l 'ACTION' %>
+ <%= l 'pse_PSEUDONYM' %>
+ <%= l 'pse_USER_OR_GROUP' %>
+ <%= l 'ACTION' %>
@@ -57,7 +57,7 @@
% $modify_text
%
%
- %};
+ % };
% }
% if ($removable eq 'yes') {
@@ -70,11 +70,11 @@
% $remove_text
%
%
- %};
+ % };
% }
- <%= $c->render_to_string(inline => $actionModify) %>
- <%= $c->render_to_string(inline => $actionRemove) %>
+ <%= $c->render_to_string(inline => $actionModify) %>
+ <%= $c->render_to_string(inline => $actionRemove) %>
% }
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep
index 0e55dae..92ed13b 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep
@@ -36,7 +36,7 @@
<%= $limit %>
<%= $absolute %>
<%= $current %>
- <%= l 'ACTION' %>
+ <%= l 'ACTION' %>
@@ -77,7 +77,7 @@
%
%};
- <%= $c->render_to_string(inline => $actionModify) %>
+ <%= $c->render_to_string(inline => $actionModify) %>
% }
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
index e56989f..03c01d2 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
@@ -23,11 +23,11 @@
- <%=l 'ACCOUNT' %>
- <%=l 'USER_NAME' %>
- <%=l 'usr_VPN_CLIENT_ACCESS' %>
- <%=l 'usr_FORWARDING_ADDRESS' %>
- <%= l 'ACTION' %>
+ <%= l 'ACCOUNT' %>
+ <%= l 'USER_NAME' %>
+ <%= l 'usr_VPN_CLIENT_ACCESS' %>
+ <%= l 'usr_FORWARDING_ADDRESS' %>
+ <%= l 'ACTION' %>
@@ -136,17 +136,17 @@
% $actionroundcube = qq{
%
- %
+ %
% $roundcube_text
%
%
%};
- <%= $c->render_to_string(inline => $actionModify) %>
- <%= $c->render_to_string(inline => $actionResetPw) %>
- <%= $c->render_to_string(inline => $actionLock) %>
- <%= $c->render_to_string(inline => $actionRemove) %>
- <%= $c->render_to_string(inline => $actionroundcube) %>
+ <%= $c->render_to_string(inline => $actionModify) %>
+ <%= $c->render_to_string(inline => $actionResetPw) %>
+ <%= $c->render_to_string(inline => $actionLock) %>
+ <%= $c->render_to_string(inline => $actionRemove) %>
+ <%= $c->render_to_string(inline => $actionroundcube) %>
% }
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
index 8b630b8..fdfbe68 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep
@@ -85,10 +85,10 @@
% foreach my $val ( @vals ) {
- % my ($net, $mask) = split '/', $val;
- % $mask = '255.255.255.255' unless ($mask);
- % my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask);
-
+ % my ($net, $mask) = split '/', $val;
+ % $mask = '255.255.255.255' unless ($mask);
+ % my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask);
+
<%= $net %>
<%= $mask %>
<%= $numhosts %>
@@ -96,7 +96,7 @@
'>
- % }
+ % }