ankitjain28may / openchat

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__));
@@ -37,13 +37,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'";
@@ -54,7 +54,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)
 						{
@@ -66,12 +66,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
 		{
@@ -95,7 +95,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/Register.php

Spacing +13 added lines, -13 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace ChatApp;
 
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Validate;
 use ChatApp\Session;
 use Dotenv\Dotenv;
@@ -41,16 +41,16 @@ 
 		$password = $data["passRegister"];
 		$userId = '';
 
-		if(filter_var($email, FILTER_VALIDATE_EMAIL) == false)
+		if (filter_var($email, FILTER_VALIDATE_EMAIL) == false)
 		{
 			$this->onError("email", " *Enter correct Email address");
 		}
-		else if($this->obValidate->validateEmailInDb($email) === 1)
+		else if ($this->obValidate->validateEmailInDb($email) === 1)
 		{
 			$this->onError("email", " *Email is already registered");
 		}
 
-		if($this->obValidate->validateUsernameInDb($username) === 1)
+		if ($this->obValidate->validateUsernameInDb($username) === 1)
 		{
 			$this->onError("username", " *Username is already registered");
 		}
@@ -59,7 +59,7 @@ 
 			$this->onError("mob", " *Enter correct Mobile Number");
 		}
 
-		if($this->flag == 1)
+		if ($this->flag == 1)
 		{
 			return json_encode($this->error);
 		}
@@ -67,26 +67,26 @@ 
 		$password = md5($password);
 
 		$query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')";
-		if(!$this->connect->query($query))
+		if (!$this->connect->query($query))
 		{
-			return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+			return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
 		}
 		$query = "SELECT id FROM register WHERE email = '$email'";
-		if($result = $this->connect->query($query))
+		if ($result = $this->connect->query($query))
 		{
 			$row = $result->fetch_assoc();
 			$userId = $row['id'];
 			$query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
 
-			if(!$this->connect->query($query))
+			if (!$this->connect->query($query))
 			{
-				return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+				return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
 			}
 
 			$query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
-			if(!$this->connect->query($query))
+			if (!$this->connect->query($query))
 			{
-				return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+				return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
 			}
 
 			Session::put('start', $userId);
@@ -116,7 +116,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]);
 			}

views/validate_login.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\Login;
 
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
     $loginField = json_decode($_POST['q']);
     $login = $loginField->login;
@@ -14,7 +14,7 @@ 
         'passLogin' => $password
     );
     $result = $obLogin->authLogin($data);
-    if(isset($result))
+    if (isset($result))
         echo $result;
     else
         echo json_encode([]);

src/Chat.php

Spacing +5 added lines, -5 removed lines

@@ -38,9 +38,9 @@ 
 
     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));
 
             $initial->conversation = json_decode(
@@ -56,13 +56,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));
         }
@@ -102,7 +102,7 @@ 
                     $client->send(json_encode($receiveResult));
                     $this->online = 1;
                 }
-                elseif($client == $from)
+                elseif ($client == $from)
                 {
                     $sentResult->sidebar = json_decode($this->onSidebar($client->userId));
 

views/message2.php

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
-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__));
 $dotenv->load();
 
-if(Session::get('start') != null && empty($_GET['user']))
+if (Session::get('start') != null && empty($_GET['user']))
 {
 
 ?>
@@ -174,7 +174,7 @@ 
 
 <?php
 }
-else{
-  header('Location:'. getenv('APP_URL')."/index.php");
+else {
+  header('Location:'.getenv('APP_URL')."/index.php");
 }
 ?>