From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 4 Oct 2014 19:49:03 +0000 (+0200)
Subject: Added missing permission check / limit
X-Git-Tag: 2.1.0_Alpha_1~276
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eb4d28070a9cd1453e314d856e1e550693c15ec4;p=GitHub%2FWoltLab%2FWCF.git

Added missing permission check / limit
---

diff --git a/com.woltlab.wcf/templates/dashboardBoxTodaysBirthdays.tpl b/com.woltlab.wcf/templates/dashboardBoxTodaysBirthdays.tpl
index 1252b6b21a..e756e22fae 100644
--- a/com.woltlab.wcf/templates/dashboardBoxTodaysBirthdays.tpl
+++ b/com.woltlab.wcf/templates/dashboardBoxTodaysBirthdays.tpl
@@ -11,7 +11,7 @@
 	{/foreach}
 </ul>
 
-{if $birthdayUserProfiles|count >= 5}
+{if $birthdayUserProfiles|count >= 10}
 	<a class="jsTodaysBirthdays button small more jsOnly">{lang}wcf.global.button.showAll{/lang}</a>
 	
 	<script data-relocate="true">
diff --git a/wcfsetup/install/files/lib/system/dashboard/box/FollowingsOnlineSidebarDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/FollowingsOnlineSidebarDashboardBox.class.php
index a2752c8860..21cb1450cc 100644
--- a/wcfsetup/install/files/lib/system/dashboard/box/FollowingsOnlineSidebarDashboardBox.class.php
+++ b/wcfsetup/install/files/lib/system/dashboard/box/FollowingsOnlineSidebarDashboardBox.class.php
@@ -28,9 +28,10 @@ class FollowingsOnlineSidebarDashboardBox extends AbstractSidebarDashboardBox {
 	public function init(DashboardBox $box, IPage $page) {
 		parent::init($box, $page);
 		
-		if (MODULE_USERS_ONLINE && count(WCF::getUserProfileHandler()->getFollowingUsers())) {
+		if (MODULE_USERS_ONLINE && WCF::getSession()->getPermission('user.profile.canViewUsersOnlineList') && count(WCF::getUserProfileHandler()->getFollowingUsers())) {
 			$this->usersOnlineList = new UsersOnlineList();
 			$this->usersOnlineList->getConditionBuilder()->add('session.userID IN (?)', array(WCF::getUserProfileHandler()->getFollowingUsers()));
+			$this->usersOnlineList->sqlLimit = 10;
 			$this->usersOnlineList->readObjects();
 		}
 		
diff --git a/wcfsetup/install/files/lib/system/dashboard/box/TodaysBirthdaysDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/TodaysBirthdaysDashboardBox.class.php
index d2afdc51c8..f11483be2f 100644
--- a/wcfsetup/install/files/lib/system/dashboard/box/TodaysBirthdaysDashboardBox.class.php
+++ b/wcfsetup/install/files/lib/system/dashboard/box/TodaysBirthdaysDashboardBox.class.php
@@ -43,7 +43,7 @@ class TodaysBirthdaysDashboardBox extends AbstractSidebarDashboardBox {
 			$userProfileList->readObjects();
 			$i = 0;
 			foreach ($userProfileList as $userProfile) {
-				if ($i == 5) break;
+				if ($i == 10) break;
 				
 				if (!$userProfile->isProtected() && substr($userProfile->birthday, 5) == $currentDay) {
 					$this->userProfiles[] = $userProfile;
diff --git a/wcfsetup/install/files/lib/system/dashboard/box/TodaysFollowingBirthdaysDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/TodaysFollowingBirthdaysDashboardBox.class.php
index 0f3a384c0a..e86ab23e25 100644
--- a/wcfsetup/install/files/lib/system/dashboard/box/TodaysFollowingBirthdaysDashboardBox.class.php
+++ b/wcfsetup/install/files/lib/system/dashboard/box/TodaysFollowingBirthdaysDashboardBox.class.php
@@ -42,9 +42,13 @@ class TodaysFollowingBirthdaysDashboardBox extends AbstractSidebarDashboardBox {
 			$userProfileList = new UserProfileList();
 			$userProfileList->setObjectIDs($userIDs);
 			$userProfileList->readObjects();
+			$i = 0;
 			foreach ($userProfileList as $userProfile) {
+				if ($i == 10) break;
+				
 				if (!$userProfile->isProtected() && substr($userProfile->birthday, 5) == $currentDay) {
 					$this->userProfiles[] = $userProfile;
+					$i++;
 				}
 			}
 		}
diff --git a/wcfsetup/install/files/lib/system/dashboard/box/UsersOnlineSidebarDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/UsersOnlineSidebarDashboardBox.class.php
index 5f701f99ab..68e21ee038 100644
--- a/wcfsetup/install/files/lib/system/dashboard/box/UsersOnlineSidebarDashboardBox.class.php
+++ b/wcfsetup/install/files/lib/system/dashboard/box/UsersOnlineSidebarDashboardBox.class.php
@@ -29,7 +29,7 @@ class UsersOnlineSidebarDashboardBox extends AbstractSidebarDashboardBox {
 	public function init(DashboardBox $box, IPage $page) {
 		parent::init($box, $page);
 		
-		if (MODULE_USERS_ONLINE) {
+		if (MODULE_USERS_ONLINE && WCF::getSession()->getPermission('user.profile.canViewUsersOnlineList')) {
 			$this->usersOnlineList = new UsersOnlineList();
 			$this->usersOnlineList->readStats();
 			$this->usersOnlineList->checkRecord();