From 86a46d281330370e467723e16db40bef45326a05 Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Sat, 11 Oct 2008 01:01:51 +0000 Subject: [PATCH] Small bug fixes. SQL query fixes and wordfilter fix. git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@173 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- inc/categories.php | 7 ++++--- inc/events.php | 5 +++-- inc/forums.php | 4 ++-- inc/members.php | 4 +++- inc/pm.php | 6 ++++-- inc/profilemain.php | 10 ++++++---- inc/replys.php | 9 ++++++--- inc/rssfeed.php | 3 ++- inc/searchs.php | 6 +++--- inc/subcategories.php | 3 ++- inc/subforums.php | 3 ++- inc/topics.php | 10 ++++++---- inc/versioninfo.php | 6 +++--- 13 files changed, 46 insertions(+), 30 deletions(-) diff --git a/inc/categories.php b/inc/categories.php index 94f3c5a..3b0e415 100644 --- a/inc/categories.php +++ b/inc/categories.php @@ -11,12 +11,13 @@ Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/ Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/ - $FileInfo: categories.php - Last Update: 06/24/2008 SVN 167 - Author: cooldude2k $ + $FileInfo: categories.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="categories.php"||$File3Name=="/categories.php") { require('index.php'); exit(); } +if(!is_numeric($_GET['id'])) { $_GET['id'] = null; } $prequery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_GET['id'])); $preresult=mysql_query($prequery); $prenum=mysql_num_rows($preresult); @@ -103,7 +104,7 @@ $gltnum = count($gltf); $glti = 0; $OldUpdateTime = 0; $UseThisFonum = null; if ($ForumType=="subforum") { while ($glti < $gltnum) { -$gltfoquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `CategoryID`=%i AND `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($CategoryID,$gltf[$glti])); +$gltfoquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($gltf[$glti])); $gltforesult=mysql_query($gltfoquery); $gltfonum=mysql_num_rows($gltforesult); if($gltfonum>0) { @@ -115,7 +116,7 @@ $OldUpdateTime = $NewUpdateTime; } } ++$glti; } } if ($ForumType!="subforum"&&$ForumType!="redirect") { $UseThisFonum = $gltf[0]; } if ($ForumType!="redirect") { -$gltquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `CategoryID`=%i AND `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($CategoryID,$UseThisFonum)); +$gltquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($UseThisFonum)); $gltresult=mysql_query($gltquery); $gltnum=mysql_num_rows($gltresult); if($gltnum>0){ diff --git a/inc/events.php b/inc/events.php index 7abd594..ded0efb 100644 --- a/inc/events.php +++ b/inc/events.php @@ -11,12 +11,13 @@ Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/ Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/ - $FileInfo: events.php - Last Update: 06/24/2008 SVN 167 - Author: cooldude2k $ + $FileInfo: events.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="events.php"||$File3Name=="/events.php") { require('index.php'); exit(); } +if(!is_numeric($_GET['id'])) { $_GET['id'] = null; } if($_GET['act']=="view"||$_GET['act']==null) { $query = query("SELECT * FROM `".$Settings['sqltable']."events` WHERE `id`=%i LIMIT 1", array($_GET['id'])); $result=mysql_query($query); @@ -376,7 +377,7 @@ if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; } $WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord"); if($WholeWord=="on") { $WholeWord = "yes"; } if($WholeWord=="off") { $WholeWord = "no"; } -if($WholeWord!="yes"||$WholeWord!="no") { $WholeWord = "no"; } +if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; } $Filter = preg_quote($Filter, "/"); if($CaseInsensitive!="yes"&&$WholeWord=="yes") { $_POST['EventText'] = preg_replace("/\b(".$Filter.")\b/", $Replace, $_POST['EventText']); } diff --git a/inc/forums.php b/inc/forums.php index 1cc025f..26d8734 100644 --- a/inc/forums.php +++ b/inc/forums.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: forums.php - Last Update: 06/24/2008 SVN 167 - Author: cooldude2k $ + $FileInfo: forums.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="forums.php"||$File3Name=="/forums.php") { @@ -89,7 +89,7 @@ $gltnum = count($gltf); $glti = 0; $OldUpdateTime = 0; $UseThisFonum = null; if ($ForumType=="subforum") { while ($glti < $gltnum) { -$gltfoquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `CategoryID`=%i AND `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($CategoryID,$gltf[$glti])); +$gltfoquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($gltf[$glti])); $gltforesult=mysql_query($gltfoquery); $gltfonum=mysql_num_rows($gltforesult); if($gltfonum>0) { diff --git a/inc/members.php b/inc/members.php index 5f34821..1a108bf 100644 --- a/inc/members.php +++ b/inc/members.php @@ -11,12 +11,14 @@ Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/ Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/ - $FileInfo: members.php - Last Update: 09/26/2008 SVN 170 - Author: cooldude2k $ + $FileInfo: members.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="members.php"||$File3Name=="/members.php") { require('index.php'); exit(); } +if(!is_numeric($_GET['id'])) { $_GET['id'] = null; } +if(!is_numeric($_GET['page'])) { $_GET['page'] = null; } if($_GET['act']=="list") { $orderlist = null; $orderlist = "order by `ID` asc"; diff --git a/inc/pm.php b/inc/pm.php index 1c45275..a28ab50 100644 --- a/inc/pm.php +++ b/inc/pm.php @@ -11,12 +11,14 @@ Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/ Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/ - $FileInfo: pm.php - Last Update: 06/24/2008 SVN 167 - Author: cooldude2k $ + $FileInfo: pm.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="pm.php"||$File3Name=="/pm.php") { require('index.php'); exit(); } +if(!is_numeric($_GET['id'])) { $_GET['id'] = null; } +if(!is_numeric($_GET['page'])) { $_GET['page'] = null; } // Check if we can read/send PM if($_SESSION['UserGroup']==$Settings['GuestGroup']||$GroupInfo['CanPM']=="no") { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); @@ -631,7 +633,7 @@ if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; } $WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord"); if($WholeWord=="on") { $WholeWord = "yes"; } if($WholeWord=="off") { $WholeWord = "no"; } -if($WholeWord!="yes"||$WholeWord!="no") { $WholeWord = "no"; } +if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; } $Filter = preg_quote($Filter, "/"); if($CaseInsensitive!="yes"&&$WholeWord=="yes") { $_POST['Message'] = preg_replace("/\b(".$Filter.")\b/", $Replace, $_POST['Message']); diff --git a/inc/profilemain.php b/inc/profilemain.php index 7718630..3d51645 100644 --- a/inc/profilemain.php +++ b/inc/profilemain.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: profilemain.php - Last Update: 05/31/2008 SVN 164 - Author: cooldude2k $ + $FileInfo: profilemain.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="profilemain.php"||$File3Name=="/profilemain.php") { @@ -140,7 +140,7 @@ if($_POST['act']=="view"&& $WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord"); if($WholeWord=="on") { $WholeWord = "yes"; } if($WholeWord=="off") { $WholeWord = "no"; } - if($WholeWord!="yes"||$WholeWord!="no") { $WholeWord = "no"; } + if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; } $Filter = preg_quote($Filter, "/"); if($CaseInsensitive!="yes"&&$WholeWord=="yes") { $_POST['NotePad'] = preg_replace("/\b(".$Filter.")\b/", $Replace, $_POST['NotePad']); } @@ -215,7 +215,7 @@ if($_POST['act']=="signature"&& $WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord"); if($WholeWord=="on") { $WholeWord = "yes"; } if($WholeWord=="off") { $WholeWord = "no"; } - if($WholeWord!="yes"||$WholeWord!="no") { $WholeWord = "no"; } + if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; } $Filter = preg_quote($Filter, "/"); if($CaseInsensitive!="yes"&&$WholeWord=="yes") { $_POST['Signature'] = preg_replace("/\b(".$Filter.")\b/", $Replace, $_POST['Signature']); } @@ -305,7 +305,9 @@ $AvatarSize1W=$AvatarSize1[0]; $AvatarSize1H=$AvatarSize1[1]; if($_POST['update']=="now") { if($_POST['Avatar']!=null&&$_POST['AvatarSizeW']!=null&&$_POST['AvatarSizeH']!=null&& $_SESSION['UserGroup']!=$Settings['GuestGroup']) { + if(!is_numeric($_POST['AvatarSizeW'])) { $_POST['AvatarSizeW'] = 100; } if($_POST['AvatarSizeW']>=100) { $_POST['AvatarSizeW']=100; } + if(!is_numeric($_POST['AvatarSizeH'])) { $_POST['AvatarSizeH'] = 100; } if($_POST['AvatarSizeH']>=100) { $_POST['AvatarSizeH']=100; } $fullavatarsize = $_POST['AvatarSizeW']."x".$_POST['AvatarSizeH']; $_POST['Avatar'] = htmlentities($_POST['Avatar'], ENT_QUOTES, $Settings['charset']); @@ -578,7 +580,7 @@ if($_POST['act']=="profile"&& $WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord"); if($WholeWord=="on") { $WholeWord = "yes"; } if($WholeWord=="off") { $WholeWord = "no"; } - if($WholeWord!="yes"||$WholeWord!="no") { $WholeWord = "no"; } + if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; } $Filter = preg_quote($Filter, "/"); if($CaseInsensitive!="yes"&&$WholeWord=="yes") { $_POST['Interests'] = preg_replace("/\b(".$Filter.")\b/", $Replace, $_POST['Interests']); diff --git a/inc/replys.php b/inc/replys.php index 0a8dc77..bbec63a 100644 --- a/inc/replys.php +++ b/inc/replys.php @@ -11,12 +11,15 @@ Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/ Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/ - $FileInfo: replys.php - Last Update: 06/24/2008 SVN 167 - Author: cooldude2k $ + $FileInfo: replys.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="replys.php"||$File3Name=="/replys.php") { require('index.php'); exit(); } +if(!is_numeric($_GET['id'])) { $_GET['id'] = null; } +if(!is_numeric($_GET['post'])) { $_GET['post'] = null; } +if(!is_numeric($_GET['page'])) { $_GET['page'] = null; } if(!isset($_GET['modact'])) { $_GET['modact'] = null; } if($_GET['modact']=="pin"||$_GET['modact']=="unpin"||$_GET['modact']=="open"|| $_GET['modact']=="close"||$_GET['modact']=="edit"||$_GET['modact']=="delete") @@ -562,7 +565,7 @@ if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; } $WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord"); if($WholeWord=="on") { $WholeWord = "yes"; } if($WholeWord=="off") { $WholeWord = "no"; } -if($WholeWord!="yes"||$WholeWord!="no") { $WholeWord = "no"; } +if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; } $Filter = preg_quote($Filter, "/"); if($CaseInsensitive!="yes"&&$WholeWord=="yes") { $_POST['ReplyDesc'] = preg_replace("/\b(".$Filter.")\b/", $Replace, $_POST['ReplyDesc']); @@ -1121,7 +1124,7 @@ if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; } $WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord"); if($WholeWord=="on") { $WholeWord = "yes"; } if($WholeWord=="off") { $WholeWord = "no"; } -if($WholeWord!="yes"||$WholeWord!="no") { $WholeWord = "no"; } +if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; } $Filter = preg_quote($Filter, "/"); if($CaseInsensitive!="yes"&&$WholeWord=="yes") { $_POST['ReplyDesc'] = preg_replace("/\b(".$Filter.")\b/", $Replace, $_POST['ReplyDesc']); diff --git a/inc/rssfeed.php b/inc/rssfeed.php index b2d2431..ce67c39 100644 --- a/inc/rssfeed.php +++ b/inc/rssfeed.php @@ -11,12 +11,13 @@ Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/ Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/ - $FileInfo: rssfeed.php - Last Update: 05/31/2008 SVN 164 - Author: cooldude2k $ + $FileInfo: rssfeed.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="rssfeed.php"||$File3Name=="/rssfeed.php") { require('index.php'); exit(); } +if(!is_numeric($_GET['id'])) { $_GET['id'] = null; } $boardsname = htmlentities($Settings['board_name'], ENT_QUOTES, $Settings['charset']); $boardsname = preg_replace("/&#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $boardsname); $_GET['feedtype'] = strtolower($_GET['feedtype']); diff --git a/inc/searchs.php b/inc/searchs.php index 794a0e1..e866cae 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: 06/24/2008 SVN 167 - Author: cooldude2k $ + $FileInfo: searchs.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="searchs.php"||$File3Name=="/searchs.php") { @@ -229,7 +229,7 @@ if(isset($PermissionInfo['CanViewForum'][$ForumID])&& $PermissionInfo['CanViewForum'][$ForumID]=="yes"&& isset($CatPermissionInfo['CanViewCategory'][$CategoryID])&& $CatPermissionInfo['CanViewCategory'][$CategoryID]=="yes") { -$glrquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `ForumID`=%i AND `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($ForumID,$TopicID)); +$glrquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID)); $glrresult=mysql_query($glrquery); $glrnum=mysql_num_rows($glrresult); if($glrnum>0){ @@ -246,7 +246,7 @@ $NumPages = ceil($NumRPosts/$Settings['max_posts']); } if($NumRPosts<=$Settings['max_posts']) { $NumPages = 1; } $Users_Name1 = pre_substr($UsersName1,0,20); -if($UsersName1=="Guest") { $UsersName1=$GuestName; +if($UsersName1=="Guest") { $UsersName1=$GuestName1; if($UsersName1==null) { $UsersName1="Guest"; } } if (pre_strlen($UsersName1)>20) { $Users_Name1 = $Users_Name1."..."; $oldusername=$UsersName1; $UsersName1=$Users_Name1; } $lul = null; diff --git a/inc/subcategories.php b/inc/subcategories.php index 74cbe32..3b9e3f2 100644 --- a/inc/subcategories.php +++ b/inc/subcategories.php @@ -11,12 +11,13 @@ Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/ Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/ - $FileInfo: subcategories.php - Last Update: 03/25/2008 SVN 155 - Author: cooldude2k $ + $FileInfo: subcategories.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="subcategories.php"||$File3Name=="/subcategories.php") { require('index.php'); exit(); } +if(!is_numeric($_GET['id'])) { $_GET['id'] = null; } $checkquery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_GET['id'])); $checkresult=mysql_query($checkquery); $checknum=mysql_num_rows($checkresult); diff --git a/inc/subforums.php b/inc/subforums.php index 827e13f..64170f7 100644 --- a/inc/subforums.php +++ b/inc/subforums.php @@ -11,12 +11,13 @@ Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/ Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/ - $FileInfo: subforums.php - Last Update: 03/25/2008 SVN 155 - Author: cooldude2k $ + $FileInfo: subforums.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="subforums.php"||$File3Name=="/subforums.php") { require('index.php'); exit(); } +if(!is_numeric($_GET['id'])) { $_GET['id'] = null; } $checkquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_GET['id'])); $checkresult=mysql_query($checkquery); $checknum=mysql_num_rows($checkresult); diff --git a/inc/topics.php b/inc/topics.php index 6074313..500fe73 100644 --- a/inc/topics.php +++ b/inc/topics.php @@ -11,12 +11,14 @@ Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/ Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/ - $FileInfo: topics.php - Last Update: 06/24/2008 SVN 167 - Author: cooldude2k $ + $FileInfo: topics.php - Last Update: 10/10/2008 SVN 173 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="topics.php"||$File3Name=="/topics.php") { require('index.php'); exit(); } +if(!is_numeric($_GET['id'])) { $_GET['id'] = null; } +if(!is_numeric($_GET['page'])) { $_GET['page'] = null; } $prequery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_GET['id'])); $preresult=mysql_query($prequery); $prenum=mysql_num_rows($preresult); @@ -198,7 +200,7 @@ $TopicStat=mysql_result($result,$i,"Closed"); $UsersName = GetUserName($UsersID,$Settings['sqltable']); if($UsersName=="Guest") { $UsersName=$GuestName; if($UsersName==null) { $UsersName="Guest"; } } -$glrquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `ForumID`=%i AND `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($_GET['id'],$TopicID)); +$glrquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID)); $glrresult=mysql_query($glrquery); $glrnum=mysql_num_rows($glrresult); if($glrnum>0){ @@ -215,7 +217,7 @@ $NumPages = ceil($NumRPosts/$Settings['max_posts']); } if($NumRPosts<=$Settings['max_posts']) { $NumPages = 1; } $Users_Name1 = pre_substr($UsersName1,0,20); -if($UsersName1=="Guest") { $UsersName1=$GuestName; +if($UsersName1=="Guest") { $UsersName1=$GuestName1; if($UsersName1==null) { $UsersName1="Guest"; } } if (pre_strlen($UsersName1)>20) { $Users_Name1 = $Users_Name1."..."; $oldusername=$UsersName1; $UsersName1=$Users_Name1; } $lul = null; @@ -444,7 +446,7 @@ if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; } $WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord"); if($WholeWord=="on") { $WholeWord = "yes"; } if($WholeWord=="off") { $WholeWord = "no"; } -if($WholeWord!="yes"||$WholeWord!="no") { $WholeWord = "no"; } +if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; } $Filter = preg_quote($Filter, "/"); if($CaseInsensitive!="yes"&&$WholeWord=="yes") { $_POST['TopicDesc'] = preg_replace("/\b(".$Filter.")\b/", $Replace, $_POST['TopicDesc']); diff --git a/inc/versioninfo.php b/inc/versioninfo.php index 47856aa..2baff7b 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: 09/26/2008 SVN 172 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 10/10/2008 SVN 173 - 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] = 2; $VER1[2] = 3; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 172; $RName = "iDB"; $SFName = "IntDB"; -$SVNDay[0] = 09; $SVNDay[1] = 26; $SVNDay[2] = 2008; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; +$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 173; $RName = "iDB"; $SFName = "IntDB"; +$SVNDay[0] = 10; $SVNDay[1] = 10; $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); $VerInfo['iDB_Full_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,false); -- 2.11.0