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));
 

Braces +6 added lines, -12 removed lines

@@ -55,33 +55,28 @@ 
                 );
             }
             $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;
             $getReturn = $this->onReply($msg);
@@ -106,8 +101,7 @@ 
                     );
 
                     $client->send(json_encode($receiveResult));
-                }
-                elseif($client == $from)
+                } elseif($client == $from)
                 {
                     $sentResult->sidebar = json_decode($this->onSidebar($client->userId));