From 3471f7c6684b12b63626af33ae408fd13544cae9 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Wed, 18 Sep 2013 08:47:34 +1000
Subject: Optionally show post user was banned for

---
 inc/functions.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'inc/functions.php')

diff --git a/inc/functions.php b/inc/functions.php
index f7421f68..bc159e88 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -617,22 +617,35 @@ function ago($timestamp) {
 }
 
 function displayBan($ban) {
-	global $config;
+	global $config, $board;
 
 	if (!$ban['seen']) {
 		Bans::seen($ban['id']);
 	}
 
 	$ban['ip'] = $_SERVER['REMOTE_ADDR'];
-
+	if ($ban['post'] && isset($ban['post']['board'], $ban['post']['id'])) {
+		openBoard($ban['post']['board']);
+		
+		$query = query(sprintf("SELECT `thumb`, `file` FROM ``posts_%s`` WHERE `id` = " . (int)$ban['post']['id'], $board['uri']));
+		if ($_post = $query->fetch(PDO::FETCH_ASSOC)) {
+			$ban['post'] = array_merge($ban['post'], $_post);
+		} else {
+			$ban['post']['file'] = 'deleted';
+			$ban['post']['thumb'] = false;
+		}
+		$post = new Post($ban['post']);
+	}
 	// Show banned page and exit
 	die(
 		Element('page.html', array(
 			'title' => _('Banned!'),
 			'config' => $config,
+			'nojavascript' => true,
 			'body' => Element('banned.html', array(
 				'config' => $config,
-				'ban' => $ban
+				'ban' => $ban,
+				'post' => isset($post) ? $post->build() : false
 			)
 		))
 	));
-- 
cgit v1.3


From 57e4292e9de44682d128e96397397d72b7bd3ede Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Wed, 18 Sep 2013 08:56:04 +1000
Subject: Improvements to showing post in ban

---
 inc/functions.php     | 10 ++++++++--
 templates/banned.html |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'inc/functions.php')

diff --git a/inc/functions.php b/inc/functions.php
index bc159e88..cfde4640 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -634,7 +634,12 @@ function displayBan($ban) {
 			$ban['post']['file'] = 'deleted';
 			$ban['post']['thumb'] = false;
 		}
-		$post = new Post($ban['post']);
+		
+		if ($ban['post']['thread']) {
+			$post = new Post($ban['post']);
+		} else {
+			$post = new Thread($ban['post'], null, false, false);
+		}
 	}
 	// Show banned page and exit
 	die(
@@ -645,7 +650,8 @@ function displayBan($ban) {
 			'body' => Element('banned.html', array(
 				'config' => $config,
 				'ban' => $ban,
-				'post' => isset($post) ? $post->build() : false
+				'board' => $board,
+				'post' => isset($post) ? $post->build(true) : false
 			)
 		))
 	));
diff --git a/templates/banned.html b/templates/banned.html
index 55dbffe0..79648156 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -79,7 +79,7 @@
 
 	{% if post %}
 		<hr>
-		<p>You were banned for the following post:</p>
+		<p>You were banned for the following post on {{ board.url }}:</p>
 		{{ post }}
 		<br>
 	{% endif %}
-- 
cgit v1.3