From 05b30156400922eb242ecb7cebe61d67856da40e Mon Sep 17 00:00:00 2001
From: Falko Trojahn <falko@trojahn.de>
Date: Tue, 9 Dec 2025 09:11:11 +0100
Subject: [PATCH 1/3] show only undeliverable list

---
 admin_users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin_users.php b/admin_users.php
index 95809e5cc6..418c3267d2 100644
--- a/admin_users.php
+++ b/admin_users.php
@@ -717,7 +717,7 @@ function regex_quote(str) {
 		} else {
 			$datelogin = (int) $user->getPreference('sessiontime');
 		}
-		if (mktime(0, 0, 0, (int) date('m') - $month, (int) date('d'), (int) date('Y')) > $datelogin && $user->getPreference('verified') && $user->getPreference('verified_by_admin')) {
+		if (mktime(0, 0, 0, (int) date('m') - $month, (int) date('d'), (int) date('Y')) > $datelogin && $user->getPreference('verified') && $user->getPreference('verified_by_admin') && $user->getPreference('undeliverable')) {
 			$ucnt++;
 			?>
 			<tr>

From 78f8f176262137d841d1ce8ac50fc272913e911a Mon Sep 17 00:00:00 2001
From: Falko Trojahn <falko@trojahn.de>
Date: Tue, 9 Dec 2025 09:33:38 +0100
Subject: [PATCH 2/3] select checkbox only if isKeinVerwalter

---
 admin_users.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/admin_users.php b/admin_users.php
index 418c3267d2..fbd9820eed 100644
--- a/admin_users.php
+++ b/admin_users.php
@@ -719,6 +719,12 @@ function regex_quote(str) {
 		}
 		if (mktime(0, 0, 0, (int) date('m') - $month, (int) date('d'), (int) date('Y')) > $datelogin && $user->getPreference('verified') && $user->getPreference('verified_by_admin') && $user->getPreference('undeliverable')) {
 			$ucnt++;
+			$istKeinVerwalter=false;
+			$gedcoms = Database::prepare("SELECT gedcom_id, setting_value FROM `##user_gedcom_setting` WHERE user_id = ? AND setting_name = 'canedit' AND setting_value IN ('admin','accept','edit')")->execute(array($user->getUserId()))->fetchAll();
+			if (sizeof($gedcoms) == 0) {
+				  $istKeinVerwalter = true;
+			} 
+
 			?>
 			<tr>
 				<td>
@@ -737,9 +743,10 @@ function regex_quote(str) {
                 </td>
                 <td>
 					<?php echo I18N::translate('User’s account has been inactive too long: ') . FunctionsDate::timestampToGedcomDate($datelogin)->display(); ?>
+					<?php if (!$istKeinVerwalter) { echo '<br>Nicht gesetzt weil: <strong>IST AL-Verwalter.</strong>'; } ?>
 				</td>
 				<td>
-					<input type="checkbox" checked name="del_<?php echo $user->getUserId(); ?>" value="1">
+					<input type="checkbox" <?php if ($user->getPreference('undeliverable') && $istKeinVerwalter ) { echo 'checked'; } ?> name="del_<?php echo $user->getUserId(); ?>" value="1">
 				</td>
 			</tr>
 		<?php

From e7f601b15403c618f01a5c3961fa3d1f793796ce Mon Sep 17 00:00:00 2001
From: Falko Trojahn <falko@trojahn.de>
Date: Tue, 9 Dec 2025 23:36:40 +0100
Subject: [PATCH 3/3] show number of users to delete

---
 admin_users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin_users.php b/admin_users.php
index fbd9820eed..a471238caf 100644
--- a/admin_users.php
+++ b/admin_users.php
@@ -818,7 +818,7 @@ function regex_quote(str) {
 		</table>
 		<p>
 		<?php if ($ucnt): ?>
-			<input type="submit" value="<?php echo I18N::translate('delete'); ?>">
+			<input type="submit" value="<?php echo "$ucnt "; echo I18N::translate('delete'); ?>">
 			<?php else: ?>
 			<?php echo I18N::translate('Nothing found to cleanup'); ?>
 			<?php endif; ?>