X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Funfollow.php;h=1c6022a4cb4b31dce2420f33d078dd96a004cb65;hb=7789ea25079801ee1425368e9bf2f7ce80d16d88;hp=280ca164e6b7c3efb62dca042804fea50f1eb6c6;hpb=b9dba631aadf6c25a97b679808c684276b3dd76a;p=friendica.git

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 280ca164e6..1c6022a4cb 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -1,10 +1,25 @@
 <?php
 /**
- * @file mod/unfollow.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
@@ -16,57 +31,15 @@ use Friendica\Util\Strings;
 
 function unfollow_post(App $a)
 {
-	$base_return_path = 'contact';
-
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.'));
+		notice(DI::l10n()->t('Permission denied.'));
 		DI::baseUrl()->redirect('login');
 		// NOTREACHED
 	}
 
-	$uid = local_user();
 	$url = Strings::escapeTags(trim($_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."));
-		DI::baseUrl()->redirect($base_return_path);
-		// NOTREACHED
-	}
-
-	if (!empty($_REQUEST['cancel'])) {
-		DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
-	}
-
-	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
-		notice(L10n::t('Unfollowing is currently not supported by your network.'));
-		DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
-		// NOTREACHED
-	}
-
-	$dissolve = ($contact['rel'] == Contact::SHARING);
-
-	$owner = User::getOwnerDataById($uid);
-	if ($owner) {
-		Contact::terminateFriendship($owner, $contact, $dissolve);
-	}
-
-	// Sharing-only contacts get deleted as there no relationship any more
-	if ($dissolve) {
-		Contact::remove($contact['id']);
-		$return_path = $base_return_path;
-	} else {
-		DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
-		$return_path = $base_return_path . '/' . $contact['id'];
-	}
-
-	info(L10n::t('Contact unfollowed'));
-	DI::baseUrl()->redirect($return_path);
-	// NOTREACHED
+	unfollow_process($url);
 }
 
 function unfollow_content(App $a)
@@ -74,7 +47,7 @@ function unfollow_content(App $a)
 	$base_return_path = 'contact';
 
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.'));
+		notice(DI::l10n()->t('Permission denied.'));
 		DI::baseUrl()->redirect('login');
 		// NOTREACHED
 	}
@@ -86,16 +59,16 @@ function unfollow_content(App $a)
 		local_user(), Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
 		Strings::normaliseLink($url), $url];
 
-	$contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
+	$contact = DBA::selectFirst('contact', ['url', 'id', 'uid', 'network', 'addr', 'name'], $condition);
 
 	if (!DBA::isResult($contact)) {
-		notice(L10n::t("You aren't following this contact."));
+		notice(DI::l10n()->t("You aren't following this contact."));
 		DI::baseUrl()->redirect($base_return_path);
 		// NOTREACHED
 	}
 
 	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
-		notice(L10n::t('Unfollowing is currently not supported by your network.'));
+		notice(DI::l10n()->t('Unfollowing is currently not supported by your network.'));
 		DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
 		// NOTREACHED
 	}
@@ -106,7 +79,7 @@ function unfollow_content(App $a)
 	$self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
 
 	if (!DBA::isResult($self)) {
-		notice(L10n::t('Permission denied.'));
+		notice(DI::l10n()->t('Permission denied.'));
 		DI::baseUrl()->redirect($base_return_path);
 		// NOTREACHED
 	}
@@ -114,27 +87,20 @@ function unfollow_content(App $a)
 	// Makes the connection request for friendica contacts easier
 	$_SESSION['fastlane'] = $contact['url'];
 
+	if (!empty($_REQUEST['auto'])) {
+		unfollow_process($contact['url']);
+	}
+
 	$o = Renderer::replaceMacros($tpl, [
-		'$header'        => L10n::t('Disconnect/Unfollow'),
-		'$desc'          => '',
-		'$pls_answer'    => '',
-		'$does_know_you' => '',
-		'$add_note'      => '',
+		'$header'        => DI::l10n()->t('Disconnect/Unfollow'),
 		'$page_desc'     => '',
-		'$friendica'     => '',
-		'$statusnet'     => '',
-		'$diaspora'      => '',
-		'$diasnote'      => '',
-		'$your_address'  => L10n::t('Your Identity Address:'),
+		'$your_address'  => DI::l10n()->t('Your Identity Address:'),
 		'$invite_desc'   => '',
-		'$emailnet'      => '',
-		'$submit'        => L10n::t('Submit Request'),
-		'$cancel'        => L10n::t('Cancel'),
-		'$nickname'      => '',
-		'$name'          => $contact['name'],
+		'$submit'        => DI::l10n()->t('Submit Request'),
+		'$cancel'        => DI::l10n()->t('Cancel'),
 		'$url'           => $contact['url'],
-		'$zrl'           => Contact::magicLink($contact['url']),
-		'$url_label'     => L10n::t('Profile URL'),
+		'$zrl'           => Contact::magicLinkByContact($contact),
+		'$url_label'     => DI::l10n()->t('Profile URL'),
 		'$myaddr'        => $self['url'],
 		'$request'       => $request,
 		'$keywords'      => '',
@@ -142,12 +108,54 @@ function unfollow_content(App $a)
 	]);
 
 	DI::page()['aside'] = '';
-	Profile::load($a, '', 0, Contact::getDetailsByURL($contact['url']));
+	Profile::load($a, '', Contact::getByURL($contact['url'], false));
 
-	$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
+	$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => DI::l10n()->t('Status Messages and Posts')]);
 
 	// Show last public posts
 	$o .= Contact::getPostsFromUrl($contact['url']);
 
 	return $o;
 }
+
+function unfollow_process(string $url)
+{
+	$base_return_path = 'contact';
+
+	$uid = local_user();
+
+	$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(DI::l10n()->t("You aren't following this contact."));
+		DI::baseUrl()->redirect($base_return_path);
+		// NOTREACHED
+	}
+
+	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+		notice(DI::l10n()->t('Unfollowing is currently not supported by your network.'));
+		DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
+		// NOTREACHED
+	}
+
+	$dissolve = ($contact['rel'] == Contact::SHARING);
+
+	$owner = User::getOwnerDataById($uid);
+	if ($owner) {
+		Contact::terminateFriendship($owner, $contact, $dissolve);
+	}
+
+	// Sharing-only contacts get deleted as there no relationship any more
+	if ($dissolve) {
+		Contact::remove($contact['id']);
+		$return_path = $base_return_path;
+	} else {
+		DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
+		$return_path = $base_return_path . '/' . $contact['id'];
+	}
+
+	DI::baseUrl()->redirect($return_path);
+}
\ No newline at end of file