Fixes unlimited block duration display (#31)

codeling · codeling · commit 497ecb8ac8a5 · 2013-07-29T23:44:00.000+02:00
diff --git a/bfstop.php b/bfstop.php
@@ -95,6 +95,13 @@ function getRealDurationFromDBDuration($duration)
 			: $duration;
 	}
 
+	function getDBDuration($duration)
+	{
+		return ($duration >= BFStopDBHelper::$UNLIMITED_DURATION)
+			? 0
+			: $duration;
+	}
+
 	function getBlockInterval()
 	{
 		$blockDuration = (int)$this->params->get('blockDuration',
@@ -112,7 +119,7 @@ function blockIfTooManyAttempts($logEntry)
 			$logEntry->logtime) < $maxNumber) {
 			return;
 		}
-		$this->block($logEntry, $interval);
+		$this->block($logEntry, $this->getDBDuration($interval));
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,13 @@ function getRealDurationFromDBDuration($duration)`
`95`	`95`	`: $duration;`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ function getDBDuration($duration)`
	`99`	`+ {`
	`100`	`+ return ($duration >= BFStopDBHelper::$UNLIMITED_DURATION)`
	`101`	`+ ? 0`
	`102`	`+ : $duration;`
	`103`	`+ }`
	`104`	`+`
`98`	`105`	`function getBlockInterval()`
`99`	`106`	`{`
`100`	`107`	`$blockDuration = (int)$this->params->get('blockDuration',`
`@@ -112,7 +119,7 @@ function blockIfTooManyAttempts($logEntry)`
`112`	`119`	`$logEntry->logtime) < $maxNumber) {`
`113`	`120`	`return;`
`114`	`121`	`}`
`115`		`- $this->block($logEntry, $interval);`
	`122`	`+ $this->block($logEntry, $this->getDBDuration($interval));`
`116`	`123`	`}`
`117`	`124`
`118`	`125`