diff --git a/etc/nginx/conf.d/cs4430.conf b/etc/nginx/conf.d/cs4430.conf index 4ea0071..ce02685 100644 --- a/etc/nginx/conf.d/cs4430.conf +++ b/etc/nginx/conf.d/cs4430.conf @@ -3,14 +3,14 @@ server { listen [::]:80; root /var/www/; - index landingPage.html + index index.html server_name _; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; location / { - try_files $uri $uri/ /landingPage.html =404; + try_files $uri $uri/ /index.html =404; } location ~ \.php$ { diff --git a/var/www/landingPage.html b/var/www/landingPage.html deleted file mode 100644 index fdf8fba..0000000 --- a/var/www/landingPage.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - -

Friendbook

- - - - - - - - - - - - diff --git a/var/www/loginCheck.php b/var/www/loginCheck.php index 1d98a38..88f6624 100644 --- a/var/www/loginCheck.php +++ b/var/www/loginCheck.php @@ -18,19 +18,16 @@ $_SESSION["loginError"] = ""; // Move onto landing page header("Location: /landingPage.html"); - die(); }else{ // No matching users found, send user error $_SESSION["loginError"] = "Invalid Username or Password"; // Return to login page header("Location: /login.php"); - die(); } }else{ // Return to login page, as credentials were not captured $_SESSION["loginError"] = "Login credentials not found, please try again"; header("Location: /login.php"); - die(); } } catch(PDOException $e){