ankitjain28may / openchat

src/Time.php

Spacing +7 added lines, -7 removed lines

@@ -16,14 +16,14 @@
     function TimeConversion($time)
     {
 
-        if(substr($time,4,11) == date("d M Y", time() + 16200))
-            $time = substr($time,16,5);
-        else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7)
-            $time = substr($time,0,3);
-        else if(substr($time,11,4) == date("Y", time() + 16200))
-            $time = substr($time,4,6);
+        if (substr($time, 4, 11) == date("d M Y", time() + 16200))
+            $time = substr($time, 16, 5);
+        else if (substr($time, 7, 8) == date("M Y", time() + 16200) && substr($time, 4, 2) - date("d") < 7)
+            $time = substr($time, 0, 3);
+        else if (substr($time, 11, 4) == date("Y", time() + 16200))
+            $time = substr($time, 4, 6);
         else
-            $time = substr($time,4,11);
+            $time = substr($time, 4, 11);
 
         return $time;
     }

Braces +9 added lines, -8 removed lines

@@ -16,14 +16,15 @@
     function TimeConversion($time)
     {
 
-        if(substr($time,4,11) == date("d M Y", time() + 16200))
-            $time = substr($time,16,5);
-        else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7)
-            $time = substr($time,0,3);
-        else if(substr($time,11,4) == date("Y", time() + 16200))
-            $time = substr($time,4,6);
-        else
-            $time = substr($time,4,11);
+        if(substr($time,4,11) == date("d M Y", time() + 16200)) {
+                    $time = substr($time,16,5);
+        } else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7) {
+                    $time = substr($time,0,3);
+        } else if(substr($time,11,4) == date("Y", time() + 16200)) {
+                    $time = substr($time,4,6);
+        } else {
+                    $time = substr($time,4,11);
+        }
 
         return $time;
     }

src/Chat.php

Braces +6 added lines, -12 removed lines

@@ -52,28 +52,23 @@ 
 
             $initial->conversation[0]->login_status = $this->online;
             $from->send(json_encode($initial));
-        }
-        elseif ($msg == 'Load Sidebar')
+        } elseif ($msg == 'Load Sidebar')
         {
             @$initial->initial = json_decode($this->onSidebar($from->userId));
             $from->send(json_encode($initial));
-        }
-        elseif (@json_decode($msg)->newConversation == 'Initiated')
+        } elseif (@json_decode($msg)->newConversation == 'Initiated')
         {
             @$result->conversation = json_decode($this->onConversation($msg, False, $sessionId));
             $from->send(json_encode($result));
-        }
-        elseif (@json_decode($msg)->search == 'search')
+        } elseif (@json_decode($msg)->search == 'search')
         {
             $searchResult = $this->onSearch($msg, $sessionId);
             $from->send($searchResult);
-        }
-        elseif (@json_decode($msg)->Compose == 'Compose')
+        } elseif (@json_decode($msg)->Compose == 'Compose')
         {
             $composeResult = $this->onCompose($msg, $sessionId);
             $from->send($composeResult);
-        }
-        else
+        } else
         {
             $this->onReply($msg, $sessionId);
 
@@ -97,8 +92,7 @@ 
 
                     $client->send(json_encode($result));
                     $this->online = 1;
-                }
-                elseif($client == $from)
+                } elseif($client == $from)
                 {
                     @$result->sidebar = json_decode($this->onSidebar($client->userId));
 

Spacing +9 added lines, -9 removed lines

@@ -36,12 +36,12 @@ 
 
     public function onMessage(ConnectionInterface $from, $msg) {
         $sessionId = $from->WebSocket->request->getCookies()['PHPSESSID'];
-        if($msg == 'OpenChat initiated..!')
+        if ($msg == '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(
                         json_encode([
@@ -55,13 +55,13 @@ 
         }
         elseif ($msg == 'Load Sidebar')
         {
-            $sidebar = (object) array();
+            $sidebar = (object)array();
             $sidebar->sidebar = json_decode($this->onSidebar($from->userId));
             $from->send(json_encode($sidebar));
         }
         elseif (@json_decode($msg)->newConversation == 'Initiated')
         {
-            $result = (object) array();
+            $result = (object)array();
             $result->conversation = json_decode($this->onConversation($msg, False, $sessionId));
             $from->send(json_encode($result));
         }
@@ -79,13 +79,13 @@ 
         }
         else
         {
-            $msg = (object) json_decode($msg);
+            $msg = (object)json_decode($msg);
             $msg->userId = $from->userId;
             $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)
@@ -103,7 +103,7 @@ 
 
                     $client->send(json_encode($receiveResult));
                 }
-                elseif($client == $from)
+                elseif ($client == $from)
                 {
                     $sentResult->sidebar = json_decode($this->onSidebar($client->userId));
 

src/Search.php

Braces +4 added lines, -6 removed lines

@@ -61,16 +61,14 @@
                 {
                     $this->array = array_merge([], ["Search" => $this->array]);
                     return json_encode($this->array);
+                } else {
+                                    return json_encode(["Search" => "Not Found"]);
                 }
-                else
-                    return json_encode(["Search" => "Not Found"]);
-            }
-            else
+            } else
             {
                 return json_encode(["Search" => "Not Found"]);
             }
-        }
-        else
+        } else
         {
             return json_encode(["Search" => "Not Found"]);
         }

