X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=3fe035286f3bed729a11b947d06ac3eb551d063b;hb=722aada460aa023212b7d97932fe338fe54861a8;hp=098e48c6fc8e224558d43c75dbd8f2368850481c;hpb=b052896c64d4b776ed1027c839d652a8928f25b6;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 098e48c6fc..3fe035286f 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -91,17 +91,19 @@ class Probe
 				"community", "keywords", "location", "about", "hide",
 				"batch", "notify", "poll", "request", "confirm", "subscribe", "poco",
 				"following", "followers", "inbox", "outbox", "sharedinbox",
-				"priority", "network", "pubkey", "baseurl", "gsid"];
+				"priority", "network", "pubkey", "manually-approve", "baseurl", "gsid"];
+
+		$numeric_fields = ["gsid", "hide", "account-type", "manually-approve"];
 
 		$newdata = [];
 		foreach ($fields as $field) {
 			if (isset($data[$field])) {
-				if (in_array($field, ["gsid", "hide", "account-type"])) {
+				if (in_array($field, $numeric_fields)) {
 					$newdata[$field] = (int)$data[$field];
 				} else {	
 					$newdata[$field] = $data[$field];
 				}
-			} elseif ($field != "gsid") {
+			} elseif (!in_array($field, $numeric_fields)) {
 				$newdata[$field] = "";
 			} else {
 				$newdata[$field] = null;
@@ -1454,6 +1456,7 @@ class Probe
 			&& !empty($hcard_url)
 		) {
 			$data["network"] = Protocol::DIASPORA;
+			$data["manually-approve"] = false;
 
 			// The Diaspora handle must always be lowercase
 			if (!empty($data["addr"])) {
@@ -1544,6 +1547,7 @@ class Probe
 			&& isset($data["url"])
 		) {
 			$data["network"] = Protocol::OSTATUS;
+			$data["manually-approve"] = false;
 		} else {
 			return $short ? false : [];
 		}
@@ -2218,7 +2222,8 @@ class Probe
 			'following' => $approfile['following'], 'followers' => $approfile['followers'],
 			'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
 			'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN, 
-			'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid']];
+			'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid'],
+			'manually-approve' => in_array($profile['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])];
 		return self::rearrangeData($data);		
 	}
 }