@@ -189,12 +189,12 @@ discard block |
||
189 | 189 | "passLogin" => 'testing' |
190 | 190 | ] |
191 | 191 | ); |
192 | - $outputEmail = (array) json_decode($outputEmail); |
|
192 | + $outputEmail = (array)json_decode($outputEmail); |
|
193 | 193 | $this->assertEquals($expectedOutput, $outputEmail); |
194 | 194 | $currentId = Session::get('start'); |
195 | 195 | Session::forget('start'); |
196 | 196 | |
197 | - $msg =(object) [ |
|
197 | + $msg = (object)[ |
|
198 | 198 | "name" => $userId, |
199 | 199 | "reply" => [ |
200 | 200 | 0 => "Hello World" |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | $output = $obReply->replyTo($msg); |
207 | 207 | $this->assertEquals("Messages is sent", $output); |
208 | 208 | |
209 | - $msg =(object) [ |
|
209 | + $msg = (object)[ |
|
210 | 210 | "name" => $currentId, |
211 | 211 | "reply" => [ |
212 | 212 | 0 => "Hello World" |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | $output = $obReply->replyTo([]); |
222 | 222 | $this->assertEquals("Failed", $output); |
223 | 223 | |
224 | - $output = $obReply->replyTo((object) [ |
|
224 | + $output = $obReply->replyTo((object)[ |
|
225 | 225 | "name" => -1, |
226 | 226 | "reply" => [ |
227 | 227 | 0 => "Hello World" |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | ]); |
231 | 231 | $this->assertEquals("Invalid Authentication", $output); |
232 | 232 | |
233 | - $output = $obReply->replyTo((object) [ |
|
233 | + $output = $obReply->replyTo((object)[ |
|
234 | 234 | "name" => $userId, |
235 | 235 | "reply" => [ |
236 | 236 | 0 => "Hello" |
@@ -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 | } |
@@ -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 ChatApp\Time; |
6 | 6 | use Dotenv\Dotenv; |
7 | 7 | $dotenv = new Dotenv(dirname(__DIR__)); |
@@ -32,18 +32,18 @@ discard block |
||
32 | 32 | |
33 | 33 | public function loadSideBar($userId) |
34 | 34 | { |
35 | - if(!empty($userId)) |
|
35 | + if (!empty($userId)) |
|
36 | 36 | { |
37 | 37 | $query = "SELECT * FROM total_message WHERE user1='$userId' or user2='$userId' ORDER BY id DESC"; |
38 | - if($result = $this->connect->query($query)) |
|
38 | + if ($result = $this->connect->query($query)) |
|
39 | 39 | { |
40 | 40 | if ($result->num_rows > 0) |
41 | 41 | { |
42 | - while($row = $result->fetch_assoc()) |
|
42 | + while ($row = $result->fetch_assoc()) |
|
43 | 43 | { |
44 | 44 | $identifier = $row['identifier']; |
45 | 45 | $substring = explode(":", $identifier); |
46 | - if($substring[0] != $userId) |
|
46 | + if ($substring[0] != $userId) |
|
47 | 47 | { |
48 | 48 | $this->data($substring[0], $row); |
49 | 49 | } |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | public function data($userId, $row) |
65 | 65 | { |
66 | 66 | $query = "SELECT username, name, login_status, login_id from login where login_id = '$userId'"; |
67 | - if($result = $this->connect->query($query)) |
|
67 | + if ($result = $this->connect->query($query)) |
|
68 | 68 | { |
69 | - if($result->num_rows > 0) |
|
69 | + if ($result->num_rows > 0) |
|
70 | 70 | { |
71 | 71 | $fetch = $result->fetch_assoc(); |
72 | 72 | $row['time'] = $this->obTime->timeConversion($row['time']); |
@@ -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 ChatApp\Time; |
6 | 6 | use ChatApp\User; |
7 | 7 | use Dotenv\Dotenv; |
@@ -35,38 +35,38 @@ discard block |
||
35 | 35 | public function conversationLoad($msg, $para) |
36 | 36 | { |
37 | 37 | $msg = json_decode($msg); |
38 | - if(!empty($msg)) |
|
38 | + if (!empty($msg)) |
|
39 | 39 | { |
40 | 40 | $userId = $msg->userId; |
41 | 41 | $add_load = 0; |
42 | 42 | $details = $msg->details; |
43 | 43 | $load = $msg->load; |
44 | 44 | |
45 | - if($para == True) |
|
45 | + if ($para == True) |
|
46 | 46 | { |
47 | 47 | $details = convert_uudecode(hex2bin($details)); |
48 | 48 | } |
49 | 49 | $fetch = $this->obUser->userDetails($details, $para); |
50 | 50 | |
51 | - if($fetch != NULL) |
|
51 | + if ($fetch != NULL) |
|
52 | 52 | { |
53 | 53 | $login_id = (int)$fetch['login_id']; |
54 | 54 | |
55 | 55 | // Unique Identifier |
56 | - if($login_id > $userId) |
|
56 | + if ($login_id > $userId) |
|
57 | 57 | $identifier = $userId.':'.$login_id; |
58 | 58 | else |
59 | 59 | $identifier = $login_id.':'.$userId; |
60 | 60 | |
61 | 61 | $query = "SELECT total_messages from total_message where identifier = '$identifier'"; |
62 | - if($result = $this->connect->query($query)) |
|
62 | + if ($result = $this->connect->query($query)) |
|
63 | 63 | { |
64 | - if($result->num_rows > 0) |
|
64 | + if ($result->num_rows > 0) |
|
65 | 65 | { |
66 | 66 | $total = $result->fetch_assoc(); |
67 | 67 | $total = $total['total_messages']; |
68 | - if($total - $load > 0) |
|
69 | - if($total - $load > 10) |
|
68 | + if ($total - $load > 0) |
|
69 | + if ($total - $load > 10) |
|
70 | 70 | $add_load = $load + 10; |
71 | 71 | else |
72 | 72 | $add_load = $total; |
@@ -74,14 +74,14 @@ discard block |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | $query = "SELECT message, time, sent_by FROM messages WHERE identifier_message_number = '$identifier' ORDER BY id DESC limit ".$load; |
77 | - if($result = $this->connect->query($query)) |
|
77 | + if ($result = $this->connect->query($query)) |
|
78 | 78 | { |
79 | - if($result->num_rows > 0) |
|
79 | + if ($result->num_rows > 0) |
|
80 | 80 | { |
81 | - while($row = $result->fetch_assoc()) |
|
81 | + while ($row = $result->fetch_assoc()) |
|
82 | 82 | { |
83 | 83 | $row['time'] = $this->obTime->timeConversion($row['time']); |
84 | - $row = array_merge($row,['start' => $userId]); |
|
84 | + $row = array_merge($row, ['start' => $userId]); |
|
85 | 85 | $this->array = array_merge($this->array, [$row]); |
86 | 86 | } |
87 | 87 |