X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Funfollow.php;h=5ccc9c859af35382b5923dfa786cb8f2cf12a665;hb=4debd8bdcb777c6e16c68828134fdf0eaaf43ba4;hp=9ca965bfd08fccf369c35b43ebb800b039d15e7d;hpb=ffc406d8195871a6580c78f1cc42ff0b7deeba02;p=friendica.git

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 9ca965bfd0..5ccc9c859a 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -1,14 +1,29 @@
 <?php
 /**
- * @file mod/unfollow.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
@@ -16,16 +31,16 @@ use Friendica\Util\Strings;
 
 function unfollow_post(App $a)
 {
-	$return_path = 'contacts';
+	$base_return_path = 'contact';
 
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.'));
-		$a->internalRedirect('login');
+		notice(DI::l10n()->t('Permission denied.'));
+		DI::baseUrl()->redirect('login');
 		// NOTREACHED
 	}
 
 	$uid = local_user();
-	$url = Strings::removeTags(trim(defaults($_REQUEST, 'url', '')));
+	$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),
@@ -33,18 +48,18 @@ function unfollow_post(App $a)
 	$contact = DBA::selectFirst('contact', [], $condition);
 
 	if (!DBA::isResult($contact)) {
-		notice(L10n::t("You aren't following this contact."));
-		$a->internalRedirect($return_path);
+		notice(DI::l10n()->t("You aren't following this contact."));
+		DI::baseUrl()->redirect($base_return_path);
 		// NOTREACHED
 	}
 
 	if (!empty($_REQUEST['cancel'])) {
-		$a->internalRedirect($return_path . '/' . $contact['id']);
+		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.'));
-		$a->internalRedirect($return_path . '/' . $contact['id']);
+		notice(DI::l10n()->t('Unfollowing is currently not supported by your network.'));
+		DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
 		// NOTREACHED
 	}
 
@@ -58,29 +73,28 @@ function unfollow_post(App $a)
 	// Sharing-only contacts get deleted as there no relationship any more
 	if ($dissolve) {
 		Contact::remove($contact['id']);
-		$return_path = 'contacts';
+		$return_path = $base_return_path;
 	} else {
 		DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
-		$return_path = 'contact/' . $contact['id'];
+		$return_path = $base_return_path . '/' . $contact['id'];
 	}
 
-	info(L10n::t('Contact unfollowed'));
-	$a->internalRedirect($return_path);
+	DI::baseUrl()->redirect($return_path);
 	// NOTREACHED
 }
 
 function unfollow_content(App $a)
 {
-	$return_path = 'contacts';
+	$base_return_path = 'contact';
 
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.'));
-		$a->internalRedirect('login');
+		notice(DI::l10n()->t('Permission denied.'));
+		DI::baseUrl()->redirect('login');
 		// NOTREACHED
 	}
 
 	$uid = local_user();
-	$url = Strings::removeTags(trim($_REQUEST['url']));
+	$url = Strings::escapeTags(trim($_REQUEST['url']));
 
 	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
 		local_user(), Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
@@ -89,64 +103,51 @@ function unfollow_content(App $a)
 	$contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
 
 	if (!DBA::isResult($contact)) {
-		notice(L10n::t("You aren't following this contact."));
-		$a->internalRedirect($return_path);
+		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.'));
-		$a->internalRedirect('contact/' . $contact['id']);
+		notice(DI::l10n()->t('Unfollowing is currently not supported by your network.'));
+		DI::baseUrl()->redirect($base_return_path . '/' . $contact['id']);
 		// NOTREACHED
 	}
 
-	$request = System::baseUrl() . '/unfollow';
+	$request = DI::baseUrl() . '/unfollow';
 	$tpl = Renderer::getMarkupTemplate('auto_request.tpl');
 
 	$self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
 
 	if (!DBA::isResult($self)) {
-		notice(L10n::t('Permission denied.'));
-		$a->internalRedirect($return_path);
+		notice(DI::l10n()->t('Permission denied.'));
+		DI::baseUrl()->redirect($base_return_path);
 		// NOTREACHED
 	}
 
 	// Makes the connection request for friendica contacts easier
 	$_SESSION['fastlane'] = $contact['url'];
 
-	$header = L10n::t('Disconnect/Unfollow');
-
 	$o = Renderer::replaceMacros($tpl, [
-		'$header'        => htmlentities($header),
-		'$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'),
+		'$url_label'     => DI::l10n()->t('Profile URL'),
 		'$myaddr'        => $self['url'],
 		'$request'       => $request,
 		'$keywords'      => '',
 		'$keywords_label'=> ''
 	]);
 
-	$a->page['aside'] = '';
-	Profile::load($a, '', 0, Contact::getDetailsByURL($contact['url']));
+	DI::page()['aside'] = '';
+	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']);