X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Funfollow.php;h=a66c88aefd2d9dcfe993c4d81cef222f11efcbd7;hb=89eaf508f19be57a07971c5f40b4bb538e36e891;hp=a26557a9a2157339a9ca70a0e95eb4a5747ca067;hpb=59dd353464ebe47b80530e68496b6e01c047feaf;p=friendica.git

diff --git a/mod/unfollow.php b/mod/unfollow.php
index a26557a9a2..a66c88aefd 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -2,137 +2,152 @@
 /**
  * @file mod/unfollow.php
  */
+
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
+use Friendica\Util\Strings;
 
 function unfollow_post(App $a)
 {
+	$base_return_path = 'contact';
+
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
-		goaway($_SESSION['return_url']);
+		notice(L10n::t('Permission denied.'));
+		$a->internalRedirect('login');
 		// NOTREACHED
 	}
 
-	if ($_REQUEST['cancel']) {
-		goaway($_SESSION['return_url']);
+	$uid = local_user();
+	$url = Strings::escapeTags(trim(defaults($_REQUEST, 'url', '')));
+
+	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
+		$uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
+		Strings::normaliseLink($url), $url];
+	$contact = DBA::selectFirst('contact', [], $condition);
+
+	if (!DBA::isResult($contact)) {
+		notice(L10n::t("You aren't following this contact."));
+		$a->internalRedirect($base_return_path);
+		// NOTREACHED
 	}
 
-	$uid = local_user();
-	$url = notags(trim($_REQUEST['url']));
-	$return_url = $_SESSION['return_url'];
+	if (!empty($_REQUEST['cancel'])) {
+		$a->internalRedirect($base_return_path . '/' . $contact['id']);
+	}
 
-	$condition = ["`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
-			$uid, CONTACT_IS_FRIEND, normalise_link($url),
-			normalise_link($url), $url, NETWORK_STATUSNET];
-	$contact = dba::selectFirst('contact', [], $condition);
+	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+		notice(L10n::t('Unfollowing is currently not supported by your network.'));
+		$a->internalRedirect($base_return_path . '/' . $contact['id']);
+		// NOTREACHED
+	}
+
+	$dissolve = ($contact['rel'] == Contact::SHARING);
+
+	$owner = User::getOwnerDataById($uid);
+	if ($owner) {
+		Contact::terminateFriendship($owner, $contact, $dissolve);
+	}
 
-	if (!DBM::is_result($contact)) {
-		notice(L10n::t("Contact wasn't found or can't be unfollowed."));
+	// Sharing-only contacts get deleted as there no relationship any more
+	if ($dissolve) {
+		Contact::remove($contact['id']);
+		$return_path = $base_return_path;
 	} else {
-		if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN])) {
-			$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
-				WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
-				intval($uid)
-			);
-			if (DBM::is_result($r)) {
-				Contact::terminateFriendship($r[0], $contact);
-			}
-		}
-		dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
-
-		info(L10n::t('Contact unfollowed').EOL);
-		goaway(System::baseUrl().'/contacts/'.$contact['id']);
+		DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
+		$return_path = $base_return_path . '/' . $contact['id'];
 	}
