@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | |
@@ -19,19 +19,19 @@ discard block |
||
| 19 | 19 | $location = URL . "/account.php/". $row['username']; |
| 20 | 20 | header("Location:".$location); |
| 21 | 21 | } |
| 22 | -} |
|
| 23 | -elseif ($user != "account.php") |
|
| 22 | +} elseif ($user != "account.php") |
|
| 24 | 23 | { |
| 25 | 24 | $obUser = new User(); |
| 26 | 25 | $row = $obUser->UserDetails($user, False); |
| 27 | 26 | if($row != NULL): |
| 28 | 27 | $userId = $row['login_id']; |
| 29 | 28 | $details = Profile::getProfile($userId); |
| 30 | - if($details != NULL) |
|
| 31 | - $row = array_merge($row, $details); |
|
| 32 | - else |
|
| 33 | - header("Location:".URL."/error.php"); |
|
| 34 | -?> |
|
| 29 | + if($details != NULL) { |
|
| 30 | + $row = array_merge($row, $details); |
|
| 31 | + } else { |
|
| 32 | + header("Location:".URL."/error.php"); |
|
| 33 | + } |
|
| 34 | + ?> |
|
| 35 | 35 | |
| 36 | 36 | <!Doctype html> |
| 37 | 37 | <html> |
@@ -48,10 +48,13 @@ discard block |
||
| 48 | 48 | <?php if(Session::get('start') != null): ?> |
| 49 | 49 | <li><a href="../message.php">Message</a></li> |
| 50 | 50 | <li><a href="../logout.php">Log out</a></li> |
| 51 | - <?php else: ?> |
|
| 51 | + <?php else { |
|
| 52 | + : ?> |
|
| 52 | 53 | <li><a href="../login.php">Login</a></li> |
| 53 | 54 | <li><a href="../register.php">Register</a></li> |
| 54 | - <?php endif; ?> |
|
| 55 | + <?php endif; |
|
| 56 | +} |
|
| 57 | +?> |
|
| 55 | 58 | </ul> |
| 56 | 59 | </div> |
| 57 | 60 | |
@@ -65,16 +68,21 @@ discard block |
||
| 65 | 68 | <div class="brief"> |
| 66 | 69 | <h1 id="name">Name: <?php echo $row['name']; ?></h1><br> |
| 67 | 70 | <?php foreach ($row as $key => $value) { |
| 68 | - if($key =='username' && $value != null) |
|
| 69 | - echo '<p>Username: '.$row["username"] .'</p><br>'; |
|
| 70 | - if($key == 'email' && $value != null) |
|
| 71 | - echo '<p>Email Id: '.$row["email"] .'</p><br>'; |
|
| 72 | - if($key == 'status' && $value != null) |
|
| 73 | - echo '<p>Status: '.$row["status"] .'</p><br>'; |
|
| 74 | - if($key == 'education' && $value != null) |
|
| 75 | - echo '<p>Education: '.$row["education"] .'</p><br>'; |
|
| 76 | - if($key == 'gender' && $value != null) |
|
| 77 | - echo '<p>Gender: '.$row["gender"] .'</p><br>'; |
|
| 71 | + if($key =='username' && $value != null) { |
|
| 72 | + echo '<p>Username: '.$row["username"] .'</p><br>'; |
|
| 73 | + } |
|
| 74 | + if($key == 'email' && $value != null) { |
|
| 75 | + echo '<p>Email Id: '.$row["email"] .'</p><br>'; |
|
| 76 | + } |
|
| 77 | + if($key == 'status' && $value != null) { |
|
| 78 | + echo '<p>Status: '.$row["status"] .'</p><br>'; |
|
| 79 | + } |
|
| 80 | + if($key == 'education' && $value != null) { |
|
| 81 | + echo '<p>Education: '.$row["education"] .'</p><br>'; |
|
| 82 | + } |
|
| 83 | + if($key == 'gender' && $value != null) { |
|
| 84 | + echo '<p>Gender: '.$row["gender"] .'</p><br>'; |
|
| 85 | + } |
|
| 78 | 86 | } |
| 79 | 87 | ?> |
| 80 | 88 | </div> |
@@ -116,11 +124,12 @@ discard block |
||
| 116 | 124 | </body> |
| 117 | 125 | </html> |
| 118 | 126 | <?php |
| 119 | - else: |
|
| 127 | + else { |
|
| 128 | + : |
|
| 120 | 129 | header("Location:".URL."/error.php"); |
| 130 | + } |
|
| 121 | 131 | endif; |
| 122 | -} |
|
| 123 | -else |
|
| 132 | +} else |
|
| 124 | 133 | { |
| 125 | 134 | header("Location: ".URL); |
| 126 | 135 | } |