ankitjain28may / openchat

src/Session.php

Spacing +4 added lines, -4 removed lines

@@ -3,22 +3,22 @@
 namespace ChatApp;
 session_start();
 
-class Session{
+class Session {
 
     public function __construct()
     {
         # code
     }
 
-    public function put($key, $value){
+    public function put($key, $value) {
         $_SESSION[$key] = $value;
     }
 
-    public function get($key){
+    public function get($key) {
         return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
     }
 
-    public function forget($key){
+    public function forget($key) {
         unset($_SESSION[$key]);
     }
 }

src/Register.php

Indentation +99 added lines, -99 removed lines

@@ -7,116 +7,116 @@
 
 class Register
 {
-	protected $error;
-	protected $key;
-	protected $obValidate;
-	protected $connect;
-	protected $session;
+    protected $error;
+    protected $key;
+    protected $obValidate;
+    protected $connect;
+    protected $session;
 
-	public function __construct()
-	{
-		$this->error = array();
-		$this->key = 0;
-		$this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
-		$this->session = new Session();
-		$this->obValidate = new Validate();
+    public function __construct()
+    {
+        $this->error = array();
+        $this->key = 0;
+        $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
+        $this->session = new Session();
+        $this->obValidate = new Validate();
 
-	}
+    }
 
-	public function authRegister($name, $email, $username, $password, $mob)
-	{
-		$name = trim($name);
-		$email = trim($email);
-		$username = trim($username);
-		$password = trim($password);
-		$mob = trim($mob);
-		$userId = '';
+    public function authRegister($name, $email, $username, $password, $mob)
+    {
+        $name = trim($name);
+        $email = trim($email);
+        $username = trim($username);
+        $password = trim($password);
+        $mob = trim($mob);
+        $userId = '';
 
-		if (empty($name)) {
-			$this->onError(["name" => " *Enter the name"]);
-		}
+        if (empty($name)) {
+            $this->onError(["name" => " *Enter the name"]);
+        }
 
-		if(empty($email)) {
-			$this->onError(["email" => " *Enter the email address"]);
-		}
-		elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
-			$this->onError(["email" => " *Enter correct Email address"]);
-		}
-		else
-		{
-			if($this->obValidate->validateEmailInDb($email) === 1)
-			{
+        if(empty($email)) {
+            $this->onError(["email" => " *Enter the email address"]);
+        }
+        elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
+            $this->onError(["email" => " *Enter correct Email address"]);
+        }
+        else
+        {
+            if($this->obValidate->validateEmailInDb($email) === 1)
+            {
 
-				$this->onError(["email" => " *Email is already registered"]);
-			}
-		}
+                $this->onError(["email" => " *Email is already registered"]);
+            }
+        }
 
-		if(empty($username)) {
-			$this->onError(["username" => " *Enter the username"]);
-		}
-		else
-		{
-			if($this->obValidate->validateUsernameInDb($username) === 1)
-			{
+        if(empty($username)) {
+            $this->onError(["username" => " *Enter the username"]);
+        }
+        else
+        {
+            if($this->obValidate->validateUsernameInDb($username) === 1)
+            {
 
-				$this->onError(["username" => " *Username is already registered"]);
-			}
-		}
+                $this->onError(["username" => " *Username is already registered"]);
+            }
+        }
 
-		if(empty($password)) {
-			$this->onError(["password" => " *Enter the password"]);
-		}
+        if(empty($password)) {
+            $this->onError(["password" => " *Enter the password"]);
+        }
 
-		if(empty($mob)) {
-			$this->onError(["mob" => " *Enter the Mobile Number"]);
-		}
-		elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
-			$this->onError(["mob" => " *Enter correct Mobile Number"]);
-		}
+        if(empty($mob)) {
+            $this->onError(["mob" => " *Enter the Mobile Number"]);
+        }
+        elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
+            $this->onError(["mob" => " *Enter correct Mobile Number"]);
+        }
 
-		if($this->key == 1)
-		{
-			return json_encode($this->error);
-		}
-		else
-		{
-			$this->key = 0;
-			$pass = md5($password);
-			$query = "INSERT INTO register VALUES(null, '$email', '$username', '$pass')";
-			if(!$this->connect->query($query)) {
-				$this->key = 1;
-				echo "You are not registered || Error in registration2";
-			}
-			else
-			{
-				$query = "SELECT id FROM register WHERE email = '$email'";
-				if($result = $this->connect->query($query)) {
-					$row = $result->fetch_assoc();
-					$userId = $row['id'];
+        if($this->key == 1)
+        {
+            return json_encode($this->error);
+        }
+        else
+        {
+            $this->key = 0;
+            $pass = md5($password);
+            $query = "INSERT INTO register VALUES(null, '$email', '$username', '$pass')";
+            if(!$this->connect->query($query)) {
+                $this->key = 1;
+                echo "You are not registered || Error in registration2";
+            }
+            else
+            {
+                $query = "SELECT id FROM register WHERE email = '$email'";
+                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)) {
-						$this->key = 1;
-						echo "You are not registered || Error in registration1";
-					}
-				}
-			}
-		}
-		if ($this->key == 0) {
-			$this->session->put('start', $userId);
-			return json_encode([
-				"location" => URL."/account.php"
-			]);
-		}
-		else
-		{
-			return json_encode($this->error);
-		}
-	}
+                    $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
+                    if(!$this->connect->query($query)) {
+                        $this->key = 1;
+                        echo "You are not registered || Error in registration1";
+                    }
+                }
+            }
+        }
+        if ($this->key == 0) {
+            $this->session->put('start', $userId);
+            return json_encode([
+                "location" => URL."/account.php"
+            ]);
+        }
+        else
+        {
+            return json_encode($this->error);
+        }
+    }
 
