Completed
Push — master ( 63d254...ecf2d0 )
by Ankit
03:04
created
views/logout.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
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");
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,8 +12,7 @@
 block discarded – undo
12 12
         header('Location: ../../index.php');
13 13
     }
14 14
 
15
-}
16
-else
15
+} else
17 16
 {
18 17
 	echo "Please Login";
19 18
 }
Please login to merge, or discard this patch.
views/message.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,6 +138,6 @@
 block discarded – undo
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
 ?>
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 ?>
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -129,8 +129,7 @@
 block discarded – undo
129 129
 </html>
130 130
 
131 131
 <?php
132
-}
133
-else{
132
+} else{
134 133
 	header('Location:http://www.localhost/openchat/login.php');
135 134
 }
136 135
 ?>
Please login to merge, or discard this patch.
views/profile_generate.php 3 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -10,37 +10,37 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 		}
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,14 +18,12 @@
 block discarded – undo
18 18
 		if($result = $connect->query($query))
19 19
 		{
20 20
 			header('Location:'.URL.'/account.php');
21
-		}
22
-		else
21
+		} else
23 22
 		{
24 23
 			header("Location:".URL."/error.php");
25 24
 		}
26 25
 	endif;
27
-}
28
-else
26
+} else
29 27
 {
30 28
 	header("Location:".URL."/error.php");
31 29
 }
Please login to merge, or discard this patch.
views/account.php 3 patches
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -14,26 +14,26 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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>
Please login to merge, or discard this patch.
Braces   +31 added lines, -22 removed lines patch added patch discarded remove patch
@@ -22,19 +22,19 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
views/validate_register.php 3 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -5,17 +5,17 @@
 block discarded – undo
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
-	$result = $obRegister->authRegister($name, $email, $username, $password, $mob);
16
-	if(isset($result))
17
-		echo $result;
18
-	else
19
-		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
+    $result = $obRegister->authRegister($name, $email, $username, $password, $mob);
16
+    if(isset($result))
17
+        echo $result;
18
+    else
19
+        echo json_encode([]);
20 20
 }
21 21
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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([]);
Please login to merge, or discard this patch.
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,9 +13,10 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.