Completed
Push — master ( 3bdd73...3b96a7 )
by Ankit
02:28
created
account.php 1 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 (__DIR__ . '/vendor/autoload.php');
3
+require_once (__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
 
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') . "/account.php/". $row['username'];
22
+		$location = getenv('APP_URL')."/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')."/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.
index.php 1 patch
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_once (__DIR__ . '/vendor/autoload.php');
3
+require_once (__DIR__.'/vendor/autoload.php');
4 4
 use ChatApp\Session;
5 5
 use Dotenv\Dotenv;
6 6
 $dotenv = new Dotenv(__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
     header("Location:".getenv('APP_URL')."/account.php");
13 13
 }
Please login to merge, or discard this patch.
check.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-require (__DIR__ . '/vendor/autoload.php');
3
+require (__DIR__.'/vendor/autoload.php');
4 4
 $dotenv = new Dotenv\Dotenv(__DIR__);
5 5
 $dotenv->load();
6 6
 
Please login to merge, or discard this patch.
message.php 1 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 (__DIR__ . '/vendor/autoload.php');
3
+require_once (__DIR__.'/vendor/autoload.php');
4 4
 use ChatApp\Session;
5 5
 use Dotenv\Dotenv;
6 6
 $dotenv = new Dotenv(__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'));
140
+else {
141
+	header('Location:'.getenv('APP_URL'));
142 142
 }
143 143
 ?>
Please login to merge, or discard this patch.
src/Conversation.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 namespace ChatApp;
4
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
4
+require_once (dirname(__DIR__).'/vendor/autoload.php');
5 5
 use ChatApp\Session;
6 6
 use ChatApp\Time;
7 7
 use ChatApp\User;
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     {
41 41
 
42 42
         $flag = 1;
43
-        if(Session::get('start') != null && isset($msg))
43
+        if (Session::get('start') != null && isset($msg))
44 44
         {
45 45
             $add_load = 0;
46 46
             $userId = Session::get('start');
@@ -50,25 +50,25 @@  discard block
 block discarded – undo
50 50
 
51 51
             $fetch = $this->obUser->userDetails($username, $para);
52 52
 
53
-            if($fetch != NULL)
53
+            if ($fetch != NULL)
54 54
             {
55 55
                 $login_id = (int)$fetch['login_id'];
56 56
 
57 57
                 // Unique Identifier
58
-                if($login_id > $userId)
58
+                if ($login_id > $userId)
59 59
                     $identifier = $userId.':'.$login_id;
60 60
                 else
61 61
                     $identifier = $login_id.':'.$userId;
62 62
 
63 63
                 $query = "SELECT total_messages from total_message where identifier = '$identifier'";
64
-                if($result = $this->connect->query($query))
64
+                if ($result = $this->connect->query($query))
65 65
                 {
66
-                    if($result->num_rows > 0)
66
+                    if ($result->num_rows > 0)
67 67
                     {
68 68
                         $total = $result->fetch_assoc();
69 69
                         $total = $total['total_messages'];
70
-                        if($total - $load > 0)
71
-                            if($total - $load > 10)
70
+                        if ($total - $load > 0)
71
+                            if ($total - $load > 10)
72 72
                                 $add_load = $load + 10;
73 73
                             else
74 74
                                 $add_load = $total;
@@ -76,14 +76,14 @@  discard block
 block discarded – undo
76 76
                 }
77 77
 
78 78
                 $query = "SELECT message, time, sent_by FROM messages WHERE identifier_message_number = '$identifier' ORDER BY id DESC limit ".$load;
79
-                if($result = $this->connect->query($query))
79
+                if ($result = $this->connect->query($query))
80 80
                 {
81
-                    if($result->num_rows > 0)
81
+                    if ($result->num_rows > 0)
82 82
                     {
83
-                        while($row = $result->fetch_assoc())
83
+                        while ($row = $result->fetch_assoc())
84 84
                         {
85 85
                             $row['time'] = $this->obTime->timeConversion($row['time']);
86
-                            $row = array_merge($row,['start' => $userId]);
86
+                            $row = array_merge($row, ['start' => $userId]);
87 87
                             $this->array = array_merge($this->array, [$row]);
88 88
                         }
89 89
 
Please login to merge, or discard this patch.
src/Compose.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 namespace ChatApp;
4
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
4
+require_once (dirname(__DIR__).'/vendor/autoload.php');
5 5
 use ChatApp\Session;
6 6
 use Dotenv\Dotenv;
7 7
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -34,18 +34,18 @@  discard block
 block discarded – undo
34 34
     public function selectUser($msg)
35 35
     {
36 36
         $msg = $msg->value;
37
-        if(Session::get('start') != null && isset($msg))
37
+        if (Session::get('start') != null && isset($msg))
38 38
         {
39 39
             $userId = Session::get('start');
40 40
             $suggestion = trim($msg);
41
-            if($suggestion != "" )
41
+            if ($suggestion != "")
42 42
             {
43 43
                 $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC";
44
-                if($result = $this->connect->query($query))
44
+                if ($result = $this->connect->query($query))
45 45
                 {
46
-                    if($result->num_rows > 0)
46
+                    if ($result->num_rows > 0)
47 47
                     {
48
-                        while($row = $result->fetch_assoc())
48
+                        while ($row = $result->fetch_assoc())
49 49
                         {
50 50
                             $this->array = array_merge($this->array, [$row]);
51 51
                         }
Please login to merge, or discard this patch.
src/Validate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace ChatApp;
3
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
3
+require_once (dirname(__DIR__).'/vendor/autoload.php');
4 4
 use Dotenv\Dotenv;
5 5
 $dotenv = new Dotenv(dirname(__DIR__));
6 6
 $dotenv->load();
Please login to merge, or discard this patch.
src/Login.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 namespace ChatApp;
4
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
4
+require_once (dirname(__DIR__).'/vendor/autoload.php');
5 5
 use ChatApp\Session;
6 6
 use Dotenv\Dotenv;
7 7
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -33,20 +33,20 @@  discard block
 block discarded – undo
33 33
 		$login = trim($login);
34 34
 		$password = trim($password);
35 35
 
36
-		if(empty($login))
36
+		if (empty($login))
37 37
 		{
38 38
 			$this->key = 1;
39 39
 			$this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
40 40
 		}
41 41
 		elseif (preg_match("/^[@]{1}$/", $login))
42 42
 		{
43
-			if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
43
+			if (filter_var($login, FILTER_VALIDATE_EMAIL) == false)
44 44
 			{
45 45
 			$this->key = 1;
46 46
 			$this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
47 47
 			}
48 48
 		}
49
-		if(empty($password)) {
49
+		if (empty($password)) {
50 50
 			$this->key = 1;
51 51
 			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
52 52
 		}
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 			$password = md5($password);
56 56
 		}
57 57
 
58
-		if($this->key == 0)
58
+		if ($this->key == 0)
59 59
 		{
60 60
 			$query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
61 61
 			if ($result = $this->connect->query($query))
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 					$row = $result->fetch_assoc();
66 66
 					$loginID = $row['login_id'];
67 67
 					$query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
68
-					if($result = $this->connect->query($query))
68
+					if ($result = $this->connect->query($query))
69 69
 					{
70 70
 						if ($result->num_rows > 0)
71 71
 						{
Please login to merge, or discard this patch.
src/Session.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,15 +6,15 @@
 block discarded – undo
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
 }
21 21
\ No newline at end of file
Please login to merge, or discard this patch.