diff --git a/inc/functions.php b/inc/functions.php
index 686a7e22..1b77c191 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -681,36 +681,38 @@ function listBoards($just_uri = false) {
 
 function until($timestamp) {
 	$difference = $timestamp - time();
-	if ($difference < 60) {
+	switch(TRUE){
+	case ($difference < 60):
 		return $difference . ' ' . ngettext('second', 'seconds', $difference);
-	} elseif ($difference < 60*60) {
+	case ($difference < 3600): //60*60 = 3600
 		return ($num = round($difference/(60))) . ' ' . ngettext('minute', 'minutes', $num);
-	} elseif ($difference < 60*60*24) {
-		return ($num = round($difference/(60*60))) . ' ' . ngettext('hour', 'hours', $num);
-	} elseif ($difference < 60*60*24*7) {
-		return ($num = round($difference/(60*60*24))) . ' ' . ngettext('day', 'days', $num);
-	} elseif ($difference < 60*60*24*365) {
-		return ($num = round($difference/(60*60*24*7))) . ' ' . ngettext('week', 'weeks', $num);
+	case ($difference < 86400): //60*60*24 = 86400
+		return ($num = round($difference/(3600))) . ' ' . ngettext('hour', 'hours', $num);
+	case ($difference < 604800): //60*60*24*7 = 604800
+		return ($num = round($difference/(86400))) . ' ' . ngettext('day', 'days', $num);
+	case ($difference < 31536000): //60*60*24*365 = 31536000
+		return ($num = round($difference/(604800))) . ' ' . ngettext('week', 'weeks', $num);
+	default:
+		return ($num = round($difference/(31536000))) . ' ' . ngettext('year', 'years', $num);
 	}
-
-	return ($num = round($difference/(60*60*24*365))) . ' ' . ngettext('year', 'years', $num);
 }
 
 function ago($timestamp) {
 	$difference = time() - $timestamp;
-	if ($difference < 60) {
+	switch(TRUE){
+	case ($difference < 60) :
 		return $difference . ' ' . ngettext('second', 'seconds', $difference);
-	} elseif ($difference < 60*60) {
+	case ($difference < 3600): //60*60 = 3600
 		return ($num = round($difference/(60))) . ' ' . ngettext('minute', 'minutes', $num);
-	} elseif ($difference < 60*60*24) {
-		return ($num = round($difference/(60*60))) . ' ' . ngettext('hour', 'hours', $num);
-	} elseif ($difference < 60*60*24*7) {
-		return ($num = round($difference/(60*60*24))) . ' ' . ngettext('day', 'days', $num);
-	} elseif ($difference < 60*60*24*365) {
-		return ($num = round($difference/(60*60*24*7))) . ' ' . ngettext('week', 'weeks', $num);
+	case ($difference <  86400): //60*60*24 = 86400
+		return ($num = round($difference/(3600))) . ' ' . ngettext('hour', 'hours', $num);
+	case ($difference < 604800): //60*60*24*7 = 604800
+		return ($num = round($difference/(86400))) . ' ' . ngettext('day', 'days', $num);
+	case ($difference < 31536000): //60*60*24*365 = 31536000
+		return ($num = round($difference/(604800))) . ' ' . ngettext('week', 'weeks', $num);
+	default:
+		return ($num = round($difference/(31536000))) . ' ' . ngettext('year', 'years', $num);
 	}
-
-	return ($num = round($difference/(60*60*24*365))) . ' ' . ngettext('year', 'years', $num);
 }
 
 function displayBan($ban) {
diff --git a/post.php b/post.php
index b8996fac..61c3eb78 100644
--- a/post.php
+++ b/post.php
@@ -192,20 +192,6 @@ if (isset($_POST['delete'])) {
 	if (!openBoard($post['board']))
 		error($config['error']['noboard']);
 
-	if (!(($post['op'] && $_POST['post'] == $config['button_newtopic']) ||
-		(!$post['op'] && $_POST['post'] == $config['button_reply'])))
-		error($config['error']['bot']);
-	
-	// Check the referrer
-	if ($config['referer_match'] !== false &&
-		(!isset($_SERVER['HTTP_REFERER']) || !preg_match($config['referer_match'], rawurldecode($_SERVER['HTTP_REFERER']))))
-		error($config['error']['referer']);
-	
-	checkDNSBL();
-		
-	// Check if banned
-	checkBan($board['uri']);
-	
 	// Check for CAPTCHA right after opening the board so the "return" link is in there
 	if ($config['recaptcha']) {
 		if (!isset($_POST['recaptcha_challenge_field']) || !isset($_POST['recaptcha_response_field']))
@@ -219,7 +205,21 @@ if (isset($_POST['delete'])) {
 			error($config['error']['captcha']);
 		}
 	}
+
+	if (!(($post['op'] && $_POST['post'] == $config['button_newtopic']) ||
+		(!$post['op'] && $_POST['post'] == $config['button_reply'])))
+		error($config['error']['bot']);
 	
+	// Check the referrer
+	if ($config['referer_match'] !== false &&
+		(!isset($_SERVER['HTTP_REFERER']) || !preg_match($config['referer_match'], rawurldecode($_SERVER['HTTP_REFERER']))))
+		error($config['error']['referer']);
+	
+	checkDNSBL();
+		
+	// Check if banned
+	checkBan($board['uri']);
+
 	if ($post['mod'] = isset($_POST['mod']) && $_POST['mod']) {
 		require 'inc/mod/auth.php';
 		if (!$mod) {