From 6868aa5d2bf8ff33ddf681eb4a70dc7567b611de Mon Sep 17 00:00:00 2001
From: Robbie Antenesse <gamedev@alamantus.com>
Date: Tue, 8 Dec 2015 22:38:53 -0800
Subject: [PATCH] Started on forgot password stuff. fixed a funciton file
 connection.

---
 FORGOT.form       | 10 ++++++++++
 LOGIN.form        |  1 +
 php/config.php    | 28 ----------------------------
 php/functions.php |  2 +-
 4 files changed, 12 insertions(+), 29 deletions(-)
 create mode 100644 FORGOT.form

diff --git a/FORGOT.form b/FORGOT.form
new file mode 100644
index 0000000..4b57fc6
--- /dev/null
+++ b/FORGOT.form
@@ -0,0 +1,10 @@
+<div class="settingsCol"><form id="forgotForm" method="post" action="?forgot">
+    <h2>Forgot Password</h2>
+    <label><span>Email</span>
+        <input type="email" id="forgotEmailField" name="email" />
+    </label>
+    <div id="forgotError" style="font-weight:bold;color:red;"></div>
+    <button type="submit" id="forgotSubmitButton" onclick="ValidateLogin(); return false;">Email Password Reset Key</button>
+    <div id="dictionaryWarn"></div>
+    <span id="forgotPassword" onclick="ShowInfo('login')">Log In/Create Account</span>
+</form></div>
\ No newline at end of file
diff --git a/LOGIN.form b/LOGIN.form
index 144fdbb..7f27e62 100644
--- a/LOGIN.form
+++ b/LOGIN.form
@@ -9,6 +9,7 @@
     <div id="loginError" style="font-weight:bold;color:red;"></div>
     <button type="submit" id="loginSubmitButton" onclick="ValidateLogin(); return false;">Log In</button>
     <div id="dictionaryWarn"></div>
+    <span id="forgotPassword" onclick="ShowInfo('forgot')">Forgot Password?</span>
 </form></div>
 <div class="settingsCol"><form id="createAccountForm" method="post" action="?createaccount">
     <h2>Create a New Account</h2>
diff --git a/php/config.php b/php/config.php
index 2b79bd8..e3bf456 100644
--- a/php/config.php
+++ b/php/config.php
@@ -10,32 +10,4 @@ define("DATABASE_USERNAME", "username");
 define("DATABASE_PASSWORD", "password");
 define("DATABASE_NAME", "databasename");
 
-$dbconnection = new PDO('mysql:host=' . DATABASE_SERVERNAME . ';dbname=' . DATABASE_NAME . ';charset=utf8', DATABASE_USERNAME, DATABASE_PASSWORD);
-$dbconnection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-$dbconnection->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
-$dbconnection->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
-
-define("DATABASE_CONNECTION", $dbconnection);
-
-/*function connection() {
-    // Fill this with relevant data.
-    $servername = "host";
-    $username = "username";
-    $password = "password";
-    $dbname = "database_name";
-
-    $conn = new PDO('mysql:host=' . DATABASE_SERVERNAME . ';dbname=' . DATABASE_NAME . ';charset=utf8', DATABASE_USERNAME, DATABASE_PASSWORD);
-    $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-    $conn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
-    $conn->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
-
-    // Create connection
-    // $conn = mysqli_connect($servername, $username, $password, $dbname);
-    // Check connection
-    // if (!$conn) {
-    //     die("Connection failed: " . mysqli_connect_error());
-    // }
-    
-    return $conn;
-}*/
 ?>
\ No newline at end of file
diff --git a/php/functions.php b/php/functions.php
index f15e1a4..897ac2c 100644
--- a/php/functions.php
+++ b/php/functions.php
@@ -4,6 +4,6 @@
 require_once(SITE_LOCATION . '/php/helpers.php');
 require_once(SITE_LOCATION . '/php/plugins/easycrypt.php');
 require_once(SITE_LOCATION . '/php/validation.php');
-require_once(SITE_LOCATION . '/php/password_reset_validation.php');
+require_once(SITE_LOCATION . '/php/ajax_passwordresetvalidation.php');
 
 ?>
\ No newline at end of file