OSDN Git Service

(root) / idb / iDB.git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 82c7e09)
Small bug fix.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Tue, 24 Nov 2009 00:32:21 +0000 (00:32 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Tue, 24 Nov 2009 00:32:21 +0000 (00:32 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@360 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/members.php patch | blob | history
inc/misc/mysql.php patch | blob | history
inc/prelogin.php patch | blob | history
inc/versioninfo.php patch | blob | history
install.php patch | blob | history
setup/mkconfig.php patch | blob | history

diff --git a/inc/members.php b/inc/members.php
index 917eaba..dc199e0 100644 (file)
--- a/inc/members.php
+++ b/inc/members.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: members.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
+    $FileInfo: members.php - Last Update: 11/23/2009 SVN 360 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="members.php"||$File3Name=="/members.php") {
@@ -671,7 +671,7 @@ Title: <?php echo $ViewMem['Title']; ?>
 <td class="TableColumn4" colspan="2">&nbsp;</td>
 </tr>
 </table></div>
-<?php } sql_free_result($result);
+<?php sql_free_result($result); } 
 if($_GET['act']=="logout") {
 session_unset();
 if($cookieDomain==null) {
@@ -910,7 +910,7 @@ $NewIP=$_SERVER['REMOTE_ADDR'];
 if($BanError!="yes") {
 $queryup = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `Password`='%s',`HashType`='%s',`LastActive`=%i,`IP`='%s',`Salt`='%s' WHERE `id`=%i", array($NewPassword,$iDBHash,$NewDay,$NewIP,$NewHashSalt,$YourIDM));
 sql_query($queryup);
-sql_free_result($resultlog); sql_free_result($queryup);
+sql_free_result($resultlog);
 //session_regenerate_id();
 $_SESSION['Theme']=$UseTheme;
 $_SESSION['MemberName']=$YourNameM;
diff --git a/inc/misc/mysql.php b/inc/misc/mysql.php
index 6fb4a9a..862b27b 100644 (file)
--- a/inc/misc/mysql.php
+++ b/inc/misc/mysql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: mysql.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
+    $FileInfo: mysql.php - Last Update: 11/23/2009 SVN 360 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mysql.php"||$File3Name=="/mysql.php") {
@@ -68,7 +68,7 @@ if ($num===false) {
        return false; }
        return $num; }
 // Connect to mysql database
-function sql_connect_db($server,$username,$password,$database,$new_link=false) {
+function sql_connect_db($server,$username,$password,$database=null,$new_link=false) {
 if($new_link!==true) { $new_link = false; }
 if($new_link!==true||$new_link===false) {
 $link = mysql_connect($server,$username,$password); }
@@ -77,10 +77,11 @@ $link = mysql_connect($server,$username,$password,$new_link); }
 if ($link===false) {
     trigger_error("Not connected: ".sql_error(),E_USER_ERROR);
        return false; }
+if($database!==null) {
 $dlink = mysql_select_db($database,$link);
 if ($dlink===false) {
     trigger_error("Can't use database ".$database.": ".sql_error(),E_USER_ERROR);
-       return false; }
+       return false; } }
 return $link; }
 // Query Results :P
 function sql_result($result,$row,$field=0) {
diff --git a/inc/prelogin.php b/inc/prelogin.php
index 91681ce..d2c96cf 100644 (file)
--- a/inc/prelogin.php
+++ b/inc/prelogin.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: prelogin.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
+    $FileInfo: prelogin.php - Last Update: 11/23/2009 SVN 360 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="prelogin.php"||$File3Name=="/prelogin.php") {
@@ -30,12 +30,14 @@ $YourPassAM=sql_result($resultlog2,0,"Password");
 $gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($YourGroupAM));
 $gresult=sql_query($gquery);
 $YourGroupAM=sql_result($gresult,0,"Name");
-sql_free_result($gresult); $BanError = null;
+sql_free_result($gresult);
+$BanError = null;
 $YourTimeZoneAM=sql_result($resultlog2,0,"TimeZone");
 $UseThemeAM=sql_result($resultlog2,0,"UseTheme");
 $YourDSTAM=sql_result($resultlog2,0,"DST");
 $YourLastPostTime=sql_result($resultlog2,0,"LastPostTime");
 $YourBanTime=sql_result($resultlog2,0,"BanTime");
+sql_free_result($resultlog2);
 $CGMTime = GMTimeStamp();
 if($YourBanTime!=0&&$YourBanTime!=null) {
 if($YourBanTime>=$CGMTime) { $BanError = "yes"; } }
@@ -89,5 +91,4 @@ $_SESSION = array(); session_unset(); session_destroy();
 redirect("location",$basedir.url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'],false)); sql_free_result($resultlog2); sql_free_result($gresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-sql_free_result($resultlog2); sql_free_result($gresult);
 ?>
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 96d2efa..0758d17 100644 (file)
--- 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: 11/23/2009 SVN 359 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 11/23/2009 SVN 360 - 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] = 3; $VER1[2] = 2; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 359; $RName = "iDB"; $SFName = "IntDB";
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 360; $RName = "iDB"; $SFName = "IntDB";
 $SVNDay[0] = 11; $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);
