@@ -38,12 +38,12 @@ discard block |
||
38 | 38 | |
39 | 39 | public function onMessage(ConnectionInterface $from, $msg) { |
40 | 40 | $sessionId = $from->WebSocket->request->getCookies()['PHPSESSID']; |
41 | - if($msg == 'OpenChat initiated..!') |
|
41 | + if ($msg == 'OpenChat initiated..!') |
|
42 | 42 | { |
43 | - $initial = (object) array(); |
|
43 | + $initial = (object)array(); |
|
44 | 44 | $initial->initial = json_decode($this->onSidebar($from->userId)); |
45 | 45 | |
46 | - if($initial->initial != null) { |
|
46 | + if ($initial->initial != null) { |
|
47 | 47 | $initial->conversation = json_decode( |
48 | 48 | $this->onConversation( |
49 | 49 | json_encode([ |
@@ -58,13 +58,13 @@ discard block |
||
58 | 58 | } |
59 | 59 | elseif ($msg == '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 (@json_decode($msg)->newConversation == 'Initiated') |
66 | 66 | { |
67 | - $result = (object) array(); |
|
67 | + $result = (object)array(); |
|
68 | 68 | $result->conversation = json_decode($this->onConversation($msg, False, $sessionId)); |
69 | 69 | $from->send(json_encode($result)); |
70 | 70 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | $client->send(json_encode($receiveResult)); |
105 | 105 | $this->online = 1; |
106 | 106 | } |
107 | - elseif($client == $from) |
|
107 | + elseif ($client == $from) |
|
108 | 108 | { |
109 | 109 | $sentResult->sidebar = json_decode($this->onSidebar($client->userId)); |
110 | 110 |
@@ -1,12 +1,12 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); |
|
3 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); |
|
4 | 4 | use ChatApp\Session; |
5 | 5 | use Dotenv\Dotenv; |
6 | 6 | $dotenv = new Dotenv(dirname(__DIR__)); |
7 | 7 | $dotenv->load(); |
8 | 8 | |
9 | -if(Session::get('start') != null && empty($_GET['user'])) |
|
9 | +if (Session::get('start') != null && empty($_GET['user'])) |
|
10 | 10 | { |
11 | 11 | |
12 | 12 | ?> |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | |
175 | 175 | <?php |
176 | 176 | } |
177 | -else{ |
|
178 | - header('Location:'. getenv('APP_URL')."/index.php"); |
|
177 | +else { |
|
178 | + header('Location:'.getenv('APP_URL')."/index.php"); |
|
179 | 179 | } |
180 | 180 | ?> |
@@ -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\Session; |
7 | 7 | use Dotenv\Dotenv; |
@@ -38,23 +38,23 @@ discard block |
||
38 | 38 | $suggestion = $suggestion->value; |
39 | 39 | $flag = 0; |
40 | 40 | $userId = Session::get('start'); |
41 | - if($userId != null && !empty($suggestion)) |
|
41 | + if ($userId != null && !empty($suggestion)) |
|
42 | 42 | { |
43 | 43 | $suggestion = trim($suggestion); |
44 | - if($suggestion != "") |
|
44 | + if ($suggestion != "") |
|
45 | 45 | { |
46 | 46 | $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC"; |
47 | - if($result = $this->connect->query($query)) |
|
47 | + if ($result = $this->connect->query($query)) |
|
48 | 48 | { |
49 | - if($result->num_rows > 0) |
|
49 | + if ($result->num_rows > 0) |
|
50 | 50 | { |
51 | - while($row = $result->fetch_assoc()) |
|
51 | + while ($row = $result->fetch_assoc()) |
|
52 | 52 | { |
53 | 53 | $check_id = $row["login_id"]; |
54 | 54 | $query = "SELECT * from total_message where (user1 = '$check_id' and user2 = '$userId') or (user2 = '$check_id' and user1 = '$userId')"; |
55 | - if($result1 = $this->connect->query($query)) |
|
55 | + if ($result1 = $this->connect->query($query)) |
|
56 | 56 | { |
57 | - if($result1->num_rows > 0) |
|
57 | + if ($result1->num_rows > 0) |
|
58 | 58 | { |
59 | 59 | $fetch = $result1->fetch_assoc(); |
60 | 60 | $fetch['time'] = $this->obTime->timeConversion($fetch['time']); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } |
67 | 67 | } |
68 | 68 | } |
69 | - if($flag != 0) |
|
69 | + if ($flag != 0) |
|
70 | 70 | { |
71 | 71 | $this->array = array_merge([], ["Search" => $this->array]); |
72 | 72 | return json_encode($this->array); |
@@ -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__)); |
@@ -30,37 +30,37 @@ discard block |
||
30 | 30 | |
31 | 31 | public function replyTo($msg) |
32 | 32 | { |
33 | - $msg = json_decode($msg); //decode json value |
|
34 | - if(Session::get('start') != null && !empty($msg)) //checks for session login and the value send |
|
33 | + $msg = json_decode($msg); //decode json value |
|
34 | + if (Session::get('start') != null && !empty($msg)) //checks for session login and the value send |
|
35 | 35 | { |
36 | 36 | $userId = Session::get('start'); |
37 | 37 | $identifier = $msg->name; |
38 | 38 | |
39 | - $receiverID = $identifier; //stores id of the person whom message is to be sent |
|
39 | + $receiverID = $identifier; //stores id of the person whom message is to be sent |
|
40 | 40 | |
41 | - if($identifier > $userId) // geneate specific unique code to store messages |
|
42 | - $identifier = $userId . ":" . $identifier; |
|
41 | + if ($identifier > $userId) // geneate specific unique code to store messages |
|
42 | + $identifier = $userId.":".$identifier; |
|
43 | 43 | else |
44 | - $identifier = $identifier . ":" . $userId; |
|
44 | + $identifier = $identifier.":".$userId; |
|
45 | 45 | |
46 | 46 | $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user. |
47 | 47 | |
48 | - $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
48 | + $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
49 | 49 | $time_id = date("YmdHis", time() + 16200); //to sort the array on the basis of time |
50 | 50 | |
51 | 51 | //the sender id must not be equal to current session id |
52 | - if($reply != "" && $receiverID != $userId) |
|
52 | + if ($reply != "" && $receiverID != $userId) |
|
53 | 53 | { |
54 | 54 | // check whether the receiver is authorized or registered |
55 | 55 | $query = "SELECT * from login where login_id = '$receiverID'"; |
56 | 56 | |
57 | 57 | $result = $this->connect->query($query); |
58 | - if($result->num_rows > 0) // if true |
|
58 | + if ($result->num_rows > 0) // if true |
|
59 | 59 | { |
60 | 60 | //check whether he is sending message for thr first time or he has sent messages before |
61 | 61 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
62 | 62 | $result = $this->connect->query($query); |
63 | - if($result->num_rows>0) // if he has sent messages before |
|
63 | + if ($result->num_rows > 0) // if he has sent messages before |
|
64 | 64 | { |
65 | 65 | // Update Total_Message Table |
66 | 66 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
@@ -70,15 +70,15 @@ discard block |
||
70 | 70 | else // if he sends message for the first time |
71 | 71 | { |
72 | 72 | $length = strlen($userId); |
73 | - if(substr($identifier, 0, $length) == $userId) // generate specific unique code |
|
73 | + if (substr($identifier, 0, $length) == $userId) // generate specific unique code |
|
74 | 74 | { |
75 | - $user2 = substr($identifier, $length+1); |
|
75 | + $user2 = substr($identifier, $length + 1); |
|
76 | 76 | $user1 = $userId; |
77 | 77 | } |
78 | 78 | else |
79 | 79 | { |
80 | 80 | $user2 = $userId; |
81 | - $length = strlen($identifier) - $length-1; |
|
81 | + $length = strlen($identifier) - $length - 1; |
|
82 | 82 | $user1 = substr($identifier, 0, $length); |
83 | 83 | } |
84 | 84 | // insert Details in Total_Message Table |
@@ -100,13 +100,13 @@ discard block |
||
100 | 100 | |
101 | 101 | public function updateMessages($query, $identifier, $reply, $userId, $time) |
102 | 102 | { |
103 | - if($result = $this->connect->query($query)) |
|
103 | + if ($result = $this->connect->query($query)) |
|
104 | 104 | { |
105 | 105 | //insert message in db |
106 | 106 | $query = "INSERT into messages values('$identifier', '$reply', '$userId', '$time', null)"; |
107 | - if($this->connect->query($query)) |
|
107 | + if ($this->connect->query($query)) |
|
108 | 108 | { |
109 | - return "Messages is sent"; // if query is executed return true |
|
109 | + return "Messages is sent"; // if query is executed return true |
|
110 | 110 | } |
111 | 111 | else |
112 | 112 | { |