Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions admin_users.php
Original file line number Diff line number Diff line change
Expand Up @@ -717,8 +717,14 @@ 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++;
$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>
Expand All @@ -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
Expand Down Expand Up @@ -811,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; ?>
Expand Down