Inspection of "Added dropdown menu" - ankitjain28may/openchat - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( d53ccf...d60caa )

by Ankit

created 2017-02-04 07:30 UTC

Status

Braces +31 added lines, -22 removed lines patch added patch discarded remove patch

@@ -22,19 +22,19 @@  discard block
 block discarded – undo
 		$location = getenv('APP_URL') . "/views/account.php/". $row['username'];
 		header("Location:".$location);
 	}
-}
-elseif ($user != "account.php")
+} elseif ($user != "account.php")
 {
 	$obUser = new User();
 	$row = $obUser->userDetails($user, False);
 	if($row != NULL):
 		$userId = $row['login_id'];
 		$details = Profile::getProfile($userId);
-		if($details != NULL)
-			$row = array_merge($row, $details);
-		else
-			header("Location:".getenv('APP_URL')."/views/error.php");
-?>
+		if($details != NULL) {
+					$row = array_merge($row, $details);
+		} else {
+					header("Location:".getenv('APP_URL')."/views/error.php");
+		}
+		?>
 
 		<!Doctype html>
 		<html>
@@ -51,10 +51,13 @@  discard block
 block discarded – undo
 		                <?php if(Session::get('start') != null): ?>
 							<li><a href="../message.php">Message</a></li>
 							<li><a href="../logout.php">Log out</a></li>
-						<?php else: ?>
+						<?php else {
+    : ?>
 							<li><a href="../login.php">Login</a></li>
 							<li><a href="../register.php">Register</a></li>
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 		            </ul>
 		        </div>
 
@@ -68,16 +71,21 @@  discard block
 block discarded – undo
 						<div class="brief">
 							<h1 id="name">Name: <?php echo $row['name']; ?></h1><br>
 							<?php foreach ($row as $key => $value) {
-								if($key =='username' && $value != null)
-									echo '<p>Username: '.$row["username"] .'</p><br>';
-								if($key == 'email' && $value != null)
-									echo '<p>Email Id: '.$row["email"] .'</p><br>';
-								if($key == 'status' && $value != null)
-									echo '<p>Status: '.$row["status"] .'</p><br>';
-								if($key == 'education' && $value != null)
-									echo '<p>Education: '.$row["education"] .'</p><br>';
-								if($key == 'gender' && $value != null)
-									echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
+								if($key =='username' && $value != null) {
+																	echo '<p>Username: '.$row["username"] .'</p><br>';
+								}
+								if($key == 'email' && $value != null) {
+																	echo '<p>Email Id: '.$row["email"] .'</p><br>';
+								}
+								if($key == 'status' && $value != null) {
+																	echo '<p>Status: '.$row["status"] .'</p><br>';
+								}
+								if($key == 'education' && $value != null) {
+																	echo '<p>Education: '.$row["education"] .'</p><br>';
+								}
+								if($key == 'gender' && $value != null) {
+																	echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
+								}
 							}
 							?>
 						</div>
@@ -119,11 +127,12 @@  discard block
 block discarded – undo
 			</body>
 		</html>
 <?php
-	else:
+	else {
+	    :
 		header("Location:".getenv('APP_URL')."/views/error.php");
+	}
 	endif;
-}
-else
+} else
 {
 	header("Location: ".getenv('APP_URL')."/views/");
 }

Please login to merge, or discard this patch.

src/Login.php 1 patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -72,8 +72,7 @@
 block discarded – undo
 				return json_encode($this->error);
 			}
 			return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
-		}
-		else
+		} else
 		{
 			return json_encode($this->error);
 		}

Please login to merge, or discard this patch.

src/Register.php 1 patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -44,8 +44,7 @@
 block discarded – undo
 		if(filter_var($email, FILTER_VALIDATE_EMAIL) == false)
 		{
 			$this->onError("email", " *Enter correct Email address");
-		}
-		else if($this->obValidate->validateEmailInDb($email) === 1)
+		} else if($this->obValidate->validateEmailInDb($email) === 1)
 		{
 			$this->onError("email", " *Email is already registered");
 		}

Please login to merge, or discard this patch.

views/validate_login.php 1 patch

Braces +6 added lines, -5 removed lines patch added patch discarded remove patch

@@ -14,8 +14,9 @@
 block discarded – undo
         'passLogin' => $password
     );
     $result = $obLogin->authLogin($data);
-    if(isset($result))
-        echo $result;
-    else
-        echo json_encode([]);
-}
\ No newline at end of file
+    if(isset($result)) {
+            echo $result;
+    } else {
+            echo json_encode([]);
+    }
+    }
\ No newline at end of file

