From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 27 Jun 2018 13:40:43 +0000 (+0200)
Subject: Track the number of articles written per user
X-Git-Tag: 5.2.0_Alpha_1~140^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bd1067ab66b06ebb89b3da0f23f40cfef373bcfc;p=GitHub%2FWoltLab%2FWCF.git

Track the number of articles written per user

See #2586
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 1566dba96b..0411cbbbf5 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1476,6 +1476,11 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
 				<defaultvalue>1</defaultvalue>
 				<options>module_trophy</options>
 			</option>
+			<option name="message_sidebar_enable_articles">
+				<categoryname>message.sidebar</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
 			<option name="message_sidebar_user_options">
 				<categoryname>message.sidebar</categoryname>
 				<optiontype>useroptions</optiontype>
diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index 9e22ea6d06..37dd130a54 100644
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -96,6 +96,11 @@
 								<dd>{#$userProfile->trophyPoints}</dd>
 							{/if}
 							
+							{if MESSAGE_SIDEBAR_ENABLE_ARTICLES && $userProfile->articles}
+								<dt><a href="{link controller='ArticleList' userID=$userProfile->userID}{/link}" class="jsTooltip" title="{lang user=$userProfile}wcf.article.showArticlesWritten{/lang}">{lang}wcf.user.articles{/lang}</a></dt>
+								<dd>{#$userProfile->articles}</dd>
+							{/if}
+							
 							{event name='userCredits'}
 							
 							{if MESSAGE_SIDEBAR_USER_OPTIONS && $userProfile->isAccessible('canViewProfile')}
diff --git a/constants.php b/constants.php
index 19c0f160c1..986a884210 100644
--- a/constants.php
+++ b/constants.php
@@ -239,3 +239,4 @@ define('PAGE_LOGO_LINK_TO_APP_DEFAULT', 1);
 define('MODULE_USER_COVER_PHOTO', 1);
 define('IMAGE_ALLOW_EXTERNAL_SOURCE', 0);
 define('MESSAGE_ENABLE_TOC', 1);
+define('MESSAGE_SIDEBAR_ENABLE_ARTICLES', 1);
diff --git a/wcfsetup/install/files/lib/data/article/ArticleAction.class.php b/wcfsetup/install/files/lib/data/article/ArticleAction.class.php
index 3fc7456573..2e6e9444e6 100644
--- a/wcfsetup/install/files/lib/data/article/ArticleAction.class.php
+++ b/wcfsetup/install/files/lib/data/article/ArticleAction.class.php
@@ -138,6 +138,10 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 			UserStorageHandler::getInstance()->resetAll('unreadArticles');
 		}
 		
+		if ($article->publicationStatus == Article::PUBLISHED) {
+			ArticleEditor::updateArticleCounter([$article->userID => 1]);
+		}
+		
 		return $article;
 	}
 	
@@ -241,6 +245,28 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 		if (ARTICLE_ENABLE_VISIT_TRACKING) {
 			UserStorageHandler::getInstance()->resetAll('unreadArticles');
 		}
+		
+		$publicationStatus = (isset($this->parameters['data']['publicationStatus'])) ? $this->parameters['data']['publicationStatus'] : null;
+		if ($publicationStatus !== null) {
+			$usersToArticles = [];
+			/** @var ArticleEditor $articleEditor */
+			foreach ($this->objects as $articleEditor) {
+				if ($publicationStatus != $articleEditor->publicationStatus) {
+					// The article was published before or was now published.
+					if ($publicationStatus == Article::PUBLISHED || $articleEditor->publicationStatus == Article::PUBLISHED) {
+						if (!isset($usersToArticles[$articleEditor->userID])) {
+							$usersToArticles[$articleEditor->userID] = 0;
+						}
+						
+						$usersToArticles[$articleEditor->userID] += ($publicationStatus == Article::PUBLISHED) ? 1 : -1;
+					}
+				}
+			}
+			
+			if (!empty($usersToArticles)) {
+				ArticleEditor::updateArticleCounter($usersToArticles);
+			}
+		}
 	}
 	
 	/**
@@ -552,14 +578,23 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 	 * Publishes articles.
 	 */
 	public function publish() {
+		$usersToArticles = [];
 		foreach ($this->getObjects() as $articleEditor) {
 			$articleEditor->update([
 				'time' => TIME_NOW,
 				'publicationStatus' => Article::PUBLISHED,
 				'publicationDate' => 0
 			]);
+			
+			if (!isset($usersToArticles[$articleEditor->userID])) {
+				$usersToArticles[$articleEditor->userID] = 0;
+			}
+			
+			$usersToArticles[$articleEditor->userID]++;
 		}
 		
+		ArticleEditor::updateArticleCounter($usersToArticles);
+		
 		$this->unmarkItems();
 	}
 	
