Issue 10050: Avoid creating new contacts for expired users

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 8b28575edb9fc6439a75bc6dae5b28817e1b68ac..b0b5fcc91b0dd37bedfb3de5b4efe83d0906434a 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -571,7 +571,8 @@ class Contact
                        return true;
                }
 
-               $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'pubkey', 'prvkey'], ['uid' => $uid]);
+               $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'pubkey', 'prvkey'],
+                       ['uid' => $uid, 'account_expired' => false]);
                if (!DBA::isResult($user)) {
                        return false;
                }
@@ -624,7 +625,7 @@ class Contact
                }
 
                $fields = ['nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
-               $user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
+               $user = DBA::selectFirst('user', $fields, ['uid' => $uid, 'account_expired' => false]);
                if (!DBA::isResult($user)) {
                        return;
                }

diff --git a/src/Model/User.php b/src/Model/User.php
index 7204fd0ac8675600abf8d42293882074eade241d..278b541fa897222f24fd45165aa92aae15a2e93e 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -399,7 +399,7 @@ class User
                        return false;
                }
 
-               if (!$repairMissing) {
+               if (!$repairMissing || $owner['account_expired']) {
                        return $owner;
                }
 
@@ -1367,6 +1367,9 @@ class User
                // unique), so it cannot be re-registered in the future.
                DBA::insert('userd', ['username' => $user['nickname']]);
 
+               // Remove all personal settings, especially connector settings
+               DBA::delete('pconfig', ['uid' => $uid]);
+
                // The user and related data will be deleted in Friendica\Worker\ExpireAndRemoveUsers
                DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc('now + 7 day')], ['uid' => $uid]);
                Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::REMOVAL, $uid);