@@ -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); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | public function onMessage(ConnectionInterface $from, $msg) { |
39 | 39 | $sessionId = $from->WebSocket->request->getCookies()['PHPSESSID']; |
40 | - if($msg == 'OpenChat initiated..!') |
|
40 | + if ($msg == 'OpenChat initiated..!') |
|
41 | 41 | { |
42 | 42 | @$initial->initial = json_decode($this->onSidebar($from->userId)); |
43 | 43 | |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $client->send(json_encode($result)); |
99 | 99 | $this->online = 1; |
100 | 100 | } |
101 | - elseif($client == $from) |
|
101 | + elseif ($client == $from) |
|
102 | 102 | { |
103 | 103 | @$result->sidebar = json_decode($this->onSidebar($client->userId)); |
104 | 104 |
@@ -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__) . '/config/database.php'); |
|
4 | +require_once (dirname(__DIR__).'/config/database.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() |
@@ -33,6 +33,9 @@ discard block |
||
33 | 33 | } |
34 | 34 | } |
35 | 35 | |
36 | + /** |
|
37 | + * @param string $email |
|
38 | + */ |
|
36 | 39 | function validate_email_in_db($email) |
37 | 40 | { |
38 | 41 | $query="SELECT login_id FROM login WHERE email='$email'"; |
@@ -46,6 +49,9 @@ discard block |
||
46 | 49 | } |
47 | 50 | } |
48 | 51 | |
52 | + /** |
|
53 | + * @param string $username |
|
54 | + */ |
|
49 | 55 | function validate_username_in_db($username) |
50 | 56 | { |
51 | 57 | $query="SELECT login_id FROM login WHERE username='$username'"; |
@@ -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__) . '/config/database.php'); |
|
4 | +require_once (dirname(__DIR__).'/config/database.php'); |
|
5 | 5 | use ChatApp\Time; |
6 | 6 | |
7 | 7 | /** |
@@ -23,26 +23,26 @@ discard block |
||
23 | 23 | |
24 | 24 | public function LoadSideBar($userId) |
25 | 25 | { |
26 | - if(isset($userId)) |
|
26 | + if (isset($userId)) |
|
27 | 27 | { |
28 | 28 | $query = "SELECT * FROM total_message WHERE user1='$userId' or user2='$userId' ORDER BY id DESC"; |
29 | - if($result = $this->connect->query($query)) |
|
29 | + if ($result = $this->connect->query($query)) |
|
30 | 30 | { |
31 | 31 | if ($result->num_rows > 0) |
32 | 32 | { |
33 | 33 | $length = strlen($userId); |
34 | - while($row = $result->fetch_assoc()) |
|
34 | + while ($row = $result->fetch_assoc()) |
|
35 | 35 | { |
36 | 36 | $identifier = $row['identifier']; |
37 | 37 | $substring = substr($identifier, 0, $length); |
38 | - if($substring != $userId) |
|
38 | + if ($substring != $userId) |
|
39 | 39 | { |
40 | 40 | $this->Data($substring, $row); |
41 | 41 | } |
42 | 42 | |
43 | 43 | else |
44 | 44 | { |
45 | - $substring = substr($identifier, $length+1); |
|
45 | + $substring = substr($identifier, $length + 1); |
|
46 | 46 | $this->Data($substring, $row); |
47 | 47 | } |
48 | 48 | } |
@@ -68,9 +68,9 @@ discard block |
||
68 | 68 | public function Data($id, $row) |
69 | 69 | { |
70 | 70 | $query = "SELECT username,name,login_status,login_id from login where login_id = '$id'"; |
71 | - if($result = $this->connect->query($query)) |
|
71 | + if ($result = $this->connect->query($query)) |
|
72 | 72 | { |
73 | - if($result->num_rows > 0) |
|
73 | + if ($result->num_rows > 0) |
|
74 | 74 | { |
75 | 75 | $fetch = $result->fetch_assoc(); |
76 | 76 | $row['time'] = $this->obTime->TimeConversion($row['time']); |
@@ -1,9 +1,9 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require (__DIR__ . '/vendor/autoload.php'); |
|
3 | +require (__DIR__.'/vendor/autoload.php'); |
|
4 | 4 | use ChatApp\Session; |
5 | 5 | |
6 | -if(Session::get('start') != null) |
|
6 | +if (Session::get('start') != null) |
|
7 | 7 | { |
8 | 8 | Session::forget('start'); |
9 | 9 | header('Location: index.php'); |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require (dirname(__DIR__) . '/vendor/autoload.php'); |
|
3 | +require (dirname(__DIR__).'/vendor/autoload.php'); |
|
4 | 4 | use ChatApp\Register; |
5 | 5 | |
6 | -if(isset($_POST['q'])) |
|
6 | +if (isset($_POST['q'])) |
|
7 | 7 | { |
8 | 8 | $registerField = json_decode($_POST['q']); |
9 | 9 | $name = $registerField->name; |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | $password = $registerField->password; |
14 | 14 | $obRegister = new Register(); |
15 | 15 | $result = $obRegister->authRegister($name, $email, $username, $password, $mob); |
16 | - if(isset($result)) |
|
16 | + if (isset($result)) |
|
17 | 17 | echo $result; |
18 | 18 | else |
19 | 19 | echo json_encode([]); |