@@ -590,10 +625,19 @@ class ArticleAction extends AbstractDatabaseObjectAction {
 	 * Unpublishes articles.
 	 */
 	public function unpublish() {
+		$usersToArticles = [];
 		foreach ($this->getObjects() as $articleEditor) {
 			$articleEditor->update(['publicationStatus' => Article::UNPUBLISHED]);
+			
+			if (!isset($usersToArticles[$articleEditor->userID])) {
+				$usersToArticles[$articleEditor->userID] = 0;
+			}
+			
+			$usersToArticles[$articleEditor->userID]--;
 		}
 		
+		ArticleEditor::updateArticleCounter($usersToArticles);
+		
 		$this->unmarkItems();
 	}
 	
diff --git a/wcfsetup/install/files/lib/data/article/ArticleEditor.class.php b/wcfsetup/install/files/lib/data/article/ArticleEditor.class.php
index 9993c67308..c48831ee73 100644
--- a/wcfsetup/install/files/lib/data/article/ArticleEditor.class.php
+++ b/wcfsetup/install/files/lib/data/article/ArticleEditor.class.php
@@ -2,6 +2,7 @@
 declare(strict_types=1);
 namespace wcf\data\article;
 use wcf\data\DatabaseObjectEditor;
+use wcf\system\WCF;
 
 /**
  * Provides functions to edit cms articles.
@@ -21,4 +22,20 @@ class ArticleEditor extends DatabaseObjectEditor {
 	 * @inheritDoc
 	 */
 	protected static $baseClass = Article::class;
+	
+	/**
+	 * Updates the article counter of the given user ids.
+	 * 
+	 * @param       int[]   $users  user id => article counter increase/decrease
+	 * @since       3.2
+	 */
+	public static function updateArticleCounter(array $users) {
+		$sql = "UPDATE	wcf".WCF_N."_user
+			SET	articles = articles + ?
+			WHERE	userID = ?";
+		$statement = WCF::getDB()->prepareStatement($sql);
+		foreach ($users as $userID => $articles) {
+			$statement->execute([$articles, $userID]);
+		}
+	}
 }
diff --git a/wcfsetup/install/files/lib/data/user/User.class.php b/wcfsetup/install/files/lib/data/user/User.class.php
index 23946382d3..d2a8130937 100644
--- a/wcfsetup/install/files/lib/data/user/User.class.php
+++ b/wcfsetup/install/files/lib/data/user/User.class.php
@@ -70,6 +70,7 @@ use wcf\util\UserUtil;
  * @property-read       integer         $disableCoverPhoto              is `1` if the user's cover photo has been disabled, otherwise `0`
  * @property-read	string		$disableCoverPhotoReason	reason why the user's cover photo is disabled
  * @property-read	integer		$disableCoverPhotoExpires	timestamp at which the user's cover photo will automatically be enabled again
+ * @property-read	integer		$articles			number of articles written by the user
  */
 final class User extends DatabaseObject implements IRouteController, IUserContent {
 	/**
diff --git a/wcfsetup/install/files/lib/page/ArticleListPage.class.php b/wcfsetup/install/files/lib/page/ArticleListPage.class.php
index ed848ae71f..430b23a48d 100644
--- a/wcfsetup/install/files/lib/page/ArticleListPage.class.php
+++ b/wcfsetup/install/files/lib/page/ArticleListPage.class.php
@@ -5,6 +5,8 @@ use wcf\data\article\category\ArticleCategory;
 use wcf\data\article\AccessibleArticleList;
 use wcf\data\label\group\ViewableLabelGroup;
 use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\user\User;
+use wcf\system\exception\IllegalLinkException;
 use wcf\system\label\LabelHandler;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
@@ -69,6 +71,12 @@ class ArticleListPage extends MultipleLinkPage {
 	 */
 	public $controllerParameters = ['application' => 'wcf'];
 	
+	/**
+	 * @var User
+	 * @since 3.2
+	 */
+	public $user;
+	
 	/**
 	 * @inheritDoc
 	 */
@@ -96,6 +104,15 @@ class ArticleListPage extends MultipleLinkPage {
 			}
 		}
 		
