@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | */ |
| 181 | 181 | public function testReply($userId) |
| 182 | 182 | { |
| 183 | - $msg =(object) [ |
|
| 183 | + $msg = (object)[ |
|
| 184 | 184 | "name" => $userId, |
| 185 | 185 | "reply" => [ |
| 186 | 186 | 0 => "Hello World" |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | $output = $obReply->replyTo([]); |
| 208 | 208 | $this->assertEquals("Failed", $output); |
| 209 | 209 | |
| 210 | - $output = $obReply->replyTo((object) [ |
|
| 210 | + $output = $obReply->replyTo((object)[ |
|
| 211 | 211 | "name" => -1, |
| 212 | 212 | "reply" => [ |
| 213 | 213 | 0 => "Hello World" |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | ]); |
| 217 | 217 | $this->assertEquals("Invalid Authentication", $output); |
| 218 | 218 | |
| 219 | - $output = $obReply->replyTo((object) [ |
|
| 219 | + $output = $obReply->replyTo((object)[ |
|
| 220 | 220 | "name" => $userId, |
| 221 | 221 | "reply" => [ |
| 222 | 222 | 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 ChatApp\Session; |
| 6 | 6 | use Dotenv\Dotenv; |
| 7 | 7 | $dotenv = new Dotenv(dirname(__DIR__)); |
@@ -33,14 +33,14 @@ discard block |
||
| 33 | 33 | $userId = $msg->userId; |
| 34 | 34 | $suggestion = $msg->value; |
| 35 | 35 | $suggestion = trim($suggestion); |
| 36 | - if(!empty($userId) && !empty($suggestion)) |
|
| 36 | + if (!empty($userId) && !empty($suggestion)) |
|
| 37 | 37 | { |
| 38 | 38 | $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC"; |
| 39 | - if($result = $this->connect->query($query)) |
|
| 39 | + if ($result = $this->connect->query($query)) |
|
| 40 | 40 | { |
| 41 | - if($result->num_rows > 0) |
|
| 41 | + if ($result->num_rows > 0) |
|
| 42 | 42 | { |
| 43 | - while($row = $result->fetch_assoc()) |
|
| 43 | + while ($row = $result->fetch_assoc()) |
|
| 44 | 44 | { |
| 45 | 45 | $this->array = array_merge($this->array, [$row]); |
| 46 | 46 | } |
@@ -36,12 +36,12 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | public function onMessage(ConnectionInterface $from, $msg) { |
| 38 | 38 | $sessionId = $from->WebSocket->request->getCookies()['PHPSESSID']; |
| 39 | - if($msg == 'OpenChat initiated..!') |
|
| 39 | + if ($msg == 'OpenChat initiated..!') |
|
| 40 | 40 | { |
| 41 | - $initial = (object) array(); |
|
| 41 | + $initial = (object)array(); |
|
| 42 | 42 | $initial->initial = json_decode($this->onSidebar($from->userId)); |
| 43 | 43 | |
| 44 | - if($initial->initial != null) { |
|
| 44 | + if ($initial->initial != null) { |
|
| 45 | 45 | $initial->conversation = json_decode( |
| 46 | 46 | $this->onConversation( |
| 47 | 47 | json_encode([ |
@@ -55,13 +55,13 @@ discard block |
||
| 55 | 55 | } |
| 56 | 56 | elseif ($msg == 'Load Sidebar') |
| 57 | 57 | { |
| 58 | - $sidebar = (object) array(); |
|
| 58 | + $sidebar = (object)array(); |
|
| 59 | 59 | $sidebar->sidebar = json_decode($this->onSidebar($from->userId)); |
| 60 | 60 | $from->send(json_encode($sidebar)); |
| 61 | 61 | } |
| 62 | 62 | elseif (@json_decode($msg)->newConversation == 'Initiated') |
| 63 | 63 | { |
| 64 | - $result = (object) array(); |
|
| 64 | + $result = (object)array(); |
|
| 65 | 65 | $result->conversation = json_decode($this->onConversation($msg, False, $sessionId)); |
| 66 | 66 | $from->send(json_encode($result)); |
| 67 | 67 | } |
@@ -79,13 +79,13 @@ discard block |
||
| 79 | 79 | } |
| 80 | 80 | else |
| 81 | 81 | { |
| 82 | - $msg = (object) json_decode($msg); |
|
| 82 | + $msg = (object)json_decode($msg); |
|
| 83 | 83 | $msg->userId = $from->userId; |
| 84 | 84 | $getReturn = $this->onReply($msg); |
| 85 | 85 | echo $getReturn; |
| 86 | 86 | |
| 87 | - $receiveResult = (object) array(); |
|
| 88 | - $sentResult = (object) array(); |
|
| 87 | + $receiveResult = (object)array(); |
|
| 88 | + $sentResult = (object)array(); |
|
| 89 | 89 | foreach ($this->clients as $client) |
| 90 | 90 | { |
| 91 | 91 | if ($client->userId == $msg->name) |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | $client->send(json_encode($receiveResult)); |
| 105 | 105 | } |
| 106 | - elseif($client == $from) |
|
| 106 | + elseif ($client == $from) |
|
| 107 | 107 | { |
| 108 | 108 | $sentResult->sidebar = json_decode($this->onSidebar($client->userId)); |
| 109 | 109 | |
@@ -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\Session; |
| 6 | 6 | use Dotenv\Dotenv; |
| 7 | 7 | $dotenv = new Dotenv(dirname(__DIR__)); |
@@ -27,35 +27,35 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | public function replyTo($msg) |
| 29 | 29 | { |
| 30 | - if(!empty($msg)) //checks for the value send |
|
| 30 | + if (!empty($msg)) //checks for the value send |
|
| 31 | 31 | { |
| 32 | 32 | $userId = $msg->userId; |
| 33 | 33 | $identifier = $msg->name; |
| 34 | - $receiverID = $identifier; //stores id of the person whom message is to be sent |
|
| 34 | + $receiverID = $identifier; //stores id of the person whom message is to be sent |
|
| 35 | 35 | |
| 36 | - if($identifier > $userId) // geneate specific unique code to store messages |
|
| 37 | - $identifier = $userId . ":" . $identifier; |
|
| 36 | + if ($identifier > $userId) // geneate specific unique code to store messages |
|
| 37 | + $identifier = $userId.":".$identifier; |
|
| 38 | 38 | else |
| 39 | - $identifier = $identifier . ":" . $userId; |
|
| 39 | + $identifier = $identifier.":".$userId; |
|
| 40 | 40 | |
| 41 | 41 | $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user. |
| 42 | 42 | |
| 43 | - $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
| 43 | + $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
| 44 | 44 | $time_id = date("YmdHis", time() + 16200); //to sort the array on the basis of time |
| 45 | 45 | |
| 46 | 46 | //the sender id must not be equal to current session id |
| 47 | - if($reply != "" && $receiverID != $userId) |
|
| 47 | + if ($reply != "" && $receiverID != $userId) |
|
| 48 | 48 | { |
| 49 | 49 | // check whether the receiver is authorized or registered |
| 50 | 50 | $query = "SELECT * from login where login_id = '$receiverID'"; |
| 51 | 51 | |
| 52 | 52 | $result = $this->connect->query($query); |
| 53 | - if($result->num_rows > 0) // if true |
|
| 53 | + if ($result->num_rows > 0) // if true |
|
| 54 | 54 | { |
| 55 | 55 | //check whether he is sending message for thr first time or he has sent messages before |
| 56 | 56 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
| 57 | 57 | $result = $this->connect->query($query); |
| 58 | - if($result->num_rows>0) // if he has sent messages before |
|
| 58 | + if ($result->num_rows > 0) // if he has sent messages before |
|
| 59 | 59 | { |
| 60 | 60 | // Update Total_Message Table |
| 61 | 61 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
@@ -65,15 +65,15 @@ discard block |
||
| 65 | 65 | else // if he sends message for the first time |
| 66 | 66 | { |
| 67 | 67 | $length = strlen($userId); |
| 68 | - if(substr($identifier, 0, $length) == $userId) // generate specific unique code |
|
| 68 | + if (substr($identifier, 0, $length) == $userId) // generate specific unique code |
|
| 69 | 69 | { |
| 70 | - $user2 = substr($identifier, $length+1); |
|
| 70 | + $user2 = substr($identifier, $length + 1); |
|
| 71 | 71 | $user1 = $userId; |
| 72 | 72 | } |
| 73 | 73 | else |
| 74 | 74 | { |
| 75 | 75 | $user2 = $userId; |
| 76 | - $length = strlen($identifier) - $length-1; |
|
| 76 | + $length = strlen($identifier) - $length - 1; |
|
| 77 | 77 | $user1 = substr($identifier, 0, $length); |
| 78 | 78 | } |
| 79 | 79 | // insert Details in Total_Message Table |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | return $this->updateMessages($query, $identifier, $reply, $userId, $time); |
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | - return "Invalid Authentication"; // if he is unauthorized echo message is failed |
|
| 84 | + return "Invalid Authentication"; // if he is unauthorized echo message is failed |
|
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | return "Failed"; |
@@ -89,13 +89,13 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | public function updateMessages($query, $identifier, $reply, $userId, $time) |
| 91 | 91 | { |
| 92 | - if($result = $this->connect->query($query)) |
|
| 92 | + if ($result = $this->connect->query($query)) |
|
| 93 | 93 | { |
| 94 | 94 | //insert message in db |
| 95 | 95 | $query = "INSERT into messages values('$identifier', '$reply', '$userId', '$time', null)"; |
| 96 | - if($this->connect->query($query)) |
|
| 96 | + if ($this->connect->query($query)) |
|
| 97 | 97 | { |
| 98 | - return "Messages is sent"; // if query is executed return true |
|
| 98 | + return "Messages is sent"; // if query is executed return true |
|
| 99 | 99 | } |
| 100 | 100 | return "Message is failed"; |
| 101 | 101 | } |