From 295db3b9c8a2a213bf143bc3d2d751393347d258 Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Mon, 29 Dec 2025 14:09:53 -0700
Subject: [PATCH] Show the list of selected domains on toggle/delete
 confirmation (#7682)

* Show the list of selected domains on toggle/delete confirmation

* Update app_languages.php

* Update modal.php

* Update domains.php
---
 core/domains/domains.php    | 36 +++++++++++++++++++++----
 resources/app_languages.php | 54 +++++++++++++++++++++++++++++++++++++
 resources/classes/modal.php | 10 ++++++-
 3 files changed, 94 insertions(+), 6 deletions(-)

diff --git a/core/domains/domains.php b/core/domains/domains.php
index bc0f3053d4..53223e7b98 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -198,6 +198,32 @@
 	$document['title'] = $text['title-domains'];
 	require_once "resources/header.php";
 
+//add the list of selected domains to the toggle/delete confirmation
+ 	if (permission_exists('domain_edit') || permission_exists('domain_delete')) {
+		?>
+		<script>
+		function get_selected_items(action) {
+			const selected_items = [];
+			const modal_message_element = document.querySelector('#modal-' + action + ' .modal-message');
+
+			if (!modal_message_element.hasAttribute('data-original-message')) {
+				modal_message_element.setAttribute('data-original-message', modal_message_element.innerHTML);
+			}
+			const original_message = modal_message_element.getAttribute('data-original-message');
+
+			document.querySelectorAll('input[type="checkbox"]:checked:not(#checkbox_all)').forEach(checkbox => {
+				selected_items.push(checkbox.dataset.itemName);
+			});
+
+			if (selected_items.length > 0) {
+				const item_list = selected_items.map(item => '<li>' + item + '</li>').join('');
+				modal_message_element.innerHTML = original_message + '<ul style="margin-top: 20px;">' + item_list + '</ul>';
+			}
+		}
+		</script>
+		<?php
+	}
+
 //show the content
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-domains']."</b><div class='count'>".number_format($num_rows)."</div></div>\n";
@@ -206,10 +232,10 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','link'=>'domain_edit.php']);
 	}
 	if (permission_exists('domain_edit') && $domains) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$settings->get('theme', 'button_icon_toggle'),'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display: none;','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$settings->get('theme', 'button_icon_toggle'),'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display: none;','onclick'=>"get_selected_items('toggle'); modal_open('modal-toggle','btn_toggle');"]);
 	}
  	if (permission_exists('domain_delete') && $domains) {
- 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete_domain');"]);
+ 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"get_selected_items('delete'); modal_open('modal-delete','btn_delete_domain');"]);
  	}
 	echo 		"<form id='form_search' class='inline' method='get'>\n";
 	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
