X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsuggest.php;h=4b67dd6eb8e7930b6d217c7dc46024d55707956f;hb=f4c94236c5ffea5ddd369b073aeec44320a137df;hp=81030842dcdf4dc220d05518e51a6fe2b157600f;hpb=8ca53993a591d45757279ba7ce743c19830df88a;p=friendica.git

diff --git a/mod/suggest.php b/mod/suggest.php
index 81030842dc..4b67dd6eb8 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -7,6 +7,7 @@ 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\Model\Contact;
@@ -18,39 +19,16 @@ function suggest_init(App $a)
 	if (! local_user()) {
 		return;
 	}
+}
 
-	if (x($_GET,'ignore') && intval($_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'] = replace_macros(get_markup_template('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(L10n::t('Contact suggestion successfully ignored.'));
 	}
 
+	$a->internalRedirect('suggest');
 }
 
 function suggest_content(App $a)
@@ -62,7 +40,7 @@ function suggest_content(App $a)
 		return;
 	}
 
-	$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
+	$_SESSION['return_path'] = $a->cmd;
 
 	$a->page['aside'] .= Widget::findPeople();
 	$a->page['aside'] .= Widget::follow();
@@ -75,10 +53,34 @@ function suggest_content(App $a)
 		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($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]];
+			}
+		}
+
+		return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
+			'$method' => 'post',
+			'$message' => L10n::t('Do you really want to delete this suggestion?'),
+			'$extra_inputs' => $inputs,
+			'$confirm' => L10n::t('Yes'),
+			'$confirm_url' => $query['base'],
+			'$confirm_name' => 'confirm',
+			'$cancel' => 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'];
 		$photo_menu = [
@@ -111,9 +113,9 @@ function suggest_content(App $a)
 		$entries[] = $entry;
 	}
 
-	$tpl = get_markup_template('viewcontact_template.tpl');
+	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-	$o .= replace_macros($tpl,[
+	$o .= Renderer::replaceMacros($tpl,[
 		'$title' => L10n::t('Friend Suggestions'),
 		'$contacts' => $entries,
 	]);