@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | namespace ChatApp; |
4 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); |
|
4 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); |
|
5 | 5 | use Dotenv\Dotenv; |
6 | 6 | $dotenv = new Dotenv(dirname(__DIR__)); |
7 | 7 | $dotenv->load(); |
@@ -26,43 +26,43 @@ discard block |
||
26 | 26 | |
27 | 27 | public function replyTo($msg) |
28 | 28 | { |
29 | - if(!empty($msg)) //checks for the value send |
|
29 | + if (!empty($msg)) //checks for the value send |
|
30 | 30 | { |
31 | 31 | $userId = $msg->userId; |
32 | 32 | $receiverID = $msg->name; //stores id of the person whom message is to be sent |
33 | 33 | $identifier = ""; |
34 | 34 | |
35 | - if($receiverID > $userId) // geneate specific unique code to store messages |
|
35 | + if ($receiverID > $userId) // geneate specific unique code to store messages |
|
36 | 36 | { |
37 | 37 | $user1 = $userId; |
38 | 38 | $user2 = $receiverID; |
39 | - $identifier = $userId . ":" . $receiverID; |
|
39 | + $identifier = $userId.":".$receiverID; |
|
40 | 40 | } |
41 | 41 | else |
42 | 42 | { |
43 | 43 | $user1 = $receiverID; |
44 | 44 | $user2 = $userId; |
45 | - $identifier = $receiverID . ":" . $userId; |
|
45 | + $identifier = $receiverID.":".$userId; |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user. |
49 | 49 | |
50 | - $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
50 | + $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
51 | 51 | $time_id = date("YmdHis", time() + 16200); //to sort the array on the basis of time |
52 | 52 | |
53 | 53 | //the sender id must not be equal to current session id |
54 | - if($reply != "" && $receiverID != $userId) |
|
54 | + if ($reply != "" && $receiverID != $userId) |
|
55 | 55 | { |
56 | 56 | // check whether the receiver is authorized or registered |
57 | 57 | $query = "SELECT * from login where login_id = '$receiverID'"; |
58 | 58 | |
59 | 59 | $result = $this->connect->query($query); |
60 | - if($result->num_rows > 0) // if true |
|
60 | + if ($result->num_rows > 0) // if true |
|
61 | 61 | { |
62 | 62 | //check whether he is sending message for thr first time or he has sent messages before |
63 | 63 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
64 | 64 | $result = $this->connect->query($query); |
65 | - if($result->num_rows > 0) // if he has sent messages before |
|
65 | + if ($result->num_rows > 0) // if he has sent messages before |
|
66 | 66 | { |
67 | 67 | // Update Total_Message Table |
68 | 68 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | return $this->updateMessages($query, $identifier, $reply, $userId, $time); |
77 | 77 | } |
78 | 78 | } |
79 | - return "Invalid Authentication"; // if he is unauthorized echo message is failed |
|
79 | + return "Invalid Authentication"; // if he is unauthorized echo message is failed |
|
80 | 80 | } |
81 | 81 | } |
82 | 82 | return "Failed"; |
@@ -84,13 +84,13 @@ discard block |
||
84 | 84 | |
85 | 85 | public function updateMessages($query, $identifier, $reply, $userId, $time) |
86 | 86 | { |
87 | - if($result = $this->connect->query($query)) |
|
87 | + if ($result = $this->connect->query($query)) |
|
88 | 88 | { |
89 | 89 | //insert message in db |
90 | 90 | $query = "INSERT into messages values('$identifier', '$reply', '$userId', '$time', null)"; |
91 | - if($this->connect->query($query)) |
|
91 | + if ($this->connect->query($query)) |
|
92 | 92 | { |
93 | - return "Messages is sent"; // if query is executed return true |
|
93 | + return "Messages is sent"; // if query is executed return true |
|
94 | 94 | } |
95 | 95 | return "Message is failed"; |
96 | 96 | } |
@@ -26,19 +26,22 @@ discard block |
||
26 | 26 | |
27 | 27 | public function replyTo($msg) |
28 | 28 | { |
29 | - if(!empty($msg)) //checks for the value send |
|
29 | + if(!empty($msg)) { |
|
30 | + //checks for the value send |
|
30 | 31 | { |
31 | 32 | $userId = $msg->userId; |
33 | + } |
|
32 | 34 | $receiverID = $msg->name; //stores id of the person whom message is to be sent |
33 | 35 | $identifier = ""; |
34 | 36 | |
35 | - if($receiverID > $userId) // geneate specific unique code to store messages |
|
37 | + if($receiverID > $userId) { |
|
38 | + // geneate specific unique code to store messages |
|
36 | 39 | { |
37 | 40 | $user1 = $userId; |
41 | + } |
|
38 | 42 | $user2 = $receiverID; |
39 | 43 | $identifier = $userId . ":" . $receiverID; |
40 | - } |
|
41 | - else |
|
44 | + } else |
|
42 | 45 | { |
43 | 46 | $user1 = $receiverID; |
44 | 47 | $user2 = $userId; |
@@ -57,19 +60,22 @@ discard block |
||
57 | 60 | $query = "SELECT * from login where login_id = '$receiverID'"; |
58 | 61 | |
59 | 62 | $result = $this->connect->query($query); |
60 | - if($result->num_rows > 0) // if true |
|
63 | + if($result->num_rows > 0) { |
|
64 | + // if true |
|
61 | 65 | { |
62 | 66 | //check whether he is sending message for thr first time or he has sent messages before |
63 | 67 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
68 | + } |
|
64 | 69 | $result = $this->connect->query($query); |
65 | - if($result->num_rows > 0) // if he has sent messages before |
|
70 | + if($result->num_rows > 0) { |
|
71 | + // if he has sent messages before |
|
66 | 72 | { |
67 | 73 | // Update Total_Message Table |
68 | 74 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
75 | + } |
|
69 | 76 | return $this->updateMessages($query, $identifier, $reply, $userId, $time); |
70 | 77 | |
71 | - } |
|
72 | - else // if he sends message for the first time |
|
78 | + } else // if he sends message for the first time |
|
73 | 79 | { |
74 | 80 | // insert Details in Total_Message Table |
75 | 81 | $query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')"; |