X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=d80827c93f9e60c61467d284267c1d57ea4630b2;hb=40259c7f04e70e9c6488e7d17f01cb2033cb73e1;hp=1bd57d8561bce8533352dbb942eac87d0405e161;hpb=bbda69a736de66d689f449604e8643f7e755865f;p=friendica.git

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 1bd57d8561..d80827c93f 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -685,7 +685,7 @@ class Contact
 	 */
 	public static function updateSelfFromUserID($uid, $update_avatar = false)
 	{
-		$fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
+		$fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey', 'manually-approve',
 			'xmpp', 'matrix', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
 			'photo', 'thumb', 'micro', 'header', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network'];
 		$self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
@@ -757,6 +757,7 @@ class Contact
 		$fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
 		$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
 		$fields['unsearchable'] = !$profile['net-publish'];
+		$fields['manually-approve'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
 
 		$update = false;
 
@@ -1457,34 +1458,11 @@ class Contact
 	 *
 	 * The function can be called with either the user or the contact array
 	 *
-	 * @param array $contact contact or user array
+	 * @param int $type type of contact or account
 	 * @return string
 	 */
-	public static function getAccountType(array $contact)
-	{
-		// There are several fields that indicate that the contact or user is a forum
-		// "page-flags" is a field in the user table,
-		// "forum" and "prv" are used in the contact table. They stand for User::PAGE_FLAGS_COMMUNITY and User::PAGE_FLAGS_PRVGROUP.
-		if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_COMMUNITY))
-			|| (isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_PRVGROUP))
-			|| (isset($contact['forum']) && intval($contact['forum']))
-			|| (isset($contact['prv']) && intval($contact['prv']))
-			|| (isset($contact['community']) && intval($contact['community']))
-		) {
-			$type = self::TYPE_COMMUNITY;
-		} else {
-			$type = self::TYPE_PERSON;
-		}
-
-		// The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
-		if (isset($contact["contact-type"])) {
-			$type = $contact["contact-type"];
-		}
-
-		if (isset($contact["account-type"])) {
-			$type = $contact["account-type"];
-		}
-
+	public static function getAccountType(int $type)
+	{
 		switch ($type) {
 			case self::TYPE_ORGANISATION:
 				$account_type = DI::l10n()->t("Organisation");
@@ -1668,8 +1646,8 @@ class Contact
 	 */
 	public static function getDefaultHeader(array $contact): string
 	{
-		if (!empty($contact['header']) || in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::TWITTER])) {
-			return DI::baseUrl() . '/images/blank.png';
+		if (!empty($contact['header'])) {
+			return $contact['header'];
 		}
 
 		if (!empty($contact['gsid'])) {
@@ -1702,7 +1680,7 @@ class Contact
 				break;
 			default:
 				/**
-				 * Use random pictures for networks that don't provide banners.
+				 * Use a random picture. 
 				 * The service provides random pictures from Unsplash.
 				 * @license https://unsplash.com/license
 				 */
@@ -1913,7 +1891,14 @@ class Contact
 			$avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
 		}
 
-		if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || DI::config()->get('system', 'cache_contact_avatar')) {
+		$cache_avatar = DI::config()->get('system', 'cache_contact_avatar');
+
+		// Local contact avatars don't need to be cached
+		if ($cache_avatar && Network::isLocalLink($contact['url'])) {
+			$cache_avatar = !DBA::exists('contact', ['nurl' => $contact['nurl'], 'self' => true]);
+		}
+
+		if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || $cache_avatar) {
 			if ($default_avatar && Proxy::isLocalImage($avatar)) {
 				$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
 					'photo' => $avatar,
@@ -2159,7 +2144,7 @@ class Contact
 		// These fields aren't updated by this routine:
 		// 'sensitive'
 
-		$fields = ['uid', 'uri-id', 'gsid', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
+		$fields = ['uid', 'uri-id', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
 			'manually-approve', 'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco',
 			'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item', 'xmpp', 'matrix'];
 		$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
@@ -2191,9 +2176,6 @@ class Contact
 		$uriid = $contact['uri-id'];
 		unset($contact['uri-id']);
 
-		$gsid = $contact['gsid'];
-		unset($contact['gsid']);
-
 		$pubkey = $contact['pubkey'];
 		unset($contact['pubkey']);
 
@@ -2943,7 +2925,7 @@ class Contact
 	 */
 	public static function isForum($contactid)
 	{
-		$fields = ['forum', 'prv'];
+		$fields = ['contact-type'];
 		$condition = ['id' => $contactid];
 		$contact = DBA::selectFirst('contact', $fields, $condition);
 		if (!DBA::isResult($contact)) {
@@ -2951,7 +2933,7 @@ class Contact
 		}
 
 		// Is it a forum?
-		return ($contact['forum'] || $contact['prv']);
+		return ($contact['contact-type'] == self::TYPE_COMMUNITY);
 	}
 
 	/**