From 02d99bdaa6227073a453200688016023ab61133c Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Mon, 31 Jul 2023 21:01:08 +0200
Subject: [PATCH 1/6] Show which sites use a php version, #6548

---
 interface/web/admin/lib/lang/ar_server_php.lng      |  1 +
 interface/web/admin/lib/lang/bg_server_php.lng      |  1 +
 interface/web/admin/lib/lang/br_server_php.lng      |  1 +
 interface/web/admin/lib/lang/ca_server_php.lng      |  1 +
 interface/web/admin/lib/lang/cn_server_php.lng      |  1 +
 interface/web/admin/lib/lang/cz_server_php.lng      |  1 +
 interface/web/admin/lib/lang/de_server_php.lng      |  1 +
 interface/web/admin/lib/lang/dk_server_php.lng      |  1 +
 interface/web/admin/lib/lang/el_server_php.lng      |  1 +
 interface/web/admin/lib/lang/en_server_php.lng      |  1 +
 interface/web/admin/lib/lang/es_server_php.lng      |  1 +
 interface/web/admin/lib/lang/fi_server_php.lng      |  1 +
 interface/web/admin/lib/lang/fr_server_php.lng      |  1 +
 interface/web/admin/lib/lang/hr_server_php.lng      |  1 +
 interface/web/admin/lib/lang/hu_server_php.lng      |  1 +
 interface/web/admin/lib/lang/id_server_php.lng      |  1 +
 interface/web/admin/lib/lang/it_server_php.lng      |  1 +
 interface/web/admin/lib/lang/ja_server_php.lng      |  1 +
 interface/web/admin/lib/lang/nl_server_php.lng      |  1 +
 interface/web/admin/lib/lang/pl_server_php.lng      |  1 +
 interface/web/admin/lib/lang/pt_server_php.lng      |  1 +
 interface/web/admin/lib/lang/ro_server_php.lng      |  1 +
 interface/web/admin/lib/lang/ru_server_php.lng      |  1 +
 interface/web/admin/lib/lang/se_server_php.lng      |  1 +
 interface/web/admin/lib/lang/sk_server_php.lng      |  1 +
 interface/web/admin/lib/lang/tr_server_php.lng      |  1 +
 interface/web/admin/server_php_edit.php             | 13 +++++++++++++
 .../web/admin/templates/server_php_name_edit.htm    |  9 ++++++++-
 28 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/interface/web/admin/lib/lang/ar_server_php.lng b/interface/web/admin/lib/lang/ar_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/ar_server_php.lng
+++ b/interface/web/admin/lib/lang/ar_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_php.lng b/interface/web/admin/lib/lang/bg_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/bg_server_php.lng
+++ b/interface/web/admin/lib/lang/bg_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/br_server_php.lng b/interface/web/admin/lib/lang/br_server_php.lng
index 791db7e3ec..42b8f06292 100644
--- a/interface/web/admin/lib/lang/br_server_php.lng
+++ b/interface/web/admin/lib/lang/br_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'O nome não pode ser modificado.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/ca_server_php.lng b/interface/web/admin/lib/lang/ca_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/ca_server_php.lng
+++ b/interface/web/admin/lib/lang/ca_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/cn_server_php.lng b/interface/web/admin/lib/lang/cn_server_php.lng
index 80571fb194..b4c5281bea 100644
--- a/interface/web/admin/lib/lang/cn_server_php.lng
+++ b/interface/web/admin/lib/lang/cn_server_php.lng
@@ -17,4 +17,5 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM套接字目录';
 $wb['active_txt'] = '激活';
 $wb['php_in_use_error'] = '此PHP版本正在使用中。';
 $wb['php_name_in_use_error'] = '名称无法更改。';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
index 6490928429..104ef453b9 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/de_server_php.lng b/interface/web/admin/lib/lang/de_server_php.lng
index 4100957b9d..2c40887929 100644
--- a/interface/web/admin/lib/lang/de_server_php.lng
+++ b/interface/web/admin/lib/lang/de_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'Der Name kann nicht geändert werden.';
 $wb['PHP Sort Priority'] = 'Priorität';
 $wb['sortprio_txt'] = 'Sorting Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP Version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/dk_server_php.lng b/interface/web/admin/lib/lang/dk_server_php.lng
