OSDN Git Service

Small bug fixes. :o
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Sun, 3 Oct 2010 02:44:33 +0000 (02:44 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Sun, 3 Oct 2010 02:44:33 +0000 (02:44 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@565 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/categories.php
inc/forums.php
inc/lowforums.php
inc/lowsubcategories.php
inc/subcategories.php
inc/subforums.php
inc/versioninfo.php
sql.php

index 9ce104c..eb8f8a7 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: categories.php - Last Update: 09/10/2010 SVN 536 - Author: cooldude2k $
+    $FileInfo: categories.php - Last Update: 09/02/2010 SVN 565 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="categories.php"||$File3Name=="/categories.php") {
@@ -172,7 +172,9 @@ if($NewUpdateTime>$OldUpdateTime) {
        $UseThisFonum = $gltf[$glti]; 
 $OldUpdateTime = $NewUpdateTime; }
 sql_free_result($gltforesult); }
-++$glti; } }
+++$glti; } 
+if($UseThisFonum==0) {
+       $UseThisFonum = $gltf[0]; } }
 if ($ForumType!="subforum"&&$ForumType!="redirect") { $UseThisFonum = $gltf[0]; }
 if ($ForumType!="redirect") {
 $ExtraIgnores = null;
index 6918c40..64d2d67 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: forums.php - Last Update: 09/10/2010 SVN 536 - Author: cooldude2k $
+    $FileInfo: forums.php - Last Update: 09/02/2010 SVN 565 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="forums.php"||$File3Name=="/forums.php") {
@@ -144,7 +144,9 @@ if($NewUpdateTime>$OldUpdateTime) {
     $UseThisFonum = $gltf[$glti];
 $OldUpdateTime = $NewUpdateTime; } }
 sql_free_result($gltforesult);
-++$glti; } }
+++$glti; } 
+if($UseThisFonum==0) {
+       $UseThisFonum = $gltf[0]; } }
 if ($ForumType!="subforum"&&$ForumType!="redirect") { $UseThisFonum = $gltf[0]; }
 if ($ForumType!="redirect") {
 $ExtraIgnores = null;
index a0cd577..008279c 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: lowforums.php - Last Update: 09/10/2010 SVN 536 - Author: cooldude2k $
+    $FileInfo: lowforums.php - Last Update: 09/02/2010 SVN 565 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="lowforums.php"||$File3Name=="/lowforums.php") {
@@ -75,59 +75,6 @@ $NumRedirects=sql_result($result,$i,"Redirects");
 $ForumDescription=sql_result($result,$i,"Description");
 $ForumType = strtolower($ForumType); $sflist = null;
 $gltf = array(null); $gltf[0] = $ForumID;
-if ($ForumType=="subforum") { 
-$apcquery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."forums\" WHERE \"ShowForum\"='yes' AND \"InSubForum\"=%i".$ForumIgnoreList2." ORDER BY \"OrderID\" ASC, \"id\" ASC", array($ForumID));
-$apcresult=sql_query($apcquery,$SQLStat);
-$apcnum=sql_num_rows($apcresult);
-$apci=0; $apcl=1; if($apcnum>=1) {
-while ($apci < $apcnum) {
-$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
-$NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
-$NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=sql_result($apcresult,$apci,"id");
-$SubsForumName=sql_result($apcresult,$apci,"Name");
-$SubsForumType=sql_result($apcresult,$apci,"ForumType");
-$SubsForumShowTopics=sql_result($result,$i,"CanHaveTopics");
-if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
-       $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
-$ExStr = ""; if ($SubsForumType!="redirect"&&
-    $SubsForumShowTopics!="no") { $ExStr = "&page=1"; }
-$shownum = null;
-if ($SubsForumType=="redirect") { $shownum = "(".$NumRedirects." redirects)"; }
-if ($SubsForumType!="redirect") { $shownum = "(".$NumPosts." posts)"; }
-$sfurl = "<a href=\"";
-$sfurl = url_maker($exfile[$SubsForumType],$Settings['file_ext'],"act=lowview&id=".$SubsForumID.$ExStr,$Settings['qstr'],$Settings['qsep'],$prexqstr[$SubsForumType],$exqstr[$SubsForumType]);
-$sfurl = "<li><ul style=\"list-style-type: none;\"><li><a href=\"".$sfurl."\">".$SubsForumName."</a> <span style=\"color: gray; font-size: 10px;\">".$shownum."</span></li></ul></li>";
-if($apcl==1) {
-$sflist = null;
-$sflist = $sflist." ".$sfurl; }
-if($apcl>1) {
-$sflist = $sflist." ".$sfurl; }
-$gltf[$apcl] = $SubsForumID; ++$apcl; }
-++$apci; }
-sql_free_result($apcresult); } }
-if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
-       $PermissionInfo['CanViewForum'][$ForumID]=="yes") {
-$LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;";
-if(!isset($LastTopic)) { $LastTopic = null; }
-$gltnum = count($gltf); $glti = 0; 
-$OldUpdateTime = 0; $UseThisFonum = null;
-if ($ForumType=="subforum") { 
-while ($glti < $gltnum) {
-$ExtraIgnores = null;
-if($PermissionInfo['CanModForum'][$gltf[$glti]]=="no") {
-       $ExtraIgnores = " AND \"Closed\"<>3"; }
-$gltfoquery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."topics\" WHERE \"ForumID\"=%i".$ExtraIgnores." ORDER BY \"LastUpdate\" DESC LIMIT 1", array($gltf[$glti]));
-$gltforesult=sql_query($gltfoquery,$SQLStat);
-$gltfonum=sql_num_rows($gltforesult);
-if($gltfonum>0) {
-$NewUpdateTime=sql_result($gltforesult,0,"LastUpdate");
-if($NewUpdateTime>$OldUpdateTime) { 
-       $UseThisFonum = $gltf[$glti]; 
-$OldUpdateTime = $NewUpdateTime; } }
-sql_free_result($gltforesult);
-++$glti; } }
 $shownum = null;
 if ($ForumType=="redirect") { $shownum = "(".$NumRedirects." redirects)"; }
 if ($ForumType!="redirect") { $shownum = "(".$NumPosts." posts)"; }
