From 14b4fac8183b645409439fc3942b61ae599a1bed Mon Sep 17 00:00:00 2001 From: AndyHee Date: Sat, 1 Dec 2018 13:21:54 +0700 Subject: [PATCH 1/2] Fixing permanent deletion counter --- mod/admin.php | 2 +- src/Worker/CronJobs.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index cedd6748ec..6cd24e9b4b 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1977,7 +1977,7 @@ function admin_page_users(App $a) '$h_users' => L10n::t('Users'), '$h_newuser' => L10n::t('New User'), - '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Delete in')], + '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Permanet deletion')], '$th_users' => $th_users, '$order_users' => $order, '$order_direction_users' => $order_direction, diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php index 0c565daa73..164b1cf4d2 100644 --- a/src/Worker/CronJobs.php +++ b/src/Worker/CronJobs.php @@ -119,7 +119,7 @@ class CronJobs } // delete user records for recently removed accounts - $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"]); + $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() "]); while ($user = DBA::fetch($users)) { // Delete the contacts of this user $self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]); From 4e20c0e50a03097317961ffea46adfd5269b59e8 Mon Sep 17 00:00:00 2001 From: AndyHee Date: Sat, 1 Dec 2018 13:25:58 +0700 Subject: [PATCH 2/2] Typo --- mod/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index 6cd24e9b4b..8b90161a46 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1977,7 +1977,7 @@ function admin_page_users(App $a) '$h_users' => L10n::t('Users'), '$h_newuser' => L10n::t('New User'), - '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Permanet deletion')], + '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Permanent deletion')], '$th_users' => $th_users, '$order_users' => $order, '$order_direction_users' => $order_direction,