X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=cf6080c572d440fde1c26b2beb3de7d48ac28ed7;hb=604262a70e4d56e91db3a43049f2c0196cf9fdee;hp=7c807b921e22cad9ff923fed1def135bd8b9918a;hpb=69a73678ebc18ad27b27f1bf92bc9433b7e7066f;p=friendica.git

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 7c807b921e..cf6080c572 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -14,8 +14,8 @@ use Friendica\App;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -37,12 +37,6 @@ use Friendica\Util\XML;
 use HTMLPurifier;
 use HTMLPurifier_Config;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once "include/enotify.php";
-require_once "include/items.php";
-require_once "include/text.php";
-
 /**
  * @brief This class contain functions to create and send DFRN XML files
  */
@@ -62,6 +56,7 @@ class DFRN
 	 * @param integer $uid User id
 	 *
 	 * @return array importer
+	 * @throws \Exception
 	 */
 	public static function getImporter($cid, $uid = 0)
 	{
@@ -102,7 +97,9 @@ class DFRN
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN entries
-	 * @todo Find proper type-hints
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @todo  Find proper type-hints
 	 */
 	public static function entries($items, $owner)
 	{
@@ -140,10 +137,12 @@ class DFRN
 	 * @param boolean $onlyheader  Output only the header without content? (Default is "no")
 	 *
 	 * @return string DFRN feed entries
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false)
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		$sitefeed    = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
 		$public_feed = (($dfrn_id) ? false : true);
@@ -177,29 +176,24 @@ class DFRN
 
 		if (! DBA::isResult($r)) {
 			Logger::log(sprintf('No contact found for nickname=%d', $owner_nick), Logger::WARNING);
-			killme();
+			exit();
 		}
 
 		$owner = $r[0];
 		$owner_id = $owner['uid'];
-		$owner_nick = $owner['nickname'];
 
 		$sql_post_table = "";
 
 		if (! $public_feed) {
-			$sql_extra = '';
 			switch ($direction) {
 				case (-1):
 					$sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id));
-					$my_id = $dfrn_id;
 					break;
 				case 0:
 					$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
-					$my_id = '1:' . $dfrn_id;
 					break;
 				case 1:
 					$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
-					$my_id = '0:' . $dfrn_id;
 					break;
 				default:
 					return false;
@@ -213,7 +207,7 @@ class DFRN
 
 			if (! DBA::isResult($r)) {
 				Logger::log(sprintf('No contact found for uid=%d', $owner_id), Logger::WARNING);
-				killme();
+				exit();
 			}
 
 			$contact = $r[0];
@@ -245,7 +239,6 @@ class DFRN
 				intval(TERM_CATEGORY),
 				intval($owner_id)
 			);
-			//$sql_extra .= FileTag::fileQuery('item',$category,'category');
 		}
 
 		if ($public_feed && ! $converse) {
@@ -301,12 +294,12 @@ class DFRN
 		$root = self::addHeader($doc, $owner, $author, $alternatelink, true);
 
 		/// @TODO This hook can't work anymore
-		//	Addon::callHooks('atom_feed', $atom);
+		//	\Friendica\Core\Hook::callAll('atom_feed', $atom);
 
 		if (!DBA::isResult($items) || $onlyheader) {
 			$atom = trim($doc->saveXML());
 
-			Addon::callHooks('atom_feed_end', $atom);
+			Hook::callAll('atom_feed_end', $atom);
 
 			return $atom;
 		}
@@ -335,7 +328,7 @@ class DFRN
 
 		$atom = trim($doc->saveXML());
 
-		Addon::callHooks('atom_feed_end', $atom);
+		Hook::callAll('atom_feed_end', $atom);
 
 		return $atom;
 	}
