ankitjain28may / openchat

views/validate_register.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\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([]);
+	}
+	}
 

Indentation +19 added lines, -19 removed lines

@@ -5,25 +5,25 @@
 
 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();
-	$data = array(
-		'name' => $name,
-		'email' => $email,
-		'username' => $username,
-		'passRegister' => $password,
-		'mob' => $mob
-	);
-	$result = $obRegister->authRegister($data);
-	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();
+    $data = array(
+        'name' => $name,
+        'email' => $email,
+        'username' => $username,
+        'passRegister' => $password,
+        'mob' => $mob
+    );
+    $result = $obRegister->authRegister($data);
+    if(isset($result))
+        echo $result;
+    else
+        echo json_encode([]);
 }
 
 

src/Register.php

Doc Comments +3 added lines

@@ -97,6 +97,9 @@
 	}
 
 
+	/**
+	 * @param string $value
+	 */
 	public function onError($key, $value)
 	{
 		$this->flag = 1;

Indentation +106 added lines, -106 removed lines

@@ -12,115 +12,115 @@
 
 class Register
 {
-	protected $error;
-	protected $flag;
-	protected $obValidate;
-	protected $connect;
-
-	public function __construct()
-	{
-		$this->error = array();
-		$this->flag = 0;
-		$this->connect = mysqli_connect(
+    protected $error;
+    protected $flag;
+    protected $obValidate;
+    protected $connect;
+
+    public function __construct()
+    {
+        $this->error = array();
+        $this->flag = 0;
+        $this->connect = mysqli_connect(
             getenv('DB_HOST'),
             getenv('DB_USER'),
             getenv('DB_PASSWORD'),
             getenv('DB_NAME')
         );
-		$this->obValidate = new Validate();
-
-	}
-
-	public function authRegister($data)
-	{
-		$data = $this->emptyValue($data);
-		$name = $data["name"];
-		$email = $data["email"];
-		$username = $data["username"];
-		$mob = $data["mob"];
-		$password = $data["passRegister"];
-		$userId = '';
-
-		if(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");
-		}
-
-		if($this->obValidate->validateUsernameInDb($username) === 1)
-		{
-			$this->onError("username", " *Username is already registered");
-		}
-
-		if (!preg_match("/^[0-9]{10}$/", $data["mob"])) {
-			$this->onError("mob", " *Enter correct Mobile Number");
-		}
-
-		if($this->flag == 1)
-		{
-			return json_encode($this->error);
-		}
-
-		$password = md5($password);
-
-		$query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')";
-		if(!$this->connect->query($query))
-		{
-			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))
-		{
-			$row = $result->fetch_assoc();
-			$userId = $row['id'];
-			$query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
-
-			if(!$this->connect->query($query))
-			{
-				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))
-			{
-				return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
-			}
-
-			Session::put('start', $userId);
-			return json_encode([
-				"location" => getenv('APP_URL')."/views/account.php"
-			]);
-		}
-	}
-
-
-	public function onError($key, $value)
-	{
-		$this->flag = 1;
-		$this->error = array_merge($this->error, [["key" => $key, "value" => $value]]);
-	}
-
-	public function emptyValue($data)
-	{
-		$errorCode = array(
-			"name" => " *Enter the name",
-			"email" => " *Enter the email address",
-			"username" => " *Enter the username",
-			"passRegister" => " *Enter the password",
-			"mob" => " *Enter the Mobile Number"
-		);
-
-		foreach ($data as $key => $value) {
-			$data[$key] = trim($data[$key]);
-			$value = trim($value);
-			if(empty($value))
-			{
-				$this->onError($key, $errorCode[$key]);
-			}
-		}
-		return $data;
-	}
+        $this->obValidate = new Validate();
+
+    }
+
+    public function authRegister($data)
+    {
+        $data = $this->emptyValue($data);
+        $name = $data["name"];
+        $email = $data["email"];
+        $username = $data["username"];
+        $mob = $data["mob"];
+        $password = $data["passRegister"];
+        $userId = '';
+
+        if(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");
+        }
+
+        if($this->obValidate->validateUsernameInDb($username) === 1)
+        {
+            $this->onError("username", " *Username is already registered");
+        }
+
+        if (!preg_match("/^[0-9]{10}$/", $data["mob"])) {
+            $this->onError("mob", " *Enter correct Mobile Number");
+        }
+
+        if($this->flag == 1)
+        {
+            return json_encode($this->error);
+        }
+
+        $password = md5($password);
+
+        $query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')";
+        if(!$this->connect->query($query))
+        {
+            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))
+        {
+            $row = $result->fetch_assoc();
+            $userId = $row['id'];
+            $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
+
+            if(!$this->connect->query($query))
+            {
+                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))
+            {
+                return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+            }
+
+            Session::put('start', $userId);
+            return json_encode([
+                "location" => getenv('APP_URL')."/views/account.php"
+            ]);
+        }
+    }
+
+
+    public function onError($key, $value)
+    {
+        $this->flag = 1;
+        $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]);
+    }
+
+    public function emptyValue($data)
+    {
+        $errorCode = array(
+            "name" => " *Enter the name",
+            "email" => " *Enter the email address",
+            "username" => " *Enter the username",
+            "passRegister" => " *Enter the password",
+            "mob" => " *Enter the Mobile Number"
+        );
+
+        foreach ($data as $key => $value) {
+            $data[$key] = trim($data[$key]);
+            $value = trim($value);
+            if(empty($value))
+            {
+                $this->onError($key, $errorCode[$key]);
+            }
+        }
+        return $data;
+    }
 }

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

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
 		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");
 		}

