@@ -20,19 +20,19 @@ discard block |
||
20 | 20 | $location = URL . "/account.php/". $row['username']; |
21 | 21 | header("Location:".$location); |
22 | 22 | } |
23 | -} |
|
24 | -elseif ($user != "account.php") |
|
23 | +} elseif ($user != "account.php") |
|
25 | 24 | { |
26 | 25 | $obUser = new User(); |
27 | 26 | $row = $obUser->UserDetails($user, False); |
28 | 27 | if($row != NULL): |
29 | 28 | $userId = $row['login_id']; |
30 | 29 | $details = Profile::getProfile($userId); |
31 | - if($details != NULL) |
|
32 | - $row = array_merge($row, $details); |
|
33 | - else |
|
34 | - header("Location:".URL."/error.php"); |
|
35 | -?> |
|
30 | + if($details != NULL) { |
|
31 | + $row = array_merge($row, $details); |
|
32 | + } else { |
|
33 | + header("Location:".URL."/error.php"); |
|
34 | + } |
|
35 | + ?> |
|
36 | 36 | |
37 | 37 | <!Doctype html> |
38 | 38 | <html> |
@@ -49,10 +49,13 @@ discard block |
||
49 | 49 | <?php if($session->get('start') != null): ?> |
50 | 50 | <li><a href="../message.php">Message</a></li> |
51 | 51 | <li><a href="../logout.php">Log out</a></li> |
52 | - <?php else: ?> |
|
52 | + <?php else { |
|
53 | + : ?> |
|
53 | 54 | <li><a href="../login.php">Login</a></li> |
54 | 55 | <li><a href="../register.php">Register</a></li> |
55 | - <?php endif; ?> |
|
56 | + <?php endif; |
|
57 | +} |
|
58 | +?> |
|
56 | 59 | </ul> |
57 | 60 | </div> |
58 | 61 | |
@@ -66,16 +69,21 @@ discard block |
||
66 | 69 | <div class="brief"> |
67 | 70 | <h1 id="name">Name: <?php echo $row['name']; ?></h1><br> |
68 | 71 | <?php foreach ($row as $key => $value) { |
69 | - if($key =='username' and $value != null) |
|
70 | - echo '<p>Username: '.$row["username"] .'</p><br>'; |
|
71 | - if($key == 'email' and $value != null) |
|
72 | - echo '<p>Email Id: '.$row["email"] .'</p><br>'; |
|
73 | - if($key == 'status' and $value != null) |
|
74 | - echo '<p>Status: '.$row["status"] .'</p><br>'; |
|
75 | - if($key == 'education' and $value != null) |
|
76 | - echo '<p>Education: '.$row["education"] .'</p><br>'; |
|
77 | - if($key == 'gender' and $value != null) |
|
78 | - echo '<p>Gender: '.$row["gender"] .'</p><br>'; |
|
72 | + if($key =='username' and $value != null) { |
|
73 | + echo '<p>Username: '.$row["username"] .'</p><br>'; |
|
74 | + } |
|
75 | + if($key == 'email' and $value != null) { |
|
76 | + echo '<p>Email Id: '.$row["email"] .'</p><br>'; |
|
77 | + } |
|
78 | + if($key == 'status' and $value != null) { |
|
79 | + echo '<p>Status: '.$row["status"] .'</p><br>'; |
|
80 | + } |
|
81 | + if($key == 'education' and $value != null) { |
|
82 | + echo '<p>Education: '.$row["education"] .'</p><br>'; |
|
83 | + } |
|
84 | + if($key == 'gender' and $value != null) { |
|
85 | + echo '<p>Gender: '.$row["gender"] .'</p><br>'; |
|
86 | + } |
|
79 | 87 | } |
80 | 88 | ?> |
81 | 89 | </div> |
@@ -117,11 +125,12 @@ discard block |
||
117 | 125 | </body> |
118 | 126 | </html> |
119 | 127 | <?php |
120 | - else: |
|
128 | + else { |
|
129 | + : |
|
121 | 130 | header("Location:".URL."/error.php"); |
131 | + } |
|
122 | 132 | endif; |
123 | -} |
|
124 | -else |
|
133 | +} else |
|
125 | 134 | { |
126 | 135 | header("Location: ".URL); |
127 | 136 | } |
@@ -30,8 +30,7 @@ discard block |
||
30 | 30 | { |
31 | 31 | $this->key = 1; |
32 | 32 | $this->error = array_merge($this->error, ["login" => " *Enter the login field"]); |
33 | - } |
|
34 | - elseif (preg_match("/^[@]{1}$/", $login)) |
|
33 | + } elseif (preg_match("/^[@]{1}$/", $login)) |
|
35 | 34 | { |
36 | 35 | if(filter_var($login, FILTER_VALIDATE_EMAIL) == false) |
37 | 36 | { |
@@ -42,8 +41,7 @@ discard block |
||
42 | 41 | if(empty($password)) { |
43 | 42 | $this->key = 1; |
44 | 43 | $this->error = array_merge($this->error, ["password" => " *Enter the password"]); |
45 | - } |
|
46 | - else |
|
44 | + } else |
|
47 | 45 | { |
48 | 46 | $password = md5($password); |
49 | 47 | } |
@@ -66,23 +64,20 @@ discard block |
||
66 | 64 | return json_encode([ |
67 | 65 | "location" => URL."/account.php" |
68 | 66 | ]); |
69 | - } |
|
70 | - else |
|
67 | + } else |
|
71 | 68 | { |
72 | 69 | $this->error = array_merge($this->error, ["password" => " *Invalid password"]); |
73 | 70 | return json_encode($this->error); |
74 | 71 | } |
75 | 72 | } |
76 | - } |
|
77 | - else |
|
73 | + } else |
|
78 | 74 | { |
79 | 75 | $this->error = array_merge($this->error, ["login" => " *Invalid username or email"]); |
80 | 76 | return json_encode($this->error); |
81 | 77 | } |
82 | 78 | } |
83 | 79 | |
84 | - } |
|
85 | - else |
|
80 | + } else |
|
86 | 81 | { |
87 | 82 | return json_encode($this->error); |
88 | 83 | } |
@@ -38,11 +38,9 @@ discard block |
||
38 | 38 | |
39 | 39 | if(empty($email)) { |
40 | 40 | $this->onError(["email" => " *Enter the email address"]); |
41 | - } |
|
42 | - elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) { |
|
41 | + } elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) { |
|
43 | 42 | $this->onError(["email" => " *Enter correct Email address"]); |
44 | - } |
|
45 | - else |
|
43 | + } else |
|
46 | 44 | { |
47 | 45 | if($this->obValidate->validateEmailInDb($email) === 1) |
48 | 46 | { |
@@ -53,8 +51,7 @@ discard block |
||
53 | 51 | |
54 | 52 | if(empty($username)) { |
55 | 53 | $this->onError(["username" => " *Enter the username"]); |
56 | - } |
|
57 | - else |
|
54 | + } else |
|
58 | 55 | { |
59 | 56 | if($this->obValidate->validateUsernameInDb($username) === 1) |
60 | 57 | { |
@@ -69,16 +66,14 @@ discard block |
||
69 | 66 | |
70 | 67 | if(empty($mob)) { |
71 | 68 | $this->onError(["mob" => " *Enter the Mobile Number"]); |
72 | - } |
|
73 | - elseif (!preg_match("/^[0-9]{10}$/", $mob)) { |
|
69 | + } elseif (!preg_match("/^[0-9]{10}$/", $mob)) { |
|
74 | 70 | $this->onError(["mob" => " *Enter correct Mobile Number"]); |
75 | 71 | } |
76 | 72 | |
77 | 73 | if($this->key == 1) |
78 | 74 | { |
79 | 75 | return json_encode($this->error); |
80 | - } |
|
81 | - else |
|
76 | + } else |
|
82 | 77 | { |
83 | 78 | $this->key = 0; |
84 | 79 | $pass = md5($password); |
@@ -86,8 +81,7 @@ discard block |
||
86 | 81 | if(!$this->connect->query($query)) { |
87 | 82 | $this->key = 1; |
88 | 83 | echo "You are not registered || Error in registration2"; |
89 | - } |
|
90 | - else |
|
84 | + } else |
|
91 | 85 | { |
92 | 86 | $query = "SELECT id FROM register WHERE email = '$email'"; |
93 | 87 | if($result = $this->connect->query($query)) { |
@@ -107,8 +101,7 @@ discard block |
||
107 | 101 | return json_encode([ |
108 | 102 | "location" => URL."/account.php" |
109 | 103 | ]); |
110 | - } |
|
111 | - else |
|
104 | + } else |
|
112 | 105 | { |
113 | 106 | return json_encode($this->error); |
114 | 107 | } |
@@ -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 | } |
@@ -10,8 +10,9 @@ |
||
10 | 10 | $password = $loginField->password; |
11 | 11 | $obLogin = new Login(); |
12 | 12 | $result = $obLogin->authLogin($login, $password); |
13 | - if(isset($result)) |
|
14 | - echo $result; |
|
15 | - else |
|
16 | - echo json_encode([]); |
|
17 | -} |
|
18 | 13 | \ No newline at end of file |
14 | + if(isset($result)) { |
|
15 | + echo $result; |
|
16 | + } else { |
|
17 | + echo json_encode([]); |
|
18 | + } |
|
19 | + } |
|
19 | 20 | \ No newline at end of file |
@@ -13,9 +13,10 @@ |
||
13 | 13 | $password = $registerField->password; |
14 | 14 | $obRegister = new Register(); |
15 | 15 | $result = $obRegister->authRegister($name, $email, $username, $password, $mob); |
16 | - if(isset($result)) |
|
17 | - echo $result; |
|
18 | - else |
|
19 | - echo json_encode([]); |
|
20 | -} |
|
16 | + if(isset($result)) { |
|
17 | + echo $result; |
|
18 | + } else { |
|
19 | + echo json_encode([]); |
|
20 | + } |
|
21 | + } |
|
21 | 22 |