@@ -11,97 +11,97 @@ |
||
11 | 11 | class Login |
12 | 12 | { |
13 | 13 | |
14 | - protected $flag; |
|
15 | - protected $error; |
|
16 | - protected $connect; |
|
14 | + protected $flag; |
|
15 | + protected $error; |
|
16 | + protected $connect; |
|
17 | 17 | |
18 | - public function __construct() |
|
19 | - { |
|
20 | - $this->flag = 0; |
|
21 | - $this->connect = mysqli_connect( |
|
18 | + public function __construct() |
|
19 | + { |
|
20 | + $this->flag = 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($data) |
|
31 | - { |
|
32 | - $data = $this->emptyValue($data); |
|
30 | + public function authLogin($data) |
|
31 | + { |
|
32 | + $data = $this->emptyValue($data); |
|
33 | 33 | |
34 | - $login = $data["login"]; |
|
35 | - $password = $data["passLogin"]; |
|
34 | + $login = $data["login"]; |
|
35 | + $password = $data["passLogin"]; |
|
36 | 36 | |
37 | 37 | |
38 | - if (preg_match("/^[@]{1}$/", $login)) |
|
39 | - { |
|
40 | - if(filter_var($login, FILTER_VALIDATE_EMAIL) == false) |
|
41 | - { |
|
42 | - $this->onError("login", " *Enter correct Email address"); |
|
43 | - } |
|
44 | - } |
|
38 | + if (preg_match("/^[@]{1}$/", $login)) |
|
39 | + { |
|
40 | + if(filter_var($login, FILTER_VALIDATE_EMAIL) == false) |
|
41 | + { |
|
42 | + $this->onError("login", " *Enter correct Email address"); |
|
43 | + } |
|
44 | + } |
|
45 | 45 | |
46 | - if($this->flag == 0) |
|
47 | - { |
|
48 | - $password = md5($password); |
|
49 | - $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'"; |
|
50 | - if ($result = $this->connect->query($query)) |
|
51 | - { |
|
52 | - if ($result->num_rows > 0) |
|
53 | - { |
|
54 | - $row = $result->fetch_assoc(); |
|
55 | - $loginID = $row['login_id']; |
|
56 | - $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'"; |
|
57 | - if($result = $this->connect->query($query)) |
|
58 | - { |
|
59 | - if ($result->num_rows > 0) |
|
60 | - { |
|
61 | - Session::put('start', $loginID); |
|
62 | - return json_encode([ |
|
63 | - "location" => getenv('APP_URL')."/views/account.php" |
|
64 | - ]); |
|
65 | - } |
|
66 | - $this->onError("passLogin", " *Invalid password"); |
|
67 | - return json_encode($this->error); |
|
68 | - } |
|
69 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
70 | - } |
|
71 | - $this->onError("login", " *Invalid username or email"); |
|
72 | - return json_encode($this->error); |
|
73 | - } |
|
74 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
75 | - } |
|
76 | - else |
|
77 | - { |
|
78 | - return json_encode($this->error); |
|
79 | - } |
|
80 | - } |
|
46 | + if($this->flag == 0) |
|
47 | + { |
|
48 | + $password = md5($password); |
|
49 | + $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'"; |
|
50 | + if ($result = $this->connect->query($query)) |
|
51 | + { |
|
52 | + if ($result->num_rows > 0) |
|
53 | + { |
|
54 | + $row = $result->fetch_assoc(); |
|
55 | + $loginID = $row['login_id']; |
|
56 | + $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'"; |
|
57 | + if($result = $this->connect->query($query)) |
|
58 | + { |
|
59 | + if ($result->num_rows > 0) |
|
60 | + { |
|
61 | + Session::put('start', $loginID); |
|
62 | + return json_encode([ |
|
63 | + "location" => getenv('APP_URL')."/views/account.php" |
|
64 | + ]); |
|
65 | + } |
|
66 | + $this->onError("passLogin", " *Invalid password"); |
|
67 | + return json_encode($this->error); |
|
68 | + } |
|
69 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
70 | + } |
|
71 | + $this->onError("login", " *Invalid username or email"); |
|
72 | + return json_encode($this->error); |
|
73 | + } |
|
74 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
75 | + } |
|
76 | + else |
|
77 | + { |
|
78 | + return json_encode($this->error); |
|
79 | + } |
|
80 | + } |
|
81 | 81 | |
82 | - public function onError($key, $value) |
|
83 | - { |
|
84 | - $this->flag = 1; |
|
85 | - $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]); |
|
86 | - } |
|
82 | + public function onError($key, $value) |
|
83 | + { |
|
84 | + $this->flag = 1; |
|
85 | + $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]); |
|
86 | + } |
|
87 | 87 | |
88 | - public function emptyValue($data) |
|
89 | - { |
|
90 | - $errorCode = array( |
|
91 | - "login" => " *Enter the login field", |
|
92 | - "passRegister" => " *Enter the password" |
|
93 | - ); |
|
88 | + public function emptyValue($data) |
|
89 | + { |
|
90 | + $errorCode = array( |
|
91 | + "login" => " *Enter the login field", |
|
92 | + "passRegister" => " *Enter the password" |
|
93 | + ); |
|
94 | 94 | |
95 | - foreach ($data as $key => $value) { |
|
96 | - $data[$key] = trim($data[$key]); |
|
97 | - $value = trim($value); |
|
98 | - if(empty($value)) |
|
99 | - { |
|
100 | - $this->onError($key, $errorCode[$key]); |
|
101 | - } |
|
102 | - } |
|
103 | - return $data; |
|
104 | - } |
|
95 | + foreach ($data as $key => $value) { |
|
96 | + $data[$key] = trim($data[$key]); |
|
97 | + $value = trim($value); |
|
98 | + if(empty($value)) |
|
99 | + { |
|
100 | + $this->onError($key, $errorCode[$key]); |
|
101 | + } |
|
102 | + } |
|
103 | + return $data; |
|
104 | + } |
|
105 | 105 | |
106 | 106 | } |
107 | 107 |
@@ -12,115 +12,115 @@ |
||
12 | 12 | |
13 | 13 | class Register |
14 | 14 | { |
15 | - protected $error; |
|
16 | - protected $flag; |
|
17 | - protected $obValidate; |
|
18 | - protected $connect; |
|
19 | - |
|
20 | - public function __construct() |
|
21 | - { |
|
22 | - $this->error = array(); |
|
23 | - $this->flag = 0; |
|
24 | - $this->connect = mysqli_connect( |
|
15 | + protected $error; |
|
16 | + protected $flag; |
|
17 | + protected $obValidate; |
|
18 | + protected $connect; |
|
19 | + |
|
20 | + public function __construct() |
|
21 | + { |
|
22 | + $this->error = array(); |
|
23 | + $this->flag = 0; |
|
24 | + $this->connect = mysqli_connect( |
|
25 | 25 | getenv('DB_HOST'), |
26 | 26 | getenv('DB_USER'), |
27 | 27 | getenv('DB_PASSWORD'), |
28 | 28 | getenv('DB_NAME') |
29 | 29 | ); |
30 | - $this->obValidate = new Validate(); |
|
31 | - |
|
32 | - } |
|
33 | - |
|
34 | - public function authRegister($data) |
|
35 | - { |
|
36 | - $data = $this->emptyValue($data); |
|
37 | - $name = $data["name"]; |
|
38 | - $email = $data["email"]; |
|
39 | - $username = $data["username"]; |
|
40 | - $mob = $data["mob"]; |
|
41 | - $password = $data["passRegister"]; |
|
42 | - $userId = ''; |
|
43 | - |
|
44 | - if(filter_var($email, FILTER_VALIDATE_EMAIL) == false) |
|
45 | - { |
|
46 | - $this->onError("email", " *Enter correct Email address"); |
|
47 | - } |
|
48 | - else if($this->obValidate->validateEmailInDb($email) === 1) |
|
49 | - { |
|
50 | - $this->onError("email", " *Email is already registered"); |
|
51 | - } |
|
52 | - |
|
53 | - if($this->obValidate->validateUsernameInDb($username) === 1) |
|
54 | - { |
|
55 | - $this->onError("username", " *Username is already registered"); |
|
56 | - } |
|
57 | - |
|
58 | - if (!preg_match("/^[0-9]{10}$/", $data["mob"])) { |
|
59 | - $this->onError("mob", " *Enter correct Mobile Number"); |
|
60 | - } |
|
61 | - |
|
62 | - if($this->flag == 1) |
|
63 | - { |
|
64 | - return json_encode($this->error); |
|
65 | - } |
|
66 | - |
|
67 | - $password = md5($password); |
|
68 | - |
|
69 | - $query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')"; |
|
70 | - if(!$this->connect->query($query)) |
|
71 | - { |
|
72 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
73 | - } |
|
74 | - $query = "SELECT id FROM register WHERE email = '$email'"; |
|
75 | - if($result = $this->connect->query($query)) |
|
76 | - { |
|
77 | - $row = $result->fetch_assoc(); |
|
78 | - $userId = $row['id']; |
|
79 | - $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)"; |
|
80 | - |
|
81 | - if(!$this->connect->query($query)) |
|
82 | - { |
|
83 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
84 | - } |
|
85 | - |
|
86 | - $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')"; |
|
87 | - if(!$this->connect->query($query)) |
|
88 | - { |
|
89 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
90 | - } |
|
91 | - |
|
92 | - Session::put('start', $userId); |
|
93 | - return json_encode([ |
|
94 | - "location" => getenv('APP_URL')."/views/account.php" |
|
95 | - ]); |
|
96 | - } |
|
97 | - } |
|
98 | - |
|
99 | - |
|
100 | - public function onError($key, $value) |
|
101 | - { |
|
102 | - $this->flag = 1; |
|
103 | - $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]); |
|
104 | - } |
|
105 | - |
|
106 | - public function emptyValue($data) |
|
107 | - { |
|
108 | - $errorCode = array( |
|
109 | - "name" => " *Enter the name", |
|
110 | - "email" => " *Enter the email address", |
|
111 | - "username" => " *Enter the username", |
|
112 | - "passRegister" => " *Enter the password", |
|
113 | - "mob" => " *Enter the Mobile Number" |
|
114 | - ); |
|
115 | - |
|
116 | - foreach ($data as $key => $value) { |
|
117 | - $data[$key] = trim($data[$key]); |
|
118 | - $value = trim($value); |
|
119 | - if(empty($value)) |
|
120 | - { |
|
121 | - $this->onError($key, $errorCode[$key]); |
|
122 | - } |
|
123 | - } |
|
124 | - return $data; |
|
125 | - } |
|
30 | + $this->obValidate = new Validate(); |
|
31 | + |
|
32 | + } |
|
33 | + |
|
34 | + public function authRegister($data) |
|
35 | + { |
|
36 | + $data = $this->emptyValue($data); |
|
37 | + $name = $data["name"]; |
|
38 | + $email = $data["email"]; |
|
39 | + $username = $data["username"]; |
|
40 | + $mob = $data["mob"]; |
|
41 | + $password = $data["passRegister"]; |
|
42 | + $userId = ''; |
|
43 | + |
|
44 | + if(filter_var($email, FILTER_VALIDATE_EMAIL) == false) |
|
45 | + { |
|
46 | + $this->onError("email", " *Enter correct Email address"); |
|
47 | + } |
|
48 | + else if($this->obValidate->validateEmailInDb($email) === 1) |
|
49 | + { |
|
50 | + $this->onError("email", " *Email is already registered"); |
|
51 | + } |
|
52 | + |
|
53 | + if($this->obValidate->validateUsernameInDb($username) === 1) |
|
54 | + { |
|
55 | + $this->onError("username", " *Username is already registered"); |
|
56 | + } |
|
57 | + |
|
58 | + if (!preg_match("/^[0-9]{10}$/", $data["mob"])) { |
|
59 | + $this->onError("mob", " *Enter correct Mobile Number"); |
|
60 | + } |
|
61 | + |
|
62 | + if($this->flag == 1) |
|
63 | + { |
|
64 | + return json_encode($this->error); |
|
65 | + } |
|
66 | + |
|
67 | + $password = md5($password); |
|
68 | + |
|
69 | + $query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')"; |
|
70 | + if(!$this->connect->query($query)) |
|
71 | + { |
|
72 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
73 | + } |
|
74 | + $query = "SELECT id FROM register WHERE email = '$email'"; |
|
75 | + if($result = $this->connect->query($query)) |
|
76 | + { |
|
77 | + $row = $result->fetch_assoc(); |
|
78 | + $userId = $row['id']; |
|
79 | + $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)"; |
|
80 | + |
|
81 | + if(!$this->connect->query($query)) |
|
82 | + { |
|
83 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
84 | + } |
|
85 | + |
|
86 | + $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')"; |
|
87 | + if(!$this->connect->query($query)) |
|
88 | + { |
|
89 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
90 | + } |
|
91 | + |
|
92 | + Session::put('start', $userId); |
|
93 | + return json_encode([ |
|
94 | + "location" => getenv('APP_URL')."/views/account.php" |
|
95 | + ]); |
|
96 | + } |
|
97 | + } |
|
98 | + |
|
99 | + |
|
100 | + public function onError($key, $value) |
|
101 | + { |
|
102 | + $this->flag = 1; |
|
103 | + $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]); |
|
104 | + } |
|
105 | + |
|
106 | + public function emptyValue($data) |
|
107 | + { |
|
108 | + $errorCode = array( |
|
109 | + "name" => " *Enter the name", |
|
110 | + "email" => " *Enter the email address", |
|
111 | + "username" => " *Enter the username", |
|
112 | + "passRegister" => " *Enter the password", |
|
113 | + "mob" => " *Enter the Mobile Number" |
|
114 | + ); |
|
115 | + |
|
116 | + foreach ($data as $key => $value) { |
|
117 | + $data[$key] = trim($data[$key]); |
|
118 | + $value = trim($value); |
|
119 | + if(empty($value)) |
|
120 | + { |
|
121 | + $this->onError($key, $errorCode[$key]); |
|
122 | + } |
|
123 | + } |
|
124 | + return $data; |
|
125 | + } |
|
126 | 126 | } |
@@ -5,25 +5,25 @@ |
||
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 | - $data = array( |
|
16 | - 'name' => $name, |
|
17 | - 'email' => $email, |
|
18 | - 'username' => $username, |
|
19 | - 'passRegister' => $password, |
|
20 | - 'mob' => $mob |
|
21 | - ); |
|
22 | - $result = $obRegister->authRegister($data); |
|
23 | - if(isset($result)) |
|
24 | - echo $result; |
|
25 | - else |
|
26 | - 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 | + $data = array( |
|
16 | + 'name' => $name, |
|
17 | + 'email' => $email, |
|
18 | + 'username' => $username, |
|
19 | + 'passRegister' => $password, |
|
20 | + 'mob' => $mob |
|
21 | + ); |
|
22 | + $result = $obRegister->authRegister($data); |
|
23 | + if(isset($result)) |
|
24 | + echo $result; |
|
25 | + else |
|
26 | + echo json_encode([]); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 |