+		if (!empty($_GET['userID'])) {
+			$this->user = new User(intval($_GET['userID']));
+			if (!$this->user->userID) {
+				throw new IllegalLinkException();
+			}
+			
+			$this->controllerParameters['userID'] = $this->user->userID;
+		}
+		
 		if (!empty($_POST)) {
 			$labelParameters = '';
 			if (!empty($this->labelIDs)) {
@@ -108,7 +125,7 @@ class ArticleListPage extends MultipleLinkPage {
 			exit;
 		}
 		
-		$this->canonicalURL = LinkHandler::getInstance()->getLink('ArticleList', [], ($this->pageNo > 1 ? 'pageNo=' . $this->pageNo : ''));
+		$this->canonicalURL = LinkHandler::getInstance()->getLink('ArticleList', $this->controllerParameters, ($this->pageNo > 1 ? 'pageNo=' . $this->pageNo : ''));
 	}
 	
 	/**
@@ -121,6 +138,10 @@ class ArticleListPage extends MultipleLinkPage {
 	}
 	
 	protected function applyFilters() {
+		if ($this->user) {
+			$this->objectList->getConditionBuilder()->add("article.userID = ?", [$this->user->userID]);
+		}
+		
 		// filter by label
 		if (!empty($this->labelIDs)) {
 			$objectTypeID = ObjectTypeCache::getInstance()->getObjectTypeByName('com.woltlab.wcf.label.object', 'com.woltlab.wcf.article')->objectTypeID;
@@ -156,7 +177,8 @@ class ArticleListPage extends MultipleLinkPage {
 			'labelGroups' => $this->labelGroups,
 			'labelIDs' => $this->labelIDs,
 			'controllerName' => $this->controllerName,
-			'controllerObject' => null
+			'controllerObject' => null,
+			'user' => $this->user
 		]);
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/worker/UserRebuildDataWorker.class.php b/wcfsetup/install/files/lib/system/worker/UserRebuildDataWorker.class.php
index 781f2f0a87..74ee8fa333 100644
--- a/wcfsetup/install/files/lib/system/worker/UserRebuildDataWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/UserRebuildDataWorker.class.php
@@ -71,10 +71,21 @@ class UserRebuildDataWorker extends AbstractRebuildDataWorker {
 			// update activity points
 			UserActivityPointHandler::getInstance()->updateUsers($userIDs);
 			
+			// update article counter
+			$conditionBuilder = new PreparedStatementConditionBuilder();
+			$conditionBuilder->add('user_table.userID IN (?)', [$userIDs]);
+			$sql = "UPDATE  wcf".WCF_N."_user user_table
+				SET     articles = (
+						SELECT  COUNT(*)
+						FROM    wcf".WCF_N."_article
+						WHERE   userID = user_table.userID
+					)
+				".$conditionBuilder;
+			$statement = WCF::getDB()->prepareStatement($sql);
+			$statement->execute($conditionBuilder->getParameters());
+			
 			// update like counter
 			if (MODULE_LIKE) {
-				$conditionBuilder = new PreparedStatementConditionBuilder();
-				$conditionBuilder->add('user_table.userID IN (?)', [$userIDs]);
 				$sql = "UPDATE	wcf".WCF_N."_user user_table
 					SET	likesReceived = (
 							SELECT	COUNT(*)
@@ -89,8 +100,6 @@ class UserRebuildDataWorker extends AbstractRebuildDataWorker {
 			
 			// update trophy points
 			if (MODULE_TROPHY) {
-				$conditionBuilder = new PreparedStatementConditionBuilder();
-				$conditionBuilder->add('user_table.userID IN (?)', [$userIDs]);
 				$sql = "UPDATE	wcf".WCF_N."_user user_table
 					SET	trophyPoints = (
 							SELECT		COUNT(*)
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 0881ea36dc..60312afed4 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2341,6 +2341,7 @@ Benutzerkontos nun in vollem Umfang nutzen.]]></item>
 		<item name="wcf.article.sortField.time"><![CDATA[Datum]]></item>
 		<item name="wcf.article.sortField.views"><![CDATA[Zugriffe]]></item>
 		<item name="wcf.article.markAllAsRead"><![CDATA[Alle Artikel als gelesen markieren]]></item>
+		<item name="wcf.article.showArticlesWritten"><![CDATA[Artikel von {$user->username}]]></item>
 	</category>
 	
 	<category name="wcf.attachment">
@@ -3692,6 +3693,7 @@ sich{/if} nicht bei uns registriert {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}
 		<item name="wcf.user.sortField.registrationDate"><![CDATA[Registrierungsdatum]]></item>
 		<item name="wcf.user.sortField.username"><![CDATA[Benutzername]]></item>
 		<item name="wcf.user.sortField.lastActivityTime"><![CDATA[Letzte Aktivität]]></item>
+		<item name="wcf.user.articles"><![CDATA[Artikel]]></item>
 	</category>
 	
 	<category name="wcf.user.menu">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index ded15c36fe..817412d951 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2277,6 +2277,7 @@ full extend.]]></item>
 		<item name="wcf.article.sortField.time"><![CDATA[Date]]></item>
 		<item name="wcf.article.sortField.views"><![CDATA[Views]]></item>
 		<item name="wcf.article.markAllAsRead"><![CDATA[Mark All Articles as Read]]></item>
+		<item name="wcf.article.showArticlesWritten"><![CDATA[Articles by {$user->username}]]></item>
 	</category>
 	
 	<category name="wcf.attachment">
@@ -3686,6 +3687,7 @@ not register with us.]]></item>
 		<item name="wcf.user.sortField.registrationDate"><![CDATA[Registration Date]]></item>
 		<item name="wcf.user.sortField.username"><![CDATA[Username]]></item>
 		<item name="wcf.user.sortField.lastActivityTime"><![CDATA[Last Activity]]></item>
+		<item name="wcf.user.articles"><![CDATA[Articles]]></item>
 	</category>
 	
 	<category name="wcf.user.menu">
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index c4f7555de5..83e79596e2 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1432,6 +1432,7 @@ CREATE TABLE wcf1_user (
 	disableCoverPhoto TINYINT(1) NOT NULL DEFAULT 0,
 	disableCoverPhotoReason TEXT,
 	disableCoverPhotoExpires INT(10) NOT NULL DEFAULT 0,
+	articles INT(10) NOT NULL DEFAULT 0,
 	
 	KEY username (username),
 	KEY email (email),