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

diff --git a/mod/follow.php b/mod/follow.php
index 45e017f088..2194321de8 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,16 +1,59 @@
 <?php
-
+/**
+ * @file mod/follow.php
+ */
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Model\Contact;
+use Friendica\Network\Probe;
+
+
+function follow_post(App $a) {
+
+	if (!local_user()) {
+		notice(t('Permission denied.') . EOL);
+		goaway($_SESSION['return_url']);
+		// NOTREACHED
+	}
+
+	if ($_REQUEST['cancel']) {
+		goaway($_SESSION['return_url']);
+	}
+
+	$uid = local_user();
+	$url = notags(trim($_REQUEST['url']));
+	$return_url = $_SESSION['return_url'];
+
+	// Makes the connection request for friendica contacts easier
+	// This is just a precaution if maybe this page is called somewhere directly via POST
+	$_SESSION["fastlane"] = $url;
+
+	$result = Contact::createFromProbe($uid, $url, true);
+
+	if ($result['success'] == false) {
+		if ($result['message']) {
+			notice($result['message']);
+		}
+		goaway($return_url);
+	} elseif ($result['cid']) {
+		goaway(System::baseUrl().'/contacts/'.$result['cid']);
+	}
 
-require_once 'include/probe.php';
-require_once 'include/follow.php';
-require_once 'include/Contact.php';
-require_once 'include/contact_selectors.php';
+	info(t('Contact added').EOL);
+
+	if (strstr($return_url,'contacts')) {
+		goaway(System::baseUrl().'/contacts/'.$contact_id);
+	}
+
+	goaway($return_url);
+	// NOTREACHED
+}
 
 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
 	}
@@ -35,24 +78,24 @@ function follow_content(App $a) {
 		// NOTREACHED
 	}
 
-	$ret = probe_url($url);
+	$ret = Probe::uri($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);
+	if (($ret["network"] == NETWORK_DIASPORA) && !Config::get('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);
+	if (($ret["network"] == NETWORK_OSTATUS) && Config::get('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);
+		notice(t("The network type couldn't be detected. Contact can't be added.") . EOL);
 		$submit = "";
 		//goaway($_SESSION['return_url']);
 		// NOTREACHED
@@ -66,14 +109,14 @@ function follow_content(App $a) {
 		$request = $ret["request"];
 		$tpl = get_markup_template('dfrn_request.tpl');
 	} else {
-		$request = App::get_baseurl()."/follow";
+		$request = System::baseUrl()."/follow";
 		$tpl = get_markup_template('auto_request.tpl');
 	}
 
 	$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
 	}
@@ -98,13 +141,6 @@ function follow_content(App $a) {
 		$r[0]["about"] = "";
 	}
 
-	$header = $ret["name"];
-
-	if ($ret["addr"] != "") {
-		$header .= " <".$ret["addr"].">";
-	}
-
-	//$header .= " (".network_to_name($ret['network'], $ret['url']).")";
 	$header = t("Connect/Follow");
 
 	$o  = replace_macros($tpl,array(
@@ -140,7 +176,8 @@ function follow_content(App $a) {
 	));
 
 	$a->page['aside'] = "";
-	profile_load($a, "", 0, get_contact_details_by_url($ret["url"]));
+
+	profile_load($a, "", 0, Contact::getDetailsByURL($ret["url"]), false);
 
 	if ($gcontact_id <> 0) {
 		$o .= replace_macros(get_markup_template('section_title.tpl'),
@@ -148,49 +185,8 @@ function follow_content(App $a) {
 		));
 
 		// Show last public posts
-		$o .= posts_from_contact_url($a, $ret["url"]);
+		$o .= Contact::getPostsFromUrl($ret["url"]);
 	}
 
 	return $o;
 }
-
-function follow_post(App $a) {
-
-	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
-		goaway($_SESSION['return_url']);
-		// NOTREACHED
-	}
-
-	if ($_REQUEST['cancel']) {
-		goaway($_SESSION['return_url']);
-	}
-
-	$uid = local_user();
-	$url = notags(trim($_REQUEST['url']));
-	$return_url = $_SESSION['return_url'];
-
-	// Makes the connection request for friendica contacts easier
-	// This is just a precaution if maybe this page is called somewhere directly via POST
-	$_SESSION["fastlane"] = $url;
-
-	$result = new_contact($uid,$url,true);
-
-	if ($result['success'] == false) {
-		if ($result['message']) {
-			notice($result['message']);
-		}
-		goaway($return_url);
-	} elseif ($result['cid']) {
-		goaway(App::get_baseurl().'/contacts/'.$result['cid']);
-	}
-
-	info( t('Contact added').EOL);
-
-	if (strstr($return_url,'contacts')) {
-		goaway(App::get_baseurl().'/contacts/'.$contact_id);
-	}
-
-	goaway($return_url);
-	// NOTREACHED
-}