Bug fixes #1

pikami · Jun 20, 2016 · cbb9b99 · cbb9b99
1 parent 045af4a
commit cbb9b99
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/index.php b/index.php
@@ -1,3 +1,9 @@
+<?php
+if(isset($_GET["page"]) && $_GET["page"] == "login" && isset($_POST["type"]) && $_POST["type"]=="login"){
+	include_once "login.php";
+	die();
+}
+?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -118,13 +124,14 @@
   } else if($_GET["page"] == "login"){
     include_once "login.php";
   } else if($_GET["page"] == "logout"){
-	  header("Location: login.php?logout=1");
-	  die();
+	echo '<center><h4>Please wait...</h4></center>';
+	echo '<meta http-equiv="refresh" content="2;url=login.php?logout=1">';
+	die();
   } else if($_GET["page"] == "signup"){
-	  include_once "signup.php";
+	include_once "signup.php";
   } else {
-	  $uid = $_GET["page"];
-	  include_once "ViewPaste.php";
+	$uid = $_GET["page"];
+	include_once "ViewPaste.php";
   }
 } else if (isset($_GET["user"])){
 	include_once "UserPage.php";

diff --git a/login.php b/login.php
@@ -13,7 +13,8 @@ function generate_skey(){
 		LogOutUserBySession($_COOKIE["pp_sid"],$_COOKIE["pp_skey"]);
 		UnsetBrowserCookies();
 	}
-	header("Location: index.php");
+	echo '<center><h4>Please wait...</h4></center>';
+	echo '<meta http-equiv="refresh" content="2;url=index.php">';
 } else if(isset($_POST["type"])) {
 	if($_POST["type"]=="login" && isset($_POST["user"]) && isset($_POST["pwd"])){
 		//Get options
@@ -44,7 +45,8 @@ function generate_skey(){
 					setcookie("pp_sid", $sid); //Dies when browser closes
 					setcookie("pp_skey", $skey); //Dies when browser closes
 				}
-				header("Location: index.php");
+				echo '<center><h4>Please wait...</h4></center>';
+				echo '<meta http-equiv="refresh" content="2;url=index.php">';
 				die();
 			}
 			else echo "No!";		//TODO: Wrong password
@@ -78,7 +80,8 @@ function generate_skey(){
 		$stmt->bindParam(':user', $user);
 		$stmt->bindParam(':pwd', $hash);
 		if($stmt->execute()){
-			header("Location: login");
+			echo '<center><h4>Please wait...</h4></center>';
+			echo '<meta http-equiv="refresh" content="2;url=login">';
 		} else {
 			echo "Fail!";
 		}