BUGFIX: Cookie dologin issue.

2 files changed, 11 insertions, 6 deletions

diff --git a/globe.php b/globe.php
index 7a3d472..760f20d 100644
--- a/globe.php
+++ b/globe.php
@@ -111,11 +111,14 @@ function CookieLogin() {
 		$_SESSION['email'] = $email;

 		$_SESSION['displayName'] = $display;

 		$_SESSION['dateJoined'] = $dateJoined;

-		if ($isAdmin == 1)

-			$_SESSION['isAdmin'] = true;

-

+		if ($isAdmin == 1) $_SESSION['isAdmin'] = true;

+		header("Location: $mydomain");

+	} else {

+		setcookie("doLogin", "");

+      setcookie("userID", "");

+      setcookie("auth", "");

+		return false;

 	}

-	header("Location: $mydomain");

 }

 

 Function DoLogin($Username, $Password, $RememberMe = False, $EN = False) {

diff --git a/index.php b/index.php
index 43a26d6..63b23cf 100644
--- a/index.php
+++ b/index.php
@@ -18,9 +18,11 @@ include_once("./includes/header.php");
 $accepted = isset($_SESSION['accepted']) && $_SESSION['accepted'] == 1;

 

 //Not logged in?

-if (!$accepted)

-	if (isset($_COOKIE['doLogin']) && $_COOKIE['doLogin'] == 'yes')

+if (!$accepted) {

+	if (isset($_COOKIE['doLogin']) && $_COOKIE['doLogin'] == 'yes') {

 		CookieLogin();

+	}

+}

 if (isset($_SESSION['accepted']) AND $_SESSION['accepted'] == 1)

 	$accepted = true;