diff --git a/var/www/acceptFriend.php b/var/www/acceptFriend.php index f03d08d..2bc93b7 100644 --- a/var/www/acceptFriend.php +++ b/var/www/acceptFriend.php @@ -1,27 +1,29 @@ - + - + $sql = "INSERT INTO FriendList VALUES user1, argv[0], true"; + $result = mysqli_query($conn, $sql); + $sql = "UPDATE FriendList SET confirm = true WHERE username = argv[0] and friend = user1"; + $result = mysqli_query($conn, $sql); + ?> - + - + diff --git a/var/www/findFriend.php b/var/www/findFriend.php index 37672b3..ed45f46 100644 --- a/var/www/findFriend.php +++ b/var/www/findFriend.php @@ -54,11 +54,13 @@ $db_connection->query($sql_statement); $sql_statement = "INSERT INTO friendList VALUES ('".$_SESSION["loggedInUser"]."', '".$_POST['friend']."', true)"; $db_connection->query($sql_statement); + echo "Friend request confirmed! You are both friends with each other now."; } else { $sql_statement = "INSERT INTO friendList VALUES ('".$_SESSION["loggedInUser"]."', '".$_POST['friend']."', false)"; $db_connection->query($sql_statement); + echo "Friend request sent to $_POST[\'friend\']"; } } } diff --git a/var/www/info.php b/var/www/info.php deleted file mode 100644 index 968c8df..0000000 --- a/var/www/info.php +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/var/www/messageSender.php b/var/www/messageSender.php index ac84a06..4bb44ee 100644 --- a/var/www/messageSender.php +++ b/var/www/messageSender.php @@ -13,25 +13,19 @@ - - -"; -try{ -$query = "INSERT INTO messages (sender, recipient, message, date, haveread) VALUES ('".$_SESSION["loggedInUser"]."', '".$_POST["name"]."', '".$_POST["message"]."', NOW(), 'N')"; -$db_connection->query($query); - -print("Message Has been sent"); -} -catch(Exception $e){ - echo "Exception: ".$e->getMessage().PHP_EOL; -} - -?> - - + "; + try{ + $query = "INSERT INTO messages (sender, recipient, message, date, haveread) VALUES ('".$_SESSION["loggedInUser"]."', '".$_POST["name"]."', '".$_POST["message"]."', NOW(), 'N')"; + $db_connection->query($query); + print("Message Has been sent"); + } + catch(Exception $e){ + echo "Exception: ".$e->getMessage().PHP_EOL; + } + ?> + + diff --git a/var/www/nameSearch.php b/var/www/nameSearch.php index 56e2dff..003a761 100644 --- a/var/www/nameSearch.php +++ b/var/www/nameSearch.php @@ -4,21 +4,23 @@ ?> - - - - - - + + + + + + -'; -$query = "Select * from contacts where fname = '".$_POST["fname"]."' and lname = '".$_POST["lname"]."'"; -foreach($db_connection->query($query) as $row){ - print "First Name:\t".$row['fname']."\nLast Name:\t".$row['lname']."\nUsername:\t".$row['username']."\n"; -} -echo ''; -?> - - + '; + $query = "Select * from contacts where fname = '".$_POST["fname"]."' and lname = '".$_POST["lname"]."'"; + foreach($db_connection->query($query) as $row){ + print "First Name:\t".$row['fname']."\nLast Name:\t".$row['lname']."\nUsername:\t".$row['username']."\n"; + } + echo ''; + ?> + + diff --git a/var/www/search.php b/var/www/search.php index ed01015..ff4f31e 100644 --- a/var/www/search.php +++ b/var/www/search.php @@ -31,4 +31,6 @@ - + diff --git a/var/www/sendMessage.php b/var/www/sendMessage.php index ef8de0a..98f6a97 100644 --- a/var/www/sendMessage.php +++ b/var/www/sendMessage.php @@ -4,24 +4,23 @@ ?> - - - - - - -

Send a message

+ + + + + + +

Send a message

-
- Who are you sending it to?:
-

- Message:
-

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

+ Message:
+

+ +
+ - + diff --git a/var/www/topNavBar.html b/var/www/topNavBar.html index f1dc211..fbbca5a 100644 --- a/var/www/topNavBar.html +++ b/var/www/topNavBar.html @@ -4,7 +4,7 @@ Sent Messages Search Message Someone - Find a New Friend + Add a Friend Check Pending Friends Logout diff --git a/var/www/usernameSearch.php b/var/www/usernameSearch.php index 229774b..daba175 100644 --- a/var/www/usernameSearch.php +++ b/var/www/usernameSearch.php @@ -9,20 +9,22 @@ - - - 
';
-        echo "Username\tFirst Name\tLast Name\n\n";
-        $query = "SELECT * FROM contacts WHERE username REGEXP '.*".$_POST["username"].".*'";
-
-        foreach($db_connection->query($query) as $row){
-            print $row['username']."\t\t";
-            print $row['fname']."\t\t";
-            print $row['lname']."\n";
-        }
-        echo '
'; - ?> + + + 
';
+            echo "Username\tFirst Name\tLast Name\n\n";
+            $query = "SELECT * FROM contacts WHERE username REGEXP '.*".$_POST["username"].".*'";
 
+            foreach($db_connection->query($query) as $row){
+                print $row['username']."\t\t";
+                print $row['fname']."\t\t";
+                print $row['lname']."\n";
+            }
+            echo '
'; + ?> +