From 2a99a49c7b7b53d8d1118e9e39a3d28624ff50e8 Mon Sep 17 00:00:00 2001
From: John Crisp <jcrisp@safeandsoundit.co.uk>
Date: Tue, 17 Jun 2025 15:08:19 +0200
Subject: [PATCH] Remove formatting from controller

---
 .../smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm | 8 ++++++--
 smeserver-certificates.spec                               | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm
index e01192c..f74e05f 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm
@@ -237,6 +237,7 @@ sub get_data_for_panel_CHECKONEDOMAIN {
 # Get control data for table(s)
 # Define a constant hash for field name mapping
 use constant DomainList_FIELD_MAPPING => (
+    'Table1-TYPE'                   => 'Type',
     'Table1-Domain name / HOSTNAME' => 'Domain',
     'Table1-Brief description'      => 'Description',
     'Table1-Content'                => 'Content',
@@ -246,6 +247,7 @@ use constant DomainList_FIELD_MAPPING => (
     'Table1-IS_IN_CERT'             => 'isincert',
     'Table1-CHECK'                  => 'Check'
 
+
         #'target_field2' => 'source_field2',
         # Add more mappings as needed
 );
@@ -280,7 +282,7 @@ sub actual_DomainList {
         my $dname     = $_->key;
         my $isincert  = "N";
         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>";
         $isincert = "Y" if (grep(/^$dname$/, @list));
@@ -288,6 +290,7 @@ sub actual_DomainList {
         # domain
         push @data,
             {
+            Type => "Domain",
             Domain => $_->key,
             $_->props,
             letsencryptSSLcert => $le,
@@ -305,7 +308,8 @@ sub actual_DomainList {
             $isincert = "N";
             $isincert = "Y" if (grep(/^$hname$/, @list));
             push @data, {
-                Domain => "--> " . $hname,
+                Type => "Host",
+                Domain => $hname,
                 $h->props,
                 Description => $h->prop('ExternalIP') || $h->prop('InternalIP') || "",
                 Content     => $h->prop('HostType'),
diff --git a/smeserver-certificates.spec b/smeserver-certificates.spec
index 04e5bfd..865ba02 100644
--- a/smeserver-certificates.spec
+++ b/smeserver-certificates.spec
@@ -1,6 +1,6 @@
 %define name smeserver-certificates
 %define version 11.0
-%define release 5
+%define release 6
 Summary: This is what smeserver-certificates does.
 Name: %{name}
 Version: %{version}
@@ -25,6 +25,10 @@ AutoReqProv: no
 
 
 %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
 - open esmith using UTF8 [SME: 13036]
   rewrite smartmatches to grep