ankitjain28may / openchat

src/Compose.php

Braces +3 added lines, -6 removed lines

@@ -40,18 +40,15 @@
                         }
                         $this->array = array_merge([], ["Compose" => $this->array]);
                         return json_encode($this->array);
-                    }
-                    else
+                    } else
                     {
                         return json_encode(["Compose" => "Not Found"]);
                     }
-                }
-                else
+                } else
                 {
                     return json_encode(["Compose" => "Query Failed"]);
                 }
-            }
-            else
+            } else
             {
                 return json_encode(["Compose" => "Not Found"]);
             }

Spacing +6 added lines, -6 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__));
@@ -34,18 +34,18 @@ 
     public function selectUser($msg)
     {
         $msg = $msg->value;
-        if(Session::get('start') != null && isset($msg))
+        if (Session::get('start') != null && isset($msg))
         {
             $userId = Session::get('start');
             $suggestion = trim($msg);
-            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())
                         {
                             $this->array = array_merge($this->array, [$row]);
                         }

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/Models/message.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 class Message extends Model
 {
-    protected $table='message';
+    protected $table = 'message';
 
     protected $fillable = ['identifier_message_number', 'message', 'sent_by', 'time'];
 }

src/Chat.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 
     public function onMessage(ConnectionInterface $from, $msg) {
         $sessionId = $from->WebSocket->request->getCookies()['PHPSESSID'];
-        if($msg == 'OpenChat initiated..!')
+        if ($msg == 'OpenChat initiated..!')
         {
             @$initial->initial = json_decode($this->onSidebar($from->userId));
 
@@ -98,7 +98,7 @@ 
                     $client->send(json_encode($result));
                     $this->online = 1;
                 }
-                elseif($client == $from)
+                elseif ($client == $from)
                 {
                     @$result->sidebar = json_decode($this->onSidebar($client->userId));
 

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

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 && isset($suggestion))
+        if ($userId != null && isset($suggestion))
         {
             $suggestion = trim($suggestion);
-            if($suggestion != "")
+            if ($suggestion != "")
             {
                 $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name ASC";
-                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);

src/SideBar.php

Braces +4 added lines, -9 removed lines

@@ -38,27 +38,22 @@
                         if($substring != $userId)
                         {
                             $this->Data($substring, $row);
-                        }
-
-                        else
+                        } else
                         {
                             $substring = substr($identifier, $length+1);
                             $this->Data($substring, $row);
                         }
                     }
                     return json_encode($this->array);
-                }
-                else
+                } else
                 {
                     return json_encode(null);
                 }
-            }
-            else
+            } else
             {
                 echo "Query Failed";
             }
-        }
-        else
+        } else
         {
             header('Location:../login.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__));
@@ -32,26 +32,26 @@ 
 
     public function loadSideBar($userId)
     {
-        if(isset($userId))
+        if (isset($userId))
         {
             $query = "SELECT * FROM total_message WHERE user1='$userId' or user2='$userId'  ORDER BY id DESC";
-            if($result = $this->connect->query($query))
+            if ($result = $this->connect->query($query))
             {
                 if ($result->num_rows > 0)
                 {
                     $length = strlen($userId);
-                    while($row = $result->fetch_assoc())
+                    while ($row = $result->fetch_assoc())
                     {
                         $identifier = $row['identifier'];
                         $substring = substr($identifier, 0, $length);
-                        if($substring != $userId)
+                        if ($substring != $userId)
                         {
                             $this->data($substring, $row);
                         }
 
                         else
                         {
-                            $substring = substr($identifier, $length+1);
+                            $substring = substr($identifier, $length + 1);
                             $this->Data($substring, $row);
                         }
                     }
@@ -77,9 +77,9 @@ 
     public function data($userId, $row)
     {
         $query = "SELECT username, name, login_status, login_id from login where login_id = '$userId'";
-        if($result = $this->connect->query($query))
+        if ($result = $this->connect->query($query))
         {
-            if($result->num_rows > 0)
+            if ($result->num_rows > 0)
             {
                 $fetch = $result->fetch_assoc();
                 $row['time'] = $this->obTime->timeConversion($row['time']);

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/Login.php

Braces +5 added lines, -10 removed lines

@@ -30,8 +30,7 @@ 
 		{
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
-		}
-		elseif (preg_match("/^[@]{1}$/", $login))
+		} elseif (preg_match("/^[@]{1}$/", $login))
 		{
 			if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
 			{
@@ -42,8 +41,7 @@ 
 		if(empty($password)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
-		}
-		else
+		} else
 		{
 			$password = md5($password);
 		}
@@ -66,23 +64,20 @@ 
 							return json_encode([
 								"location" => URL."/account.php"
 							]);
-						}
-						else
+						} else
 						{
 							$this->error = array_merge($this->error, ["password" => " *Invalid password"]);
 							return json_encode($this->error);
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
 					return json_encode($this->error);
 				}
 			}
 
-		}
-		else
+		} else
 		{
 			return json_encode($this->error);
 		}

Spacing +6 added lines, -6 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,20 +33,20 @@ 
 		$login = trim($login);
 		$password = trim($password);
 
-		if(empty($login))
+		if (empty($login))
 		{
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
 		}
 		elseif (preg_match("/^[@]{1}$/", $login))
 		{
-			if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
+			if (filter_var($login, FILTER_VALIDATE_EMAIL) == false)
 			{
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
 			}
 		}
-		if(empty($password)) {
+		if (empty($password)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
 		}
@@ -55,7 +55,7 @@ 
 			$password = md5($password);
 		}
 
-		if($this->key == 0)
+		if ($this->key == 0)
 		{
 			$query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
 			if ($result = $this->connect->query($query))
@@ -65,7 +65,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)
 						{

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