Spacing +9 added lines, -9 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\Session;
 use Dotenv\Dotenv;
@@ -38,23 +38,23 @@ 
         $suggestion = $suggestion->value;
         $flag = 0;
         $userId = Session::get('start');
-        if($userId != null && !empty($suggestion))
+        if ($userId != null && !empty($suggestion))
         {
             $suggestion = trim($suggestion);
-            if($suggestion != "")
+            if ($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']);
@@ -66,7 +66,7 @@ 
                         }
                     }
                 }
-                if($flag != 0)
+                if ($flag != 0)
                 {
                     $this->array = array_merge([], ["Search" => $this->array]);
                     return json_encode($this->array);

cmd.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 use Ratchet\WebSocket\WsServer;
 use ChatApp\Chat;
 
-$server =IoServer::factory(
+$server = IoServer::factory(
 	new HttpServer(
 		new WsServer(
 			new Chat()

src/Validate.php

Braces +4 added lines, -4 removed lines

@@ -40,9 +40,9 @@ 
 		{
 			if ($result->num_rows>0) {
 				return 1;
+			} else {
+							return 0;
 			}
-			else
-				return 0;
 		}
 	}
 
@@ -52,9 +52,9 @@ 
 		if ($result=$this->connect->query($query)) {
 			if ($result->num_rows>0) {
 				return 1;
+			} else {
+							return 0;
 			}
-			else
-				return 0;
 			
 		}
 	}

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 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();

src/Profile.php

Braces +4 added lines, -3 removed lines

@@ -14,12 +14,13 @@
         $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
         $query = "SELECT * from profile where login_id = '$userId'";
         $result = $connect->query($query);
-        if($result->num_rows > 0)                   // if true
+        if($result->num_rows > 0) {
+            // if true
         {
             $details = $result->fetch_assoc();
-            return $details;
         }
-        else
+            return $details;
+        } else
         {
             return NULL;
         }

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 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();
@@ -23,7 +23,7 @@ 
         );
         $query = "SELECT * from profile where login_id = '$userId'";
         $result = $connect->query($query);
-        if($result->num_rows > 0)                   // if true
+        if ($result->num_rows > 0)                   // if true
         {
             $details = $result->fetch_assoc();
             return $details;

src/Session.php

Spacing +3 added lines, -3 removed lines

@@ -6,15 +6,15 @@
 class Session
 {
 
-    public static function put($key, $value){
+    public static function put($key, $value) {
         $_SESSION[$key] = $value;
     }
 
-    public static function get($key){
+    public static function get($key) {
         return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
     }
 
-    public static function forget($key){
+    public static function forget($key) {
         unset($_SESSION[$key]);
     }
 }

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();
 
 
-if(Session::get('start') != null)
+if (Session::get('start') != null)
 {
     header("Location:".getenv('APP_URL')."/account.php");
 }

src/Conversation.php

Spacing +12 added lines, -12 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 ChatApp\Time;
 use ChatApp\User;
@@ -40,7 +40,7 @@ 
     {
 
         $flag = 1;
-        if(Session::get('start') != null && isset($msg))
+        if (Session::get('start') != null && isset($msg))
         {
             $add_load = 0;
             $userId = Session::get('start');
@@ -50,25 +50,25 @@ 
 
             $fetch = $this->obUser->userDetails($username, $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;
@@ -76,14 +76,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]);
                         }
 

Braces +14 added lines, -16 removed lines

@@ -55,10 +55,11 @@ 
                 $login_id = (int)$fetch['login_id'];
 
                 // Unique Identifier
-                if($login_id > $userId)
-                    $identifier = $userId.':'.$login_id;
-                else
-                    $identifier = $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))
@@ -67,11 +68,12 @@ 
                     {
                         $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;
+                        } else {
+                                                            $add_load = $total;
+                            }
                     }
                 }
 
@@ -89,23 +91,19 @@ 
 
                         $this->array = array_merge([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'load' => $add_load, 'login_status' => $fetch['login_status'], 'type' => 1]], $this->array);
                         return json_encode($this->array);
-                    }
-                    else
+                    } else
                     {
                         return json_encode([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'login_status' => $fetch['login_status'], 'type' => 0]]);
                     }
-                }
-                else
+                } else
                 {
                     echo "Query Failed";
                 }
-            }
-            else
+            } else
             {
                 echo "Query Failed";
             }
-        }
-        else
+        } else
         {
             header('Location:../login.php');
         }