From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 8 Jul 2013 14:34:24 +0000 (+0200)
Subject: Showing deleted participants
X-Git-Tag: 2.0.0_Beta_3~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=07e90692edcdfefbdd6318257db54db6e5fe5f3d;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.conversation.git

Showing deleted participants
---

diff --git a/files/lib/data/conversation/ConversationParticipantList.class.php b/files/lib/data/conversation/ConversationParticipantList.class.php
index 71adef7..6d22854 100644
--- a/files/lib/data/conversation/ConversationParticipantList.class.php
+++ b/files/lib/data/conversation/ConversationParticipantList.class.php
@@ -1,5 +1,7 @@
 <?php 
 namespace wcf\data\conversation;
+use wcf\data\user\User;
+use wcf\data\user\UserProfile;
 use wcf\data\user\UserProfileList;
 use wcf\system\WCF;
 
@@ -7,13 +9,19 @@ use wcf\system\WCF;
  * Represents a list of conversation participants.
  * 
  * @author	Marcel Werk
- * @copyright	2001-2012 WoltLab GmbH
+ * @copyright	2001-2013 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	com.woltlab.wcf.conversation
  * @subpackage	data.conversation
  * @category	Community Framework
  */
 class ConversationParticipantList extends UserProfileList {
+	/**
+	 * conversation id
+	 * @var	integer
+	 */
+	public $conversationID = 0;
+	
 	/**
 	 * @see	wcf\data\DatabaseObjectList::$sqlLimit
 	 */
@@ -28,6 +36,7 @@ class ConversationParticipantList extends UserProfileList {
 	public function __construct($conversationID, $userID = 0, $isAuthor = false) {
 		parent::__construct();
 		
+		$this->conversationID = $conversationID;
 		$this->getConditionBuilder()->add('conversation_to_user.conversationID = ?', array($conversationID));
 		if (!$isAuthor) {
 			if ($userID) {
@@ -74,4 +83,26 @@ class ConversationParticipantList extends UserProfileList {
 			$this->objectIDs[] = $row['objectID'];
 		}
 	}
+	
+	/**
+	 * @see	wcf\data\user\UserProfileList::readObjects()
+	 */
+	public function readObjects() {
+		parent::readObjects();
+		
+		// check for deleted users
+		$sql = "SELECT	username
+			FROM	wcf".WCF_N."_conversation_to_user
+			WHERE	conversationID = ?
+				AND participantID IS NULL";
+		$statement = WCF::getDB()->prepareStatement($sql);
+		$statement->execute(array($this->conversationID));
+		$i = 0;
+		while ($row = $statement->fetchArray()) {
+			// create fake user profiles
+			$user = new User(null, array('userID' => 0, 'username' => $row['username']));
+			$this->objects['x'.++$i] = new UserProfile($user);
+			$this->indexToObject[] = 'x'.$i;
+		}
+	}
 }
diff --git a/templates/conversation.tpl b/templates/conversation.tpl
index 5dc52af..4a22864 100644
--- a/templates/conversation.tpl
+++ b/templates/conversation.tpl
@@ -78,12 +78,12 @@
 				{foreach from=$participants item=participant}
 					<li class="jsParticipant{if $participant->hideConversation == 2} conversationLeft{/if}">
 						<div class="box24">
-							<a href="{link controller='User' object=$participant}{/link}" class="framed">{@$participant->getAvatar()->getImageTag(24)}</a>
+							{if $participant->userID}<a href="{link controller='User' object=$participant}{/link}" class="framed">{@$participant->getAvatar()->getImageTag(24)}</a>{else}<span class="framed">{@$participant->getAvatar()->getImageTag(24)}</span>{/if}
 							<div>
 								<p>
-									<a href="{link controller='User' object=$participant}{/link}" class="userLink" data-user-id="{@$participant->userID}">{$participant->username}</a>
+									{if $participant->userID}<a href="{link controller='User' object=$participant}{/link}" class="userLink" data-user-id="{@$participant->userID}">{$participant->username}</a>{else}{$participant->username}{/if}
 									{if $participant->isInvisible}<small>({lang}wcf.conversation.invisible{/lang})</small>{/if}
-									{if ($conversation->userID == $__wcf->getUser()->userID) && ($participant->userID != $__wcf->getUser()->userID) && $participant->hideConversation != 2}
+									{if $participant->userID && ($conversation->userID == $__wcf->getUser()->userID) && ($participant->userID != $__wcf->getUser()->userID) && $participant->hideConversation != 2}
 										<a class="jsDeleteButton jsTooltip jsOnly" title="{lang}wcf.conversation.participants.removeParticipant{/lang}" data-confirm-message="{lang}wcf.conversation.participants.removeParticipant.confirmMessage{/lang}" data-object-id="{@$participant->userID}"><span class="icon icon16 icon-remove"></span></a>
 									{/if}
 								</p>