diff --git a/install.php b/install.php
index e1cb30f..afcc8e4 100644 (file)
--- a/install.php
+++ b/install.php
@@ -12,11 +12,24 @@
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.de/support/category.php?act=view&id=2
 
-    $FileInfo: install.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
+    $FileInfo: install.php - Last Update: 11/23/2009 SVN 360 - Author: cooldude2k $
 */
 if(ini_get("register_globals")) {
 require_once('inc/misc/killglobals.php'); }
+//ini_set("display_errors", true); 
+//ini_set("display_startup_errors", true);
 error_reporting(E_ALL ^ E_NOTICE);
+/* Get rid of session id in urls */
+//ini_set("session.use_trans_sid", false);
+//ini_set("session.use_cookies", true);
+//ini_set("session.use_only_cookies", true);
+//ini_set("url_rewriter.tags","");
+set_time_limit(30); ignore_user_abort(true);
+/* Change session garbage collection settings */
+//ini_set("session.gc_probability", 1);
+//ini_set("session.gc_divisor", 100);
+//ini_set("session.gc_maxlifetime", 1440);
+ob_start();
 if(ini_get("register_globals")) { 
        if(!isset($SettDir['misc'])) { $SettDir['misc'] = "inc/misc/"; }
        require_once($SettDir['misc'].'killglobals.php'); }
