@@ -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 Dotenv\Dotenv; |
6 | 6 | $dotenv = new Dotenv(dirname(__DIR__)); |
7 | 7 | $dotenv->load(); |
@@ -26,43 +26,43 @@ discard block |
||
26 | 26 | |
27 | 27 | public function replyTo($msg) |
28 | 28 | { |
29 | - if(!empty($msg)) //checks for the value send |
|
29 | + if (!empty($msg)) //checks for the value send |
|
30 | 30 | { |
31 | 31 | $userId = $msg->userId; |
32 | 32 | $receiverID = $msg->name; //stores id of the person whom message is to be sent |
33 | 33 | $identifier = ""; |
34 | 34 | |
35 | - if($receiverID > $userId) // geneate specific unique code to store messages |
|
35 | + if ($receiverID > $userId) // geneate specific unique code to store messages |
|
36 | 36 | { |
37 | 37 | $user1 = $userId; |
38 | 38 | $user2 = $receiverID; |
39 | - $identifier = $userId . ":" . $receiverID; |
|
39 | + $identifier = $userId.":".$receiverID; |
|
40 | 40 | } |
41 | 41 | else |
42 | 42 | { |
43 | 43 | $user1 = $receiverID; |
44 | 44 | $user2 = $userId; |
45 | - $identifier = $receiverID . ":" . $userId; |
|
45 | + $identifier = $receiverID.":".$userId; |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user. |
49 | 49 | |
50 | - $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
50 | + $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
51 | 51 | $time_id = date("YmdHis", time() + 16200); //to sort the array on the basis of time |
52 | 52 | |
53 | 53 | //the sender id must not be equal to current session id |
54 | - if($reply != "" && $receiverID != $userId) |
|
54 | + if ($reply != "" && $receiverID != $userId) |
|
55 | 55 | { |
56 | 56 | // check whether the receiver is authorized or registered |
57 | 57 | $query = "SELECT * from login where login_id = '$receiverID'"; |
58 | 58 | |
59 | 59 | $result = $this->connect->query($query); |
60 | - if($result->num_rows > 0) // if true |
|
60 | + if ($result->num_rows > 0) // if true |
|
61 | 61 | { |
62 | 62 | //check whether he is sending message for thr first time or he has sent messages before |
63 | 63 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
64 | 64 | $result = $this->connect->query($query); |
65 | - if($result->num_rows > 0) // if he has sent messages before |
|
65 | + if ($result->num_rows > 0) // if he has sent messages before |
|
66 | 66 | { |
67 | 67 | // Update Total_Message Table |
68 | 68 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | return $this->updateMessages($query, $identifier, $reply, $userId, $time); |
77 | 77 | } |
78 | 78 | } |
79 | - return "Invalid Authentication"; // if he is unauthorized echo message is failed |
|
79 | + return "Invalid Authentication"; // if he is unauthorized echo message is failed |
|
80 | 80 | } |
81 | 81 | } |
82 | 82 | return "Failed"; |
@@ -84,13 +84,13 @@ discard block |
||
84 | 84 | |
85 | 85 | public function updateMessages($query, $identifier, $reply, $userId, $time) |
86 | 86 | { |
87 | - if($result = $this->connect->query($query)) |
|
87 | + if ($result = $this->connect->query($query)) |
|
88 | 88 | { |
89 | 89 | //insert message in db |
90 | 90 | $query = "INSERT into messages values('$identifier', '$reply', '$userId', '$time', null)"; |
91 | - if($this->connect->query($query)) |
|
91 | + if ($this->connect->query($query)) |
|
92 | 92 | { |
93 | - return "Messages is sent"; // if query is executed return true |
|
93 | + return "Messages is sent"; // if query is executed return true |
|
94 | 94 | } |
95 | 95 | return "Message is failed"; |
96 | 96 | } |
@@ -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 | } |
@@ -6,6 +6,9 @@ |
||
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 | } |
@@ -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; |