From 9b8e5e54357329ae6804b30ee1e8c747c23545aa Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Fri, 9 Feb 2024 22:47:55 +0100
Subject: [PATCH 1/4] Add a delete button to the DNS zone settings page

---
 interface/web/dns/dns_soa_edit.php           | 8 ++++++++
 interface/web/dns/templates/dns_soa_edit.htm | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/interface/web/dns/dns_soa_edit.php b/interface/web/dns/dns_soa_edit.php
index e17571e736..f2f10180b1 100644
--- a/interface/web/dns/dns_soa_edit.php
+++ b/interface/web/dns/dns_soa_edit.php
@@ -227,6 +227,14 @@ class page_action extends tform_actions {
 			}
 		}
 
+               $csrf_token = $app->auth->csrf_token_get('dns_soa_del');
+               $app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
+               $app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
+
+               $global_config = $app->getconf->get_global_config();
+               $app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);
+
+
 	} else {
 		$app->tpl->setVar("edit_disabled", 0);
 	}
diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm
index 97f3385030..a23d87e8cb 100644
--- a/interface/web/dns/templates/dns_soa_edit.htm
+++ b/interface/web/dns/templates/dns_soa_edit.htm
@@ -173,6 +173,10 @@
 <input type="hidden" name="id" value="{tmpl_var name='id'}">
 <input name="serial" type="hidden" value="{tmpl_var name='serial'}">
 <div class="clear">
+  <tmpl_if name='id'><tmpl_if name='show_delete_on_forms' op="==" value="y">
+    <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('dns/dns_soa_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='_csrf_id'}&_csrf_key={tmpl_var name='_csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name
+='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
+  </tmpl_if></tmpl_if>
   <div class="right">
     <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_soa_edit.php">{tmpl_var name='btn_save_txt'}</button>
     <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-- 
GitLab


From 43b8fa5a592b6eab9f44ed51a5dd680a0d9f3d1c Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Fri, 9 Feb 2024 22:50:19 +0100
Subject: [PATCH 2/4] Add a delete button to the Web Domain edit page

---
 interface/web/sites/templates/web_vhost_domain_edit.htm | 6 +++++-
 interface/web/sites/web_vhost_domain_edit.php           | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index 356e03e2dc..c3c004bc00 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -278,7 +278,11 @@
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
-        <div class="clear"><div class="right">
+        <div class="clear">
+          <tmpl_if name='id'><tmpl_if name='show_delete_on_forms' op="==" value="y">
+            <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('sites/web_vhost_domain_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='_csrf_id'}&_csrf_key={tmpl_var name='_csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
+          </tmpl_if></tmpl_if>
+          <div class="right">
             <button id="dom-edit-submit" class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_vhost_domain_list.php">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index be9f0911c7..81d65f2d84 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -843,6 +843,13 @@ class page_action extends tform_actions {
 			$app->tpl->setVar('is_pagespeed_enabled', ($web_config['nginx_enable_pagespeed']));
 		}
 
+               $csrf_token = $app->auth->csrf_token_get('web_vhost_domain_del');
+               $app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
+               $app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
+
+               $global_config = $app->getconf->get_global_config();
+               $app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);
+
 		$app->tpl->setVar('app_module', 'sites');
 
 		parent::onShowEnd();
-- 
GitLab


From 7e670185e4ed35918e1acfe06af1578e0c6fae76 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Fri, 9 Feb 2024 23:35:13 +0100
Subject: [PATCH 3/4] Add a delete button to the Client Domain edit page

---
 interface/web/client/domain_edit.php           | 7 +++++++
 interface/web/client/templates/domain_edit.htm | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/interface/web/client/domain_edit.php b/interface/web/client/domain_edit.php
index af7b900b91..78b7d53de7 100644
--- a/interface/web/client/domain_edit.php
+++ b/interface/web/client/domain_edit.php
@@ -130,6 +130,13 @@ class page_action extends tform_actions {
 
 		$app->tpl->setVar($wb);
 
+		$csrf_token = $app->auth->csrf_token_get('_domain_del');
+		$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
+		$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
+
+		$global_config = $app->getconf->get_global_config();
+		$app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);
+
 		parent::onShowEnd();
 	}
 
diff --git a/interface/web/client/templates/domain_edit.htm b/interface/web/client/templates/domain_edit.htm
index 97fefc85e0..8d2da4d03f 100644
--- a/interface/web/client/templates/domain_edit.htm
+++ b/interface/web/client/templates/domain_edit.htm
@@ -19,7 +19,11 @@
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
         <input type="hidden" name="type" value="local">
 
-        <div class="clear"><div class="right">
+        <div class="clear">
+          <tmpl_if name='id'><tmpl_if name='show_delete_on_forms' op="==" value="y">
+            <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('client/domain_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='_csrf_id'}&_csrf_key={tmpl_var name='_csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
+          </tmpl_if></tmpl_if>
+          <div class="right">
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="client/domain_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/domain_list.php">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>
\ No newline at end of file
-- 
GitLab


From 0b927681fba4640a09bc01d404cf3970871d02f5 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sat, 10 Feb 2024 21:03:15 +0100
Subject: [PATCH 4/4] Add new setting show_delete_on_forms=n to template

---
 install/tpl/system.ini.master | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index 0c4254f87b..79baa94700 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -75,3 +75,4 @@ session_timeout=0
 session_allow_endless=0
 min_password_length=8
 min_password_strength=3
+show_delete_on_forms=n
-- 
GitLab