Local networks plus a few tweaks

This commit is contained in:
John Crisp 2025-05-19 17:27:13 +02:00
parent 12ea3b7c0b
commit 12f8be6936
8 changed files with 330 additions and 295 deletions

View File

@ -5,16 +5,17 @@
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $c->stash("ret")
%= dumper $c->param("localnetwork");
%= dumper $c->stash("ln_datas");
%= dumper $c->param("deletehost");
</p>
<div>
<%= dumper $c->current_route %>
<%= dumper $c->stash("ret") %>
<%= dumper $c->param("localnetwork") %>
<%= dumper $c->stash("ln_datas") %>
<%= dumper $c->param("deletehost") %>
</div>
% }
<h1><%= $title%></h1>
%= $modul
% if ($ln_datas->{trt} eq 'ADD') {
@ -30,4 +31,5 @@
%}
</div>
%end

View File

@ -4,42 +4,42 @@
<form action="/smanager/domains2" method="POST">
<div>
<%=l 'dom_DESC_CORPORATE_DNS' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-3">
<label for="inputCorpDNSPrimary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %></label>
<div>
<%=l 'dom_DESC_CORPORATE_DNS' %>
</div>
<div class="col-auto">
% param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
<input type="text" name="Forwarder" id="inputCorpDNSPrimary" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{forwarder} %>">
</div>
</div>
<br>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-3">
<label for="inputCorpDNSSecondary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' %></label>
</div>
<div class="col-auto">
% param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
<input type="text" name="Forwarder2" id="inputCorpDNSSecondary" class="form-control" aria-describedby="inputCorpDNSSecondary" value="<%= $dom_datas->{forwarder2} %>">
</div>
</div>
<div class="row g-3 align-items-center">
<div class="col-md-3">
<label for="inputCorpDNSPrimary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' %></label>
</div>
<div class="col-auto">
% param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
<input type="text" name="Forwarder" id="inputCorpDNSPrimary" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{forwarder} %>">
</div>
</div>
<br>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<div class="row g-3 align-items-center">
<div class="col-md-3">
<label for="inputCorpDNSSecondary" class="col-form-label"><%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' %></label>
</div>
<div class="col-auto">
% param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
<input type="text" name="Forwarder2" id="inputCorpDNSSecondary" class="form-control" aria-describedby="inputCorpDNSSecondary" value="<%= $dom_datas->{forwarder2} %>">
</div>
</div>
</div>
<%= hidden_field 'trt' => $dom_datas->{trt} %>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $dom_datas->{trt} %>
</form>

View File

@ -4,84 +4,84 @@
<form action="/smanager/domains2" method="POST">
<br>
<br>
<div>
<h2>
% if ( $dom_datas->{trt} eq "ADD" ) {
<%=l 'dom_CREATE_TITLE' %>
% } else {
<%=l 'dom_MODIFY_TITLE' %>
% $btn = l('MODIFY');
% }
</h2>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-3">
<%=l 'DOMAIN_NAME' %>
<div>
<h2>
% if ( $dom_datas->{trt} eq "ADD" ) {
<%=l 'dom_CREATE_TITLE' %>
% } else {
<%=l 'dom_MODIFY_TITLE' %>
% $btn = l('MODIFY');
% }
</h2>
</div>
<div class="col-auto">
% if ( $dom_datas->{trt} eq "ADD" ) {
% param 'Domain' => $dom_datas->{domain} unless param 'Domain';
<%= text_field 'Domain' %>
% } else {
<%= hidden_field 'Domain' => $dom_datas->{domain} %>
<%= $dom_datas->{domain} %>
% }
</div>
</div>
<br>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-3">
<label for="inputDomainDesc" class="col-form-label"><%=l 'DESCRIPTION_BRIEF' %></label>
<div class="row g-3 algn-items-center">
<div class="col-md-2">
<label for="Domain" class="col-form-label"><%=l 'DOMAIN_NAME' %></label>
</div>
<div class="col-auto">
% if ( $dom_datas->{trt} eq "ADD" ) {
% param 'Domain' => $dom_datas->{domain} unless param 'Domain';
<input type="text" name="Domain" id="Domain" class="form-control" aria-describedby="inputDomain" value="<%= $dom_datas->{domain} %>">
% } else {
<%= hidden_field 'Domain' => $dom_datas->{domain} %>
<%= $dom_datas->{domain} %>
% }
</div>
</div>
<div class="col-auto">
% param 'Description' => $dom_datas->{description} unless param 'Description';
<input type="text" name="Description" id="DomainDesc" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{description} %>">
</div>
</div>
<br>
<%=l 'dom_CONTENT_FIELD_DESCRIPTION' %>
<br><br>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-3">
<label for="inputDomainContent" class="col-form-label"><%= $c->l('dom_CONTENT') %></label>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDomainDesc" class="col-form-label"><%=l 'DESCRIPTION_BRIEF' %></label>
</div>
<div class="col-auto">
% param 'Description' => $dom_datas->{description} unless param 'Description';
<input type="text" name="Description" id="DomainDesc" class="form-control" aria-describedby="inputCorpDNSPrimary" value="<%= $dom_datas->{description} %>">
</div>
</div>
<div class="col-auto">
% param 'Content' => $dom_datas->{content} unless param 'Content';
<%= select_field 'Content', $c->content_options_list(), class => "form-select", id => "inputDomainContent" %>
</div>
</div>
<br>
<%=l 'dom_DESC_NAMESERVERS' %>
<br><br>
<br>
<%=l 'dom_CONTENT_FIELD_DESCRIPTION' %>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-3">
<label for="inputDomainNameServers" class="col-form-label"><%=l 'dom_LABEL_NAMESERVERS' %></label>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDomainContent" class="col-form-label"><%= $c->l('dom_CONTENT') %></label>
</div>
<div class="col-auto">
% param 'Content' => $dom_datas->{content} unless param 'Content';
<%= select_field 'Content', $c->content_options_list(), class => "form-select", id => "inputDomainContent" %>
</div>
</div>
<div class="col-auto">
% param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
<%= select_field 'Nameservers', $c->nameserver_options_list(), class => "form-select", id => "inputDomainNameServers" %>
</div>
</div>
<br>
<br>
<%=l 'dom_DESC_NAMESERVERS' %>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<label for="inputDomainNameServers" class="col-form-label"><%=l 'dom_LABEL_NAMESERVERS' %></label>
</div>
<div class="col-auto">
% param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
<%= select_field 'Nameservers', $c->nameserver_options_list(), class => "form-select", id => "inputDomainNameServers" %>
</div>
</div>
</div>
<%= hidden_field 'trt' => $dom_datas->{trt} %>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
<%= hidden_field 'trt' => $dom_datas->{trt} %>
</form>

