@@ -2,11 +2,9 @@ |
||
2 | 2 | namespace ChatApp; |
3 | 3 | use Ratchet\MessageComponentInterface; |
4 | 4 | use Ratchet\ConnectionInterface; |
5 | -use ChatApp\Models\Message; |
|
6 | 5 | use ChatApp\Reply; |
7 | 6 | use ChatApp\Conversation; |
8 | 7 | use ChatApp\Receiver; |
9 | -use ChatApp\SideBar; |
|
10 | 8 | use ChatApp\Search; |
11 | 9 | use ChatApp\Compose; |
12 | 10 |
@@ -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 |
@@ -16,14 +16,14 @@ |
||
16 | 16 | function TimeConversion($time) |
17 | 17 | { |
18 | 18 | |
19 | - if(substr($time,4,11) == date("d M Y", time() + 16200)) |
|
20 | - $time = substr($time,16,5); |
|
21 | - else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7) |
|
22 | - $time = substr($time,0,3); |
|
23 | - else if(substr($time,11,4) == date("Y", time() + 16200)) |
|
24 | - $time = substr($time,4,6); |
|
19 | + if (substr($time, 4, 11) == date("d M Y", time() + 16200)) |
|
20 | + $time = substr($time, 16, 5); |
|
21 | + else if (substr($time, 7, 8) == date("M Y", time() + 16200) && substr($time, 4, 2) - date("d") < 7) |
|
22 | + $time = substr($time, 0, 3); |
|
23 | + else if (substr($time, 11, 4) == date("Y", time() + 16200)) |
|
24 | + $time = substr($time, 4, 6); |
|
25 | 25 | else |
26 | - $time = substr($time,4,11); |
|
26 | + $time = substr($time, 4, 11); |
|
27 | 27 | |
28 | 28 | return $time; |
29 | 29 | } |
@@ -7,7 +7,7 @@ |
||
7 | 7 | use Ratchet\WebSocket\WsServer; |
8 | 8 | use ChatApp\Chat; |
9 | 9 | |
10 | -$server =IoServer::factory( |
|
10 | +$server = IoServer::factory( |
|
11 | 11 | new HttpServer( |
12 | 12 | new WsServer( |
13 | 13 | new Chat() |
@@ -6,15 +6,15 @@ |
||
6 | 6 | class Session |
7 | 7 | { |
8 | 8 | |
9 | - public static function put($key, $value){ |
|
9 | + public static function put($key, $value) { |
|
10 | 10 | $_SESSION[$key] = $value; |
11 | 11 | } |
12 | 12 | |
13 | - public static function get($key){ |
|
13 | + public static function get($key) { |
|
14 | 14 | return (isset($_SESSION[$key]) ? $_SESSION[$key] : null); |
15 | 15 | } |
16 | 16 | |
17 | - public static function forget($key){ |
|
17 | + public static function forget($key) { |
|
18 | 18 | unset($_SESSION[$key]); |
19 | 19 | } |
20 | 20 | } |
@@ -1,13 +1,13 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once (__DIR__ . '/vendor/autoload.php'); |
|
3 | +require_once (__DIR__.'/vendor/autoload.php'); |
|
4 | 4 | use ChatApp\Session; |
5 | 5 | use Dotenv\Dotenv; |
6 | 6 | $dotenv = new Dotenv(__DIR__); |
7 | 7 | $dotenv->load(); |
8 | 8 | |
9 | 9 | |
10 | -if(Session::get('start') != null) |
|
10 | +if (Session::get('start') != null) |
|
11 | 11 | { |
12 | 12 | header("Location:".getenv('APP_URL')."/account.php"); |
13 | 13 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace ChatApp; |
3 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); |
|
3 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); |
|
4 | 4 | use Dotenv\Dotenv; |
5 | 5 | $dotenv = new Dotenv(dirname(__DIR__)); |
6 | 6 | $dotenv->load(); |
@@ -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\User; |
6 | 6 | use ChatApp\Session; |
7 | 7 | use ChatApp\Conversation; |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $name = $this->messages['name']; |
37 | 37 | $this->messages = json_decode($this->conversation->conversationLoad($msg, True)); |
38 | 38 | $id = json_decode($msg)->username; |
39 | - for ($i=1 ; $i < count($this->messages); $i++) { |
|
39 | + for ($i = 1; $i < count($this->messages); $i++) { |
|
40 | 40 | $this->messages[$i]->start = $id; |
41 | 41 | } |
42 | 42 | $this->messages[0]->username = $username; |
@@ -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(); |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | ); |
24 | 24 | $query = "SELECT * from profile where login_id = '$userId'"; |
25 | 25 | $result = $connect->query($query); |
26 | - if($result->num_rows > 0) // if true |
|
26 | + if ($result->num_rows > 0) // if true |
|
27 | 27 | { |
28 | 28 | $details = $result->fetch_assoc(); |
29 | 29 | return $details; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | |
4 | 4 | namespace ChatApp; |
5 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); |
|
5 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); |
|
6 | 6 | use Dotenv\Dotenv; |
7 | 7 | $dotenv = new Dotenv(dirname(__DIR__)); |
8 | 8 | $dotenv->load(); |
@@ -30,12 +30,12 @@ discard block |
||
30 | 30 | |
31 | 31 | public function userDetails($userId, $para) |
32 | 32 | { |
33 | - if($para == True) |
|
33 | + if ($para == True) |
|
34 | 34 | $this->query = "SELECT * from login where login_id = '$userId'"; |
35 | 35 | else |
36 | 36 | $this->query = "SELECT * from login where username = '$userId'"; |
37 | 37 | $this->result = $this->connect->query($this->query); |
38 | - if($this->result->num_rows > 0) // if true |
|
38 | + if ($this->result->num_rows > 0) // if true |
|
39 | 39 | { |
40 | 40 | $this->details = $this->result->fetch_assoc(); |
41 | 41 | return $this->details; |