index e9b42a5133..14efa73915 100644
--- a/interface/web/admin/lib/lang/dk_server_php.lng
+++ b/interface/web/admin/lib/lang/dk_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_php.lng b/interface/web/admin/lib/lang/el_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/el_server_php.lng
+++ b/interface/web/admin/lib/lang/el_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/en_server_php.lng b/interface/web/admin/lib/lang/en_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/en_server_php.lng
+++ b/interface/web/admin/lib/lang/en_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_php.lng b/interface/web/admin/lib/lang/es_server_php.lng
index e75aa0e4e4..80c38b3f1b 100644
--- a/interface/web/admin/lib/lang/es_server_php.lng
+++ b/interface/web/admin/lib/lang/es_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_php.lng b/interface/web/admin/lib/lang/fi_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/fi_server_php.lng
+++ b/interface/web/admin/lib/lang/fi_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server_php.lng b/interface/web/admin/lib/lang/fr_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/fr_server_php.lng
+++ b/interface/web/admin/lib/lang/fr_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/hr_server_php.lng b/interface/web/admin/lib/lang/hr_server_php.lng
index 9db79d4f9b..721748cd11 100644
--- a/interface/web/admin/lib/lang/hr_server_php.lng
+++ b/interface/web/admin/lib/lang/hr_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server_php.lng b/interface/web/admin/lib/lang/hu_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/hu_server_php.lng
+++ b/interface/web/admin/lib/lang/hu_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/id_server_php.lng b/interface/web/admin/lib/lang/id_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/id_server_php.lng
+++ b/interface/web/admin/lib/lang/id_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_php.lng b/interface/web/admin/lib/lang/it_server_php.lng
index d4feb7cb0c..a69b9f268d 100644
--- a/interface/web/admin/lib/lang/it_server_php.lng
+++ b/interface/web/admin/lib/lang/it_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'Il nome non può essere cambiato.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server_php.lng b/interface/web/admin/lib/lang/ja_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/ja_server_php.lng
+++ b/interface/web/admin/lib/lang/ja_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_php.lng b/interface/web/admin/lib/lang/nl_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/nl_server_php.lng
+++ b/interface/web/admin/lib/lang/nl_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_server_php.lng b/interface/web/admin/lib/lang/pl_server_php.lng
index d86e2cf01f..3cac95f535 100644
--- a/interface/web/admin/lib/lang/pl_server_php.lng
+++ b/interface/web/admin/lib/lang/pl_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_server_php.lng b/interface/web/admin/lib/lang/pt_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/pt_server_php.lng
+++ b/interface/web/admin/lib/lang/pt_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server_php.lng b/interface/web/admin/lib/lang/ro_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/ro_server_php.lng
+++ b/interface/web/admin/lib/lang/ro_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_php.lng b/interface/web/admin/lib/lang/ru_server_php.lng
index ca1a8147a3..ddab336886 100644
--- a/interface/web/admin/lib/lang/ru_server_php.lng
+++ b/interface/web/admin/lib/lang/ru_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_php.lng b/interface/web/admin/lib/lang/se_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/se_server_php.lng
+++ b/interface/web/admin/lib/lang/se_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_php.lng b/interface/web/admin/lib/lang/sk_server_php.lng
index 4d71bb50b7..378e1af7c7 100644
--- a/interface/web/admin/lib/lang/sk_server_php.lng
+++ b/interface/web/admin/lib/lang/sk_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_server_php.lng b/interface/web/admin/lib/lang/tr_server_php.lng
index 914d28f167..6e12f26eb5 100644
--- a/interface/web/admin/lib/lang/tr_server_php.lng
+++ b/interface/web/admin/lib/lang/tr_server_php.lng
@@ -20,4 +20,5 @@ $wb['php_name_in_use_error'] = 'The name can not be changed.';
 $wb['PHP Sort Priority'] = 'Priority';
 $wb['sortprio_txt'] = 'Priority';
 $wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
+$wb['php_usage_list_txt'] = 'Currently used for';
 ?>
