From e2c010a861546f1ded52bf14e122738fd1d62c27 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 12 Dec 2014 14:49:58 +0100
Subject: [PATCH] Fixed fetching queues was still using the outdated logic

---
 com.woltlab.wcf/templates/userPanel.tpl       |  9 +---
 .../queue/ModerationQueueAction.class.php     | 47 ++++++++++++++-----
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/com.woltlab.wcf/templates/userPanel.tpl b/com.woltlab.wcf/templates/userPanel.tpl
index 65e91f142d..6c333e08c2 100644
--- a/com.woltlab.wcf/templates/userPanel.tpl
+++ b/com.woltlab.wcf/templates/userPanel.tpl
@@ -191,19 +191,12 @@
 				<script data-relocate="true">
 					//<![CDATA[
 					$(function() {
-						/*WCF.Language.addObject({
-							'wcf.moderation.noMoreItems': '{lang}wcf.moderation.noMoreItems{/lang}',
-							'wcf.moderation.showAll': '{lang}wcf.moderation.showAll{/lang}',
-							'wcf.moderation.showDeletedContent': '{lang}wcf.moderation.showDeletedContent{/lang}'
-						});*/
-						
-						//new WCF.Moderation.UserPanel('{link controller='ModerationList' encode=false}{/link}', '{link controller='DeletedContentList' encode=false}{/link}');
-						
 						new WCF.User.Panel.Moderation({
 							deletedContent: '{lang}wcf.moderation.showDeletedContent{/lang}',
 							deletedContentLink: '{link controller='DeletedContentList' encode=false}{/link}',
 							markAllAsReadConfirmMessage: '{lang}wcf.moderation.markAllAsRead.confirmMessage{/lang}',
 							noItems: '{lang}wcf.moderation.noMoreItems{/lang}',
+							showAllLink: '{link controller='ModerationList' encode=false}{/link}',
 							title: '{lang}wcf.moderation.moderation{/lang}'
 						});
 					});
diff --git a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php
index a9f182f361..692aa708f3 100644
--- a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php
+++ b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php
@@ -103,27 +103,50 @@ class ModerationQueueAction extends AbstractDatabaseObjectAction {
 	public function getOutstandingQueues() {
 		$objectTypeIDs = ModerationQueueManager::getInstance()->getObjectTypeIDs(array_keys(ModerationQueueManager::getInstance()->getDefinitions()));
 		
-		$queueList = new ViewableModerationQueueList();
-		$queueList->getConditionBuilder()->add("moderation_queue.objectTypeID IN (?)", array($objectTypeIDs));
-		$queueList->getConditionBuilder()->add("moderation_queue.status IN (?)", array(array(ModerationQueue::STATUS_OUTSTANDING, ModerationQueue::STATUS_PROCESSING)));
-		$queueList->sqlOrderBy = 'moderation_queue.lastChangeTime DESC';
-		$queueList->sqlLimit = 5;
-		$queueList->loadUserProfiles = true;
-		$queueList->readObjects();
+		$conditions = new PreparedStatementConditionBuilder();
+		$conditions->add("moderation_queue_to_user.userID = ?", array(WCF::getUser()->userID));
+		$conditions->add("moderation_queue_to_user.isAffected = ?", array(1));
+		$conditions->add("moderation_queue.status IN (?)", array(array(ModerationQueue::STATUS_OUTSTANDING, ModerationQueue::STATUS_PROCESSING)));
+		$conditions->add("moderation_queue.time > ?", array(VisitTracker::getInstance()->getVisitTime('com.woltlab.wcf.moderation.queue')));
+		$conditions->add("(moderation_queue.time > tracked_visit.visitTime OR tracked_visit.visitTime IS NULL)");
+		
+		$sql = "SELECT		moderation_queue.queueID
+			FROM		wcf".WCF_N."_moderation_queue_to_user moderation_queue_to_user
+			LEFT JOIN	wcf".WCF_N."_moderation_queue moderation_queue
+			ON		(moderation_queue.queueID = moderation_queue_to_user.queueID)
+			LEFT JOIN	wcf".WCF_N."_tracked_visit tracked_visit
+			ON		(tracked_visit.objectTypeID = ".VisitTracker::getInstance()->getObjectTypeID('com.woltlab.wcf.moderation.queue')." AND tracked_visit.objectID = moderation_queue.queueID AND tracked_visit.userID = ".WCF::getUser()->userID.")
+			".$conditions."
+			ORDER BY	moderation_queue.lastChangeTime DESC";
+		$statement = WCF::getDB()->prepareStatement($sql, 5);
+		$statement->execute($conditions->getParameters());
+		$queueIDs = array();
+		while ($row = $statement->fetchArray()) {
+			$queueIDs[] = $row['queueID'];
+		}
+		
+		$queues = array();
+		if (!empty($queueIDs)) {
+			$queueList = new ViewableModerationQueueList();
+			$queueList->setObjectIDs($queueIDs);
+			$queueList->loadUserProfiles = true;
+			$queueList->readObjects();
+			$queues = $queueList->getObjects();
+		}
 		
 		WCF::getTPL()->assign(array(
-			'queues' => $queueList
+			'queues' => $queues
 		));
 		
 		// check if user storage is outdated
-		$totalCount = ModerationQueueManager::getInstance()->getOutstandingModerationCount();
-		$count = count($queueList);
+		$totalCount = ModerationQueueManager::getInstance()->getUnreadModerationCount();
+		$count = count($queues);
 		if ($count < 5 && $count < $totalCount) {
 			UserStorageHandler::getInstance()->reset(array(WCF::getUser()->userID), 'outstandingModerationCount');
 			
 			// check for orphaned queues
-			$queueCount = ModerationQueueManager::getInstance()->getOutstandingModerationCount();
-			if (count($queueList) < $queueCount) {
+			$queueCount = ModerationQueueManager::getInstance()->getUnreadModerationCount();
+			if (count($queues) < $queueCount) {
 				ModerationQueueManager::getInstance()->identifyOrphans();
 			}
 		}
-- 
2.20.1