From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 8 Jul 2013 17:09:08 +0000 (+0200)
Subject: Properly handling profile preview for deleted users
X-Git-Tag: 2.0.0_Beta_5~91
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a821cb93dac0ac38dd60fdbd859dd97418798331;p=GitHub%2FWoltLab%2FWCF.git

Properly handling profile preview for deleted users
---

diff --git a/com.woltlab.wcf/templates/userProfilePreview.tpl b/com.woltlab.wcf/templates/userProfilePreview.tpl
index f3f3f27ae6..83e1929dac 100644
--- a/com.woltlab.wcf/templates/userProfilePreview.tpl
+++ b/com.woltlab.wcf/templates/userProfilePreview.tpl
@@ -1,51 +1,55 @@
-<div class="box128 userProfilePreview">
-	<a href="{link controller='User' object=$user}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag(128)}</a>
-	
-	{if $__wcf->getUser()->userID && $__wcf->getUser()->userID != $user->userID}
-		<script>
-			//<![CDATA[
-				$(function() {
-					WCF.Language.addObject({
-						'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-						'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-						'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-						'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
-					});
-					
-					new WCF.User.Action.Follow($('.userInformation'));
-					
-					{if !$user->getPermission('user.profile.cannotBeIgnored')}
-						new WCF.User.Action.Ignore($('.userInformation'));
-					{/if}
-				});
-			//]]>
-		</script>
-	{/if}
-	
-	<div class="userInformation">
-		{include file='userInformation'}
+{if $unknownUser|isset}
+	<p>{lang}wcf.user.unknownUser{/lang}</p>
+{else}
+	<div class="box128 userProfilePreview">
+		<a href="{link controller='User' object=$user}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag(128)}</a>
 		
-		{if $user->canViewOnlineStatus() && $user->getLastActivityTime()}
-			<dl class="plain inlineDataList userStats">
-				<dt>{lang}wcf.user.usersOnline.lastActivity{/lang}</dt>
-				<dd>{@$user->getLastActivityTime()|time}{if $user->getCurrentLocation()}, {@$user->getCurrentLocation()}{/if}</dd>
-			</dl>
+		{if $__wcf->getUser()->userID && $__wcf->getUser()->userID != $user->userID}
+			<script>
+				//<![CDATA[
+					$(function() {
+						WCF.Language.addObject({
+							'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
+							'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
+							'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
+							'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
+						});
+						
+						new WCF.User.Action.Follow($('.userInformation'));
+						
+						{if !$user->getPermission('user.profile.cannotBeIgnored')}
+							new WCF.User.Action.Ignore($('.userInformation'));
+						{/if}
+					});
+				//]]>
+			</script>
 		{/if}
 		
-		{hascontent}
-			<dl class="plain inlineDataList userFields">
-				{content}
-					{if $user->occupation}
-						<dt>{lang}wcf.user.option.occupation{/lang}</dt>
-						<dd>{$user->occupation}</dd>
-					{/if}
-					{if $user->hobbies}
-						<dt>{lang}wcf.user.option.hobbies{/lang}</dt>
-						<dd>{$user->hobbies}</dd>
-					{/if}
-					{event name='userFields'}
-				{/content}
-			</dl>
-		{/hascontent}
+		<div class="userInformation">
+			{include file='userInformation'}
+			
+			{if $user->canViewOnlineStatus() && $user->getLastActivityTime()}
+				<dl class="plain inlineDataList userStats">
+					<dt>{lang}wcf.user.usersOnline.lastActivity{/lang}</dt>
+					<dd>{@$user->getLastActivityTime()|time}{if $user->getCurrentLocation()}, {@$user->getCurrentLocation()}{/if}</dd>
+				</dl>
+			{/if}
+			
+			{hascontent}
+				<dl class="plain inlineDataList userFields">
+					{content}
+						{if $user->occupation}
+							<dt>{lang}wcf.user.option.occupation{/lang}</dt>
+							<dd>{$user->occupation}</dd>
+						{/if}
+						{if $user->hobbies}
+							<dt>{lang}wcf.user.option.hobbies{/lang}</dt>
+							<dd>{$user->hobbies}</dd>
+						{/if}
+						{event name='userFields'}
+					{/content}
+				</dl>
+			{/hascontent}
+		</div>
 	</div>
-</div>
\ No newline at end of file
+{/if}
diff --git a/wcfsetup/install/files/lib/data/user/UserProfileAction.class.php b/wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
index 4e44455c2c..8fd0de7325 100644
--- a/wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserProfileAction.class.php
@@ -95,14 +95,22 @@ class UserProfileAction extends UserAction {
 	public function getUserProfile() {
 		$userID = reset($this->objectIDs);
 		
-		$userProfileList = new UserProfileList();
-		$userProfileList->getConditionBuilder()->add("user_table.userID = ?", array($userID));
-		$userProfileList->readObjects();
-		$userProfiles = $userProfileList->getObjects();
-		
-		WCF::getTPL()->assign(array(
-			'user' => reset($userProfiles)
-		));
+		if ($userID) {
+			$userProfileList = new UserProfileList();
+			$userProfileList->getConditionBuilder()->add("user_table.userID = ?", array($userID));
+			$userProfileList->readObjects();
+			$userProfiles = $userProfileList->getObjects();
+			
+			if (empty($userProfiles)) {
+				WCF::getTPL()->assign('unknownUser', true);
+			}
+			else {
+				WCF::getTPL()->assign('user', reset($userProfiles));
+			}
+		}
+		else {
+			WCF::getTPL()->assign('unknownUser', true);
+		}
 		
 		return array(
 			'template' => WCF::getTPL()->fetch('userProfilePreview'),
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7a11c1a0bc..8ed2aa7680 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1876,6 +1876,7 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getAllowedExtensions()
 		<item name="wcf.user.registrationDate"><![CDATA[Registrierungsdatum]]></item>
 		<item name="wcf.user.visibleLanguages"><![CDATA[Inhaltssprachen]]></item>
 		<item name="wcf.user.visibleLanguages.description"><![CDATA[Zeigt Inhalte in den ausgewählten Sprachen an]]></item>
+		<item name="wcf.user.unknownUser"><![CDATA[Dieser Benutzer existiert nicht oder wurde gelöscht.]]></item>
 		<item name="wcf.user.userID"><![CDATA[Benutzer-ID]]></item>
 		<item name="wcf.user.username"><![CDATA[Benutzername]]></item>
 		<item name="wcf.user.username.placeholder"><![CDATA[Geben Sie einen Benutzernamen ein]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c01cc355b8..3738dd9a8f 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1875,6 +1875,7 @@ Allowed extensions: {', '|implode:$attachmentHandler->getAllowedExtensions()}]]>
 		<item name="wcf.user.registrationDate"><![CDATA[Registration Date]]></item>
 		<item name="wcf.user.visibleLanguages"><![CDATA[Multilingualism]]></item>
 		<item name="wcf.user.visibleLanguages.description"><![CDATA[Limits visibility to content associated with the selected languages]]></item>
+		<item name="wcf.user.unknownUser"><![CDATA[This user does not exist or has been deleted.]]></item>
 		<item name="wcf.user.userID"><![CDATA[User ID]]></item>
 		<item name="wcf.user.username"><![CDATA[Username]]></item>
 		<item name="wcf.user.username.placeholder"><![CDATA[Enter a username]]></item>