From: Michael <heluecht@pirati.ca>
Date: Sun, 12 Aug 2018 17:15:47 +0000 (+0000)
Subject: Remove contacts in the background
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=29aa90ec097ee42ff0b2265eb763731b99088cb3;p=friendica.git

Remove contacts in the background
---

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 39a0ba718a..b18159d40c 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -314,15 +314,10 @@ class Contact extends BaseObject
 			return;
 		}
 
-		$archive = PConfig::get($contact['uid'], 'system', 'archive_removed_contacts');
-		if ($archive) {
-			DBA::update('contact', ['archive' => true, 'network' => 'none', 'writable' => false], ['id' => $id]);
-			return;
-		}
-
-		DBA::delete('contact', ['id' => $id]);
+		// Archive the contact
+		DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM], ['id' => $id]);
 
-		// Delete the rest in the background
+		// Delete it in the background
 		Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
 	}
 
diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
index 40ac937f10..01388516bc 100644
--- a/src/Worker/RemoveContact.php
+++ b/src/Worker/RemoveContact.php
@@ -12,13 +12,14 @@ require_once 'include/dba.php';
 class RemoveContact {
 	public static function execute($id) {
 
-		// Only delete if the contact doesn't exist (anymore)
-		$r = DBA::exists('contact', ['id' => $id]);
-		if ($r) {
+		// Only delete if the contact is archived
+		$condition = ['archive' => true, 'network' => Protocol::PHANTOM, 'id' => $id];
+		$r = DBA::exists('contact', $condition);
+		if (!DBA::isResult($r)) {
 			return;
 		}
 
-		// Now we delete all the depending table entries
+		// Now we delete the contact and all depending tables
 		DBA::delete('contact', ['id' => $id]);
 	}
 }