From 4a9db238978febf6d5634749f423ebecedd96710 Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Fri, 5 Oct 2007 06:45:10 +0000 Subject: [PATCH] Small bug fix. :P git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@115 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- inc/filename.php | 7 ++++-- inc/function.php | 7 ++++-- inc/groupsetup.php | 26 ++++++++++----------- inc/members.php | 62 +++++++++++++++++++++++++------------------------- inc/misc/functions.php | 8 +++---- inc/prelogin.php | 44 +++++++++++++++++------------------ inc/profilemain.php | 8 +++---- inc/versioninfo.php | 6 ++--- mysql.php | 15 ++++++++---- setup/mkconfig.php | 4 ++-- 10 files changed, 99 insertions(+), 88 deletions(-) diff --git a/inc/filename.php b/inc/filename.php index 0c59a13..c489f4e 100644 --- a/inc/filename.php +++ b/inc/filename.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: filename.php - Last Update: 08/30/2007 SVN 92 - Author: cooldude2k $ + $FileInfo: filename.php - Last Update: 10/05/2007 SVN 115 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="filename.php"||$File3Name=="/filename.php") { @@ -24,8 +24,11 @@ if(dirname($_SERVER['SCRIPT_NAME'])==".") { $basedir = dirname($_SERVER['PHP_SELF'])."/"; } if($basedir=="\/") { $basedir="/"; } $basedir = str_replace("//", "/", $basedir); -if($Settings['fixbasedir']!=null&&$Settings['fixbasedir']!="") { +$cbasedir = $basedir; +if($Settings['fixbasedir']!=null&&$Settings['fixbasedir']!=false) { $basedir = $Settings['fixbasedir']; } +if($Settings['fixcookiedir']!=null&&$Settings['fixcookiedir']!="") { + $cbasedir = $Settings['fixcookiedir']; } $BaseURL = $basedir; if(!isset($_SERVER['HTTPS'])) { $_SERVER['HTTPS'] = 'off'; } if($_SERVER['HTTPS']=="on") { $prehost = "https://"; } diff --git a/inc/function.php b/inc/function.php index f0b7e69..1143ab5 100644 --- a/inc/function.php +++ b/inc/function.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: function.php - Last Update: 08/02/2007 SVN 61 - Author: cooldude2k $ + $FileInfo: function.php - Last Update: 10/05/2007 SVN 115 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="function.php"||$File3Name=="/function.php") { @@ -37,8 +37,11 @@ if(dirname($_SERVER['SCRIPT_NAME'])=="."|| $basedir = dirname($_SERVER['PHP_SELF'])."/"; } } if($basedir=="\/") { $basedir="/"; } $basedir = str_replace("//", "/", $basedir); -if($Settings['fixbasedir']!=null&&$Settings['fixbasedir']!="") { +$cbasedir = $basedir; +if($Settings['fixbasedir']!=null&&$Settings['fixbasedir']!=false) { $basedir = $Settings['fixbasedir']; } +if($Settings['fixcookiedir']!=null&&$Settings['fixcookiedir']!="") { + $cbasedir = $Settings['fixcookiedir']; } $BaseURL = $basedir; // Get our Host Name and Referer URL's Host Name if(!isset($_SERVER['HTTP_REFERER'])) { $_SERVER['HTTP_REFERER'] = null; } diff --git a/inc/groupsetup.php b/inc/groupsetup.php index 605a228..f4e2688 100644 --- a/inc/groupsetup.php +++ b/inc/groupsetup.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: groupsetup.php - Last Update: 09/21/2007 SVN 108 - Author: cooldude2k $ + $FileInfo: groupsetup.php - Last Update: 10/05/2007 SVN 115 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="groupsetup.php"||$File3Name=="/groupsetup.php") { @@ -48,21 +48,21 @@ $_SESSION['UserDST']=$ChkUsrDST; $_SESSION['UserPass']=$ChkUsrPass; } } if($numchkusr<=0||$numchkusr>1||$BanError=="yes") { @session_unset(); if($cookieDomain==null) { -@setcookie("MemberName", null, GMTimeStamp() - 3600, $basedir); -@setcookie("UserID", null, GMTimeStamp() - 3600, $basedir); -@setcookie("SessPass", null, GMTimeStamp() - 3600, $basedir); -@setcookie(session_name(), "", GMTimeStamp() - 3600, $basedir); } +@setcookie("MemberName", null, GMTimeStamp() - 3600, $cbasedir); +@setcookie("UserID", null, GMTimeStamp() - 3600, $cbasedir); +@setcookie("SessPass", null, GMTimeStamp() - 3600, $cbasedir); +@setcookie(session_name(), "", GMTimeStamp() - 3600, $cbasedir); } if($cookieDomain!=null) { if($cookieSecure==true) { -@setcookie("MemberName", null, GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); -@setcookie("UserID", null, GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); -@setcookie("SessPass", null, GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); -@setcookie(session_name(), "", GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); } +@setcookie("MemberName", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); +@setcookie("UserID", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); +@setcookie("SessPass", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); +@setcookie(session_name(), "", GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); } if($cookieSecure==false) { -@setcookie("MemberName", null, GMTimeStamp() - 3600, $basedir, $cookieDomain); -@setcookie("UserID", null, GMTimeStamp() - 3600, $basedir, $cookieDomain); -@setcookie("SessPass", null, GMTimeStamp() - 3600, $basedir, $cookieDomain); -@setcookie(session_name(), "", GMTimeStamp() - 3600, $basedir, $cookieDomain); } } +@setcookie("MemberName", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain); +@setcookie("UserID", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain); +@setcookie("SessPass", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain); +@setcookie(session_name(), "", GMTimeStamp() - 3600, $cbasedir, $cookieDomain); } } unset($_COOKIE[session_name()]); $_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)); @mysql_free_result($numchkusr); @mysql_free_result($svrgresultkgb); diff --git a/inc/members.php b/inc/members.php index 5a97135..54b7902 100644 --- a/inc/members.php +++ b/inc/members.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: members.php - Last Update: 09/21/2007 SVN 108 - Author: cooldude2k $ + $FileInfo: members.php - Last Update: 10/05/2007 SVN 115 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="members.php"||$File3Name=="/members.php") { @@ -246,21 +246,21 @@ Title: if($_GET['act']=="logout") { @session_unset(); if($cookieDomain==null) { -@setcookie("MemberName", null, GMTimeStamp() - 3600, $basedir); -@setcookie("UserID", null, GMTimeStamp() - 3600, $basedir); -@setcookie("SessPass", null, GMTimeStamp() - 3600, $basedir); -@setcookie(session_name(), "", GMTimeStamp() - 3600, $basedir); } +@setcookie("MemberName", null, GMTimeStamp() - 3600, $cbasedir); +@setcookie("UserID", null, GMTimeStamp() - 3600, $cbasedir); +@setcookie("SessPass", null, GMTimeStamp() - 3600, $cbasedir); +@setcookie(session_name(), "", GMTimeStamp() - 3600, $cbasedir); } if($cookieDomain!=null) { if($cookieSecure==true) { -@setcookie("MemberName", null, GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); -@setcookie("UserID", null, GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); -@setcookie("SessPass", null, GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); -@setcookie(session_name(), "", GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); } +@setcookie("MemberName", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); +@setcookie("UserID", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); +@setcookie("SessPass", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); +@setcookie(session_name(), "", GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); } if($cookieSecure==false) { -@setcookie("MemberName", null, GMTimeStamp() - 3600, $basedir, $cookieDomain); -@setcookie("UserID", null, GMTimeStamp() - 3600, $basedir, $cookieDomain); -@setcookie("SessPass", null, GMTimeStamp() - 3600, $basedir, $cookieDomain); -@setcookie(session_name(), "", GMTimeStamp() - 3600, $basedir, $cookieDomain); } } +@setcookie("MemberName", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain); +@setcookie("UserID", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain); +@setcookie("SessPass", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain); +@setcookie(session_name(), "", GMTimeStamp() - 3600, $cbasedir, $cookieDomain); } } unset($_COOKIE[session_name()]); $_SESSION = array(); @session_unset(); @@ -420,18 +420,18 @@ $_SESSION['UserPass']=$NewPassword; $_SESSION['DBName']=$Settings['sqldb']; if($_POST['storecookie']==true) { if($cookieDomain==null) { -@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $basedir); -@setcookie("UserID", $YourIDM, time() + (7 * 86400), $basedir); -@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $basedir); } +@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir); +@setcookie("UserID", $YourIDM, time() + (7 * 86400), $cbasedir); +@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir); } if($cookieDomain!=null) { if($cookieSecure==true) { -@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $basedir, $cookieDomain, 1); -@setcookie("UserID", $YourIDM, time() + (7 * 86400), $basedir, $cookieDomain, 1); -@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $basedir, $cookieDomain, 1); } +@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir, $cookieDomain, 1); +@setcookie("UserID", $YourIDM, time() + (7 * 86400), $cbasedir, $cookieDomain, 1); +@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir, $cookieDomain, 1); } if($cookieSecure==false) { -@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $basedir, $cookieDomain); -@setcookie("UserID", $YourIDM, time() + (7 * 86400), $basedir, $cookieDomain); -@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $basedir, $cookieDomain); } } } } +@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir, $cookieDomain); +@setcookie("UserID", $YourIDM, time() + (7 * 86400), $cbasedir, $cookieDomain); +@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir, $cookieDomain); } } } } } } if($numlog<=0) { //echo "Password was not right or user not found!! <_< "; } ?> @@ -749,18 +749,18 @@ $_SESSION['UserPass']=$NewPassword; $_SESSION['DBName']=$Settings['sqldb']; if($_POST['storecookie']==true) { if($cookieDomain==null) { -@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $basedir); -@setcookie("UserID", $YourIDM, time() + (7 * 86400), $basedir); -@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $basedir); } +@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir); +@setcookie("UserID", $YourIDM, time() + (7 * 86400), $cbasedir); +@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir); } if($cookieDomain!=null) { if($cookieSecure==true) { -@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $basedir, $cookieDomain, 1); -@setcookie("UserID", $YourIDM, time() + (7 * 86400), $basedir, $cookieDomain, 1); -@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $basedir, $cookieDomain, 1); } +@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir, $cookieDomain, 1); +@setcookie("UserID", $YourIDM, time() + (7 * 86400), $cbasedir, $cookieDomain, 1); +@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir, $cookieDomain, 1); } if($cookieSecure==false) { -@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $basedir, $cookieDomain); -@setcookie("UserID", $YourIDM, time() + (7 * 86400), $basedir, $cookieDomain); -@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $basedir, $cookieDomain); } } } +@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir, $cookieDomain); +@setcookie("UserID", $YourIDM, time() + (7 * 86400), $cbasedir, $cookieDomain); +@setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir, $cookieDomain); } } } /* $SendPMtoID=$_SESSION['UserID']; $YourPMID = 1; diff --git a/inc/misc/functions.php b/inc/misc/functions.php index e6919f8..e78b82b 100644 --- a/inc/misc/functions.php +++ b/inc/misc/functions.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: functions.php - Last Update: 09/20/2007 SVN 106 - Author: cooldude2k $ + $FileInfo: functions.php - Last Update: 10/05/2007 SVN 115 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="functions.php"||$File3Name=="/functions.php") { @@ -30,10 +30,10 @@ if ($File3Name==$FileName||$File3Name=="/".$FileName) { return true; } } CheckFile("functions.php"); require($SettDir['misc']."compression.php"); +/* if ($_GET['act']=="DeleteSession") { @session_destroy(); } if ($_GET['act']=="ResetSession") { @session_unset(); } if ($_GET['act']=="NewSessionID") { @session_regenerate_id(); } -/* if ($_GET['act']=="PHPInfo") { @phpinfo(); exit(); } if ($_GET['act']=="phpinfo") { @phpinfo(); exit(); } if ($_GET['act']=="PHPCredits") { @phpcredits(); exit(); } @@ -209,8 +209,8 @@ function getnextid($tablepre,$table) { $getnextid = mysql_fetch_assoc($getnextidr); return $getnextid['Auto_increment']; @mysql_free_result($getnextidr); } - $Names['RSA'] = "Rachel Sabonis"; -define("_rachel_", $Names['RSA']); + $Names['K'] = "Katarzyna"; +define("_katarzyna_", $Names['K']); // Change Time Stamp to a readable time function GMTimeChange($format,$timestamp,$offset,$minoffset=null,$dst=null) { $TCHour = date("H",$timestamp); diff --git a/inc/prelogin.php b/inc/prelogin.php index e860f8d..2984a7c 100644 --- a/inc/prelogin.php +++ b/inc/prelogin.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: prelogin.php - Last Update: 09/21/2007 SVN 108 - Author: cooldude2k $ + $FileInfo: prelogin.php - Last Update: 10/05/2007 SVN 115 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="prelogin.php"||$File3Name=="/prelogin.php") { @@ -48,35 +48,35 @@ $_SESSION['UserGroup']=$YourGroupAM; $_SESSION['UserDST']=$YourDSTAM; $_SESSION['UserPass']=$YourPassAM; if($cookieDomain==null) { -@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $basedir); -@setcookie("UserID", $YourIDAM, time() + (7 * 86400), $basedir); -@setcookie("SessPass", $YourPassAM, time() + (7 * 86400), $basedir); } +@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir); +@setcookie("UserID", $YourIDAM, time() + (7 * 86400), $cbasedir); +@setcookie("SessPass", $YourPassAM, time() + (7 * 86400), $cbasedir); } if($cookieDomain!=null) { if($cookieSecure==true) { -@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $basedir, $cookieDomain, 1); -@setcookie("UserID", $YourIDAM, time() + (7 * 86400), $basedir, $cookieDomain, 1); -@setcookie("SessPass", $YourPassAM, time() + (7 * 86400), $basedir, $cookieDomain, 1); } +@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir, $cookieDomain, 1); +@setcookie("UserID", $YourIDAM, time() + (7 * 86400), $cbasedir, $cookieDomain, 1); +@setcookie("SessPass", $YourPassAM, time() + (7 * 86400), $cbasedir, $cookieDomain, 1); } if($cookieSecure==false) { -@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $basedir, $cookieDomain); -@setcookie("UserID", $YourIDAM, time() + (7 * 86400), $basedir, $cookieDomain); -@setcookie("SessPass", $YourPassAM, time() + (7 * 86400), $basedir, $cookieDomain); } } +@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir, $cookieDomain); +@setcookie("UserID", $YourIDAM, time() + (7 * 86400), $cbasedir, $cookieDomain); +@setcookie("SessPass", $YourPassAM, time() + (7 * 86400), $cbasedir, $cookieDomain); } } } } if($numlog2<=0||$numlog2>1||$BanError=="yes") { @session_unset(); if($cookieDomain==null) { -@setcookie("MemberName", null, GMTimeStamp() - 3600, $basedir); -@setcookie("UserID", null, GMTimeStamp() - 3600, $basedir); -@setcookie("SessPass", null, GMTimeStamp() - 3600, $basedir); -@setcookie(session_name(), "", GMTimeStamp() - 3600, $basedir); } +@setcookie("MemberName", null, GMTimeStamp() - 3600, $cbasedir); +@setcookie("UserID", null, GMTimeStamp() - 3600, $cbasedir); +@setcookie("SessPass", null, GMTimeStamp() - 3600, $cbasedir); +@setcookie(session_name(), "", GMTimeStamp() - 3600, $cbasedir); } if($cookieDomain!=null) { if($cookieSecure==true) { -@setcookie("MemberName", null, GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); -@setcookie("UserID", null, GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); -@setcookie("SessPass", null, GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); -@setcookie(session_name(), "", GMTimeStamp() - 3600, $basedir, $cookieDomain, 1); } +@setcookie("MemberName", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); +@setcookie("UserID", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); +@setcookie("SessPass", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); +@setcookie(session_name(), "", GMTimeStamp() - 3600, $cbasedir, $cookieDomain, 1); } if($cookieSecure==false) { -@setcookie("MemberName", null, GMTimeStamp() - 3600, $basedir, $cookieDomain); -@setcookie("UserID", null, GMTimeStamp() - 3600, $basedir, $cookieDomain); -@setcookie("SessPass", null, GMTimeStamp() - 3600, $basedir, $cookieDomain); -@setcookie(session_name(), "", GMTimeStamp() - 3600, $basedir, $cookieDomain); } } +@setcookie("MemberName", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain); +@setcookie("UserID", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain); +@setcookie("SessPass", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain); +@setcookie(session_name(), "", GMTimeStamp() - 3600, $cbasedir, $cookieDomain); } } unset($_COOKIE[session_name()]); $_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)); @mysql_free_result($resultlog2); @mysql_free_result($gresult); diff --git a/inc/profilemain.php b/inc/profilemain.php index 742e0d2..e971bf1 100644 --- a/inc/profilemain.php +++ b/inc/profilemain.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: profilemain.php - Last Update: 09/16/2007 SVN 104 - Author: cooldude2k $ + $FileInfo: profilemain.php - Last Update: 10/05/2007 SVN 115 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="profilemain.php"||$File3Name=="/profilemain.php") { @@ -618,12 +618,12 @@ if($YourPassword!=$OldPassword) { $Error="Yes"; ?> $NewIP=$_SERVER['REMOTE_ADDR']; if ($Error!="Yes") { $_SESSION['UserPass']=$NewPassword; if($cookieDomain==null) { - @setcookie("SessPass", $NewPassword, time() + (7 * 86400), $basedir); } + @setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir); } if($cookieDomain!=null) { if($cookieSecure==true) { - @setcookie("SessPass", $NewPassword, time() + (7 * 86400), $basedir, $cookieDomain, 1); } + @setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir, $cookieDomain, 1); } if($cookieSecure==false) { - @setcookie("SessPass", $NewPassword, time() + (7 * 86400), $basedir, $cookieDomain); } } + @setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir, $cookieDomain); } } $_POST['Email'] = @remove_spaces($_POST['Email']); $querynewuserinfo = query("UPDATE `".$Settings['sqltable']."members` SET `Password`='%s',`HashType`='iDBH',`Email`='%s',`LastActive`=%i,`IP`='%s',`Salt`='%s' WHERE `id`=%i", array($NewPassword,$_POST['Email'],$NewDay,$NewIP,$NewSalt,$_SESSION['UserID'])); mysql_query($querynewuserinfo); } } } } diff --git a/inc/versioninfo.php b/inc/versioninfo.php index 429d793..1772b7f 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/03/2007 SVN 114 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 10/05/2007 SVN 115 - 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 = 114; $RName = "iDB"; $SFName = "IntDB"; -$SVNDay[0] = 10; $SVNDay[1] = 03; $SVNDay[2] = 2007; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; +$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 115; $RName = "iDB"; $SFName = "IntDB"; +$SVNDay[0] = 10; $SVNDay[1] = 05; $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); diff --git a/mysql.php b/mysql.php index 3ff50b6..7b5c1ed 100644 --- a/mysql.php +++ b/mysql.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: mysql.php - Last Update: 09/16/2007 SVN 104 - Author: cooldude2k $ + $FileInfo: mysql.php - Last Update: 10/05/2007 SVN 115 - Author: cooldude2k $ */ //@ini_set("display_errors", true); //@ini_set("display_startup_errors", true); @@ -31,6 +31,11 @@ if($Settings['idburl']!=null&&$Settings['idburl']!="localhost") { $PathsTest = parse_url($Settings['idburl']); $Settings['fixbasedir'] = $PathsTest['path']."/"; $Settings['fixbasedir'] = str_replace("//", "/", $Settings['fixbasedir']); } } +if($Settings['fixcookiedir']==true) { +if($Settings['idburl']!=null&&$Settings['idburl']!="localhost") { +$PathsTest = parse_url($Settings['idburl']); +$Settings['fixcookiedir'] = $PathsTest['path']."/"; +$Settings['fixcookiedir'] = str_replace("//", "/", $Settings['fixcookiedir']); } } //@session_save_path($SettDir['inc']."temp/"); if(!isset($Settings['sqldb'])) { if(file_exists("install.php")) { @header('Location: install.php'); die(); } @@ -118,12 +123,12 @@ if($GZipEncode['Type']!="gzip") { if($GZipEncode['Type']!="deflate") { $GZipEnco @header('P3P: CP="NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM"'); } */ // Some http stuff if($cookieDomain==null) { -@session_set_cookie_params(0, $basedir); } +@session_set_cookie_params(0, $cbasedir); } if($cookieDomain!=null) { if($cookieSecure==true) { -@session_set_cookie_params(0, $basedir, $cookieDomain, 1); } +@session_set_cookie_params(0, $cbasedir, $cookieDomain, 1); } if($cookieSecure==false) { -@session_set_cookie_params(0, $basedir, $cookieDomain); } } +@session_set_cookie_params(0, $cbasedir, $cookieDomain); } } @session_cache_limiter("private, must-revalidate"); @header("Cache-Control: private, must-revalidate"); // IE 6 Fix @header("Pragma: private, must-revalidate"); @@ -132,7 +137,7 @@ if($cookieSecure==false) { @header("Expires: ".gmdate("D, d M Y H:i:s")." GMT"); @session_name($Settings['sqltable']."sess"); @session_start(); -//@header("Set-Cookie: PHPSESSID=" . session_id() . "; path=".$basedir); +//@header("Set-Cookie: PHPSESSID=" . session_id() . "; path=".$cbasedir); @output_reset_rewrite_vars(); if($_GET['act']=="bsdl"||$_GET['act']=="BSDL") { $_GET['act']="bsd"; } if($_GET['act']=="bsd"||$_GET['act']=="bsd") { diff --git a/setup/mkconfig.php b/setup/mkconfig.php index 115c0fd..9e74a57 100644 --- a/setup/mkconfig.php +++ b/setup/mkconfig.php @@ -12,7 +12,7 @@ Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/ iDB Installer made by Game Maker 2k - http://idb.berlios.net/ - $FileInfo: mkconfig.php - Last Update: 09/19/2007 SVN 105 - Author: cooldude2k $ + $FileInfo: mkconfig.php - Last Update: 10/05/2007 SVN 115 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") { @@ -149,7 +149,7 @@ $CHMOD = $_SERVER['PHP_SELF']; $pretext = ""; +$BoardSettings=$pretext2[0]."\n\$Settings['sqlhost'] = '".$_POST['DatabaseHost']."';\n\$Settings['sqldb'] = '".$_POST['DatabaseName']."';\n\$Settings['sqltable'] = '".$_POST['tableprefix']."';\n\$Settings['sqluser'] = '".$_POST['DatabaseUserName']."';\n\$Settings['sqlpass'] = '".$_POST['DatabasePassword']."';\n\$Settings['board_name'] = '".$_POST['NewBoardName']."';\n\$Settings['idbdir'] = '".$idbdir."';\n\$Settings['idburl'] = '".$_POST['BoardURL']."';\n\$Settings['enable_https'] = 'false';\n\$Settings['weburl'] = '".$_POST['WebURL']."';\n\$Settings['use_gzip'] = '".$_POST['GZip']."';\n\$Settings['html_type'] = '".$_POST['HTMLType']."';\n\$Settings['html_level'] = '".$_POST['HTMLLevel']."';\n\$Settings['output_type'] = '".$_POST['OutPutType']."';\n\$Settings['GuestGroup'] = 'Guest';\n\$Settings['MemberGroup'] = 'Member';\n\$Settings['ValidateGroup'] = 'Validate';\n\$Settings['AdminValidate'] = false;\n\$Settings['TestReferer'] = ".$_POST['TestReferer'].";\n\$Settings['DefaultTheme'] = 'iDB';\n\$Settings['DefaultTimeZone'] = '".$AdminTime."';\n\$Settings['DefaultDST'] = '".$AdminDST."';\n\$Settings['charset'] = 'iso-8859-15';\n\$Settings['add_power_by'] = false;\n\$Settings['send_pagesize'] = false;\n\$Settings['max_posts'] = '10';\n\$Settings['max_topics'] = '10';\n\$Settings['max_memlist'] = '10';\n\$Settings['max_pmlist'] = '10';\n\$Settings['hot_topic_num'] = '15';\n\$Settings['qstr'] = '&';\n\$Settings['qsep'] = '=';\n\$Settings['file_ext'] = '.php';\n\$Settings['rss_ext'] = '.php';\n\$Settings['js_ext'] = '.js';\n\$Settings['showverinfo'] = true;\n\$Settings['enable_rss'] = true;\n\$Settings['enable_search'] = true;\n\$Settings['sessionid_in_urls'] = false;\n\$Settings['fixpathinfo'] = false;\n\$Settings['fixbasedir'] = false;\n\$Settings['fixcookiedir'] = false;\n\$Settings['enable_pathinfo'] = false;\n\$Settings['rssurl'] = false;\n\$Settings['board_offline'] = false;\n".$pretext2[1]."\n\$SettInfo['board_name'] = '".$_POST['NewBoardName']."';\n\$SettInfo['Author'] = '".$_POST['AdminUser']."';\n\$SettInfo['Keywords'] = '".$_POST['NewBoardName'].",".$_POST['AdminUser']."';\n\$SettInfo['Description'] = '".$_POST['NewBoardName'].",".$_POST['AdminUser']."';\n".$pretext2[2]."\n\$SettDir['maindir'] = '".$idbdir."';\n\$SettDir['inc'] = 'inc/';\n\$SettDir['misc'] = 'inc/misc/';\n\$SettDir['admin'] = 'inc/admin/';\n\$SettDir['mod'] = 'inc/mod/';\n\$SettDir['themes'] = 'themes/';\n".$pretext2[3]."\n?>"; $BoardSettingsBak = $pretext.$settcheck.$BoardSettings; $BoardSettings = $pretext.$settcheck.$BoardSettings; $fp = fopen("settings.php","w+"); -- 2.11.0