@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require (dirname(__DIR__) . '/vendor/autoload.php'); |
|
3 | +require (dirname(__DIR__).'/vendor/autoload.php'); |
|
4 | 4 | use ChatApp\Register; |
5 | 5 | |
6 | -if(isset($_POST['q'])) |
|
6 | +if (isset($_POST['q'])) |
|
7 | 7 | { |
8 | 8 | $registerField = json_decode($_POST['q']); |
9 | 9 | $name = $registerField->name; |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | $password = $registerField->password; |
14 | 14 | $obRegister = new Register(); |
15 | 15 | $result = $obRegister->authRegister($name, $email, $username, $password, $mob); |
16 | - if(isset($result)) |
|
16 | + if (isset($result)) |
|
17 | 17 | echo $result; |
18 | 18 | else |
19 | 19 | echo json_encode([]); |
@@ -6,15 +6,15 @@ |
||
6 | 6 | class Session |
7 | 7 | { |
8 | 8 | |
9 | - public static function put($key, $value){ |
|
9 | + public static function put($key, $value) { |
|
10 | 10 | $_SESSION[$key] = $value; |
11 | 11 | } |
12 | 12 | |
13 | - public static function get($key){ |
|
13 | + public static function get($key) { |
|
14 | 14 | return (isset($_SESSION[$key]) ? $_SESSION[$key] : null); |
15 | 15 | } |
16 | 16 | |
17 | - public static function forget($key){ |
|
17 | + public static function forget($key) { |
|
18 | 18 | unset($_SESSION[$key]); |
19 | 19 | } |
20 | 20 | } |
@@ -1,22 +1,22 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once (__DIR__ . '/vendor/autoload.php'); |
|
4 | -require_once (__DIR__ . '/config/database.php'); |
|
3 | +require_once (__DIR__.'/vendor/autoload.php'); |
|
4 | +require_once (__DIR__.'/config/database.php'); |
|
5 | 5 | use ChatApp\User; |
6 | 6 | use ChatApp\Profile; |
7 | 7 | use ChatApp\Session; |
8 | 8 | |
9 | 9 | $user = explode("/", $_SERVER['REQUEST_URI']); |
10 | -$user = $user[count($user)-1]; |
|
10 | +$user = $user[count($user) - 1]; |
|
11 | 11 | $userId = Session::get('start'); |
12 | -if($userId != null && $user == "account.php") |
|
12 | +if ($userId != null && $user == "account.php") |
|
13 | 13 | { |
14 | 14 | $obUser = new User(); |
15 | 15 | $row = $obUser->UserDetails($userId, True); |
16 | 16 | |
17 | - if($row != NULL) |
|
17 | + if ($row != NULL) |
|
18 | 18 | { |
19 | - $location = URL . "/account.php/". $row['username']; |
|
19 | + $location = URL."/account.php/".$row['username']; |
|
20 | 20 | header("Location:".$location); |
21 | 21 | } |
22 | 22 | } |
@@ -24,10 +24,10 @@ discard block |
||
24 | 24 | { |
25 | 25 | $obUser = new User(); |
26 | 26 | $row = $obUser->UserDetails($user, False); |
27 | - if($row != NULL): |
|
27 | + if ($row != NULL): |
|
28 | 28 | $userId = $row['login_id']; |
29 | 29 | $details = Profile::getProfile($userId); |
30 | - if($details != NULL) |
|
30 | + if ($details != NULL) |
|
31 | 31 | $row = array_merge($row, $details); |
32 | 32 | else |
33 | 33 | header("Location:".URL."/error.php"); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | <a id="brand" href="">OpenChat</a> |
46 | 46 | <ul class="nav-right"> |
47 | 47 | <li><a href="../index.php">About</a></li> |
48 | - <?php if(Session::get('start') != null): ?> |
|
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 | 51 | <?php else: ?> |
@@ -65,20 +65,20 @@ discard block |
||
65 | 65 | <div class="brief"> |
66 | 66 | <h1 id="name">Name: <?php echo $row['name']; ?></h1><br> |
67 | 67 | <?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>'; |
|
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>'; |
|
78 | 78 | } |
79 | 79 | ?> |
80 | 80 | </div> |
81 | - <?php if(Session::get('start') == $row['login_id']): ?> |
|
81 | + <?php if (Session::get('start') == $row['login_id']): ?> |
|
82 | 82 | <div class="edit"> |
83 | 83 | <a href="#">Edit Profile</a> |
84 | 84 | </div> |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | </div> |
87 | 87 | |
88 | 88 | <?php |
89 | - if(Session::get('start') == $row['login_id']): |
|
89 | + if (Session::get('start') == $row['login_id']): |
|
90 | 90 | ?> |
91 | 91 | |
92 | 92 | <div class="boxx" id="profile"> |
@@ -96,8 +96,8 @@ discard block |
||
96 | 96 | <label>Education : </label> |
97 | 97 | <input type="text" name="education" id="education" value="<?php echo $row['education']; ?>"></input> |
98 | 98 | <label>Gender : </label><br> |
99 | - <input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender']=='Male')?'checked':'' ?>> Male<br> |
|
100 | - <input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender']=='Female')?'checked':'' ?>> Female<br> |
|
99 | + <input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender'] == 'Male') ? 'checked' : '' ?>> Male<br> |
|
100 | + <input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender'] == 'Female') ? 'checked' : '' ?>> Female<br> |
|
101 | 101 | <input type="submit" name="submit" value="Done" id="submit"> |
102 | 102 | </form> |
103 | 103 | </div> |
@@ -1,21 +1,21 @@ |
||
1 | 1 | <?php |
2 | -require_once (__DIR__ . '/config/database.php'); |
|
3 | -require_once (__DIR__ . '/vendor/autoload.php'); |
|
2 | +require_once (__DIR__.'/config/database.php'); |
|
3 | +require_once (__DIR__.'/vendor/autoload.php'); |
|
4 | 4 | use ChatApp\Session; |
5 | 5 | use ChatApp\Profile; |
6 | 6 | |
7 | 7 | $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME); |
8 | 8 | $userId = Session::get('start'); |
9 | 9 | $data = ''; |
10 | -if(isset($_POST['submit'])) |
|
10 | +if (isset($_POST['submit'])) |
|
11 | 11 | { |
12 | 12 | $data = Profile::getProfile($userId); |
13 | - if($data != NULL): |
|
13 | + if ($data != NULL): |
|
14 | 14 | $status = get($_POST['status'], $data['status']); |
15 | 15 | $edu = get($_POST['education'], $data['education']); |
16 | 16 | $gender = get($_POST['gender'], $data['gender']); |
17 | 17 | $query = "UPDATE profile set status='$status', education='$edu', gender='$gender' where login_id = '$userId'"; |
18 | - if($result = $connect->query($query)) |
|
18 | + if ($result = $connect->query($query)) |
|
19 | 19 | { |
20 | 20 | header('Location:'.URL.'/account.php'); |
21 | 21 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | // Define database connection constants |
3 | 3 | define('DB_HOST', 'localhost'); |
4 | 4 | define('DB_USER', 'root'); |
5 | - define('DB_PASSWORD',''); |
|
5 | + define('DB_PASSWORD', ''); |
|
6 | 6 | define('DB_NAME', 'openchat'); |
7 | 7 | define('URL', URL()); |
8 | 8 | |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | $host = $_SERVER['SERVER_NAME']; |
13 | 13 | $port = $_SERVER['SERVER_PORT']; |
14 | 14 | $fol = ""; |
15 | - if(@$_SERVER['SERVER_ADDR']!=NULL) |
|
15 | + if (@$_SERVER['SERVER_ADDR'] != NULL) |
|
16 | 16 | { |
17 | 17 | $fol = "/".explode('/', $_SERVER['PHP_SELF'])[1]; |
18 | 18 | } |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | namespace ChatApp; |
4 | 4 | use ChatApp\Validate; |
5 | 5 | use ChatApp\Session; |
6 | -require_once (dirname(__DIR__) . '/config/database.php'); |
|
6 | +require_once (dirname(__DIR__).'/config/database.php'); |
|
7 | 7 | |
8 | 8 | class Register |
9 | 9 | { |
@@ -34,45 +34,45 @@ discard block |
||
34 | 34 | $this->onError(["name" => " *Enter the name"]); |
35 | 35 | } |
36 | 36 | |
37 | - if(empty($email)) { |
|
37 | + if (empty($email)) { |
|
38 | 38 | $this->onError(["email" => " *Enter the email address"]); |
39 | 39 | } |
40 | - elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) { |
|
40 | + elseif (filter_var($email, FILTER_VALIDATE_EMAIL) == false) { |
|
41 | 41 | $this->onError(["email" => " *Enter correct Email address"]); |
42 | 42 | } |
43 | 43 | else |
44 | 44 | { |
45 | - if($this->obValidate->validateEmailInDb($email) === 1) |
|
45 | + if ($this->obValidate->validateEmailInDb($email) === 1) |
|
46 | 46 | { |
47 | 47 | |
48 | 48 | $this->onError(["email" => " *Email is already registered"]); |
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
52 | - if(empty($username)) { |
|
52 | + if (empty($username)) { |
|
53 | 53 | $this->onError(["username" => " *Enter the username"]); |
54 | 54 | } |
55 | 55 | else |
56 | 56 | { |
57 | - if($this->obValidate->validateUsernameInDb($username) === 1) |
|
57 | + if ($this->obValidate->validateUsernameInDb($username) === 1) |
|
58 | 58 | { |
59 | 59 | |
60 | 60 | $this->onError(["username" => " *Username is already registered"]); |
61 | 61 | } |
62 | 62 | } |
63 | 63 | |
64 | - if(empty($password)) { |
|
64 | + if (empty($password)) { |
|
65 | 65 | $this->onError(["password" => " *Enter the password"]); |
66 | 66 | } |
67 | 67 | |
68 | - if(empty($mob)) { |
|
68 | + if (empty($mob)) { |
|
69 | 69 | $this->onError(["mob" => " *Enter the Mobile Number"]); |
70 | 70 | } |
71 | 71 | elseif (!preg_match("/^[0-9]{10}$/", $mob)) { |
72 | 72 | $this->onError(["mob" => " *Enter correct Mobile Number"]); |
73 | 73 | } |
74 | 74 | |
75 | - if($this->key == 1) |
|
75 | + if ($this->key == 1) |
|
76 | 76 | { |
77 | 77 | return json_encode($this->error); |
78 | 78 | } |
@@ -81,26 +81,26 @@ discard block |
||
81 | 81 | $this->key = 0; |
82 | 82 | $pass = md5($password); |
83 | 83 | $query = "INSERT INTO register VALUES(null, '$email', '$username', '$pass')"; |
84 | - if(!$this->connect->query($query)) { |
|
84 | + if (!$this->connect->query($query)) { |
|
85 | 85 | $this->key = 1; |
86 | 86 | echo "You are not registered || Error in registration1"; |
87 | 87 | } |
88 | 88 | else |
89 | 89 | { |
90 | 90 | $query = "SELECT id FROM register WHERE email = '$email'"; |
91 | - if($result = $this->connect->query($query)) { |
|
91 | + if ($result = $this->connect->query($query)) { |
|
92 | 92 | $row = $result->fetch_assoc(); |
93 | 93 | $userId = $row['id']; |
94 | 94 | |
95 | 95 | $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)"; |
96 | - if(!$this->connect->query($query)) { |
|
96 | + if (!$this->connect->query($query)) { |
|
97 | 97 | $this->key = 1; |
98 | 98 | echo "You are not registered || Error in registration2"; |
99 | 99 | } |
100 | 100 | else |
101 | 101 | { |
102 | 102 | $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')"; |
103 | - if(!$this->connect->query($query)) { |
|
103 | + if (!$this->connect->query($query)) { |
|
104 | 104 | $this->key = 1; |
105 | 105 | echo "You are not registered || Error in registration3"; |
106 | 106 | } |