From 472db6722e19f8094549cb36244e7358d8710061 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Joshua=20R=C3=BCsweg?= <josh@bastelstu.be>
Date: Wed, 19 Jul 2017 21:54:31 +0200
Subject: [PATCH] Add canViewTrophy user option

See #2315
---
 com.woltlab.wcf/userOption.xml                       | 12 ++++++++++++
 .../files/lib/data/user/trophy/UserTrophy.class.php  |  3 +--
 wcfsetup/install/lang/de.xml                         |  1 +
 wcfsetup/install/lang/en.xml                         |  1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/com.woltlab.wcf/userOption.xml b/com.woltlab.wcf/userOption.xml
index 547a264ca5..3c1d26973e 100644
--- a/com.woltlab.wcf/userOption.xml
+++ b/com.woltlab.wcf/userOption.xml
@@ -219,6 +219,18 @@
 3:wcf.user.access.nobody</selectoptions>
 				<defaultvalue>0</defaultvalue>
 			</option>
+			<option name="canViewTrophies">
+				<categoryname>settings.privacy.content</categoryname>
+				<optiontype>select</optiontype>
+				<editable>3</editable>
+				<selectoptions>0:wcf.user.access.everyone
+1:wcf.user.access.registered
+2:wcf.user.access.following
+3:wcf.user.access.nobody</selectoptions>
+				<options>module_trophy</options>
+				<permissions>user.profile.trophy.canSeeTrophies</permissions>
+				<defaultvalue>0</defaultvalue>
+			</option>
 			
 			<!-- settings.privacy.messaging -->
 			<option name="canViewEmailAddress">
diff --git a/wcfsetup/install/files/lib/data/user/trophy/UserTrophy.class.php b/wcfsetup/install/files/lib/data/user/trophy/UserTrophy.class.php
index 1bb469996f..7fc18f1e7c 100644
--- a/wcfsetup/install/files/lib/data/user/trophy/UserTrophy.class.php
+++ b/wcfsetup/install/files/lib/data/user/trophy/UserTrophy.class.php
@@ -96,8 +96,7 @@ class UserTrophy extends DatabaseObject {
 			return false;
 		}
 		
-		// @TODO check user option canViewTrophies
-		return true;
+		return $this->getUserProfile()->isAccessible('canViewTrophies') || $user->userID == $this->userID;
 	}
 	
 	/**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index b1aa694dab..aa23d4a6b8 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3943,6 +3943,7 @@ Benachrichtigungen auf <a href="{link isEmail=true}{/link}">{PAGE_TITLE|language
 		<item name="wcf.user.option.canViewEmailAddress"><![CDATA[Kann E-Mail-Adresse sehen]]></item>
 		<item name="wcf.user.option.canViewOnlineStatus"><![CDATA[Kann Online-Status sehen]]></item>
 		<item name="wcf.user.option.canViewProfile"><![CDATA[Kann Benutzerprofil sehen]]></item>
+		<item name="wcf.user.option.canViewTrophies"><![CDATA[Kann Trophäen sehen]]></item>
 		
 		<item name="wcf.user.option.category.profile"><![CDATA[Persönliche Daten]]></item>
 		<item name="wcf.user.option.category.profile.aboutMe"><![CDATA[Über mich]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 83fde96f64..09a1bcb1bb 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3936,6 +3936,7 @@ your notifications on <a href="{link isEmail=true}{/link}">{PAGE_TITLE|language}
 		<item name="wcf.user.option.canViewEmailAddress"><![CDATA[Can View My Email Address]]></item>
 		<item name="wcf.user.option.canViewOnlineStatus"><![CDATA[Can View My Online Status]]></item>
 		<item name="wcf.user.option.canViewProfile"><![CDATA[Can View My Profile]]></item>
+		<item name="wcf.user.option.canViewTrophies"><![CDATA[Can View Trophies]]></item>
 		
 		<item name="wcf.user.option.category.profile"><![CDATA[Personal Data]]></item>
 		<item name="wcf.user.option.category.profile.aboutMe"><![CDATA[About Me]]></item>
-- 
2.20.1