From: Michael Vogel <icarus@dabo.de>
Date: Tue, 22 Sep 2015 20:31:22 +0000 (+0200)
Subject: Bugfix: Following mail accounts is now possible again
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7c8c8b821a7a1f4aeb3524136a1734b5d94937d6;p=friendica.git

Bugfix: Following mail accounts is now possible again
---

diff --git a/include/Scrape.php b/include/Scrape.php
index a2bf5ee0aa..93d68be22b 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -819,7 +819,9 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
 		}
 	}
 
-	Cache::set("probe_url:".$mode.":".$url,serialize($result), CACHE_DAY);
+	// Only store into the cache if the value seems to be valid
+	if ($result['network'] != NETWORK_FEED)
+		Cache::set("probe_url:".$mode.":".$url,serialize($result), CACHE_DAY);
 
 	return $result;
 }
diff --git a/mod/follow.php b/mod/follow.php
index 9b5b39545f..bdcde77435 100755
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -2,6 +2,7 @@
 
 require_once('include/Scrape.php');
 require_once('include/follow.php');
+require_once('include/contact_selectors.php');
 
 function follow_content(&$a) {
 
@@ -30,6 +31,9 @@ function follow_content(&$a) {
 
 	$ret = probe_url($url);
 
+	if ($ret["network"] == NETWORK_MAIL)
+		$ret["url"] = $ret["addr"];
+
 	if($ret['network'] === NETWORK_DFRN) {
 		$request = $ret["request"];
 		$tpl = get_markup_template('dfrn_request.tpl');
@@ -51,8 +55,15 @@ function follow_content(&$a) {
 	// Makes the connection request for friendica contacts easier
 	$_SESSION["fastlane"] = $ret["url"];
 
+	$header = $ret["name"];
+
+	if ($ret["addr"] != "")
+		$header .= " <".$ret["addr"].">";
+
+	$header .= " (".network_to_name($ret['network']).")";
+
 	$o  = replace_macros($tpl,array(
-			'$header' => $ret["name"]." (".$ret["addr"].")",
+			'$header' => htmlentities($header),
 			'$photo' => $ret["photo"],
                         '$desc' => "",
                         '$pls_answer' => t('Please answer the following:'),