Compare commits

...

8 Commits

Author SHA1 Message Date
John Crisp
4d47e099a6 11.0.0-40.sme 2025-06-18 15:44:15 +02:00
John Crisp
9e05c8df28 Update Letsencrypt templates 2025-06-18 15:42:51 +02:00
John Crisp
625855f87e Fix typo in css file 2025-06-18 15:42:19 +02:00
John Crisp
37361c8c3f Fix typo in _usr files 2025-06-18 15:40:41 +02:00
John Crisp
322d3b7038 Start Letsencrypt panels 2025-06-17 15:33:22 +02:00
John Crisp
1baec827d3 11.0.0-38.sme More formatting 2025-06-13 19:55:48 +02:00
John Crisp
2d6deb9b37 More formatting with PortForwards 2025-06-13 19:54:20 +02:00
John Crisp
f547a5300d More formatting with LocalNetworks 2025-06-13 19:49:28 +02:00
16 changed files with 661 additions and 474 deletions

View File

@@ -111,6 +111,6 @@ html {
.user-table-max-wdith {
.user-table-max-width {
max-width: 50%;
}

View File

@@ -1,74 +1,78 @@
%#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%#
% layout 'AdminLTE', title => "Sme server 2 - Letsencrypt certificate", share_dir => './';
%# css specific to this panel:
% content_for 'module' => begin
<!-- needs moving -->
<!-- reetp needs moving - probabyl not required -->
%= stylesheet '/css/letsencrypt.css'
<!-- stylesheet '/css/letsencrypt.css' -->
<div class="card-body">
% if (config->{debug} == 1) {
<pre>
%= dumper $c->current_route
%= dumper $lets_data->{trt}
<%= dumper $c->current_route %>
<%= dumper $lets_data->{trt} %>
</pre>
% }
<h1><%=$title%></h1>
% if ( stash('modul')) {
%= $c->render_to_string(inline => stash('modul') );
<br>
<div>
<%= $c->render_to_string(inline => stash('modul') ); %>
</div>
% }
%if ($c->stash('first')) {
<br><p>
%=$c->render_to_string(inline =>$c->l($c->stash('first')))
</p>
%} elsif ($c->stash('success')) {
<div class="">
<h2><%=$c->l('lets_Status_Report') %></h2><p>
%= $c->l($c->stash('success'));
</p>
% if ($c->stash('first')) {
<br>
<div>
<%=$c->render_to_string(inline =>$c->l($c->stash('first'))) %>
</div>
%} elsif ($c->stash('error')) {
<div class="">
<h2><%=$c->l('lets_Error_Status_Report') %></h2><p>
%= $c->l($c->stash('error'));
</p>
% } elsif ($c->stash('success')) {
<div class="text-success">
<h2><%=$c->l('lets_Status_Report') %></h2>
<div>
<%= $c->l($c->stash('success')); %>
</div>
</div>
%}
% } elsif ($c->stash('error')) {
<div class="text-danger">
<h2><%=$c->l('lets_Error_Status_Report') %></h2>
<div>
<%= $c->l($c->stash('error')); %>
</div>
</div>
% }
%#Routing to partials according to trt parameter.
%#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
% if ($lets_data->{trt} eq "LIST") {
%= include 'partials/_lets_LIST'
%}
<%= include 'partials/_lets_LIST' %>
% }
% if ($lets_data->{trt} eq "PARAMS") {
%= include 'partials/_lets_PARAMS'
%}
<%= include 'partials/_lets_PARAMS' %>
% }
% if ($lets_data->{trt} eq "CHECKALLDOMAINS") {
%= include 'partials/_lets_CHECKALLDOMAINS'
%}
<%= include 'partials/_lets_CHECKALLDOMAINS' %>
% }
% if ($lets_data->{trt} eq "CHECKALLENABLEDDOMAINS") {
%= include 'partials/_lets_CHECKALLENABLEDDOMAINS'
%}
<%= include 'partials/_lets_CHECKALLENABLEDDOMAINS' %>
% }
% if ($lets_data->{trt} eq "CHECKONEDOMAIN") {
%= include 'partials/_lets_CHECKONEDOMAIN'
%}
<%= include 'partials/_lets_CHECKONEDOMAIN' %>
% }
</div>
%end

