From 8943c8a9b21ba49632b3b21f95015107070bc335 Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Fri, 24 Jul 2009 01:02:38 +0000 Subject: [PATCH] Small bug fix. git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@282 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- inc/lowsubcategories.php | 4 ++-- inc/searchs.php | 3 ++- inc/subcategories.php | 47 +++++++++++++++++++++++++++++++++-------------- inc/versioninfo.php | 4 ++-- 4 files changed, 39 insertions(+), 19 deletions(-) diff --git a/inc/lowsubcategories.php b/inc/lowsubcategories.php index 26f1100..a55d743 100644 --- a/inc/lowsubcategories.php +++ b/inc/lowsubcategories.php @@ -11,7 +11,7 @@ Copyright 2004-2009 iDB Support - http://idb.berlios.de/ Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: lowsubcategories.php - Last Update: 7/23/2009 SVN 281 - Author: cooldude2k $ + $FileInfo: lowsubcategories.php - Last Update: 7/23/2009 SVN 282 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="lowsubcategories.php"||$File3Name=="/lowsubcategories.php") { @@ -146,7 +146,7 @@ $gltf[$apcl] = $SubsForumID; ++$apcl; } @mysql_free_result($apcresult); } } if(isset($PermissionInfo['CanViewForum'][$ForumID])&& $PermissionInfo['CanViewForum'][$ForumID]=="yes") { -$LastTopic = null; +$LastTopic = " 
 
 "; if(!isset($LastTopic)) { $LastTopic = null; } $gltnum = count($gltf); $glti = 0; $OldUpdateTime = 0; $UseThisFonum = null; diff --git a/inc/searchs.php b/inc/searchs.php index 1b699d2..f9329b4 100644 --- a/inc/searchs.php +++ b/inc/searchs.php @@ -11,7 +11,7 @@ Copyright 2004-2009 iDB Support - http://idb.berlios.de/ Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: searchs.php - Last Update: 7/21/2009 SVN 276 - Author: cooldude2k $ + $FileInfo: searchs.php - Last Update: 7/23/2009 SVN 282 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="searchs.php"||$File3Name=="/searchs.php") { @@ -352,6 +352,7 @@ if(isset($PermissionInfo['CanViewForum'][$ForumID])&& $PermissionInfo['CanViewForum'][$ForumID]=="yes"&& isset($CatPermissionInfo['CanViewCategory'][$CategoryID])&& $CatPermissionInfo['CanViewCategory'][$CategoryID]=="yes") { +$LastReply = " 
 "; $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); diff --git a/inc/subcategories.php b/inc/subcategories.php index 9918285..65b870a 100644 --- a/inc/subcategories.php +++ b/inc/subcategories.php @@ -11,7 +11,7 @@ Copyright 2004-2009 iDB Support - http://idb.berlios.de/ Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: subcategories.php - Last Update: 7/23/2009 SVN 281 - Author: cooldude2k $ + $FileInfo: subcategories.php - Last Update: 7/23/2009 SVN 282 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="subcategories.php"||$File3Name=="/subcategories.php") { @@ -187,13 +187,13 @@ $gltf[$apcl] = $SubsForumID; ++$apcl; } @mysql_free_result($apcresult); } } if(isset($PermissionInfo['CanViewForum'][$ForumID])&& $PermissionInfo['CanViewForum'][$ForumID]=="yes") { -$LastTopic = null; +$LastTopic = " 
 
 "; if(!isset($LastTopic)) { $LastTopic = null; } $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) { @@ -205,31 +205,50 @@ $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){ $TopicID=mysql_result($gltresult,0,"id"); $TopicName=mysql_result($gltresult,0,"TopicName"); $NumReplys=mysql_result($gltresult,0,"NumReply"); -$ShowReply = $NumReplys + 1; +$NumPages = null; $NumRPosts = $NumReplys + 1; +if(!isset($Settings['max_posts'])) { $Settings['max_posts'] = 10; } +if($NumRPosts>$Settings['max_posts']) { +$NumPages = ceil($NumRPosts/$Settings['max_posts']); } +if($NumRPosts<=$Settings['max_posts']) { $NumPages = 1; } $TopicName1 = pre_substr($TopicName,0,20); -if (pre_strlen($TopicName)>20) { $TopicName1 = $TopicName1."..."; -$oldtopicname=$TopicName; $TopicName=$TopicName1; } -$UsersID=mysql_result($gltresult,0,"UserID"); -$GuestsName=mysql_result($gltresult,0,"GuestName"); +$oldtopicname=$TopicName; +if (pre_strlen($TopicName)>20) { +$TopicName1 = $TopicName1."..."; $TopicName=$TopicName1; } +$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){ +$ReplyID=mysql_result($glrresult,0,"id"); +$UsersID=mysql_result($glrresult,0,"UserID"); +$GuestsName=mysql_result($glrresult,0,"GuestName"); +$TimeStamp=mysql_result($glrresult,0,"TimeStamp"); +$TimeStamp=GMTimeChange("F j Y, g:i a",$TimeStamp,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']); +@mysql_free_result($glrresult); } $UsersName = GetUserName($UsersID,$Settings['sqltable']); $UsersHidden = GetHiddenMember($UsersID,$Settings['sqltable']); -$UsersName1 = pre_substr($UsersName,0,20); if($UsersName=="Guest") { $UsersName=$GuestsName; if($UsersName==null) { $UsersName="Guest"; } } -if (pre_strlen($UsersName)>20) { $UsersName1 = $UsersName1."..."; -$oldusername=$UsersName; $UsersName=$UsersName1; } $lul = null; +$UsersName1 = pre_substr($UsersName,0,20); +$oldusername=$UsersName; +if (pre_strlen($UsersName)>20) { +$UsersName1 = $UsersName1."..."; $UsersName=$UsersName1; } +$lul = null; if($UsersID>0&&$UsersHidden=="no") { $lul = url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$UsersID,$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); -$LastTopic = "Topic: ".$TopicName."
\nUser: ".$UsersName.""; } +$LastTopic = $TimeStamp."
\nTopic: ".$TopicName."
\nUser: ".$UsersName.""; } if($UsersID<=0||$UsersHidden=="yes") { -$LastTopic = "Topic: ".$TopicName."
\nUser: ".$UsersName.""; } } +if($UsersID==-1) { $UserPre = "Guest:"; } +if($UsersID<-1||$UsersID=0||$UsersHidden=="yes") { + $UserPre = "Hidden:"; } +$LastTopic = $TimeStamp."
\nTopic: ".$TopicName."
\n".$UserPre." ".$UsersName.""; } } +if($LastTopic==null) { $LastTopic = " 
 
 "; } } @mysql_free_result($gltresult); if ($ForumType=="redirect") { $LastTopic=" 
Redirects: ".$NumRedirects."
 "; } $PreForum = $ThemeSet['ForumIcon']; diff --git a/inc/versioninfo.php b/inc/versioninfo.php index f59ee8a..bc4746e 100644 --- a/inc/versioninfo.php +++ b/inc/versioninfo.php @@ -11,7 +11,7 @@ Copyright 2004-2009 iDB Support - http://idb.berlios.de/ Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: versioninfo.php - Last Update: 7/23/2009 SVN 281 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 7/23/2009 SVN 282 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") { @@ -27,7 +27,7 @@ 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] = 8; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 281; $RName = "iDB"; $SFName = "IntDB"; +$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 282; $RName = "iDB"; $SFName = "IntDB"; $SVNDay[0] = 7; $SVNDay[1] = 23; $SVNDay[2] = 2009; $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