diff --git a/interface/web/admin/server_php_edit.php b/interface/web/admin/server_php_edit.php
index 8ad055624d..59b3460e75 100644
--- a/interface/web/admin/server_php_edit.php
+++ b/interface/web/admin/server_php_edit.php
@@ -53,6 +53,19 @@ class page_action extends tform_actions {
 	function onSubmit() {
 		parent::onSubmit();
 	}
+
+	function onShowEdit() {
+		global $app, $conf;
+
+		$result = $app->db->queryAllRecords("SELECT w.domain
+			FROM server_php s LEFT JOIN web_domain w ON (w.server_php_id = s.server_php_id AND s.server_id=w.server_id)
+			WHERE s.server_php_id = ?", $this->id);
+
+		$app->tpl->setLoop('php_usage_list', $result);
+
+		parent::onShowEdit();
+	}
+
 	function onBeforeUpdate() {
                 
                 global $app;
diff --git a/interface/web/admin/templates/server_php_name_edit.htm b/interface/web/admin/templates/server_php_name_edit.htm
index ab1d889ef9..7487462b24 100644
--- a/interface/web/admin/templates/server_php_name_edit.htm
+++ b/interface/web/admin/templates/server_php_name_edit.htm
@@ -22,4 +22,11 @@
         <div class="clear"><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="admin/server_php_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="admin/server_php_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-        </div></div>
+        </div>
+        {tmpl_var name='php_usage_list_txt'}:
+        <ul>
+        <tmpl_loop name="php_usage_list">
+          <li>{tmpl_var name='domain'}</li>
+        </tmpl_loop>
+        </ul>
+        </div>
-- 
GitLab


From 7097439e2b4b7c375f7588c02f8f3990e5fe0cd4 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 6 Aug 2023 20:09:43 +0200
Subject: [PATCH 2/6] Move php usage to a separate tab, showing empty though :(

---
 interface/web/admin/form/server_php.tform.php          |  6 ++++++
 interface/web/admin/server_php_edit.php                | 10 ++++++----
 interface/web/admin/templates/server_php_name_edit.htm |  7 -------
 .../web/admin/templates/server_php_usage_edit.htm      |  8 ++++++++
 4 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100755 interface/web/admin/templates/server_php_usage_edit.htm

diff --git a/interface/web/admin/form/server_php.tform.php b/interface/web/admin/form/server_php.tform.php
index 67f22cbeb4..c978adb3b7 100644
--- a/interface/web/admin/form/server_php.tform.php
+++ b/interface/web/admin/form/server_php.tform.php
@@ -264,4 +264,10 @@ $form["tabs"]['php_sort'] = array (
 		),
 	)
 );
+$form["tabs"]['usage'] = array(
+	'title' => "Usage",
+	'width' => 80,
+	'template' => "templates/server_php_usage_edit.htm",
+	'fields'  => array(),
+);
 ?>
diff --git a/interface/web/admin/server_php_edit.php b/interface/web/admin/server_php_edit.php
index 59b3460e75..d62bf35a83 100644
--- a/interface/web/admin/server_php_edit.php
+++ b/interface/web/admin/server_php_edit.php
@@ -57,11 +57,13 @@ class page_action extends tform_actions {
 	function onShowEdit() {
 		global $app, $conf;
 
-		$result = $app->db->queryAllRecords("SELECT w.domain
-			FROM server_php s LEFT JOIN web_domain w ON (w.server_php_id = s.server_php_id AND s.server_id=w.server_id)
-			WHERE s.server_php_id = ?", $this->id);
+		if ($this->active_tab == 'usage') {
+			$result = $app->db->queryAllRecords("SELECT w.domain
+				FROM server_php s LEFT JOIN web_domain w ON (w.server_php_id = s.server_php_id AND s.server_id=w.server_id)
+				WHERE s.server_php_id = ?", $this->id);
 
-		$app->tpl->setLoop('php_usage_list', $result);
+			$app->tpl->setLoop('php_usage_list', $result);
+		}
 
 		parent::onShowEdit();
 	}
diff --git a/interface/web/admin/templates/server_php_name_edit.htm b/interface/web/admin/templates/server_php_name_edit.htm
index 7487462b24..71fa557626 100644
--- a/interface/web/admin/templates/server_php_name_edit.htm
+++ b/interface/web/admin/templates/server_php_name_edit.htm
@@ -23,10 +23,3 @@
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_php_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="admin/server_php_list.php">{tmpl_var name='btn_cancel_txt'}</button>
         </div>
-        {tmpl_var name='php_usage_list_txt'}:
-        <ul>
-        <tmpl_loop name="php_usage_list">
-          <li>{tmpl_var name='domain'}</li>
-        </tmpl_loop>
-        </ul>
-        </div>
diff --git a/interface/web/admin/templates/server_php_usage_edit.htm b/interface/web/admin/templates/server_php_usage_edit.htm
new file mode 100755
index 0000000000..4b11031baa
--- /dev/null
+++ b/interface/web/admin/templates/server_php_usage_edit.htm
@@ -0,0 +1,8 @@
+   <div class="form-group">
+        {tmpl_var name='php_usage_list_txt'}:
+        <ul>
+        <tmpl_loop name="php_usage_list">
+          <li>{tmpl_var name='domain'}</li>
+        </tmpl_loop>
+        </ul>
+  </div>
-- 
GitLab


From df9bab2f25263e31e0961555a373aaa06b45126c Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 17 Mar 2024 00:52:57 +0100
Subject: [PATCH 3/6] Restore lost div tag

---
 interface/web/admin/templates/server_php_name_edit.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/web/admin/templates/server_php_name_edit.htm b/interface/web/admin/templates/server_php_name_edit.htm
index 71fa557626..ab1d889ef9 100644
--- a/interface/web/admin/templates/server_php_name_edit.htm
+++ b/interface/web/admin/templates/server_php_name_edit.htm
@@ -22,4 +22,4 @@
         <div class="clear"><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="admin/server_php_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="admin/server_php_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-        </div>
+        </div></div>
-- 
GitLab


From 052c140ab3c5f9addddd50d5edd5d111a729c923 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 17 Mar 2024 00:53:26 +0100
Subject: [PATCH 4/6] Add id field, required for tab switching.

---
 interface/web/admin/templates/server_php_usage_edit.htm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/web/admin/templates/server_php_usage_edit.htm b/interface/web/admin/templates/server_php_usage_edit.htm
index 4b11031baa..b713aa62c9 100755
--- a/interface/web/admin/templates/server_php_usage_edit.htm
+++ b/interface/web/admin/templates/server_php_usage_edit.htm
@@ -6,3 +6,4 @@
         </tmpl_loop>
         </ul>
   </div>
+  <input type="hidden" name="id" value="{tmpl_var name='id'}">
-- 
GitLab


From 7570829cb3ea3e713c31e3501f5ddefcf83e1e0c Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sat, 30 Mar 2024 16:56:50 +0100
Subject: [PATCH 5/6] Add div to fix styling issue

---
 interface/web/admin/templates/server_php_usage_edit.htm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/interface/web/admin/templates/server_php_usage_edit.htm b/interface/web/admin/templates/server_php_usage_edit.htm
index b713aa62c9..06acd96c12 100755
--- a/interface/web/admin/templates/server_php_usage_edit.htm
+++ b/interface/web/admin/templates/server_php_usage_edit.htm
@@ -1,4 +1,5 @@
-   <div class="form-group">
+<div id="tabbox_content" class="tab-content">
+  <div class="form-group">
         {tmpl_var name='php_usage_list_txt'}:
         <ul>
         <tmpl_loop name="php_usage_list">
@@ -7,3 +8,4 @@
         </ul>
   </div>
   <input type="hidden" name="id" value="{tmpl_var name='id'}">
+</div>
-- 
GitLab


From b881534a502f83ed298a356c1400d9e7544027cc Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 28 Apr 2024 14:26:35 +0200
Subject: [PATCH 6/6] Layout usagelist as textarea

---
 .../web/admin/templates/server_php_usage_edit.htm      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/interface/web/admin/templates/server_php_usage_edit.htm b/interface/web/admin/templates/server_php_usage_edit.htm
index 06acd96c12..7eb137863e 100755
--- a/interface/web/admin/templates/server_php_usage_edit.htm
+++ b/interface/web/admin/templates/server_php_usage_edit.htm
@@ -1,11 +1,9 @@
 <div id="tabbox_content" class="tab-content">
   <div class="form-group">
-        {tmpl_var name='php_usage_list_txt'}:
-        <ul>
-        <tmpl_loop name="php_usage_list">
-          <li>{tmpl_var name='domain'}</li>
-        </tmpl_loop>
-        </ul>
+    <label for="php_usage_list" class="col-sm-3 control-label">{tmpl_var name='php_usage_list_txt'}</label>
+  <div class="col-sm-9">
+  <textarea name="php_usage_list" id="php_usage_list" class="form-control" rows=20 disabled="disabled"><tmpl_loop name="php_usage_list">{tmpl_var name='domain'}
+</tmpl_loop></textarea>
   </div>
   <input type="hidden" name="id" value="{tmpl_var name='id'}">
 </div>
-- 
GitLab