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"]);
             }

src/Time.php

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

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"]);
         }

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

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

Indentation +73 added lines, -73 removed lines

@@ -11,88 +11,88 @@
 class Login
 {
 
-	protected $key;
-	protected $error;
-	protected $connect;
+    protected $key;
+    protected $error;
+    protected $connect;
 
-	public function __construct()
-	{
-		$this->key = 0;
-		$this->connect = mysqli_connect(
+    public function __construct()
+    {
+        $this->key = 0;
+        $this->connect = mysqli_connect(
             getenv('DB_HOST'),
             getenv('DB_USER'),
             getenv('DB_PASSWORD'),
             getenv('DB_NAME')
         );
-		$this->error = array();
-	}
+        $this->error = array();
+    }
 
-	public function authLogin($login, $password)
-	{
+    public function authLogin($login, $password)
+    {
 
-		$login = trim($login);
-		$password = trim($password);
+        $login = trim($login);
+        $password = trim($password);
 
-		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)
-			{
-			$this->key = 1;
-			$this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
-			}
-		}
-		if(empty($password)) {
-			$this->key = 1;
-			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
-		}
-		else
-		{
-			$password = md5($password);
-		}
+        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)
+            {
+            $this->key = 1;
+            $this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
+            }
+        }
+        if(empty($password)) {
+            $this->key = 1;
+            $this->error = array_merge($this->error, ["password" => " *Enter the password"]);
+        }
+        else
+        {
+            $password = md5($password);
+        }
 
-		if($this->key == 0)
-		{
-			$query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
-			if ($result = $this->connect->query($query))
-			{
-				if ($result->num_rows > 0)
-				{
-					$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->num_rows > 0)
-						{
-							Session::put('start', $loginID);
-							return json_encode([
-								"location" => getenv('APP_URL')."/views/account.php"
-							]);
-						}
-						else
-						{
-							$this->error = array_merge($this->error, ["password" => " *Invalid password"]);
-							return json_encode($this->error);
-						}
-					}
-				}
-				else
-				{
-					$this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
-					return json_encode($this->error);
-				}
-			}
+        if($this->key == 0)
+        {
+            $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
+            if ($result = $this->connect->query($query))
+            {
+                if ($result->num_rows > 0)
+                {
+                    $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->num_rows > 0)
+                        {
+                            Session::put('start', $loginID);
+                            return json_encode([
+                                "location" => getenv('APP_URL')."/views/account.php"
+                            ]);
+                        }
+                        else
+                        {
+                            $this->error = array_merge($this->error, ["password" => " *Invalid password"]);
+                            return json_encode($this->error);
+                        }
+                    }
+                }
+                else
+                {
+                    $this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
+                    return json_encode($this->error);
+                }
+            }
 
-		}
-		else
-		{
-			return json_encode($this->error);
-		}
-		$this->connect->close();
-	}
+        }
+        else
+        {
+            return json_encode($this->error);
+        }
+        $this->connect->close();
+    }
 }

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

Indentation +28 added lines, -28 removed lines

@@ -11,40 +11,40 @@
 */
 class Validate
 {
-	protected $connect;
+    protected $connect;
 
-	public function __construct()
-	{
-		$this->connect = mysqli_connect(
+    public function __construct()
+    {
+        $this->connect = mysqli_connect(
             getenv('DB_HOST'),
             getenv('DB_USER'),
             getenv('DB_PASSWORD'),
             getenv('DB_NAME')
         );
-	}
+    }
 
-	public function validateEmailInDb($email)
-	{
-		$query = "SELECT login_id FROM login WHERE email = '$email'";
-		if ($result = $this->connect->query($query))
-		{
-			if ($result->num_rows > 0) {
-				return 1;
-			}
-			else
-				return 0;
-		}
-	}
+    public function validateEmailInDb($email)
+    {
+        $query = "SELECT login_id FROM login WHERE email = '$email'";
+        if ($result = $this->connect->query($query))
+        {
+            if ($result->num_rows > 0) {
+                return 1;
+            }
+            else
+                return 0;
+        }
+    }
 
-	function validateUsernameInDb($username)
-	{
-		$query = "SELECT login_id FROM login WHERE username = '$username'";
-		if ($result = $this->connect->query($query)) {
-			if ($result->num_rows > 0) {
-				return 1;
-			}
-			else
-				return 0;
-		}
-	}
+    function validateUsernameInDb($username)
+    {
+        $query = "SELECT login_id FROM login WHERE username = '$username'";
+        if ($result = $this->connect->query($query)) {
+            if ($result->num_rows > 0) {
+                return 1;
+            }
+            else
+                return 0;
+        }
+    }
 }

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

cmd.php

Indentation +8 added lines, -8 removed lines

@@ -8,12 +8,12 @@
 use ChatApp\Chat;
 
 $server =IoServer::factory(
-	new HttpServer(
-		new WsServer(
-			new Chat()
-			)
-		)
-	,
-	8080
-	);
+    new HttpServer(
+        new WsServer(
+            new Chat()
+            )
+        )
+    ,
+    8080
+    );
 $server->run();