From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 23 May 2016 10:04:20 +0000 (+0200)
Subject: Added users online list pagination
X-Git-Tag: 3.0.0_Beta_1~1654
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f8114c0641f8816127cceac0c71243318dd3a3c;p=GitHub%2FWoltLab%2FWCF.git

Added users online list pagination
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25987b3d1d..46fcc0725d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
 * `\wcf\system\condition\MultiPageControllerCondition` has been replaced by `wcf\system\condition\page\MultiPageCondition`
 * Added special CSS class to cookie policy notice (`cookiePolicyNotice`)
 * Improved confirmation messages (`<span class="confirmationObject">...</span>`)
+* Added users online list pagination
 
 #### CMS
 
diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index 8688e758e0..7433466544 100644
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -1,8 +1,10 @@
+{capture assign='pageTitle'}{$__wcf->getActivePage()->getTitle()}{if $pageNo > 1} - {lang}wcf.page.pageNo{/lang}{/if}{/capture}
+
 {capture assign='headContent'}
 	<link rel="canonical" href="{link controller='UsersOnlineList'}{/link}" />
 	
 	{if USERS_ONLINE_PAGE_REFRESH > 0}
-		<meta http-equiv="refresh" content="{@USERS_ONLINE_PAGE_REFRESH}; url={link controller='UsersOnlineList'}sortField={@$sortField}&sortOrder={@$sortOrder}{/link}" />
+		<meta http-equiv="refresh" content="{@USERS_ONLINE_PAGE_REFRESH}; url={link controller='UsersOnlineList'}{if $pageNo > 1}pageNo={@$pageNo}&{/if}sortField={@$sortField}&sortOrder={@$sortOrder}{/link}" />
 	{/if}
 {/capture}
 
@@ -68,6 +70,14 @@
 
 {include file='header'}
 
+{hascontent}
+	<div class="paginationTop">
+		{content}
+			{pages print=true assign=pagesLinks controller='UsersOnlineList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
+		{/content}
+	</div>
+{/hascontent}
+
 {assign var=usersOnlineList value=''}
 {assign var=usersOnline value=0}
 {assign var=robotsOnlineList value=''}
@@ -183,7 +193,7 @@
 	<section class="section sectionContainerList">
 		<h2 class="sectionTitle">{lang}wcf.user.usersOnline.guests{/lang} <span class="badge">{#$guestsOnline}</span></h2>
 		
-		<ol class="containerList">
+		<ol class="containerList userList">
 			{@$guestsOnlineList}
 		</ol>
 	</section>
@@ -193,13 +203,19 @@
 	<section class="section sectionContainerList">
 		<h2 class="sectionTitle">{lang}wcf.user.usersOnline.robots{/lang} <span class="badge">{#$robotsOnline}</span></h2>
 		
-		<ol class="containerList">
+		<ol class="containerList userList">
 			{@$robotsOnlineList}
 		</ol>
 	</section>
 {/if}
 
 <footer class="contentFooter">
+	{hascontent}
+		<div class="paginationBottom">
+			{content}{@$pagesLinks}{/content}
+		</div>
+	{/hascontent}
+	
 	{hascontent}
 		<nav class="contentFooterNavigation">
 			<ul>
diff --git a/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php b/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php
index 4d9eb95fa3..2527b5d6f1 100644
--- a/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php
+++ b/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php
@@ -32,6 +32,11 @@ class UsersOnlineListPage extends SortablePage {
 	 */
 	public $enableTracking = true;
 	
+	/**
+	 * @inheritDoc
+	 */
+	public $itemsPerPage = 100;
+	
 	/**
 	 * @inheritDoc
 	 */
@@ -137,8 +142,7 @@ class UsersOnlineListPage extends SortablePage {
 	 * @inheritDoc
 	 */
 	protected function readObjects() {
-		$this->objectList->sqlLimit = 0;
-		if ($this->sqlOrderBy) $this->objectList->sqlOrderBy = ($this->sortField == 'lastActivityTime' ? 'session.' : '').$this->sqlOrderBy;
-		$this->objectList->readObjects();
+		if ($this->sqlOrderBy) $this->sqlOrderBy = ($this->sortField == 'lastActivityTime' ? 'session.' : '').$this->sqlOrderBy;
+		parent::readObjects();
 	}
 }