X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsuggest.php;h=5fb9bdcff782756524b90d5caa76675e31585cc7;hb=afdb827bd7ed44a1c3028f287e101fa33e438332;hp=7f1fe3386c139f297244f88f0ea45f2d23aba310;hpb=c5558cc4595263e2654bb614f54d61273d79bc5f;p=friendica.git

diff --git a/mod/suggest.php b/mod/suggest.php
index 7f1fe3386c..5fb9bdcff7 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -1,15 +1,30 @@
 <?php
 /**
- * @file mod/suggest.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\Content\ContactSelector;
 use Friendica\Content\Widget;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Util\Proxy as ProxyUtils;
@@ -19,39 +34,16 @@ function suggest_init(App $a)
 	if (! local_user()) {
 		return;
 	}
+}
 
-	if (!empty($_GET['ignore'])) {
-		// Check if we should do HTML-based delete confirmation
-		if ($_REQUEST['confirm']) {
-			// <form> can't take arguments in its "action" parameter
-			// so add any arguments as hidden inputs
-			$query = explode_querystring($a->query_string);
-			$inputs = [];
-			foreach ($query['args'] as $arg) {
-				if (strpos($arg, 'confirm=') === false) {
-					$arg_parts = explode('=', $arg);
-					$inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]];
-				}
-			}
-
-			$a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
-				'$method' => 'get',
-				'$message' => L10n::t('Do you really want to delete this suggestion?'),
-				'$extra_inputs' => $inputs,
-				'$confirm' => L10n::t('Yes'),
-				'$confirm_url' => $query['base'],
-				'$confirm_name' => 'confirmed',
-				'$cancel' => L10n::t('Cancel'),
-			]);
-			$a->error = 1; // Set $a->error so the other module functions don't execute
-			return;
-		}
-		// Now check how the user responded to the confirmation query
-		if (!$_REQUEST['canceled']) {
-			DBA::insert('gcign', ['uid' => local_user(), 'gcid' => $_GET['ignore']]);
-		}
+function suggest_post(App $a)
+{
+	if (!empty($_POST['ignore']) && !empty($_POST['confirm'])) {
+		DBA::insert('gcign', ['uid' => local_user(), 'gcid' => $_POST['ignore']]);
+		notice(DI::l10n()->t('Contact suggestion successfully ignored.'));
 	}
 
+	DI::baseUrl()->redirect('suggest');
 }
 
 function suggest_content(App $a)
@@ -59,33 +51,57 @@ function suggest_content(App $a)
 	$o = '';
 
 	if (! local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.') . EOL);
 		return;
 	}
 
-	$_SESSION['return_path'] = $a->cmd;
+	$_SESSION['return_path'] = DI::args()->getCommand();
 
-	$a->page['aside'] .= Widget::findPeople();
-	$a->page['aside'] .= Widget::follow();
+	DI::page()['aside'] .= Widget::findPeople();
+	DI::page()['aside'] .= Widget::follow();
 
 
 	$r = GContact::suggestionQuery(local_user());
 
 	if (! DBA::isResult($r)) {
-		$o .= L10n::t('No suggestions available. If this is a new site, please try again in 24 hours.');
+		$o .= DI::l10n()->t('No suggestions available. If this is a new site, please try again in 24 hours.');
 		return $o;
 	}
 
+
+	if (!empty($_GET['ignore'])) {
+		// <form> can't take arguments in its "action" parameter
+		// so add any arguments as hidden inputs
+		$query = explode_querystring(DI::args()->getQueryString());
+		$inputs = [];
+		foreach ($query['args'] as $arg) {
+			if (strpos($arg, 'confirm=') === false) {
+				$arg_parts = explode('=', $arg);
+				$inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]];
+			}
+		}
+
+		return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
+			'$method' => 'post',
+			'$message' => DI::l10n()->t('Do you really want to delete this suggestion?'),
+			'$extra_inputs' => $inputs,
+			'$confirm' => DI::l10n()->t('Yes'),
+			'$confirm_url' => $query['base'],
+			'$confirm_name' => 'confirm',
+			'$cancel' => DI::l10n()->t('Cancel'),
+		]);
+	}
+
 	$id = 0;
+	$entries = [];
 
 	foreach ($r as $rr) {
-
-		$connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
-		$ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
+		$connlnk = DI::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
+		$ignlnk = DI::baseUrl() . '/suggest?ignore=' . $rr['id'];
 		$photo_menu = [
-			'profile' => [L10n::t("View Profile"), Contact::magicLink($rr["url"])],
-			'follow' => [L10n::t("Connect/Follow"), $connlnk],
-			'hide' => [L10n::t('Ignore/Hide'), $ignlnk]
+			'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($rr["url"])],
+			'follow' => [DI::l10n()->t("Connect/Follow"), $connlnk],
+			'hide' => [DI::l10n()->t('Ignore/Hide'), $ignlnk]
 		];
 
 		$contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
@@ -102,10 +118,10 @@ function suggest_content(App $a)
 			'account_type'  => Contact::getAccountType($contact_details),
 			'ignlnk' => $ignlnk,
 			'ignid' => $rr['id'],
-			'conntxt' => L10n::t('Connect'),
+			'conntxt' => DI::l10n()->t('Connect'),
 			'connlnk' => $connlnk,
 			'photo_menu' => $photo_menu,
-			'ignore' => L10n::t('Ignore/Hide'),
+			'ignore' => DI::l10n()->t('Ignore/Hide'),
 			'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
 			'id' => ++$id,
 		];
@@ -115,7 +131,7 @@ function suggest_content(App $a)
 	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
 	$o .= Renderer::replaceMacros($tpl,[
-		'$title' => L10n::t('Friend Suggestions'),
+		'$title' => DI::l10n()->t('Friend Suggestions'),
 		'$contacts' => $entries,
 	]);