src/Login.php

Indentation +77 added lines, -77 removed lines

@@ -11,97 +11,97 @@
 class Login
 {
 
-	protected $flag;
-	protected $error;
-	protected $connect;
+    protected $flag;
+    protected $error;
+    protected $connect;
 
-	public function __construct()
-	{
-		$this->flag = 0;
-		$this->connect = mysqli_connect(
+    public function __construct()
+    {
+        $this->flag = 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($data)
-	{
-		$data = $this->emptyValue($data);
+    public function authLogin($data)
+    {
+        $data = $this->emptyValue($data);
 
-		$login = $data["login"];
-		$password = $data["passLogin"];
+        $login = $data["login"];
+        $password = $data["passLogin"];
 
 
-		if (preg_match("/^[@]{1}$/", $login))
-		{
-			if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
-			{
-			$this->onError("login", " *Enter correct Email address");
-			}
-		}
+        if (preg_match("/^[@]{1}$/", $login))
+        {
+            if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
+            {
+            $this->onError("login", " *Enter correct Email address");
+            }
+        }
 
-		if($this->flag == 0)
-		{
-			$password = md5($password);
-			$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"
-							]);
-						}
-						$this->onError("passLogin", " *Invalid password");
-						return json_encode($this->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 ]);
-		}
-		else
-		{
-			return json_encode($this->error);
-		}
-	}
+        if($this->flag == 0)
+        {
+            $password = md5($password);
+            $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"
+                            ]);
+                        }
+                        $this->onError("passLogin", " *Invalid password");
+                        return json_encode($this->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 ]);
+        }
+        else
+        {
+            return json_encode($this->error);
+        }
+    }
 
-	public function onError($key, $value)
-	{
-		$this->flag = 1;
-		$this->error = array_merge($this->error, [["key" => $key, "value" => $value]]);
-	}
+    public function onError($key, $value)
+    {
+        $this->flag = 1;
+        $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]);
+    }
 
-	public function emptyValue($data)
-	{
-		$errorCode = array(
-			"login" => " *Enter the login field",
-			"passRegister" => " *Enter the password"
-		);
+    public function emptyValue($data)
+    {
+        $errorCode = array(
+            "login" => " *Enter the login field",
+            "passRegister" => " *Enter the password"
+        );
 
-		foreach ($data as $key => $value) {
-			$data[$key] = trim($data[$key]);
-			$value = trim($value);
-			if(empty($value))
-			{
-				$this->onError($key, $errorCode[$key]);
-			}
-		}
-		return $data;
-	}
+        foreach ($data as $key => $value) {
+            $data[$key] = trim($data[$key]);
+            $value = trim($value);
+            if(empty($value))
+            {
+                $this->onError($key, $errorCode[$key]);
+            }
+        }
+        return $data;
+    }
 
 }
 

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

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
 				return json_encode($this->error);
 			}
 			return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
-		}
-		else
+		} else
 		{
 			return json_encode($this->error);
 		}

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

Braces +6 added lines, -5 removed lines

@@ -14,8 +14,9 @@
         'passLogin' => $password
     );
     $result = $obLogin->authLogin($data);
-    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

views/message2.php

Indentation +1 added lines, -1 removed lines

@@ -175,6 +175,6 @@
 <?php
 }
 else{
-  header('Location:'. getenv('APP_URL')."/index.php");
+    header('Location:'. getenv('APP_URL')."/index.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");
 }
 ?>

Braces +1 added lines, -2 removed lines

@@ -129,8 +129,7 @@
 </html>
 
 <?php
-}
-else{
+} else{
 	header('Location:http://www.localhost/openchat/login.php');
 }
 ?>