From 2d15002442bdf1d69bee9035824a4e5a6e6db4e7 Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Sat, 10 Dec 2011 08:00:20 +0000
Subject: [PATCH] Empty commit

---
 sections/forums/forum.php            | 32 ++++++++++++++++++++++++++--
 sections/tools/misc/update_geoip.php | 12 +++++------
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/sections/forums/forum.php b/sections/forums/forum.php
index f61ee40f..3e2a4afb 100644
--- a/sections/forums/forum.php
+++ b/sections/forums/forum.php
@@ -70,11 +70,39 @@
 ?>
 <div class="thin">
 	<h2><a href="forums.php">Forums</a> &gt; <?=$Forums[$ForumID]['Name']?></h2>
-<? if(check_forumperm($ForumID, 'Write') && check_forumperm($ForumID, 'Create')){ ?>
 	<div class="linkbox">
+<? if(check_forumperm($ForumID, 'Write') && check_forumperm($ForumID, 'Create')){ ?>
 		[<a href="forums.php?action=new&amp;forumid=<?=$ForumID?>">New Thread</a>]
-	</div>
 <? } ?>
+		[<a href="#" onclick="$('#searchforum').toggle(); this.innerHTML = (this.innerHTML == 'Search this Forum'?'Hide Search':'Search this Forum'); return false;">Search this Forum</a>]
+		<div id="searchforum" class="hidden center">
+			<div style="display: inline-block;">
+				<h3>Search this forum:</h3>
+				<form action="forums.php" method="get">
+					<table cellpadding="6" cellspacing="1" border="0" class="border">	
+						<input type="hidden" name="action" value="search" />
+						<input type="hidden" name="forums[]" value="<?=$ForumID?>" />
+						<tr>
+							<td><strong>Search for:</strong></td><td><input type="text" id="searchbox" name="search" size="70" /></td>
+						</tr>
+						<tr>
+							<td><strong>Search in:</strong></td>
+							<td>
+								<input type="radio" name="type" id="type_title" value="title" checked="checked" /> 
+								<label for="type_title">Titles</label>
+								<input type="radio" name="type" id="type_body" value="body" /> 
+								<label for="type_body">Post bodies</label>
+							</td>
+						<tr>
+							<td><strong>Username:</strong></td><td><input type="text" id="username" name="user" size="70" /></td>
+						</tr>
+						<tr><td colspan="2" style="text-align: center"><input type="submit" name="submit" value="Search" /></td></tr>
+					</table>
+				</form>
+				<br />
+			</div>
+		</div>
+	</div>
 <? if(check_perms('site_moderate_forums')) { ?>
 	<div class="linkbox">
 		<a href="forums.php?action=edit_rules&amp;forumid=<?=$ForumID?>">Change specific rules</a>
diff --git a/sections/tools/misc/update_geoip.php b/sections/tools/misc/update_geoip.php
index 91d1d133..64969c69 100644
--- a/sections/tools/misc/update_geoip.php
+++ b/sections/tools/misc/update_geoip.php
@@ -7,12 +7,12 @@
 show_header();
 
 //requires wget, unzip commands to be installed
-#shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity_'.date('Ym').'01.zip');
-shell_exec('wget http://debug.what.cd/GeoLiteCity_'.date('Ym').'01.zip');
-shell_exec('unzip GeoLiteCity_'.date('Ym').'01.zip');
-shell_exec('rm GeoLiteCity_'.date('Ym').'01.zip');
+shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity_'.date('Ym').'06.zip');
+//shell_exec('wget http://debug.what.cd/GeoLiteCity_'.date('Ym').'01.zip');
+shell_exec('unzip GeoLiteCity_'.date('Ym').'06.zip');
+shell_exec('rm GeoLiteCity_'.date('Ym').'06.zip');
 
-if(($Locations = file("GeoLiteCity_".date('Ym')."01/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) {
+if(($Locations = file("GeoLiteCity_".date('Ym')."06/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) {
 	error("Download or extraction of maxmind database failed");
 }
 array_shift($Locations);
@@ -31,7 +31,7 @@
 echo "There are ".count($CountryIDs)." CountryIDs";
 echo "<br />";
 
-if(($Blocks = file("GeoLiteCity_".date('Ym')."01/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) {
+if(($Blocks = file("GeoLiteCity_".date('Ym')."06/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) {
 	echo "Error";
 }
 array_shift($Blocks);