Please login to merge, or discard this patch.

src/Reply.php 1 patch

Braces +14 added lines, -8 removed lines patch added patch discarded remove patch

@@ -26,19 +26,22 @@  discard block
 block discarded – undo
 
     public function replyTo($msg)
     {
-        if(!empty($msg))  //checks for the value send
+        if(!empty($msg)) {
+            //checks for the value send
         {
             $userId = $msg->userId;
+        }
             $receiverID = $msg->name; //stores id of the person whom message is to be sent
             $identifier = "";
 
-            if($receiverID > $userId)     // geneate specific unique code to store messages
+            if($receiverID > $userId) {
+                // geneate specific unique code to store messages
             {
                 $user1 = $userId;
+            }
                 $user2 = $receiverID;
                 $identifier = $userId . ":" . $receiverID;
-            }
-            else
+            } else
             {
                 $user1 = $receiverID;
                 $user2 = $userId;
@@ -57,19 +60,22 @@  discard block
 block discarded – undo
                 $query = "SELECT * from login where login_id = '$receiverID'";
 
                 $result = $this->connect->query($query);
-                if($result->num_rows > 0)     // if true
+                if($result->num_rows > 0) {
+                    // if true
                 {
                     //check whether he is sending message for thr first time or he has sent messages before
                     $query = "SELECT * from total_message where identifier = '$identifier'";
+                }
                     $result = $this->connect->query($query);
-                    if($result->num_rows > 0)               // if he has sent messages before
+                    if($result->num_rows > 0) {
+                        // if he has sent messages before
                     {
                         // Update Total_Message Table
                         $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'";
+                    }
                         return $this->updateMessages($query, $identifier, $reply, $userId, $time);
 
-                    }
-                    else    // if he sends message for the first time
+                    } else    // if he sends message for the first time
                     {
                         // insert Details in Total_Message Table
                         $query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')";

Please login to merge, or discard this patch.

src/User.php 1 patch

Braces +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -33,18 +33,18 @@
 block discarded – undo
         if($para == True)
         {
             $this->query = "SELECT * from login where login_id = '$details'";
-        }
-        else
+        } else
         {
             $this->query = "SELECT * from login where username = '$details'";
         }
         $this->result = $this->connect->query($this->query);
-        if($this->result->num_rows > 0)                   // if true
+        if($this->result->num_rows > 0) {
+            // if true
         {
             $this->details = $this->result->fetch_assoc();
-            return $this->details;
         }
-        else
+            return $this->details;
+        } else
         {
             return NULL;
         }

Please login to merge, or discard this patch.

src/Chat.php 2 patches

Unused Use Statements -2 removed lines patch added patch discarded remove patch

@@ -2,11 +2,9 @@
 block discarded – undo
 namespace ChatApp;
 use Ratchet\MessageComponentInterface;
 use Ratchet\ConnectionInterface;
-use ChatApp\Models\Message;
 use ChatApp\Reply;
 use ChatApp\Conversation;
 use ChatApp\Receiver;
-use ChatApp\SideBar;
 use ChatApp\Search;
 use ChatApp\Compose;
 use ChatApp\Online;

Please login to merge, or discard this patch.

Braces +6 added lines, -12 removed lines patch added patch discarded remove patch

@@ -55,33 +55,28 @@  discard block
 block discarded – undo
                 );
             }
             $from->send(json_encode($initial));
-        }
-        elseif ($msg->type == 'Load Sidebar')
+        } elseif ($msg->type == 'Load Sidebar')
         {
             $sidebar = (object) array();
             $sidebar->sidebar = json_decode($this->onSidebar($from->userId));
             $from->send(json_encode($sidebar));
-        }
-        elseif ($msg->type == 'Initiated')
+        } elseif ($msg->type == 'Initiated')
         {
             $msg->userId = $from->userId;
             $result = (object) array();
             $result->conversation = json_decode($this->onConversation(json_encode($msg), False));
             $from->send(json_encode($result));
-        }
-        elseif ($msg->type == 'Search')
+        } elseif ($msg->type == 'Search')
         {
             $msg->userId = $from->userId;
             $searchResult = $this->onSearch($msg);
             $from->send($searchResult);
-        }
-        elseif ($msg->type == 'Compose')
+        } elseif ($msg->type == 'Compose')
         {
             $msg->userId = $from->userId;
             $composeResult = $this->onCompose($msg);
             $from->send($composeResult);
-        }
-        else
+        } else
         {
             $msg->userId = $from->userId;
             $msg->name = convert_uudecode(hex2bin($msg->name));
@@ -108,8 +103,7 @@  discard block
 block discarded – undo
                     );
 
                     $client->send(json_encode($receiveResult));
