@@ -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__)); |
@@ -34,20 +34,20 @@ discard block |
||
| 34 | 34 | $userId = $suggestion->userId; |
| 35 | 35 | $suggestion = trim($suggestion->value); |
| 36 | 36 | $flag = 0; |
| 37 | - if(!empty($userId) && !empty($suggestion)) |
|
| 37 | + if (!empty($userId) && !empty($suggestion)) |
|
| 38 | 38 | { |
| 39 | 39 | $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC"; |
| 40 | - if($result = $this->connect->query($query)) |
|
| 40 | + if ($result = $this->connect->query($query)) |
|
| 41 | 41 | { |
| 42 | - if($result->num_rows > 0) |
|
| 42 | + if ($result->num_rows > 0) |
|
| 43 | 43 | { |
| 44 | - while($row = $result->fetch_assoc()) |
|
| 44 | + while ($row = $result->fetch_assoc()) |
|
| 45 | 45 | { |
| 46 | 46 | $check_id = $row["login_id"]; |
| 47 | 47 | $query = "SELECT * from total_message where (user1 = '$check_id' and user2 = '$userId') or (user2 = '$check_id' and user1 = '$userId')"; |
| 48 | - if($result1 = $this->connect->query($query)) |
|
| 48 | + if ($result1 = $this->connect->query($query)) |
|
| 49 | 49 | { |
| 50 | - if($result1->num_rows > 0) |
|
| 50 | + if ($result1->num_rows > 0) |
|
| 51 | 51 | { |
| 52 | 52 | $fetch = $result1->fetch_assoc(); |
| 53 | 53 | $fetch['time'] = $this->obTime->timeConversion($fetch['time']); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | - if($flag != 0) |
|
| 62 | + if ($flag != 0) |
|
| 63 | 63 | { |
| 64 | 64 | $this->array = array_merge([], ["Search" => $this->array]); |
| 65 | 65 | return json_encode($this->array); |
@@ -36,13 +36,13 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | public function onMessage(ConnectionInterface $from, $msg) |
| 38 | 38 | { |
| 39 | - $msg = (object) json_decode($msg); |
|
| 40 | - if($msg->type == 'OpenChat initiated..!') |
|
| 39 | + $msg = (object)json_decode($msg); |
|
| 40 | + if ($msg->type == 'OpenChat initiated..!') |
|
| 41 | 41 | { |
| 42 | - $initial = (object) array(); |
|
| 42 | + $initial = (object)array(); |
|
| 43 | 43 | $initial->initial = json_decode($this->onSidebar($from->userId)); |
| 44 | 44 | |
| 45 | - if($initial->initial != null) |
|
| 45 | + if ($initial->initial != null) |
|
| 46 | 46 | { |
| 47 | 47 | $initial->conversation = json_decode( |
| 48 | 48 | $this->onConversation( |
@@ -58,14 +58,14 @@ discard block |
||
| 58 | 58 | } |
| 59 | 59 | elseif ($msg->type == 'Load Sidebar') |
| 60 | 60 | { |
| 61 | - $sidebar = (object) array(); |
|
| 61 | + $sidebar = (object)array(); |
|
| 62 | 62 | $sidebar->sidebar = json_decode($this->onSidebar($from->userId)); |
| 63 | 63 | $from->send(json_encode($sidebar)); |
| 64 | 64 | } |
| 65 | 65 | elseif ($msg->type == 'Initiated') |
| 66 | 66 | { |
| 67 | 67 | $msg->userId = $from->userId; |
| 68 | - $result = (object) array(); |
|
| 68 | + $result = (object)array(); |
|
| 69 | 69 | $result->conversation = json_decode($this->onConversation(json_encode($msg), False)); |
| 70 | 70 | $from->send(json_encode($result)); |
| 71 | 71 | } |
@@ -87,8 +87,8 @@ discard block |
||
| 87 | 87 | $getReturn = $this->onReply($msg); |
| 88 | 88 | echo $getReturn; |
| 89 | 89 | |
| 90 | - $receiveResult = (object) array(); |
|
| 91 | - $sentResult = (object) array(); |
|
| 90 | + $receiveResult = (object)array(); |
|
| 91 | + $sentResult = (object)array(); |
|
| 92 | 92 | foreach ($this->clients as $client) |
| 93 | 93 | { |
| 94 | 94 | if ($client->userId == $msg->name) |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | $client->send(json_encode($receiveResult)); |
| 109 | 109 | } |
| 110 | - elseif($client == $from) |
|
| 110 | + elseif ($client == $from) |
|
| 111 | 111 | { |
| 112 | 112 | $sentResult->sidebar = json_decode($this->onSidebar($client->userId)); |
| 113 | 113 | |
@@ -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 | } |