@@ -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 | } |
@@ -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 | } |
@@ -11,40 +11,40 @@ |
||
11 | 11 | */ |
12 | 12 | class Validate |
13 | 13 | { |
14 | - protected $connect; |
|
14 | + protected $connect; |
|
15 | 15 | |
16 | - public function __construct() |
|
17 | - { |
|
18 | - $this->connect = mysqli_connect( |
|
16 | + public function __construct() |
|
17 | + { |
|
18 | + $this->connect = mysqli_connect( |
|
19 | 19 | getenv('DB_HOST'), |
20 | 20 | getenv('DB_USER'), |
21 | 21 | getenv('DB_PASSWORD'), |
22 | 22 | getenv('DB_NAME') |
23 | 23 | ); |
24 | - } |
|
24 | + } |
|
25 | 25 | |
26 | - public function validateEmailInDb($email) |
|
27 | - { |
|
28 | - $query = "SELECT login_id FROM login WHERE email = '$email'"; |
|
29 | - if ($result = $this->connect->query($query)) |
|
30 | - { |
|
31 | - if ($result->num_rows > 0) { |
|
32 | - return 1; |
|
33 | - } |
|
34 | - else |
|
35 | - return 0; |
|
36 | - } |
|
37 | - } |
|
26 | + public function validateEmailInDb($email) |
|
27 | + { |
|
28 | + $query = "SELECT login_id FROM login WHERE email = '$email'"; |
|
29 | + if ($result = $this->connect->query($query)) |
|
30 | + { |
|
31 | + if ($result->num_rows > 0) { |
|
32 | + return 1; |
|
33 | + } |
|
34 | + else |
|
35 | + return 0; |
|
36 | + } |
|
37 | + } |
|
38 | 38 | |
39 | - function validateUsernameInDb($username) |
|
40 | - { |
|
41 | - $query = "SELECT login_id FROM login WHERE username = '$username'"; |
|
42 | - if ($result = $this->connect->query($query)) { |
|
43 | - if ($result->num_rows > 0) { |
|
44 | - return 1; |
|
45 | - } |
|
46 | - else |
|
47 | - return 0; |
|
48 | - } |
|
49 | - } |
|
39 | + function validateUsernameInDb($username) |
|
40 | + { |
|
41 | + $query = "SELECT login_id FROM login WHERE username = '$username'"; |
|
42 | + if ($result = $this->connect->query($query)) { |
|
43 | + if ($result->num_rows > 0) { |
|
44 | + return 1; |
|
45 | + } |
|
46 | + else |
|
47 | + return 0; |
|
48 | + } |
|
49 | + } |
|
50 | 50 | } |
@@ -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 | } |
@@ -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(); |
@@ -76,8 +76,8 @@ |
||
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
79 | - * @dataProvider ClassNameProvider |
|
80 | - */ |
|
79 | + * @dataProvider ClassNameProvider |
|
80 | + */ |
|
81 | 81 | public function testClassExists($className) |
82 | 82 | { |
83 | 83 | $this->assertTrue(class_exists($className)); |
@@ -30,17 +30,19 @@ |
||
30 | 30 | |
31 | 31 | public function userDetails($userId, $para) |
32 | 32 | { |
33 | - if($para == True) |
|
34 | - $this->query = "SELECT * from login where login_id = '$userId'"; |
|
35 | - else |
|
36 | - $this->query = "SELECT * from login where username = '$userId'"; |
|
33 | + if($para == True) { |
|
34 | + $this->query = "SELECT * from login where login_id = '$userId'"; |
|
35 | + } else { |
|
36 | + $this->query = "SELECT * from login where username = '$userId'"; |
|
37 | + } |
|
37 | 38 | $this->result = $this->connect->query($this->query); |
38 | - if($this->result->num_rows > 0) // if true |
|
39 | + if($this->result->num_rows > 0) { |
|
40 | + // if true |
|
39 | 41 | { |
40 | 42 | $this->details = $this->result->fetch_assoc(); |
41 | - return $this->details; |
|
42 | 43 | } |
43 | - else |
|
44 | + return $this->details; |
|
45 | + } else |
|
44 | 46 | { |
45 | 47 | return NULL; |
46 | 48 | } |
@@ -12,8 +12,7 @@ |
||
12 | 12 | header('Location: ../../index.php'); |
13 | 13 | } |
14 | 14 | |
15 | -} |
|
16 | -else |
|
15 | +} else |
|
17 | 16 | { |
18 | 17 | echo "Please Login"; |
19 | 18 | } |
@@ -129,8 +129,7 @@ |
||
129 | 129 | </html> |
130 | 130 | |
131 | 131 | <?php |
132 | -} |
|
133 | -else{ |
|
132 | +} else{ |
|
134 | 133 | header('Location:http://www.localhost/openchat/login.php'); |
135 | 134 | } |
136 | 135 | ?> |
@@ -175,6 +175,6 @@ |
||
175 | 175 | <?php |
176 | 176 | } |
177 | 177 | else{ |
178 | - header('Location:'. getenv('APP_URL')."/index.php"); |
|
178 | + header('Location:'. getenv('APP_URL')."/index.php"); |
|
179 | 179 | } |
180 | 180 | ?> |
@@ -10,37 +10,37 @@ |
||
10 | 10 | $connect = mysqli_connect( |
11 | 11 | getenv('DB_HOST'), |
12 | 12 | getenv('DB_USER'), |
13 | - getenv('DB_PASSWORD'), |
|
14 | - getenv('DB_NAME') |
|
13 | + getenv('DB_PASSWORD'), |
|
14 | + getenv('DB_NAME') |
|
15 | 15 | ); |
16 | 16 | |
17 | 17 | $userId = Session::get('start'); |
18 | 18 | $data = ''; |
19 | 19 | if(isset($_POST['submit'])) |
20 | 20 | { |
21 | - $data = Profile::getProfile($userId); |
|
22 | - if($data != NULL): |
|
23 | - $status = get($_POST['status'], $data['status']); |
|
24 | - $edu = get($_POST['education'], $data['education']); |
|
25 | - $gender = get($_POST['gender'], $data['gender']); |
|
26 | - $query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'"; |
|
27 | - if($result = $connect->query($query)) |
|
28 | - { |
|
29 | - header('Location:'.getenv('APP_URL').'/views/account.php'); |
|
30 | - } |
|
31 | - else |
|
32 | - { |
|
33 | - header("Location:".getenv('APP_URL')."/views/error.php"); |
|
34 | - } |
|
35 | - endif; |
|
21 | + $data = Profile::getProfile($userId); |
|
22 | + if($data != NULL): |
|
23 | + $status = get($_POST['status'], $data['status']); |
|
24 | + $edu = get($_POST['education'], $data['education']); |
|
25 | + $gender = get($_POST['gender'], $data['gender']); |
|
26 | + $query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'"; |
|
27 | + if($result = $connect->query($query)) |
|
28 | + { |
|
29 | + header('Location:'.getenv('APP_URL').'/views/account.php'); |
|
30 | + } |
|
31 | + else |
|
32 | + { |
|
33 | + header("Location:".getenv('APP_URL')."/views/error.php"); |
|
34 | + } |
|
35 | + endif; |
|
36 | 36 | } |
37 | 37 | else |
38 | 38 | { |
39 | - header("Location:".getenv('APP_URL')."/views/error.php"); |
|
39 | + header("Location:".getenv('APP_URL')."/views/error.php"); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | function get($value, $default) |
43 | 43 | { |
44 | - $value = trim($value); |
|
45 | - return (isset($value) ? $value : $default); |
|
44 | + $value = trim($value); |
|
45 | + return (isset($value) ? $value : $default); |
|
46 | 46 | } |
@@ -18,14 +18,12 @@ |
||
18 | 18 | if($result = $connect->query($query)) |
19 | 19 | { |
20 | 20 | header('Location:'.URL.'/account.php'); |
21 | - } |
|
22 | - else |
|
21 | + } else |
|
23 | 22 | { |
24 | 23 | header("Location:".URL."/error.php"); |
25 | 24 | } |
26 | 25 | endif; |
27 | -} |
|
28 | -else |
|
26 | +} else |
|
29 | 27 | { |
30 | 28 | header("Location:".URL."/error.php"); |
31 | 29 | } |