From b819e9f10f8fec2e85e634403570abbbc8a64c71 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Thu, 21 Nov 2019 18:25:56 -0500
Subject: [PATCH 01/70] Update Dockerfile

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index b5f5408..72ff19b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,9 @@ COPY /entrypoint.sh /
 # Copying in  web files
 COPY /var/www/ /var/www/
 
+# Setting up the database tables
+RUN mysql -u root friendbook < initialization.sql
+
 # Expose Insecure Web, MySQL Server
 EXPOSE 80 3306
 CMD ["/bin/sh", "/entrypoint.sh"]
\ No newline at end of file

From 69c610fe15eff7d25cef8fa77674aa8c7c2efced Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 18:33:32 -0500
Subject: [PATCH 02/70] Added Traefik labels just in case it's needed later;
 note about public hosting

---
 README.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0e3750a..71edf03 100644
--- a/README.md
+++ b/README.md
@@ -13,5 +13,23 @@
   - Will be using `mysql_secure_installation --use-default`, for now as I can't find what the defaults actually are.
   - [https://dev.mysql.com/doc/refman/5.7/en/mysql-secure-installation.html]
 - Use `nginx -s reload` to reload the web server's configurations
+- I (William) will host an instance at [friends.proxy0.williammiceli.io] that is publically accessible for testing. If anyone wants me to change the version/image used, just let me know.
 
-##hello
+#### Traefik Configuration Labels
+
+`
+traefik.enable: true
+traefik.http.routers.CS4430-Project-router-http.entrypoints: http
+traefik.http.routers.CS4430-Project-router-http.rule: Host(`friends.proxy0.williammiceli.io`)
+traefik.http.routers.CS4430-Project-router-http.middlewares: CS4430-Project-redirectHttp
+traefik.http.routers.CS4430-Project-router-http.service: CS4430-Project-service-http
+traefik.http.routers.CS4430-Project-router-https.entrypoints: https
+traefik.http.routers.CS4430-Project-router-https.rule: Host(`friends.proxy0.williammiceli.io`)
+traefik.http.routers.CS4430-Project-router-https.tls: true
+traefik.http.routers.CS4430-Project-router-https.tls.certresolver: letsencrypt
+traefik.http.routers.CS4430-Project-router-https.service: CS4430-Project-service-http
+traefik.http.middlewares.CS4430-Project-redirectHttp.redirectscheme.permanent: true
+traefik.http.middlewares.CS4430-Project-redirectHttp.redirectscheme.scheme: https
+traefik.http.services.CS4430-Project-service-http.loadbalancer.passhostheader: true
+traefik.http.services.CS4430-Project-service-http.loadbalancer.server.port: "80"
+`
\ No newline at end of file

From 41217d3746e2538ad2de1801b36cd46ec4d59408 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 18:39:11 -0500
Subject: [PATCH 03/70] index.php no longer used

---
 etc/nginx/conf.d/cs4430.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/nginx/conf.d/cs4430.conf b/etc/nginx/conf.d/cs4430.conf
index 8e93695..4c0311c 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 index.html index.php;
+    index index.html
     server_name _;
 
     access_log /var/log/nginx/access.log;
     error_log /var/log/nginx/error.log;
 
     location / {
-         try_files $uri $uri/ /index.php /index.html =404;
+         try_files $uri $uri/ /index.html =404;
     }
 
     location ~ \.php$ {

From 3a1c990308633c2d683e36e32380f881460f259b Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 18:39:37 -0500
Subject: [PATCH 04/70] Merged langingPage.html into index.html

---
 var/www/index.html       | 36 +++++++++++++++++++++++-------------
 var/www/landingPage.html | 21 ---------------------
 2 files changed, 23 insertions(+), 34 deletions(-)
 delete mode 100644 var/www/landingPage.html

diff --git a/var/www/index.html b/var/www/index.html
index 0946be0..aef7256 100644
--- a/var/www/index.html
+++ b/var/www/index.html
@@ -1,16 +1,26 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head> 
-    <title>Today&rsquo;s Date</title> 
+    <title>FriendBook</title> 
     <meta http-equiv="content-type" 
-        content="text/html; charset=utf-8"/> 
+      content="text/html; charset=utf-8"/> 
   </head> 
-  <body> 
-    <p>Today&rsquo;s date (according to this web server) is 
-      <?php 
-      echo date('l, F dS Y.'); 
-      ?> 
-    </p> 
-  </body> 
-</html>
\ No newline at end of file
+  <body>
+    <style>
+    body {
+      background-color: #3B5998;
+    }
+    </style>
+    <h2><font color="white">Friendbook</h2>
+
+    <button type="button" onclick="window.location.href = 'friends.html'">See Friends</button>
+    <button type="button" onclick="window.location.href = 'messages.html'">See Messages</button>
+    <button type="button" onclick="window.location.href = 'contacts.html'">See Contacts</button>
+    <button type="button" onclick="window.location.href = 'search.html'">Search</button>
+    <button type="button" onclick="window.location.href = 'sendMessage.html'">Message Someone</button>
+    <button type="button" onclick="window.location.href = 'findFriend.html'">Find a New Friend</button>
+    <button type="button" onclick="window.location.href = 'pendingFriend.html'">Check Pending Friends</button>
+
+
+  </body>
+</html> 
diff --git a/var/www/landingPage.html b/var/www/landingPage.html
deleted file mode 100644
index dcc5955..0000000
--- a/var/www/landingPage.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<style>
-body {
-  background-color: #3B5998;
-}
-</style>
-<h2><font color="white">Friendbook</h2>
-
-<button type="button" onclick="window.location.href = 'friends.html'">See Friends</button>
-<button type="button" onclick="window.location.href = 'messages.html'">See Messages</button>
-<button type="button" onclick="window.location.href = 'contacts.html'">See Contacts</button>
-<button type="button" onclick="window.location.href = 'search.html'">Search</button>
-<button type="button" onclick="window.location.href = 'sendMessage.html'">Message Someone</button>
-<button type="button" onclick="window.location.href = 'findFriend.html'">Find a New Friend</button>
-<button type="button" onclick="window.location.href = 'pendingFriend.html'">Check Pending Friends</button>
-
-
-</body>
-</html> 

From 91918c2f19e984d4a014f6029aafe27292f5e44b Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 18:40:02 -0500
Subject: [PATCH 05/70] Disabled SQL database initialization until it's ready

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 72ff19b..535e2df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ COPY /entrypoint.sh /
 COPY /var/www/ /var/www/
 
 # Setting up the database tables
-RUN mysql -u root friendbook < initialization.sql
+#RUN mysql -u root friendbook < initialization.sql
 
 # Expose Insecure Web, MySQL Server
 EXPOSE 80 3306

From 325e9a1ed225b6958d585b70f763d3f17d16b282 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 18:48:02 -0500
Subject: [PATCH 06/70] Updated with page responsibilities

---
 README.md | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 71edf03..41e59da 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,24 @@
 [https://www.sitepoint.com/mysql-3-getting-started-php/]
 [https://www.sitepoint.com/publishing-mysql-data-web/]
 
-#### Notes
+## Page Responsibilities
+
+### Bryan
+
+- "Search" `search.html`
+- "Message Someone" `sendMessage.html`
+
+### Logan
+
+- "Find a New Friend" `findFriend.html`
+- "Check Pending Friends" `pendingFriend.html`
+
+### William
+
+- "See Messages" `messages.html`
+- "See Friends" `friends.html`
+
+## Notes
 
 - Can use `ps waux | grep nginx` to check if the NGINX service is running
 - MySQL's documentation sucks.
@@ -15,7 +32,7 @@
 - Use `nginx -s reload` to reload the web server's configurations
 - I (William) will host an instance at [friends.proxy0.williammiceli.io] that is publically accessible for testing. If anyone wants me to change the version/image used, just let me know.
 
-#### Traefik Configuration Labels
+### Traefik Configuration Labels
 
 `
 traefik.enable: true

From 12a7b164539760a3151b1826a85749e508e3afca Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 18:49:17 -0500
Subject: [PATCH 07/70] Fixed code block

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 41e59da..e0f22f4 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@
 
 ### Traefik Configuration Labels
 
-`
+```
 traefik.enable: true
 traefik.http.routers.CS4430-Project-router-http.entrypoints: http
 traefik.http.routers.CS4430-Project-router-http.rule: Host(`friends.proxy0.williammiceli.io`)
@@ -49,4 +49,4 @@ traefik.http.middlewares.CS4430-Project-redirectHttp.redirectscheme.permanent: t
 traefik.http.middlewares.CS4430-Project-redirectHttp.redirectscheme.scheme: https
 traefik.http.services.CS4430-Project-service-http.loadbalancer.passhostheader: true
 traefik.http.services.CS4430-Project-service-http.loadbalancer.server.port: "80"
-`
\ No newline at end of file
+```
\ No newline at end of file

From fc37a58fb50d550764a731d7fce84f60a0a9658a Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 18:50:05 -0500
Subject: [PATCH 08/70] Fixed link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e0f22f4..313d880 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@
   - Will be using `mysql_secure_installation --use-default`, for now as I can't find what the defaults actually are.
   - [https://dev.mysql.com/doc/refman/5.7/en/mysql-secure-installation.html]
 - Use `nginx -s reload` to reload the web server's configurations
-- I (William) will host an instance at [friends.proxy0.williammiceli.io] that is publically accessible for testing. If anyone wants me to change the version/image used, just let me know.
+- I (William) will host an instance at [https://friends.proxy0.williammiceli.io/] that is publically accessible for testing. If anyone wants me to change the version/image used, just let me know.
 
 ### Traefik Configuration Labels
 

From 1e17adea0ecae2a5cd4d75bd1085f73c9463d735 Mon Sep 17 00:00:00 2001
From: Logan McInnis <logan.j.mcinnis@wmich.edu>
Date: Thu, 21 Nov 2019 18:51:00 -0500
Subject: [PATCH 09/70] Update search.html

---
 var/www/search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/var/www/search.html b/var/www/search.html
index cd8391e..6754a05 100644
--- a/var/www/search.html
+++ b/var/www/search.html
@@ -9,7 +9,7 @@ body {
 
 <h2><font color="white">Who Would you like to search for</h2>
 
-<input type="radio" name="type" value="number">Search By Number<br>
+<input type="radio" name="type" value="username">Search By Username<br>
 <input type="radio" name="type" value="name">Search By Name<br>
 
 <textarea autofocus rows="1" cols="50">

From 102b847e484ffe62567ca23c8853c756b169e63d Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 19:05:47 -0500
Subject: [PATCH 10/70] Test PHP page

---
 var/www/phptest.php | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 var/www/phptest.php

diff --git a/var/www/phptest.php b/var/www/phptest.php
new file mode 100644
index 0000000..7f7dc18
--- /dev/null
+++ b/var/www/phptest.php
@@ -0,0 +1,30 @@
+<?php
+//Step1
+ $db = mysqli_connect('localhost','root','','database_name')
+ or die('Error connecting to MySQL server.');
+?>
+
+<html>
+ <head>
+ </head>
+ <body>
+ <h1>PHP connect to MySQL</h1>
+
+<?php
+//Step2
+$query = "SELECT * FROM contacts";
+mysqli_query($db, $query) or die('Error querying database.');
+
+//Step3
+$result = mysqli_query($db, $query);
+$row = mysqli_fetch_array($result);
+
+while ($row = mysqli_fetch_array($result)) {
+ echo $row['first_name'] . ' ' . $row['last_name'] . ': ' . $row['email'] . ' ' . $row['city'] .'<br />';
+}
+//Step 4
+mysqli_close($db);
+?>
+
+</body>
+</html>
\ No newline at end of file

From f1d2f580b6ab95f4b5ad9a16f2e4be8c50be9ee5 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 19:20:36 -0500
Subject: [PATCH 11/70] Testing if any common modules are needed

---
 Dockerfile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 535e2df..a8ffd53 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,18 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     mysql-server \
     nginx \
     php-fpm \
+    php-mbstring \
+    php-xmlrpc \
+    php-soap \
+    php-gd \
+    php-xml \
+    php-intl \
+    php-mysql \
+    php-cli \
+    php-mcrypt \
+    php-ldap \
+    php-zip \
+    php-curl \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /var/www/html \
     && rm /etc/nginx/sites-enabled/default

From ab85158dbb271268f12b72fff7d8817d15fa5628 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 19:30:44 -0500
Subject: [PATCH 12/70] Added PHP info page for debug

---
 var/www/info.php | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 var/www/info.php

diff --git a/var/www/info.php b/var/www/info.php
new file mode 100644
index 0000000..968c8df
--- /dev/null
+++ b/var/www/info.php
@@ -0,0 +1,3 @@
+<?php
+phpinfo();
+?>
\ No newline at end of file

From 32f5e691af7017bf50c4bac56e3e898e12b38f25 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 19:30:59 -0500
Subject: [PATCH 13/70] Removed some moduels

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a8ffd53..6fbd94b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,8 +15,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     php-intl \
     php-mysql \
     php-cli \
-    php-mcrypt \
-    php-ldap \
     php-zip \
     php-curl \
     && rm -rf /var/lib/apt/lists/* \

From 0798433975a36af862fe89ba0446fd62a7b42db7 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 19:52:29 -0500
Subject: [PATCH 14/70] PHP was having issues because the service needed to be
 manually started at boot

---
 entrypoint.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/entrypoint.sh b/entrypoint.sh
index ae590e1..1653cc1 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -6,5 +6,8 @@ chown -R www-data:www-data /var/www
 echo "[ INFO ] Starting MySQL Server"
 service mysql start
 
+echo "[ INFO ] Starting PHP 7.2 Service"
+service php7.2-fpm start
+
 echo "[ INFO ] Starting nginx"
 nginx -g "daemon off;" # Foreground

From 8c8f697afb28d18ab3da5955bd0c2aba293e704b Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 19:52:49 -0500
Subject: [PATCH 15/70] Removed modules that we probably won't need

---
 Dockerfile | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6fbd94b..429d041 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,16 +7,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     mysql-server \
     nginx \
     php-fpm \
-    php-mbstring \
-    php-xmlrpc \
-    php-soap \
-    php-gd \
-    php-xml \
-    php-intl \
     php-mysql \
     php-cli \
-    php-zip \
-    php-curl \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /var/www/html \
     && rm /etc/nginx/sites-enabled/default

From 1433f31971738e4967ddb89493f3d052d081a039 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Thu, 21 Nov 2019 20:22:14 -0500
Subject: [PATCH 16/70] Object-oriented connection method; indentation

---
 var/www/phptest.php | 52 +++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/var/www/phptest.php b/var/www/phptest.php
index 7f7dc18..a1e86d1 100644
--- a/var/www/phptest.php
+++ b/var/www/phptest.php
@@ -1,30 +1,40 @@
 <?php
-//Step1
- $db = mysqli_connect('localhost','root','','database_name')
- or die('Error connecting to MySQL server.');
+$servername = "localhost";
+$username = "root";
+$password = "";
+
+// Create connection
+$conn = new mysqli($servername, $username, $password);
+
+// Check connection
+if ($conn->connect_error) {
+    die("Connection failed: " . $conn->connect_error);
+}
+echo "Connected successfully";
+
 ?>
 
 <html>
- <head>
- </head>
- <body>
- <h1>PHP connect to MySQL</h1>
+    <head>
+    </head>
+    <body>
+        <h1>PHP connect to MySQL</h1>
 
-<?php
-//Step2
-$query = "SELECT * FROM contacts";
-mysqli_query($db, $query) or die('Error querying database.');
+        <?php
+        //Step2
+        $query = "SELECT * FROM contacts";
+        mysqli_query($db, $query) or die('Error querying database.');
 
-//Step3
-$result = mysqli_query($db, $query);
-$row = mysqli_fetch_array($result);
+        //Step3
+        $result = mysqli_query($db, $query);
+        $row = mysqli_fetch_array($result);
 
-while ($row = mysqli_fetch_array($result)) {
- echo $row['first_name'] . ' ' . $row['last_name'] . ': ' . $row['email'] . ' ' . $row['city'] .'<br />';
-}
-//Step 4
-mysqli_close($db);
-?>
+        while ($row = mysqli_fetch_array($result)) {
+        echo $row['first_name'] . ' ' . $row['last_name'] . ': ' . $row['email'] . ' ' . $row['city'] .'<br />';
+        }
+        //Step 4
+        mysqli_close($db);
+        ?>
 
-</body>
+    </body>
 </html>
\ No newline at end of file

From 1bf76da58a4a14094f757b698fe87da32c4770f3 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 21:31:45 -0500
Subject: [PATCH 17/70] Attempt at unattended mysql_secure_installation

---
 Dockerfile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 429d041..6e83b61 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,16 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 COPY /etc/ /etc/
 
 # Setting up MySQL --Will come back to later, as it's not necessary and not playing very well with automation
-#RUN mysql_secure_installation --use-defaults
+RUN mysql_secure_installation << EOF
+
+    y
+    Password1234
+    Password1234
+    y
+    y
+    y
+    y
+    EOF
 
 # Copying in startup script
 COPY /entrypoint.sh /

From e93f966b8695b84e2cd84e4b18ea1199fb18e737 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 21:35:05 -0500
Subject: [PATCH 18/70] Different attempt at unattended
 mysql_secure_installation

---
 Dockerfile | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6e83b61..1937890 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,16 +17,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 COPY /etc/ /etc/
 
 # Setting up MySQL --Will come back to later, as it's not necessary and not playing very well with automation
-RUN mysql_secure_installation << EOF
-
-    y
-    Password1234
-    Password1234
-    y
-    y
-    y
-    y
-    EOF
+RUN echo -e "\ny\nPassword1234\nPassword1234\ny\ny\ny\ny" | mysql_secure_installation
 
 # Copying in startup script
 COPY /entrypoint.sh /

From 12c609cadedf9dcaef92d2f22e6f5b1ab3752fca Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 22:13:05 -0500
Subject: [PATCH 19/70] Attempting equivalent of mysql_secure_installation

---
 Dockerfile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1937890..077fb5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,13 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 COPY /etc/ /etc/
 
 # Setting up MySQL --Will come back to later, as it's not necessary and not playing very well with automation
-RUN echo -e "\ny\nPassword1234\nPassword1234\ny\ny\ny\ny" | mysql_secure_installation
-
+RUN mysql -u root <<-EOF
+    UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';
+    DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');
+    DELETE FROM mysql.user WHERE User='';
+    DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';
+    FLUSH PRIVILEGES;
+    EOF
 # Copying in startup script
 COPY /entrypoint.sh /
 

From 328b40f0f676bcc3ca22ca40185c73f57ece5ec3 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 22:31:47 -0500
Subject: [PATCH 20/70] Another attempt at setting up the database properly

---
 Dockerfile      | 9 ++-------
 mysql_setup.sql | 5 +++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 mysql_setup.sql

diff --git a/Dockerfile b/Dockerfile
index 077fb5e..12c1105 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,13 +17,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 COPY /etc/ /etc/
 
 # Setting up MySQL --Will come back to later, as it's not necessary and not playing very well with automation
-RUN mysql -u root <<-EOF
-    UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';
-    DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');
-    DELETE FROM mysql.user WHERE User='';
-    DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';
-    FLUSH PRIVILEGES;
-    EOF
+RUN mysql -u root < mysql_setup.sql
+
 # Copying in startup script
 COPY /entrypoint.sh /
 
diff --git a/mysql_setup.sql b/mysql_setup.sql
new file mode 100644
index 0000000..4164de6
--- /dev/null
+++ b/mysql_setup.sql
@@ -0,0 +1,5 @@
+UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';
+DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');
+DELETE FROM mysql.user WHERE User='';
+DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';
+FLUSH PRIVILEGES;
\ No newline at end of file

From 937b9c07a1dd9e46723eb8595788597231d34231 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 22:45:28 -0500
Subject: [PATCH 21/70] Trying to figure out why MySQL is so annoying

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 12c1105..9da10af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 COPY /etc/ /etc/
 
 # Setting up MySQL --Will come back to later, as it's not necessary and not playing very well with automation
-RUN mysql -u root < mysql_setup.sql
+RUN mysql -u root --verbose < mysql_setup.sql
 
 # Copying in startup script
 COPY /entrypoint.sh /

From a68844a3beb865c469e5e23284b384b6ac071fa4 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 22:51:02 -0500
Subject: [PATCH 22/70] Yet another attempt

---
 Dockerfile      |  2 +-
 mysql_setup.sh  | 20 ++++++++++++++++++++
 mysql_setup.sql |  5 -----
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 mysql_setup.sh
 delete mode 100644 mysql_setup.sql

diff --git a/Dockerfile b/Dockerfile
index 9da10af..13fd6c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 COPY /etc/ /etc/
 
 # Setting up MySQL --Will come back to later, as it's not necessary and not playing very well with automation
-RUN mysql -u root --verbose < mysql_setup.sql
+RUN mysql_setup.sh
 
 # Copying in startup script
 COPY /entrypoint.sh /
diff --git a/mysql_setup.sh b/mysql_setup.sh
new file mode 100644
index 0000000..5c56b2c
--- /dev/null
+++ b/mysql_setup.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+mysql_secure_installation << EOF
+
+y
+Password1234
+Password1234
+y
+y
+y
+y
+EOF
+
+
+
+
+#UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';
+#DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');
+#DELETE FROM mysql.user WHERE User='';
+#DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';
+#FLUSH PRIVILEGES;
\ No newline at end of file
diff --git a/mysql_setup.sql b/mysql_setup.sql
deleted file mode 100644
index 4164de6..0000000
--- a/mysql_setup.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';
-DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');
-DELETE FROM mysql.user WHERE User='';
-DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';
-FLUSH PRIVILEGES;
\ No newline at end of file

From 8a8498ea7da5b5e0d7c2143185c9d14181620288 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 22:53:35 -0500
Subject: [PATCH 23/70] Possible typo

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 13fd6c9..4d6c239 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 COPY /etc/ /etc/
 
 # Setting up MySQL --Will come back to later, as it's not necessary and not playing very well with automation
-RUN mysql_setup.sh
+RUN /mysql_setup.sh
 
 # Copying in startup script
 COPY /entrypoint.sh /

From 44d32af4f943ec07e62b78637d9fedf6b54e7745 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:04:15 -0500
Subject: [PATCH 24/70] Let's try this...

---
 Dockerfile                               | 6 ++++--
 mysql_setup.sh => scripts/mysql_setup.sh | 0
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename mysql_setup.sh => scripts/mysql_setup.sh (100%)

diff --git a/Dockerfile b/Dockerfile
index 4d6c239..26541ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,8 +16,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 # Copying in nginx configuration
 COPY /etc/ /etc/
 
-# Setting up MySQL --Will come back to later, as it's not necessary and not playing very well with automation
-RUN /mysql_setup.sh
+COPY /scripts/ /scripts/
+
+# Setting up MySQL
+RUN /scripts/mysql_setup.sh
 
 # Copying in startup script
 COPY /entrypoint.sh /
diff --git a/mysql_setup.sh b/scripts/mysql_setup.sh
similarity index 100%
rename from mysql_setup.sh
rename to scripts/mysql_setup.sh

From b32265f3971d6d705f509d3a632628266ab41d1c Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:10:21 -0500
Subject: [PATCH 25/70] Giving execute permission to scripts directory

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 26541ce..7baea3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 COPY /etc/ /etc/
 
 COPY /scripts/ /scripts/
+RUN chmod -R +x /scripts/
 
 # Setting up MySQL
 RUN /scripts/mysql_setup.sh

From 5bb6a27efa3cac22b9578232483e08446606d133 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:17:37 -0500
Subject: [PATCH 26/70] Another attempt

---
 scripts/mysql_secure_install_equivalent.sql |  5 +++++
 scripts/mysql_setup.sh                      | 20 +-------------------
 2 files changed, 6 insertions(+), 19 deletions(-)
 create mode 100644 scripts/mysql_secure_install_equivalent.sql

diff --git a/scripts/mysql_secure_install_equivalent.sql b/scripts/mysql_secure_install_equivalent.sql
new file mode 100644
index 0000000..4164de6
--- /dev/null
+++ b/scripts/mysql_secure_install_equivalent.sql
@@ -0,0 +1,5 @@
+UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';
+DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');
+DELETE FROM mysql.user WHERE User='';
+DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';
+FLUSH PRIVILEGES;
\ No newline at end of file
diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index 5c56b2c..97ac519 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,20 +1,2 @@
 #!/bin/bash
-mysql_secure_installation << EOF
-
-y
-Password1234
-Password1234
-y
-y
-y
-y
-EOF
-
-
-
-
-#UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';
-#DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');
-#DELETE FROM mysql.user WHERE User='';
-#DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';
-#FLUSH PRIVILEGES;
\ No newline at end of file
+mysql -u root < /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file

From 69be8392e4bc982dc76e490c6a83982dedc87038 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:19:48 -0500
Subject: [PATCH 27/70] Another attempt

---
 scripts/mysql_setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index 97ac519..aa56610 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-mysql -u root < /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file
+mysql -u root -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file

From 4bb62e068e432250979837981802dd83d4436363 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:21:23 -0500
Subject: [PATCH 28/70] Yet again

---
 scripts/mysql_setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index aa56610..7bb4dc2 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-mysql -u root -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file
+mysql -u root -p -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file

From 707c74c70084808b1a7a1bd172f88319e6062ca0 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:23:50 -0500
Subject: [PATCH 29/70] And again

---
 scripts/mysql_setup.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index 7bb4dc2..d599e7c 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,2 +1,5 @@
-#!/bin/bash
-mysql -u root -p -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file
+mysql -e "UPDATE mysql.user SET authentication_string=PASSWORD('{input_password_here}') WHERE User='root';"
+mysql -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
+mysql -e "DELETE FROM mysql.user WHERE User='';"
+mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';"
+mysql -e "FLUSH PRIVILEGES;"
\ No newline at end of file

From 80d082aef4a81d594196f6abe67f3fd0375c98f2 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:27:38 -0500
Subject: [PATCH 30/70] And again

---
 scripts/mysql_setup.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index d599e7c..907ced4 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,5 +1,2 @@
-mysql -e "UPDATE mysql.user SET authentication_string=PASSWORD('{input_password_here}') WHERE User='root';"
-mysql -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
-mysql -e "DELETE FROM mysql.user WHERE User='';"
-mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';"
-mysql -e "FLUSH PRIVILEGES;"
\ No newline at end of file
+#!/bin/bash
+mysql -h localhost -u root -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file

From d69e50f7327424a1013aaea6f8579a25fa01527e Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:28:58 -0500
Subject: [PATCH 31/70] And again

---
 scripts/mysql_setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index 907ced4..c94b351 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-mysql -h localhost -u root -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file
+mysql -h localhost -P 3306 --protocol=tcp -u root -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file

From 33985077804f93c0cdbc8087202f975d87178848 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:30:14 -0500
Subject: [PATCH 32/70] And again

---
 scripts/mysql_setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index c94b351..2d44f33 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-mysql -h localhost -P 3306 --protocol=tcp -u root -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file
+mysql -h 127.0.0.1 -P 3306 --protocol=tcp -u root -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file

From 38824d4bec83b8269e1868c6089a21dba49e1e28 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:37:05 -0500
Subject: [PATCH 33/70] And again, but this time I might have found out why...

---
 scripts/mysql_setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index 2d44f33..e093e3f 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
-mysql -h 127.0.0.1 -P 3306 --protocol=tcp -u root -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file
+service mysql start
+mysql -u root -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file

From 52864bad21558982d8ed369bf1319f6a645455a9 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:39:40 -0500
Subject: [PATCH 34/70] Maybe......?

---
 scripts/mysql_setup.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index e093e3f..9649896 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,3 +1,12 @@
 #!/bin/bash
 service mysql start
-mysql -u root -e /scripts/mysql_secure_install_equivalent.sql
\ No newline at end of file
+mysql_secure_installation << EOF
+
+y
+Password1234
+Password1234
+y
+y
+y
+y
+EOF
\ No newline at end of file

From 4891d8cf7c26f9b4f3f463941c81507a2e07c587 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:53:20 -0500
Subject: [PATCH 35/70] 100th time's the charm?

---
 scripts/mysql_setup.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index 9649896..d12a452 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
 service mysql start
-mysql_secure_installation << EOF
-
-y
-Password1234
-Password1234
-y
-y
-y
-y
-EOF
\ No newline at end of file
+mysql -e "UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';"
+mysql -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
+mysql -e "DELETE FROM mysql.user WHERE User='';"
+mysql -e "DROP DATABASE test;"
+mysql -e "FLUSH PRIVILEGES;"
\ No newline at end of file

From 6f1f9f63ace97a044c0e3780bfae6e2f4af03fef Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Fri, 22 Nov 2019 23:56:58 -0500
Subject: [PATCH 36/70] IT WORKS!!!!!!!!!!!!!!!!!!!!!!... now to clean up.

---
 scripts/mysql_secure_install_equivalent.sql | 5 -----
 scripts/mysql_setup.sh                      | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 scripts/mysql_secure_install_equivalent.sql

diff --git a/scripts/mysql_secure_install_equivalent.sql b/scripts/mysql_secure_install_equivalent.sql
deleted file mode 100644
index 4164de6..0000000
--- a/scripts/mysql_secure_install_equivalent.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';
-DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');
-DELETE FROM mysql.user WHERE User='';
-DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';
-FLUSH PRIVILEGES;
\ No newline at end of file
diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index d12a452..163cb99 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 service mysql start
+
+# Perform the equivalent of running `mysql_secure_installation`
 mysql -e "UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';"
 mysql -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
 mysql -e "DELETE FROM mysql.user WHERE User='';"
-mysql -e "DROP DATABASE test;"
+mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';"
 mysql -e "FLUSH PRIVILEGES;"
\ No newline at end of file

From 215d0322ffcbf3b1d091a0bb3d76692504b87280 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Sat, 23 Nov 2019 00:06:40 -0500
Subject: [PATCH 37/70] Moved starting services to inside dockerfile;
 side-benefit of faster startups

---
 Dockerfile             | 8 +++++++-
 entrypoint.sh          | 9 ---------
 scripts/mysql_setup.sh | 1 -
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7baea3c..6d746c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,9 +13,14 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     && rm -rf /var/www/html \
     && rm /etc/nginx/sites-enabled/default
 
+# Start services
+RUN service mysql start \
+    && service php7.2-fpm start
+
 # Copying in nginx configuration
 COPY /etc/ /etc/
 
+# Copying in scripts and making them executable
 COPY /scripts/ /scripts/
 RUN chmod -R +x /scripts/
 
@@ -25,8 +30,9 @@ RUN /scripts/mysql_setup.sh
 # Copying in startup script
 COPY /entrypoint.sh /
 
-# Copying in  web files
+# Copying in  web files and setting default owenership
 COPY /var/www/ /var/www/
+RUN chown -R www-data:www-data /var/www
 
 # Setting up the database tables
 #RUN mysql -u root friendbook < initialization.sql
diff --git a/entrypoint.sh b/entrypoint.sh
index 1653cc1..369ee77 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,13 +1,4 @@
 #!/bin/sh
 
-echo "[ INFO ] Recursively setting www-data:www-data permissions on root web directory"
-chown -R www-data:www-data /var/www
-
-echo "[ INFO ] Starting MySQL Server"
-service mysql start
-
-echo "[ INFO ] Starting PHP 7.2 Service"
-service php7.2-fpm start
-
 echo "[ INFO ] Starting nginx"
 nginx -g "daemon off;" # Foreground
diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index 163cb99..9b65744 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-service mysql start
 
 # Perform the equivalent of running `mysql_secure_installation`
 mysql -e "UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';"

From ed85d2dc78d382e093393c973065b84478833093 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Sat, 23 Nov 2019 00:09:22 -0500
Subject: [PATCH 38/70] Testing

---
 scripts/mysql_setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index 9b65744..163cb99 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+service mysql start
 
 # Perform the equivalent of running `mysql_secure_installation`
 mysql -e "UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';"

From d84df24e085c57a3818fd13d31146d206ea1f0ae Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Sat, 23 Nov 2019 00:12:20 -0500
Subject: [PATCH 39/70] Removed unneeded MySQL port

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6d746c3..3335017 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,5 +38,5 @@ RUN chown -R www-data:www-data /var/www
 #RUN mysql -u root friendbook < initialization.sql
 
 # Expose Insecure Web, MySQL Server
-EXPOSE 80 3306
+EXPOSE 80
 CMD ["/bin/sh", "/entrypoint.sh"]
\ No newline at end of file

From 6870eb425a3eb9794d95ee81a86c61de3527a781 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Sat, 23 Nov 2019 00:13:06 -0500
Subject: [PATCH 40/70] Learned that services are only running within the
 Docker build layer they are started in it seems...

---
 Dockerfile    | 7 -------
 entrypoint.sh | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3335017..bfbb32a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,10 +13,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     && rm -rf /var/www/html \
     && rm /etc/nginx/sites-enabled/default
 
-# Start services
-RUN service mysql start \
-    && service php7.2-fpm start
-
 # Copying in nginx configuration
 COPY /etc/ /etc/
 
@@ -34,9 +30,6 @@ COPY /entrypoint.sh /
 COPY /var/www/ /var/www/
 RUN chown -R www-data:www-data /var/www
 
-# Setting up the database tables
-#RUN mysql -u root friendbook < initialization.sql
-
 # Expose Insecure Web, MySQL Server
 EXPOSE 80
 CMD ["/bin/sh", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
index 369ee77..4a0f5ef 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,10 @@
 #!/bin/sh
 
+echo "[ INFO ] Starting MySQL Server"
+service mysql start
+
+echo "[ INFO ] Starting PHP 7.2 Service"
+service php7.2-fpm start
+
 echo "[ INFO ] Starting nginx"
 nginx -g "daemon off;" # Foreground

From 30d39c355972ee25aef4b3493e826389ebe2ac3a Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Sat, 23 Nov 2019 00:19:47 -0500
Subject: [PATCH 41/70] Let's see if this now works

---
 scripts/mysql_setup.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index 163cb99..0e47f4e 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -2,8 +2,16 @@
 service mysql start
 
 # Perform the equivalent of running `mysql_secure_installation`
-mysql -e "UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';"
-mysql -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
-mysql -e "DELETE FROM mysql.user WHERE User='';"
-mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';"
-mysql -e "FLUSH PRIVILEGES;"
\ No newline at end of file
+#mysql -e "UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';"
+#ysql -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
+#mysql -e "DELETE FROM mysql.user WHERE User='';"
+#mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';"
+#mysql -e "FLUSH PRIVILEGES;"
+
+mysql -u root << EOF
+UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';
+DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');
+DELETE FROM mysql.user WHERE User='';
+DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';
+FLUSH PRIVILEGES;
+EOF
\ No newline at end of file

From 1c2980c416c21f535285734c814601456e7d760f Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Sat, 23 Nov 2019 00:35:47 -0500
Subject: [PATCH 42/70] Added the database and a user to test out the PHP pages
 with

---
 scripts/mysql_setup.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/mysql_setup.sh b/scripts/mysql_setup.sh
index 0e47f4e..464a4fa 100644
--- a/scripts/mysql_setup.sh
+++ b/scripts/mysql_setup.sh
@@ -2,16 +2,18 @@
 service mysql start
 
 # Perform the equivalent of running `mysql_secure_installation`
-#mysql -e "UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';"
-#ysql -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
-#mysql -e "DELETE FROM mysql.user WHERE User='';"
-#mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';"
-#mysql -e "FLUSH PRIVILEGES;"
-
 mysql -u root << EOF
-UPDATE mysql.user SET authentication_string=PASSWORD('Password1234') WHERE User='root';
+UPDATE mysql.user SET authentication_string=PASSWORD('Password123') WHERE User='root';
 DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');
 DELETE FROM mysql.user WHERE User='';
 DELETE FROM mysql.db WHERE Db='test' OR Db='test_%';
 FLUSH PRIVILEGES;
+EOF
+
+# Setting up the basics
+mysql -u root << EOF
+CREATE USER 'web'@'localhost' IDENTIFIED BY 'Password456';
+CREATE DATABASE friendBook;
+GRANT ALL PRIVILEGES ON friendBook . * TO 'web'@'localhost';
+FLUSH PRIVILEGES;
 EOF
\ No newline at end of file

From 8e7b68966cd10d4a47d33b8cdcc8c805047666da Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Sat, 23 Nov 2019 00:45:17 -0500
Subject: [PATCH 43/70] Updated username and password

---
 var/www/phptest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/var/www/phptest.php b/var/www/phptest.php
index a1e86d1..cdf9f10 100644
--- a/var/www/phptest.php
+++ b/var/www/phptest.php
@@ -1,7 +1,7 @@
 <?php
 $servername = "localhost";
-$username = "root";
-$password = "";
+$username = "web";
+$password = "Password456";
 
 // Create connection
 $conn = new mysqli($servername, $username, $password);

From d068ea34493b9704224fd12ac1a2bdd01611a75e Mon Sep 17 00:00:00 2001
From: Logan McInnis <logan.j.mcinnis@wmich.edu>
Date: Sun, 24 Nov 2019 13:56:57 -0500
Subject: [PATCH 44/70] Upload New File

---
 friendbook.sql | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 friendbook.sql

diff --git a/friendbook.sql b/friendbook.sql
new file mode 100644
index 0000000..7cbeb45
--- /dev/null
+++ b/friendbook.sql
@@ -0,0 +1,48 @@
+drop database if exists friendbook;
+
+create database friendbook;
+
+use friendbook;
+
+create table login(
+	username varchar(25),
+	pword varchar(25),
+	primary key(username));
+
+create table contacts(
+	username varchar(25),
+	fname varchar(25),
+	lnam varchar(25),
+	primary key(username),
+	foreign key(username) references login(username));
+
+create table messages(
+	messageID int,
+	sender varchar(25),
+	recipient varchar(25),
+	message text,
+	date date,
+	haveread varchar(1),
+	primary key(messageID),
+	foreign key(sender) references contacts(username),
+	foreign key(recipient) references contacts(username));
+
+create table friendlist(
+	username varchar(25),
+	friend varchar(25),
+	confirm boolean);
+
+insert into login
+	values ('user1', 'password1');
+insert into login
+	values ('user2', 'password2');
+
+insert into contacts
+	values ('user1', 'num1', 'uno');
+insert into contacts
+	values ('user2', 'num2', 'dos');
+
+insert into messages
+	values ('1', 'user1', 'user2', 'hello, how are you', now(), 'Y');
+insert into messages
+	values ('2', 'user2', 'user1', 'im doing good, thanks', now(), 'N');
\ No newline at end of file

From 95d57554f92d20299206461d180e62604b0c6591 Mon Sep 17 00:00:00 2001
From: Logan McInnis <logan.j.mcinnis@wmich.edu>
Date: Sun, 24 Nov 2019 13:57:51 -0500
Subject: [PATCH 45/70] this will start database and create a few values


From 5b87ac68d7e9779457f407952152ee1ac739ac9d Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Sun, 24 Nov 2019 14:17:34 -0500
Subject: [PATCH 46/70] Moved to scripts folder

---
 friendbook.sql => scripts/friendBook.sql | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename friendbook.sql => scripts/friendBook.sql (100%)

diff --git a/friendbook.sql b/scripts/friendBook.sql
similarity index 100%
rename from friendbook.sql
rename to scripts/friendBook.sql

From 7a3e2e00fb4c15b2e50c050787991110844a317f Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Sun, 24 Nov 2019 14:17:58 -0500
Subject: [PATCH 47/70] Replaced tabs with 4 spaces

---
 scripts/friendBook.sql | 52 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/scripts/friendBook.sql b/scripts/friendBook.sql
index 7cbeb45..87b862f 100644
--- a/scripts/friendBook.sql
+++ b/scripts/friendBook.sql
@@ -5,44 +5,44 @@ create database friendbook;
 use friendbook;
 
 create table login(
-	username varchar(25),
-	pword varchar(25),
-	primary key(username));
+    username varchar(25),
+    pword varchar(25),
+    primary key(username));
 
 create table contacts(
-	username varchar(25),
-	fname varchar(25),
-	lnam varchar(25),
-	primary key(username),
-	foreign key(username) references login(username));
+    username varchar(25),
+    fname varchar(25),
+    lnam varchar(25),
+    primary key(username),
+    foreign key(username) references login(username));
 
 create table messages(
-	messageID int,
-	sender varchar(25),
-	recipient varchar(25),
-	message text,
-	date date,
-	haveread varchar(1),
-	primary key(messageID),
-	foreign key(sender) references contacts(username),
-	foreign key(recipient) references contacts(username));
+    messageID int,
+    sender varchar(25),
+    recipient varchar(25),
+    message text,
+    date date,
+    haveread varchar(1),
+    primary key(messageID),
+    foreign key(sender) references contacts(username),
+    foreign key(recipient) references contacts(username));
 
 create table friendlist(
-	username varchar(25),
-	friend varchar(25),
-	confirm boolean);
+    username varchar(25),
+    friend varchar(25),
+    confirm boolean);
 
 insert into login
-	values ('user1', 'password1');
+    values ('user1', 'password1');
 insert into login
-	values ('user2', 'password2');
+    values ('user2', 'password2');
 
 insert into contacts
-	values ('user1', 'num1', 'uno');
+    values ('user1', 'num1', 'uno');
 insert into contacts
-	values ('user2', 'num2', 'dos');
+    values ('user2', 'num2', 'dos');
 
 insert into messages
-	values ('1', 'user1', 'user2', 'hello, how are you', now(), 'Y');
+    values ('1', 'user1', 'user2', 'hello, how are you', now(), 'Y');
 insert into messages
-	values ('2', 'user2', 'user1', 'im doing good, thanks', now(), 'N');
\ No newline at end of file
+    values ('2', 'user2', 'user1', 'im doing good, thanks', now(), 'N');
\ No newline at end of file

From 3dec2ea750817416e72adb1e84fe93e326d603f4 Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Sun, 24 Nov 2019 14:19:10 -0500
Subject: [PATCH 48/70] Removed since the friendBook database is made before
 startup

---
 scripts/friendBook.sql | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/friendBook.sql b/scripts/friendBook.sql
index 87b862f..40e95a0 100644
--- a/scripts/friendBook.sql
+++ b/scripts/friendBook.sql
@@ -1,7 +1,3 @@
-drop database if exists friendbook;
-
-create database friendbook;
-
 use friendbook;
 
 create table login(

From 0f527de9a7afe7cd8d6337c3886791d498c313a8 Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Sun, 24 Nov 2019 14:25:51 -0500
Subject: [PATCH 49/70] Added command to execute friendBook SQL script

---
 entrypoint.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/entrypoint.sh b/entrypoint.sh
index 4a0f5ef..ce3d439 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,10 +1,15 @@
 #!/bin/sh
 
+# Starting base services
 echo "[ INFO ] Starting MySQL Server"
 service mysql start
 
 echo "[ INFO ] Starting PHP 7.2 Service"
 service php7.2-fpm start
 
+# Running friendBook database setup script
+echo "[ INFO ] Setting up friendBook database"
+mysql -u root < /scripts/friendBook.sql
+
 echo "[ INFO ] Starting nginx"
 nginx -g "daemon off;" # Foreground

From a235858693ff226bc97e84b39d44c3ed9c89df38 Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Sun, 24 Nov 2019 14:32:13 -0500
Subject: [PATCH 50/70] Changed to use camelCase

---
 scripts/friendBook.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/friendBook.sql b/scripts/friendBook.sql
index 40e95a0..7271481 100644
--- a/scripts/friendBook.sql
+++ b/scripts/friendBook.sql
@@ -1,4 +1,4 @@
-use friendbook;
+use friendBook;
 
 create table login(
     username varchar(25),

From 064d1e25c3b6dc0cfb21960fc85755441e3e5d2e Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Sun, 24 Nov 2019 14:42:17 -0500
Subject: [PATCH 51/70] Automatically install nano editor to make things a
 little easier

---
 entrypoint.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/entrypoint.sh b/entrypoint.sh
index ce3d439..a1925bd 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -11,5 +11,9 @@ service php7.2-fpm start
 echo "[ INFO ] Setting up friendBook database"
 mysql -u root < /scripts/friendBook.sql
 
+# Installing nano to make live changes a little quicker
+echo "[ INFO ] Installing nano editor"
+apt-get update && apt-get install -y nano
+
 echo "[ INFO ] Starting nginx"
 nginx -g "daemon off;" # Foreground

From dc0c7f43811b6c9d6a02367500745397e9814b91 Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Sun, 24 Nov 2019 22:26:17 -0500
Subject: [PATCH 52/70] Using PHP's PDO syntax now

---
 var/www/phptest.php | 46 ++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/var/www/phptest.php b/var/www/phptest.php
index cdf9f10..01d907d 100644
--- a/var/www/phptest.php
+++ b/var/www/phptest.php
@@ -1,38 +1,38 @@
 <?php
-$servername = "localhost";
+$server = "localhost";
+$database = "friendBook";
 $username = "web";
 $password = "Password456";
 
-// Create connection
-$conn = new mysqli($servername, $username, $password);
-
-// Check connection
-if ($conn->connect_error) {
-    die("Connection failed: " . $conn->connect_error);
-}
-echo "Connected successfully";
-
-?>
+// Current user
+$user = "William"; // Testing with until we have login working
 
 <html>
     <head>
     </head>
     <body>
-        <h1>PHP connect to MySQL</h1>
+        <h1>PHP Test Page - Connecting to MySQL</h1>
 
         <?php
-        //Step2
-        $query = "SELECT * FROM contacts";
-        mysqli_query($db, $query) or die('Error querying database.');
-
-        //Step3
-        $result = mysqli_query($db, $query);
-        $row = mysqli_fetch_array($result);
-
-        while ($row = mysqli_fetch_array($result)) {
-        echo $row['first_name'] . ' ' . $row['last_name'] . ': ' . $row['email'] . ' ' . $row['city'] .'<br />';
+        try{
+            $connection = new PDO("mysql:host=$server;dbname=$database", $username, $password);
+            // set the PDO error mode to exception
+            $connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+            echo "Connected successfully";
         }
-        //Step 4
+        catch(PDOException $e){
+            echo "Connection failed: " . $e->getMessage();
+        }
+
+        $sql = "SELECT messageID, date, message 
+                FROM messages
+                WHERE recipient=$user";
+        foreach($connection->query($sql) as $row){
+            print $row['messageID'] . "\t";
+            print $row['date'] . "\t";
+            print $row['message'] . "\t";
+        }
+
         mysqli_close($db);
         ?>
 

From cef19f325d9902c84f27d1a5c7412c041a8f1efc Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Sun, 24 Nov 2019 22:34:59 -0500
Subject: [PATCH 53/70] Added back Port 3306 just in case for debugging

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bfbb32a..e211b90 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,5 +31,5 @@ COPY /var/www/ /var/www/
 RUN chown -R www-data:www-data /var/www
 
 # Expose Insecure Web, MySQL Server
-EXPOSE 80
+EXPOSE 80 3306
 CMD ["/bin/sh", "/entrypoint.sh"]
\ No newline at end of file

From e7edd119f93d7f4b43fc02b95b0b11be04e2f9aa Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Sun, 24 Nov 2019 23:00:10 -0500
Subject: [PATCH 54/70] Small fix

---
 var/www/phptest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/var/www/phptest.php b/var/www/phptest.php
index 01d907d..507e96b 100644
--- a/var/www/phptest.php
+++ b/var/www/phptest.php
@@ -24,7 +24,7 @@ $user = "William"; // Testing with until we have login working
             echo "Connection failed: " . $e->getMessage();
         }
 
-        $sql = "SELECT messageID, date, message 
+        $sql = "SELECT messageID, date, message
                 FROM messages
                 WHERE recipient=$user";
         foreach($connection->query($sql) as $row){
@@ -33,7 +33,7 @@ $user = "William"; // Testing with until we have login working
             print $row['message'] . "\t";
         }
 
-        mysqli_close($db);
+        mysqli_close($connection);
         ?>
 
     </body>

From e24d376cb07fb1bf567bda17615a238316b9a836 Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Sun, 24 Nov 2019 23:00:53 -0500
Subject: [PATCH 55/70] Explicitly using desired versions; added nano editor
 into dockerfile (less logs)

---
 Dockerfile    | 9 +++++----
 entrypoint.sh | 4 ----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e211b90..f6809cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,11 +4,12 @@ WORKDIR /var/www
 
 # Installing needed packages
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    mysql-server \
+    mysql-server-5.7 \
+    nano \
     nginx \
-    php-fpm \
-    php-mysql \
-    php-cli \
+    php7.2-fpm \
+    php7.2-mysql \
+    php7.2-cli \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /var/www/html \
     && rm /etc/nginx/sites-enabled/default
diff --git a/entrypoint.sh b/entrypoint.sh
index a1925bd..ce3d439 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -11,9 +11,5 @@ service php7.2-fpm start
 echo "[ INFO ] Setting up friendBook database"
 mysql -u root < /scripts/friendBook.sql
 
-# Installing nano to make live changes a little quicker
-echo "[ INFO ] Installing nano editor"
-apt-get update && apt-get install -y nano
-
 echo "[ INFO ] Starting nginx"
 nginx -g "daemon off;" # Foreground

From d5f977e7d1eb985ebab9182b53fadc717baef56b Mon Sep 17 00:00:00 2001
From: Bryan <bryan@nearing.xyz>
Date: Sun, 24 Nov 2019 23:07:11 -0500
Subject: [PATCH 56/70] Updating search and sendMessage. Also correcting the
 landing page to redirect to redirect to the new pages

---
 var/www/landingPage.html | 21 +++++++++++++++
 var/www/search.php       | 50 +++++++++++++++++++++++++++++++++++
 var/www/sendMessage.php  | 56 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 127 insertions(+)
 create mode 100644 var/www/landingPage.html
 create mode 100644 var/www/search.php
 create mode 100644 var/www/sendMessage.php

diff --git a/var/www/landingPage.html b/var/www/landingPage.html
new file mode 100644
index 0000000..fdf8fba
--- /dev/null
+++ b/var/www/landingPage.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<body>
+<style>
+body {
+  background-color: #3B5998;
+}
+</style>
+<h2><font color="white">Friendbook</h2>
+
+<button type="button" onclick="window.location.href = 'friends.html'">See Friends</button>
+<button type="button" onclick="window.location.href = 'messages.html'">See Messages</button>
+<button type="button" onclick="window.location.href = 'contacts.html'">See Contacts</button>
+<button type="button" onclick="window.location.href = 'search.php'">Search</button>
+<button type="button" onclick="window.location.href = 'sendMessage.php'">Message Someone</button>
+<button type="button" onclick="window.location.href = 'findFriend.html'">Find a New Friend</button>
+<button type="button" onclick="window.location.href = 'pendingFriend.html'">Check Pending Friends</button>
+
+
+</body>
+</html> 
diff --git a/var/www/search.php b/var/www/search.php
new file mode 100644
index 0000000..7f6be88
--- /dev/null
+++ b/var/www/search.php
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<body>
+<style>
+body {
+  background-color: #3B5998;
+}
+</style>
+
+<h2><font color="white">Who would you like to search for</h2>
+
+<?php
+$name = $message = "";
+
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+	if (empty($_POST["name"])) {
+    	$name = "";
+  	} else {
+    	$comment = test_input($_POST["name"]);
+  	}
+
+	if (empty($_POST["Message"])) {
+    	$message = "";
+  	} else {
+    	$message = test_input($_POST["message"]);
+  	}
+}
+
+function test_input($data) {
+  $data = trim($data);
+  $data = stripslashes($data);
+  $data = htmlspecialchars($data);
+  return $data;
+}
+?>
+
+<form method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">  
+  Which Search:
+  <input type="radio" name="type" <?php if (isset($type) && $gender=="name") echo "checked";?> value="type">Name
+  <input type="radio" name="type" <?php if (isset($type) && $gender=="username") echo "checked";?> value="type">Username
+  <br><br>
+  Search Key: <br><input type="text" name="name" value="<?php echo $name;?>">
+  <br><br>
+  
+  <input type="submit" name="submit" value="Submit">  
+</form>
+</body>
+</html>
+
diff --git a/var/www/sendMessage.php b/var/www/sendMessage.php
new file mode 100644
index 0000000..426962b
--- /dev/null
+++ b/var/www/sendMessage.php
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+<body>
+<style>
+body {
+  background-color: #3B5998;
+}
+</style>
+
+<h2><font color="white">Send a message</h2>
+
+<?php
+$name = $message = "";
+
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+	if (empty($_POST["name"])) {
+    	$name = "";
+  	} else {
+    	$comment = test_input($_POST["name"]);
+  	}
+
+	if (empty($_POST["Message"])) {
+    	$message = "";
+  	} else {
+    	$message = test_input($_POST["message"]);
+  	}
+}
+
+function test_input($data) {
+  $data = trim($data);
+  $data = stripslashes($data);
+  $data = htmlspecialchars($data);
+  return $data;
+}
+?>
+
+<form method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">  
+  Who are you sending it to?: <br><input type="text" name="name" value="<?php echo $name;?>">
+  <br><br>
+  Message: <br><textarea name="message" rows="5" cols="40"><?php echo $message;?></textarea>
+  <br><br>
+  <input type="submit" name="submit" value="Submit">  
+</form>
+
+<?php
+echo $name;
+echo "<br>";
+echo $message;
+echo "<br>";
+?>
+
+
+</body>
+</html>
+

From 70373d14536a94c6b8d4480f40646f55a62a1a07 Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Mon, 25 Nov 2019 01:26:53 -0500
Subject: [PATCH 57/70] Fixed missing end tag; page works again

---
 var/www/phptest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/var/www/phptest.php b/var/www/phptest.php
index 507e96b..9ffb6a9 100644
--- a/var/www/phptest.php
+++ b/var/www/phptest.php
@@ -6,6 +6,7 @@ $password = "Password456";
 
 // Current user
 $user = "William"; // Testing with until we have login working
+?>
 
 <html>
     <head>

From 235c55285d67c21df089bf2fcb8be7ee53bfc74a Mon Sep 17 00:00:00 2001
From: Bryan <bryan@nearing.xyz>
Date: Mon, 25 Nov 2019 03:17:21 -0500
Subject: [PATCH 58/70] fixing the search, now does it for full name or
 username, not complete just yet

---
 var/www/nameSearch.php     |  8 +++++++
 var/www/search.php         | 47 +++++++++++++++++++++++---------------
 var/www/usernameSearch.php |  7 ++++++
 3 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100644 var/www/nameSearch.php
 create mode 100644 var/www/usernameSearch.php

diff --git a/var/www/nameSearch.php b/var/www/nameSearch.php
new file mode 100644
index 0000000..2a73f98
--- /dev/null
+++ b/var/www/nameSearch.php
@@ -0,0 +1,8 @@
+<html>
+<body>
+
+First Name is  <?php echo $_POST["fname"]; ?><br>
+Last Name is <?php echo $_POST["lname"]; ?>
+
+</body>
+</html>
diff --git a/var/www/search.php b/var/www/search.php
index 7f6be88..a16288f 100644
--- a/var/www/search.php
+++ b/var/www/search.php
@@ -10,21 +10,24 @@ body {
 <h2><font color="white">Who would you like to search for</h2>
 
 <?php
-$name = $message = "";
+$name = $fname = $lname = "";
+$nameErr = $fnameErr = $lnameErr = "";
 
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
 	if (empty($_POST["name"])) {
-    	$name = "";
-  	} else {
-    	$comment = test_input($_POST["name"]);
+    		$nameErr = "Name is required";
+  	} 
+	else {
+    		$name = test_input($_POST["name"]);
+    		if (!preg_match("/^[a-zA-Z ]*$/",$name)) {
+      			$nameErr = "Only letters and white space allowed";
+    		}
   	}
 
-	if (empty($_POST["Message"])) {
-    	$message = "";
-  	} else {
-    	$message = test_input($_POST["message"]);
-  	}
+
+	
+
 }
 
 function test_input($data) {
@@ -35,16 +38,24 @@ function test_input($data) {
 }
 ?>
 
-<form method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">  
-  Which Search:
-  <input type="radio" name="type" <?php if (isset($type) && $gender=="name") echo "checked";?> value="type">Name
-  <input type="radio" name="type" <?php if (isset($type) && $gender=="username") echo "checked";?> value="type">Username
-  <br><br>
-  Search Key: <br><input type="text" name="name" value="<?php echo $name;?>">
-  <br><br>
-  
-  <input type="submit" name="submit" value="Submit">  
+<form method="post" action="usernameSearch.php">  
+Username: <br><input type="text" name="username"><br>
+<input type="submit">  
 </form>
+<br>
+<form action="nameSearch.php" method="post">
+First Name: <input type="text" name="fname"><br>
+Last Name:  <input type="text" name="lname"><br>
+<input type="submit">
+</form>
+
+
+
+<?php
+echo $name;
+echo "<br>"
+?>
+
 </body>
 </html>
 
diff --git a/var/www/usernameSearch.php b/var/www/usernameSearch.php
new file mode 100644
index 0000000..124f6a7
--- /dev/null
+++ b/var/www/usernameSearch.php
@@ -0,0 +1,7 @@
+<html>
+<body>
+
+Username is  <?php echo $_POST["username"]; ?>
+
+</body>
+</html>

From b90e6961def7f7e56bcfe1317d2fee7625402d79 Mon Sep 17 00:00:00 2001
From: Bryan <bryan@nearing.xyz>
Date: Mon, 25 Nov 2019 03:25:08 -0500
Subject: [PATCH 59/70] Deleting the unused html files

---
 var/www/search.html      | 25 -------------------------
 var/www/sendMessage.html | 14 --------------
 2 files changed, 39 deletions(-)
 delete mode 100644 var/www/search.html
 delete mode 100644 var/www/sendMessage.html

diff --git a/var/www/search.html b/var/www/search.html
deleted file mode 100644
index 6754a05..0000000
--- a/var/www/search.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<style>
-body {
-  background-color: #3B5998;
-}
-</style>
-
-<h2><font color="white">Who Would you like to search for</h2>
-
-<input type="radio" name="type" value="username">Search By Username<br>
-<input type="radio" name="type" value="name">Search By Name<br>
-
-<textarea autofocus rows="1" cols="50">
-</textarea>
-
-<form action="/action_page.php">
-  <input type="text" name="usrname"><br>
-  <input type="submit" value="Submit">
-</form>
-
-</body>
-</html>
-
diff --git a/var/www/sendMessage.html b/var/www/sendMessage.html
deleted file mode 100644
index dc9a9a2..0000000
--- a/var/www/sendMessage.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<style>
-body {
-  background-color: #3B5998;
-}
-</style>
-
-<h2><font color="white">Heres where you send your dumbass messages</h2>
-
-</body>
-</html>
-

From 3a7e7ced94066cf1aa1522801f2713fa8d8f3e51 Mon Sep 17 00:00:00 2001
From: Bryan <bryan@nearing.xyz>
Date: Mon, 25 Nov 2019 03:30:23 -0500
Subject: [PATCH 60/70] Cosmetic fix for the search site

---
 var/www/search.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/var/www/search.php b/var/www/search.php
index a16288f..963b35f 100644
--- a/var/www/search.php
+++ b/var/www/search.php
@@ -7,7 +7,7 @@ body {
 }
 </style>
 
-<h2><font color="white">Who would you like to search for</h2>
+<h2><font color="white">Search by</h2>
 
 <?php
 $name = $fname = $lname = "";
@@ -43,6 +43,7 @@ Username: <br><input type="text" name="username"><br>
 <input type="submit">  
 </form>
 <br>
+<h2>Or</h2>
 <form action="nameSearch.php" method="post">
 First Name: <input type="text" name="fname"><br>
 Last Name:  <input type="text" name="lname"><br>

From f1fcba3e83dfd4c15515e895203bc62b52cc1553 Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Mon, 25 Nov 2019 04:31:19 -0500
Subject: [PATCH 61/70] User authentication setup - first test

---
 var/www/login.php      | 28 ++++++++++++++++++++++++++++
 var/www/loginCheck.php | 39 +++++++++++++++++++++++++++++++++++++++
 var/www/logout.php     | 27 +++++++++++++++++++++++++++
 var/www/phptest.php    | 12 ++++++++++--
 4 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 var/www/login.php
 create mode 100644 var/www/loginCheck.php
 create mode 100644 var/www/logout.php

diff --git a/var/www/login.php b/var/www/login.php
new file mode 100644
index 0000000..82554d2
--- /dev/null
+++ b/var/www/login.php
@@ -0,0 +1,28 @@
+<?php
+session_start();
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head> 
+        <title>FriendBook Login</title> 
+        <meta http-equiv="content-type" 
+            content="text/html; charset=utf-8"/> 
+    </head> 
+    <body>
+        <style>
+            body {
+                background-color: #3B5998;
+            }
+        </style>
+        <div class="message"><?php if($_SESSION["loginError"]!="") { echo $_SESSION["loginError"]; } ?></div>
+        <h2><font color="white">Please Login</h2>
+        <form action="loginCheck.php" method="post">
+            User&colon;
+            <input type="text" name="username" placeholder="Username"><br>
+            Password&colon;
+            <input type="password" name="password" placeholder="Password"><br>
+            <input type="submit">
+        </form>
+    </body>
+</html> 
diff --git a/var/www/loginCheck.php b/var/www/loginCheck.php
new file mode 100644
index 0000000..f479258
--- /dev/null
+++ b/var/www/loginCheck.php
@@ -0,0 +1,39 @@
+<?php
+session_start();
+
+$server = "localhost";
+$database = "friendBook";
+$username = "web";
+$password = "Password456";
+
+try{
+    $connection = new PDO("mysql:host=$server;dbname=$database", $username, $password);
+    $connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+    echo "Connected successfully";
+    if(count($_POST) > 0){
+        $matchingUsers = $connection->query("SELECT COUNT(*) FROM login WHERE username = '".$_POST["Username"]."' and pword = '".$_POST["Password"]."'");
+        if($matchingUsers > 0){
+            // User has been authenticated; set user as logged in
+            $_SESSION["loggedInUser"] = "".$_POST["Username"]."";
+            $_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){
+    echo "Error: " . $e->getMessage();
+}
+?>
\ No newline at end of file
diff --git a/var/www/logout.php b/var/www/logout.php
new file mode 100644
index 0000000..3b7c9d9
--- /dev/null
+++ b/var/www/logout.php
@@ -0,0 +1,27 @@
+<?php
+session_start();
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head> 
+        <title>FriendBook Logout</title> 
+        <meta http-equiv="content-type" 
+            content="text/html; charset=utf-8"/> 
+    </head> 
+    <body>
+
+        <?php
+        session_unset(); // remove all session variables
+        session_destroy(); // destroy the session
+        ?>
+
+        <style>
+        body {
+            background-color: #3B5998;
+        }
+        </style>
+        <h2><font color="white">You have been successfully logged out.</h2>
+        <button type="button" onclick="window.location.href = 'friends.html'">Login again? (FIXME)</button>
+    </body>
+</html> 
diff --git a/var/www/phptest.php b/var/www/phptest.php
index 9ffb6a9..4ba50ac 100644
--- a/var/www/phptest.php
+++ b/var/www/phptest.php
@@ -1,4 +1,6 @@
 <?php
+session_start();
+
 $server = "localhost";
 $database = "friendBook";
 $username = "web";
@@ -12,7 +14,9 @@ $user = "William"; // Testing with until we have login working
     <head>
     </head>
     <body>
-        <h1>PHP Test Page - Connecting to MySQL</h1>
+        <h1>PHP Test Page</h1>
+        
+        <h2>Connecting to MySQL</h2>
 
         <?php
         try{
@@ -34,8 +38,12 @@ $user = "William"; // Testing with until we have login working
             print $row['message'] . "\t";
         }
 
-        mysqli_close($connection);
+        $conn = null;
         ?>
 
+        <h2>PHP Session Info</h2>
+        <?php
+        print_r($_SESSION);
+        ?>
     </body>
 </html>
\ No newline at end of file

From 1431c5273a81c393872a974ac9f0e05f604635cf Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Mon, 25 Nov 2019 05:57:33 -0500
Subject: [PATCH 62/70] Indentation

---
 var/www/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/var/www/login.php b/var/www/login.php
index 82554d2..8d23141 100644
--- a/var/www/login.php
+++ b/var/www/login.php
@@ -1,5 +1,5 @@
 <?php
-session_start();
+    session_start();
 ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

From acc4dcb4eca39ed84271899e62128c7bd892c19a Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Mon, 25 Nov 2019 05:57:54 -0500
Subject: [PATCH 63/70] Indentation fix

---
 var/www/loginCheck.php | 61 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/var/www/loginCheck.php b/var/www/loginCheck.php
index f479258..982d862 100644
--- a/var/www/loginCheck.php
+++ b/var/www/loginCheck.php
@@ -1,39 +1,40 @@
 <?php
-session_start();
+    session_start();
 
-$server = "localhost";
-$database = "friendBook";
-$username = "web";
-$password = "Password456";
+    $server = "localhost";
+    $database = "friendBook";
+    $username = "web";
+    $password = "Password456";
 
-try{
-    $connection = new PDO("mysql:host=$server;dbname=$database", $username, $password);
-    $connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-    echo "Connected successfully";
-    if(count($_POST) > 0){
-        $matchingUsers = $connection->query("SELECT COUNT(*) FROM login WHERE username = '".$_POST["Username"]."' and pword = '".$_POST["Password"]."'");
-        if($matchingUsers > 0){
-            // User has been authenticated; set user as logged in
-            $_SESSION["loggedInUser"] = "".$_POST["Username"]."";
-            $_SESSION["loginError"] = "";
-            // Move onto landing page
-            header("Location: /landingPage.html");
-            die();
+    try{
+        $connection = new PDO("mysql:host=$server;dbname=$database", $username, $password);
+        $connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        echo "Connected successfully";
+        if(count($_POST) > 0){
+            $matchingUsers = $connection->query("SELECT COUNT(*) FROM login WHERE username = '".$_POST["Username"]."' and pword = '".$_POST["Password"]."'");
+            if($matchingUsers > 0){
+                // User has been authenticated; set user as logged in
+                $_SESSION["loggedInUser"] = "".$_POST["Username"]."";
+                $_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{
-            // No matching users found, send user error
-            $_SESSION["loginError"] = "Invalid Username or Password";
-            // Return to login page
+            // Return to login page, as credentials were not captured
+            $_SESSION["loginError"] = "Login credentials not found, please try again";
             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){
-    echo "Error: " . $e->getMessage();
-}
+    catch(PDOException $e){
+        echo "Error: " . $e->getMessage();
+    }
+    $connection = null;
 ?>
\ No newline at end of file

From e975293caba8d28ed649d76c84863c4aaa67c460 Mon Sep 17 00:00:00 2001
From: William Miceli <git@williammiceli.me>
Date: Mon, 25 Nov 2019 06:06:27 -0500
Subject: [PATCH 64/70] Lots and lots of stuff...

---
 var/www/phptest.php | 80 ++++++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 33 deletions(-)

diff --git a/var/www/phptest.php b/var/www/phptest.php
index 4ba50ac..7a3066f 100644
--- a/var/www/phptest.php
+++ b/var/www/phptest.php
@@ -1,13 +1,10 @@
 <?php
-session_start();
+    session_start();
 
-$server = "localhost";
-$database = "friendBook";
-$username = "web";
-$password = "Password456";
-
-// Current user
-$user = "William"; // Testing with until we have login working
+    $server = "localhost";
+    $database = "friendBook";
+    $username = "web";
+    $password = "Password456";
 ?>
 
 <html>
@@ -15,35 +12,52 @@ $user = "William"; // Testing with until we have login working
     </head>
     <body>
         <h1>PHP Test Page</h1>
-        
-        <h2>Connecting to MySQL</h2>
 
+        <h2>MySQL</h2>
+
+        <h3>Creating Connection</h3>
         <?php
-        try{
-            $connection = new PDO("mysql:host=$server;dbname=$database", $username, $password);
-            // set the PDO error mode to exception
-            $connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-            echo "Connected successfully";
-        }
-        catch(PDOException $e){
-            echo "Connection failed: " . $e->getMessage();
-        }
-
-        $sql = "SELECT messageID, date, message
-                FROM messages
-                WHERE recipient=$user";
-        foreach($connection->query($sql) as $row){
-            print $row['messageID'] . "\t";
-            print $row['date'] . "\t";
-            print $row['message'] . "\t";
-        }
-
-        $conn = null;
+            try{
+                $connection = new PDO("mysql:host=$server;dbname=$database", $username, $password);
+                // set the PDO error mode to exception
+                $connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                echo "Connected successfully".PHP_EOL;
+            }
+            catch(PDOException $e){
+                echo "Connection failed: ".$e->getMessage().PHP_EOL;
+            }
         ?>
 
-        <h2>PHP Session Info</h2>
+        <h3>Creating and Executing Query</h3>
         <?php
-        print_r($_SESSION);
+            try{
+                $sql = "SELECT messageID, date, message FROM messages WHERE recipient={$_SESSION["loggedInUser"]}";
+                foreach($connection->query($sql) as $row){
+                    print $row['messageID']."\t";
+                    print $row['date']."\t";
+                    print $row['message']."\t";
+                }
+            }
+            catch(Exception $e){
+                echo "Error: ".$e->getMessage().PHP_EOL;
+            }
+        ?>
+        <h3>$sql</h3>
+        <?php
+            echo "<pre>";
+            print_r($sql);
+            echo "</pre>";
+        ?>
+
+        <h3>$_SESSION</h3>
+        <?php
+            echo "<pre>";
+            print_r($_SESSION);
+            echo "</pre>";
         ?>
     </body>
-</html>
\ No newline at end of file
+</html>
+
+<?php
+    $connection = null;
+?>
\ No newline at end of file

From 36beca341f82f7f89cc5068f2575535d67ceca0c Mon Sep 17 00:00:00 2001
From: Bryan <bryan@nearing.xyz>
Date: Mon, 25 Nov 2019 13:24:32 -0500
Subject: [PATCH 65/70] updating the searching

---
 etc/nginx/conf.d/cs4430.conf |  6 +++---
 var/www/messageSender.php    | 13 +++++++++++++
 var/www/nameSearch.php       | 26 ++++++++++++++++++++++++--
 var/www/search.php           | 29 -----------------------------
 var/www/usernameSearch.php   | 26 +++++++++++++++++++++++++-
 5 files changed, 65 insertions(+), 35 deletions(-)
 create mode 100644 var/www/messageSender.php

diff --git a/etc/nginx/conf.d/cs4430.conf b/etc/nginx/conf.d/cs4430.conf
index 4c0311c..1bea391 100644
--- a/etc/nginx/conf.d/cs4430.conf
+++ b/etc/nginx/conf.d/cs4430.conf
@@ -3,18 +3,18 @@ server {
     listen [::]:80;
 
     root /var/www/;
-    index index.html
+    landingPage landingPage.html
     server_name _;
 
     access_log /var/log/nginx/access.log;
     error_log /var/log/nginx/error.log;
 
     location / {
-         try_files $uri $uri/ /index.html =404;
+         try_files $uri $uri/ /landingPage.html =404;
     }
 
     location ~ \.php$ {
         include snippets/fastcgi-php.conf;
         fastcgi_pass unix:/run/php/php7.2-fpm.sock;
     }
-}
\ No newline at end of file
+}
diff --git a/var/www/messageSender.php b/var/www/messageSender.php
new file mode 100644
index 0000000..d177c09
--- /dev/null
+++ b/var/www/messageSender.php
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<body>
+<style>
+body {
+  background-color: #3B5998;
+}
+</style>
+
+
+
+</body>
+</html>
diff --git a/var/www/nameSearch.php b/var/www/nameSearch.php
index 2a73f98..decdfef 100644
--- a/var/www/nameSearch.php
+++ b/var/www/nameSearch.php
@@ -1,8 +1,30 @@
 <html>
 <body>
 
-First Name is  <?php echo $_POST["fname"]; ?><br>
-Last Name is <?php echo $_POST["lname"]; ?>
+
+<?php
+
+$fname = $_POST["fname"];
+$lname = $_POST["lname"];
+
+$servername = "localhost";
+$username = "web";
+$password = "Password456";
+
+// Create connection
+$conn = new mysqli($servername, $username, $password);
+
+// Check connection
+if ($conn->connect_error) {
+    die("Connection failed: " . $conn->connect_error);
+}
+echo "Connected successfully";
+
+$query = "Select * from contacts where fname = " + $fname + " and lnam = " + $lname;
+
+print $query;
+
+?>
 
 </body>
 </html>
diff --git a/var/www/search.php b/var/www/search.php
index 963b35f..262bfe0 100644
--- a/var/www/search.php
+++ b/var/www/search.php
@@ -9,35 +9,6 @@ body {
 
 <h2><font color="white">Search by</h2>
 
-<?php
-$name = $fname = $lname = "";
-$nameErr = $fnameErr = $lnameErr = "";
-
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-	if (empty($_POST["name"])) {
-    		$nameErr = "Name is required";
-  	} 
-	else {
-    		$name = test_input($_POST["name"]);
-    		if (!preg_match("/^[a-zA-Z ]*$/",$name)) {
-      			$nameErr = "Only letters and white space allowed";
-    		}
-  	}
-
-
-	
-
-}
-
-function test_input($data) {
-  $data = trim($data);
-  $data = stripslashes($data);
-  $data = htmlspecialchars($data);
-  return $data;
-}
-?>
-
 <form method="post" action="usernameSearch.php">  
 Username: <br><input type="text" name="username"><br>
 <input type="submit">  
diff --git a/var/www/usernameSearch.php b/var/www/usernameSearch.php
index 124f6a7..183ad88 100644
--- a/var/www/usernameSearch.php
+++ b/var/www/usernameSearch.php
@@ -1,7 +1,31 @@
 <html>
 <body>
+<style>
+body {
+  background-color: #3B5998;
+}
+</style>
 
-Username is  <?php echo $_POST["username"]; ?>
+<?php
+$username = $_POST["username"];
+
+$servername = "localhost";
+$username = "web";
+$password = "Password456";
+
+// Create connection
+$conn = new mysqli($servername, $username, $password);
+
+// Check connection
+if ($conn->connect_error) {
+    die("Connection failed: " . $conn->connect_error);
+}
+echo "Connected successfully";
+
+$query = "Select * from contacts where username = " + $username;
+
+print $query;
+?>
 
 </body>
 </html>

From 145146a56126b89963f877656be0c227e29b5fa3 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Mon, 25 Nov 2019 13:25:29 -0500
Subject: [PATCH 66/70] Trying to fix login issue

---
 var/www/loginCheck.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/var/www/loginCheck.php b/var/www/loginCheck.php
index 982d862..1d98a38 100644
--- a/var/www/loginCheck.php
+++ b/var/www/loginCheck.php
@@ -10,7 +10,7 @@
         $connection = new PDO("mysql:host=$server;dbname=$database", $username, $password);
         $connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         echo "Connected successfully";
-        if(count($_POST) > 0){
+        if($_POST["Username"] != "" && $_POST["Password"] != ""){
             $matchingUsers = $connection->query("SELECT COUNT(*) FROM login WHERE username = '".$_POST["Username"]."' and pword = '".$_POST["Password"]."'");
             if($matchingUsers > 0){
                 // User has been authenticated; set user as logged in

From e3b7fcc6468616339756acb5ac23edb41543df57 Mon Sep 17 00:00:00 2001
From: Bryan <bryan@nearing.xyz>
Date: Mon, 25 Nov 2019 13:28:38 -0500
Subject: [PATCH 67/70] fix the nginx conf file

---
 etc/nginx/conf.d/cs4430.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/nginx/conf.d/cs4430.conf b/etc/nginx/conf.d/cs4430.conf
index 1bea391..817d0dd 100644
--- a/etc/nginx/conf.d/cs4430.conf
+++ b/etc/nginx/conf.d/cs4430.conf
@@ -3,7 +3,7 @@ server {
     listen [::]:80;
 
     root /var/www/;
-    landingPage landingPage.html
+    landingPage.html
     server_name _;
 
     access_log /var/log/nginx/access.log;

From 49e5b074ab2a99c99b6ce3e70418c91b9c2a0071 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Mon, 25 Nov 2019 13:32:35 -0500
Subject: [PATCH 68/70] Added index directive

---
 etc/nginx/conf.d/cs4430.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/nginx/conf.d/cs4430.conf b/etc/nginx/conf.d/cs4430.conf
index 817d0dd..4ea0071 100644
--- a/etc/nginx/conf.d/cs4430.conf
+++ b/etc/nginx/conf.d/cs4430.conf
@@ -3,7 +3,7 @@ server {
     listen [::]:80;
 
     root /var/www/;
-    landingPage.html
+    index landingPage.html
     server_name _;
 
     access_log /var/log/nginx/access.log;

From fcf59fe3e3befe96f45ac4ee5476331add80658d Mon Sep 17 00:00:00 2001
From: Bryan <bryan@nearing.xyz>
Date: Mon, 25 Nov 2019 13:36:33 -0500
Subject: [PATCH 69/70] update the index page

---
 var/www/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/var/www/index.html b/var/www/index.html
index aef7256..56eaff7 100644
--- a/var/www/index.html
+++ b/var/www/index.html
@@ -16,8 +16,8 @@
     <button type="button" onclick="window.location.href = 'friends.html'">See Friends</button>
     <button type="button" onclick="window.location.href = 'messages.html'">See Messages</button>
     <button type="button" onclick="window.location.href = 'contacts.html'">See Contacts</button>
-    <button type="button" onclick="window.location.href = 'search.html'">Search</button>
-    <button type="button" onclick="window.location.href = 'sendMessage.html'">Message Someone</button>
+    <button type="button" onclick="window.location.href = 'search.php'">Search</button>
+    <button type="button" onclick="window.location.href = 'sendMessage.php'">Message Someone</button>
     <button type="button" onclick="window.location.href = 'findFriend.html'">Find a New Friend</button>
     <button type="button" onclick="window.location.href = 'pendingFriend.html'">Check Pending Friends</button>
 

From a2e66af73cb53f0e1fcfe0509c5048305575a2c2 Mon Sep 17 00:00:00 2001
From: WilliamMiceli <git@williammiceli.me>
Date: Mon, 25 Nov 2019 13:40:24 -0500
Subject: [PATCH 70/70] Removed die(); as it might be messing with things.

---
 var/www/loginCheck.php | 3 ---
 1 file changed, 3 deletions(-)

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){