X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=adc3fcc3bd5125465e4c3a0720053869360f8cfb;hb=a09273802ef0b790c0374a2fece6cded5686ebc2;hp=1292d24e3359ca9f401cae2853178ede9094e96e;hpb=bcf974a995a2b511dbdb116bfa572645b6f3cbd7;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index 1292d24e33..adc3fcc3bd 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -5,27 +5,27 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Util\Proxy as ProxyUtils;
 
 function follow_post(App $a)
 {
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.'));
-		goaway($_SESSION['return_url']);
-		// NOTREACHED
+		System::httpExit(403, ['title' => L10n::t('Access denied.')]);
 	}
 
-	if ($_REQUEST['cancel']) {
-		goaway($_SESSION['return_url']);
+	if (isset($_REQUEST['cancel'])) {
+		$a->internalRedirect('contacts');
 	}
 
 	$uid = local_user();
 	$url = notags(trim($_REQUEST['url']));
-	$return_url = $_SESSION['return_url'];
+	$return_path = 'contacts';
 
 	// Makes the connection request for friendica contacts easier
 	// This is just a precaution if maybe this page is called somewhere directly via POST
@@ -37,22 +37,24 @@ function follow_post(App $a)
 		if ($result['message']) {
 			notice($result['message']);
 		}
-		goaway($return_url);
+		$a->internalRedirect($return_path);
 	} elseif ($result['cid']) {
-		goaway(System::baseUrl() . '/contacts/' . $result['cid']);
+		$a->internalRedirect('contact/' . $result['cid']);
 	}
 
 	info(L10n::t('The contact could not be added.'));
 
-	goaway($return_url);
+	$a->internalRedirect($return_path);
 	// NOTREACHED
 }
 
 function follow_content(App $a)
 {
+	$return_path = 'contacts';
+
 	if (!local_user()) {
 		notice(L10n::t('Permission denied.'));
-		goaway($_SESSION['return_url']);
+		$a->internalRedirect($return_path);
 		// NOTREACHED
 	}
 
@@ -65,46 +67,46 @@ function follow_content(App $a)
 	$r = q("SELECT `pending` FROM `contact` WHERE `uid` = %d AND ((`rel` != %d) OR (`network` = '%s')) AND
 		(`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') AND
 		`network` != '%s' LIMIT 1",
-		intval(local_user()), dbesc(CONTACT_IS_FOLLOWER), dbesc(NETWORK_DFRN), dbesc(normalise_link($url)),
-		dbesc(normalise_link($url)), dbesc($url), dbesc(NETWORK_STATUSNET));
+		intval(local_user()), DBA::escape(Contact::FOLLOWER), DBA::escape(Protocol::DFRN), DBA::escape(normalise_link($url)),
+		DBA::escape(normalise_link($url)), DBA::escape($url), DBA::escape(Protocol::STATUSNET));
 
 	if ($r) {
 		if ($r[0]['pending']) {
 			notice(L10n::t('You already added this contact.'));
 			$submit = '';
-			//goaway($_SESSION['return_url']);
+			//$a->internalRedirect($_SESSION['return_path']);
 			// NOTREACHED
 		}
 	}
 
 	$ret = Probe::uri($url);
 
-	if (($ret['network'] == NETWORK_DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
+	if (($ret['network'] == Protocol::DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
 		notice(L10n::t("Diaspora support isn't enabled. Contact can't be added."));
 		$submit = '';
-		//goaway($_SESSION['return_url']);
+		//$a->internalRedirect($_SESSION['return_path']);
 		// NOTREACHED
 	}
 
-	if (($ret['network'] == NETWORK_OSTATUS) && Config::get('system', 'ostatus_disabled')) {
+	if (($ret['network'] == Protocol::OSTATUS) && Config::get('system', 'ostatus_disabled')) {
 		notice(L10n::t("OStatus support is disabled. Contact can't be added."));
 		$submit = '';
-		//goaway($_SESSION['return_url']);
+		//$a->internalRedirect($_SESSION['return_path']);
 		// NOTREACHED
 	}
 
-	if ($ret['network'] == NETWORK_PHANTOM) {
+	if ($ret['network'] == Protocol::PHANTOM) {
 		notice(L10n::t("The network type couldn't be detected. Contact can't be added."));
 		$submit = '';
-		//goaway($_SESSION['return_url']);
+		//$a->internalRedirect($_SESSION['return_path']);
 		// NOTREACHED
 	}
 
-	if ($ret['network'] == NETWORK_MAIL) {
+	if ($ret['network'] == Protocol::MAIL) {
 		$ret['url'] = $ret['addr'];
 	}
 
-	if (($ret['network'] === NETWORK_DFRN) && !DBM::is_result($r)) {
+	if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($r)) {
 		$request = $ret['request'];
 		$tpl = get_markup_template('dfrn_request.tpl');
 	} else {
@@ -116,7 +118,7 @@ function follow_content(App $a)
 
 	if (!$r) {
 		notice(L10n::t('Permission denied.'));
-		goaway($_SESSION['return_url']);
+		$a->internalRedirect($return_path);
 		// NOTREACHED
 	}
 
@@ -135,7 +137,7 @@ function follow_content(App $a)
 		$gcontact_id = $r[0]['id'];
 	}
 
-	if ($ret['network'] === NETWORK_DIASPORA) {
+	if ($ret['network'] === Protocol::DIASPORA) {
 		$r[0]['location'] = '';
 		$r[0]['about'] = '';
 	}
@@ -144,7 +146,7 @@ function follow_content(App $a)
 
 	$o = replace_macros($tpl, [
 		'$header'        => htmlentities($header),
-		//'$photo' => proxy_url($ret['photo'], false, PROXY_SIZE_SMALL),
+		//'$photo'         => ProxyUtils::proxifyUrl($ret['photo'], false, ProxyUtils::SIZE_SMALL),
 		'$desc'          => '',
 		'$pls_answer'    => L10n::t('Please answer the following:'),
 		'$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $ret['name']), false, '', [L10n::t('No'), L10n::t('Yes')]],
@@ -166,10 +168,13 @@ function follow_content(App $a)
 		'$url_label'     => L10n::t('Profile URL'),
 		'$myaddr'        => $myaddr,
 		'$request'       => $request,
-		/*'$location'      => Friendica\Content\Text\BBCode::::convert($r[0]['location']),
+		/*
+		 * @TODO commented out?
+		'$location'      => Friendica\Content\Text\BBCode::::convert($r[0]['location']),
 		'$location_label'=> L10n::t('Location:'),
 		'$about'         => Friendica\Content\Text\BBCode::::convert($r[0]['about'], false, false),
-		'$about_label'   => L10n::t('About:'),*/
+		'$about_label'   => L10n::t('About:'),
+		*/
 		'$keywords'      => $r[0]['keywords'],
 		'$keywords_label'=> L10n::t('Tags:')
 	]);