From 538fe900e561b854afe038097bee05238bad8560 Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Mon, 29 Oct 2007 08:59:27 +0000 Subject: [PATCH] Small bug fix. :P git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@120 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- inc/categories.php | 7 +++++-- inc/events.php | 28 +++++++++++++++----------- inc/forums.php | 7 +++++-- inc/pm.php | 28 +++++++++++++++----------- inc/replys.php | 54 +++++++++++++++++++++++++++++++-------------------- inc/subcategories.php | 7 +++++-- inc/subforums.php | 7 +++++-- inc/topics.php | 28 +++++++++++++++----------- inc/versioninfo.php | 6 +++--- 9 files changed, 107 insertions(+), 65 deletions(-) diff --git a/inc/categories.php b/inc/categories.php index 8623d15..99a4ff6 100644 --- a/inc/categories.php +++ b/inc/categories.php @@ -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: categories.php - Last Update: 10/16/2007 SVN 117 - Author: cooldude2k $ + $FileInfo: categories.php - Last Update: 10/29/2007 SVN 120 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="categories.php"||$File3Name=="/categories.php") { @@ -71,6 +71,8 @@ $ForumID=mysql_result($result,$i,"id"); $ForumName=mysql_result($result,$i,"Name"); $ForumShow=mysql_result($result,$i,"ShowForum"); $ForumType=mysql_result($result,$i,"ForumType"); +$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics"); +$ForumShowTopics = strtolower($ForumShowTopics); $NumTopics=mysql_result($result,$i,"NumTopics"); $NumPosts=mysql_result($result,$i,"NumPosts"); $NumRedirects=mysql_result($result,$i,"Redirects"); @@ -149,7 +151,8 @@ $PreForum = $ThemeSet['ForumIcon']; if ($ForumType=="forum") { $PreForum=$ThemeSet['ForumIcon']; } if ($ForumType=="subforum") { $PreForum=$ThemeSet['SubForumIcon']; } if ($ForumType=="redirect") { $PreForum=$ThemeSet['RedirectIcon']; } -$ExStr = ""; if ($ForumType!="redirect") { $ExStr = "&page=1"; } +$ExStr = ""; if ($ForumType!="redirect"&& + $ForumShowTopics!="no") { $ExStr = "&page=1"; } ?>
diff --git a/inc/events.php b/inc/events.php index d4734ef..d59449b 100644 --- a/inc/events.php +++ b/inc/events.php @@ -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: 10/23/2007 SVN 119 - Author: cooldude2k $ + $FileInfo: events.php - Last Update: 10/29/2007 SVN 120 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="events.php"||$File3Name=="/events.php") { @@ -154,24 +154,30 @@ gzip_page($Settings['use_gzip'],$GZipEncode['Type']); @mysql_close(); die(); } -
+ - " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('EventText','  ')" />   - - " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('EventText','  ')" />
- + + + + +  "; } +echo "
 " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" />  " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" /> 
