From e41e77b8a99a4a61d38b57b0ed820dca5f58e5cf Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 5 Aug 2017 17:34:30 +0200
Subject: [PATCH] Adapt abstract other stats daily handler implementations

See #2365
---
 .../AbstractCommentStatDailyHandler.class.php |  9 ++++++
 ...bstractDiskUsageStatDailyHandler.class.php | 32 +++++++++++++++----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/stat/AbstractCommentStatDailyHandler.class.php b/wcfsetup/install/files/lib/system/stat/AbstractCommentStatDailyHandler.class.php
index dbc1c5fe33..2c0258dab3 100644
--- a/wcfsetup/install/files/lib/system/stat/AbstractCommentStatDailyHandler.class.php
+++ b/wcfsetup/install/files/lib/system/stat/AbstractCommentStatDailyHandler.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\stat;
 use wcf\system\comment\CommentHandler;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\WCF;
 
@@ -79,4 +80,12 @@ abstract class AbstractCommentStatDailyHandler extends AbstractStatDailyHandler
 			'total' => $total
 		];
 	}
+	
+	/**
+	 * @inheritDoc
+	 * @since	3.1
+	 */
+	protected function addConditions(PreparedStatementConditionBuilder $conditionBuilder) {
+		throw new \BadMethodCallException(__CLASS__ . " does not support addConditions().");
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/stat/AbstractDiskUsageStatDailyHandler.class.php b/wcfsetup/install/files/lib/system/stat/AbstractDiskUsageStatDailyHandler.class.php
index d448cf38d6..b9289055d5 100644
--- a/wcfsetup/install/files/lib/system/stat/AbstractDiskUsageStatDailyHandler.class.php
+++ b/wcfsetup/install/files/lib/system/stat/AbstractDiskUsageStatDailyHandler.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\stat;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\WCF;
 
 /**
@@ -11,15 +12,28 @@ use wcf\system\WCF;
  * @package	WoltLabSuite\Core\System\Stat
  */
 abstract class AbstractDiskUsageStatDailyHandler extends AbstractStatDailyHandler {
+	/**
+	 * name of the filesize database table column
+	 * @var	string
+	 * @since	3.1
+	 */
+	protected $columnName = 'filesize';
+	
 	/**
 	 * @inheritDoc
 	 */
 	protected function getCounter($date, $tableName, $dateColumnName) {
-		$sql = "SELECT	CEIL(SUM(filesize) / 1000)
+		$conditionBuilder = new PreparedStatementConditionBuilder();
+		$conditionBuilder->add($dateColumnName . ' BETWEEN ? AND ?', [$date, $date + 86399]);
+		
+		$this->addConditions($conditionBuilder);
+		
+		$sql = "SELECT	CEIL(SUM(" . $this->columnName . ") / 1000)
 			FROM	".$tableName."
-			WHERE	".$dateColumnName." BETWEEN ? AND ?";
+			" . $conditionBuilder;
 		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute([$date, $date + 86399]);
+		$statement->execute($conditionBuilder->getParameters());
+		
 		return $statement->fetchColumn();
 	}
 	
@@ -27,11 +41,17 @@ abstract class AbstractDiskUsageStatDailyHandler extends AbstractStatDailyHandle
 	 * @inheritDoc
 	 */
 	protected function getTotal($date, $tableName, $dateColumnName) {
-		$sql = "SELECT	CEIL(SUM(filesize) / 1000)
+		$conditionBuilder = new PreparedStatementConditionBuilder();
+		$conditionBuilder->add($dateColumnName . ' < ?', [$date + 86399]);
+		
+		$this->addConditions($conditionBuilder);
+		
+		$sql = "SELECT	CEIL(SUM(" . $this->columnName . ") / 1000)
 			FROM	".$tableName."
-			WHERE	".$dateColumnName." < ?";
+			" . $conditionBuilder;
 		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute([$date + 86400]);
+		$statement->execute($conditionBuilder->getParameters());
+		
 		return $statement->fetchColumn();
 	}
 	
-- 
2.20.1