Fixed bug in iDB cookie system.

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@220 2b68903e-0b30-0410-9a39-a2e4f3c5be39

diff --git a/inc/prelogin.php b/inc/prelogin.php
index c5ae290..81b2edd 100644 (file)
--- a/inc/prelogin.php
+++ b/inc/prelogin.php
@@ -11,7 +11,7 @@
     Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/
     Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/
 
-    $FileInfo: prelogin.php - Last Update: 05/31/2008 SVN 164 - Author: cooldude2k $
+    $FileInfo: prelogin.php - Last Update: 12/19/2008 SVN 220 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="prelogin.php"||$File3Name=="/prelogin.php") {
@@ -23,6 +23,7 @@ $resultlog2=mysql_query($querylog2);
 $numlog2=mysql_num_rows($resultlog2);
 if($numlog2==1) {
 $YourIDAM=mysql_result($resultlog2,0,"id");
+$YourNameAM=mysql_result($resultlog2,0,"Name");
 $YourGroupAM=mysql_result($resultlog2,0,"GroupID");
 $YourPassAM=mysql_result($resultlog2,0,"Password");
 $gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($YourGroupAM));
@@ -48,16 +49,16 @@ $_SESSION['UserGroup']=$YourGroupAM;
 $_SESSION['UserDST']=$YourDSTAM;
 $_SESSION['UserPass']=$YourPassAM;
 if($cookieDomain==null) {
-@setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir);
+@setcookie("MemberName", $YourNameAM, 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), $cbasedir, $cookieDomain, 1);
+@setcookie("MemberName", $YourNameAM, 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), $cbasedir, $cookieDomain);
+@setcookie("MemberName", $YourNameAM, 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();

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 1faba8a..218c87d 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/
     Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/
 
-    $FileInfo: versioninfo.php - Last Update: 12/19/2008 SVN 219 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 12/19/2008 SVN 220 - 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] = 5; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 219; $RName = "iDB"; $SFName = "IntDB";
+$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 220; $RName = "iDB"; $SFName = "IntDB";
 $SVNDay[0] = 12; $SVNDay[1] = 19; $SVNDay[2] = 2008; $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/mysql.php b/mysql.php
index ceb2dfc..ef1152b 100644 (file)
--- a/mysql.php
+++ b/mysql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/
     Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/
 
-    $FileInfo: mysql.php - Last Update: 12/11/2008 SVN 210 - Author: cooldude2k $
+    $FileInfo: mysql.php -Last Update: 12/19/2008 SVN 220 - Author: cooldude2k $
 */
 //@ini_set("display_errors", true); 
 //@ini_set("display_startup_errors", true);
@@ -206,11 +206,9 @@ if($_GET['act']=="MkCaptcha"||$_GET['act']=="Captcha") {
        $oPhpCaptcha->SetOwnerText("Fake Code: ".$RandNum);
        $oPhpCaptcha->UseColour(true);
        $oPhpCaptcha->Create(); @mysql_close(); die(); } }
-if(isset($_SESSION['CheckCookie'])) {
-if($_SESSION['CheckCookie']!="done") {
-if($_COOKIE['SessPass']!=null&&
-$_COOKIE['MemberName']!=null) {
-require($SettDir['inc'].'prelogin.php'); } } }
+if(!isset($_SESSION['CheckCookie'])) {
+if(isset($_COOKIE['SessPass'])&&isset($_COOKIE['MemberName'])) {
+require($SettDir['inc'].'prelogin.php'); } }
 require($SettDir['inc'].'groupsetup.php');
 if($Settings['board_offline']=="on"&&$GroupInfo['HasAdminCP']!="yes") {
 @header("Content-Type: text/plain; charset=".$Settings['charset']); @mysql_free_result($peresult);