Completed
Push — master ( 361ab6...eb4497 )
by Ankit
02:40
created
src/Time.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,14 +16,14 @@
 block discarded – undo
16 16
     function TimeConversion($time)
17 17
     {
18 18
 
19
-        if(substr($time,4,11) == date("d M Y", time() + 16200))
20
-            $time = substr($time,16,5);
21
-        else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7)
22
-            $time = substr($time,0,3);
23
-        else if(substr($time,11,4) == date("Y", time() + 16200))
24
-            $time = substr($time,4,6);
19
+        if (substr($time, 4, 11) == date("d M Y", time() + 16200))
20
+            $time = substr($time, 16, 5);
21
+        else if (substr($time, 7, 8) == date("M Y", time() + 16200) && substr($time, 4, 2) - date("d") < 7)
22
+            $time = substr($time, 0, 3);
23
+        else if (substr($time, 11, 4) == date("Y", time() + 16200))
24
+            $time = substr($time, 4, 6);
25 25
         else
26
-            $time = substr($time,4,11);
26
+            $time = substr($time, 4, 11);
27 27
 
28 28
         return $time;
29 29
     }
Please login to merge, or discard this patch.
src/Models/message.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 
9 9
 class Message extends Model
10 10
 {
11
-    protected $table='message';
11
+    protected $table = 'message';
12 12
 
13 13
     protected $fillable = ['identifier_message_number', 'message', 'sent_by', 'time'];
14 14
 }
Please login to merge, or discard this patch.
src/Chat.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
     public function onMessage(ConnectionInterface $from, $msg) {
39 39
         $sessionId = $from->WebSocket->request->getCookies()['PHPSESSID'];
40
-        if($msg == 'OpenChat initiated..!')
40
+        if ($msg == 'OpenChat initiated..!')
41 41
         {
42 42
             @$initial->initial = json_decode($this->onSidebar($from->userId));
43 43
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
                     $client->send(json_encode($result));
99 99
                     $this->online = 1;
100 100
                 }
101
-                elseif($client == $from)
101
+                elseif ($client == $from)
102 102
                 {
103 103
                     @$result->sidebar = json_decode($this->onSidebar($client->userId));
104 104
 
Please login to merge, or discard this patch.
cmd.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 use Ratchet\WebSocket\WsServer;
8 8
 use ChatApp\Chat;
9 9
 
10
-$server =IoServer::factory(
10
+$server = IoServer::factory(
11 11
 	new HttpServer(
12 12
 		new WsServer(
13 13
 			new Chat()
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -8,12 +8,12 @@
 block discarded – undo
8 8
 use ChatApp\Chat;
9 9
 
10 10
 $server =IoServer::factory(
11
-	new HttpServer(
12
-		new WsServer(
13
-			new Chat()
14
-			)
15
-		)
16
-	,
17
-	8080
18
-	);
11
+    new HttpServer(
12
+        new WsServer(
13
+            new Chat()
14
+            )
15
+        )
16
+    ,
17
+    8080
18
+    );
19 19
 $server->run();
Please login to merge, or discard this patch.
logout.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-require (__DIR__ . '/vendor/autoload.php');
3
+require (__DIR__.'/vendor/autoload.php');
4 4
 use ChatApp\Session;
5 5
 
6
-if(Session::get('start') != null)
6
+if (Session::get('start') != null)
7 7
 {
8 8
     Session::forget('start');
9 9
     header('Location: index.php');
Please login to merge, or discard this patch.
ajax/validate_login.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -5,13 +5,13 @@
 block discarded – undo
5 5
 
6 6
 if(isset($_POST['q']))
7 7
 {
8
-	$loginField = json_decode($_POST['q']);
9
-	$login = $loginField->login;
10
-	$password = $loginField->password;
11
-	$obLogin = new Login();
12
-	$result = $obLogin->authLogin($login, $password);
13
-	if(isset($result))
14
-		echo $result;
15
-	else
16
-		echo json_encode([]);
8
+    $loginField = json_decode($_POST['q']);
9
+    $login = $loginField->login;
10
+    $password = $loginField->password;
11
+    $obLogin = new Login();
12
+    $result = $obLogin->authLogin($login, $password);
13
+    if(isset($result))
14
+        echo $result;
15
+    else
16
+        echo json_encode([]);
17 17
 }
18 18
\ No newline at end of file
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.
ajax/validate_register.php 2 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.
tests/ExistsTest.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,8 +76,8 @@
 block discarded – undo
76 76
     }
77 77
 
78 78
     /**
79
-    * @dataProvider ClassNameProvider
80
-    */
79
+     * @dataProvider ClassNameProvider
80
+     */
81 81
     public function testClassExists($className)
82 82
     {
83 83
         $this->assertTrue(class_exists($className));
Please login to merge, or discard this patch.
account.php 2 patches
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.
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') . "/account.php/". $row['username'];
23
-		header("Location:".$location);
24
-	}
20
+    if($row != NULL)
21
+    {
22
+        $location = getenv('APP_URL') . "/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')."/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')."/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')."/error.php");
124
-	endif;
122
+    else:
123
+        header("Location:".getenv('APP_URL')."/error.php");
124
+    endif;
125 125
 }
126 126
 else
127 127
 {
128
-	header("Location: ".getenv('APP_URL'));
128
+    header("Location: ".getenv('APP_URL'));
129 129
 }
130 130
 ?>
131 131
 
Please login to merge, or discard this patch.