@@ -347,6 +340,8 @@ class DFRN
 	 * @param boolean $conversation Show the conversation. If false show the single post.
 	 *
 	 * @return string DFRN feed entry
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function itemFeed($item_id, $conversation = false)
 	{
@@ -359,7 +354,7 @@ class DFRN
 		$ret = Item::select(Item::DELIVER_FIELDLIST, $condition);
 		$items = Item::inArray($ret);
 		if (!DBA::isResult($items)) {
-			killme();
+			exit();
 		}
 
 		$item = $items[0];
@@ -367,7 +362,7 @@ class DFRN
 		if ($item['uid'] != 0) {
 			$owner = User::getOwnerDataById($item['uid']);
 			if (!$owner) {
-				killme();
+				exit();
 			}
 		} else {
 			$owner = ['uid' => 0, 'nick' => 'feed-item'];
@@ -412,7 +407,8 @@ class DFRN
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN mail
-	 * @todo Find proper type-hints
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  Find proper type-hints
 	 */
 	public static function mail($item, $owner)
 	{
@@ -448,7 +444,8 @@ class DFRN
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN suggestions
-	 * @todo Find proper type-hints
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  Find proper type-hints
 	 */
 	public static function fsuggest($item, $owner)
 	{
@@ -477,7 +474,8 @@ class DFRN
 	 * @param int   $uid   User ID
 	 *
 	 * @return string DFRN relocations
-	 * @todo Find proper type-hints
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  Find proper type-hints
 	 */
 	public static function relocate($owner, $uid)
 	{
@@ -538,7 +536,8 @@ class DFRN
 	 * @param bool   $public        Is it a header for public posts?
 	 *
 	 * @return object XML root object
-	 * @todo Find proper type-hints
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  Find proper type-hints
 	 */
 	private static function addHeader($doc, $owner, $authorelement, $alternatelink = "", $public = false)
 	{
@@ -588,14 +587,14 @@ class DFRN
 		}
 
 		// For backward compatibility we keep this element
-		if ($owner['page-flags'] == Contact::PAGE_COMMUNITY) {
+		if ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY) {
 			XML::addElement($doc, $root, "dfrn:community", 1);
 		}
 
 		// The former element is replaced by this one
 		XML::addElement($doc, $root, "dfrn:account_type", $owner["account-type"]);
 
-		/// @todo We need a way to transmit the different page flags like "Contact::PAGE_PRVGROUP"
+		/// @todo We need a way to transmit the different page flags like "User::PAGE_FLAGS_PRVGROUP"
 
 		XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
 
@@ -614,7 +613,8 @@ class DFRN
 	 * @param boolean $public        boolean
 	 *
 	 * @return object XML author object
-	 * @todo Find proper type-hints
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  Find proper type-hints
 	 */
 	private static function addAuthor($doc, $owner, $authorelement, $public)
 	{
@@ -758,7 +758,8 @@ class DFRN
 	 * @param array  $item        Item elements
 	 *
 	 * @return object XML author object
-	 * @todo Find proper type-hints
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  Find proper type-hints
 	 */
 	private static function addEntryAuthor($doc, $element, $contact_url, $item)
 	{
@@ -799,7 +800,8 @@ class DFRN
 	 * @param string $activity activity value
 	 *
 	 * @return object XML activity object
-	 * @todo Find proper type-hints
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  Find proper type-hints
 	 */
 	private static function createActivity($doc, $element, $activity)
 	{
@@ -864,8 +866,8 @@ class DFRN
 	 * @param object $root XML root
 	 * @param array  $item Item element
 	 *
-	 * @return object XML attachment object
-	 * @todo Find proper type-hints
+	 * @return void XML attachment object
+	 * @todo  Find proper type-hints
 	 */
 	private static function getAttachment($doc, $root, $item)
 	{
@@ -905,7 +907,9 @@ class DFRN
 	 * @param bool   $single  If set, the entry is created as an XML document with a single "entry" element
 	 *
 	 * @return object XML entry object
-	 * @todo Find proper type-hints
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @todo  Find proper type-hints
 	 */
 	private static function entry($doc, $type, array $item, array $owner, $comment = false, $cid = 0, $single = false)
 	{
@@ -1161,13 +1165,14 @@ class DFRN
 	 * @param string $atom     Content that will be transmitted
 	 * @param bool   $dissolve (to be documented)
 	 *
+	 * @param bool   $legacy_transport
 	 * @return int Deliver status. Negative values mean an error.
-	 * @todo Add array type-hint for $owner, $contact
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @todo  Add array type-hint for $owner, $contact
 	 */
 	public static function deliver($owner, $contact, $atom, $dissolve = false, $legacy_transport = false)
 	{
-		$a = get_app();
-
 		// At first try the Diaspora transport layer
 		if (!$dissolve && !$legacy_transport) {
 			$curlResult = self::transmit($owner, $contact, $atom);
@@ -1192,7 +1197,6 @@ class DFRN
 		Logger::log("Local rino version: ". $rino, Logger::DEBUG);
 
 		$ssl_val = intval(Config::get('system', 'ssl_policy'));
-		$ssl_policy = '';
 
 		switch ($ssl_val) {
 			case SSL_POLICY_FULL:
@@ -1260,11 +1264,11 @@ class DFRN
 		$perm         = (($res->perm) ? $res->perm : null);
 		$dfrn_version = (float) (($res->dfrn_version) ? $res->dfrn_version : 2.0);
 		$rino_remote_version = intval($res->rino);
-		$page         = (($owner['page-flags'] == Contact::PAGE_COMMUNITY) ? 1 : 0);
+		$page         = (($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? 1 : 0);
 
 		Logger::log("Remote rino version: ".$rino_remote_version." for ".$contact["url"], Logger::DEBUG);
 
-		if ($owner['page-flags'] == Contact::PAGE_PRVGROUP) {
+		if ($owner['page-flags'] == User::PAGE_FLAGS_PRVGROUP) {
 			$page = 2;
 		}
 
@@ -1281,7 +1285,7 @@ class DFRN
 		}
 
 		if (($contact['duplex'] && strlen($contact['pubkey']))
-			|| ($owner['page-flags'] == Contact::PAGE_COMMUNITY && strlen($contact['pubkey']))
+			|| ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY && strlen($contact['pubkey']))
 			|| ($contact['rel'] == Contact::SHARING && strlen($contact['pubkey']))
 		) {
 			openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
@@ -1310,7 +1314,7 @@ class DFRN
 			$postvars['dissolve'] = '1';
 		}
 
-		if ((($contact['rel']) && ($contact['rel'] != Contact::SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == Contact::PAGE_COMMUNITY)) {
+		if ((($contact['rel']) && ($contact['rel'] != Contact::SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) {
 			$postvars['data'] = $atom;
 			$postvars['perm'] = 'rw';
 		} else {
@@ -1345,7 +1349,7 @@ class DFRN
 
 			if ($dfrn_version >= 2.1) {
 				if (($contact['duplex'] && strlen($contact['pubkey']))
-					|| ($owner['page-flags'] == Contact::PAGE_COMMUNITY && strlen($contact['pubkey']))
+					|| ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY && strlen($contact['pubkey']))
 					|| ($contact['rel'] == Contact::SHARING && strlen($contact['pubkey']))
 				) {
 					openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']);
@@ -1353,7 +1357,7 @@ class DFRN
 					openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
 				}
 			} else {
-				if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == Contact::PAGE_COMMUNITY)) {
+				if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) {
 					openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
 				} else {
 					openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']);
@@ -1418,16 +1422,17 @@ class DFRN
 	/**
 	 * @brief Transmits atom content to the contacts via the Diaspora transport layer
 	 *
-	 * @param array  $owner    Owner record
-	 * @param array  $contact  Contact record of the receiver
-	 * @param string $atom     Content that will be transmitted
+	 * @param array  $owner   Owner record
+	 * @param array  $contact Contact record of the receiver
+	 * @param string $atom    Content that will be transmitted
 	 *
+	 * @param bool   $public_batch
 	 * @return int Deliver status. Negative values mean an error.
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function transmit($owner, $contact, $atom, $public_batch = false)
 	{
-		$a = get_app();
-
 		if (!$public_batch) {
 			if (empty($contact['addr'])) {
 				Logger::log('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.');
@@ -1520,7 +1525,9 @@ class DFRN
 	 * @param string $xml       optional, default empty
 	 *
 	 * @return array Relevant data of the author
-	 * @todo Find good type-hints for all parameter
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @todo  Find good type-hints for all parameter
 	 */
 	private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "")
 	{
@@ -1690,7 +1697,6 @@ class DFRN
 
 				if (strtotime($value) < time()) {
 					$value = str_replace($bdyear, $bdyear + 1, $value);
-					$bdyear = $bdyear + 1;
 				}
 
 				$poco["bd"] = $value;
@@ -1841,7 +1847,8 @@ class DFRN
 	 * @param object $mail     mail elements
 	 * @param array  $importer Record of the importer user mixed with contact of the content
 	 * @return void
-	 * @todo Find good type-hints for all parameter
+	 * @throws \Exception
+	 * @todo  Find good type-hints for all parameter
 	 */
 	private static function processMail($xpath, $mail, $importer)
 	{
@@ -1876,6 +1883,7 @@ class DFRN
 			"to_email" => $importer["email"],
 			"uid" => $importer["importer_uid"],
 			"item" => $msg,
+			"parent" => $msg["parent-uri"],
 			"source_name" => $msg["from-name"],
 			"source_link" => $importer["url"],
 			"source_photo" => $importer["thumb"],
@@ -1895,12 +1903,11 @@ class DFRN
 	 * @param object $suggestion suggestion elements
 	 * @param array  $importer   Record of the importer user mixed with contact of the content
 	 * @return boolean
-	 * @todo Find good type-hints for all parameter
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  Find good type-hints for all parameter
 	 */
 	private static function processSuggestion($xpath, $suggestion, $importer)
 	{
-		$a = get_app();
-
 		Logger::log("Processing suggestions");
 
 		/// @TODO Rewrite this to one statement
@@ -1956,6 +1963,7 @@ class DFRN
 				DBA::escape($suggest["photo"]),
 				DBA::escape($suggest["request"])
 			);
+			$fid = $r[0]["id"];
 		}
 
 		$condition = ['url' => $suggest["url"], 'name' => $suggest["name"], 'request' => $suggest["request"]];
@@ -1967,14 +1975,12 @@ class DFRN
 		 */
 		if (!DBA::isResult($fcontact)) {
 			// Database record did not get created. Quietly give up.
-			killme();
+			exit();
 		}
 
-		$fid = $r[0]["id"];
-
 		$hash = Strings::getRandomHex();
 
-		$r = q(
+		q(
 			"INSERT INTO `intro` (`uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked`)
 			VALUES(%d, %d, %d, '%s', '%s', '%s', %d)",
 			intval($suggest["uid"]),
@@ -2013,7 +2019,9 @@ class DFRN
 	 * @param object $relocation relocation elements
 	 * @param array  $importer   Record of the importer user mixed with contact of the content
 	 * @return boolean
-	 * @todo Find good type-hints for all parameter
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @todo  Find good type-hints for all parameter
 	 */
 	private static function processRelocation($xpath, $relocation, $importer)
 	{
@@ -2097,7 +2105,8 @@ class DFRN
 	 * @param array $importer  Record of the importer user mixed with contact of the content
 	 * @param int   $entrytype Is it a toplevel entry, a comment or a relayed comment?
 	 * @return mixed
-	 * @todo set proper type-hints (array?)
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  set proper type-hints (array?)
 	 */
 	private static function updateContent($current, $item, $importer, $entrytype)
 	{
@@ -2128,14 +2137,15 @@ class DFRN
 	 * @param array $item     the new item record
 	 *
 	 * @return int Is it a toplevel entry, a comment or a relayed comment?
-	 * @todo set proper type-hints (array?)
+	 * @throws \Exception
+	 * @todo  set proper type-hints (array?)
 	 */
 	private static function getEntryType($importer, $item)
 	{
 		if ($item["parent-uri"] != $item["uri"]) {
 			$community = false;
 
-			if ($importer["page-flags"] == Contact::PAGE_COMMUNITY || $importer["page-flags"] == Contact::PAGE_PRVGROUP) {
+			if ($importer["page-flags"] == User::PAGE_FLAGS_COMMUNITY || $importer["page-flags"] == User::PAGE_FLAGS_PRVGROUP) {
 				$sql_extra = "";
 				$community = true;
 				Logger::log("possible community action");
@@ -2195,7 +2205,8 @@ class DFRN
 	 * @param array $importer  Record of the importer user mixed with contact of the content
 	 * @param int   $posted_id The record number of item record that was just posted
 	 * @return void
-	 * @todo set proper type-hints (array?)
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  set proper type-hints (array?)
 	 */
 	private static function doPoke($item, $importer, $posted_id)
 	{
@@ -2207,6 +2218,7 @@ class DFRN
 
 		if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
 			// somebody was poked/prodded. Was it me?
+			$Blink = '';
 			foreach ($xo->link as $l) {
 				$atts = $l->attributes();
 				switch ($atts["rel"]) {
@@ -2258,7 +2270,8 @@ class DFRN
 	 * @param bool  $is_like   Is the verb a "like"?
 	 *
 	 * @return bool Should the processing of the entries be continued?
-	 * @todo set proper type-hints (array?)
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  set proper type-hints (array?)
 	 */
 	private static function processVerbs($entrytype, $importer, &$item, &$is_like)
 	{
@@ -2381,8 +2394,6 @@ class DFRN
 						$item["plink"] = $href;
 						break;
 					case "enclosure":
-						$enclosure = $href;
-
 						if (!empty($item["attach"])) {
 							$item["attach"] .= ",";
 						} else {
@@ -2405,7 +2416,9 @@ class DFRN
 	 * @param array  $importer Record of the importer user mixed with contact of the content
 	 * @param object $xml      xml
 	 * @return void
-	 * @todo Add type-hints
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @todo  Add type-hints
 	 */
 	private static function processEntry($header, $xpath, $entry, $importer, $xml)
 	{
@@ -2462,7 +2475,7 @@ class DFRN
 
 		/// @todo Do we really need this check for HTML elements? (It was copied from the old function)
 		if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) {
-			$base_url = get_app()->getBaseURL();
+			$base_url = \get_app()->getBaseURL();
 			$item['body'] = HTML::relToAbs($item['body'], $base_url);
 
 			$item['body'] = HTML::toBBCodeVideo($item['body']);
@@ -2567,8 +2580,6 @@ class DFRN
 			}
 		}
 
-		$enclosure = "";
-
 		$links = $xpath->query("atom:link", $entry);
 		if ($links) {
 			self::parseLinks($links, $item);
@@ -2684,8 +2695,6 @@ class DFRN
 
 		if (in_array($entrytype, [DFRN::REPLY, DFRN::REPLY_RC])) {
 			$posted_id = Item::insert($item);
-			$parent = 0;
-
 			if ($posted_id) {
 				Logger::log("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, Logger::DEBUG);
 
@@ -2746,7 +2755,8 @@ class DFRN
 	 * @param object $deletion deletion elements
 	 * @param array  $importer Record of the importer user mixed with contact of the content
 	 * @return void
-	 * @todo set proper type-hints
+	 * @throws \Exception
+	 * @todo  set proper type-hints
 	 */
 	private static function processDeletion($xpath, $deletion, $importer)
 	{
@@ -2806,7 +2816,9 @@ class DFRN
 	 * @param array  $importer     Record of the importer user mixed with contact of the content
 	 * @param bool   $sort_by_date Is used when feeds are polled
 	 * @return integer Import status
-	 * @todo set proper type-hints
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 * @todo  set proper type-hints
 	 */
 	public static function import($xml, $importer, $sort_by_date = false)
 	{
@@ -2855,19 +2867,41 @@ class DFRN
 
 		// The account type is new since 3.5.1
 		if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
+			// Hint: We are using separate update calls for uid=0 and uid!=0 since a combined call is bad for the database performance
+
 			$accounttype = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:account_type/text()"));
 
 			if ($accounttype != $importer["contact-type"]) {
-				DBA::update('contact', ['contact-type' => $accounttype], ['id' => $importer["id"]]);
+				DBA::update('contact', ['contact-type' => $accounttype], ['id' => $importer['id']]);
+
+				// Updating the public contact as well
+				DBA::update('contact', ['contact-type' => $accounttype], ['uid' => 0, 'nurl' => $importer['nurl']]);
 			}
 			// A forum contact can either have set "forum" or "prv" - but not both
-			if (($accounttype == Contact::ACCOUNT_TYPE_COMMUNITY) && (($forum != $importer["forum"]) || ($forum == $importer["prv"]))) {
-				$condition = ['(`forum` != ? OR `prv` != ?) AND `id` = ?', $forum, !$forum, $importer["id"]];
+			if ($accounttype == User::ACCOUNT_TYPE_COMMUNITY) {
+				// It's a forum, so either set the public or private forum flag
+				$condition = ['(`forum` != ? OR `prv` != ?) AND `id` = ?', $forum, !$forum, $importer['id']];
 				DBA::update('contact', ['forum' => $forum, 'prv' => !$forum], $condition);
+
+				// Updating the public contact as well
+				$condition = ['(`forum` != ? OR `prv` != ?) AND `uid` = 0 AND `nurl` = ?', $forum, !$forum, $importer['nurl']];
+				DBA::update('contact', ['forum' => $forum, 'prv' => !$forum], $condition);
+			} else {
+				// It's not a forum, so remove the flags
+				$condition = ['(`forum` OR `prv`) AND `id` = ?', $importer['id']];
+				DBA::update('contact', ['forum' => false, 'prv' => false], $condition);
+
+				// Updating the public contact as well
+				$condition = ['(`forum` OR `prv`) AND `uid` = 0 AND `nurl` = ?', $importer['nurl']];
+				DBA::update('contact', ['forum' => false, 'prv' => false], $condition);
 			}
 		} elseif ($forum != $importer["forum"]) { // Deprecated since 3.5.1
 			$condition = ['`forum` != ? AND `id` = ?', $forum, $importer["id"]];
 			DBA::update('contact', ['forum' => $forum], $condition);
+
+			// Updating the public contact as well
+			$condition = ['`forum` != ? AND `uid` = 0 AND `nurl` = ?', $forum, $importer['nurl']];
+			DBA::update('contact', ['forum' => $forum], $condition);
 		}
 
 
@@ -2921,6 +2955,7 @@ class DFRN
 	/**
 	 * @param App    $a            App
 	 * @param string $contact_nick contact nickname
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function autoRedir(App $a, $contact_nick)
 	{
@@ -3038,8 +3073,8 @@ class DFRN
 			return false;
 		}
 
-		$community_page = ($user['page-flags'] == Contact::PAGE_COMMUNITY);
-		$prvgroup = ($user['page-flags'] == Contact::PAGE_PRVGROUP);
+		$community_page = ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY);
+		$prvgroup = ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP);
 
 		$link = Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']);
 
@@ -3074,6 +3109,10 @@ class DFRN
 	 * item is assumed to be up-to-date.  If the timestamps are equal it
 	 * assumes the update has been seen before and should be ignored.
 	 *
+	 * @param $existing
+	 * @param $update
+	 * @return bool
+	 * @throws \Exception
 	 */
 	private static function isEditedTimestampNewer($existing, $update)
 	{