OSDN Git Service

Added filter by member to iDB search system and some bug fixes. :P
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Sat, 1 Sep 2007 09:28:36 +0000 (09:28 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Sat, 1 Sep 2007 09:28:36 +0000 (09:28 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@94 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/events.php
inc/members.php
inc/pm.php
inc/replys.php
inc/searchs.php
inc/topics.php
inc/versioninfo.php
search.php

index 4e1ba71..4103113 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
 
-    $FileInfo: events.php - Last Update: 08/31/2007 SVN 93 - Author: cooldude2k $
+    $FileInfo: events.php - Last Update: 09/01/2007 SVN 94 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="events.php"||$File3Name=="/events.php") {
@@ -233,7 +233,7 @@ $TimeOut = explode("/",$_POST['EventEnd']);
 <tr class="TableRow2">
 <th class="TableRow2" style="width: 100%; text-align: left;">&nbsp;Make Event Message: </th>
 </tr>
-<?php if (strlen($_POST['EventName'])=="30") { $Error="Yes";  ?>
+<?php if (strlen($_POST['EventName'])>="30") { $Error="Yes";  ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />Your Event Name is too big.<br />
@@ -312,7 +312,7 @@ $TimeOut = explode("/",$_POST['EventEnd']);
        </span></td>
 </tr>
 <?php } if($_SESSION['UserGroup']==$Settings['GuestGroup']&&
-       strlen($_POST['GuestName'])=="25") { $Error="Yes"; ?>
+       strlen($_POST['GuestName'])>="25") { $Error="Yes"; ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />You Guest Name is too big.<br />
index 19a3b71..1ed716a 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
 
-    $FileInfo: members.php - Last Update: 08/31/2007 SVN 93 - Author: cooldude2k $
+    $FileInfo: members.php - Last Update: 09/01/2007 SVN 94 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="members.php"||$File3Name=="/members.php") {
@@ -320,13 +320,13 @@ $REFERERurl = null; unset($REFERERurl);
 <td class="TableRow3">
 <table style="width: 100%; height: 25%; text-align: center;">
 <?php
-if (strlen($_POST['userpass'])=="30") { $Error="Yes";  ?>
+if (strlen($_POST['userpass'])>="30") { $Error="Yes";  ?>
 <tr>
        <td><span class="TableMessage">
        <br />Your password is too big.<br />
        </span></td>
 </tr>
-<?php } if (strlen($_POST['username'])=="20") { $Error="Yes";  ?>
+<?php } if (strlen($_POST['username'])>="20") { $Error="Yes";  ?>
 <tr>
        <td><span class="TableMessage">
        <br />Your user name is too big.<br />
@@ -556,13 +556,13 @@ if(!isset($_POST['TOS'])) { $_POST['TOS'] = null; }
 <tr class="TableRow3">
 <td class="TableRow3">
 <table style="width: 100%; height: 25%; text-align: center;">
-<?php if (strlen($_POST['Password'])=="30") { $Error="Yes";  ?>
+<?php if (strlen($_POST['Password'])>="30") { $Error="Yes";  ?>
 <tr>
        <td><span class="TableMessage">
        <br />Your password is too big.<br />
        </span></td>
 </tr>
-<?php } if (strlen($_POST['username'])=="20") { $Error="Yes";  ?>
+<?php } if (strlen($_POST['username'])>="20") { $Error="Yes";  ?>
 <tr>
        <td><span class="TableMessage">
        <br />Your user name is too big.<br />
index 6980401..96788ed 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
 
-    $FileInfo: pm.php - Last Update: 08/31/2007 SVN 93 - Author: cooldude2k $
+    $FileInfo: pm.php - Last Update: 09/01/2007 SVN 94 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="pm.php"||$File3Name=="/pm.php") {
@@ -451,7 +451,7 @@ if(!isset($_POST['GuestName'])) { $_POST['GuestName'] = null; }
 <tr class="TableRow2">
 <th class="TableRow2" style="width: 100%; text-align: left;">&nbsp;Make Message: </th>
 </tr>
-<?php if (strlen($_POST['SendMessageTo'])=="25") { $Error="Yes";  ?>
+<?php if (strlen($_POST['SendMessageTo'])>="25") { $Error="Yes";  ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />Send to user name too big.<br />
@@ -463,20 +463,20 @@ if(!isset($_POST['GuestName'])) { $_POST['GuestName'] = null; }
        <br />You need to enter a user name to send message to.<br />
        </span></td>
 </tr>
-<?php } if (strlen($_POST['MessageName'])=="30") { $Error="Yes";  ?>
+<?php } if (strlen($_POST['MessageName'])>="30") { $Error="Yes";  ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />Message Name is too big.<br />
        </span></td>
 </tr>
-<?php } if (strlen($_POST['MessageDesc'])=="30") { $Error="Yes";  ?>
+<?php } if (strlen($_POST['MessageDesc'])>="30") { $Error="Yes";  ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />Message Description is too big.<br />
        </span></td>
 </tr>
 <?php } if($_SESSION['UserGroup']==$Settings['GuestGroup']&&
-       strlen($_POST['GuestName'])=="25") { $Error="Yes"; ?>
+       strlen($_POST['GuestName'])>="25") { $Error="Yes"; ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />You Guest Name is too big.<br />
index 6eaab8a..ad2146a 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
 
-    $FileInfo: replys.php - Last Update: 08/30/2007 SVN 92 - Author: cooldude2k $
+    $FileInfo: replys.php - Last Update: 09/01/2007 SVN 94 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replys.php"||$File3Name=="/replys.php") {
@@ -429,14 +429,14 @@ if(!isset($_POST['GuestName'])) { $_POST['GuestName'] = null; }
 <tr class="TableRow2">
 <th class="TableRow2" style="width: 100%; text-align: left;">&nbsp;Make Reply Message: </th>
 </tr>
-<?php if (strlen($_POST['ReplyDesc'])=="30") { $Error="Yes";  ?>
+<?php if (strlen($_POST['ReplyDesc'])>="30") { $Error="Yes";  ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />Your Reply Description is too big.<br />
        </span></td>
 </tr>
 <?php } if($_SESSION['UserGroup']==$Settings['GuestGroup']&&
-       strlen($_POST['GuestName'])=="25") { $Error="Yes"; ?>
+       strlen($_POST['GuestName'])>="25") { $Error="Yes"; ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />You Guest Name is too big.<br />
@@ -807,21 +807,21 @@ if($PermissionInfo['CanModForum'][$TopicForumID]=="yes"&&
 <tr class="TableRow2">
 <th class="TableRow2" style="width: 100%; text-align: left;">&nbsp;Edit Reply Message: </th>
 </tr>
-<?php if (strlen($_POST['ReplyDesc'])=="30") { $Error="Yes";  ?>
+<?php if (strlen($_POST['ReplyDesc'])>="30") { $Error="Yes";  ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />Your Reply Description is too big.<br />
        </span></td>
 </tr>
 <?php } if($_SESSION['UserGroup']==$Settings['GuestGroup']&&
-       strlen($_POST['GuestName'])=="25") { $Error="Yes"; ?>
+       strlen($_POST['GuestName'])>="25") { $Error="Yes"; ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />You Guest Name is too big.<br />
        </span></td>
 </tr>
 <?php } if($ShowEditTopic==true&&
-       strlen($_POST['TopicName'])=="30") { $Error="Yes"; ?>
+       strlen($_POST['TopicName'])>="30") { $Error="Yes"; ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />You Topic Name is too big.<br />
index 6d568dd..3d04f76 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
 
-    $FileInfo: searchs.php - Last Update: 08/18/2007 SVN 86 - Author: cooldude2k $
+    $FileInfo: searchs.php - Last Update: 09/01/2007 SVN 94 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="searchs.php"||$File3Name=="/searchs.php") {
@@ -32,7 +32,7 @@ if($_GET['act']=="topics") {
 <table class="Table1">
 <tr class="TableRow1">
 <td class="TableRow1"><span style="float: 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>
+<?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><span style="float: right;">&nbsp;</span></td>
 </tr>
 <tr class="TableRow2">
@@ -46,6 +46,9 @@ if($_GET['act']=="topics") {
        <td style="width: 30%;"><label class="TextBoxLabel" for="search">Enter SearchTerm: </label></td>
        <td style="width: 70%;"><input class="TextBox" id="search" type="text" name="search" /></td>
 </tr><tr>
+       <td style="width: 30%;"><label class="TextBoxLabel" for="msearch">Filter by Member (optional): </label></td>
+       <td style="width: 70%;"><input class="TextBox" id="msearch" type="text" name="msearch" /></td>
+</tr><tr>
        <td style="width: 30%;"><label class="TextBoxLabel" title="Wildcard is %" for="type">Search Type: </label></td>
        <td style="width: 70%;"><select id="type" name="type" class="TextBox">
 <option value="normal">Normal Search</option>
@@ -66,10 +69,27 @@ if($_GET['act']=="topics") {
 </tr>
 </table></div>
 <?php } if($_GET['search']!=null&&$_GET['type']!=null) {
+if(strlen($_GET['msearch'])>="25") { 
+       $_GET['msearch'] = null; }
+if($_GET['msearch']!=null) {
+$memsiquery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s'", array($_GET['msearch']));
+$memsiresult=mysql_query($memsiquery);
+$memsinum=mysql_num_rows($memsiresult);
+$memsi=0;
+if($memsinum==0) { $_GET['msearch'] = null; }
+if($memsinum!=0) {
+$memsid=mysql_result($memsiresult,$memsi,"id"); 
+@mysql_free_result($memsiresult); } }
+if($_GET['msearch']==null) {
 if($_GET['type']!="wildcard") {
 $query = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `TopicName`='%s' ORDER BY `Pinned` DESC, `LastUpdate` DESC", array($_GET['search'])); }
 if($_GET['type']=="wildcard") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `TopicName` LIKE '%s' ORDER BY `Pinned` DESC, `LastUpdate` DESC", array($_GET['search'])); }
+$query = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `TopicName` LIKE '%s' ORDER BY `Pinned` DESC, `LastUpdate` DESC", array($_GET['search'])); } }
+if($_GET['msearch']!=null) {
+if($_GET['type']!="wildcard") {
+$query = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `TopicName`='%s' AND `UserID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC", array($_GET['search'],$memsid)); }
+if($_GET['type']=="wildcard") {
+$query = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `TopicName` LIKE '%s' AND `UserID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC", array($_GET['search'],$memsid)); } }
 $result=mysql_query($query);
 $num=mysql_num_rows($result);
 if($num<=0) { 
@@ -110,7 +130,12 @@ $pstring = $pstring."<a href=\"".url_maker($exfile['search'],$Settings['file_ext
 <table class="Table1" id="Search">
 <tr id="SearchStart" class="TableRow1">
 <td class="TableRow1" colspan="6"><span style="float: left;">
-<?php echo $ThemeSet['TitleIcon'] ?><a href="<?php echo url_maker($exfile['search'],$Settings['file_ext'],"act=topics&search=".$_GET['search']."&type=".$_GET['type'],$Settings['qstr'],$Settings['qsep'],$prexqstr['search'],$exqstr['search']); ?>">Searching for <?php echo $_GET['search']; ?></a></span>
+<?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'],$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'],$Settings['qstr'],$Settings['qsep'],$prexqstr['search'],$exqstr['search']); ?>">Searching for <?php echo $_GET['search']; ?> by <?php echo $_GET['msearch']; ?></a>
+<?php } ?></span>
 <?php echo "<span style=\"float: right;\">&nbsp;</span>"; ?></td>
 </tr>
 <tr id="SearchStatRow" class="TableRow2">
index 3098bb8..d4b7a8c 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
 
-    $FileInfo: topics.php - Last Update: 08/18/2007 SVN 87 - Author: cooldude2k $
+    $FileInfo: topics.php - Last Update: 09/01/2007 SVN 94 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="topics.php"||$File3Name=="/topics.php") {
@@ -327,20 +327,20 @@ if(!isset($_POST['GuestName'])) { $_POST['GuestName'] = null; }
 <tr class="TableRow2">
 <th class="TableRow2" style="width: 100%; text-align: left;">&nbsp;Make Topic Message: </th>
 </tr>
-<?php if (strlen($_POST['TopicName'])=="30") { $Error="Yes";  ?>
+<?php if (strlen($_POST['TopicName'])>="30") { $Error="Yes";  ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />Your Topic Name is too big.<br />
        </span></td>
 </tr>
-<?php } if (strlen($_POST['TopicDesc'])=="30") { $Error="Yes";  ?>
+<?php } if (strlen($_POST['TopicDesc'])>="30") { $Error="Yes";  ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />Your Topic Description is too big.<br />
        </span></td>
 </tr>
 <?php } if($_SESSION['UserGroup']==$Settings['GuestGroup']&&
-       strlen($_POST['GuestName'])=="25") { $Error="Yes"; ?>
+       strlen($_POST['GuestName'])>="25") { $Error="Yes"; ?>
 <tr style="text-align: center;">
        <td style="text-align: center;"><span class="TableMessage">
        <br />You Guest Name is too big.<br />
index 228d64a..f1c8700 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
 
-    $FileInfo: versioninfo.php - Last Update: 08/31/2007 SVN 93 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 09/01/2007 SVN 94 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,8 +27,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
        return $return_var; }
 // Version number and date stuff. :P
 $VER1[0] = 0; $VER1[1] = 1; $VER1[2] = 9; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 93; $RName = "iDB"; $SFName = "IntDB";
-$SVNDay[0] = 08; $SVNDay[1] = 31; $SVNDay[2] = 2007; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 94; $RName = "iDB"; $SFName = "IntDB";
+$SVNDay[0] = 09; $SVNDay[1] = 01; $SVNDay[2] = 2007; $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);
 $VerInfo['iDB_Full_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,false);
index 6bef529..4dfdfc1 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
 
-    $FileInfo: search.php - Last Update: 07/17/2007 SVN 46 - Author: cooldude2k $
+    $FileInfo: search.php - Last Update: 09/01/2007 SVN 94 - Author: cooldude2k $
 */
 require('preindex.php');
 $usefileext = $Settings['file_ext'];
@@ -44,8 +44,13 @@ if(!isset($_POST['act'])) { $_POST['act'] = null; }
 if($_GET['act']==null||$_GET['act']=="topic"||
        $_POST['act']=="topic"||$_POST['act']=="topics")
        {       $_GET['act']="topics";  }
-if($_GET['act']=="topics")
-{ require($SettDir['inc'].'searchs.php'); } }
+if($_GET['act']=="topics") { 
+if(!isset($_GET['msearch'])) { $_GET['msearch'] = null; }
+if(!isset($_POST['msearch'])) { $_POST['msearch'] = null; }
+if($_GET['msearch']==null&&
+       $_POST['msearch']!=null) { 
+               $_GET['msearch'] = $_POST['msearch']; }
+require($SettDir['inc'].'searchs.php'); } }
 require($SettDir['inc'].'endpage.php');
 if(!isset($_GET['search'])) { $_GET['search'] = null; }
 ?>