X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact%2FUser.php;h=05530cccc5a7cdf503bf1c1fbcf1a9551c6cd76f;hb=3153e098b0e83910a550773f5661d4e8541b14b7;hp=85399951c87e878e2c65b19e0421ec0780354e68;hpb=3eea4b11304278f1b6eb1292102d2c9ab7fcb311;p=friendica.git

diff --git a/src/Model/Contact/User.php b/src/Model/Contact/User.php
index 85399951c8..05530cccc5 100644
--- a/src/Model/Contact/User.php
+++ b/src/Model/Contact/User.php
@@ -23,6 +23,7 @@ namespace Friendica\Model\Contact;
 
 use Exception;
 use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -66,17 +67,7 @@ class User
 			return false;
 		}
 
-		$fields = $contact;
-
-		if (isset($fields['readonly'])) {
-			$fields['ignored'] = $fields['readonly'];
-		}
-
-		if (!empty($fields['self'])) {
-			$fields['rel'] = Contact::SELF;
-		}
-
-		$fields = DBStructure::getFieldsForTable('user-contact', $fields);
+		$fields = self::preparedFields($contact);
 		$fields['cid'] = $pcid;
 		$fields['uid'] = $contact['uid'];
 		$fields['uri-id'] = $contact['uri-id'];
@@ -101,19 +92,7 @@ class User
 	{
 		DBA::transaction();
 
-		unset($fields['uid']);
-		unset($fields['cid']);
-		unset($fields['uri-id']);
-
-		if (isset($fields['readonly'])) {
-			$fields['ignored'] = $fields['readonly'];
-		}
-
-		if (!empty($fields['self'])) {
-			$fields['rel'] = Contact::SELF;
-		}
-
-		$update_fields = DBStructure::getFieldsForTable('user-contact', $fields);
+		$update_fields = self::preparedFields($fields);
 		if (!empty($update_fields)) {
 			$contacts = DBA::select('contact', ['uri-id', 'uid'], $condition);
 			while ($row = DBA::fetch($contacts)) {
@@ -129,6 +108,29 @@ class User
 		DBA::commit();	
 	}
 
+	/**
+	 * Prepare field data for update/insert
+	 *
+	 * @param array $fields
+	 * @return array prepared fields
+	 */
+	private static function preparedFields(array $fields): array
+	{
+		unset($fields['uid']);
+		unset($fields['cid']);
+		unset($fields['uri-id']);
+
+		if (isset($fields['readonly'])) {
+			$fields['ignored'] = $fields['readonly'];
+		}
+
+		if (!empty($fields['self'])) {
+			$fields['rel'] = Contact::SELF;
+		}
+
+		return DBStructure::getFieldsForTable('user-contact', $fields);
+	}
+
 	/**
 	 * Block contact id for user id
 	 *
@@ -144,6 +146,13 @@ class User
 			return;
 		}
 
+		$contact = Contact::getById($cdata['public']);
+		if ($blocked) {
+			Protocol::block($contact, $uid);
+		} else {
+			Protocol::unblock($contact, $uid);
+		}
+
 		if ($cdata['user'] != 0) {
 			DBA::update('contact', ['blocked' => $blocked], ['id' => $cdata['user'], 'pending' => false]);
 		}