X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=cc08831285e74fb69ed6aef54deafce7c5f67543;hb=f3eebda4fa9e308eb00bb212a537632c4cbb85cb;hp=8affa11b560cde4514e3576700b27e0f36cc794f;hpb=79391bbb624783c24bdd63eebbcfb0ee662a6cad;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index 8affa11b56..cc08831285 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -15,6 +15,8 @@ function follow_content(&$a) {
 	$uid = local_user();
 	$url = notags(trim($_REQUEST['url']));
 
+	$submit = t('Submit Request');
+
 	// There is a current issue. It seems as if you can't start following a Friendica that is following you
 	// With Diaspora this works - but Friendica is special, it seems ...
 	$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND ((`rel` != %d) OR (`network` = '%s')) AND
@@ -25,15 +27,31 @@ function follow_content(&$a) {
 
 	if ($r) {
 		notice(t('You already added this contact.').EOL);
-		goaway($_SESSION['return_url']);
+		$submit = "";
+		//goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
 
 	$ret = probe_url($url);
 
+	if (($ret["network"] == NETWORK_DIASPORA) AND !get_config('system','diaspora_enabled')) {
+		notice( t("Diaspora support isn't enabled. Contact can't be added.") . EOL);
+		$submit = "";
+		//goaway($_SESSION['return_url']);
+		// NOTREACHED
+	}
+
+	if (($ret["network"] == NETWORK_OSTATUS) AND get_config('system','ostatus_disabled')) {
+		notice( t("OStatus support is disabled. Contact can't be added.") . EOL);
+		$submit = "";
+		//goaway($_SESSION['return_url']);
+		// NOTREACHED
+	}
+
 	if ($ret["network"] == NETWORK_PHANTOM) {
 		notice( t("The network type couldn't be detected. Contact can't be added.") . EOL);
-		goaway($_SESSION['return_url']);
+		$submit = "";
+		//goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
 
@@ -67,16 +85,21 @@ function follow_content(&$a) {
 	if (!$r)
 		$r = array(array("location" => "", "about" => "", "keywords" => ""));
 
+	if($ret['network'] === NETWORK_DIASPORA) {
+		$r[0]["location"] = "";
+		$r[0]["about"] = "";
+	}
+
 	$header = $ret["name"];
 
 	if ($ret["addr"] != "")
 		$header .= " <".$ret["addr"].">";
 
-	$header .= " (".network_to_name($ret['network']).")";
+	$header .= " (".network_to_name($ret['network'], $ret['url']).")";
 
 	$o  = replace_macros($tpl,array(
 			'$header' => htmlentities($header),
-			'$photo' => $ret["photo"],
+			'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL),
 			'$desc' => "",
 			'$pls_answer' => t('Please answer the following:'),
 			'$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))),
@@ -89,7 +112,7 @@ function follow_content(&$a) {
 			'$your_address' => t('Your Identity Address:'),
 			'$invite_desc' => "",
 			'$emailnet' => "",
-			'$submit' => t('Submit Request'),
+			'$submit' => $submit,
 			'$cancel' => t('Cancel'),
 			'$nickname' => "",
 			'$name' => $ret["name"],
@@ -100,7 +123,7 @@ function follow_content(&$a) {
 			'$request' => $request,
 			'$location' => bbcode($r[0]["location"]),
 			'$location_label' => t("Location:"),
-			'$about' => proxy_parse_html(bbcode($r[0]["about"], false, false)),
+			'$about' => bbcode($r[0]["about"], false, false),
 			'$about_label' => t("About:"),
 			'$keywords' => $r[0]["keywords"],
 			'$keywords_label' => t("Tags:")