From f1e904b5246d6eed89fd48764d55de04cefe8935 Mon Sep 17 00:00:00 2001
From: Kazuki Przyborowski <kazuki.przyborowski@gmail.com>
Date: Thu, 11 Dec 2008 06:51:07 +0000
Subject: [PATCH] Small bug fix in search theme system. O_o Also iDB is now
 version 0.2.5 ^_^

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@211 2b68903e-0b30-0410-9a39-a2e4f3c5be39
---
 inc/searchs.php     | 35 ++++++++++++++++++++++++++---------
 inc/versioninfo.php |  6 +++---
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/inc/searchs.php b/inc/searchs.php
index e3cacf0..da1654f 100644
--- a/inc/searchs.php
+++ b/inc/searchs.php
@@ -11,7 +11,7 @@
     Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/
     Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/
 
-    $FileInfo: searchs.php - Last Update: 12/09/2008 SVN 207 - Author: cooldude2k $
+    $FileInfo: searchs.php - Last Update: 12/11/2008 SVN 211 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="searchs.php"||$File3Name=="/searchs.php") {
@@ -31,12 +31,18 @@ if($_GET['act']=="topics") {
 <div class="NavLinks"><?php echo $ThemeSet['NavLinkIcon']; ?><a href="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>">Board index</a><?php echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile['search'],$Settings['file_ext'],"act=topics",$Settings['qstr'],$Settings['qsep'],$prexqstr['search'],$exqstr['search']); ?>">Search topics</a></div>
 <div class="DivNavLinks">&nbsp;</div>
 <div class="Table1Border">
+<?php if($ThemeSet['TableStyle']=="div") { ?>
+<div class="TableRow1">
+<span style="text-align: left;">
+<?php echo $ThemeSet['TitleIcon'] ?><a href="<?php echo url_maker($exfile['search'],$Settings['file_ext'],"act=topics",$Settings['qstr'],$Settings['qsep'],$prexqstr['search'],$exqstr['search']); ?>">Topic Search</a></span></div>
+<?php } ?>
 <table class="Table1">
-<tr class="TableRow1">
-<td class="TableColumn1"><span style="text-align: left;">
-<?php echo $ThemeSet['TitleIcon']; ?><a href="<?php echo url_maker($exfile['search'],$Settings['file_ext'],"act=topics",$Settings['qstr'],$Settings['qsep'],$prexqstr['search'],$exqstr['search']); ?>">Topic Search</a>
-</span></td>
-</tr>
+<?php if($ThemeSet['TableStyle']=="table") { ?>
+<tr id="ForumStart<?php echo $ForumID; ?>" class="TableRow1">
+<td class="TableColumn1" colspan="6"><span style="text-align: left;">
+<?php echo $ThemeSet['TitleIcon'] ?><a href="<?php echo url_maker($exfile['search'],$Settings['file_ext'],"act=topics",$Settings['qstr'],$Settings['qsep'],$prexqstr['search'],$exqstr['search']); ?>">Topic Search</a></span>
+</td>
+</tr><?php } ?>
 <tr class="TableRow2">
 <th class="TableColumn2" style="width: 100%; text-align: left;">&nbsp;Search for topic: </th>
 </tr>
@@ -218,8 +224,19 @@ echo $pstring;
 ?>
 <div class="DivPageLinks">&nbsp;</div>
 <div class="Table1Border">
-<table class="Table1" id="Search">
-<tr id="SearchStart" class="TableRow1">
+<?php if($ThemeSet['TableStyle']=="div") { ?>
+<div class="TableRow1">
+<span style="text-align: left;">
+<?php echo $ThemeSet['TitleIcon'];
+if($_GET['msearch']==null) { ?>
+<a href="<?php echo url_maker($exfile['search'],$Settings['file_ext'],"act=topics&search=".$_GET['search']."&type=".$_GET['type']."&page=".$_GET['page'],$Settings['qstr'],$Settings['qsep'],$prexqstr['search'],$exqstr['search']); ?>">Searching for <?php echo $_GET['search']; ?></a>
+<?php } if($_GET['msearch']!=null) { ?>
+<a href="<?php echo url_maker($exfile['search'],$Settings['file_ext'],"act=topics&search=".$_GET['search']."&type=".$_GET['type']."&msearch=".$_GET['msearch']."&page=".$_GET['page'],$Settings['qstr'],$Settings['qsep'],$prexqstr['search'],$exqstr['search']); ?>">Searching for <?php echo $_GET['search']; ?> by <?php echo $_GET['msearch']; ?></a>
+<?php } ?></span></div>
+<?php } ?>
+<table class="Table1">
+<?php if($ThemeSet['TableStyle']=="table") { ?>
+<tr id="ForumStart<?php echo $ForumID; ?>" class="TableRow1">
 <td class="TableColumn1" colspan="6"><span style="text-align: left;">
 <?php echo $ThemeSet['TitleIcon'];
 if($_GET['msearch']==null) { ?>
@@ -228,7 +245,7 @@ if($_GET['msearch']==null) { ?>
 <a href="<?php echo url_maker($exfile['search'],$Settings['file_ext'],"act=topics&search=".$_GET['search']."&type=".$_GET['type']."&msearch=".$_GET['msearch']."&page=".$_GET['page'],$Settings['qstr'],$Settings['qsep'],$prexqstr['search'],$exqstr['search']); ?>">Searching for <?php echo $_GET['search']; ?> by <?php echo $_GET['msearch']; ?></a>
 <?php } ?></span>
 </td>
-</tr>
+</tr><?php } ?>
 <tr id="SearchStatRow" class="TableRow2">
 <th class="TableColumn2" style="width: 4%;">State</th>
 <th class="TableColumn2" style="width: 36%;">Topic Name</th>
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 2e1b176..899c805 100644
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/
     Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/
 
-    $FileInfo: versioninfo.php - Last Update: 12/11/2008 SVN 210 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 12/11/2008 SVN 211 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -26,8 +26,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
 	if($showsvn!==true&&$showsvn!=null) { $return_var .= " ".$showsvn." ".$svnver; }
 	return $return_var; }
 // Version number and date stuff. :P
-$VER1[0] = 0; $VER1[1] = 2; $VER1[2] = 4; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 210; $RName = "iDB"; $SFName = "IntDB";
+$VER1[0] = 0; $VER1[1] = 2; $VER1[2] = 5; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
+$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 211; $RName = "iDB"; $SFName = "IntDB";
 $SVNDay[0] = 12; $SVNDay[1] = 11; $SVNDay[2] = 2008; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $VerInfo['iDB_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,false);
 $VerInfo['iDB_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,true);
-- 
2.11.0