From dd8d9d7c70acc27bff59877f5782c2a455f6c3f4 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin@philipp.info>
Date: Tue, 28 Jan 2020 22:41:38 +0100
Subject: [PATCH] Fix ignore notification

---
 src/Module/BaseNotifications.php              | 24 -------------------
 src/Module/Notifications/Notification.php     | 20 ++++++++++++++++
 static/routes.config.php                      |  7 +++---
 view/templates/notifications/intros.tpl       |  2 +-
 view/templates/notifications/suggestions.tpl  |  2 +-
 .../frio/templates/notifications/intros.tpl   |  4 ++--
 6 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index 9a67bb5667..4deb2a24cc 100644
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -75,30 +75,6 @@ abstract class BaseNotifications extends BaseModule
 		self::$showAll      = ($_REQUEST['show'] ?? '') === 'all';
 	}
 
-	public static function post(array $parameters = [])
-	{
-		$request_id = DI::args()->get(1);
-
-		if ($request_id === 'all') {
-			return;
-		}
-
-		if ($request_id) {
-			$intro = DI::intro()->selectFirst(['id' => $request_id, 'uid' => local_user()]);
-
-			switch ($_POST['submit']) {
-				case DI::l10n()->t('Discard'):
-					$intro->discard();
-					break;
-				case DI::l10n()->t('Ignore'):
-					$intro->ignore();
-					break;
-			}
-
-			DI::baseUrl()->redirect('notifications/intros');
-		}
-	}
-
 	public static function rawContent(array $parameters = [])
 	{
 		// If the last argument of the query is NOT json, return
diff --git a/src/Module/Notifications/Notification.php b/src/Module/Notifications/Notification.php
index 9b252562cc..20530e81ae 100644
--- a/src/Module/Notifications/Notification.php
+++ b/src/Module/Notifications/Notification.php
@@ -19,6 +19,26 @@ class Notification extends BaseModule
 		}
 	}
 
+	public static function post(array $parameters = [])
+	{
+		$request_id = $parameters['id'] ?? false;
+
+		if (DI::args()->get(1) == 'action' && $request_id) {
+			$intro = DI::intro()->selectFirst(['id' => $request_id, 'uid' => local_user()]);
+
+			switch ($_POST['submit']) {
+				case DI::l10n()->t('Discard'):
+					$intro->discard();
+					break;
+				case DI::l10n()->t('Ignore'):
+					$intro->ignore();
+					break;
+			}
+
+			DI::baseUrl()->redirect('notifications/intros');
+		}
+	}
+
 	public static function rawContent(array $parameters = [])
 	{
 		// @TODO: Replace with parameter from router
diff --git a/static/routes.config.php b/static/routes.config.php
index c081dba66a..2dd6da1bf4 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -184,9 +184,10 @@ return [
 	],
 
 	'/notification'         => [
-		'[/]'            => [Module\Notifications\Notification::class, [R::GET]],
-		'/view/{id:\d+}' => [Module\Notifications\Notification::class, [R::GET]],
-		'/mark/all'      => [Module\Notifications\Notification::class, [R::GET]],
+		'[/]'               => [Module\Notifications\Notification::class, [R::GET]],
+		'/view/{id:\d+}'    => [Module\Notifications\Notification::class, [R::GET]],
+		'/mark/all'         => [Module\Notifications\Notification::class, [R::GET]],
+		'/action/{id:\d+}'  => [Module\Notifications\Notification::class, [        R::POST]],
 	],
 	'/objects/{guid}' => [Module\Objects::class, [R::GET]],
 
diff --git a/view/templates/notifications/intros.tpl b/view/templates/notifications/intros.tpl
index 808f155b9d..4ad96c7274 100644
--- a/view/templates/notifications/intros.tpl
+++ b/view/templates/notifications/intros.tpl
@@ -12,7 +12,7 @@
 <div class="intro-knowyou">{{$lbl_knowyou}} {{$knowyou}}</div>
 <div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div>
 <div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
-<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
+<form class="intro-form" action="notification/action/{{$intro_id}}" method="post">
 <input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
 {{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />{{/if}}
 </form>
diff --git a/view/templates/notifications/suggestions.tpl b/view/templates/notifications/suggestions.tpl
index d7bb7b6019..ac5c2e9c2a 100644
--- a/view/templates/notifications/suggestions.tpl
+++ b/view/templates/notifications/suggestions.tpl
@@ -8,7 +8,7 @@
 <a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
 <div class="intro-note" >{{$note}}</div>
 <div class="intro-wrapper-end"></div>
-<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
+<form class="intro-form" action="notification/action/{{$intro_id}}" method="post">
 <input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
 <input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
 </form>
diff --git a/view/theme/frio/templates/notifications/intros.tpl b/view/theme/frio/templates/notifications/intros.tpl
index 4bab6fa964..879920af36 100644
--- a/view/theme/frio/templates/notifications/intros.tpl
+++ b/view/theme/frio/templates/notifications/intros.tpl
@@ -13,7 +13,7 @@
 		<div class="intro-actions pull-right nav-pills preferences">
 			<button class="btn-link intro-action-link" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}');" aria-label="{{$approve}}" title="{{$approve}}" data-toggle="tooltip"><i class="fa fa-check" aria-hidden="true"></i></button>
 
-			<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
+			<form class="intro-form" action="notification/action/{{$intro_id}}" method="post">
 				<button class="btn-link intro-submit-ignore intro-action-link" type="submit" name="submit" value="{{$ignore}}" aria-label="{{$ignore}}" title="{{$ignore}}" data-toggle="tooltip"><i class="fa fa-ban" aria-hidden="true"></i></button>
 				{{if $discard}}<button class="btn-link intro-submit-discard intro-action-link" type="submit" name="submit" value="{{$discard}}" aria-label="{{$discard}}" title="{{$discard}}" data-toggle="tooltip"><i class="fa fa-trash-o" aria-hidden="true"></i></button>{{/if}}
 			</form>
@@ -73,7 +73,7 @@
 	{{* On mobile touch devices we use buttons for approve, ingnore && discard to have a better UX *}}
 	{{if $APP->is_mobile}}
 	<div class="intro-action-buttons">
-		<form class="intro-form pull-left" action="notifications/{{$intro_id}}" method="post">
+		<form class="intro-form pull-left" action="notification/action/{{$intro_id}}" method="post">
 			<button class="btn btn-small btn-default intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}">{{$ignore}}</button>
 			{{if $discard}}<button class="btn btn-small btn-default intro-submit-discard" type="submit" name="submit" value="{{$discard}}">{{$discard}}</button>&nbsp;{{/if}}
 		</form>