View File

@@ -1,47 +1,64 @@
%#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%#
<div>
<!-- reetp this isn't required? -->
<!--
<script>
window.onload = function() {
SelectInput();
};
</script>
-->
% if (config->{debug} == 1) {
<pre>
%= dumper $lets_data
<%= dumper $lets_data %>
</pre>
% }
% my $btn = l('lets_APPLY');
%= form_for "letsencryptu" => (method => 'POST') => begin
% param 'trt' => $lets_data->{trt} unless param 'trt';
%= hidden_field 'trt' => $lets_data->{trt}
<!-- <form action="/smanager/letsencryptu" method="POST"> -->
%# Inputs etc in here.
<h1 class=""><%=l('lets_Check_all_domains')%></h1>
<h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
<span class="">
%=l('lets_All_domains_check_result')
</span>
<span class="">
% param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
%= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
</span><br>
<span class="">
%my $back_text = l('lets_Back'); # Localized text
%my $actionBack = qq{
% <a href="letsencryptd">
% <input class="" type='submit' value='$back_text'>
% </a>
%};
<%= $c->render_to_string(inline => $actionBack) %>
</span>
<h1><%=l('lets_Check_all_domains')%></h1>
<br>
<h2><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
<br>
<!-- results box-->
<div class="row g-3 align-items-center">
<div class="col-md-1">
%=l('lets_All_domains_check_result')
</div>
<div class="col-auto">
% param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
%= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
</div>
</div>
<br>
%# my $btn = l('lets_APPLY');
%# param 'trt' => $lets_data->{trt} unless param 'trt';
%#= hidden_field 'trt' => $lets_data->{trt}
% my $back_text = l('lets_Back'); # Localized text
<div class="row g-3 align-items-center">
<div class="col-md-2">
<!-- <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> -->
<a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
</div>
</div>
<!-- </form> -->
%# Probably finally by a submit.
%end
</div>

View File

@@ -1,49 +1,68 @@
%#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%#
<div>
<!-- reetp Move to JS file -->
<!--
<script>
window.onload = function() {
SelectInput();
};
</script>
-->
% if (config->{debug} == 1) {
<pre>
%= dumper $lets_data
<%= dumper $lets_data %>
</pre>
% }
% my $btn = l('lets_APPLY');
%= form_for "letsencryptu" => (method => 'POST') => begin
% param 'trt' => $lets_data->{trt} unless param 'trt';
%= hidden_field 'trt' => $lets_data->{trt}
<!-- reetp could change this to a form -->
<!-- <form action="/smanager/letsencryptu" method="POST"> -->
%# Inputs etc in here.
<h1 class=""><%=l('lets_Check_all_enabled_domains')%></h1>
<h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
<span class="">
%=l('lets_Enabled_domains_check_result')
</span>
<span class="">
% param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck';
%= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
</span>
<h1><%= l ('lets_Check_all_enabled_domains')%></h1>
<br>
<span class="">
%my $back_text = l('lets_Back'); # Localized text
%my $actionBack = qq{
% <a href="letsencryptd">
% <input class="" type='submit' value='$back_text'>
% </a>
%};
<%= $c->render_to_string(inline => $actionBack) %>
</span>
%# Probably finally by a submit.
%end
<h2><%= l ('lets_Loop_through_checking_the_letsencrypt')%></h2>
<br>
<!-- Domains being checked -->
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_Enabled_domains_check_result') %>
</div>
<div class="col-auto">
% param 'EnabledDomainsCheck' => $lets_data->{EnabledDomainsCheck} unless param 'EnabledDomainsCheck';
%= text_area 'EnabledDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
</div>
</div>
<br>
<!-- results box-->
% my $back_text = l('lets_Back'); # Localized text
%# param 'trt' => $lets_data->{trt} unless param 'trt';
%#= hidden_field 'trt' => $lets_data->{trt}
<div class="row g-3 align-items-center">
<div class="col-md-2">
<!-- <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> -->
<a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
</div>
</div>
<!--
</form>
-->
</div>

View File

