@@ -26,6 +26,9 @@ discard block |
||
26 | 26 | echo "New connection! ({$conn->resourceId})\n"; |
27 | 27 | } |
28 | 28 | |
29 | + /** |
|
30 | + * @param ConnectionInterface $conn |
|
31 | + */ |
|
29 | 32 | public function setID($conn) |
30 | 33 | { |
31 | 34 | session_id($conn->WebSocket->request->getCookies()['PHPSESSID']); |
@@ -126,30 +129,47 @@ discard block |
||
126 | 129 | return $obSidebar->LoadSideBar($data); |
127 | 130 | } |
128 | 131 | |
132 | + /** |
|
133 | + * @param string $data |
|
134 | + * @param boolean $para |
|
135 | + */ |
|
129 | 136 | public function onConversation($data, $para, $sessionId) |
130 | 137 | { |
131 | 138 | $obConversation = new Conversation($sessionId); |
132 | 139 | return $obConversation->ConversationLoad($data, $para); |
133 | 140 | } |
134 | 141 | |
142 | + /** |
|
143 | + * @param string $data |
|
144 | + * @param boolean $para |
|
145 | + */ |
|
135 | 146 | public function onReceiver($data, $para, $sessionId) |
136 | 147 | { |
137 | 148 | $obReceiver = new Receiver($sessionId); |
138 | 149 | return $obReceiver->ReceiverLoad($data, True); |
139 | 150 | } |
140 | 151 | |
152 | + /** |
|
153 | + * @param string $data |
|
154 | + */ |
|
141 | 155 | public function onSearch($data, $sessionId) |
142 | 156 | { |
143 | 157 | $obSearch = new Search($sessionId); |
144 | 158 | return $obSearch->SearchItem(json_decode($data)); |
145 | 159 | } |
146 | 160 | |
161 | + /** |
|
162 | + * @param string $data |
|
163 | + */ |
|
147 | 164 | public function onCompose($data, $sessionId) |
148 | 165 | { |
149 | 166 | $obCompose = new Compose($sessionId); |
150 | 167 | return $obCompose->SelectUser(json_decode($data)); |
151 | 168 | } |
152 | 169 | |
170 | + /** |
|
171 | + * @param string $data |
|
172 | + */ |
|
153 | 173 | public function onReply($data, $sessionId) |
154 | 174 | { |
155 | 175 | $obReply = new Reply($sessionId); |
@@ -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 |
@@ -90,6 +90,11 @@ |
||
90 | 90 | $this->connect->close(); |
91 | 91 | } |
92 | 92 | |
93 | + /** |
|
94 | + * @param string $identifier |
|
95 | + * @param string $reply |
|
96 | + * @param string $time |
|
97 | + */ |
|
93 | 98 | function UpdateMessages($query, $identifier, $reply, $id, $time) |
94 | 99 | { |
95 | 100 | if($result = $this->connect->query($query)) |
@@ -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__)); |
@@ -31,37 +31,37 @@ discard block |
||
31 | 31 | public function replyTo($msg) |
32 | 32 | { |
33 | 33 | |
34 | - if(Session::get('start') != null && isset($msg)) //checks for session login and the value send |
|
34 | + if (Session::get('start') != null && isset($msg)) //checks for session login and the value send |
|
35 | 35 | { |
36 | 36 | $userId = Session::get('start'); |
37 | - $msg = json_decode($msg); //decode json value |
|
37 | + $msg = json_decode($msg); //decode json value |
|
38 | 38 | $identifier = $msg->name; |
39 | 39 | |
40 | - $receiverID = $identifier; //stores id of the person whom message is to be sent |
|
40 | + $receiverID = $identifier; //stores id of the person whom message is to be sent |
|
41 | 41 | |
42 | - if($identifier > $userId) // geneate specific unique code to store messages |
|
43 | - $identifier = $userId . ":" . $identifier; |
|
42 | + if ($identifier > $userId) // geneate specific unique code to store messages |
|
43 | + $identifier = $userId.":".$identifier; |
|
44 | 44 | else |
45 | - $identifier = $identifier . ":" . $userId; |
|
45 | + $identifier = $identifier.":".$userId; |
|
46 | 46 | |
47 | 47 | $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user. |
48 | 48 | |
49 | - $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
49 | + $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
50 | 50 | $time_id = date("YmdHis", time() + 16200); //to sort the array on the basis of time |
51 | 51 | |
52 | 52 | //the sender id must not be equal to current session id |
53 | - if($reply != "" && $receiverID != $userId) |
|
53 | + if ($reply != "" && $receiverID != $userId) |
|
54 | 54 | { |
55 | 55 | // check whether the receiver is authorized or registered |
56 | 56 | $query = "SELECT * from login where login_id = '$receiverID'"; |
57 | 57 | |
58 | 58 | $result = $this->connect->query($query); |
59 | - if($result->num_rows > 0) // if true |
|
59 | + if ($result->num_rows > 0) // if true |
|
60 | 60 | { |
61 | 61 | //check whether he is sending message for thr first time or he has sent messages before |
62 | 62 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
63 | 63 | $result = $this->connect->query($query); |
64 | - if($result->num_rows>0) // if he has sent messages before |
|
64 | + if ($result->num_rows > 0) // if he has sent messages before |
|
65 | 65 | { |
66 | 66 | // Update Total_Message Table |
67 | 67 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
@@ -71,15 +71,15 @@ discard block |
||
71 | 71 | else // if he sends message for the first time |
72 | 72 | { |
73 | 73 | $length = strlen($userId); |
74 | - if(substr($identifier, 0, $length) == $userId) // generate specific unique code |
|
74 | + if (substr($identifier, 0, $length) == $userId) // generate specific unique code |
|
75 | 75 | { |
76 | - $user2 = substr($identifier, $length+1); |
|
76 | + $user2 = substr($identifier, $length + 1); |
|
77 | 77 | $user1 = $userId; |
78 | 78 | } |
79 | 79 | else |
80 | 80 | { |
81 | 81 | $user2 = $userId; |
82 | - $length = strlen($identifier) - $length-1; |
|
82 | + $length = strlen($identifier) - $length - 1; |
|
83 | 83 | $user1 = substr($identifier, 0, $length); |
84 | 84 | } |
85 | 85 | // insert Details in Total_Message Table |
@@ -102,13 +102,13 @@ discard block |
||
102 | 102 | |
103 | 103 | public function updateMessages($query, $identifier, $reply, $userId, $time) |
104 | 104 | { |
105 | - if($result = $this->connect->query($query)) |
|
105 | + if ($result = $this->connect->query($query)) |
|
106 | 106 | { |
107 | 107 | //insert message in db |
108 | 108 | $query = "INSERT into messages values('$identifier', '$reply', '$userId', '$time', null)"; |
109 | - if($result = $this->connect->query($query)) |
|
109 | + if ($result = $this->connect->query($query)) |
|
110 | 110 | { |
111 | - echo "Messages is sent \n"; // if query is executed return true |
|
111 | + echo "Messages is sent \n"; // if query is executed return true |
|
112 | 112 | } |
113 | 113 | else |
114 | 114 | { |
@@ -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 | } |
@@ -8,7 +8,7 @@ |
||
8 | 8 | |
9 | 9 | class Message extends Model |
10 | 10 | { |
11 | - protected $table='message'; |
|
11 | + protected $table = 'message'; |
|
12 | 12 | |
13 | 13 | protected $fillable = ['identifier_message_number', 'message', 'sent_by', 'time']; |
14 | 14 | } |
@@ -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,10 +6,16 @@ |
||
6 | 6 | class Session |
7 | 7 | { |
8 | 8 | |
9 | + /** |
|
10 | + * @param string $key |
|
11 | + */ |
|
9 | 12 | public static function put($key, $value){ |
10 | 13 | $_SESSION[$key] = $value; |
11 | 14 | } |
12 | 15 | |
16 | + /** |
|
17 | + * @param string $key |
|
18 | + */ |
|
13 | 19 | public static function get($key){ |
14 | 20 | return (isset($_SESSION[$key]) ? $_SESSION[$key] : null); |
15 | 21 | } |
@@ -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 | } |
21 | 21 | \ No newline at end of file |
@@ -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,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 ChatApp\Time; |
7 | 7 | use ChatApp\User; |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | { |
41 | 41 | |
42 | 42 | $flag = 1; |
43 | - if(Session::get('start') != null && isset($msg)) |
|
43 | + if (Session::get('start') != null && isset($msg)) |
|
44 | 44 | { |
45 | 45 | $add_load = 0; |
46 | 46 | $userId = Session::get('start'); |
@@ -50,25 +50,25 @@ discard block |
||
50 | 50 | |
51 | 51 | $fetch = $this->obUser->userDetails($username, $para); |
52 | 52 | |
53 | - if($fetch != NULL) |
|
53 | + if ($fetch != NULL) |
|
54 | 54 | { |
55 | 55 | $login_id = (int)$fetch['login_id']; |
56 | 56 | |
57 | 57 | // Unique Identifier |
58 | - if($login_id > $userId) |
|
58 | + if ($login_id > $userId) |
|
59 | 59 | $identifier = $userId.':'.$login_id; |
60 | 60 | else |
61 | 61 | $identifier = $login_id.':'.$userId; |
62 | 62 | |
63 | 63 | $query = "SELECT total_messages from total_message where identifier = '$identifier'"; |
64 | - if($result = $this->connect->query($query)) |
|
64 | + if ($result = $this->connect->query($query)) |
|
65 | 65 | { |
66 | - if($result->num_rows > 0) |
|
66 | + if ($result->num_rows > 0) |
|
67 | 67 | { |
68 | 68 | $total = $result->fetch_assoc(); |
69 | 69 | $total = $total['total_messages']; |
70 | - if($total - $load > 0) |
|
71 | - if($total - $load > 10) |
|
70 | + if ($total - $load > 0) |
|
71 | + if ($total - $load > 10) |
|
72 | 72 | $add_load = $load + 10; |
73 | 73 | else |
74 | 74 | $add_load = $total; |
@@ -76,14 +76,14 @@ discard block |
||
76 | 76 | } |
77 | 77 | |
78 | 78 | $query = "SELECT message, time, sent_by FROM messages WHERE identifier_message_number = '$identifier' ORDER BY id DESC limit ".$load; |
79 | - if($result = $this->connect->query($query)) |
|
79 | + if ($result = $this->connect->query($query)) |
|
80 | 80 | { |
81 | - if($result->num_rows > 0) |
|
81 | + if ($result->num_rows > 0) |
|
82 | 82 | { |
83 | - while($row = $result->fetch_assoc()) |
|
83 | + while ($row = $result->fetch_assoc()) |
|
84 | 84 | { |
85 | 85 | $row['time'] = $this->obTime->timeConversion($row['time']); |
86 | - $row = array_merge($row,['start' => $userId]); |
|
86 | + $row = array_merge($row, ['start' => $userId]); |
|
87 | 87 | $this->array = array_merge($this->array, [$row]); |
88 | 88 | } |
89 | 89 |
@@ -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__)); |
@@ -34,18 +34,18 @@ discard block |
||
34 | 34 | public function selectUser($msg) |
35 | 35 | { |
36 | 36 | $msg = $msg->value; |
37 | - if(Session::get('start') != null && isset($msg)) |
|
37 | + if (Session::get('start') != null && isset($msg)) |
|
38 | 38 | { |
39 | 39 | $userId = Session::get('start'); |
40 | 40 | $suggestion = trim($msg); |
41 | - if($suggestion != "" ) |
|
41 | + if ($suggestion != "") |
|
42 | 42 | { |
43 | 43 | $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC"; |
44 | - if($result = $this->connect->query($query)) |
|
44 | + if ($result = $this->connect->query($query)) |
|
45 | 45 | { |
46 | - if($result->num_rows > 0) |
|
46 | + if ($result->num_rows > 0) |
|
47 | 47 | { |
48 | - while($row = $result->fetch_assoc()) |
|
48 | + while ($row = $result->fetch_assoc()) |
|
49 | 49 | { |
50 | 50 | $this->array = array_merge($this->array, [$row]); |
51 | 51 | } |