-                }
-                elseif($client == $from)
+                } elseif($client == $from)
                 {
                     $sentResult->sidebar = json_decode($this->onSidebar($client->userId));
 

Please login to merge, or discard this patch.

tests/TestAll.php 1 patch

Unused Use Statements -1 removed lines patch added patch discarded remove patch

@@ -9,7 +9,6 @@
 block discarded – undo
 use ChatApp\Reply;
 use ChatApp\Session;
 use ChatApp\SideBar;
-
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
 $dotenv->load();

Please login to merge, or discard this patch.

views/validate_register.php 1 patch

Braces +6 added lines, -5 removed lines patch added patch discarded remove patch

@@ -20,11 +20,12 @@
 block discarded – undo
 		'mob' => $mob
 	);
 	$result = $obRegister->authRegister($data);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
-}
+	if(isset($result)) {
+			echo $result;
+	} else {
+			echo json_encode([]);
+	}
+	}
 
 
 

Please login to merge, or discard this patch.

		@@ -72,8 +72,7 @@
		block discarded – undo
72	72	return json_encode($this->error);
73	73	}
74	74	return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
75		- }
76		- else
	75	+ } else
77	76	{
78	77	return json_encode($this->error);
79	78	}

		@@ -44,8 +44,7 @@
		block discarded – undo
44	44	if(filter_var($email, FILTER_VALIDATE_EMAIL) == false)
45	45	{
46	46	$this->onError("email", " *Enter correct Email address");
47		- }
48		- else if($this->obValidate->validateEmailInDb($email) === 1)
	47	+ } else if($this->obValidate->validateEmailInDb($email) === 1)
49	48	{
50	49	$this->onError("email", " *Email is already registered");
51	50	}

		@@ -33,18 +33,18 @@
		block discarded – undo
33	33	if($para == True)
34	34	{
35	35	$this->query = "SELECT * from login where login_id = '$details'";
36		- }
37		- else
	36	+ } else
38	37	{
39	38	$this->query = "SELECT * from login where username = '$details'";
40	39	}
41	40	$this->result = $this->connect->query($this->query);
42		- if($this->result->num_rows > 0) // if true
	41	+ if($this->result->num_rows > 0) {
	42	+ // if true
43	43	{
44	44	$this->details = $this->result->fetch_assoc();
45		- return $this->details;
46	45	}
47		- else
	46	+ return $this->details;
	47	+ } else
48	48	{
49	49	return NULL;
50	50	}

		@@ -55,33 +55,28 @@ discard block
		block discarded – undo
55	55	);
56	56	}
57	57	$from->send(json_encode($initial));
58		- }
59		- elseif ($msg->type == 'Load Sidebar')
	58	+ } elseif ($msg->type == 'Load Sidebar')
60	59	{
61	60	$sidebar = (object) array();
62	61	$sidebar->sidebar = json_decode($this->onSidebar($from->userId));
63	62	$from->send(json_encode($sidebar));
64		- }
65		- elseif ($msg->type == 'Initiated')
	63	+ } elseif ($msg->type == 'Initiated')
66	64	{
67	65	$msg->userId = $from->userId;
68	66	$result = (object) array();
69	67	$result->conversation = json_decode($this->onConversation(json_encode($msg), False));
70	68	$from->send(json_encode($result));
71		- }
72		- elseif ($msg->type == 'Search')
	69	+ } elseif ($msg->type == 'Search')
73	70	{
74	71	$msg->userId = $from->userId;
75	72	$searchResult = $this->onSearch($msg);
76	73	$from->send($searchResult);
77		- }
78		- elseif ($msg->type == 'Compose')
	74	+ } elseif ($msg->type == 'Compose')
79	75	{
80	76	$msg->userId = $from->userId;
81	77	$composeResult = $this->onCompose($msg);
82	78	$from->send($composeResult);
83		- }
84		- else
	79	+ } else
85	80	{
86	81	$msg->userId = $from->userId;
87	82	$msg->name = convert_uudecode(hex2bin($msg->name));
		@@ -108,8 +103,7 @@ discard block
		block discarded – undo
108	103	);
109	104
110	105	$client->send(json_encode($receiveResult));
111		- }
112		- elseif($client == $from)
	106	+ } elseif($client == $from)
113	107	{
114	108	$sentResult->sidebar = json_decode($this->onSidebar($client->userId));
115	109

		@@ -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	}

		@@ -14,8 +14,9 @@
		block discarded – undo