@@ -224,10 +250,10 @@
 	echo "</div>\n";
 
 	if (permission_exists('domain_edit') && !empty($domains)) {
-		echo modal::create(['id'=>'modal-toggle','type'=>'toggle','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_toggle','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('toggle'); list_form_submit('form_list');"])]);
+		echo modal::create(['id'=>'modal-toggle','type'=>'toggle_items','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_toggle','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('toggle'); list_form_submit('form_list');"])]);
 	}
  	if (permission_exists('domain_delete') && !empty($domains)) {
-		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
+		echo modal::create(['id'=>'modal-delete','type'=>'delete_items','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
  	}
 
 	echo $text['description-domains']."\n";
@@ -267,7 +293,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('domain_edit') || permission_exists('domain_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='domains[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='domains[$x][checked]' id='checkbox_".$x."' value='true' data-item-name='".escape($row['domain_name'])."' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
 				echo "		<input type='hidden' name='domains[$x][uuid]' value='".escape($row['domain_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/resources/app_languages.php b/resources/app_languages.php
index 8e748ba8f6..994e278381 100644
--- a/resources/app_languages.php
+++ b/resources/app_languages.php
@@ -621,6 +621,33 @@ $text['confirm-delete']['ja-jp'] = "本当にこれを削除しますか?";
 $text['confirm-delete']['ko-kr'] = "정말 삭제하시겠습니까?";
 $text['confirm-delete']['ka-ge'] = "ნამდვილად გსურთ წაშლა";
 
+$text['confirm-delete_items']['en-us'] = "Do you really want to DELETE the following items?";
+$text['confirm-delete_items']['en-gb'] = "Do you really want to DELETE the following items?";
+$text['confirm-delete_items']['ar-eg'] = "هل تريد حقًا حذف العناصر التالية؟";
+$text['confirm-delete_items']['de-at'] = "Möchten Sie die folgenden Elemente wirklich LÖSCHEN?";
+$text['confirm-delete_items']['de-ch'] = "Möchten Sie die folgenden Elemente wirklich LÖSCHEN?";
+$text['confirm-delete_items']['de-de'] = "Möchten Sie die folgenden Elemente wirklich LÖSCHEN?";
+$text['confirm-delete_items']['el-gr'] = "Θέλετε πράγματι να ΔΙΑΓΡΑΨΕΤΕ τα ακόλουθα στοιχεία;";
+$text['confirm-delete_items']['es-cl'] = "¿Realmente desea ELIMINAR los siguientes elementos?";
+$text['confirm-delete_items']['es-mx'] = "¿Realmente desea ELIMINAR los siguientes elementos?";
+$text['confirm-delete_items']['fr-ca'] = "Voulez-vous vraiment SUPPRIMER les éléments suivants ?";
+$text['confirm-delete_items']['fr-fr'] = "Voulez-vous vraiment SUPPRIMER les éléments suivants ?";
+$text['confirm-delete_items']['he-il'] = "هل אתה حقًا רוצה למחוק את הפריטים הבאים?";
+$text['confirm-delete_items']['it-it'] = "Vuoi davvero ELIMINARE gli elementi seguenti?";
+$text['confirm-delete_items']['nl-nl'] = "Wilt u de volgende items WERKELIJK VERWIJDEREN?";
+$text['confirm-delete_items']['pl-pl'] = "Czy na pewno chcesz USUNĄĆ następujące elementy?";
+$text['confirm-delete_items']['pt-br'] = "Você realmente quer EXCLUIR os seguintes itens?";
+$text['confirm-delete_items']['pt-pt'] = "Deseja realmente APAGAR os seguintes itens?";
+$text['confirm-delete_items']['ro-ro'] = "Chiar doriți să ȘTERGEȚI următoarele elemente?";
+$text['confirm-delete_items']['ru-ru'] = "Вы действительно хотите УДАЛИТЬ следующие элементы?";
+$text['confirm-delete_items']['sv-se'] = "Vill du verkligen TA BORT följande objekt?";
+$text['confirm-delete_items']['uk-ua'] = "Чи справді ви хочете ВИДАЛИТИ наступні елементи?";
+$text['confirm-delete_items']['tr-tr'] = "Aşağıdaki öğeleri gerçekten SİLMEK istiyor musunuz?";
+$text['confirm-delete_items']['zh-cn'] = "您真的要删除以下项目吗？";
+$text['confirm-delete_items']['ja-jp'] = "次のアイテムを本当に削除しますか?";
+$text['confirm-delete_items']['ko-kr'] = "다음 항목을 정말로 삭제하시겠습니까?";
+$text['confirm-delete_items']['ka-ge'] = "დროსაც გინდათ, შემდეგ ელემენტებს წაშალოთ?";
+
 $text['confirm-copy']['en-us'] = "Do you really want to COPY this?";
 $text['confirm-copy']['en-gb'] = "Do you really want to COPY this?";
 $text['confirm-copy']['ar-eg'] = "هل تريد حقًا نسخ هذا؟";
@@ -675,6 +702,33 @@ $text['confirm-toggle']['ja-jp'] = "あなたは本当にこれをTOGGLEした
 $text['confirm-toggle']['ko-kr'] = "정말 토글하시겠습니까?";
 $text['confirm-toggle']['ka-ge'] = "ნამდვილად გსურთ გადართვა?";
 
+$text['confirm-toggle_items']['en-us'] = "Do you really want to TOGGLE the following items?";
+$text['confirm-toggle_items']['en-gb'] = "Do you really want to TOGGLE the following items?";
+$text['confirm-toggle_items']['ar-eg'] = "هل تريد حقًا تبديل العناصر التالية؟";
+$text['confirm-toggle_items']['de-at'] = "Möchten Sie die folgenden Elemente wirklich UMSCHALTEN?";
+$text['confirm-toggle_items']['de-ch'] = "Möchten Sie die folgenden Elemente wirklich UMSCHALTEN?";
+$text['confirm-toggle_items']['de-de'] = "Möchten Sie die folgenden Elemente wirklich UMSCHALTEN?";
+$text['confirm-toggle_items']['el-gr'] = "Θέλετε πράγματι να ΑΝΑΤΟΛΠΗΣΕΤΕ τα ακόλουθα στοιχεία;";
+$text['confirm-toggle_items']['es-cl'] = "¿Realmente desea CAMBIAR el estado de los siguientes elementos?";
+$text['confirm-toggle_items']['es-mx'] = "¿Realmente desea CAMBIAR el estado de los siguientes elementos?";
+$text['confirm-toggle_items']['fr-ca'] = "Voulez-vous vraiment BASCULER les éléments suivants ?";
+$text['confirm-toggle_items']['fr-fr'] = "Voulez-vous vraiment BASCULER les éléments suivants ?";
+$text['confirm-toggle_items']['he-il'] = "هل אתה حقًا רוצה להחליף את מצב הפריטים הבאים?";
+$text['confirm-toggle_items']['it-it'] = "Vuoi davvero CAMBIARE lo stato degli elementi seguenti?";
+$text['confirm-toggle_items']['nl-nl'] = "Wilt u de status van de volgende items WERKELIJK OMKEREN?";
+$text['confirm-toggle_items']['pl-pl'] = "Czy na pewno chcesz PRZEKŁĄDNIĆ następujące elementy?";
+$text['confirm-toggle_items']['pt-br'] = "Você realmente quer ALTERAR o estado dos seguintes itens?";
+$text['confirm-toggle_items']['pt-pt'] = "Deseja realmente MUDAR o estado dos seguintes itens?";
+$text['confirm-toggle_items']['ro-ro'] = "Chiar doriți să COMUTAȚI starea următoarelor elemente?";
+$text['confirm-toggle_items']['ru-ru'] = "Вы действительно хотите ПЕРЕКЛЮЧИТЬ состояние следующих элементов?";
+$text['confirm-toggle_items']['sv-se'] = "Vill du verkligen VÄND OM statusen för följande objekt?";
+$text['confirm-toggle_items']['uk-ua'] = "Чи справді ви хочете ПЕРЕКЛЮЧИТИ стан наступних елементів?";
+$text['confirm-toggle_items']['tr-tr'] = "Aşağıdaki öğelerin durumunu gerçekten DEĞİŞTİRMEK istiyor musunuz?";
+$text['confirm-toggle_items']['zh-cn'] = "您真的要切换以下项目的状态吗？";
+$text['confirm-toggle_items']['ja-jp'] = "次のアイテムの状態を本当に切り替えますか?";
+$text['confirm-toggle_items']['ko-kr'] = "다음 항목의 상태를 정말로 전환하시겠습니까?";
+$text['confirm-toggle_items']['ka-ge'] = "დროსაც გინდათ, შემდეგ ელემენტების სტატუსს შეცვალოთ?";
+
 $text['confirm-unassign']['en-us'] = "Do you really want to UNASSIGN this?";
 $text['confirm-unassign']['en-gb'] = "Do you really want to UNASSIGN this?";
 $text['confirm-unassign']['ar-eg'] = "هل تريد حقا أن تفصل هذا؟";
diff --git a/resources/classes/modal.php b/resources/classes/modal.php
index 78a29a2719..c433352322 100644
--- a/resources/classes/modal.php
+++ b/resources/classes/modal.php
@@ -18,7 +18,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Copyright (C) 2010 - 2020
+	Copyright (C) 2010-2025
 	All Rights Reserved.
 
 	Contributor(s):
@@ -68,10 +68,18 @@ class modal {
 					$array['title'] = $text['modal_title-confirmation'];
 					$array['message'] = $text['confirm-toggle'];
 					break;
+				case 'toggle_items':
+					$array['title'] = $text['modal_title-confirmation'];
+					$array['message'] = $text['confirm-toggle_items'];
+					break;
 				case 'delete':
 					$array['title'] = $text['modal_title-confirmation'];
 					$array['message'] = $text['confirm-delete'];
 					break;
+				case 'delete_items':
+					$array['title'] = $text['modal_title-confirmation'];
+					$array['message'] = $text['confirm-delete_items'];
+					break;
 				case 'unassign':
 					$array['title'] = $text['modal_title-confirmation'];
 					$array['message'] = $text['confirm-unassign'];