@@ -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 | } |
@@ -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 |
@@ -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() |
@@ -8,12 +8,12 @@ |
||
8 | 8 | use ChatApp\Chat; |
9 | 9 | |
10 | 10 | $server =IoServer::factory( |
11 | - new HttpServer( |
|
12 | - new WsServer( |
|
13 | - new Chat() |
|
14 | - ) |
|
15 | - ) |
|
16 | - , |
|
17 | - 8080 |
|
18 | - ); |
|
11 | + new HttpServer( |
|
12 | + new WsServer( |
|
13 | + new Chat() |
|
14 | + ) |
|
15 | + ) |
|
16 | + , |
|
17 | + 8080 |
|
18 | + ); |
|
19 | 19 | $server->run(); |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | session_start(); |
3 | -if(isset($_SESSION['start']) and empty($_GET['user'])) |
|
3 | +if (isset($_SESSION['start']) and empty($_GET['user'])) |
|
4 | 4 | { |
5 | 5 | ?> |
6 | 6 | <!DOCTYPE html> |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | |
131 | 131 | <?php |
132 | 132 | } |
133 | -else{ |
|
133 | +else { |
|
134 | 134 | header('Location:http://www.localhost/openchat/login.php'); |
135 | 135 | } |
136 | 136 | ?> |
@@ -131,6 +131,6 @@ |
||
131 | 131 | <?php |
132 | 132 | } |
133 | 133 | else{ |
134 | - header('Location:http://localhost/openchat'); |
|
134 | + header('Location:http://localhost/openchat'); |
|
135 | 135 | } |
136 | 136 | ?> |
@@ -1,13 +1,13 @@ discard block |
||
1 | 1 | <?php |
2 | - // Define database connection constants |
|
3 | - define('DB_HOST', 'localhost'); |
|
4 | - define('DB_USER', 'root'); |
|
5 | - define('DB_PASSWORD',''); |
|
6 | - define('DB_NAME', 'openchat'); |
|
7 | - define('URL', URL()); |
|
2 | + // Define database connection constants |
|
3 | + define('DB_HOST', 'localhost'); |
|
4 | + define('DB_USER', 'root'); |
|
5 | + define('DB_PASSWORD',''); |
|
6 | + define('DB_NAME', 'openchat'); |
|
7 | + define('URL', URL()); |
|
8 | 8 | |
9 | - function URL() |
|
10 | - { |
|
9 | + function URL() |
|
10 | + { |
|
11 | 11 | $http = "http://"; |
12 | 12 | $host = $_SERVER['SERVER_NAME']; |
13 | 13 | $port = $_SERVER['SERVER_PORT']; |
@@ -18,5 +18,5 @@ discard block |
||
18 | 18 | } |
19 | 19 | $url = $http.$host.":".$port.$fol; |
20 | 20 | return $url; |
21 | - } |
|
21 | + } |
|
22 | 22 | ?> |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | // Define database connection constants |
3 | 3 | define('DB_HOST', 'localhost'); |
4 | 4 | define('DB_USER', 'root'); |
5 | - define('DB_PASSWORD',''); |
|
5 | + define('DB_PASSWORD', ''); |
|
6 | 6 | define('DB_NAME', 'openchat'); |
7 | 7 | define('URL', URL()); |
8 | 8 | |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | $host = $_SERVER['SERVER_NAME']; |
13 | 13 | $port = $_SERVER['SERVER_PORT']; |
14 | 14 | $fol = ""; |
15 | - if(@$_SERVER['SERVER_ADDR']!=NULL) |
|
15 | + if (@$_SERVER['SERVER_ADDR'] != NULL) |
|
16 | 16 | { |
17 | 17 | $fol = "/".explode('/', $_SERVER['PHP_SELF'])[1]; |
18 | 18 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | session_start(); |
3 | -if(isset($_SESSION['start'])) |
|
3 | +if (isset($_SESSION['start'])) |
|
4 | 4 | { |
5 | 5 | header("Location: account.php"); |
6 | 6 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace ChatApp; |
4 | 4 | use ChatApp\Session; |
5 | -require_once (dirname(__DIR__) . '/config/database.php'); |
|
5 | +require_once (dirname(__DIR__).'/config/database.php'); |
|
6 | 6 | |
7 | 7 | class Login |
8 | 8 | { |
@@ -26,20 +26,20 @@ discard block |
||
26 | 26 | $login = trim($login); |
27 | 27 | $password = trim($password); |
28 | 28 | |
29 | - if(empty($login)) |
|
29 | + if (empty($login)) |
|
30 | 30 | { |
31 | 31 | $this->key = 1; |
32 | 32 | $this->error = array_merge($this->error, ["login" => " *Enter the login field"]); |
33 | 33 | } |
34 | 34 | elseif (preg_match("/^[@]{1}$/", $login)) |
35 | 35 | { |
36 | - if(filter_var($login, FILTER_VALIDATE_EMAIL) == false) |
|
36 | + if (filter_var($login, FILTER_VALIDATE_EMAIL) == false) |
|
37 | 37 | { |
38 | 38 | $this->key = 1; |
39 | 39 | $this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]); |
40 | 40 | } |
41 | 41 | } |
42 | - if(empty($password)) { |
|
42 | + if (empty($password)) { |
|
43 | 43 | $this->key = 1; |
44 | 44 | $this->error = array_merge($this->error, ["password" => " *Enter the password"]); |
45 | 45 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | $password = md5($password); |
49 | 49 | } |
50 | 50 | |
51 | - if($this->key == 0) |
|
51 | + if ($this->key == 0) |
|
52 | 52 | { |
53 | 53 | $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'"; |
54 | 54 | if ($result = $this->connect->query($query)) |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $row = $result->fetch_assoc(); |
59 | 59 | $loginID = $row['login_id']; |
60 | 60 | $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'"; |
61 | - if($result = $this->connect->query($query)) |
|
61 | + if ($result = $this->connect->query($query)) |
|
62 | 62 | { |
63 | 63 | if ($result->num_rows > 0) |
64 | 64 | { |
@@ -7,83 +7,83 @@ |
||
7 | 7 | class Login |
8 | 8 | { |
9 | 9 | |
10 | - protected $key; |
|
11 | - protected $error; |
|
12 | - protected $connect; |
|
10 | + protected $key; |
|
11 | + protected $error; |
|
12 | + protected $connect; |
|
13 | 13 | |
14 | - public function __construct() |
|
15 | - { |
|
16 | - $this->key = 0; |
|
17 | - $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME); |
|
18 | - $this->error = array(); |
|
19 | - } |
|
14 | + public function __construct() |
|
15 | + { |
|
16 | + $this->key = 0; |
|
17 | + $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME); |
|
18 | + $this->error = array(); |
|
19 | + } |
|
20 | 20 | |
21 | - public function authLogin($login, $password) |
|
22 | - { |
|
21 | + public function authLogin($login, $password) |
|
22 | + { |
|
23 | 23 | |
24 | - $login = trim($login); |
|
25 | - $password = trim($password); |
|
24 | + $login = trim($login); |
|
25 | + $password = trim($password); |
|
26 | 26 | |
27 | - if(empty($login)) |
|
28 | - { |
|
29 | - $this->key = 1; |
|
30 | - $this->error = array_merge($this->error, ["login" => " *Enter the login field"]); |
|
31 | - } |
|
32 | - elseif (preg_match("/^[@]{1}$/", $login)) |
|
33 | - { |
|
34 | - if(filter_var($login, FILTER_VALIDATE_EMAIL) == false) |
|
35 | - { |
|
36 | - $this->key = 1; |
|
37 | - $this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]); |
|
38 | - } |
|
39 | - } |
|
40 | - if(empty($password)) { |
|
41 | - $this->key = 1; |
|
42 | - $this->error = array_merge($this->error, ["password" => " *Enter the password"]); |
|
43 | - } |
|
44 | - else |
|
45 | - { |
|
46 | - $password = md5($password); |
|
47 | - } |
|
27 | + if(empty($login)) |
|
28 | + { |
|
29 | + $this->key = 1; |
|
30 | + $this->error = array_merge($this->error, ["login" => " *Enter the login field"]); |
|
31 | + } |
|
32 | + elseif (preg_match("/^[@]{1}$/", $login)) |
|
33 | + { |
|
34 | + if(filter_var($login, FILTER_VALIDATE_EMAIL) == false) |
|
35 | + { |
|
36 | + $this->key = 1; |
|
37 | + $this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]); |
|
38 | + } |
|
39 | + } |
|
40 | + if(empty($password)) { |
|
41 | + $this->key = 1; |
|
42 | + $this->error = array_merge($this->error, ["password" => " *Enter the password"]); |
|
43 | + } |
|
44 | + else |
|
45 | + { |
|
46 | + $password = md5($password); |
|
47 | + } |
|
48 | 48 | |
49 | - if($this->key == 0) |
|
50 | - { |
|
51 | - $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'"; |
|
52 | - if ($result = $this->connect->query($query)) |
|
53 | - { |
|
54 | - if ($result->num_rows > 0) |
|
55 | - { |
|
56 | - $row = $result->fetch_assoc(); |
|
57 | - $loginID = $row['login_id']; |
|
58 | - $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'"; |
|
59 | - if($result = $this->connect->query($query)) |
|
60 | - { |
|
61 | - if ($result->num_rows > 0) |
|
62 | - { |
|
63 | - Session::put('start', $loginID); |
|
64 | - return json_encode([ |
|
65 | - "location" => URL."/account.php" |
|
66 | - ]); |
|
67 | - } |
|
68 | - else |
|
69 | - { |
|
70 | - $this->error = array_merge($this->error, ["password" => " *Invalid password"]); |
|
71 | - return json_encode($this->error); |
|
72 | - } |
|
73 | - } |
|
74 | - } |
|
75 | - else |
|
76 | - { |
|
77 | - $this->error = array_merge($this->error, ["login" => " *Invalid username or email"]); |
|
78 | - return json_encode($this->error); |
|
79 | - } |
|
80 | - } |
|
49 | + if($this->key == 0) |
|
50 | + { |
|
51 | + $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'"; |
|
52 | + if ($result = $this->connect->query($query)) |
|
53 | + { |
|
54 | + if ($result->num_rows > 0) |
|
55 | + { |
|
56 | + $row = $result->fetch_assoc(); |
|
57 | + $loginID = $row['login_id']; |
|
58 | + $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'"; |
|
59 | + if($result = $this->connect->query($query)) |
|
60 | + { |
|
61 | + if ($result->num_rows > 0) |
|
62 | + { |
|
63 | + Session::put('start', $loginID); |
|
64 | + return json_encode([ |
|
65 | + "location" => URL."/account.php" |
|
66 | + ]); |
|
67 | + } |
|
68 | + else |
|
69 | + { |
|
70 | + $this->error = array_merge($this->error, ["password" => " *Invalid password"]); |
|
71 | + return json_encode($this->error); |
|
72 | + } |
|
73 | + } |
|
74 | + } |
|
75 | + else |
|
76 | + { |
|
77 | + $this->error = array_merge($this->error, ["login" => " *Invalid username or email"]); |
|
78 | + return json_encode($this->error); |
|
79 | + } |
|
80 | + } |
|
81 | 81 | |
82 | - } |
|
83 | - else |
|
84 | - { |
|
85 | - return json_encode($this->error); |
|
86 | - } |
|
87 | - $this->connect->close(); |
|
88 | - } |
|
82 | + } |
|
83 | + else |
|
84 | + { |
|
85 | + return json_encode($this->error); |
|
86 | + } |
|
87 | + $this->connect->close(); |
|
88 | + } |
|
89 | 89 | } |
@@ -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 | /** |
@@ -28,24 +28,24 @@ discard block |
||
28 | 28 | { |
29 | 29 | $suggestion = $suggestion->value; |
30 | 30 | $flag = 0; |
31 | - if(isset($_SESSION['start']) && isset($suggestion)) |
|
31 | + if (isset($_SESSION['start']) && isset($suggestion)) |
|
32 | 32 | { |
33 | 33 | $id = $_SESSION['start']; |
34 | 34 | $suggestion = trim($suggestion); |
35 | - if($suggestion != "") |
|
35 | + if ($suggestion != "") |
|
36 | 36 | { |
37 | 37 | $query = "SELECT * FROM login where login_id != '$id' and name like '$suggestion%' ORDER BY name ASC"; |
38 | - if($result = $this->connect->query($query)) |
|
38 | + if ($result = $this->connect->query($query)) |
|
39 | 39 | { |
40 | - if($result->num_rows > 0) |
|
40 | + if ($result->num_rows > 0) |
|
41 | 41 | { |
42 | - while($row = $result->fetch_assoc()) |
|
42 | + while ($row = $result->fetch_assoc()) |
|
43 | 43 | { |
44 | 44 | $check_id = $row["login_id"]; |
45 | 45 | $query = "SELECT * from total_message where (user1 = '$check_id' and user2 = '$id') or (user2 = '$check_id' and user1 = '$id')"; |
46 | - if($result1 = $this->connect->query($query)) |
|
46 | + if ($result1 = $this->connect->query($query)) |
|
47 | 47 | { |
48 | - if($result1->num_rows > 0) |
|
48 | + if ($result1->num_rows > 0) |
|
49 | 49 | { |
50 | 50 | $fetch = $result1->fetch_assoc(); |
51 | 51 | $fetch['time'] = $this->obTime->TimeConversion($fetch['time']); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | } |
58 | 58 | } |
59 | 59 | } |
60 | - if($flag != 0) |
|
60 | + if ($flag != 0) |
|
61 | 61 | { |
62 | 62 | $this->array = array_merge([], ["Search" => $this->array]); |
63 | 63 | return json_encode($this->array); |