"; @mysql_free_result($renee_result); ?>
diff --git a/inc/forums.php b/inc/forums.php index 7f98fd2..85908bf 100644 --- a/inc/forums.php +++ b/inc/forums.php @@ -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: forums.php - Last Update: 10/16/2007 SVN 117 - Author: cooldude2k $ + $FileInfo: forums.php - Last Update: 10/29/2007 SVN 120 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="forums.php"||$File3Name=="/forums.php") { @@ -57,6 +57,8 @@ $ForumID=mysql_result($result,$i,"id"); $ForumName=mysql_result($result,$i,"Name"); $ForumShow=mysql_result($result,$i,"ShowForum"); $ForumType=mysql_result($result,$i,"ForumType"); +$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics"); +$ForumShowTopics = strtolower($ForumShowTopics); $NumTopics=mysql_result($result,$i,"NumTopics"); $NumPosts=mysql_result($result,$i,"NumPosts"); $NumRedirects=mysql_result($result,$i,"Redirects"); @@ -135,7 +137,8 @@ $PreForum = $ThemeSet['ForumIcon']; if ($ForumType=="forum") { $PreForum=$ThemeSet['ForumIcon']; } if ($ForumType=="subforum") { $PreForum=$ThemeSet['SubForumIcon']; } if ($ForumType=="redirect") { $PreForum=$ThemeSet['RedirectIcon']; } -$ExStr = ""; if ($ForumType!="redirect") { $ExStr = "&page=1"; } +$ExStr = ""; if ($ForumType!="redirect"&& + $ForumShowTopics!="no") { $ExStr = "&page=1"; } ?>
diff --git a/inc/pm.php b/inc/pm.php index e6d7da5..d0ec2fc 100644 --- a/inc/pm.php +++ b/inc/pm.php @@ -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: 10/23/2007 SVN 119 - Author: cooldude2k $ + $FileInfo: pm.php - Last Update: 10/29/2007 SVN 120 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="pm.php"||$File3Name=="/pm.php") { @@ -403,24 +403,30 @@ if($renum==0) { $SendMessageTo = null; } -
+ - " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" />   - - " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" />
- + + + + +  "; } +echo "
 " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" />  " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" /> 
"; @mysql_free_result($renee_result); ?>
diff --git a/inc/replys.php b/inc/replys.php index 3bfc156..f72eb3b 100644 --- a/inc/replys.php +++ b/inc/replys.php @@ -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: 10/23/2007 SVN 119 - Author: cooldude2k $ + $FileInfo: replys.php - Last Update: 10/29/2007 SVN 120 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="replys.php"||$File3Name=="/replys.php") { @@ -295,24 +295,30 @@ $QuoteReply = null; $QuoteDescription = null; -
+ - " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" />   - - " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" />
- + + + + +  "; } +echo "
 " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" />  " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" /> 
"; @mysql_free_result($renee_result); ?>
@@ -402,24 +408,30 @@ if($_GET['post']==null) { $QuoteReply = null; $QuoteDescription = null; } -
+ - " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" />   - - " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" />
- + + + + +  "; } +echo "
 " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" />  " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" /> 
"; @mysql_free_result($renee_result); ?>
diff --git a/inc/subcategories.php b/inc/subcategories.php index 7ed5026..38a4f1e 100644 --- a/inc/subcategories.php +++ b/inc/subcategories.php @@ -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: subcategories.php - Last Update: 10/16/2007 SVN 117 - Author: cooldude2k $ + $FileInfo: subcategories.php - Last Update: 10/29/2007 SVN 120 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="subcategories.php"||$File3Name=="/subcategories.php") { @@ -84,6 +84,8 @@ $ForumID=mysql_result($result,$i,"id"); $ForumName=mysql_result($result,$i,"Name"); $ForumShow=mysql_result($result,$i,"ShowForum"); $ForumType=mysql_result($result,$i,"ForumType"); +$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics"); +$ForumShowTopics = strtolower($ForumShowTopics); $NumTopics=mysql_result($result,$i,"NumTopics"); $NumPosts=mysql_result($result,$i,"NumPosts"); $NumRedirects=mysql_result($result,$i,"Redirects"); @@ -156,7 +158,8 @@ $PreForum = $ThemeSet['ForumIcon']; if ($ForumType=="forum") { $PreForum=$ThemeSet['ForumIcon']; } if ($ForumType=="subforum") { $PreForum=$ThemeSet['SubForumIcon']; } if ($ForumType=="redirect") { $PreForum=$ThemeSet['RedirectIcon']; } -$ExStr = ""; if ($ForumType!="redirect") { $ExStr = "&page=1"; } +$ExStr = ""; if ($ForumType!="redirect"&& + $ForumShowTopics!="no") { $ExStr = "&page=1"; } ?>
diff --git a/inc/subforums.php b/inc/subforums.php index 6223989..523b2a9 100644 --- a/inc/subforums.php +++ b/inc/subforums.php @@ -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: subforums.php - Last Update: 10/16/2007 SVN 117 - Author: cooldude2k $ + $FileInfo: subforums.php - Last Update: 10/29/2007 SVN 120 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="subforums.php"||$File3Name=="/subforums.php") { @@ -106,6 +106,8 @@ $ForumID=mysql_result($result,$i,"id"); $ForumName=mysql_result($result,$i,"Name"); $ForumShow=mysql_result($result,$i,"ShowForum"); $ForumType=mysql_result($result,$i,"ForumType"); +$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics"); +$ForumShowTopics = strtolower($ForumShowTopics); $NumTopics=mysql_result($result,$i,"NumTopics"); $NumPosts=mysql_result($result,$i,"NumPosts"); $NumRedirects=mysql_result($result,$i,"Redirects"); @@ -174,7 +176,8 @@ $PreForum = $ThemeSet['ForumIcon']; if ($ForumType=="forum") { $PreForum=$ThemeSet['ForumIcon']; } if ($ForumType=="subforum") { $PreForum=$ThemeSet['SubForumIcon']; } if ($ForumType=="redirect") { $PreForum=$ThemeSet['RedirectIcon']; } -$ExStr = ""; if ($ForumType!="redirect") { $ExStr = "&page=1"; } +$ExStr = ""; if ($ForumType!="redirect"&& + $ForumShowTopics!="no") { $ExStr = "&page=1"; } ?>
diff --git a/inc/topics.php b/inc/topics.php index 58078c3..dffa1f5 100644 --- a/inc/topics.php +++ b/inc/topics.php @@ -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: 10/23/2007 SVN 119 - Author: cooldude2k $ + $FileInfo: topics.php - Last Update: 10/29/2007 SVN 120 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="topics.php"||$File3Name=="/topics.php") { @@ -281,24 +281,30 @@ gzip_page($Settings['use_gzip'],$GZipEncode['Type']); @mysql_close(); die(); } -
+ - " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('TopicPost','  ')" />   - - " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('TopicPost','  ')" />
- + + + + +  "; } +echo "
 " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" />  " style="vertical-align: middle; border: 0px; cursor: pointer;" title="" alt="" onclick="addsmiley('ReplyPost','  ')" /> 
"; @mysql_free_result($renee_result); ?>
diff --git a/inc/versioninfo.php b/inc/versioninfo.php index f698f60..af7535a 100644 --- a/inc/versioninfo.php +++ b/inc/versioninfo.php @@ -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: 10/23/2007 SVN 119 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 10/29/2007 SVN 120 - 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] = 0; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 119; $RName = "iDB"; $SFName = "IntDB"; -$SVNDay[0] = 10; $SVNDay[1] = 23; $SVNDay[2] = 2007; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; +$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 120; $RName = "iDB"; $SFName = "IntDB"; +$SVNDay[0] = 10; $SVNDay[1] = 29; $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); -- 2.11.0