-	goaway($return_url);
+
+	info(L10n::t('Contact unfollowed'));
+	$a->internalRedirect($return_path);
 	// NOTREACHED
 }
 
 function unfollow_content(App $a)
 {
-	if (! local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
-		goaway($_SESSION['return_url']);
+	$base_return_path = 'contact';
+
+	if (!local_user()) {
+		notice(L10n::t('Permission denied.'));
+		$a->internalRedirect('login');
 		// NOTREACHED
 	}
 
 	$uid = local_user();
-	$url = notags(trim($_REQUEST['url']));
+	$url = Strings::escapeTags(trim($_REQUEST['url']));
 
-	$submit = L10n::t('Submit Request');
+	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
+		local_user(), Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
+		Strings::normaliseLink($url), $url];
 
-	$condition = ["`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
-			local_user(), CONTACT_IS_FRIEND, normalise_link($url),
-			normalise_link($url), $url, NETWORK_STATUSNET];
-	$contact = dba::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
+	$contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
 
-	if (!DBM::is_result($contact)) {
-		notice(L10n::t("You aren't a friend of this contact.").EOL);
-		$submit = "";
+	if (!DBA::isResult($contact)) {
+		notice(L10n::t("You aren't following this contact."));
+		$a->internalRedirect($base_return_path);
 		// NOTREACHED
 	}
 
-	if (!in_array($contact['network'], [NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_DFRN])) {
-		notice(L10n::t("Unfollowing is currently not supported by your network.").EOL);
-		$submit = "";
+	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+		notice(L10n::t('Unfollowing is currently not supported by your network.'));
+		$a->internalRedirect($base_return_path . '/' . $contact['id']);
 		// NOTREACHED
 	}
 
-	$request = System::baseUrl()."/unfollow";
-	$tpl = get_markup_template('auto_request.tpl');
+	$request = System::baseUrl() . '/unfollow';
+	$tpl = Renderer::getMarkupTemplate('auto_request.tpl');
 
-	$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
+	$self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
 
-	if (!$r) {
-		notice(L10n::t('Permission denied.') . EOL);
-		goaway($_SESSION['return_url']);
+	if (!DBA::isResult($self)) {
+		notice(L10n::t('Permission denied.'));
+		$a->internalRedirect($base_return_path);
 		// NOTREACHED
 	}
 
-	$myaddr = $r[0]["url"];
-
 	// Makes the connection request for friendica contacts easier
-	$_SESSION["fastlane"] = $contact["url"];
-
-	$header = L10n::t("Disconnect/Unfollow");
-
-	$o  = replace_macros($tpl, [
-			'$header' => htmlentities($header),
-			'$desc' => "",
-			'$pls_answer' => "",
-			'$does_know_you' => "",
-			'$add_note' => "",
-			'$page_desc' => "",
-			'$friendica' => "",
-			'$statusnet' => "",
-			'$diaspora' => "",
-			'$diasnote' => "",
-			'$your_address' => L10n::t('Your Identity Address:'),
-			'$invite_desc' => "",
-			'$emailnet' => "",
-			'$submit' => $submit,
-			'$cancel' => L10n::t('Cancel'),
-			'$nickname' => "",
-			'$name' => $contact["name"],
-			'$url' => $contact["url"],
-			'$zrl' => Profile::zrl($contact["url"]),
-			'$url_label' => L10n::t("Profile URL"),
-			'$myaddr' => $myaddr,
-			'$request' => $request,
-			'$keywords' => "",
-			'$keywords_label' => ""
+	$_SESSION['fastlane'] = $contact['url'];
+
+	$o = Renderer::replaceMacros($tpl, [
+		'$header'        => L10n::t('Disconnect/Unfollow'),
+		'$desc'          => '',
+		'$pls_answer'    => '',
+		'$does_know_you' => '',
+		'$add_note'      => '',
+		'$page_desc'     => '',
+		'$friendica'     => '',
+		'$statusnet'     => '',
+		'$diaspora'      => '',
+		'$diasnote'      => '',
+		'$your_address'  => L10n::t('Your Identity Address:'),
+		'$invite_desc'   => '',
+		'$emailnet'      => '',
+		'$submit'        => L10n::t('Submit Request'),
+		'$cancel'        => L10n::t('Cancel'),
+		'$nickname'      => '',
+		'$name'          => $contact['name'],
+		'$url'           => $contact['url'],
+		'$zrl'           => Contact::magicLink($contact['url']),
+		'$url_label'     => L10n::t('Profile URL'),
+		'$myaddr'        => $self['url'],
+		'$request'       => $request,
+		'$keywords'      => '',
+		'$keywords_label'=> ''
 	]);
 
-	$a->page['aside'] = "";
-	Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+	$a->page['aside'] = '';
+	Profile::load($a, '', 0, Contact::getDetailsByURL($contact['url']));
 
-	$o .= replace_macros(get_markup_template('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
+	$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
 
 	// Show last public posts
-	$o .= Contact::getPostsFromUrl($contact["url"]);
+	$o .= Contact::getPostsFromUrl($contact['url']);
 
 	return $o;
 }