From 268d9d2c889b23c560b6ff528aaae81f153091a3 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Tue, 28 Aug 2012 02:24:29 +1000
Subject: [PATCH] bugfix: security token forgotten for ban form in view_ip.html

---
 inc/mod/pages.php            |  5 ++++-
 templates/mod/dashboard.html | 13 +++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index d3900130..c3693468 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -328,6 +328,9 @@ function mod_noticeboard_delete($id) {
 	
 	modLog('Deleted a noticeboard entry');
 	
+	if ($config['cache']['enabled'])
+		cache::delete('noticeboard_preview');
+	
 	header('Location: ?/noticeboard', true, $config['redirect_http']);
 }
 
@@ -564,7 +567,7 @@ function mod_page_ip($ip) {
 	}
 	
 	$args['boards'] = $boards;
-	
+	$args['token'] = make_secure_link_token('ban');
 	
 	if (hasPermission($config['mod']['view_ban'])) {
 		$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 30742dc1..04da9e70 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -54,7 +54,7 @@
 					</ul>
 				</li>
 			{% endif %}
-			<li><a href="?/noticeboard">{% trans 'View all entries' %}</a></li>
+			<li><a href="?/noticeboard">{% trans 'View all noticeboard entries' %}</a></li>
 		{% endif %}
 		<li><a href="?/news">{% trans 'News' %}</a></li>
 		<li>
@@ -104,7 +104,16 @@
 <fieldset>
 	<legend>{% trans 'Search' %}</legend>
 	
-	{# TODO #}
+	<ul>
+		<li>
+			<form style="display:inline" action="?/search" method="post">
+				<label style="display:inline" for="search">{% trans 'Phrase:' %}</label> 
+				<input id="search" name="search" type="text" size="35">
+				<input type="submit" value="{% trans 'Search' %}">
+			</form>
+			<p class="unimportant">{% trans '(Search is case-insensitive, and based on keywords. To match exact phrases, use "quotes". Use an asterisk (*) for wildcard.)' %}</p>
+		</li>
+	</ul>
 </fieldset>
 
 {% if config.debug %}