View File

@ -4,7 +4,7 @@
% my %ret;
% unless (length($retref)) {%ret = (ret=>"");}
% else {%ret = %$retref;}
% my @vars = split(",",$ret{vars});
% my $var1 = @vars[0];
% my $var2 = @vars[1];
@ -14,63 +14,80 @@
% my $var6 = @vars[5];
%if ($ret{'ret'} eq "") {
%} elsif (index($ret{ret},"SUCCESS") != -1) {
<div class="">
<h2> Operation Status Report</h2>
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
<%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
</div>
%} else {
%} else {
<div class="">
<h2> Operation Status Report - Error</h2>
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
<%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
</div>
%}
<br />
% my $btn = l('ADD');
% my $network_db = esmith::NetworksDB->open();
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $c->stash("ret")
</p>
<div>
<%= dumper $c->current_route %>
<%= dumper $c->stash("ret") %>
</div>
% }
%= form_for '/localnetworksb' => (method => 'POST') => begin
<h2>
%=l "ln_ADD_TITLE"
</h2>
<p>
%= $c->render_to_string(inline => l('ln_ADD_DESC'));
</p>
<br>
<span class="">
%=l "NETWORK"
</span>
<span class="">
%=text_field 'networkAddress'
</span>
<br><br>
<span class="">
%=l "ln_SUBNET_MASK"
</span>
<span class="">
%=text_field 'networkMask'
</span>
<br><br>
<span class="">
%=l "ROUTER"
</span>
<span class="">
%=text_field 'networkRouter'
</span>
<br><br>
<p>
<br>
%= submit_button "$btn", class => ""
</p>
%end
<form action="/smanager/localnetworksb" method="POST">
<div>
<h2><%=l "ln_ADD_TITLE" %></h2>
</div>
<br>
<div>
<%= $c->render_to_string(inline => l('ln_ADD_DESC')); %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label>
</div>
<div class="col-auto">
<input type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="inputNetwork" >
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label>
</div>
<div class="col-auto">
<input type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="inputNetworkMask" >
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label>
</div>
<div class="col-auto">
<input type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="inputNetworkRouter" >
</div>
</div>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
</form>
</div>

View File

