@@ -5,13 +5,13 @@ |
||
5 | 5 | |
6 | 6 | if(isset($_POST['q'])) |
7 | 7 | { |
8 | - $loginField = json_decode($_POST['q']); |
|
9 | - $login = $loginField->login; |
|
10 | - $password = $loginField->password; |
|
11 | - $obLogin = new Login(); |
|
12 | - $result = $obLogin->authLogin($login, $password); |
|
13 | - if(isset($result)) |
|
14 | - echo $result; |
|
15 | - else |
|
16 | - echo json_encode([]); |
|
8 | + $loginField = json_decode($_POST['q']); |
|
9 | + $login = $loginField->login; |
|
10 | + $password = $loginField->password; |
|
11 | + $obLogin = new Login(); |
|
12 | + $result = $obLogin->authLogin($login, $password); |
|
13 | + if(isset($result)) |
|
14 | + echo $result; |
|
15 | + else |
|
16 | + echo json_encode([]); |
|
17 | 17 | } |
18 | 18 | \ No newline at end of file |
@@ -5,17 +5,17 @@ |
||
5 | 5 | |
6 | 6 | if(isset($_POST['q'])) |
7 | 7 | { |
8 | - $registerField = json_decode($_POST['q']); |
|
9 | - $name = $registerField->name; |
|
10 | - $email = $registerField->email; |
|
11 | - $username = $registerField->username; |
|
12 | - $mob = $registerField->mob; |
|
13 | - $password = $registerField->password; |
|
14 | - $obRegister = new Register(); |
|
15 | - $result = $obRegister->authRegister($name, $email, $username, $password, $mob); |
|
16 | - if(isset($result)) |
|
17 | - echo $result; |
|
18 | - else |
|
19 | - echo json_encode([]); |
|
8 | + $registerField = json_decode($_POST['q']); |
|
9 | + $name = $registerField->name; |
|
10 | + $email = $registerField->email; |
|
11 | + $username = $registerField->username; |
|
12 | + $mob = $registerField->mob; |
|
13 | + $password = $registerField->password; |
|
14 | + $obRegister = new Register(); |
|
15 | + $result = $obRegister->authRegister($name, $email, $username, $password, $mob); |
|
16 | + if(isset($result)) |
|
17 | + echo $result; |
|
18 | + else |
|
19 | + echo json_encode([]); |
|
20 | 20 | } |
21 | 21 |
@@ -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(); |
@@ -9,29 +9,29 @@ |
||
9 | 9 | $data = ''; |
10 | 10 | if(isset($_POST['submit'])) |
11 | 11 | { |
12 | - $data = Profile::getProfile($userId); |
|
13 | - if($data != NULL): |
|
14 | - $status = get($_POST['status'], $data['status']); |
|
15 | - $edu = get($_POST['education'], $data['education']); |
|
16 | - $gender = get($_POST['gender'], $data['gender']); |
|
17 | - $query = "UPDATE profile set status='$status', education='$edu', gender='$gender' where login_id = '$userId'"; |
|
18 | - if($result = $connect->query($query)) |
|
19 | - { |
|
20 | - header('Location:'.URL.'/account.php'); |
|
21 | - } |
|
22 | - else |
|
23 | - { |
|
24 | - header("Location:".URL."/error.php"); |
|
25 | - } |
|
26 | - endif; |
|
12 | + $data = Profile::getProfile($userId); |
|
13 | + if($data != NULL): |
|
14 | + $status = get($_POST['status'], $data['status']); |
|
15 | + $edu = get($_POST['education'], $data['education']); |
|
16 | + $gender = get($_POST['gender'], $data['gender']); |
|
17 | + $query = "UPDATE profile set status='$status', education='$edu', gender='$gender' where login_id = '$userId'"; |
|
18 | + if($result = $connect->query($query)) |
|
19 | + { |
|
20 | + header('Location:'.URL.'/account.php'); |
|
21 | + } |
|
22 | + else |
|
23 | + { |
|
24 | + header("Location:".URL."/error.php"); |
|
25 | + } |
|
26 | + endif; |
|
27 | 27 | } |
28 | 28 | else |
29 | 29 | { |
30 | - header("Location:".URL."/error.php"); |
|
30 | + header("Location:".URL."/error.php"); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | function get($value, $default) |
34 | 34 | { |
35 | - $value = trim($value); |
|
36 | - return (isset($value) ? $value : $default); |
|
35 | + $value = trim($value); |
|
36 | + return (isset($value) ? $value : $default); |
|
37 | 37 | } |
@@ -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)); |
@@ -14,26 +14,26 @@ discard block |
||
14 | 14 | $userId = Session::get('start'); |
15 | 15 | if($userId != null && $user == "account.php") |
16 | 16 | { |
17 | - $obUser = new User(); |
|
18 | - $row = $obUser->UserDetails($userId, True); |
|
17 | + $obUser = new User(); |
|
18 | + $row = $obUser->UserDetails($userId, True); |
|
19 | 19 | |
20 | - if($row != NULL) |
|
21 | - { |
|
22 | - $location = getenv('APP_URL') . "/account.php/". $row['username']; |
|
23 | - header("Location:".$location); |
|
24 | - } |
|
20 | + if($row != NULL) |
|
21 | + { |
|
22 | + $location = getenv('APP_URL') . "/account.php/". $row['username']; |
|
23 | + header("Location:".$location); |
|
24 | + } |
|
25 | 25 | } |
26 | 26 | elseif ($user != "account.php") |
27 | 27 | { |
28 | - $obUser = new User(); |
|
29 | - $row = $obUser->UserDetails($user, False); |
|
30 | - if($row != NULL): |
|
31 | - $userId = $row['login_id']; |
|
32 | - $details = Profile::getProfile($userId); |
|
33 | - if($details != NULL) |
|
34 | - $row = array_merge($row, $details); |
|
35 | - else |
|
36 | - header("Location:".getenv('APP_URL')."/error.php"); |
|
28 | + $obUser = new User(); |
|
29 | + $row = $obUser->UserDetails($user, False); |
|
30 | + if($row != NULL): |
|
31 | + $userId = $row['login_id']; |
|
32 | + $details = Profile::getProfile($userId); |
|
33 | + if($details != NULL) |
|
34 | + $row = array_merge($row, $details); |
|
35 | + else |
|
36 | + header("Location:".getenv('APP_URL')."/error.php"); |
|
37 | 37 | ?> |
38 | 38 | |
39 | 39 | <!Doctype html> |
@@ -68,18 +68,18 @@ discard block |
||
68 | 68 | <div class="brief"> |
69 | 69 | <h1 id="name">Name: <?php echo $row['name']; ?></h1><br> |
70 | 70 | <?php foreach ($row as $key => $value) { |
71 | - if($key =='username' && $value != null) |
|
72 | - echo '<p>Username: '.$row["username"] .'</p><br>'; |
|
73 | - if($key == 'email' && $value != null) |
|
74 | - echo '<p>Email Id: '.$row["email"] .'</p><br>'; |
|
75 | - if($key == 'status' && $value != null) |
|
76 | - echo '<p>Status: '.$row["status"] .'</p><br>'; |
|
77 | - if($key == 'education' && $value != null) |
|
78 | - echo '<p>Education: '.$row["education"] .'</p><br>'; |
|
79 | - if($key == 'gender' && $value != null) |
|
80 | - echo '<p>Gender: '.$row["gender"] .'</p><br>'; |
|
81 | - } |
|
82 | - ?> |
|
71 | + if($key =='username' && $value != null) |
|
72 | + echo '<p>Username: '.$row["username"] .'</p><br>'; |
|
73 | + if($key == 'email' && $value != null) |
|
74 | + echo '<p>Email Id: '.$row["email"] .'</p><br>'; |
|
75 | + if($key == 'status' && $value != null) |
|
76 | + echo '<p>Status: '.$row["status"] .'</p><br>'; |
|
77 | + if($key == 'education' && $value != null) |
|
78 | + echo '<p>Education: '.$row["education"] .'</p><br>'; |
|
79 | + if($key == 'gender' && $value != null) |
|
80 | + echo '<p>Gender: '.$row["gender"] .'</p><br>'; |
|
81 | + } |
|
82 | + ?> |
|
83 | 83 | </div> |
84 | 84 | <?php if(Session::get('start') == $row['login_id']): ?> |
85 | 85 | <div class="edit"> |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | </div> |
90 | 90 | |
91 | 91 | <?php |
92 | - if(Session::get('start') == $row['login_id']): |
|
93 | - ?> |
|
92 | + if(Session::get('start') == $row['login_id']): |
|
93 | + ?> |
|
94 | 94 | |
95 | 95 | <div class="boxx" id="profile"> |
96 | 96 | <form method="post" action="../profile_generate.php"> |
@@ -105,8 +105,8 @@ discard block |
||
105 | 105 | </form> |
106 | 106 | </div> |
107 | 107 | <?php |
108 | - endif; |
|
109 | - ?> |
|
108 | + endif; |
|
109 | + ?> |
|
110 | 110 | </div> |
111 | 111 | |
112 | 112 | <div class="footer"> |
@@ -119,13 +119,13 @@ discard block |
||
119 | 119 | </body> |
120 | 120 | </html> |
121 | 121 | <?php |
122 | - else: |
|
123 | - header("Location:".getenv('APP_URL')."/error.php"); |
|
124 | - endif; |
|
122 | + else: |
|
123 | + header("Location:".getenv('APP_URL')."/error.php"); |
|
124 | + endif; |
|
125 | 125 | } |
126 | 126 | else |
127 | 127 | { |
128 | - header("Location: ".getenv('APP_URL')); |
|
128 | + header("Location: ".getenv('APP_URL')); |
|
129 | 129 | } |
130 | 130 | ?> |
131 | 131 |
@@ -138,6 +138,6 @@ |
||
138 | 138 | <?php |
139 | 139 | } |
140 | 140 | else{ |
141 | - header('Location:'. getenv('APP_URL')); |
|
141 | + header('Location:'. getenv('APP_URL')); |
|
142 | 142 | } |
143 | 143 | ?> |
@@ -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 | } |
@@ -11,88 +11,88 @@ |
||
11 | 11 | class Login |
12 | 12 | { |
13 | 13 | |
14 | - protected $key; |
|
15 | - protected $error; |
|
16 | - protected $connect; |
|
14 | + protected $key; |
|
15 | + protected $error; |
|
16 | + protected $connect; |
|
17 | 17 | |
18 | - public function __construct() |
|
19 | - { |
|
20 | - $this->key = 0; |
|
21 | - $this->connect = mysqli_connect( |
|
18 | + public function __construct() |
|
19 | + { |
|
20 | + $this->key = 0; |
|
21 | + $this->connect = mysqli_connect( |
|
22 | 22 | getenv('DB_HOST'), |
23 | 23 | getenv('DB_USER'), |
24 | 24 | getenv('DB_PASSWORD'), |
25 | 25 | getenv('DB_NAME') |
26 | 26 | ); |
27 | - $this->error = array(); |
|
28 | - } |
|
27 | + $this->error = array(); |
|
28 | + } |
|
29 | 29 | |
30 | - public function authLogin($login, $password) |
|
31 | - { |
|
30 | + public function authLogin($login, $password) |
|
31 | + { |
|
32 | 32 | |
33 | - $login = trim($login); |
|
34 | - $password = trim($password); |
|
33 | + $login = trim($login); |
|
34 | + $password = trim($password); |
|
35 | 35 | |
36 | - if(empty($login)) |
|
37 | - { |
|
38 | - $this->key = 1; |
|
39 | - $this->error = array_merge($this->error, ["login" => " *Enter the login field"]); |
|
40 | - } |
|
41 | - elseif (preg_match("/^[@]{1}$/", $login)) |
|
42 | - { |
|
43 | - if(filter_var($login, FILTER_VALIDATE_EMAIL) == false) |
|
44 | - { |
|
45 | - $this->key = 1; |
|
46 | - $this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]); |
|
47 | - } |
|
48 | - } |
|
49 | - if(empty($password)) { |
|
50 | - $this->key = 1; |
|
51 | - $this->error = array_merge($this->error, ["password" => " *Enter the password"]); |
|
52 | - } |
|
53 | - else |
|
54 | - { |
|
55 | - $password = md5($password); |
|
56 | - } |
|
36 | + if(empty($login)) |
|
37 | + { |
|
38 | + $this->key = 1; |
|
39 | + $this->error = array_merge($this->error, ["login" => " *Enter the login field"]); |
|
40 | + } |
|
41 | + elseif (preg_match("/^[@]{1}$/", $login)) |
|
42 | + { |
|
43 | + if(filter_var($login, FILTER_VALIDATE_EMAIL) == false) |
|
44 | + { |
|
45 | + $this->key = 1; |
|
46 | + $this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]); |
|
47 | + } |
|
48 | + } |
|
49 | + if(empty($password)) { |
|
50 | + $this->key = 1; |
|
51 | + $this->error = array_merge($this->error, ["password" => " *Enter the password"]); |
|
52 | + } |
|
53 | + else |
|
54 | + { |
|
55 | + $password = md5($password); |
|
56 | + } |
|
57 | 57 | |
58 | - if($this->key == 0) |
|
59 | - { |
|
60 | - $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'"; |
|
61 | - if ($result = $this->connect->query($query)) |
|
62 | - { |
|
63 | - if ($result->num_rows > 0) |
|
64 | - { |
|
65 | - $row = $result->fetch_assoc(); |
|
66 | - $loginID = $row['login_id']; |
|
67 | - $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'"; |
|
68 | - if($result = $this->connect->query($query)) |
|
69 | - { |
|
70 | - if ($result->num_rows > 0) |
|
71 | - { |
|
72 | - Session::put('start', $loginID); |
|
73 | - return json_encode([ |
|
74 | - "location" => getenv('APP_URL')."/account.php" |
|
75 | - ]); |
|
76 | - } |
|
77 | - else |
|
78 | - { |
|
79 | - $this->error = array_merge($this->error, ["password" => " *Invalid password"]); |
|
80 | - return json_encode($this->error); |
|
81 | - } |
|
82 | - } |
|
83 | - } |
|
84 | - else |
|
85 | - { |
|
86 | - $this->error = array_merge($this->error, ["login" => " *Invalid username or email"]); |
|
87 | - return json_encode($this->error); |
|
88 | - } |
|
89 | - } |
|
58 | + if($this->key == 0) |
|
59 | + { |
|
60 | + $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'"; |
|
61 | + if ($result = $this->connect->query($query)) |
|
62 | + { |
|
63 | + if ($result->num_rows > 0) |
|
64 | + { |
|
65 | + $row = $result->fetch_assoc(); |
|
66 | + $loginID = $row['login_id']; |
|
67 | + $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'"; |
|
68 | + if($result = $this->connect->query($query)) |
|
69 | + { |
|
70 | + if ($result->num_rows > 0) |
|
71 | + { |
|
72 | + Session::put('start', $loginID); |
|
73 | + return json_encode([ |
|
74 | + "location" => getenv('APP_URL')."/account.php" |
|
75 | + ]); |
|
76 | + } |
|
77 | + else |
|
78 | + { |
|
79 | + $this->error = array_merge($this->error, ["password" => " *Invalid password"]); |
|
80 | + return json_encode($this->error); |
|
81 | + } |
|
82 | + } |
|
83 | + } |
|
84 | + else |
|
85 | + { |
|
86 | + $this->error = array_merge($this->error, ["login" => " *Invalid username or email"]); |
|
87 | + return json_encode($this->error); |
|
88 | + } |
|
89 | + } |
|
90 | 90 | |
91 | - } |
|
92 | - else |
|
93 | - { |
|
94 | - return json_encode($this->error); |
|
95 | - } |
|
96 | - $this->connect->close(); |
|
97 | - } |
|
91 | + } |
|
92 | + else |
|
93 | + { |
|
94 | + return json_encode($this->error); |
|
95 | + } |
|
96 | + $this->connect->close(); |
|
97 | + } |
|
98 | 98 | } |