X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=2194321de8bad5fb4cac601caaab46d82c367e66;hb=c54a2c1e83822f6e043b449468570d2c9ed3ab3a;hp=f0cffff4a1afb860e8dc0b8e05d52b7fcbc98ba8;hpb=e437c74d0e4e4ece4693a2e32513c3ecde7efb4d;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index f0cffff4a1..2194321de8 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,18 +1,18 @@
 <?php
-
+/**
+ * @file mod/follow.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Network\Probe;
 
-require_once 'include/follow.php';
-require_once 'include/contact_selectors.php';
 
 function follow_post(App $a) {
 
-	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
+	if (!local_user()) {
+		notice(t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
@@ -29,7 +29,7 @@ function follow_post(App $a) {
 	// This is just a precaution if maybe this page is called somewhere directly via POST
 	$_SESSION["fastlane"] = $url;
 
-	$result = new_contact($uid,$url,true);
+	$result = Contact::createFromProbe($uid, $url, true);
 
 	if ($result['success'] == false) {
 		if ($result['message']) {
@@ -40,7 +40,7 @@ function follow_post(App $a) {
 		goaway(System::baseUrl().'/contacts/'.$result['cid']);
 	}
 
-	info( t('Contact added').EOL);
+	info(t('Contact added').EOL);
 
 	if (strstr($return_url,'contacts')) {
 		goaway(System::baseUrl().'/contacts/'.$contact_id);
@@ -52,8 +52,8 @@ function follow_post(App $a) {
 
 function follow_content(App $a) {
 
-	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
+	if (!local_user()) {
+		notice(t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
@@ -81,21 +81,21 @@ function follow_content(App $a) {
 	$ret = Probe::uri($url);
 
 	if (($ret["network"] == NETWORK_DIASPORA) && !Config::get('system','diaspora_enabled')) {
-		notice( t("Diaspora support isn't enabled. Contact can't be added.") . EOL);
+		notice(t("Diaspora support isn't enabled. Contact can't be added.") . EOL);
 		$submit = "";
 		//goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
 
 	if (($ret["network"] == NETWORK_OSTATUS) && Config::get('system','ostatus_disabled')) {
-		notice( t("OStatus support is disabled. Contact can't be added.") . EOL);
+		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);
+		notice(t("The network type couldn't be detected. Contact can't be added.") . EOL);
 		$submit = "";
 		//goaway($_SESSION['return_url']);
 		// NOTREACHED
@@ -116,7 +116,7 @@ function follow_content(App $a) {
 	$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
 
 	if (!$r) {
-		notice( t('Permission denied.') . EOL);
+		notice(t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
@@ -176,7 +176,8 @@ function follow_content(App $a) {
 	));
 
 	$a->page['aside'] = "";
-	profile_load($a, "", 0, Contact::getDetailsByURL($ret["url"]));
+
+	profile_load($a, "", 0, Contact::getDetailsByURL($ret["url"]), false);
 
 	if ($gcontact_id <> 0) {
 		$o .= replace_macros(get_markup_template('section_title.tpl'),