@ -4,62 +4,85 @@
% my $deletehosts = $ln_datas->{deletehosts};
% my $subnet = $ln_datas->{subnet};
% my $router = $ln_datas->{router};
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $c->stash("ret")
%= dumper %$ln_datas
%= dumper $deletehosts
</p>
<div>
<%= dumper $c->current_route %>
<%= dumper $c->stash("ret") %>
<%= dumper %$ln_datas %>
<%= dumper $deletehosts %>
</div>
% }
%= form_for '/localnetworkse' => (method => 'POST') => begin
<h2>
%=l "ln_REMOVE_TITLE"
</h2>
<p>
%=l "ln_REMOVE_DESC"
</p>
<br>
<span class="">
%=l "NETWORK"
</span>
<span class="">
%=$localnetwork
</span>
<br><br>
<span class="">
%=l "ln_SUBNET_MASK"
</span>
<span class="">
%= $subnet
</span>
<br><br>
<span class="">
%=l "ROUTER"
</span>
<span class="">
%= $router
</span>
<br><br>
% if($deletehosts) {
<br>
%=$c->l("ln_REMOVE_HOSTS_DESC")
<br>
<span class="">
%= $c->l("ln_REMOVE_HOSTS_LABEL")
</span>
<span class="">
%=check_box deletehost=>1, checked=>1
</span>
<br><br>
%}
%= hidden_field localnetwork=>$localnetwork
<p>
<br>
%= submit_button "$btn", class => ""
</p>
%end
<form action="/smanager/localnetworkse" method="POST">
<div>
<h2><%=l "ln_REMOVE_TITLE" %></h2>
</div>
<div>
<%=l "ln_REMOVE_DESC" %>
</div>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetwork" class="col-form-label"><%= l "NETWORK" %></label>
</div>
<div class="col-auto">
<input disabled type="text" name="networkAddress" id="inputNetwork" class="form-control" aria-describedby="inputNetwork" value="<%= $localnetwork %>" >
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetworkMask" class="col-form-label"><%= l "ln_SUBNET_MASK" %></label>
</div>
<div class="col-auto">
<input disabled type="text" name="networkMask" id="inputNetworkMask" class="form-control" aria-describedby="inputNetworkMask" value="<%= $subnet %>" >
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNetworkRouter" class="col-form-label"><%= l "ROUTER" %></label>
</div>
<div class="col-auto">
<input disabled type="text" name="networkRouter" id="inputNetworkRouter" class="form-control" aria-describedby="inputNetworkRouter" value="<%= $router %>">
</div>
</div>
<br>
% if ($deletehosts) {
<br>
<b>tell me if you find this!</b>
<%=$c->l("ln_REMOVE_HOSTS_DESC") %>
<br>
<span class="">
<%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
</span>
<span class="">
<%=check_box deletehost=>1, checked=>1 %>
</span>
<br><br>
% }
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
<%= hidden_field localnetwork=>$localnetwork %>
</form>
</div>

View File

@ -1,108 +1,100 @@
<div>
% my $btn = l('ln_LOCALNETWORK_ADD');
%= form_for '/localnetworksa' => (method => 'POST') => begin
% my $retref= $c->stash("ret");
% my %ret;
% unless (length($retref)) {%ret = (ret=>"");}
% else {%ret = %$retref;}
<form action="/smanager/localnetworksa" method="POST">
% if (config->{debug} == 1) {
<p>
%= dumper "Ret:".$ret{ret};
</p>
%}
<br>
% 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];
% my $retref= $c->stash("ret");
% my %ret;
% unless (length($retref)) {%ret = (ret=>"");}
% else {%ret = %$retref;}
% if (config->{debug} == 1) {
<div>
%= dumper "Ret:".$ret{ret};
</div>
% }
%if ($ret{ret} eq "") {
%=l "ln_FIRSTPAGE_DESC"
%} elsif (index($ret{ret},"SUCCESS") != -1) {
<div class="">
<h2> Operation Status Report</h2>
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
% 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" %>
% } elsif (index($ret{ret},"SUCCESS") != -1) {
<br>
<div>
<h2> Operation Status Report</h2>
<%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
</div>
% } else {
<div>
<h2> Operation Status Report - Error</h2>
<%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %>
</div>
% }
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary"><%= $btn %></button>
</div>
</div>
%} else {
<div class="">
<h2> Operation Status Report - Error</h2>
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
</div>
%}
<p>
<br>
%= submit_button "$btn", class => ""
</p>
% end
</form>
<br>
% my $numlocalnetworks = @$localnetworks;
% if ($numlocalnetworks == 0){
%=l 'ln_LOCAL_NETWORK_NONE'
% } else {
% if ($numlocalnetworks == 0) {
<%= l 'ln_LOCAL_NETWORK_NONE' %>
% } else {
<br>
<table class="table table-bordered">
<thead>
<tr>
<th class="">
%=l 'NETWORK'
</th>
<th class="">
%=l 'ln_SUBNET_MASK'
</th>
<th class="">
%=l 'ln_NUMBER_OF_HOSTS'
</th>
<th class="">
%=l 'ROUTER'
</th>
<th class="">
%=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>
%= t td => (class => "") => $localnetwork->key
%= t td => (class => "") => $localnetwork->prop('Mask')
%= t td => (class => "") => $num_hosts
%= t td => (class => "") => $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="" title='$remove_text' >
% $remove_text
% </button>
% </a>
%};
<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>
% }
<td class=""><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr>
% }
</tbody>
</tbody>
</table>
%= hidden_field 'trt' => $ln_datas->{trt}
%}
<%= hidden_field 'trt' => $ln_datas->{trt} %>
% }
</div>

View File

@ -2,8 +2,6 @@
% my $btn = l('pse_CLICK_TO_CREATE');
<form action="/smanager/pseudonyms" method="POST">
<%= $c->render_to_string(inline => l('pse_DESCRIPTION')); %>
<div class="row g-3 align-items-center">

View File

@ -1,6 +1,6 @@
%define name smeserver-manager-AdminLTE
%define version 11.0.0
%define release 23
%define release 24
Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
Name: %{name}
Version: %{version}
@ -26,6 +26,9 @@ AdminLTE is an html framework for admin consoles
wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
%changelog
* Mon May 19 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-24.sme
- Local Networks and a few odd tidies
* Sun May 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-23.sme
- Domains done plus more tweaks