From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 2 Dec 2014 21:24:05 +0000 (+0100)
Subject: Improved notification links to mark items as confirmed
X-Git-Tag: 2.1.0_Beta_1~102
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=09abc0769ebad8a06024930fa0996b76dbfe7f3c;p=GitHub%2FWoltLab%2FWCF.git

Improved notification links to mark items as confirmed
---

diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index da5d1977e1..6522ea6a33 100644
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -63,7 +63,7 @@
 			<div class="container marginTop">
 				<ul class="containerList userNotificationItemList">
 		{/if}
-				<li class="jsNotificationItem notificationItem{if $notification[authors] > 1} groupedNotificationItem{/if}{if !$notification[event]->isConfirmed()} notificationUnconfirmed{/if}" data-notification-id="{@$notification[notificationID]}" data-link="{$notification[event]->getLink()}" data-is-grouped="{if $notification[authors] > 1}true{else}false{/if}" data-is-confirmed="{if $notification[event]->isConfirmed()}true{else}false{/if}">
+				<li class="jsNotificationItem notificationItem{if $notification[authors] > 1} groupedNotificationItem{/if}{if !$notification[event]->isConfirmed()} notificationUnconfirmed{/if}" data-notification-id="{@$notification[notificationID]}" data-link="{$notification[event]->getLink()}" data-confirm-link="{link controller='NotificationConfirm' id=$notification[notificationID]}{/link}" data-is-grouped="{if $notification[authors] > 1}true{else}false{/if}" data-is-confirmed="{if $notification[event]->isConfirmed()}true{else}false{/if}">
 					<div class="box24">
 						{if $notification[authors] < 2}
 							<div class="framed">
diff --git a/com.woltlab.wcf/templates/notificationListOustanding.tpl b/com.woltlab.wcf/templates/notificationListOustanding.tpl
index ccb5cb282c..e8bae594ee 100644
--- a/com.woltlab.wcf/templates/notificationListOustanding.tpl
+++ b/com.woltlab.wcf/templates/notificationListOustanding.tpl
@@ -1,5 +1,5 @@
 {foreach from=$notifications[notifications] item=notification}
-	<li class="jsNotificationItem notificationItem{if $notification[event]->getAuthors()|count > 1} groupedNotificationItem{/if}{if !$notification[event]->isConfirmed()} notificationUnconfirmed{/if}" data-link="{$notification[event]->getLink()}" data-notification-id="{@$notification[notificationID]}" data-is-confirmed="{if $notification[event]->isConfirmed()}true{else}false{/if}">
+	<li class="jsNotificationItem notificationItem{if $notification[event]->getAuthors()|count > 1} groupedNotificationItem{/if}{if !$notification[event]->isConfirmed()} notificationUnconfirmed{/if}" data-link="{$notification[event]->getLink()}" data-confirm-link="{link controller='NotificationConfirm' id=$notification[notificationID]}{/link}" data-notification-id="{@$notification[notificationID]}" data-is-confirmed="{if $notification[event]->isConfirmed()}true{else}false{/if}">
 		<span class="box24">
 			<div class="framed">
 				{if $notification[event]->getAuthors()|count < 2}
diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index 493dd20db4..718fa274c7 100644
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -1295,10 +1295,15 @@ WCF.Notification.List = Class.extend({
 	_convertList: function() {
 		$('.userNotificationItemList > .notificationItem').each((function(index, item) {
 			var $item = $(item);
+			var $isConfirmed = $item.data('isConfirmed');
 			
-			if (!$.browser.mobile && !$item.data('isConfirmed')) {
-				var $markAsConfirmed = $('<a href="#" class="icon icon24 fa-check green notificationItemMarkAsConfirmed jsTooltip" title="' + WCF.Language.get('wcf.user.notification.markAsConfirmed') + '" />').prependTo($item.find('> div.box24 > .framed'));
-				$markAsConfirmed.click($.proxy(this._markAsConfirmed, this));
+			if (!$isConfirmed) {
+				$item.find('a:not(.userLink)').prop('href', $item.data('confirmLink'));
+				
+				if (!$.browser.mobile) {
+					var $markAsConfirmed = $('<a href="#" class="icon icon24 fa-check green notificationItemMarkAsConfirmed jsTooltip" title="' + WCF.Language.get('wcf.user.notification.markAsConfirmed') + '" />').prependTo($item.find('> div.box24 > .framed'));
+					$markAsConfirmed.click($.proxy(this._markAsConfirmed, this));
+				}
 			}
 		}).bind(this));
 		
@@ -1448,15 +1453,20 @@ WCF.Notification.UserPanel = WCF.UserPanel.extend({
 		var $insertAfter = null;
 		$items.each((function(index, item) {
 			var $item = $(item);
+			var $isConfirmed = $item.data('isConfirmed');
 			
 			if (!$.browser.msie) {
 				$item.addClass('notificationItemLink');
-				$('<a href="' + $item.data('link') + '" />').appendTo($item);
+				$('<a href="' + ($isConfirmed ? $item.data('link') : $item.data('confirmLink')) + '" />').appendTo($item);
 			}
 			
-			if (!$.browser.mobile && !$item.data('isConfirmed')) {
-				var $markAsConfirmed = $('<a href="#" class="icon icon24 fa-check green notificationItemMarkAsConfirmed jsTooltip" title="' + WCF.Language.get('wcf.user.notification.markAsConfirmed') + '" />').prependTo($item.find('> span.box24 > .framed'));
-				$markAsConfirmed.click($.proxy(this._markAsConfirmed, this));
+			if (!$isConfirmed) {
+				$item.find('a:not(.userLink)').prop('href', $item.data('confirmLink'));
+				
+				if (!$.browser.mobile) {
+					var $markAsConfirmed = $('<a href="#" class="icon icon24 fa-check green notificationItemMarkAsConfirmed jsTooltip" title="' + WCF.Language.get('wcf.user.notification.markAsConfirmed') + '" />').prependTo($item.find('> span.box24 > .framed'));
+					$markAsConfirmed.click($.proxy(this._markAsConfirmed, this));
+				}
 			}
 			
 			if (!$item.data('isConfirmed')) {
diff --git a/wcfsetup/install/files/lib/action/NotificationConfirmAction.class.php b/wcfsetup/install/files/lib/action/NotificationConfirmAction.class.php
new file mode 100644
index 0000000000..fa30f9b9f7
--- /dev/null
+++ b/wcfsetup/install/files/lib/action/NotificationConfirmAction.class.php
@@ -0,0 +1,86 @@
+<?php
+namespace wcf\action;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\user\notification\event\UserNotificationEvent;
+use wcf\data\user\notification\UserNotification;
+use wcf\data\user\User;
+use wcf\data\user\UserProfile;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\user\notification\UserNotificationHandler;
+use wcf\system\WCF;
+use wcf\util\HeaderUtil;
+
+/**
+ * Marks target notification as confirmed and forwards to the notification URL.
+ * 
+ * @author	Alexander Ebert
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	action
+ * @category	Community Framework
+ */
+class NotificationConfirmAction extends AbstractAction {
+	/**
+	 * @see	\wcf\action\AbstractAction::$loginRequired
+	 */
+	public $loginRequired = true;
+	
+	/**
+	 * user notification object
+	 * @var	\wcf\data\user\notification\UserNotification
+	 */
+	public $notification = null;
+	
+	/**
+	 * user notification id
+	 * @var	integer
+	 */
+	public $notificationID = 0;
+	
+	/**
+	 * @see	\wcf\action\IAction::readParameters()
+	 */
+	public function readParameters() {
+		parent::readParameters();
+		
+		if (isset($_REQUEST['id'])) $this->notificationID = intval($_REQUEST['id']);
+		
+		$this->notification = new UserNotification($this->notificationID);
+		if (!$this->notification->notificationID) {
+			throw new IllegalLinkException();
+		}
+		
+		if ($this->notification->userID != WCF::getUser()->userID) {
+			throw new PermissionDeniedException();
+		}
+	}
+	
+	/**
+	 * @see	\wcf\action\IAction::execute()
+	 */
+	public function execute() {
+		parent::execute();
+		
+		if (!$this->notification->confirmTime) {
+			UserNotificationHandler::getInstance()->markAsConfirmedByID($this->notification->notificationID);
+		}
+		
+		$event = new UserNotificationEvent($this->notification->eventID);
+		$objectType = ObjectTypeCache::getInstance()->getObjectType($event->objectTypeID);
+		$objects = $objectType->getProcessor()->getObjectsByIDs(array($this->notification->objectID));
+		
+		$className = $event->className;
+		$notificationEvent = new $className($event);
+		$notificationEvent->setObject(
+			$this->notification,
+			$objects[$this->notification->objectID],
+			$unknownAuthor = new UserProfile(new User(null, array('userID' => null, 'username' => WCF::getLanguage()->get('wcf.user.guest')))),
+			$this->notification->additionalData
+		);
+		
+		HeaderUtil::redirect($notificationEvent->getLink());
+		exit;
+	}
+}