@@ -1,59 +1,88 @@
%#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%#
<div>
<!-- reetp this isn't required? -->
<!--
<script>
window.onload = function() {
SelectInput();
};
</script>
% if (config->{debug} == 1) {
-->
% if (config->{debug} == 0) {
<pre>
%= dumper $lets_data
<%= dumper $lets_data %>
</pre>
% }
% my $btn = l('lets_APPLY');
%= form_for "letsencryptu" => (method => 'POST') => begin
% param 'trt' => $lets_data->{trt} unless param 'trt';
%= hidden_field 'trt' => $lets_data->{trt}
<!-- <form action="/smanager/letsencrypt" method="POST"> -->
%# Inputs etc in here.
<h1 class=""><%=l('lets_Check_just_one_domain')%></h1>
<h2 class=""><%=l('lets_Loop_through_and_check_the')%></h2>
<p><span class="">
%=l('lets_Domains_name')
</span>
<span class="">
% param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
%= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
<h1><%=l('lets_Check_just_one_domain')%></h1>
<br>
</span>
</p>
<span class="">
%=l('lets_One_domain_check_result')
</span>
<span class="">
% param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
%= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
</span>
<h2><%=l('lets_Loop_through_and_check_the')%></h2>
<br>
<span class="">
%my $back_text = l('lets_Back'); # Localized text
%my $actionBack = qq{
% <a href="letsencryptd">
% <input class="" type='submit' value='$back_text'>
% </a>
%};
<%= $c->render_to_string(inline => $actionBack) %>
</span>
%# Probably finally by a submit.
%end
<!-- Domain being checked -->
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_Domains_name') %>
</div>
<div class="col-auto">
<%= $lets_data->{OneDomainToCheck} %>
%# param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
%#= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
</div>
</div>
<br>
<!-- results box-->
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_One_domain_check_result') %>
</div>
<div class="col-md-auto">
<%= $lets_data->{OneDomainsCheck} %>
</div>
<div class="col-md-auto">
%# param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
%#= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
</div>
</div>
<br>
% my $back_text = l('lets_Back'); # Localized text
%# param 'trt' => $lets_data->{trt} unless param 'trt';
%#= hidden_field 'trt' => $lets_data->{trt}
<div class="row g-3 align-items-center">
<div class="col-md-2">
<!-- <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> -->
<a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
</div>
</div>
<!-- </form> -->
</div>

View File

@@ -1,152 +1,236 @@
%#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%#
<div>
<!-- reetp Move to JS file -->
<!--
<script>
window.onload = function() {
SelectInput();
};
</script>
-->
% if (config->{debug} == 1) {
<pre>
%= dumper $lets_data
<%= dumper $lets_data %>
</pre>
% }
% my $btn = l('lets_APPLY');
%= form_for "letsencryptu" => (method => 'POST') => begin
% param 'trt' => $lets_data->{trt} unless param 'trt';
%= hidden_field 'trt' => $lets_data->{trt}
%# Inputs etc in here.
<div>
<a href='letsencryptd?trt=PARAMS' class="">
%= l('lets_CONFIG')
</a>
%#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2'
<a href='letsencryptd?trt=CHECKALLDOMAINS' class="">
%= l('lets_CHECK_ALL_DOMAINS')
</a>
%#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3'
<a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="">
%= l('lets_CHECK_ALL_ENABLED_DOMAINS')
</a>
%#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4'
<br>
<!-- reetp could change this to a form -->
<!-- <form action="/smanager/letsencryptu" method="POST"> -->
%# my $btn = l('lets_APPLY');
%# param 'trt' => $lets_data->{trt} unless param 'trt';
%#= hidden_field 'trt' => $lets_data->{trt}
% my $modifybtn = l ('MODIFY');
% my $checkbtn = l ('lets_CHECK');
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l('lets_CONFIG') %>
</div>
<h2 class=""><%=l('lets_For_this_Server')%></h2>
<p>
<span class="">
%=l('lets_Internal_IP')
</span>
<span class="">
<div class="col-md-1 text-center">
<a href='letsencryptd?trt=PARAMS' class="btn btn-primary btn-sm" role="button"><%= $modifybtn %></a>
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l ('lets_CHECK_ALL_DOMAINS') %>
</div>
<div class="col-md-1 text-center">
<a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
</div>
<div class="col-md-1 text-center">
<a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
</div>
<div>
<br>
<!--
<div class="row g-3 align-items-center">
<div class="col-md-1 border text-center">
<%= l('lets_CONFIG') %>
</div>
<div class="col-md-2 border text-center">
<%= l ('lets_CHECK_ALL_DOMAINS') %>
</div>
<div class="col-md-2 border text-center">
<%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
</div>
<div>
<div class="row g-3 align-items-center">
<div class="col-md-1 border text-center">
<a href='letsencryptd?trt=PARAMS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
</div>
<div class="col-md-2 border text-center">
<a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
</div>
<div class="col-md-2 border text-center">
<a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
</div>
</div>
-->
<!-- </form> -->
<br><br>
<h2><%=l('lets_For_this_Server') %></h2>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputInternalIP" class="col-form-label"><%= l ('lets_Internal_IP') %></label>
</div>
<div class="col-auto">
% param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
%= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
<br>
</span>
</p>
<p>
<span class="">
%=l('lets_External_Interface_IP')
</span>
<span class="">
<input type="text" name="InternalIP" id="inputInternalIP" class="form-control" aria-describedby="Disabled Internal IP" value="<%=$lets_data->{InternalIP}%>" disabled readonly>
%#= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputExternalIP" class="col-form-label"><%= l ('lets_External_Interface_IP') %></label>
</div>
<div class="col-auto">
% param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
%= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
<br>
</span>
</p>
<p>
<span class="">
%=l('lets_Internet_IP')
</span>
<span class="">
<input type="text" name="ExternalIP" id="inputExternalIP" class="form-control" aria-describedby="Disabled External Interface IP" value="<%=$lets_data->{ExternalIP}%>" disabled readonly>
%#= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputInternetIP" class="col-form-label"><%= l ('lets_Internet_IP') %></label>
</div>
<div class="col-auto">
% param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
%= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
<br>
</span>
</p>
<h2 class=""><%=l('lets_Current_certificate_details')%></h2>
<p>
<span class="">
%=l('lets_Issuer')
</span>
<span class="">
<input type="text" name="InternetIP" id="inputInternetIP" class="form-control" aria-describedby="Disabled Internet IP" value="<%=$lets_data->{InternetIP}%>" disabled readonly>
%#= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
</div>
</div>
<br><br>
<h2><%=l('lets_Current_certificate_details') %></h2>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputIssuer" class="col-form-label"><%= l ('lets_Issuer') %></label>
</div>
<div class="col-auto">
% param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
%= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
<br>
</span>
</p>
<p>
<span class="">
%=l('lets_Expiry')
</span>
<span class="">
<input type="text" name="Issuer" id="inputIssuer" class="form-control" aria-describedby="Disabled Issuer" value="<%=$lets_data->{Issuer}%>" disabled readonly>
%#= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputExpiry" class="col-form-label"><%= l ('lets_Expiry') %></label>
</div>
<div class="col-auto">
% param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
%= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
<br>
</span>
</p>
<p>
<span class="">
%=l('lets_Not_Before')
</span>
<span class="">
<input type="text" name="Expiry" id="inputExpiry" class="form-control" aria-describedby="Disabled Issuer" value="<%=$lets_data->{Expiry}%>" disabled readonly>
%#= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="inputNotBefore" class="col-form-label"><%= l ('lets_Not_Before') %></label>
</div>
<div class="col-auto">
% param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
%= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
<br>
</span>
</p>
<h2 class=""><%=l('lets_List_of_Domains_and_Hosts')%></h2>
<br />
<table class="table table-bordered">
<thead class="">
<tr table-head-row>
<th class=""><%=l('lets_Domain_name_/_HOSTNAME')%></th>
<th class=""><%=l('lets_Brief_description')%></th>
<th class=""><%=l('lets_Content')%></th>
<th class=""><%=l('lets_LABEL_NAMESERVERS')%></th>
<th class=""><%=l('lets_LABEL_POINT')%></th>
<th class=""><%=l('lets_LABEL_LECERT')%></th>
<th class=""><%=l('lets_IS_IN_CERT')%></th>
<th class=""><%=l('lets_CHECK')%></th>
<input type="text" name="NotBefore" id="inputNotBefore" class="form-control" aria-describedby="Disabled Not before" value="<%=$lets_data->{NotBefore}%>" disabled readonly>
%#= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
</div>
</div>
<br><br>
<h2 class=""><%=l('lets_List_of_Domains_and_Hosts') %></h2>
<br>
<table class="table table-bordered">
<thead>
<tr table-head-row>
<th><%= l ('lets_Domain_name_/_HOSTNAME') %></th>
<th><%= l ('lets_Brief_description') %></th>
<th class="text-center"><%= l ('lets_Content') %></th>
<th class="text-center"><%= l ('lets_LABEL_NAMESERVERS') %></th>
<th class="text-center"><%= l ('lets_LABEL_POINT') %></th>
<th class="text-center"><%= l ('lets_LABEL_LECERT') %></th>
<th class="text-center"><%= l ('lets_IS_IN_CERT') %></th>
<th class="text-center"><%= l ('lets_CHECK') %></th>
</tr>
</thead>
<tbody>
% my $control_data = $c->stash('DomainList');
% foreach my $row (@$control_data) {
% my $link = $c->render_to_string(inline=>$row->{'Table1-CHECK'});
% my $type = $c->render_to_string(inline=>$row->{'Table1-TYPE'});
<tr>
% if ($type eq "Domain\n"){
<td><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
% }
% if ($type eq "Host\n") {
<td><i class="bi bi-arrow-return-right"> </i><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
% }
<td ><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'}) %></td>
% if ($link ne "") {
<td class="text-center"><a href= "<%= $link %>" class="btn btn-primary btn-sm" role="button" > <%= $checkbtn %></a></td>
% } else {
<td>&nbsp</td>
% }
</tr>
</thead>
<tbody class="">
% my $control_data = $c->stash('DomainList');
% foreach my $row (@$control_data) {
<tr class="">
<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'})%></td>
<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'})%></td>
<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-Content'})%></td>
<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'})%></td>
<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'})%></td>
<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'})%></td>
<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'})%></td>
<td class=""><%=$c->render_to_string(inline=>$row->{'Table1-CHECK'})%></td>
</tr>
%}
</tbody>
</table>
%# Probably finally by a submit.
%end
% }
</tbody>
</table>
</div>

View File

@@ -1,130 +1,154 @@
%#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%#
<div>
<!-- reetp This needs fixing -->
<!--
<script>
window.onload = function() {
SelectInput();
};
</script>
-->
% if (config->{debug} == 1) {
<pre>
%= dumper $lets_data
<%= dumper $lets_data %>
</pre>
% }
% my $btn = l('lets_APPLY');
%= form_for "letsencryptu" => (method => 'POST') => begin
<form action="/smanager/letsencryptu" method="POST">
% param 'trt' => $lets_data->{trt} unless param 'trt';
%= hidden_field 'trt' => $lets_data->{trt}
%# Inputs etc in here.
<h2 class=""><%=l('lets_Manage_letsencrypt-config_settings:')%></h2>
<p class="">
%=l('lets_CONFIG_LETSENCRYPT')
</p>
<p>
<span class="">
%=l('lets_SERVICE_STATUS')
</span>
<span class="">
%# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']];
% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status});
%# param 'status' => $lets_data->{status} unless param 'status';
%= select_field 'status' => @status_options, class => ""
<br>
</span>
</p>
<p>
<span class="">
%=l('lets_HOOKSCRIPT_STATUS')
</span>
<span class="">
% my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
% param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
%= select_field 'hookScript' => @hookScript_options, class => ""
<br>
</span>
</p>
<p>
<span class="">
%=l('lets_HOSTOVERRIDE_STATUS')
</span>
<span class="">
% my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
% param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
%= select_field 'hostOverride' => @hostOverride_options, class => ""
<br>
</span>
</p>
<p>
<span class="">
%=l('lets_ACCEPT_TERMS_STATUS')
</span>
<span class="">
% my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
% param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS';
%= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => ""
<br>
</span>
</p>
<h2 class=""><%=l('lets_Manage_letsencrypt-config_settings:') %></h2>
<p>
<span class="">
%=l('lets_API_STATUS')
</span>
<span class="">
% my @API_options = [['2' => '2']];
% param 'API' => $lets_data->{API} unless param 'API';
%= select_field 'API' => @API_options, class => ""
<br>
</span>
</p>
<p>
<span class="">
%=l('lets_KEYSIZE_STATUS')
</span>
<span class="">
% my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
% param 'keysize' => $lets_data->{keysize} unless param 'keysize';
%= select_field 'keysize' => @keysize_options, class => ""
<div>
<%= l ('lets_CONFIG_LETSENCRYPT') %>
</div>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_SERVICE_STATUS') %>
</div>
<div class="col-auto">
% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status});
%= select_field 'status' => @status_options, class => "form-select"
</div>
</div>
<br>
</span>
</p>
<p>
<span class="">
%=l('lets_CONFIGUREMODE_STATUS')
</span>
<span class="">
% my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']];
% param 'configure' => $lets_data->{configure} unless param 'configure';
%= select_field 'configure' => @configure_options, class => ""
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_HOOKSCRIPT_STATUS') %>
</div>
<div class="col-auto">
% my @hookScript_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
% param 'hookScript' => $lets_data->{hookScript} unless param 'hookScript';
%= select_field 'hookScript' => @hookScript_options, class => "form-select"
</div>
</div>
<br>
</span>
</p>
<p>
<span class="">
%=l('lets_EMAIL')
</span>
<span class="">
% param 'email' => $lets_data->{email} unless param 'email';
%=email_field 'email', class => ""
</span>
</p>
<span class="">
%= submit_button l('lets_Save'), class => ""
</span>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_HOSTOVERRIDE_STATUS') %>
</div>
<div class="col-auto">
% my @hostOverride_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
% param 'hostOverride' => $lets_data->{hostOverride} unless param 'hostOverride';
%= select_field 'hostOverride' => @hostOverride_options, class => "form-select"
</div>
</div>
%# Probably finally by a submit.
%end
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_ACCEPT_TERMS_STATUS') %>
</div>
<div class="col-auto">
% my @ACCEPT_TERMS_options = [['Disabled' => 'disabled'], ['Yes' => 'yes']];
% param 'ACCEPT_TERMS' => $lets_data->{ACCEPT_TERMS} unless param 'ACCEPT_TERMS';
%= select_field 'ACCEPT_TERMS' => @ACCEPT_TERMS_options, class => "form-select"
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_API_STATUS') %>
</div>
<div class="col-auto">
% my @API_options = [['2' => '2']];
% param 'API' => $lets_data->{API} unless param 'API';
%= select_field 'API' => @API_options, class => "form-select"
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_KEYSIZE_STATUS') %>
</div>
<div class="col-auto">
% my @keysize_options = [['2048' => '2048'], ['3072' => '3072'], ['4096' => '4096']];
% param 'keysize' => $lets_data->{keysize} unless param 'keysize';
%= select_field 'keysize' => @keysize_options, class => "form-select"
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_CONFIGUREMODE_STATUS') %>
</div>
<div class="col-auto">
% my @configure_options = [['ALL' => 'all'], ['Domains' => 'domains'], ['HOSTS' => 'hosts'], ['NONE' => 'none']];
% param 'configure' => $lets_data->{configure} unless param 'configure';
%= select_field 'configure' => @configure_options, class => "form-select"
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<label for="email_address" class="col-form-label"><%= l ('lets_EMAIL') %></label>
</div>
<div class="col-auto">
% param 'email' => $lets_data->{email} unless param 'email';
<input type="email" name="email" id="email_address" class="form-control" aria-describedby="Email Address" value="<%= $lets_data->{email} %>">
</div>
</div>
<br>
% my $btn = l('lets_APPLY');
<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