diff --git a/setup/mkconfig.php b/setup/mkconfig.php
index 9f9e939..fb4106b 100644 (file)
--- a/setup/mkconfig.php
+++ b/setup/mkconfig.php
@@ -12,7 +12,7 @@
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: mkconfig.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
+    $FileInfo: mkconfig.php - Last Update: 11/23/2009 SVN 360 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") {
@@ -35,12 +35,12 @@ $_POST['tableprefix'] = preg_replace("/[^A-Za-z0-9_$]/", "", $_POST['tableprefix
 if($_POST['tableprefix']==null||$_POST['tableprefix']=="_") { $_POST['tableprefix']="idb_"; }
 if($_POST['sessprefix']==null||$_POST['sessprefix']=="_") { $_POST['sessprefix']="idb_"; }
 $checkfile="settings.php";
-chmod("settings.php",0766);
-chmod("settingsbak.php",0766);
+@chmod("settings.php",0766);
+@chmod("settingsbak.php",0766);
 if (!is_writable($checkfile)) {
    echo "<br />Settings is not writable.";
-   chmod("settings.php",0766); $Error="Yes";
-   chmod("settingsbak.php",0766);
+   @chmod("settings.php",0766); $Error="Yes";
+   @chmod("settingsbak.php",0766);
 } else { /* settings.php is writable install iDB. ^_^ */ }
 session_name($_POST['tableprefix']."sess");
 $URLsTest = parse_url($_POST['BoardURL']);
@@ -120,7 +120,7 @@ if($Settings['charset']=="UTF-8") {
        $SQLCollate = "utf8_unicode_ci";
        $SQLCharset = "utf8"; }
 sql_set_charset($SQLCharset);
-if($mydbtest!==true) { $Error="Yes";
+if($mydbtest===false) { $Error="Yes";
 echo "<br />".sql_errno().": ".sql_error()."\n"; }
 if ($Error!="Yes") {
 $ServerUUID = uuid(false,true,false,$_POST['usehashtype'],null);
@@ -182,20 +182,21 @@ $fp = fopen("settingsbak.php","w+");
 fwrite($fp, $BoardSettingsBak);
 fclose($fp);
 if($_POST['storecookie']=="true") {
-setcookie("MemberName", $_POST['AdminUser'], time() + (7 * 86400), $this_dir, $URLsTest['host']);
-setcookie("UserID", 1, time() + (7 * 86400), $this_dir, $URLsTest['host']);
-setcookie("SessPass", $NewPassword, time() + (7 * 86400), $this_dir, $URLsTest['host']); }
+//setcookie("MemberName", $_POST['AdminUser'], time() + (7 * 86400), $this_dir, $URLsTest['host']);
+//setcookie("UserID", 1, time() + (7 * 86400), $this_dir, $URLsTest['host']);
+//setcookie("SessPass", $NewPassword, time() + (7 * 86400), $this_dir, $URLsTest['host']); 
+}
 mysql_close(); $chdel = true;
 if($Error!="Yes") {
 if($_POST['unlink']=="true") {
-$chdel1 = unlink($SetupDir['setup'].'presetup.php'); $chdel2 = unlink($SetupDir['setup'].'setup.php');
-$chdel3 = unlink($SetupDir['setup'].'mkconfig.php'); $chdel4 = unlink($SetupDir['setup'].'mktable.php');
-$chdel5 = unlink($SetupDir['setup'].'index.php'); $chdel6 = unlink($SetupDir['setup'].'license.php');
-$chdel7 = unlink($SetupDir['setup'].'preinstall.php'); $chdel8 = unlink($SetupDir['convert'].'index.php');
-if($ConvertInfo['ConvertFile']!=null) { $chdel0 = unlink($ConvertInfo['ConvertFile']); }
-$chdel9 = unlink($SetupDir['convert'].'info.php'); 
+$chdel1 = @unlink($SetupDir['setup'].'presetup.php'); $chdel2 = @unlink($SetupDir['setup'].'setup.php');
+$chdel3 = @unlink($SetupDir['setup'].'mkconfig.php'); $chdel4 = @unlink($SetupDir['setup'].'mktable.php');
+$chdel5 = @unlink($SetupDir['setup'].'index.php'); $chdel6 = @unlink($SetupDir['setup'].'license.php');
+$chdel7 = @unlink($SetupDir['setup'].'preinstall.php'); $chdel8 = @unlink($SetupDir['convert'].'index.php');
+if($ConvertInfo['ConvertFile']!=null) { $chdel0 = @unlink($ConvertInfo['ConvertFile']); }
+$chdel9 = @unlink($SetupDir['convert'].'info.php'); 
 $chdel10 = rmdir($SetupDir['convert']); $chdel11 = rmdir('setup');
-$chdel12 = unlink('install.php'); } }
+$chdel12 = @unlink('install.php'); } }
 if($chdel1===false||$chdel2===false||$chdel3===false||$chdel4===false) { $chdel = false; }
 if($chdel5===false||$chdel6===false||$chdel7===false||$chdel8===false) { $chdel = false; }
 if($chdel9===false||$chdel10===false||$chdel11===false||$chdel12===false) { $chdel = false; }
Internet Discussion Boards is a message board system by Game Maker 2k. Its very easy to set up. Your web host needs PHP and CUBRID / MySQL / MariaDB / PostgreSQL / SQLite. Internet Discussion Boards is Open Source so you can make changes to it.
About OSDN
Find Software
Develop Software
Help