14	14	'passLogin' => $password
15	15	);
16	16	$result = $obLogin->authLogin($data);
17		- if(isset($result))
18		- echo $result;
19		- else
20		- echo json_encode([]);
21		-}
22	17	\ No newline at end of file
	18	+ if(isset($result)) {
	19	+ echo $result;
	20	+ } else {
	21	+ echo json_encode([]);
	22	+ }
	23	+ }
23	24	\ No newline at end of file

		@@ -26,19 +26,22 @@ discard block
		block discarded – undo
26	26
27	27	public function replyTo($msg)
28	28	{
29		- if(!empty($msg)) //checks for the value send
	29	+ if(!empty($msg)) {
	30	+ //checks for the value send
30	31	{
31	32	$userId = $msg->userId;
	33	+ }
32	34	$receiverID = $msg->name; //stores id of the person whom message is to be sent
33	35	$identifier = "";
34	36
35		- if($receiverID > $userId) // geneate specific unique code to store messages
	37	+ if($receiverID > $userId) {
	38	+ // geneate specific unique code to store messages
36	39	{
37	40	$user1 = $userId;
	41	+ }
38	42	$user2 = $receiverID;
39	43	$identifier = $userId . ":" . $receiverID;
40		- }
41		- else
	44	+ } else
42	45	{
43	46	$user1 = $receiverID;
44	47	$user2 = $userId;
		@@ -57,19 +60,22 @@ discard block
		block discarded – undo
57	60	$query = "SELECT * from login where login_id = '$receiverID'";
58	61
59	62	$result = $this->connect->query($query);
60		- if($result->num_rows > 0) // if true
	63	+ if($result->num_rows > 0) {
	64	+ // if true
61	65	{
62	66	//check whether he is sending message for thr first time or he has sent messages before
63	67	$query = "SELECT * from total_message where identifier = '$identifier'";
	68	+ }
64	69	$result = $this->connect->query($query);
65		- if($result->num_rows > 0) // if he has sent messages before
	70	+ if($result->num_rows > 0) {
	71	+ // if he has sent messages before
66	72	{
67	73	// Update Total_Message Table
68	74	$query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'";
	75	+ }
69	76	return $this->updateMessages($query, $identifier, $reply, $userId, $time);
70	77
71		- }
72		- else // if he sends message for the first time
	78	+ } else // if he sends message for the first time
73	79	{
74	80	// insert Details in Total_Message Table
75	81	$query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')";

		@@ -2,11 +2,9 @@
		block discarded – undo
2	2	namespace ChatApp;
3	3	use Ratchet\MessageComponentInterface;
4	4	use Ratchet\ConnectionInterface;
5		-use ChatApp\Models\Message;
6	5	use ChatApp\Reply;
7	6	use ChatApp\Conversation;
8	7	use ChatApp\Receiver;
9		-use ChatApp\SideBar;
10	8	use ChatApp\Search;
11	9	use ChatApp\Compose;
12	10	use ChatApp\Online;

		@@ -9,7 +9,6 @@
		block discarded – undo
9	9	use ChatApp\Reply;
10	10	use ChatApp\Session;
11	11	use ChatApp\SideBar;
12		-
13	12	use Dotenv\Dotenv;
14	13	$dotenv = new Dotenv(dirname(__DIR__));
15	14	$dotenv->load();

		@@ -20,11 +20,12 @@
		block discarded – undo
20	20	'mob' => $mob
21	21	);
22	22	$result = $obRegister->authRegister($data);
23		- if(isset($result))
24		- echo $result;
25		- else
26		- echo json_encode([]);
27		-}
	23	+ if(isset($result)) {
	24	+ echo $result;
	25	+ } else {
	26	+ echo json_encode([]);
	27	+ }
	28	+ }
28	29
29	30
30	31

ankitjain28may / openchat

Push — master ( d53ccf...d60caa )

Status

Category

Braces +31 added lines, -22 removed lines patch added patch discarded remove patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

Braces +6 added lines, -5 removed lines patch added patch discarded remove patch

Braces +14 added lines, -8 removed lines patch added patch discarded remove patch

Braces +5 added lines, -5 removed lines patch added patch discarded remove patch

Unused Use Statements -2 removed lines patch added patch discarded remove patch

Braces +6 added lines, -12 removed lines patch added patch discarded remove patch

Unused Use Statements -1 removed lines patch added patch discarded remove patch

Braces +6 added lines, -5 removed lines patch added patch discarded remove patch