ankitjain28may /
openchat
@@ -1,13 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require (dirname(__DIR__) . '/vendor/autoload.php'); |
|
| 3 | +require (dirname(__DIR__).'/vendor/autoload.php'); |
|
| 4 | 4 | use ChatApp\Session; |
| 5 | 5 | use Dotenv\Dotenv; |
| 6 | 6 | $dotenv = new Dotenv(dirname(__DIR__)); |
| 7 | 7 | $dotenv->load(); |
| 8 | 8 | |
| 9 | 9 | |
| 10 | -if(Session::get('start') != null) |
|
| 10 | +if (Session::get('start') != null) |
|
| 11 | 11 | { |
| 12 | 12 | Session::forget('start'); |
| 13 | 13 | header('Location:'.getenv('APP_URL')."/index.php"); |
@@ -138,6 +138,6 @@ |
||
| 138 | 138 | <?php |
| 139 | 139 | } |
| 140 | 140 | else{ |
| 141 | - header('Location:'. getenv('APP_URL')."/index.php"); |
|
| 141 | + header('Location:'. getenv('APP_URL')."/index.php"); |
|
| 142 | 142 | } |
| 143 | 143 | ?> |
@@ -1,13 +1,13 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); |
|
| 3 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); |
|
| 4 | 4 | use ChatApp\Session; |
| 5 | 5 | use Dotenv\Dotenv; |
| 6 | 6 | $dotenv = new Dotenv(dirname(__DIR__)); |
| 7 | 7 | $dotenv->load(); |
| 8 | 8 | |
| 9 | 9 | |
| 10 | -if(Session::get('start') != null && empty($_GET['user'])) |
|
| 10 | +if (Session::get('start') != null && empty($_GET['user'])) |
|
| 11 | 11 | { |
| 12 | 12 | ?> |
| 13 | 13 | <!DOCTYPE html> |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | |
| 138 | 138 | <?php |
| 139 | 139 | } |
| 140 | -else{ |
|
| 141 | - header('Location:'. getenv('APP_URL')."/index.php"); |
|
| 140 | +else { |
|
| 141 | + header('Location:'.getenv('APP_URL')."/index.php"); |
|
| 142 | 142 | } |
| 143 | 143 | ?> |
@@ -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 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); |
|
| 3 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); |
|
| 4 | 4 | use ChatApp\Session; |
| 5 | 5 | use ChatApp\Profile; |
| 6 | 6 | use Dotenv\Dotenv; |
@@ -16,15 +16,15 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | $userId = Session::get('start'); |
| 18 | 18 | $data = ''; |
| 19 | -if(isset($_POST['submit'])) |
|
| 19 | +if (isset($_POST['submit'])) |
|
| 20 | 20 | { |
| 21 | 21 | $data = Profile::getProfile($userId); |
| 22 | - if($data != NULL): |
|
| 22 | + if ($data != NULL): |
|
| 23 | 23 | $status = get($_POST['status'], $data['status']); |
| 24 | 24 | $edu = get($_POST['education'], $data['education']); |
| 25 | 25 | $gender = get($_POST['gender'], $data['gender']); |
| 26 | 26 | $query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'"; |
| 27 | - if($result = $connect->query($query)) |
|
| 27 | + if ($result = $connect->query($query)) |
|
| 28 | 28 | { |
| 29 | 29 | header('Location:'.getenv('APP_URL').'/views/account.php'); |
| 30 | 30 | } |
@@ -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') . "/views/account.php/". $row['username']; |
|
| 23 | - header("Location:".$location); |
|
| 24 | - } |
|
| 20 | + if($row != NULL) |
|
| 21 | + { |
|
| 22 | + $location = getenv('APP_URL') . "/views/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')."/views/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')."/views/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')."/views/error.php"); |
|
| 124 | - endif; |
|
| 122 | + else: |
|
| 123 | + header("Location:".getenv('APP_URL')."/views/error.php"); |
|
| 124 | + endif; |
|
| 125 | 125 | } |
| 126 | 126 | else |
| 127 | 127 | { |
| 128 | - header("Location: ".getenv('APP_URL')."/views/"); |
|
| 128 | + header("Location: ".getenv('APP_URL')."/views/"); |
|
| 129 | 129 | } |
| 130 | 130 | ?> |
| 131 | 131 | |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); |
|
| 3 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); |
|
| 4 | 4 | use ChatApp\User; |
| 5 | 5 | use ChatApp\Profile; |
| 6 | 6 | use ChatApp\Session; |
@@ -10,16 +10,16 @@ discard block |
||
| 10 | 10 | // die("Hello"); |
| 11 | 11 | |
| 12 | 12 | $user = explode("/", $_SERVER['REQUEST_URI']); |
| 13 | -$user = $user[count($user)-1]; |
|
| 13 | +$user = $user[count($user) - 1]; |
|
| 14 | 14 | $userId = Session::get('start'); |
| 15 | -if($userId != null && $user == "account.php") |
|
| 15 | +if ($userId != null && $user == "account.php") |
|
| 16 | 16 | { |
| 17 | 17 | $obUser = new User(); |
| 18 | 18 | $row = $obUser->userDetails($userId, True); |
| 19 | 19 | |
| 20 | - if($row != NULL) |
|
| 20 | + if ($row != NULL) |
|
| 21 | 21 | { |
| 22 | - $location = getenv('APP_URL') . "/views/account.php/". $row['username']; |
|
| 22 | + $location = getenv('APP_URL')."/views/account.php/".$row['username']; |
|
| 23 | 23 | header("Location:".$location); |
| 24 | 24 | } |
| 25 | 25 | } |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | { |
| 28 | 28 | $obUser = new User(); |
| 29 | 29 | $row = $obUser->userDetails($user, False); |
| 30 | - if($row != NULL): |
|
| 30 | + if ($row != NULL): |
|
| 31 | 31 | $userId = $row['login_id']; |
| 32 | 32 | $details = Profile::getProfile($userId); |
| 33 | - if($details != NULL) |
|
| 33 | + if ($details != NULL) |
|
| 34 | 34 | $row = array_merge($row, $details); |
| 35 | 35 | else |
| 36 | 36 | header("Location:".getenv('APP_URL')."/views/error.php"); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | <a id="brand" href="">OpenChat</a> |
| 49 | 49 | <ul class="nav-right"> |
| 50 | 50 | <li><a href="../../index.php">About</a></li> |
| 51 | - <?php if(Session::get('start') != null): ?> |
|
| 51 | + <?php if (Session::get('start') != null): ?> |
|
| 52 | 52 | <li><a href="../message.php">Message</a></li> |
| 53 | 53 | <li><a href="../logout.php">Log out</a></li> |
| 54 | 54 | <?php else: ?> |
@@ -68,20 +68,20 @@ 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>'; |
|
| 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 | 81 | } |
| 82 | 82 | ?> |
| 83 | 83 | </div> |
| 84 | - <?php if(Session::get('start') == $row['login_id']): ?> |
|
| 84 | + <?php if (Session::get('start') == $row['login_id']): ?> |
|
| 85 | 85 | <div class="edit"> |
| 86 | 86 | <a href="#">Edit Profile</a> |
| 87 | 87 | </div> |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | </div> |
| 90 | 90 | |
| 91 | 91 | <?php |
| 92 | - if(Session::get('start') == $row['login_id']): |
|
| 92 | + if (Session::get('start') == $row['login_id']): |
|
| 93 | 93 | ?> |
| 94 | 94 | |
| 95 | 95 | <div class="boxx" id="profile"> |
@@ -99,8 +99,8 @@ discard block |
||
| 99 | 99 | <label>Education : </label> |
| 100 | 100 | <input type="text" name="education" id="education" value="<?php echo $row['education']; ?>"></input> |
| 101 | 101 | <label>Gender : </label><br> |
| 102 | - <input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender']=='Male')?'checked':'' ?>> Male<br> |
|
| 103 | - <input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender']=='Female')?'checked':'' ?>> Female<br> |
|
| 102 | + <input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender'] == 'Male') ? 'checked' : '' ?>> Male<br> |
|
| 103 | + <input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender'] == 'Female') ? 'checked' : '' ?>> Female<br> |
|
| 104 | 104 | <input type="submit" name="submit" value="Done" id="submit"> |
| 105 | 105 | </form> |
| 106 | 106 | </div> |
@@ -22,19 +22,19 @@ discard block |
||
| 22 | 22 | $location = getenv('APP_URL') . "/views/account.php/". $row['username']; |
| 23 | 23 | header("Location:".$location); |
| 24 | 24 | } |
| 25 | -} |
|
| 26 | -elseif ($user != "account.php") |
|
| 25 | +} elseif ($user != "account.php") |
|
| 27 | 26 | { |
| 28 | 27 | $obUser = new User(); |
| 29 | 28 | $row = $obUser->userDetails($user, False); |
| 30 | 29 | if($row != NULL): |
| 31 | 30 | $userId = $row['login_id']; |
| 32 | 31 | $details = Profile::getProfile($userId); |
| 33 | - if($details != NULL) |
|
| 34 | - $row = array_merge($row, $details); |
|
| 35 | - else |
|
| 36 | - header("Location:".getenv('APP_URL')."/views/error.php"); |
|
| 37 | -?> |
|
| 32 | + if($details != NULL) { |
|
| 33 | + $row = array_merge($row, $details); |
|
| 34 | + } else { |
|
| 35 | + header("Location:".getenv('APP_URL')."/views/error.php"); |
|
| 36 | + } |
|
| 37 | + ?> |
|
| 38 | 38 | |
| 39 | 39 | <!Doctype html> |
| 40 | 40 | <html> |
@@ -51,10 +51,13 @@ discard block |
||
| 51 | 51 | <?php if(Session::get('start') != null): ?> |
| 52 | 52 | <li><a href="../message.php">Message</a></li> |
| 53 | 53 | <li><a href="../logout.php">Log out</a></li> |
| 54 | - <?php else: ?> |
|
| 54 | + <?php else { |
|
| 55 | + : ?> |
|
| 55 | 56 | <li><a href="../login.php">Login</a></li> |
| 56 | 57 | <li><a href="../register.php">Register</a></li> |
| 57 | - <?php endif; ?> |
|
| 58 | + <?php endif; |
|
| 59 | +} |
|
| 60 | +?> |
|
| 58 | 61 | </ul> |
| 59 | 62 | </div> |
| 60 | 63 | |
@@ -68,16 +71,21 @@ discard block |
||
| 68 | 71 | <div class="brief"> |
| 69 | 72 | <h1 id="name">Name: <?php echo $row['name']; ?></h1><br> |
| 70 | 73 | <?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>'; |
|
| 74 | + if($key =='username' && $value != null) { |
|
| 75 | + echo '<p>Username: '.$row["username"] .'</p><br>'; |
|
| 76 | + } |
|
| 77 | + if($key == 'email' && $value != null) { |
|
| 78 | + echo '<p>Email Id: '.$row["email"] .'</p><br>'; |
|
| 79 | + } |
|
| 80 | + if($key == 'status' && $value != null) { |
|
| 81 | + echo '<p>Status: '.$row["status"] .'</p><br>'; |
|
| 82 | + } |
|
| 83 | + if($key == 'education' && $value != null) { |
|
| 84 | + echo '<p>Education: '.$row["education"] .'</p><br>'; |
|
| 85 | + } |
|
| 86 | + if($key == 'gender' && $value != null) { |
|
| 87 | + echo '<p>Gender: '.$row["gender"] .'</p><br>'; |
|
| 88 | + } |
|
| 81 | 89 | } |
| 82 | 90 | ?> |
| 83 | 91 | </div> |
@@ -119,11 +127,12 @@ discard block |
||
| 119 | 127 | </body> |
| 120 | 128 | </html> |
| 121 | 129 | <?php |
| 122 | - else: |
|
| 130 | + else { |
|
| 131 | + : |
|
| 123 | 132 | header("Location:".getenv('APP_URL')."/views/error.php"); |
| 133 | + } |
|
| 124 | 134 | endif; |
| 125 | -} |
|
| 126 | -else |
|
| 135 | +} else |
|
| 127 | 136 | { |
| 128 | 137 | header("Location: ".getenv('APP_URL')."/views/"); |
| 129 | 138 | } |
@@ -12,127 +12,127 @@ |
||
| 12 | 12 | |
| 13 | 13 | class Register |
| 14 | 14 | { |
| 15 | - protected $error; |
|
| 16 | - protected $key; |
|
| 17 | - protected $obValidate; |
|
| 18 | - protected $connect; |
|
| 19 | - |
|
| 20 | - public function __construct() |
|
| 21 | - { |
|
| 22 | - $this->error = array(); |
|
| 23 | - $this->key = 0; |
|
| 24 | - $this->connect = mysqli_connect( |
|
| 15 | + protected $error; |
|
| 16 | + protected $key; |
|
| 17 | + protected $obValidate; |
|
| 18 | + protected $connect; |
|
| 19 | + |
|
| 20 | + public function __construct() |
|
| 21 | + { |
|
| 22 | + $this->error = array(); |
|
| 23 | + $this->key = 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($name, $email, $username, $password, $mob) |
|
| 35 | - { |
|
| 36 | - $name = trim($name); |
|
| 37 | - $email = trim($email); |
|
| 38 | - $username = trim($username); |
|
| 39 | - $password = trim($password); |
|
| 40 | - $mob = trim($mob); |
|
| 41 | - $userId = ''; |
|
| 42 | - |
|
| 43 | - if (empty($name)) { |
|
| 44 | - $this->onError(["name" => " *Enter the name"]); |
|
| 45 | - } |
|
| 46 | - |
|
| 47 | - if(empty($email)) { |
|
| 48 | - $this->onError(["email" => " *Enter the email address"]); |
|
| 49 | - } |
|
| 50 | - elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) { |
|
| 51 | - $this->onError(["email" => " *Enter correct Email address"]); |
|
| 52 | - } |
|
| 53 | - else |
|
| 54 | - { |
|
| 55 | - if($this->obValidate->validateEmailInDb($email) === 1) |
|
| 56 | - { |
|
| 57 | - |
|
| 58 | - $this->onError(["email" => " *Email is already registered"]); |
|
| 59 | - } |
|
| 60 | - } |
|
| 61 | - |
|
| 62 | - if(empty($username)) { |
|
| 63 | - $this->onError(["username" => " *Enter the username"]); |
|
| 64 | - } |
|
| 65 | - else |
|
| 66 | - { |
|
| 67 | - if($this->obValidate->validateUsernameInDb($username) === 1) |
|
| 68 | - { |
|
| 69 | - |
|
| 70 | - $this->onError(["username" => " *Username is already registered"]); |
|
| 71 | - } |
|
| 72 | - } |
|
| 73 | - |
|
| 74 | - if(empty($password)) { |
|
| 75 | - $this->onError(["password" => " *Enter the password"]); |
|
| 76 | - } |
|
| 77 | - |
|
| 78 | - if(empty($mob)) { |
|
| 79 | - $this->onError(["mob" => " *Enter the Mobile Number"]); |
|
| 80 | - } |
|
| 81 | - elseif (!preg_match("/^[0-9]{10}$/", $mob)) { |
|
| 82 | - $this->onError(["mob" => " *Enter correct Mobile Number"]); |
|
| 83 | - } |
|
| 84 | - |
|
| 85 | - if($this->key == 1) |
|
| 86 | - { |
|
| 87 | - return json_encode($this->error); |
|
| 88 | - } |
|
| 89 | - else |
|
| 90 | - { |
|
| 91 | - $this->key = 0; |
|
| 92 | - $pass = md5($password); |
|
| 93 | - $query = "INSERT INTO register VALUES(null, '$email', '$username', '$pass')"; |
|
| 94 | - if(!$this->connect->query($query)) { |
|
| 95 | - $this->key = 1; |
|
| 96 | - echo "You are not registered || Error in registration1"; |
|
| 97 | - } |
|
| 98 | - else |
|
| 99 | - { |
|
| 100 | - $query = "SELECT id FROM register WHERE email = '$email'"; |
|
| 101 | - if($result = $this->connect->query($query)) { |
|
| 102 | - $row = $result->fetch_assoc(); |
|
| 103 | - $userId = $row['id']; |
|
| 104 | - |
|
| 105 | - $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)"; |
|
| 106 | - if(!$this->connect->query($query)) { |
|
| 107 | - $this->key = 1; |
|
| 108 | - echo "You are not registered || Error in registration2"; |
|
| 109 | - } |
|
| 110 | - else |
|
| 111 | - { |
|
| 112 | - $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')"; |
|
| 113 | - if(!$this->connect->query($query)) { |
|
| 114 | - $this->key = 1; |
|
| 115 | - echo "You are not registered || Error in registration3"; |
|
| 116 | - } |
|
| 117 | - } |
|
| 118 | - } |
|
| 119 | - } |
|
| 120 | - } |
|
| 121 | - if ($this->key == 0) { |
|
| 122 | - Session::put('start', $userId); |
|
| 123 | - return json_encode([ |
|
| 124 | - "location" => getenv('APP_URL')."/views/account.php" |
|
| 125 | - ]); |
|
| 126 | - } |
|
| 127 | - else |
|
| 128 | - { |
|
| 129 | - return json_encode($this->error); |
|
| 130 | - } |
|
| 131 | - } |
|
| 132 | - |
|
| 133 | - public function onError($value) |
|
| 134 | - { |
|
| 135 | - $this->key = 1; |
|
| 136 | - $this->error = array_merge($this->error, $value); |
|
| 137 | - } |
|
| 30 | + $this->obValidate = new Validate(); |
|
| 31 | + |
|
| 32 | + } |
|
| 33 | + |
|
| 34 | + public function authRegister($name, $email, $username, $password, $mob) |
|
| 35 | + { |
|
| 36 | + $name = trim($name); |
|
| 37 | + $email = trim($email); |
|
| 38 | + $username = trim($username); |
|
| 39 | + $password = trim($password); |
|
| 40 | + $mob = trim($mob); |
|
| 41 | + $userId = ''; |
|
| 42 | + |
|
| 43 | + if (empty($name)) { |
|
| 44 | + $this->onError(["name" => " *Enter the name"]); |
|
| 45 | + } |
|
| 46 | + |
|
| 47 | + if(empty($email)) { |
|
| 48 | + $this->onError(["email" => " *Enter the email address"]); |
|
| 49 | + } |
|
| 50 | + elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) { |
|
| 51 | + $this->onError(["email" => " *Enter correct Email address"]); |
|
| 52 | + } |
|
| 53 | + else |
|
| 54 | + { |
|
| 55 | + if($this->obValidate->validateEmailInDb($email) === 1) |
|
| 56 | + { |
|
| 57 | + |
|
| 58 | + $this->onError(["email" => " *Email is already registered"]); |
|
| 59 | + } |
|
| 60 | + } |
|
| 61 | + |
|
| 62 | + if(empty($username)) { |
|
| 63 | + $this->onError(["username" => " *Enter the username"]); |
|
| 64 | + } |
|
| 65 | + else |
|
| 66 | + { |
|
| 67 | + if($this->obValidate->validateUsernameInDb($username) === 1) |
|
| 68 | + { |
|
| 69 | + |
|
| 70 | + $this->onError(["username" => " *Username is already registered"]); |
|
| 71 | + } |
|
| 72 | + } |
|
| 73 | + |
|
| 74 | + if(empty($password)) { |
|
| 75 | + $this->onError(["password" => " *Enter the password"]); |
|
| 76 | + } |
|
| 77 | + |
|
| 78 | + if(empty($mob)) { |
|
| 79 | + $this->onError(["mob" => " *Enter the Mobile Number"]); |
|
| 80 | + } |
|
| 81 | + elseif (!preg_match("/^[0-9]{10}$/", $mob)) { |
|
| 82 | + $this->onError(["mob" => " *Enter correct Mobile Number"]); |
|
| 83 | + } |
|
| 84 | + |
|
| 85 | + if($this->key == 1) |
|
| 86 | + { |
|
| 87 | + return json_encode($this->error); |
|
| 88 | + } |
|
| 89 | + else |
|
| 90 | + { |
|
| 91 | + $this->key = 0; |
|
| 92 | + $pass = md5($password); |
|
| 93 | + $query = "INSERT INTO register VALUES(null, '$email', '$username', '$pass')"; |
|
| 94 | + if(!$this->connect->query($query)) { |
|
| 95 | + $this->key = 1; |
|
| 96 | + echo "You are not registered || Error in registration1"; |
|
| 97 | + } |
|
| 98 | + else |
|
| 99 | + { |
|
| 100 | + $query = "SELECT id FROM register WHERE email = '$email'"; |
|
| 101 | + if($result = $this->connect->query($query)) { |
|
| 102 | + $row = $result->fetch_assoc(); |
|
| 103 | + $userId = $row['id']; |
|
| 104 | + |
|
| 105 | + $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)"; |
|
| 106 | + if(!$this->connect->query($query)) { |
|
| 107 | + $this->key = 1; |
|
| 108 | + echo "You are not registered || Error in registration2"; |
|
| 109 | + } |
|
| 110 | + else |
|
| 111 | + { |
|
| 112 | + $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')"; |
|
| 113 | + if(!$this->connect->query($query)) { |
|
| 114 | + $this->key = 1; |
|
| 115 | + echo "You are not registered || Error in registration3"; |
|
| 116 | + } |
|
| 117 | + } |
|
| 118 | + } |
|
| 119 | + } |
|
| 120 | + } |
|
| 121 | + if ($this->key == 0) { |
|
| 122 | + Session::put('start', $userId); |
|
| 123 | + return json_encode([ |
|
| 124 | + "location" => getenv('APP_URL')."/views/account.php" |
|
| 125 | + ]); |
|
| 126 | + } |
|
| 127 | + else |
|
| 128 | + { |
|
| 129 | + return json_encode($this->error); |
|
| 130 | + } |
|
| 131 | + } |
|
| 132 | + |
|
| 133 | + public function onError($value) |
|
| 134 | + { |
|
| 135 | + $this->key = 1; |
|
| 136 | + $this->error = array_merge($this->error, $value); |
|
| 137 | + } |
|
| 138 | 138 | } |
@@ -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')."/views/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')."/views/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 | } |
