From bf13e08e76aad4e49945f130b5858b8a04a43fee Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 25 Nov 2019 13:48:50 -0500 Subject: [PATCH 01/15] Using index.html now --- etc/nginx/conf.d/cs4430.conf | 4 ++-- var/www/landingPage.html | 21 --------------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 var/www/landingPage.html diff --git a/etc/nginx/conf.d/cs4430.conf b/etc/nginx/conf.d/cs4430.conf index 4ea0071..ce02685 100644 --- a/etc/nginx/conf.d/cs4430.conf +++ b/etc/nginx/conf.d/cs4430.conf @@ -3,14 +3,14 @@ server { listen [::]:80; root /var/www/; - index landingPage.html + index index.html server_name _; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; location / { - try_files $uri $uri/ /landingPage.html =404; + try_files $uri $uri/ /index.html =404; } location ~ \.php$ { diff --git a/var/www/landingPage.html b/var/www/landingPage.html deleted file mode 100644 index fdf8fba..0000000 --- a/var/www/landingPage.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - -

Friendbook

- - - - - - - - - - - - From 73143f14f2ad509078db7ece5fd8bfa60a7d7eb9 Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 25 Nov 2019 13:54:51 -0500 Subject: [PATCH 02/15] updating index to add backslashes to make the buttons work --- var/www/index.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/var/www/index.html b/var/www/index.html index 56eaff7..e5dc74e 100644 --- a/var/www/index.html +++ b/var/www/index.html @@ -13,13 +13,13 @@

Friendbook

- - - - - - - + + + + + + + From eba4ae6401cf5c8569fc4cb4df400fb90f358d89 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 25 Nov 2019 14:11:39 -0500 Subject: [PATCH 03/15] Renamed; added $_POST to be shown --- var/www/{phptest.php => debug.php} | 7 +++++++ 1 file changed, 7 insertions(+) rename var/www/{phptest.php => debug.php} (92%) diff --git a/var/www/phptest.php b/var/www/debug.php similarity index 92% rename from var/www/phptest.php rename to var/www/debug.php index 7a3066f..724c0e0 100644 --- a/var/www/phptest.php +++ b/var/www/debug.php @@ -49,6 +49,13 @@ echo ""; ?> +

$_POST

+ "; + print_r($_POST); + echo ""; + ?> +

$_SESSION

"; From 20fc6d6d3510cb2e25ab149ae0bea68e5c8209a3 Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 25 Nov 2019 14:19:03 -0500 Subject: [PATCH 04/15] testing the database with usernamesearch --- var/www/sendMessage.php | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/var/www/sendMessage.php b/var/www/sendMessage.php index 426962b..a5cfa98 100644 --- a/var/www/sendMessage.php +++ b/var/www/sendMessage.php @@ -9,33 +9,7 @@ body {

Send a message

- - -
"> + Who are you sending it to?:


Message:
From 3dc67d566110da1716471d9c17fee266cb645b9c Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 25 Nov 2019 14:32:25 -0500 Subject: [PATCH 05/15] testing the usernameSearch --- var/www/usernameSearch.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/var/www/usernameSearch.php b/var/www/usernameSearch.php index 183ad88..c9c0011 100644 --- a/var/www/usernameSearch.php +++ b/var/www/usernameSearch.php @@ -22,6 +22,8 @@ if ($conn->connect_error) { } echo "Connected successfully"; +echo "
"; + $query = "Select * from contacts where username = " + $username; print $query; From 2e85edcfb4c692ce72153382ab79b2dc5db51a33 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 25 Nov 2019 14:42:38 -0500 Subject: [PATCH 06/15] Attempting to save $_POST data to be used on loginCheck.php page --- var/www/login.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/var/www/login.php b/var/www/login.php index 8d23141..dd45956 100644 --- a/var/www/login.php +++ b/var/www/login.php @@ -1,5 +1,9 @@ From d11570a3f6fe2aa5f46ee8779949dd5a9d676e4a Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Mon, 25 Nov 2019 14:48:21 -0500 Subject: [PATCH 07/15] Adjusting redirect method --- var/www/login.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/var/www/login.php b/var/www/login.php index dd45956..bf7bea5 100644 --- a/var/www/login.php +++ b/var/www/login.php @@ -3,6 +3,7 @@ if (isset($_POST['Submit'])){ $_SESSION['loginData'] = $_POST; + header("Location: /loginCheck.php"); } ?> @@ -21,7 +22,7 @@

Please Login

- + User:
Password: From aeaf4c16a04cdf8f5824fd467896be1627354e94 Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 25 Nov 2019 21:35:07 -0500 Subject: [PATCH 08/15] update the string concatenation --- var/www/usernameSearch.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/var/www/usernameSearch.php b/var/www/usernameSearch.php index c9c0011..dec770b 100644 --- a/var/www/usernameSearch.php +++ b/var/www/usernameSearch.php @@ -21,10 +21,9 @@ if ($conn->connect_error) { die("Connection failed: " . $conn->connect_error); } echo "Connected successfully"; - echo "
"; - -$query = "Select * from contacts where username = " + $username; +echo "Awesome dude"; +$query = "Select * from contacts where username = {$username}; print $query; ?> From 7785a39f2bc3d3ed621523cc076aaa70f3d7baa6 Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 25 Nov 2019 21:51:19 -0500 Subject: [PATCH 09/15] add in a " to correct the php file --- var/www/usernameSearch.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/var/www/usernameSearch.php b/var/www/usernameSearch.php index dec770b..7c639f8 100644 --- a/var/www/usernameSearch.php +++ b/var/www/usernameSearch.php @@ -7,6 +7,7 @@ body { connect_error) { die("Connection failed: " . $conn->connect_error); } echo "Connected successfully"; + echo "
"; echo "Awesome dude"; -$query = "Select * from contacts where username = {$username}; +$query = "Select * from contacts where username = {$username}"; print $query; ?> From 6dbe81040cdd74b4003c18e7d388c09ac1cfe2c0 Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 25 Nov 2019 21:57:49 -0500 Subject: [PATCH 10/15] final correction to this, I promise --- var/www/usernameSearch.php | 1 - 1 file changed, 1 deletion(-) diff --git a/var/www/usernameSearch.php b/var/www/usernameSearch.php index 7c639f8..3811cf2 100644 --- a/var/www/usernameSearch.php +++ b/var/www/usernameSearch.php @@ -24,7 +24,6 @@ if ($conn->connect_error) { echo "Connected successfully"; echo "
"; -echo "Awesome dude"; $query = "Select * from contacts where username = {$username}"; print $query; From b3e367c240ef720b4ff1a5ec5c6b12906c9fdcc0 Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 25 Nov 2019 22:15:26 -0500 Subject: [PATCH 11/15] update index with breaks in between the buttons --- var/www/index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/var/www/index.html b/var/www/index.html index e5dc74e..e65d633 100644 --- a/var/www/index.html +++ b/var/www/index.html @@ -14,11 +14,17 @@

Friendbook

+

+

+

+

+

+

From 6343d24c6014d20729e84ee7fe26e106b697e093 Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 25 Nov 2019 22:22:47 -0500 Subject: [PATCH 12/15] get the query ready for nameSearch.php --- var/www/nameSearch.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/var/www/nameSearch.php b/var/www/nameSearch.php index decdfef..72a6eff 100644 --- a/var/www/nameSearch.php +++ b/var/www/nameSearch.php @@ -1,6 +1,10 @@ - + connect_error) { } echo "Connected successfully"; -$query = "Select * from contacts where fname = " + $fname + " and lnam = " + $lname; +$query = "Select * from contacts where fname = {$fname} and lnam = {$lname}"; print $query; From 74eedc9961c00d3156790f972274262b3988c492 Mon Sep 17 00:00:00 2001 From: Bryan Date: Tue, 26 Nov 2019 00:19:34 -0500 Subject: [PATCH 13/15] initial database output, probably doesn't work --- var/www/messageSender.php | 24 ++++++++++++++++++++++++ var/www/nameSearch.php | 16 ++++++++++------ var/www/usernameSearch.php | 11 ++++++++++- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/var/www/messageSender.php b/var/www/messageSender.php index d177c09..fd7d853 100644 --- a/var/www/messageSender.php +++ b/var/www/messageSender.php @@ -7,7 +7,31 @@ body { } +connect_error) { + die("Connection failed: " . $conn->connect_error); +} + +$username = $_POST["name"]; +$message = $_POST["message"]; + +$query0 = "Select max(messageID) from messages"; +mysqli_query($db, $query0) or die('Error querying database.'); +$maxID = mysqli_query($db, $query0); +$maxID = $maxID + 1; +$query1 = "Insert into messages (messageID, sender, recipient, message, date, haveread) values({$maxID}, , {$username}, {$message}, NOW(), 'N')"; +mysqli_query($db, $query1) or die('Error querying database.'); + +mysqli_close($db); +?> diff --git a/var/www/nameSearch.php b/var/www/nameSearch.php index 72a6eff..0b2b025 100644 --- a/var/www/nameSearch.php +++ b/var/www/nameSearch.php @@ -1,10 +1,6 @@ - + connect_error) { echo "Connected successfully"; $query = "Select * from contacts where fname = {$fname} and lnam = {$lname}"; +mysqli_query($db, $query) or die('Error querying database.'); -print $query; +$result = mysqli_query($db, $query); +$row = mysqli_fetch_array($result); +while ($row = mysqli_fetch_array($result)) { + echo $row['fname'] . ' ' . $row['lnam'] . ': ' . $row['username'] .'
'; +} + + +mysqli_close($db); ?> diff --git a/var/www/usernameSearch.php b/var/www/usernameSearch.php index 3811cf2..f9abb3b 100644 --- a/var/www/usernameSearch.php +++ b/var/www/usernameSearch.php @@ -21,12 +21,21 @@ $conn = new mysqli($servername, $username, $password); if ($conn->connect_error) { die("Connection failed: " . $conn->connect_error); } -echo "Connected successfully"; echo "
"; $query = "Select * from contacts where username = {$username}"; +mysqli_query($db, $query) or die('Error querying database.'); + +$result = mysqli_query($db, $query0); +$row = mysqli_fetch_array($result); + +while ($row = mysqli_fetch_array($result)) { + echo $row['username'] . ': ' . $row['fname'] . ' ' . $row['lnam'] .'
'; +} print $query; + +mysqli_close($db); ?> From 0bf67e78d184c7f8d226120b43f7f8e65a2e35d7 Mon Sep 17 00:00:00 2001 From: Bryan Date: Tue, 26 Nov 2019 00:29:29 -0500 Subject: [PATCH 14/15] adding more descriptive error message and taking out one of the useless buttons on index page --- var/www/index.html | 2 -- var/www/messageSender.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/var/www/index.html b/var/www/index.html index e65d633..7de4bc8 100644 --- a/var/www/index.html +++ b/var/www/index.html @@ -17,8 +17,6 @@



- -



diff --git a/var/www/messageSender.php b/var/www/messageSender.php index fd7d853..9ab9bdf 100644 --- a/var/www/messageSender.php +++ b/var/www/messageSender.php @@ -28,7 +28,7 @@ mysqli_query($db, $query0) or die('Error querying database.'); $maxID = mysqli_query($db, $query0); $maxID = $maxID + 1; $query1 = "Insert into messages (messageID, sender, recipient, message, date, haveread) values({$maxID}, , {$username}, {$message}, NOW(), 'N')"; -mysqli_query($db, $query1) or die('Error querying database.'); +mysqli_query($db, $query1) or die('Error inserting into database.'); mysqli_close($db); ?> From 751632226ec9b8725d02dbb331c3af80eb899404 Mon Sep 17 00:00:00 2001 From: Bryan Date: Tue, 26 Nov 2019 00:38:49 -0500 Subject: [PATCH 15/15] correcting the connection when querying the database --- var/www/messageSender.php | 8 ++++---- var/www/nameSearch.php | 6 +++--- var/www/usernameSearch.php | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/var/www/messageSender.php b/var/www/messageSender.php index 9ab9bdf..ad71a0e 100644 --- a/var/www/messageSender.php +++ b/var/www/messageSender.php @@ -24,13 +24,13 @@ $username = $_POST["name"]; $message = $_POST["message"]; $query0 = "Select max(messageID) from messages"; -mysqli_query($db, $query0) or die('Error querying database.'); -$maxID = mysqli_query($db, $query0); +mysqli_query($conn, $query0) or die('Error querying database.'); +$maxID = mysqli_query($conn, $query0); $maxID = $maxID + 1; $query1 = "Insert into messages (messageID, sender, recipient, message, date, haveread) values({$maxID}, , {$username}, {$message}, NOW(), 'N')"; -mysqli_query($db, $query1) or die('Error inserting into database.'); +mysqli_query($conn, $query1) or die('Error inserting into database.'); -mysqli_close($db); +mysqli_close($conn); ?> diff --git a/var/www/nameSearch.php b/var/www/nameSearch.php index 0b2b025..e1660ad 100644 --- a/var/www/nameSearch.php +++ b/var/www/nameSearch.php @@ -21,9 +21,9 @@ if ($conn->connect_error) { echo "Connected successfully"; $query = "Select * from contacts where fname = {$fname} and lnam = {$lname}"; -mysqli_query($db, $query) or die('Error querying database.'); +mysqli_query($conn, $query) or die('Error querying database.'); -$result = mysqli_query($db, $query); +$result = mysqli_query($conn, $query); $row = mysqli_fetch_array($result); while ($row = mysqli_fetch_array($result)) { @@ -31,7 +31,7 @@ while ($row = mysqli_fetch_array($result)) { } -mysqli_close($db); +mysqli_close($conn); ?> diff --git a/var/www/usernameSearch.php b/var/www/usernameSearch.php index f9abb3b..82c39d0 100644 --- a/var/www/usernameSearch.php +++ b/var/www/usernameSearch.php @@ -24,9 +24,9 @@ if ($conn->connect_error) { echo "
"; $query = "Select * from contacts where username = {$username}"; -mysqli_query($db, $query) or die('Error querying database.'); +mysqli_query($conn, $query) or die('Error querying database.'); -$result = mysqli_query($db, $query0); +$result = mysqli_query($conn, $query0); $row = mysqli_fetch_array($result); while ($row = mysqli_fetch_array($result)) { @@ -35,7 +35,7 @@ while ($row = mysqli_fetch_array($result)) { print $query; -mysqli_close($db); +mysqli_close($conn); ?>