@@ -13,31 +13,30 @@
% }
% if ($ret{ret} eq "") {
<br>
<%= l "ln_FIRSTPAGE_DESC" %>
<BR>
<div>
<%= l "ln_FIRSTPAGE_DESC" %>
</div>
% } elsif (index($ret{ret},"SUCCESS") != -1) {
<div class="">
<h2> Operation Status Report</h2>
<%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
<div>
<!-- <h2> Operation Status Report</h2> -->
<%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
</div>
% } else {
<div class="">
<h2> Operation Status Report - Error</h2>
<%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
<div class="text-danger">
<!-- <h2> Operation Status Report - Error</h2> -->
<%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
</div>
% }
<br>
% my $btn = l('ADD');
% my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
% if (config->{debug} == 1) {
<div>
<%= dumper $c->current_route %>
<%= dumper $c->stash("ret") %>
</div>
% if (config->{debug} == 1) {
<div>
<%= dumper $c->current_route %>
<%= dumper $c->stash("ret") %>
</div>
% }
<form action="/smanager/localnetworksb" method="POST">
@@ -84,11 +83,14 @@
<br><br>
% my $btn = l('ADD');
<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

@@ -6,12 +6,12 @@
% my $router = $ln_datas->{router};
% if (config->{debug} == 1) {
<div>
<pre>
<%= dumper $c->current_route %>
<%= dumper $c->stash("ret") %>
<%= dumper %$ln_datas %>
<%= dumper $deletehosts %>
</div>
</pre>
% }
<form action="/smanager/localnetworkse" method="POST">
@@ -62,28 +62,24 @@
% if ($deletehosts) {
<br>
<b>tell me if you find this!</b>
<b>Please opoen a bug and tell me</b>
<%= $c->l("ln_REMOVE_HOSTS_DESC") %>
<div>
<%= $c->l("ln_REMOVE_HOSTS_DESC") %>
</div>
<br>
<span class="">
<%= $c->l("ln_REMOVE_HOSTS_LABEL") %>
</span>
<span class="">
<%= check_box deletehost=>1, checked=>1 %>
</span>
<div class="text-danger align-bottom">
<%= $c->l("ln_REMOVE_HOSTS_LABEL") %>&nbsp&nbsp<input type="checkbox" name="deletehost">
</div>
<br><br>
% }
<%= hidden_field localnetwork=>$localnetwork %>
<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

@@ -7,20 +7,6 @@
<br>
% if ($ret{'ret'} eq "") {
% } elsif (index($ret{ret},"SUCCESS") != -1) {
<div class="">
<!--<h2> Operation Status Report</h2>-->
<%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
</div>
% } else {
<div class="">
<!--<h2> Operation Status Report - Error</h2>-->
<%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
</div>
% }
% if (config->{debug} == 1) {
<pre>
<%= dumper $c->current_route %>
@@ -28,6 +14,24 @@
</pre>
% }
% if ($ret{'ret'} eq "") {
<div>
<%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
</div>
% } elsif (index($ret{ret},"SUCCESS") != -1) {
<div>
<!--<h2> Operation Status Report</h2>-->
<%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
</div>
% } else {
<div class="text-danger">
<!--<h2> Operation Status Report - Error</h2>-->
<%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
</div>
% }
<br>
<h2><%= l "pf_CREATE_RULE" %></h2>
<form action="/smanager/portforwardingb" method="POST">

View File

@@ -1,11 +1,5 @@
<div>
<form action="/smanager/portforwardinga" method="POST">
<br>
% my $retref = $c->stash("ret");
% my %ret = $retref ? %$retref : (ret => "");
% my @vars = split(/,/, $ret{vars} // '');
@@ -14,24 +8,25 @@
% my $numtcpforwards = @$tcpforwards;
% my $numudpforwards = @$udpforwards;
% if ($c->app->config->{debug}) {
<pre>
%= dumper { ret_data => \%ret }
</pre>
% }
% if ($c->app->config->{debug}) {
<pre>
<%= dumper { ret_data => \%ret } %>
</pre>
% }
% if ($ret{ret} eq "") {
<%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
<div>
<%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %>
</div>
% } elsif (index($ret{ret},"SUCCESS") != -1) {
<br>
<div>
<div>
<h2> Operation Status Report</h2>
<%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
</div>
% } else {
% } else {
<br>
<div class="text-danger">
<div class="text-danger">
<h2> Operation Status Report - Error</h2>
<%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
</div>
@@ -39,6 +34,8 @@
<br>
<form action="/smanager/portforwardinga" method="POST">
% my $btn = l('pf_CREATE_RULE');
<div class="row g-3 align-items-center">
@@ -49,16 +46,16 @@
</form>
<br>
% if ($empty) {
<br>
<%= l 'pf_NO_FORWARDS' %>
% } else {
<br>
<%= l 'pf_SHOW_FORWARDS' %>
<br><br>
<table class="table table-bordered">
<br>
<%= l 'pf_SHOW_FORWARDS' %>
<br><br>
<table class="table table-bordered">
<thead>
<tr>
<th><%= l 'pf_LABEL_PROTOCOL' %></th>
@@ -103,12 +100,12 @@
<td class="text-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
</tr>
% }
% }
% }
% }
% }
% }
</tbody>
</table>
</tbody>
</table>
<%= hidden_field 'trt' => $pf_datas->{trt} %>
</div>