-	public function onError($value)
-	{
-		$this->key = 1;
-		$this->error = array_merge($this->error, $value);
-	}
+    public function onError($value)
+    {
+        $this->key = 1;
+        $this->error = array_merge($this->error, $value);
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -3,7 +3,7 @@ 
 namespace ChatApp;
 use ChatApp\Validate;
 use ChatApp\Session;
-require_once (dirname(__DIR__) . '/config/database.php');
+require_once (dirname(__DIR__).'/config/database.php');
 
 class Register
 {
@@ -36,45 +36,45 @@ 
 			$this->onError(["name" => " *Enter the name"]);
 		}
 
-		if(empty($email)) {
+		if (empty($email)) {
 			$this->onError(["email" => " *Enter the email address"]);
 		}
-		elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
+		elseif (filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
 			$this->onError(["email" => " *Enter correct Email address"]);
 		}
 		else
 		{
-			if($this->obValidate->validateEmailInDb($email) === 1)
+			if ($this->obValidate->validateEmailInDb($email) === 1)
 			{
 
 				$this->onError(["email" => " *Email is already registered"]);
 			}
 		}
 
-		if(empty($username)) {
+		if (empty($username)) {
 			$this->onError(["username" => " *Enter the username"]);
 		}
 		else
 		{
-			if($this->obValidate->validateUsernameInDb($username) === 1)
+			if ($this->obValidate->validateUsernameInDb($username) === 1)
 			{
 
 				$this->onError(["username" => " *Username is already registered"]);
 			}
 		}
 
-		if(empty($password)) {
+		if (empty($password)) {
 			$this->onError(["password" => " *Enter the password"]);
 		}
 
-		if(empty($mob)) {
+		if (empty($mob)) {
 			$this->onError(["mob" => " *Enter the Mobile Number"]);
 		}
 		elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
 			$this->onError(["mob" => " *Enter correct Mobile Number"]);
 		}
 
-		if($this->key == 1)
+		if ($this->key == 1)
 		{
 			return json_encode($this->error);
 		}
@@ -83,19 +83,19 @@ 
 			$this->key = 0;
 			$pass = md5($password);
 			$query = "INSERT INTO register VALUES(null, '$email', '$username', '$pass')";
-			if(!$this->connect->query($query)) {
+			if (!$this->connect->query($query)) {
 				$this->key = 1;
 				echo "You are not registered || Error in registration2";
 			}
 			else
 			{
 				$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)) {
 						$this->key = 1;
 						echo "You are not registered || Error in registration1";
 					}

Braces +7 added lines, -14 removed lines

@@ -38,11 +38,9 @@ 
 
 		if(empty($email)) {
 			$this->onError(["email" => " *Enter the email address"]);
-		}
-		elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
+		} elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
 			$this->onError(["email" => " *Enter correct Email address"]);
-		}
-		else
+		} else
 		{
 			if($this->obValidate->validateEmailInDb($email) === 1)
 			{
@@ -53,8 +51,7 @@ 
 
 		if(empty($username)) {
 			$this->onError(["username" => " *Enter the username"]);
-		}
-		else
+		} else
 		{
 			if($this->obValidate->validateUsernameInDb($username) === 1)
 			{
@@ -69,16 +66,14 @@ 
 
 		if(empty($mob)) {
 			$this->onError(["mob" => " *Enter the Mobile Number"]);
-		}
-		elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
+		} elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
 			$this->onError(["mob" => " *Enter correct Mobile Number"]);
 		}
 
 		if($this->key == 1)
 		{
 			return json_encode($this->error);
-		}
-		else
+		} else
 		{
 			$this->key = 0;
 			$pass = md5($password);
@@ -86,8 +81,7 @@ 
 			if(!$this->connect->query($query)) {
 				$this->key = 1;
 				echo "You are not registered || Error in registration2";
-			}
-			else
+			} else
 			{
 				$query = "SELECT id FROM register WHERE email = '$email'";
 				if($result = $this->connect->query($query)) {
@@ -107,8 +101,7 @@ 
 			return json_encode([
 				"location" => URL."/account.php"
 			]);
-		}
-		else
+		} else
 		{
 			return json_encode($this->error);
 		}

src/Online.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/config/database.php');
+require_once (dirname(__DIR__).'/config/database.php');
 
 /**
 * For checking online status
@@ -13,7 +13,7 @@ 
     {
         $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
         $query = "Update login set login_status = 1 where login_id = '$userId'";
-        if(!$connect->query($query));
+        if (!$connect->query($query));
             echo $connect->error;
         $connect->close();
     }
@@ -22,7 +22,7 @@ 
     {
         $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
         $query = "Update login set login_status = 0 where login_id = '$userId'";
-        if(!$connect->query($query));
+        if (!$connect->query($query));
             echo $connect->error;
         $connect->close();
     }

src/Profile.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/config/database.php');
+require_once (dirname(__DIR__).'/config/database.php');
 
 /**
 * For retreiving User Profile
@@ -14,7 +14,7 @@ 
         $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;

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

logout.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 
-require (__DIR__ . '/vendor/autoload.php');
+require (__DIR__.'/vendor/autoload.php');
 use ChatApp\Session;
 
-if(Session::get('start') != null)
+if (Session::get('start') != null)
 {
     Session::forget('start');
     header('Location: index.php');

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
         header('Location: ../../index.php');
     }
 
-}
-else
+} else
 {
 	echo "Please Login";
 }

ajax/validate_login.php

Indentation +9 added lines, -9 removed lines

@@ -5,13 +5,13 @@
 
 if(isset($_POST['q']))
 {
-	$loginField = json_decode($_POST['q']);
-	$login = $loginField->login;
-	$password = $loginField->password;
-	$obLogin = new Login();
-	$result = $obLogin->authLogin($login, $password);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
+    $loginField = json_decode($_POST['q']);
+    $login = $loginField->login;
+    $password = $loginField->password;
+    $obLogin = new Login();
+    $result = $obLogin->authLogin($login, $password);
+    if(isset($result))
+        echo $result;
+    else
+        echo json_encode([]);
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -1,16 +1,16 @@
 <?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;
 	$password = $loginField->password;
 	$obLogin = new Login();
 	$result = $obLogin->authLogin($login, $password);
-	if(isset($result))
+	if (isset($result))
 		echo $result;
 	else
 		echo json_encode([]);

Braces +6 added lines, -5 removed lines

@@ -10,8 +10,9 @@
 	$password = $loginField->password;
 	$obLogin = new Login();
 	$result = $obLogin->authLogin($login, $password);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
-}
\ No newline at end of file
+	if(isset($result)) {
+			echo $result;
+	} else {
+			echo json_encode([]);
+	}
+	}
\ No newline at end of file

ajax/validate_register.php

Indentation +12 added lines, -12 removed lines

@@ -5,17 +5,17 @@
 
 if(isset($_POST['q']))
 {
-	$registerField = json_decode($_POST['q']);
-	$name = $registerField->name;
-	$email = $registerField->email;
-	$username = $registerField->username;
-	$mob = $registerField->mob;
-	$password = $registerField->password;
-	$obRegister = new Register();
-	$result = $obRegister->authRegister($name, $email, $username, $password, $mob);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
+    $registerField = json_decode($_POST['q']);
+    $name = $registerField->name;
+    $email = $registerField->email;
+    $username = $registerField->username;
+    $mob = $registerField->mob;
+    $password = $registerField->password;
+    $obRegister = new Register();
+    $result = $obRegister->authRegister($name, $email, $username, $password, $mob);
+    if(isset($result))
+        echo $result;
+    else
+        echo json_encode([]);
 }
 

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\Register;
 
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
 	$registerField = json_decode($_POST['q']);
 	$name = $registerField->name;
@@ -13,7 +13,7 @@ 
 	$password = $registerField->password;
 	$obRegister = new Register();
 	$result = $obRegister->authRegister($name, $email, $username, $password, $mob);
-	if(isset($result))
+	if (isset($result))
 		echo $result;
 	else
 		echo json_encode([]);

Braces +6 added lines, -5 removed lines

@@ -13,9 +13,10 @@
 	$password = $registerField->password;
 	$obRegister = new Register();
 	$result = $obRegister->authRegister($name, $email, $username, $password, $mob);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
-}
+	if(isset($result)) {
+			echo $result;
+	} else {
+			echo json_encode([]);
+	}
+	}