@@ -141,7 +88,7 @@ $ExStr = ""; if ($ForumType!="redirect"&&
 <ul style="list-style-type: none;"><li>
 <a href="<?php echo url_maker($exfile[$ForumType],$Settings['file_ext'],"act=lowview&id=".$ForumID.$ExStr,$Settings['qstr'],$Settings['qsep'],$prexqstr[$ForumType],$exqstr[$ForumType]); ?>"<?php if($ForumType=="redirect") { echo " onclick=\"window.open(this.href);return false;\""; } ?>><?php echo $ForumName; ?></a> <span style="color: gray; font-size: 10px;"><?php echo $shownum; ?></span></li>
 <?php echo $sflist; ?></ul>
-<?php ++$i; } sql_free_result($result);
+<?php ++$i; } sql_free_result($result);
 if($num>=1) {
 ?>
 <?php } } 
index 9aae51d..97190a1 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: lowsubcategories.php - Last Update: 09/10/2010 SVN 536 - Author: cooldude2k $
+    $FileInfo: lowsubcategories.php - Last Update: 09/02/2010 SVN 565 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="lowsubcategories.php"||$File3Name=="/lowsubcategories.php") {
@@ -107,74 +107,6 @@ $NumRedirects=sql_result($result,$i,"Redirects");
 $ForumDescription=sql_result($result,$i,"Description");
 $ForumType = strtolower($ForumType); $sflist = null;
 $gltf = array(null); $gltf[0] = $ForumID;
-if ($ForumType=="subforum") { 
-$apcquery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."forums\" WHERE \"ShowForum\"='yes' AND \"InSubForum\"=%i".$ForumIgnoreList2." ORDER BY \"OrderID\" ASC, \"id\" ASC", array($ForumID));
-$apcresult=sql_query($apcquery,$SQLStat);
-$apcnum=sql_num_rows($apcresult);
-$apci=0; $apcl=1; if($apcnum>=1) {
-while ($apci < $apcnum) {
-$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
-$NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
-$NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=sql_result($apcresult,$apci,"id");
-$SubsForumName=sql_result($apcresult,$apci,"Name");
-$SubsForumType=sql_result($apcresult,$apci,"ForumType");
-$SubsForumShowTopics=sql_result($result,$i,"CanHaveTopics");
-if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
-       $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
-$ExStr = ""; if ($SubsForumType!="redirect"&&
-    $SubsForumShowTopics!="no") { $ExStr = "&page=1"; }
-$shownum = null;
-if ($SubsForumType=="redirect") { $shownum = "(".$NumRedirects." redirects)"; }
-if ($SubsForumType!="redirect") { $shownum = "(".$NumPosts." posts)"; }
-$sfurl = "<a href=\"";
-$sfurl = url_maker($exfile[$SubsForumType],$Settings['file_ext'],"act=view&id=".$SubsForumID.$ExStr,$Settings['qstr'],$Settings['qsep'],$prexqstr[$SubsForumType],$exqstr[$SubsForumType]);
-$sfurl = "<li><ul style=\"list-style-type: none;\"><li><a href=\"".$sfurl."\">".$SubsForumName."</a> <span style=\"color: gray; font-size: 10px;\">".$shownum."</span></li></ul></li>";
-if($apcl==1) {
-$sflist = $sflist." ".$sfurl; }
-if($apcl>1) {
-$sflist = $sflist." ".$sfurl; }
-$gltf[$apcl] = $SubsForumID; ++$apcl; }
-++$apci; }
-sql_free_result($apcresult); } }
-if ($ForumType=="subforum") { 
-$apcquery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."forums\" WHERE \"ShowForum\"='yes' AND \"InSubForum\"=%i".$ForumIgnoreList2." ORDER BY \"OrderID\" ASC, \"id\" ASC", array($ForumID));
-$apcresult=sql_query($apcquery,$SQLStat);
-$apcnum=sql_num_rows($apcresult);
-$apci=0; $apcl=1; if($apcnum>=1) {
-while ($apci < $apcnum) {
-$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
-$NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
-$NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=sql_result($apcresult,$apci,"id");
-if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
-       $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
-$gltf[$apcl] = $SubsForumID; ++$apcl; }
-++$apci; }
-sql_free_result($apcresult); } }
-if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
-       $PermissionInfo['CanViewForum'][$ForumID]=="yes") {
-$LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;";
-if(!isset($LastTopic)) { $LastTopic = null; }
-$gltnum = count($gltf); $glti = 0; 
-$OldUpdateTime = 0; $UseThisFonum = null;
-if ($ForumType=="subforum") { 
-while ($glti < $gltnum) {
-$ExtraIgnores = null;
-if($PermissionInfo['CanModForum'][$gltf[$glti]]=="no") {
-       $ExtraIgnores = " AND \"Closed\"<>3"; }
-$gltfoquery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."topics\" WHERE \"CategoryID\"=%i AND \"ForumID\"=%i".$ExtraIgnores." ORDER BY \"LastUpdate\" DESC LIMIT 1", array($CategoryID,$gltf[$glti]));
-$gltforesult=sql_query($gltfoquery,$SQLStat);
-$gltfonum=sql_num_rows($gltforesult);
-if($gltfonum>0) {
-$NewUpdateTime=sql_result($gltforesult,0,"LastUpdate");
-if($NewUpdateTime>$OldUpdateTime) { 
-       $UseThisFonum = $gltf[$glti]; 
-$OldUpdateTime = $NewUpdateTime; } }
-sql_free_result($gltforesult);
-++$glti; } }
 $shownum = null;
 if ($ForumType=="redirect") { $shownum = "(".$NumRedirects." redirects)"; }
 if ($ForumType!="redirect") { $shownum = "(".$NumPosts." posts)"; }