View File

@@ -16,7 +16,7 @@
<br><br>
<table class="table table-bordered user-table-max-wdith">
<table class="table table-bordered user-table-max-width">
<thead>
<tr>
<th class="col-sm">

View File

@@ -1,11 +1,11 @@
<div>
% my $btn = l('usr_LOCK');
<form action="/smanager/useraccountsd" method="POST">
%#= form_for '/useraccountsd' => (method => 'POST') => begin
<div>
<h2><%= l 'usr_LOCK_ACCOUNT_TITLE' %></h2>
</div>
@@ -13,12 +13,12 @@
<div>
Needs a text change in the Lex files
<br>
<%= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} ) %>
<%= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} ) %>
</div>
<br><br>
<table class="table table-bordered user-table-max-wdith">
<table class="table table-bordered user-table-max-width">
<thead>
<tr>
<th class="col-sm">
@@ -50,8 +50,8 @@
%= hidden_field 'trt' => $usr_datas->{trt}
%= hidden_field 'user' => $usr_datas->{user}
%= hidden_field 'name' => $usr_datas->{name}
</form>
%# end
%# end
</div>

View File

@@ -18,7 +18,7 @@
<br>
<table class="table table-bordered user-table-max-wdith">
<table class="table table-bordered user-table-max-width">
<thead>
<tr>
<th class="col-sm">

