smeserver/smeserver-certificates
6
0
Fork 0
generated from smedev/Template-for-SMEServer-Core-Package
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove formatting from controller

Browse Source
This commit is contained in:
John Crisp 2025-06-17 15:08:19 +02:00
parent 3cc63a7890
commit 2a99a49c7b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm
View File

@ -237,6 +237,7 @@ sub get_data_for_panel_CHECKONEDOMAIN {
# Get control data for table(s) # Get control data for table(s)
# Define a constant hash for field name mapping # Define a constant hash for field name mapping
use constant DomainList_FIELD_MAPPING => ( use constant DomainList_FIELD_MAPPING => (
'Table1-TYPE' => 'Type',
'Table1-Domain name / HOSTNAME' => 'Domain', 'Table1-Domain name / HOSTNAME' => 'Domain',
'Table1-Brief description' => 'Description', 'Table1-Brief description' => 'Description',
'Table1-Content' => 'Content', 'Table1-Content' => 'Content',
@ -246,6 +247,7 @@ use constant DomainList_FIELD_MAPPING => (
'Table1-IS_IN_CERT' => 'isincert', 'Table1-IS_IN_CERT' => 'isincert',
'Table1-CHECK' => 'Check' 'Table1-CHECK' => 'Check'
#'target_field2' => 'source_field2', #'target_field2' => 'source_field2',
# Add more mappings as needed # Add more mappings as needed
); );
@ -280,7 +282,7 @@ sub actual_DomainList {
my $dname = $_->key; my $dname = $_->key;
my $isincert = "N"; my $isincert = "N";
my $link = $c->create_link("letsencryptd", "CHECKONEDOMAIN", ""); my $link = $c->create_link("letsencryptd", "CHECKONEDOMAIN", "");
my $checklink = "<a href='" . $link . "&CHECKONEDOMAIN=" . $_->key . "'>" . $check . "</a>"; my $checklink = $link . "&CHECKONEDOMAIN=" . $_->key;
#my $checklink = "<a href=''>check</a>"; #my $checklink = "<a href=''>check</a>";
$isincert = "Y" if (grep(/^$dname$/, @list)); $isincert = "Y" if (grep(/^$dname$/, @list));
@ -288,6 +290,7 @@ sub actual_DomainList {
# domain # domain
push @data, push @data,
{ {
Type => "Domain",
Domain => $_->key, Domain => $_->key,
$_->props, $_->props,
letsencryptSSLcert => $le, letsencryptSSLcert => $le,
@ -305,7 +308,8 @@ sub actual_DomainList {
$isincert = "N"; $isincert = "N";
$isincert = "Y" if (grep(/^$hname$/, @list)); $isincert = "Y" if (grep(/^$hname$/, @list));
push @data, { push @data, {
Domain => "--> " . $hname, Type => "Host",
Domain => $hname,
$h->props, $h->props,
Description => $h->prop('ExternalIP') || $h->prop('InternalIP') || "", Description => $h->prop('ExternalIP') || $h->prop('InternalIP') || "",
Content => $h->prop('HostType'), Content => $h->prop('HostType'),

6
smeserver-certificates.spec
View File

@ -1,6 +1,6 @@
%define name smeserver-certificates %define name smeserver-certificates
%define version 11.0 %define version 11.0
%define release 5 %define release 6
Summary: This is what smeserver-certificates does. Summary: This is what smeserver-certificates does.
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
@ -25,6 +25,10 @@ AutoReqProv: no
%changelog %changelog
* Tue Jun 17 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0-6.sme
- Remove formatting from controller file [SME: 13045]
- Add Domain/Host as Types for template checking [SME: 13045]
* Wed Jun 11 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0-5.sme * Wed Jun 11 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0-5.sme
- open esmith using UTF8 [SME: 13036] - open esmith using UTF8 [SME: 13036]
rewrite smartmatches to grep rewrite smartmatches to grep