@@ -191,7 +123,7 @@ $ExStr = ""; if ($ForumType!="redirect"&&
 <?php } ++$i; } sql_free_result($result); } ?>
 </li></ul>
 <ul style="list-style-type: none;">
-<?php ++$prei; } ?>
+<?php ++$prei; } ?>
 <?php
 sql_free_result($preresult);
 $CatCheck = "skip";
index 8d1ef01..f342e7f 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: subcategories.php - Last Update: 09/10/2010 SVN 536 - Author: cooldude2k $
+    $FileInfo: subcategories.php - Last Update: 09/02/2010 SVN 565 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="subcategories.php"||$File3Name=="/subcategories.php") {
@@ -219,7 +219,9 @@ if($NewUpdateTime>$OldUpdateTime) {
        $UseThisFonum = $gltf[$glti]; 
 $OldUpdateTime = $NewUpdateTime; }
 sql_free_result($gltforesult); }
-++$glti; } }
+++$glti; } 
+if($UseThisFonum==0) {
+       $UseThisFonum = $gltf[0]; } }
 if ($ForumType!="subforum"&&$ForumType!="redirect") { $UseThisFonum = $gltf[0]; }
 if ($ForumType!="redirect") {
 $ExtraIgnores = null;
index 7fc6cdd..9793836 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: subforums.php - Last Update: 09/10/2010 SVN 536 - Author: cooldude2k $
+    $FileInfo: subforums.php - Last Update: 09/02/2010 SVN 565 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="subforums.php"||$File3Name=="/subforums.php") {
@@ -200,7 +200,9 @@ if($NewUpdateTime>$OldUpdateTime) {
        $UseThisFonum = $gltf[$glti]; 
 $OldUpdateTime = $NewUpdateTime; }
 sql_free_result($gltforesult); }