View File

@@ -3,75 +3,75 @@
% my $btn = l('SAVE');
<form action="/smanager/useraccountsd" method="POST">
%#= form_for '/useraccountsd' => (method => 'POST') => begin
<div>
<h2><%= l 'PASSWORD_RESET' %></h2>
</div>
<br>
<div>
<%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION' %>
</div>
<br>
<div>
<%=l 'usr_CURRENT_SYSTEM_PASSWORD' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<input name="CurPass" id="Pass" type="password" class="form-control sme-password" placeholder="Current Password">
</div>
</div>
</div>
<br>
<div>
<%= l 'usr_NEW_SYSTEM_PASSWORD' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<input name="Pass" id="Pass" type="password" class="form-control sme-password" placeholder="New Password">
</div>
</div>
</div>
<br>
<div>
<%= l 'usr_NEW_SYSTEM_PASSWORD_VERIFY' %>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<input name="PassVerify" id="PassVerify" type="password" class="form-control sme-password" placeholder="New Password verify">
</div>
</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>
</div>
%= hidden_field 'trt' => $usr_datas->{trt}
%= hidden_field 'user' => $usr_datas->{user}
%= hidden_field 'name' => $usr_datas->{name}
%# end
</form>

View File

@@ -1,6 +1,6 @@
%define name smeserver-manager-AdminLTE
%define version 11.0.0
%define release 37
%define release 40
Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
Name: %{name}
Version: %{version}
@@ -28,6 +28,17 @@ AdminLTE is an html framework for admin consoles
wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
%changelog
* Wed Jun 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-40.sme
- Finish Letsencrypt panels
- fix CSS and _usr files typo
* Tue Jun 17 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-39.sme
- Start Letsencrypt panels
* Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-38.sme
- More formatting for LocalNetworks
- More formatting for PortForwards
* Fri Jun 13 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-37.sme
- Finish portforwarding to work with [SME:13043]