ankitjain28may / openchat

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

tests/ExistsTest.php

Indentation +2 added lines, -2 removed lines

@@ -76,8 +76,8 @@
     }
 
     /**
-    * @dataProvider ClassNameProvider
-    */
+     * @dataProvider ClassNameProvider
+     */
     public function testClassExists($className)
     {
         $this->assertTrue(class_exists($className));

src/Validate.php

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

views/profile_generate.php

Indentation +20 added lines, -20 removed lines

@@ -10,37 +10,37 @@
 $connect = mysqli_connect(
     getenv('DB_HOST'),
     getenv('DB_USER'),
-	getenv('DB_PASSWORD'),
-	getenv('DB_NAME')
+    getenv('DB_PASSWORD'),
+    getenv('DB_NAME')
 );
 
 $userId = Session::get('start');
 $data = '';
 if(isset($_POST['submit']))
 {
-	$data = Profile::getProfile($userId);
-	if($data != NULL):
-		$status = get($_POST['status'], $data['status']);
-		$edu = get($_POST['education'], $data['education']);
-		$gender = get($_POST['gender'], $data['gender']);
-		$query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'";
-		if($result = $connect->query($query))
-		{
-			header('Location:'.getenv('APP_URL').'/views/account.php');
-		}
-		else
-		{
-			header("Location:".getenv('APP_URL')."/views/error.php");
-		}
-	endif;
+    $data = Profile::getProfile($userId);
+    if($data != NULL):
+        $status = get($_POST['status'], $data['status']);
+        $edu = get($_POST['education'], $data['education']);
+        $gender = get($_POST['gender'], $data['gender']);
+        $query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'";
+        if($result = $connect->query($query))
+        {
+            header('Location:'.getenv('APP_URL').'/views/account.php');
+        }
+        else
+        {
+            header("Location:".getenv('APP_URL')."/views/error.php");
+        }
+    endif;
 }
 else
 {
-	header("Location:".getenv('APP_URL')."/views/error.php");
+    header("Location:".getenv('APP_URL')."/views/error.php");
 }
 
 function get($value, $default)
 {
-	$value = trim($value);
-	return (isset($value) ? $value : $default);
+    $value = trim($value);
+    return (isset($value) ? $value : $default);
 }

views/account.php

Indentation +36 added lines, -36 removed lines

@@ -14,26 +14,26 @@ 
 $userId = Session::get('start');
 if($userId != null && $user == "account.php")
 {
-	$obUser = new User();
-	$row = $obUser->userDetails($userId, True);
+    $obUser = new User();
+    $row = $obUser->userDetails($userId, True);
 
-	if($row != NULL)
-	{
-		$location = getenv('APP_URL') . "/views/account.php/". $row['username'];
-		header("Location:".$location);
-	}
+    if($row != NULL)
+    {
+        $location = getenv('APP_URL') . "/views/account.php/". $row['username'];
+        header("Location:".$location);
+    }
 }
 elseif ($user != "account.php")
 {
-	$obUser = new User();
-	$row = $obUser->userDetails($user, False);
-	if($row != NULL):
-		$userId = $row['login_id'];
-		$details = Profile::getProfile($userId);
-		if($details != NULL)
-			$row = array_merge($row, $details);
-		else
-			header("Location:".getenv('APP_URL')."/views/error.php");
+    $obUser = new User();
+    $row = $obUser->userDetails($user, False);
+    if($row != NULL):
+        $userId = $row['login_id'];
+        $details = Profile::getProfile($userId);
+        if($details != NULL)
+            $row = array_merge($row, $details);
+        else
+            header("Location:".getenv('APP_URL')."/views/error.php");
 ?>
 
 		<!Doctype html>
@@ -68,18 +68,18 @@ 
 						<div class="brief">
 							<h1 id="name">Name: <?php echo $row['name']; ?></h1><br>
 							<?php foreach ($row as $key => $value) {
-								if($key =='username' && $value != null)
-									echo '<p>Username: '.$row["username"] .'</p><br>';
-								if($key == 'email' && $value != null)
-									echo '<p>Email Id: '.$row["email"] .'</p><br>';
-								if($key == 'status' && $value != null)
-									echo '<p>Status: '.$row["status"] .'</p><br>';
-								if($key == 'education' && $value != null)
-									echo '<p>Education: '.$row["education"] .'</p><br>';
-								if($key == 'gender' && $value != null)
-									echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
-							}
-							?>
+                                if($key =='username' && $value != null)
+                                    echo '<p>Username: '.$row["username"] .'</p><br>';
+                                if($key == 'email' && $value != null)
+                                    echo '<p>Email Id: '.$row["email"] .'</p><br>';
+                                if($key == 'status' && $value != null)
+                                    echo '<p>Status: '.$row["status"] .'</p><br>';
+                                if($key == 'education' && $value != null)
+                                    echo '<p>Education: '.$row["education"] .'</p><br>';
+                                if($key == 'gender' && $value != null)
+                                    echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
+                            }
+                            ?>
 						</div>
 						<?php if(Session::get('start') == $row['login_id']): ?>
 							<div class="edit">
@@ -89,8 +89,8 @@ 
 					</div>
 
 					<?php
-						if(Session::get('start') == $row['login_id']):
-					?>
+                        if(Session::get('start') == $row['login_id']):
+                    ?>
 
 					<div class="boxx" id="profile">
 						<form method="post" action="../profile_generate.php">
@@ -105,8 +105,8 @@ 
 						</form>
 					</div>
 					<?php
-						endif;
-					?>
+                        endif;
+                    ?>
 				</div>
 
 				<div class="footer">
@@ -119,13 +119,13 @@ 
 			</body>
 		</html>
 <?php
-	else:
-		header("Location:".getenv('APP_URL')."/views/error.php");
-	endif;
+    else:
+        header("Location:".getenv('APP_URL')."/views/error.php");
+    endif;
 }
 else
 {
-	header("Location: ".getenv('APP_URL')."/views/");
+    header("Location: ".getenv('APP_URL')."/views/");
 }
 ?>
 

src/Register.php

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

views/validate_register.php

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

views/message.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");
 }
 ?>

src/Login.php

Indentation +77 added lines, -77 removed lines

@@ -11,96 +11,96 @@
 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",
-			"passLogin" => " *Enter the password"
-		);
+    public function emptyValue($data)
+    {
+        $errorCode = array(
+            "login" => " *Enter the login field",
+            "passLogin" => " *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;
+    }
 
 }