X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FRemoveContact.php;h=a84cb0d53760701f9eb9a825b5a24c22fbf3255d;hb=bf8fb215a9cc554b5ec5b774168a52fb56fa43e6;hp=ba464f75f3a8cbc4807ce7254842a5170cecf2f5;hpb=2ec3a97393959e42d450e074271d2d622d25701f;p=friendica.git

diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
index ba464f75f3..a84cb0d537 100644
--- a/src/Worker/RemoveContact.php
+++ b/src/Worker/RemoveContact.php
@@ -21,32 +21,42 @@
 
 namespace Friendica\Worker;
 
+use Friendica\Core\Logger;
 use Friendica\Database\DBA;
-use Friendica\Core\Protocol;
 use Friendica\Model\Item;
+use Friendica\Model\Photo;
 
 /**
  * Removes orphaned data from deleted contacts
  */
 class RemoveContact {
 	public static function execute($id) {
-
 		// Only delete if the contact is to be deleted
-		$contact = DBA::selectFirst('contact', ['uid'], ['deleted' => true]);
+		$contact = DBA::selectFirst('contact', ['uid'], ['deleted' => true, 'id' => $id]);
 		if (!DBA::isResult($contact)) {
 			return;
 		}
 
+		Logger::info('Start deleting contact', ['id' => $id]);
 		// Now we delete the contact and all depending tables
-		$condition = ['uid' => $contact['uid'], 'contact-id' => $id];
+		if ($contact['uid'] == 0) {
+			DBA::delete('post-tag', ['cid' => $id]);
+			$condition = ["`author-id` = ? OR `owner-id` = ? OR `causer-id` = ? OR `contact-id` = ?",
+				$id, $id, $id, $id];
+		} else {
+			$condition = ['uid' => $contact['uid'], 'contact-id' => $id];
+		}
 		do {
-			$items = Item::select(['id'], $condition, ['limit' => 100]);
+			$items = Item::select(['id', 'guid'], $condition, ['limit' => 100]);
 			while ($item = Item::fetch($items)) {
+				Logger::info('Delete removed contact item', ['id' => $item['id'], 'guid' => $item['guid']]);
 				DBA::delete('item', ['id' => $item['id']]);
 			}
 			DBA::close($items);
 		} while (Item::exists($condition));
 
-		DBA::delete('contact', ['id' => $id]);
+		Photo::delete(['contact-id' => $id]);
+		$ret = DBA::delete('contact', ['id' => $id]);
+		Logger::info('Deleted contact', ['id' => $id, 'result' => $ret]);
 	}
 }