smeserver/smeserver-manager-AdminLTE
6
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update clamav. Modify ibayupd,ln list, start remoteaccess

Browse Source
This commit is contained in:
John Crisp
2025-06-10 23:05:00 +02:00
parent b1e896c187
commit f9f799d2ce
4 changed files with 302 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_upd.html.ep
View File

@@ -5,7 +5,6 @@
<form action="/smanager/ibaysd" method="POST">
<div>
<h2><%=l 'iba_ADD_TITLE' %></h2>
</div>
@@ -36,7 +35,7 @@
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputIbayDesc" class="col-form-label"><%= l 'DESCRIPTION' %></label>
<label for="inputIbayDesc" class="col-form-label"><%= l 'DESCRIPTION' %></label>
</div>
<div class="col-auto">
% param 'ibayDesc' => $iba_datas->{description} unless param 'ibayDesc';
@@ -50,7 +49,6 @@
<div class="col-md-2">
<%= l 'GROUP' %>
</div>
<div class="col-auto">
% param 'group' => $iba_datas->{group} unless param 'group';
%= select_field 'group' => $c->group_list_m(), class => "form-select"
@@ -63,7 +61,6 @@
<div class="col-md-2">
<%= l 'iba_USER_ACCESS' %>
</div>
<div class="col-auto">
% param 'userAccess' => $iba_datas->{userAccess} unless param 'userAccess';
%= select_field 'userAccess' => $c->userAccess_list_m(), class => "form-select"
@@ -76,7 +73,6 @@
<div class="col-md-2">
%=l 'iba_PUBLIC_ACCESS'
</div>
<div class="col-auto">
% param 'publicAccess' => $iba_datas->{publicAccess} unless param 'publicAccess';
%= select_field 'publicAccess' => $c->publicAccess_list_m(), class => "form-select"
@@ -89,7 +85,6 @@
<div class="col-md-2">
<%=l 'iba_ALLOW_DYNAMIC_CONTENT' %>
</div>
<div class="col-auto">
% param 'CgiBin' => $iba_datas->{CgiBin} unless param 'CgiBin';
%= select_field 'CgiBin' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select"
@@ -102,7 +97,6 @@
<div class="col-md-2">
<%=l 'iba_HTTPS_Only' %>
</div>
<div class="col-auto">
% param 'SSL' => $iba_datas->{SSL} unless param 'SSL';
%= select_field 'SSL' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "form-select"

130
root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep
View File

@@ -1,29 +1,28 @@
<div>
% my $btn = l('ln_LOCALNETWORK_ADD');
<form action="/smanager/localnetworksa" method="POST">
<br>
% my $retref= $c->stash("ret");
% my $retref = $c->stash("ret");
% my %ret;
% unless (length($retref)) {%ret = (ret=>"");}
% else {%ret = %$retref;}
<!-- So at this point the next section is only relevant it ret is not defined -->
% if (config->{debug} == 1) {
<div>
%= dumper "Ret:".$ret{ret};
</div>
% }
%# my $element_count = scalar(@ret);
% 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 (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 "") {
<%= l "ln_FIRSTPAGE_DESC" %>
@@ -41,60 +40,63 @@
% }
<br><br>
% my $btn = l('ln_LOCALNETWORK_ADD');
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
</form>
<br>
% my $numlocalnetworks = @$localnetworks;
% if ($numlocalnetworks == 0) {
<%= l 'ln_LOCAL_NETWORK_NONE' %>
% } else {
<br>
<table class="table table-bordered">
<thead>
<tr>
<th><%= l 'NETWORK' %></th>
<th><%= l 'ln_SUBNET_MASK' %></th>
<th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
<th><%= l 'ROUTER' %></th>
<th><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
% foreach my $localnetwork (@$localnetworks ) {
% my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
% my $removable = $localnetwork->prop('Removable') || "yes";
% my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
% if ( $system eq "yes" ) { $removable = "no"; }
<tr>
<td><%= $localnetwork->key %>
<td><%= $localnetwork->prop('Mask') %>
<td><%= $num_hosts %>
<td><%= $localnetwork->prop('Router') %>
% my $actionRemove = '&nbsp;';
% if ($removable eq "yes") {
%my $remove_text = l('REMOVE'); # Localized text
%my $local_network_entry = $localnetwork->key;
%my $csrf_token = "TOKEN"; # CSRF token for security
%$actionRemove = qq{
% <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text
% </button>
% </a>
%};
% }
<td><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr>
% }
</tbody>
</table>
<%= hidden_field 'trt' => $ln_datas->{trt} %>
% }
% my $numlocalnetworks = @$localnetworks;
% if ($numlocalnetworks == 0) {
<%= l 'ln_LOCAL_NETWORK_NONE' %>
% } else {
<br>
<table class="table table-bordered">
<thead>
<tr>
<th><%= l 'NETWORK' %></th>
<th><%= l 'ln_SUBNET_MASK' %></th>
<th><%= l 'ln_NUMBER_OF_HOSTS' %></th>
<th><%= l 'ROUTER' %></th>
<th><%= l 'ACTION' %></th>
</tr>
</thead>
<tbody>
% foreach my $localnetwork (@$localnetworks ) {
% my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
% my $removable = $localnetwork->prop('Removable') || "yes";
% my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
% if ( $system eq "yes" ) { $removable = "no"; }
<tr>
<td><%= $localnetwork->key %>
<td><%= $localnetwork->prop('Mask') %>
<td><%= $num_hosts %>
<td><%= $localnetwork->prop('Router') %>
% my $actionRemove = '&nbsp;';
% if ($removable eq "yes") {
%my $remove_text = l('REMOVE'); # Localized text
%my $local_network_entry = $localnetwork->key;
%my $csrf_token = "TOKEN"; # CSRF token for security
%$actionRemove = qq{
% <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
% <button type='button' class="btn btn-primary" title='$remove_text' >
% $remove_text
% </button>
% </a>
%};
% }
<td><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr>
% }
</tbody>
</table>
<%= hidden_field 'trt' => $ln_datas->{trt} %>
% }
</form>
</div>