-++$glti; } }
+++$glti; } 
+if($UseThisFonum==0) {
+       $UseThisFonum = $gltf[0]; } }
 if ($ForumType!="subforum"&&$ForumType!="redirect") { $UseThisFonum = $gltf[0]; }
 if ($ForumType!="redirect") {
 $ExtraIgnores = null;
index e8ec162..6929d0e 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 09/30/2010 SVN 564 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 09/02/2010 SVN 565 - 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] = 4; $VER1[2] = 1; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 564; $RName = "iDB"; $SFName = "IntDB";
-$SVNDay[0] = 09; $SVNDay[1] = 30; $SVNDay[2] = 2010; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 565; $RName = "iDB"; $SFName = "IntDB";
+$SVNDay[0] = 09; $SVNDay[1] = 02; $SVNDay[2] = 2010; $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);
diff --git a/sql.php b/sql.php
index c2b6ed9..c9e5096 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2010 iDB Support - http://idb.berlios.de/
     Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: sql.php - Last Update: 09/29/2010 SVN 563 - Author: cooldude2k $
+    $FileInfo: sql.php - Last Update: 09/02/2010 SVN 565 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -314,6 +314,11 @@ $temp_user_ip = $_SERVER['REMOTE_ADDR'];
 if(!isset($_SERVER['HTTP_USER_AGENT'])) {
        $_SERVER['HTTP_USER_AGENT'] = ""; }
 $temp_user_agent = $_SERVER['HTTP_USER_AGENT'];
+if($Settings['file_ext']!="no+ext"&&$Settings['file_ext']!="no ext") {
+$MkIndexFile = $exfile['index'].$Settings['file_ext']; }
+if($Settings['file_ext']=="no+ext"||$Settings['file_ext']=="no ext") {
+$MkIndexFile = $exfile['index']; }
+$temp_session_data = "ViewingPage|s:9:\"?act=view\";ViewingFile|s:".strlen($MkIndexFile).":\"".$MkIndexFile."\";PreViewingTitle|s:7:\"Viewing\";ViewingTitle|s:11:\"Board index\";UserID|s:1:\"0\";UserIP|s:".strlen($_SERVER['REMOTE_ADDR']).":\"".$_SERVER['REMOTE_ADDR']."\";UserGroup|s:".strlen($Settings['GuestGroup']).":\"".$Settings['GuestGroup']."\";UserGroupID|s:1:\"4\";UserTimeZone|s:".strlen($Settings['DefaultTimeZone']).":\"".$Settings['DefaultTimeZone']."\";UserDST|s:".strlen($Settings['DefaultDST']).":\"".$Settings['DefaultDST']."\";";
 $SQLSType = $Settings['sqltype'];
 //Session Open Function
 function sql_session_open($save_path, $session_name ) {
@@ -325,13 +330,13 @@ function sql_session_close() {
 return true; }
 //Session Read Function
 function sql_session_read($id) {
-global $sqltable,$SQLStat,$SQLSType,$temp_user_ip,$temp_user_agent;
+global $sqltable,$SQLStat,$SQLSType,$temp_user_ip,$temp_user_agent,$temp_session_data;
 $result = sql_query(sql_pre_query("SELECT * FROM \"".$sqltable."sessions\" WHERE \"session_id\" = '%s'", array($id)),$SQLStat);
 if (!sql_num_rows($result)) {
 sql_query(sql_pre_query("DELETE FROM \"".$sqltable."sessions\" WHERE \"session_id\"<>'%s' AND ip_address='%s'", array($id,$temp_user_ip)),$SQLStat);
 $time = GMTimeStamp();
 sql_query(sql_pre_query("INSERT INTO \"".$sqltable."sessions\" (\"session_id\", \"session_data\", \"user_agent\", \"ip_address\", \"expires\") VALUES\n".
-"('%s', '', '%s', '%s', %i)", array($id,$temp_user_agent,$temp_user_ip,$time)),$SQLStat);
+"('%s', '%s', '%s', '%s', %i)", array($id,$temp_session_data,$temp_user_agent,$temp_user_ip,$time)),$SQLStat);
 return '';
 } else {
 $time = GMTimeStamp();