From 207323067f2032fbd7f3b19adf1cd10f23c63a24 Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Fri, 1 Jan 2010 23:22:22 +0000 Subject: [PATCH] Small bug fix to localhost setcookie. Fixed login after install. Happy New Year Everybody. :P git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@438 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- inc/events.php | 14 ++++++++++---- inc/pm.php | 14 ++++++++++---- inc/replies.php | 14 ++++++++++---- inc/topics.php | 14 ++++++++++---- inc/versioninfo.php | 10 +++++----- setup/mkconfig.php | 23 +++++++++++++++-------- sql.php | 7 ++++--- 7 files changed, 64 insertions(+), 32 deletions(-) diff --git a/inc/events.php b/inc/events.php index e209ff1..9b2cc83 100644 --- a/inc/events.php +++ b/inc/events.php @@ -8,10 +8,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Revised BSD License for more details. - Copyright 2004-2009 iDB Support - http://idb.berlios.de/ - Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ + Copyright 2004-2010 iDB Support - http://idb.berlios.de/ + Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: events.php - Last Update: 12/18/2009 SVN 421 - Author: cooldude2k $ + $FileInfo: events.php - Last Update: 01/01/2010 SVN 438 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="events.php"||$File3Name=="/events.php") { @@ -453,7 +453,13 @@ $_POST['EventText'] = remove_bad_entities($_POST['EventText']); //$_POST['EventText'] = remove_spaces($_POST['EventText']); if($_SESSION['UserGroup']==$Settings['GuestGroup']) { if(isset($_POST['GuestName'])&&$_POST['GuestName']!=null) { -setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir); +if($cookieDomain==null) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir); } +if($cookieDomain!=null) { +if($cookieSecure===true) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $cookieDomain, 1); } +if($cookieSecure===false) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $cookieDomain); } } $_SESSION['GuestName']=$_POST['GuestName']; } } /* <_< iWordFilter >_> by Kazuki Przyborowski - Cool Dude 2k */ diff --git a/inc/pm.php b/inc/pm.php index 5be30a9..79530ca 100644 --- a/inc/pm.php +++ b/inc/pm.php @@ -8,10 +8,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Revised BSD License for more details. - Copyright 2004-2009 iDB Support - http://idb.berlios.de/ - Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ + Copyright 2004-2010 iDB Support - http://idb.berlios.de/ + Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: pm.php - Last Update: 12/18/2009 SVN 421 - Author: cooldude2k $ + $FileInfo: pm.php - Last Update: 01/01/2010 SVN 438 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="pm.php"||$File3Name=="/pm.php") { @@ -810,7 +810,13 @@ $_POST['Message'] = stripcslashes(htmlspecialchars($_POST['Message'], ENT_QUOTES $_POST['Message'] = remove_bad_entities($_POST['Message']); if($_SESSION['UserGroup']==$Settings['GuestGroup']) { if(isset($_POST['GuestName'])&&$_POST['GuestName']!=null) { -setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir); +if($cookieDomain==null) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir); } +if($cookieDomain!=null) { +if($cookieSecure===true) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $cookieDomain, 1); } +if($cookieSecure===false) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $cookieDomain); } } $_SESSION['GuestName']=$_POST['GuestName']; } } /* <_< iWordFilter >_> by Kazuki Przyborowski - Cool Dude 2k */ diff --git a/inc/replies.php b/inc/replies.php index 1497c33..d7b256d 100644 --- a/inc/replies.php +++ b/inc/replies.php @@ -8,10 +8,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Revised BSD License for more details. - Copyright 2004-2009 iDB Support - http://idb.berlios.de/ - Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ + Copyright 2004-2010 iDB Support - http://idb.berlios.de/ + Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: replies.php - Last Update: 12/18/2009 SVN 421 - Author: cooldude2k $ + $FileInfo: replies.php - Last Update: 01/01/2010 SVN 438 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="replies.php"||$File3Name=="/replies.php") { @@ -767,7 +767,13 @@ $_POST['ReplyPost'] = stripcslashes(htmlspecialchars($_POST['ReplyPost'], ENT_QU $_POST['ReplyPost'] = remove_bad_entities($_POST['ReplyPost']); if($_SESSION['UserGroup']==$Settings['GuestGroup']) { if(isset($_POST['GuestName'])&&$_POST['GuestName']!=null) { -setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir); +if($cookieDomain==null) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir); } +if($cookieDomain!=null) { +if($cookieSecure===true) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $cookieDomain, 1); } +if($cookieSecure===false) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $cookieDomain); } } $_SESSION['GuestName']=$_POST['GuestName']; } } /* <_< iWordFilter >_> by Kazuki Przyborowski - Cool Dude 2k */ diff --git a/inc/topics.php b/inc/topics.php index 40c7142..ce9199b 100644 --- a/inc/topics.php +++ b/inc/topics.php @@ -8,10 +8,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Revised BSD License for more details. - Copyright 2004-2009 iDB Support - http://idb.berlios.de/ - Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ + Copyright 2004-2010 iDB Support - http://idb.berlios.de/ + Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: topics.php - Last Update: 12/17/2009 SVN 418 - Author: cooldude2k $ + $FileInfo: topics.php - Last Update: 01/01/2010 SVN 438 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="topics.php"||$File3Name=="/topics.php") { @@ -698,7 +698,13 @@ $_POST['TopicPost'] = remove_bad_entities($_POST['TopicPost']); //$_POST['TopicPost'] = remove_spaces($_POST['TopicPost']); if($_SESSION['UserGroup']==$Settings['GuestGroup']) { if(isset($_POST['GuestName'])&&$_POST['GuestName']!=null) { -setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir); +if($cookieDomain==null) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir); } +if($cookieDomain!=null) { +if($cookieSecure===true) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $cookieDomain, 1); } +if($cookieSecure===false) { +setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $cookieDomain); } } $_SESSION['GuestName']=$_POST['GuestName']; } } /* <_< iWordFilter >_> by Kazuki Przyborowski - Cool Dude 2k */ diff --git a/inc/versioninfo.php b/inc/versioninfo.php index 3fb2ed7..a87529e 100644 --- a/inc/versioninfo.php +++ b/inc/versioninfo.php @@ -8,10 +8,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Revised BSD License for more details. - Copyright 2004-2009 iDB Support - http://idb.berlios.de/ - Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ + Copyright 2004-2010 iDB Support - http://idb.berlios.de/ + Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: versioninfo.php - Last Update: 12/31/2009 SVN 437 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 01/01/2010 SVN 438 - 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] = 3; $VER1[2] = 6; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 437; $RName = "iDB"; $SFName = "IntDB"; -$SVNDay[0] = 12; $SVNDay[1] = 31; $SVNDay[2] = 2009; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2]; +$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 438; $RName = "iDB"; $SFName = "IntDB"; +$SVNDay[0] = 01; $SVNDay[1] = 01; $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/setup/mkconfig.php b/setup/mkconfig.php index fb284cd..b789b08 100644 --- a/setup/mkconfig.php +++ b/setup/mkconfig.php @@ -8,11 +8,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Revised BSD License for more details. - Copyright 2004-2009 iDB Support - http://idb.berlios.de/ - Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ + Copyright 2004-2010 iDB Support - http://idb.berlios.de/ + Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ iDB Installer made by Game Maker 2k - http://idb.berlios.net/ - $FileInfo: mkconfig.php - Last Update: 12/31/2009 SVN 437 - Author: cooldude2k $ + $FileInfo: mkconfig.php - Last Update: 01/01/2010 SVN 438 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") { @@ -49,7 +49,10 @@ if (!is_writable($checkfile)) { @chmod("settingsbak.php",0766); } else { /* settings.php is writable install iDB. ^_^ */ } session_name($_POST['tableprefix']."sess"); +if(preg_match("/\/$/", $_POST['BoardURL'])<1) { + $_POST['BoardURL'] = $_POST['BoardURL']."/"; } $URLsTest = parse_url($_POST['BoardURL']); +$this_dir = $URLsTest['path']; session_set_cookie_params(0, $this_dir, $URLsTest['host']); session_cache_limiter("private, must-revalidate"); header("Cache-Control: private, must-revalidate"); // IE 6 Fix @@ -194,11 +197,15 @@ $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']); -} -/*mysql_close();*/ $chdel = true; +if($URLsTest['host']!="localhost") { +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']); } +if($URLsTest['host']=="localhost") { +setcookie("MemberName", $_POST['AdminUser'], time() + (7 * 86400), $this_dir, false); +setcookie("UserID", 1, time() + (7 * 86400), $this_dir, false); +setcookie("SessPass", $NewPassword, time() + (7 * 86400), $this_dir, false); } } +$chdel = true; if($Error!="Yes") { if($_POST['unlink']=="true") { $chdel1 = @unlink($SetupDir['setup'].'presetup.php'); $chdel2 = @unlink($SetupDir['setup'].'setup.php'); diff --git a/sql.php b/sql.php index 3f11f4e..9a33df5 100644 --- a/sql.php +++ b/sql.php @@ -8,10 +8,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Revised BSD License for more details. - Copyright 2004-2009 iDB Support - http://idb.berlios.de/ - Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ + Copyright 2004-2010 iDB Support - http://idb.berlios.de/ + Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: sql.php - Last Update: 12/31/2009 SVN 437 - Author: cooldude2k $ + $FileInfo: sql.php - Last Update: 01/01/2010 SVN 438 - Author: cooldude2k $ */ /* Some ini setting changes uncomment if you need them. Display PHP Errors */ @@ -164,6 +164,7 @@ $cookieDomain = null; $cookieSecure = false; if($Settings['idburl']!=null&&$Settings['idburl']!="localhost") { $URLsTest = parse_url($Settings['idburl']); $cookieDomain = $URLsTest['host']; +if($cookieDomain=="localhost") { $cookieDomain = false; } if($Settings['enable_https']=="on") { if($URLsTest['scheme']=="https") { $cookieSecure = true; } if($URLsTest['scheme']!="https") { $cookieSecure = false; } } } -- 2.11.0