Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5

Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	install.php
	js/quick-reply.js
	post.php
	templates/index.html

1 files changed, 2 insertions, 97 deletions

diff --git a/inc/mod/ban.php b/inc/mod/ban.php
index 71173326..82260585 100644
--- a/inc/mod/ban.php
+++ b/inc/mod/ban.php
@@ -4,102 +4,7 @@
  *  Copyright (c) 2010-2013 Tinyboard Development Group
  */
 
-if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
-	// You cannot request this file directly.
-	exit;
-}
+defined('TINYBOARD') or exit;
 
-function parse_time($str) {
-	if (empty($str))
-		return false;
-	
-	if (($time = @strtotime($str)) !== false)
-		return $time;
-	
-	if (!preg_match('/^((\d+)\s?ye?a?r?s?)?\s?+((\d+)\s?mon?t?h?s?)?\s?+((\d+)\s?we?e?k?s?)?\s?+((\d+)\s?da?y?s?)?((\d+)\s?ho?u?r?s?)?\s?+((\d+)\s?mi?n?u?t?e?s?)?\s?+((\d+)\s?se?c?o?n?d?s?)?$/', $str, $matches))
-		return false;
-	
-	$expire = 0;
-	
-	if (isset($matches[2])) {
-		// Years
-		$expire += $matches[2]*60*60*24*365;
-	}
-	if (isset($matches[4])) {
-		// Months
-		$expire += $matches[4]*60*60*24*30;
-	}
-	if (isset($matches[6])) {
-		// Weeks
-		$expire += $matches[6]*60*60*24*7;
-	}
-	if (isset($matches[8])) {
-		// Days
-		$expire += $matches[8]*60*60*24;
-	}
-	if (isset($matches[10])) {
-		// Hours
-		$expire += $matches[10]*60*60;
-	}
-	if (isset($matches[12])) {
-		// Minutes
-		$expire += $matches[12]*60;
-	}
-	if (isset($matches[14])) {
-		// Seconds
-		$expire += $matches[14];
-	}
-	
-	return time() + $expire;
-}
-
-function ban($mask, $reason, $length, $board) {
-	global $mod, $pdo;
-	
-	$query = prepare("INSERT INTO ``bans`` VALUES (NULL, :ip, :mod, :time, :expires, :reason, :board, 0)");
-	$query->bindValue(':ip', $mask);
-	$query->bindValue(':mod', $mod['id']);
-	$query->bindValue(':time', time());
-	if ($reason !== '') {
-		$reason = escape_markup_modifiers($reason);
-		markup($reason);
-		$query->bindValue(':reason', $reason);
-	} else
-		$query->bindValue(':reason', null, PDO::PARAM_NULL);
-	
-	if ($length > 0)
-		$query->bindValue(':expires', $length);
-	else
-		$query->bindValue(':expires', null, PDO::PARAM_NULL);
-	
-	if ($board)
-		$query->bindValue(':board', $board);
-	else
-		$query->bindValue(':board', null, PDO::PARAM_NULL);
-	
-	$query->execute() or error(db_error($query));
-	
-	modLog('Created a new ' .
-		($length > 0 ? preg_replace('/^(\d+) (\w+?)s?$/', '$1-$2', until($length)) : 'permanent') .
-		' ban on ' .
-		($board ? '/' . $board . '/' : 'all boards') .
-		' for ' .
-		(filter_var($mask, FILTER_VALIDATE_IP) !== false ? "<a href=\"?/IP/$mask\">$mask</a>" : utf8tohtml($mask)) .
-		' (<small>#' . $pdo->lastInsertId() . '</small>)' .
-		' with ' . ($reason ? 'reason: ' . utf8tohtml($reason) . '' : 'no reason'));
-}
-
-function unban($id) {
-	$query = prepare("SELECT `ip` FROM ``bans`` WHERE `id` = :id");
-	$query->bindValue(':id', $id);
-	$query->execute() or error(db_error($query));
-	$mask = $query->fetchColumn();
-		
-	$query = prepare("DELETE FROM ``bans`` WHERE `id` = :id");
-	$query->bindValue(':id', $id);
-	$query->execute() or error(db_error($query));
-	
-	if ($mask)
-		modLog("Removed ban #{$id} for " . (filter_var($mask, FILTER_VALIDATE_IP) !== false ? "<a href=\"?/IP/$mask\">$mask</a>" : utf8tohtml($mask)));
-}
 
+// This file is no longer used.