@@ -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 | } |
@@ -16,14 +16,15 @@ |
||
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); |
|
25 | - else |
|
26 | - $time = substr($time,4,11); |
|
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 | + } else { |
|
26 | + $time = substr($time,4,11); |
|
27 | + } |
|
27 | 28 | |
28 | 29 | return $time; |
29 | 30 | } |
@@ -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() |
@@ -40,9 +40,9 @@ discard block |
||
40 | 40 | { |
41 | 41 | if ($result->num_rows>0) { |
42 | 42 | return 1; |
43 | + } else { |
|
44 | + return 0; |
|
43 | 45 | } |
44 | - else |
|
45 | - return 0; |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
@@ -52,9 +52,9 @@ discard block |
||
52 | 52 | if ($result=$this->connect->query($query)) { |
53 | 53 | if ($result->num_rows>0) { |
54 | 54 | return 1; |
55 | + } else { |
|
56 | + return 0; |
|
55 | 57 | } |
56 | - else |
|
57 | - return 0; |
|
58 | 58 | |
59 | 59 | } |
60 | 60 | } |
@@ -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(); |
@@ -14,12 +14,13 @@ |
||
14 | 14 | $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME); |
15 | 15 | $query = "SELECT * from profile where login_id = '$userId'"; |
16 | 16 | $result = $connect->query($query); |
17 | - if($result->num_rows > 0) // if true |
|
17 | + if($result->num_rows > 0) { |
|
18 | + // if true |
|
18 | 19 | { |
19 | 20 | $details = $result->fetch_assoc(); |
20 | - return $details; |
|
21 | 21 | } |
22 | - else |
|
22 | + return $details; |
|
23 | + } else |
|
23 | 24 | { |
24 | 25 | return NULL; |
25 | 26 | } |
@@ -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; |
@@ -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,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; |
@@ -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; |
@@ -33,18 +33,18 @@ |
||
33 | 33 | if($para == True) |
34 | 34 | { |
35 | 35 | $this->query = "SELECT * from login where login_id = '$details'"; |
36 | - } |
|
37 | - else |
|
36 | + } else |
|
38 | 37 | { |
39 | 38 | $this->query = "SELECT * from login where username = '$details'"; |
40 | 39 | } |
41 | 40 | $this->result = $this->connect->query($this->query); |
42 | - if($this->result->num_rows > 0) // if true |
|
41 | + if($this->result->num_rows > 0) { |
|
42 | + // if true |
|
43 | 43 | { |
44 | 44 | $this->details = $this->result->fetch_assoc(); |
45 | - return $this->details; |
|
46 | 45 | } |
47 | - else |
|
46 | + return $this->details; |
|
47 | + } else |
|
48 | 48 | { |
49 | 49 | return NULL; |
50 | 50 | } |
@@ -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(); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | getenv('DB_NAME') |
23 | 23 | ); |
24 | 24 | $query = "Update login set login_status = 1 where login_id = '$userId'"; |
25 | - if(!$connect->query($query)); |
|
25 | + if (!$connect->query($query)); |
|
26 | 26 | echo $connect->error; |
27 | 27 | $connect->close(); |
28 | 28 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | getenv('DB_NAME') |
37 | 37 | ); |
38 | 38 | $query = "Update login set login_status = 0 where login_id = '$userId'"; |
39 | - if(!$connect->query($query)); |
|
39 | + if (!$connect->query($query)); |
|
40 | 40 | echo $connect->error; |
41 | 41 | $connect->close(); |
42 | 42 | } |