ankitjain28may / openchat

src/Search.php

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Time;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -34,20 +34,20 @@ 
         $userId = $suggestion->userId;
         $suggestion = trim($suggestion->value);
         $flag = 0;
-        if(!empty($userId) && !empty($suggestion))
+        if (!empty($userId) && !empty($suggestion))
         {
             $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC";
-            if($result = $this->connect->query($query))
+            if ($result = $this->connect->query($query))
             {
-                if($result->num_rows > 0)
+                if ($result->num_rows > 0)
                 {
-                    while($row = $result->fetch_assoc())
+                    while ($row = $result->fetch_assoc())
                     {
                         $check_id = $row["login_id"];
                         $query = "SELECT * from total_message where (user1 = '$check_id' and user2 = '$userId') or (user2 = '$check_id' and user1 = '$userId')";
-                        if($result1 = $this->connect->query($query))
+                        if ($result1 = $this->connect->query($query))
                         {
-                            if($result1->num_rows > 0)
+                            if ($result1->num_rows > 0)
                             {
                                 $fetch = $result1->fetch_assoc();
                                 $fetch['time'] = $this->obTime->timeConversion($fetch['time']);
@@ -59,7 +59,7 @@ 
                     }
                 }
             }
-            if($flag != 0)
+            if ($flag != 0)
             {
                 $this->array = array_merge([], ["Search" => $this->array]);
                 return json_encode($this->array);

src/Chat.php

Spacing +9 added lines, -9 removed lines

@@ -36,13 +36,13 @@ 
 
     public function onMessage(ConnectionInterface $from, $msg)
     {
-        $msg = (object) json_decode($msg);
-        if($msg->type == 'OpenChat initiated..!')
+        $msg = (object)json_decode($msg);
+        if ($msg->type == 'OpenChat initiated..!')
         {
-            $initial = (object) array();
+            $initial = (object)array();
             $initial->initial = json_decode($this->onSidebar($from->userId));
 
-            if($initial->initial != null)
+            if ($initial->initial != null)
             {
                 $initial->conversation = json_decode(
                     $this->onConversation(
@@ -58,14 +58,14 @@ 
         }
         elseif ($msg->type == 'Load Sidebar')
         {
-            $sidebar = (object) array();
+            $sidebar = (object)array();
             $sidebar->sidebar = json_decode($this->onSidebar($from->userId));
             $from->send(json_encode($sidebar));
         }
         elseif ($msg->type == 'Initiated')
         {
             $msg->userId = $from->userId;
-            $result = (object) array();
+            $result = (object)array();
             $result->conversation = json_decode($this->onConversation(json_encode($msg), False));
             $from->send(json_encode($result));
         }
@@ -87,8 +87,8 @@ 
             $getReturn = $this->onReply($msg);
             echo $getReturn;
 
-            $receiveResult = (object) array();
-            $sentResult = (object) array();
+            $receiveResult = (object)array();
+            $sentResult = (object)array();
             foreach ($this->clients as $client)
             {
                 if ($client->userId == $msg->name)
@@ -107,7 +107,7 @@ 
 
                     $client->send(json_encode($receiveResult));
                 }
-                elseif($client == $from)
+                elseif ($client == $from)
                 {
                     $sentResult->sidebar = json_decode($this->onSidebar($client->userId));
 

src/Conversation.php

Spacing +13 added lines, -13 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Time;
 use ChatApp\User;
 use Dotenv\Dotenv;
@@ -35,38 +35,38 @@ 
     public function conversationLoad($msg, $para)
     {
         $msg = json_decode($msg);
-        if(!empty($msg))
+        if (!empty($msg))
         {
             $userId = $msg->userId;
             $add_load = 0;
             $details = $msg->details;
             $load = $msg->load;
 
-            if($para == True)
+            if ($para == True)
             {
                 $details = convert_uudecode(hex2bin($details));
             }
             $fetch = $this->obUser->userDetails($details, $para);
 
-            if($fetch != NULL)
+            if ($fetch != NULL)
             {
                 $login_id = (int)$fetch['login_id'];
 
                 // Unique Identifier
-                if($login_id > $userId)
+                if ($login_id > $userId)
                     $identifier = $userId.':'.$login_id;
                 else
                     $identifier = $login_id.':'.$userId;
 
                 $query = "SELECT total_messages from total_message where identifier = '$identifier'";
-                if($result = $this->connect->query($query))
+                if ($result = $this->connect->query($query))
                 {
-                    if($result->num_rows > 0)
+                    if ($result->num_rows > 0)
                     {
                         $total = $result->fetch_assoc();
                         $total = $total['total_messages'];
-                        if($total - $load > 0)
-                            if($total - $load > 10)
+                        if ($total - $load > 0)
+                            if ($total - $load > 10)
                                 $add_load = $load + 10;
                             else
                                 $add_load = $total;
@@ -74,14 +74,14 @@ 
                 }
 
                 $query = "SELECT message, time, sent_by FROM messages WHERE identifier_message_number = '$identifier' ORDER BY id DESC limit ".$load;
-                if($result = $this->connect->query($query))
+                if ($result = $this->connect->query($query))
                 {
-                    if($result->num_rows > 0)
+                    if ($result->num_rows > 0)
                     {
-                        while($row = $result->fetch_assoc())
+                        while ($row = $result->fetch_assoc())
                         {
                             $row['time'] = $this->obTime->timeConversion($row['time']);
-                            $row = array_merge($row,['start' => $userId]);
+                            $row = array_merge($row, ['start' => $userId]);
                             $this->array = array_merge($this->array, [$row]);
                         }
 

index.php

Spacing +2 added lines, -2 removed lines

@@ -1,13 +1,13 @@
 <?php
 
-require_once (__DIR__ . '/vendor/autoload.php');
+require_once (__DIR__.'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(__DIR__);
 $dotenv->load();
 
 // die("Hello");
-if(Session::get('start') != null)
+if (Session::get('start') != null)
 {
     header("Location:".getenv('APP_URL')."/views/account.php");
 }

views/validate_register.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
-require (dirname(__DIR__) . '/vendor/autoload.php');
+require (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Register;
 
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
 	$registerField = json_decode($_POST['q']);
 	$name = $registerField->name;
@@ -20,7 +20,7 @@ 
 		'mob' => $mob
 	);
 	$result = $obRegister->authRegister($data);
-	if(isset($result))
+	if (isset($result))
 		echo $result;
 	else
 		echo json_encode([]);

tests/TestAll.php

Spacing +5 added lines, -5 removed lines

@@ -190,12 +190,12 @@ 
                 "passLogin" => 'testing'
             ]
         );
-        $outputEmail = (array) json_decode($outputEmail);
+        $outputEmail = (array)json_decode($outputEmail);
         $this->assertEquals($expectedOutput, $outputEmail);
         $currentId = Session::get('start');
         Session::forget('start');
 
-        $msg =(object) [
+        $msg = (object)[
             "name" => $userId,
             "reply" => "Hello World",
             "userId" => $currentId
@@ -205,7 +205,7 @@ 
         $output = $obReply->replyTo($msg);
         $this->assertEquals("Messages is sent", $output);
 
-        $msg =(object) [
+        $msg = (object)[
             "name" => $currentId,
             "reply" => "Hello World",
             "userId" => $userId
@@ -218,14 +218,14 @@ 
         $output = $obReply->replyTo([]);
         $this->assertEquals("Failed", $output);
 
-        $output = $obReply->replyTo((object) [
+        $output = $obReply->replyTo((object)[
             "name" => -1,
             "reply" => "Hello World",
             "userId" => $currentId
         ]);
         $this->assertEquals("Invalid Authentication", $output);
 
-        $output = $obReply->replyTo((object) [
+        $output = $obReply->replyTo((object)[
             "name" => $userId,
             "reply" => "Hello",
             "userId" => $currentId

src/Login.php

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -36,13 +36,13 @@ 
 
 		if (preg_match("/^.+[@]{1}.+$/", $login))
 		{
-			if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
+			if (filter_var($login, FILTER_VALIDATE_EMAIL) == false)
 			{
 			$this->onError("login", " *Enter correct Email address");
 			}
 		}
 
-		if($this->flag == 0)
+		if ($this->flag == 0)
 		{
 			$password = md5($password);
 			$query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
@@ -53,7 +53,7 @@ 
 					$row = $result->fetch_assoc();
 					$loginID = $row['login_id'];
 					$query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
-					if($result = $this->connect->query($query))
+					if ($result = $this->connect->query($query))
 					{
 						if ($result->num_rows > 0)
 						{
@@ -65,12 +65,12 @@ 
 						$this->onError("passLogin", " *Invalid password");
 						return json_encode($this->error);
 					}
-					return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+					return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
 				}
 				$this->onError("login", " *Invalid username or email");
 				return json_encode($this->error);
 			}
-			return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+			return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
 		}
 		else
 		{
@@ -94,7 +94,7 @@ 
 		foreach ($data as $key => $value) {
 			$data[$key] = trim($data[$key]);
 			$value = trim($value);
-			if(empty($value))
+			if (empty($value))
 			{
 				$this->onError($key, $errorCode[$key]);
 			}

src/User.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
 $dotenv->load();
@@ -30,7 +30,7 @@ 
 
     public function userDetails($details, $para)
     {
-        if($para == True)
+        if ($para == True)
         {
             $this->query = "SELECT * from login where login_id = '$details'";
         }
@@ -39,7 +39,7 @@ 
             $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;

src/Compose.php

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -33,14 +33,14 @@ 
         $userId = $msg->userId;
         $suggestion = $msg->value;
         $suggestion = trim($suggestion);
-        if(!empty($userId) && !empty($suggestion))
+        if (!empty($userId) && !empty($suggestion))
         {
             $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC";
-            if($result = $this->connect->query($query))
+            if ($result = $this->connect->query($query))
             {
-                if($result->num_rows > 0)
+                if ($result->num_rows > 0)
                 {
-                    while($row = $result->fetch_assoc())
+                    while ($row = $result->fetch_assoc())
                     {
                         $row["login_id"] = bin2hex(convert_uuencode($row["login_id"]));
                         $this->array = array_merge($this->array, [$row]);